@nowcrew/daemon 0.5.19 → 0.5.20

package/dist/slog.js

@@ -6,7 +6,7 @@
  *     所以补传的日志仍落在正确时间点,时间线不乱;补传条目带 spooled=true + reported_at 归因。
  *   - 上报失败(server 不可达/断网)→ 落本地 spool(~/.crew/logs/sls-spool/*.jsonl);
  *     下次 WS 重连成功(drainSpool)时补传。「daemon 为什么断开」的现场就靠这批日志还原。
- *   - 进程退出(SIGINT/SIGTERM/exit)→ 残余队列同步落 spool,下次启动补传。
+ *   - 进程退出(exit)→ 残余队列同步落 spool,下次启动补传。异步信号由 main.ts 统一收口。
  *
  * 永不抛错、永不阻塞业务;未 init 时所有调用是 no-op(兼容单测/一次性 run 模式无凭证场景)。
  */
@@ -22,8 +22,10 @@ let cfg = null;
 let defaults = {};
 let queue = [];
 let timer = null;
-let flushing = false;
+let flushPromise = null;
+let inFlightBatch = [];
 let lastErrorAt = 0;
+let exitHookInstalled = false;
 function spoolDir() {
     return process.env.CREW_SLS_SPOOL_DIR ?? join(homedir(), ".crew", "logs", "sls-spool");
 }
@@ -34,12 +36,9 @@ export function initSlog(serverUrl, machineToken) {
     cfg = { serverUrl: serverUrl.replace(/\/+$/, ""), token: machineToken };
     defaults = { host: hostname(), pid: process.pid };
     // 退出兜底:残余队列同步落 spool(exit 回调只能做同步工作,append 正合适)
-    process.once("exit", () => spoolRemainingSync());
-    for (const sig of ["SIGINT", "SIGTERM"]) {
-        process.once(sig, () => {
-            spoolRemainingSync();
-            process.exit(sig === "SIGINT" ? 130 : 143);
-        });
+    if (!exitHookInstalled) {
+        exitHookInstalled = true;
+        process.once("exit", () => spoolRemainingSync());
     }
 }
 /** 追加默认关联字段(如 ready 帧下发的 machine_id),之后每条日志自动带上。 */
@@ -73,20 +72,34 @@ export async function flushSlog() {
         clearTimeout(timer);
         timer = null;
     }
-    if (!cfg || flushing || queue.length === 0)
+    if (!cfg)
         return;
-    flushing = true;
-    const batch = queue;
-    queue = [];
+    if (flushPromise !== null)
+        return flushPromise;
+    const current = (async () => {
+        while (queue.length > 0) {
+            const batch = queue;
+            queue = [];
+            inFlightBatch = batch;
+            try {
+                await post(batch);
+            }
+            catch (e) {
+                appendSpool(batch);
+                warnThrottled(`SLS 日志上报失败,已落本地 spool(${batch.length} 条): ${e.message}`);
+            }
+            finally {
+                inFlightBatch = [];
+            }
+        }
+    })();
+    flushPromise = current;
     try {
-        await post(batch);
-    }
-    catch (e) {
-        appendSpool(batch);
-        warnThrottled(`SLS 日志上报失败,已落本地 spool(${batch.length} 条): ${e.message}`);
+        await current;
     }
     finally {
-        flushing = false;
+        if (flushPromise === current)
+            flushPromise = null;
     }
 }
 /**
@@ -190,9 +203,10 @@ function rotateSpool(dir) {
     catch { /* 忽略 */ }
 }
 function spoolRemainingSync() {
-    if (queue.length === 0)
+    if (inFlightBatch.length === 0 && queue.length === 0)
         return;
-    const batch = queue;
+    const batch = [...inFlightBatch, ...queue];
+    inFlightBatch = [];
     queue = [];
     appendSpool(batch);
 }

package/dist/supervised-runtime.js

@@ -0,0 +1,104 @@
+import { fileURLToPath } from "node:url";
+import { startDormantSupervisor, } from "./execution-supervisor.js";
+import { buildClaudeArgs } from "./runtimes/claude.js";
+import { RuntimeCancelledError } from "./runtime-cancellation.js";
+export function supervisorLaunch(request) {
+    const common = {
+        wakePrompt: request.wakePrompt,
+        dangerous: request.effectivePermission === "full_access",
+        effectivePermission: request.effectivePermission,
+        ...(request.model === undefined ? {} : { model: request.model }),
+        ...(request.reasoning === undefined ? {} : { reasoning: request.reasoning }),
+    };
+    if (request.runtime === "claude") {
+        return {
+            command: request.bin,
+            args: buildClaudeArgs({
+                ...common,
+                bin: request.bin,
+                cwd: request.cwd,
+                env: request.env,
+                systemPromptPath: request.systemPromptPath,
+                ...(request.sessionId === undefined ? {} : {
+                    sessionId: request.sessionId,
+                    resume: request.resume,
+                }),
+            }),
+            cwd: request.cwd,
+            env: request.env,
+        };
+    }
+    if (request.runtime === "codex") {
+        return {
+            command: process.execPath,
+            args: [
+                fileURLToPath(new URL("./runtimes/codex-app-server-runner.js", import.meta.url)),
+                "--bin", request.bin,
+            ],
+            cwd: request.cwd,
+            env: request.env,
+            stdinText: JSON.stringify({
+                systemPrompt: request.systemPrompt,
+                wakePrompt: request.wakePrompt,
+                effectivePermission: request.effectivePermission,
+                ...(request.model === undefined ? {} : { model: request.model }),
+                ...(request.reasoning === undefined ? {} : { reasoning: request.reasoning }),
+                ...(request.sessionId === undefined ? {} : { sessionId: request.sessionId }),
+                ...(request.imagePaths === undefined ? {} : { imagePaths: request.imagePaths }),
+                resume: request.resume,
+            }),
+        };
+    }
+    if (request.effectivePermission !== "full_access") {
+        throw new Error(`Kimi ACP cannot enforce ${request.effectivePermission} permission`);
+    }
+    return {
+        command: process.execPath,
+        args: [
+            fileURLToPath(new URL("./runtimes/kimi-acp-runner.js", import.meta.url)),
+            "--bin", request.bin,
+            ...(request.model === undefined ? [] : ["--model", request.model]),
+            ...(request.sessionId === undefined ? [] : ["--session", request.sessionId]),
+            ...(request.resume ? ["--resume"] : []),
+        ],
+        cwd: request.cwd,
+        env: request.env,
+        stdinText: `${request.systemPrompt}\n\n${request.wakePrompt}`,
+    };
+}
+export async function launchSupervisedRuntime(request, startSupervisor = startDormantSupervisor, cancellation, platform) {
+    if (cancellation?.isRequested())
+        throw new RuntimeCancelledError();
+    const supervisor = await startSupervisor(supervisorLaunch(request), {
+        ownershipMode: "process-lifetime",
+        ...(platform === undefined ? {} : { platform }),
+    });
+    let stopPromise = null;
+    const cancelOnce = () => {
+        stopPromise ??= Promise.resolve().then(supervisor.cancel);
+        return stopPromise;
+    };
+    cancellation?.register(cancelOnce);
+    if (cancellation?.isRequested()) {
+        await cancellation.waitForStop();
+        throw new RuntimeCancelledError();
+    }
+    const release = supervisor.release();
+    if (cancellation === undefined) {
+        await release;
+    }
+    else {
+        await Promise.race([
+            release,
+            cancellation.requested.then(async () => {
+                await cancellation.waitForStop();
+                throw new RuntimeCancelledError();
+            }),
+        ]);
+    }
+    if (cancellation?.isRequested()) {
+        await cancellation.waitForStop();
+        throw new RuntimeCancelledError();
+    }
+    return { ...supervisor, cancel: cancelOnce };
+}

package/dist/websocket-shutdown.js

@@ -0,0 +1,53 @@
+import { WebSocket } from "ws";
+export function closeWebSocketWithinDeadline(socket, signal) {
+    if (socket === null || socket.readyState === WebSocket.CLOSED)
+        return Promise.resolve();
+    return new Promise((resolve, reject) => {
+        let settled = false;
+        const cleanup = () => {
+            socket.removeListener("close", onClose);
+            socket.removeListener("error", onError);
+            signal.removeEventListener("abort", onAbort);
+        };
+        const settle = (outcome) => {
+            if (settled)
+                return;
+            settled = true;
+            cleanup();
+            outcome();
+        };
+        const onClose = () => settle(resolve);
+        const onError = () => {
+            if (socket.readyState === WebSocket.CLOSED)
+                onClose();
+        };
+        const onAbort = () => {
+            settle(() => {
+                if (socket.readyState !== WebSocket.CLOSED) {
+                    try {
+                        socket.terminate();
+                    }
+                    catch { /* deadline error remains authoritative */ }
+                }
+                reject(signal.reason);
+            });
+        };
+        socket.on("close", onClose);
+        socket.on("error", onError);
+        signal.addEventListener("abort", onAbort, { once: true });
+        if (signal.aborted) {
+            onAbort();
+        }
+        else if (socket.readyState === WebSocket.CLOSED) {
+            onClose();
+        }
+        else if (socket.readyState !== WebSocket.CLOSING) {
+            try {
+                socket.close();
+            }
+            catch (error) {
+                settle(() => reject(error));
+            }
+        }
+    });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nowcrew/daemon",
-  "version": "0.5.19",
+  "version": "0.5.20",
   "type": "module",
   "description": "crew daemon — 运行在用户机器:拉起/管理 agent 进程,注入 crew CLI,归一化 runtime 事件",
   "license": "Apache-2.0",
@@ -21,7 +21,7 @@
     "cross-spawn": "^7.0.6",
     "ws": "^8",
     "zod": "^3.23.0",
-    "@nowcrew/cli": "^0.4.11"
+    "@nowcrew/cli": "^0.4.6"
   },
   "devDependencies": {
     "@types/cross-spawn": "^6.0.6",