fix PR comment

The restart reason belongs with other server state (shutting_down,
restarting, update_progress) rather than on the top-level ServerInfo.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

core/src/registry/package/get.rs

@@ -615,7 +615,6 @@ fn check_matching_info_short() {
             sdk_version: None,
             hardware_acceleration: false,
             plugins: BTreeSet::new(),
-            satisfies: BTreeSet::new(),
         },
         icon: DataUrl::from_vec("image/png", vec![]),
         dependency_metadata: BTreeMap::new(),

core/src/registry/package/index.rs

@@ -110,8 +110,6 @@ pub struct PackageMetadata {
     pub hardware_acceleration: bool,
     #[serde(default)]
     pub plugins: BTreeSet<PluginId>,
-    #[serde(default)]
-    pub satisfies: BTreeSet<VersionString>,
 }
 
 #[derive(Debug, Deserialize, Serialize, HasModel, TS)]

core/src/s9pk/v2/compat.rs

@@ -197,6 +197,7 @@ impl TryFrom<ManifestV1> for Manifest {
         Ok(Self {
             id: value.id,
             version: version.into(),
+            satisfies: BTreeSet::new(),
             can_migrate_from: VersionRange::any(),
             can_migrate_to: VersionRange::none(),
             metadata: PackageMetadata {
@@ -218,7 +219,6 @@ impl TryFrom<ManifestV1> for Manifest {
                     PackageProcedure::Script(_) => false,
                 },
                 plugins: BTreeSet::new(),
-                satisfies: BTreeSet::new(),
             },
             images: BTreeMap::new(),
             volumes: value

core/src/s9pk/v2/manifest.rs

@@ -32,6 +32,7 @@ pub(crate) fn current_version() -> Version {
 pub struct Manifest {
     pub id: PackageId,
     pub version: VersionString,
+    pub satisfies: BTreeSet<VersionString>,
     #[ts(type = "string")]
     pub can_migrate_to: VersionRange,
     #[ts(type = "string")]

core/src/service/effects/dependency.rs

@@ -358,7 +358,7 @@ pub async fn check_dependencies(
         };
         let manifest = package.as_state_info().as_manifest(ManifestPreference::New);
         let installed_version = manifest.as_version().de()?.into_version();
-        let satisfies = manifest.as_metadata().as_satisfies().de()?;
+        let satisfies = manifest.as_satisfies().de()?;
         let installed_version = Some(installed_version.clone().into());
         let is_running = package
             .as_status_info()

sdk/base/lib/osBindings/Manifest.ts

@@ -15,6 +15,7 @@ import type { VolumeId } from './VolumeId'
 export type Manifest = {
   id: PackageId
   version: Version
+  satisfies: Array<Version>
   canMigrateTo: string
   canMigrateFrom: string
   images: { [key: ImageId]: ImageConfig }
@@ -36,5 +37,4 @@ export type Manifest = {
   sdkVersion: string | null
   hardwareAcceleration: boolean
   plugins: Array<PluginId>
-  satisfies: Array<Version>
 }

sdk/base/lib/osBindings/PackageVersionInfo.ts

@@ -10,7 +10,6 @@ import type { MerkleArchiveCommitment } from './MerkleArchiveCommitment'
 import type { PackageId } from './PackageId'
 import type { PluginId } from './PluginId'
 import type { RegistryAsset } from './RegistryAsset'
-import type { Version } from './Version'
 
 export type PackageVersionInfo = {
   icon: DataUrl
@@ -32,5 +31,4 @@ export type PackageVersionInfo = {
   sdkVersion: string | null
   hardwareAcceleration: boolean
   plugins: Array<PluginId>
-  satisfies: Array<Version>
 }

web/projects/ui/src/app/routes/portal/routes/marketplace/components/controls.component.ts

@@ -31,7 +31,7 @@ import { hasCurrentDeps } from 'src/app/utils/has-deps'
 
 import { MarketplaceAlertsService } from '../services/alerts.service'
 
-type KEYS = 'id' | 'version' | 'alerts' | 'flavor' | 'satisfies'
+type KEYS = 'id' | 'version' | 'alerts' | 'flavor'
 
 @Component({
   selector: 'marketplace-controls',
@@ -185,13 +185,9 @@ export class MarketplaceControlsComponent {
   }
 
   private async dryInstall(url: string | null) {
-    const { id, version, satisfies } = this.pkg()
+    const { id, version } = this.pkg()
     const packages = await getAllPackages(this.patch)
-    const breakages = dryUpdate(
+    const breakages = dryUpdate({ id, version }, packages, this.exver)
-      { id, version, satisfies: satisfies || [] },
-      packages,
-      this.exver,
-    )
 
     if (!breakages.length || (await this.alerts.alertBreakages(breakages))) {
       this.installOrUpload(url)

web/projects/ui/src/app/routes/portal/routes/services/modals/action-input.component.ts

@@ -14,6 +14,7 @@ import {
   TuiNotification,
 } from '@taiga-ui/core'
 import { injectContext } from '@taiga-ui/polymorpheus'
+import * as json from 'fast-json-patch'
 import { compare } from 'fast-json-patch'
 import { PatchDB } from 'patch-db-client'
 import { catchError, EMPTY, endWith, firstValueFrom, from, map } from 'rxjs'
@@ -190,7 +191,9 @@ export class ActionInputModal {
               task.actionId === this.actionId &&
               task.when?.condition === 'input-not-matches' &&
               task.input &&
-              conflicts(task.input.value, input),
+              json
+                .compare(input, task.input.value)
+                .some(op => op.op === 'add' || op.op === 'replace'),
           ),
       )
       .map(id => id)
@@ -211,26 +214,3 @@ export class ActionInputModal {
     )
   }
 }
-
-// Mirrors the Rust backend's `conflicts()` function in core/src/service/action.rs.
-// A key in the partial that is missing from the full input is NOT a conflict.
-function conflicts(left: unknown, right: unknown): boolean {
-  if (
-    typeof left === 'object' &&
-    left !== null &&
-    !Array.isArray(left) &&
-    typeof right === 'object' &&
-    right !== null &&
-    !Array.isArray(right)
-  ) {
-    const l = left as Record<string, unknown>
-    const r = right as Record<string, unknown>
-    return Object.keys(l).some(k => (k in r ? conflicts(l[k], r[k]) : false))
-  }
-
-  if (Array.isArray(left) && Array.isArray(right)) {
-    return left.some(v => right.every(vr => conflicts(v, vr)))
-  }
-
-  return left !== right
-}

web/projects/ui/src/app/services/api/api.fixures.ts

@@ -459,7 +459,6 @@ export namespace Mock {
             gitHash: 'fakehash',
             icon: BTC_ICON,
             sourceVersion: null,
-            satisfies: [],
             dependencyMetadata: {},
             donationUrl: null,
             alerts: {
@@ -502,7 +501,6 @@ export namespace Mock {
             gitHash: 'fakehash',
             icon: BTC_ICON,
             sourceVersion: null,
-            satisfies: [],
             dependencyMetadata: {},
             donationUrl: null,
             alerts: {
@@ -555,7 +553,6 @@ export namespace Mock {
             gitHash: 'fakehash',
             icon: BTC_ICON,
             sourceVersion: null,
-            satisfies: [],
             dependencyMetadata: {},
             donationUrl: null,
             alerts: {
@@ -598,7 +595,6 @@ export namespace Mock {
             gitHash: 'fakehash',
             icon: BTC_ICON,
             sourceVersion: null,
-            satisfies: [],
             dependencyMetadata: {},
             donationUrl: null,
             alerts: {
@@ -653,7 +649,6 @@ export namespace Mock {
             gitHash: 'fakehash',
             icon: LND_ICON,
             sourceVersion: null,
-            satisfies: [],
             dependencyMetadata: {
               bitcoind: BitcoinDep,
               'btc-rpc-proxy': ProxyDep,
@@ -709,7 +704,6 @@ export namespace Mock {
             gitHash: 'fakehash',
             icon: LND_ICON,
             sourceVersion: null,
-            satisfies: [],
             dependencyMetadata: {
               bitcoind: BitcoinDep,
               'btc-rpc-proxy': ProxyDep,
@@ -769,7 +763,6 @@ export namespace Mock {
           gitHash: 'fakehash',
           icon: BTC_ICON,
           sourceVersion: null,
-          satisfies: [],
           dependencyMetadata: {},
           donationUrl: null,
           alerts: {
@@ -812,7 +805,6 @@ export namespace Mock {
           gitHash: 'fakehash',
           icon: BTC_ICON,
           sourceVersion: null,
-          satisfies: [],
           dependencyMetadata: {},
           donationUrl: null,
           alerts: {
@@ -865,7 +857,6 @@ export namespace Mock {
           gitHash: 'fakehash',
           icon: LND_ICON,
           sourceVersion: null,
-          satisfies: [],
           dependencyMetadata: {
             bitcoind: BitcoinDep,
             'btc-rpc-proxy': ProxyDep,
@@ -921,7 +912,6 @@ export namespace Mock {
           gitHash: 'fakehash',
           icon: PROXY_ICON,
           sourceVersion: null,
-          satisfies: [],
           dependencyMetadata: {
             bitcoind: BitcoinDep,
           },

web/projects/ui/src/app/utils/dry-update.ts

@@ -3,11 +3,7 @@ import { DataModel } from '../services/patch-db/data-model'
 import { getManifest } from './get-package-data'
 
 export function dryUpdate(
-  {
+  { id, version }: { id: string; version: string },
-    id,
-    version,
-    satisfies,
-  }: { id: string; version: string; satisfies: string[] },
   pkgs: DataModel['packageData'],
   exver: Exver,
 ): string[] {
@@ -17,24 +13,10 @@ export function dryUpdate(
         Object.keys(pkg.currentDependencies || {}).some(
           pkgId => pkgId === id,
         ) &&
-        !versionSatisfies(
+        !exver.satisfies(
           version,
-          satisfies,
           pkg.currentDependencies[id]?.versionRange || '',
-          exver,
         ),
     )
     .map(pkg => getManifest(pkg).title)
 }
-
-function versionSatisfies(
-  version: string,
-  satisfies: string[],
-  range: string,
-  exver: Exver,
-): boolean {
-  return (
-    exver.satisfies(version, range) ||
-    satisfies.some(v => exver.satisfies(v, range))
-  )
-}