@nowcrew/daemon 0.5.46 → 0.5.47

package/dist/daemon-update-controller.js

@@ -4,6 +4,12 @@ const DaemonUpdateMessageSchema = z.object({
     updateId: z.string().uuid(),
     targetVersion: z.string().regex(/^\d+\.\d+\.\d+$/),
 }).strict();
+const DaemonRestartMessageSchema = z.object({
+    type: z.literal("daemon:restart"),
+    updateId: z.string().uuid(),
+    targetVersion: z.string().regex(/^\d+\.\d+\.\d+$/),
+}).strict();
+const DaemonControlMessageSchema = z.union([DaemonUpdateMessageSchema, DaemonRestartMessageSchema]);
 export function createDaemonUpdateController(deps) {
     const handled = new Set();
     let running = null;
@@ -17,16 +23,18 @@ export function createDaemonUpdateController(deps) {
             failed(message.updateId, "ineligible");
             return;
         }
-        const installed = await deps.install({
-            targetVersion: message.targetVersion,
-            packageRoot: eligibility.packageRoot,
-            npmPrefix: eligibility.npmPrefix,
-            onInstalling: () => {
-                deps.sendStatus({ type: "daemon:update-status", updateId: message.updateId, status: "installing" });
-            },
-        });
-        if (!installed.ok) {
-            failed(message.updateId, installed.errorCode);
+        const preparation = message.type === "daemon:restart"
+            ? await deps.prepareRestart()
+            : await deps.install({
+                targetVersion: message.targetVersion,
+                packageRoot: eligibility.packageRoot,
+                npmPrefix: eligibility.npmPrefix,
+                onInstalling: () => {
+                    deps.sendStatus({ type: "daemon:update-status", updateId: message.updateId, status: "installing" });
+                },
+            });
+        if (!preparation.ok) {
+            failed(message.updateId, preparation.errorCode);
             return;
         }
         let released = false;
@@ -34,7 +42,7 @@ export function createDaemonUpdateController(deps) {
             if (released)
                 return;
             released = true;
-            await installed.release();
+            await preparation.release();
         };
         deps.sendStatus({ type: "daemon:update-status", updateId: message.updateId, status: "restarting" });
         try {
@@ -66,7 +74,7 @@ export function createDaemonUpdateController(deps) {
             }
         },
         handle: async (input) => {
-            const parsed = DaemonUpdateMessageSchema.safeParse(input);
+            const parsed = DaemonControlMessageSchema.safeParse(input);
             if (!parsed.success)
                 return false;
             const message = parsed.data;

package/dist/daemon-update-eligibility.js

@@ -10,6 +10,16 @@ import { daemonInstallationLeaseHeld } from "./daemon-installation-lease.js";
 import { inspectLegacyServiceInstallation } from "./legacy-service-installation.js";
 import { inspectWindowsServiceUpdateScope } from "./windows-scheduled-task.js";
 import { assertRegistryCoversDescriptors, listManagedServiceDescriptorPaths, managedServiceIdentityMatches, readManagedServiceRegistry, serviceDescriptorSha256, } from "./managed-service-registry.js";
+export async function managedDaemonCapabilities(eligibility) {
+    try {
+        return (await eligibility()).eligible
+            ? ["daemon_update_v1", "daemon_restart_v1"]
+            : [];
+    }
+    catch {
+        return [];
+    }
+}
 function defaults() {
     return {
         platform: process.platform,

package/dist/daemon-updater.js

@@ -3,6 +3,27 @@ import { resolve } from "node:path";
 import { systemCommandRunner } from "./computer-service.js";
 import { daemonGlobalInstallation } from "./daemon-installation.js";
 const RELEASED_VERSION_RE = /^\d+\.\d+\.\d+$/;
+export async function prepareDaemonRestart(input) {
+    const local = input.localSlots.tryAcquireExclusive();
+    if (local === null)
+        return { ok: false, errorCode: "runtime_busy" };
+    const host = await input.hostCoordinator.tryAcquireExclusiveExecution();
+    if (host === null) {
+        local.release();
+        return { ok: false, errorCode: "runtime_busy" };
+    }
+    let released = false;
+    return {
+        ok: true,
+        release: async () => {
+            if (released)
+                return;
+            released = true;
+            await host.release();
+            local.release();
+        },
+    };
+}
 async function readPackageVersion(packageRoot) {
     const body = JSON.parse(await readFile(resolve(packageRoot, "package.json"), "utf8"));
     return typeof body.version === "string" ? body.version : "";

package/dist/serve.js

@@ -32,9 +32,9 @@ import { createCompletionRetransmitter } from "./completion-retransmitter.js";
 import { createAgentMemoryBridge } from "./agent-memory/bridge.js";
 import { createRuntimeStartupGate } from "./runtime-startup-gate.js";
 import { createHostExecutionCoordinator, hostCoordinatedSlotManager, hostCoordinatedStartupGate, } from "./host-execution-coordinator.js";
-import { detectDaemonUpdateEligibility, } from "./daemon-update-eligibility.js";
+import { detectDaemonUpdateEligibility, managedDaemonCapabilities, } from "./daemon-update-eligibility.js";
 import { createDaemonUpdateController } from "./daemon-update-controller.js";
-import { installExactDaemonUpdate } from "./daemon-updater.js";
+import { installExactDaemonUpdate, prepareDaemonRestart } from "./daemon-updater.js";
 import { scheduleServiceRestart } from "./computer-service.js";
 import { createProjectRegistry } from "./project-skills/registry.js";
 import { createProjectSkillsController, } from "./project-skills/controller.js";
@@ -100,6 +100,10 @@ export function serve(config, opts = {}) {
             localSlots,
             hostCoordinator,
         })),
+        prepareRestart: opts.update?.prepareRestart ?? (() => prepareDaemonRestart({
+            localSlots,
+            hostCoordinator,
+        })),
         scheduleRestart: opts.update?.scheduleRestart ?? scheduleServiceRestart,
         sendStatus: (frame) => {
             try {
@@ -310,14 +314,7 @@ export function serve(config, opts = {}) {
                 ...(detectInstalled ? { detectInstalled } : {}),
                 // First hello must not wait for third-party handshakes; optional transports arrive in the refresh.
                 detectExecutable: async (installed) => conservativeExecutionRuntimes(installed),
-                additionalCapabilities: async () => {
-                    try {
-                        return (await updateEligibility()).eligible ? ["daemon_update_v1"] : [];
-                    }
-                    catch {
-                        return [];
-                    }
-                },
+                additionalCapabilities: () => managedDaemonCapabilities(updateEligibility),
             });
             runtimeFacts = helloPromise
                 .then(async (hello) => {
@@ -390,9 +387,9 @@ export function serve(config, opts = {}) {
             if (typeof decoded !== "object" || decoded === null)
                 return;
             const rawType = "type" in decoded && typeof decoded.type === "string" ? decoded.type : "";
-            if (rawType === "daemon:update") {
+            if (rawType === "daemon:update" || rawType === "daemon:restart") {
                 void updateController.handle(decoded).catch((error) => {
-                    dslog("daemon.update_failed", "daemon 更新处理失败", {
+                    dslog("daemon.control_failed", "daemon 控制操作处理失败", {
                         level: "ERROR", error_message: error.message,
                     });
                 });

package/package.json

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