@nowcrew/daemon 0.5.38 → 0.5.40

package/README.md

@@ -95,23 +95,18 @@ crew-daemon doctor --profile work
 crew-daemon status --profile work
 ```
 
-For a non-default daemon home, the bootstrap release changes the native service ID to include the
-daemon-home fingerprint. Run the first command with the currently installed daemon: it upgrades and
-restarts the exact legacy service ID. Then use the upgraded CLI to migrate that profile instead of adopting
-the old ID:
+For a non-default daemon home, the daemon now recognizes the pre-registry service ID when its descriptor
+exactly matches the running profile's node path, package entry, profile name, and `--daemon-home`. No
+uninstall/reinstall migration is required. The first self-update uses that exact legacy service ID for the
+restart; future service lifecycle commands can continue to migrate it explicitly if desired:
 
 ```bash
-CREW_DAEMON_HOME="$HOME/.crew/daemon-dev" crew-daemon upgrade --profile work
-CREW_DAEMON_HOME="$HOME/.crew/daemon-dev" crew-daemon uninstall --profile work
-CREW_DAEMON_HOME="$HOME/.crew/daemon-dev" crew-daemon install --profile work
-CREW_DAEMON_HOME="$HOME/.crew/daemon-dev" crew-daemon start --profile work
-CREW_DAEMON_HOME="$HOME/.crew/daemon-dev" crew-daemon doctor --profile work
-CREW_DAEMON_HOME="$HOME/.crew/daemon-dev" crew-daemon status --profile work
+CREW_DAEMON_HOME="$HOME/.crew/daemon-dev" crew-daemon doctor --profile dev
+CREW_DAEMON_HOME="$HOME/.crew/daemon-dev" crew-daemon status --profile dev
 ```
 
-If migration is interrupted after `uninstall`, resume at `install` and `start`. If it is interrupted before
-`uninstall` completes, verify the exact legacy service with `status`, then repeat `uninstall`; identity checks
-prevent either path from removing a drifted descriptor.
+If the descriptor has drifted, the profile is stopped, or another host descriptor is not registered, the
+daemon fails closed and remains manually upgradeable.
 
 The daemon advertises `daemon_update_v1` only when all of these conditions hold:
 
@@ -120,7 +115,7 @@ The daemon advertises `daemon_update_v1` only when all of these conditions hold:
 | Platform | macOS LaunchAgent or Linux systemd user service |
 | Entrypoint | global `@nowcrew/daemon/dist/main.js`, not npx or source/tsx |
 | Startup | `crew-daemon serve --profile <name>` through the installed service |
-| Registry | every NowCrew descriptor on the OS user account is registered and conflict-free |
+| Registry | every other NowCrew descriptor on the OS user account is registered and conflict-free; the exact target legacy descriptor may be adopted once |
 | Identity | service ID, descriptor, daemon home, Agent root, entrypoint, package root, and npm prefix match |
 | Service | the selected profile is running and holds the installation lease |
 | Install root | a standard writable Unix global npm prefix can be derived from the running entrypoint |

package/dist/daemon-update-eligibility.js

@@ -53,9 +53,8 @@ export async function detectDaemonUpdateEligibility(profileName, overrides = {})
         entryPath: deps.entryPath,
         profileHome: deps.profileHome,
     });
-    const status = await deps.serviceStatus(spec);
-    if (!status.running)
-        return { eligible: false, reason: "service_not_running" };
+    let selectedSpec = spec;
+    let status = await deps.serviceStatus(spec);
     let services;
     try {
         services = await deps.readManagedServices();
@@ -65,34 +64,66 @@ export async function detectDaemonUpdateEligibility(profileName, overrides = {})
     }
     const registered = services.find((record) => record.serviceId === spec.id
         || (record.daemonHome === deps.profileHome && record.profile === profileName));
-    if (registered === undefined) {
-        return { eligible: false, reason: "managed_service_not_registered" };
-    }
-    try {
-        assertRegistryCoversDescriptors(services, await deps.listManagedDescriptorPaths());
-    }
-    catch {
-        return { eligible: false, reason: "managed_service_registry_incomplete" };
+    if (registered !== undefined) {
+        try {
+            assertRegistryCoversDescriptors(services, await deps.listManagedDescriptorPaths());
+        }
+        catch {
+            return { eligible: false, reason: "managed_service_registry_incomplete" };
+        }
+        const descriptor = await deps.readServiceDescriptor(spec).catch(() => null);
+        if (descriptor === null || spec.descriptorPath === null || spec.descriptor === null
+            || !managedServiceIdentityMatches(registered, {
+                version: 1,
+                platform: deps.platform,
+                serviceId: spec.id,
+                profile: profileName,
+                daemonHome: deps.profileHome,
+                agentsRoot: resolveAgentsRoot(profile.agentsRoot, deps.userHome, deps.platform),
+                nodePath: deps.nodePath,
+                entryPath: deps.entryPath,
+                packageRoot: installation.packageRoot,
+                npmPrefix: installation.npmPrefix,
+                descriptorPath: spec.descriptorPath,
+                descriptorSha256: serviceDescriptorSha256(descriptor),
+            })
+            || descriptor !== spec.descriptor) {
+            return { eligible: false, reason: "managed_service_identity_mismatch" };
+        }
     }
-    const descriptor = await deps.readServiceDescriptor(spec).catch(() => null);
-    if (descriptor === null || spec.descriptorPath === null || spec.descriptor === null
-        || !managedServiceIdentityMatches(registered, {
-            version: 1,
+    else {
+        // Releases before the managed-service registry used the unsuffixed service id.
+        // Adopt only an exact descriptor for this profile; never infer ownership from a
+        // running process or accept a descriptor with a different entry/home.
+        const legacySpec = buildServiceSpec({
             platform: deps.platform,
-            serviceId: spec.id,
             profile: profileName,
-            daemonHome: deps.profileHome,
-            agentsRoot: resolveAgentsRoot(profile.agentsRoot, deps.userHome, deps.platform),
+            userHome: deps.userHome,
+            uid: deps.uid,
             nodePath: deps.nodePath,
             entryPath: deps.entryPath,
-            packageRoot: installation.packageRoot,
-            npmPrefix: installation.npmPrefix,
-            descriptorPath: spec.descriptorPath,
-            descriptorSha256: serviceDescriptorSha256(descriptor),
-        })
-        || descriptor !== spec.descriptor) {
-        return { eligible: false, reason: "managed_service_identity_mismatch" };
+            profileHome: deps.profileHome,
+            legacyServiceId: true,
+        });
+        const legacyDescriptor = await deps.readServiceDescriptor(legacySpec).catch(() => null);
+        if (legacyDescriptor !== legacySpec.descriptor) {
+            return { eligible: false, reason: "managed_service_not_registered" };
+        }
+        try {
+            const descriptorPaths = await deps.listManagedDescriptorPaths();
+            const targetPath = legacySpec.descriptorPath;
+            assertRegistryCoversDescriptors(services, descriptorPaths.filter((descriptorPath) => descriptorPath !== targetPath));
+        }
+        catch {
+            return { eligible: false, reason: "managed_service_registry_incomplete" };
+        }
+        status = await deps.serviceStatus(legacySpec);
+        if (!status.running)
+            return { eligible: false, reason: "service_not_running" };
+        selectedSpec = legacySpec;
     }
+    if (!status.running)
+        return { eligible: false, reason: "service_not_running" };
     if (!deps.installationLeaseHeld(installation.npmPrefix)) {
         return { eligible: false, reason: "installation_lease_missing" };
     }
@@ -106,6 +137,6 @@ export async function detectDaemonUpdateEligibility(profileName, overrides = {})
         eligible: true,
         profileName,
         ...installation,
-        serviceSpec: spec,
+        serviceSpec: selectedSpec,
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nowcrew/daemon",
-  "version": "0.5.38",
+  "version": "0.5.40",
   "type": "module",
   "description": "crew daemon — 运行在用户机器:拉起/管理 agent 进程,注入 crew CLI,归一化 runtime 事件",
   "license": "Apache-2.0",