@nowcrew/daemon 0.5.18 → 0.5.20

package/dist/serve.js

@@ -22,6 +22,11 @@ import { createExecutionTelemetryJournal } from "./execution-telemetry-journal.j
 import { ExecutionRejectedSchema, ExecutionSnapshotSchema, LegacyAgentStartSchema, ServerToDaemonExecutionFrameSchema, } from "./execution-protocol.js";
 import { hashExecutionSpec, runExecution, } from "./execution-runner.js";
 import { executionBackendCapability } from "./execution-backend.js";
+import { awaitWithCancellation, createRuntimeCancellation, RuntimeCancelledError, } from "./runtime-cancellation.js";
+import { createShutdownDeadline, readTestShutdownConfiguration } from "./shutdown-deadline.js";
+import { closeWebSocketWithinDeadline } from "./websocket-shutdown.js";
+import { reconcileExecutionJournal } from "./execution-recovery.js";
+import { createSharedSlotManager } from "./shared-execution-slots.js";
 // normalize.ts 的活动种类 → activity 枚举
 const ACTIVITY_MAP = {
     init: "working", text: "thinking", reading: "reading", sending: "sending",
@@ -44,24 +49,23 @@ export function serve(config, opts = {}) {
     let ws = null;
     let backoff = 1000;
     const maxBackoff = opts.maxBackoffMs ?? 30_000;
+    const testShutdown = readTestShutdownConfiguration(process.env);
+    const shutdownTimeoutMs = opts.shutdownTimeoutMs ?? testShutdown.timeoutMs ?? 30_000;
+    const createWebSocket = opts.createWebSocket ?? ((url) => new WebSocket(url));
+    let reconnectTimer = null;
+    let stopPromise = null;
     const executionJournal = opts.execution?.journal ?? createExecutionJournal(config.agentsRoot);
     const executionTelemetry = createExecutionTelemetryJournal(config.agentsRoot);
     const executeProtocol = opts.execution?.runExecution ?? runExecution;
     let detectedExecutionRuntimes = [];
     let runtimeFacts = null;
-    const executionReady = executionJournal.reconcileAfterRestart().then(() => true, (error) => {
-        dslog("execution.recovery_failed", "execution journal 恢复失败", {
-            level: "ERROR", error_message: error.message,
-        });
-        return false;
-    });
-    const sharedActive = new Map();
-    const sharedQueues = new Map();
+    const sharedSlots = createSharedSlotManager(config.executionLimits);
     const knownExecutionHashes = new Map();
     const executionReservations = new Map();
     const executionRuns = new Map();
     let executionFrameQueue = Promise.resolve();
     const cancellations = new Map();
+    const legacyRuns = new Map();
     const safeExecutionSend = (frame) => {
         try {
             if (ws?.readyState === WebSocket.OPEN)
@@ -124,134 +128,33 @@ export function serve(config, opts = {}) {
         }
     };
     const cancellationFor = (executionId) => {
-        const startStop = (state) => {
-            if (!state.requested || state.cancel === null)
-                return Promise.resolve();
-            state.stopPromise ??= Promise.resolve().then(state.cancel);
-            return state.stopPromise;
-        };
         const existing = cancellations.get(executionId);
-        if (existing !== undefined) {
-            return {
-                isRequested: () => existing.requested,
-                requested: existing.promise,
-                register: (cancel) => {
-                    existing.cancel = cancel;
-                    void startStop(existing).catch(() => { });
-                },
-                waitForStop: () => startStop(existing),
-            };
-        }
-        let resolve;
-        const promise = new Promise((done) => { resolve = done; });
-        const state = {
-            requested: false, resolve, promise,
-            cancel: null,
-            stopPromise: null,
-        };
-        cancellations.set(executionId, state);
-        return {
-            isRequested: () => state.requested,
-            requested: promise,
-            register: (cancel) => {
-                state.cancel = cancel;
-                void startStop(state).catch(() => { });
-            },
-            waitForStop: () => startStop(state),
-        };
+        if (existing !== undefined)
+            return existing.cancellation;
+        const controller = createRuntimeCancellation();
+        cancellations.set(executionId, controller);
+        return controller.cancellation;
     };
     const requestCancellation = (executionId) => {
         cancellationFor(executionId);
-        const state = cancellations.get(executionId);
-        if (state.requested)
-            return;
-        state.requested = true;
-        state.resolve();
+        cancellations.get(executionId).request();
         const reservation = executionReservations.get(executionId);
-        if (reservation?.isQueued()) {
+        if (reservation?.isQueued())
             reservation.release();
-        }
-        if (state.cancel !== null && state.stopPromise === null) {
-            state.stopPromise = Promise.resolve().then(state.cancel);
-            void state.stopPromise.catch(() => { });
-        }
-    };
-    const promoteNext = (handle) => {
-        const queue = sharedQueues.get(handle) ?? [];
-        while ((sharedActive.get(handle) ?? 0) < config.executionLimits.maxParallelPerAgent && queue.length > 0) {
-            const next = queue.shift();
-            if (next.released)
-                continue;
-            next.promoted = true;
-            sharedActive.set(handle, (sharedActive.get(handle) ?? 0) + 1);
-            next.resolve();
-        }
-        if (queue.length === 0)
-            sharedQueues.delete(handle);
-    };
-    const reserveSharedSlot = (handle, kind) => {
-        const active = sharedActive.get(handle) ?? 0;
-        const queued = sharedQueues.get(handle)?.length ?? 0;
-        const facts = { activeForAgent: active, queuedForAgent: queued };
-        if (kind === "execution" && active >= config.executionLimits.maxParallelPerAgent
-            && queued >= config.executionLimits.maxQueuedPerAgent) {
-            return { facts, ready: Promise.resolve(), isQueued: () => false, release: () => { } };
-        }
-        let resolve;
-        const ready = new Promise((done) => { resolve = done; });
-        const entry = { kind, released: false, promoted: active < config.executionLimits.maxParallelPerAgent, resolve };
-        if (entry.promoted) {
-            sharedActive.set(handle, active + 1);
-            resolve();
-        }
-        else {
-            const queue = sharedQueues.get(handle) ?? [];
-            queue.push(entry);
-            sharedQueues.set(handle, queue);
-        }
-        return {
-            facts,
-            state: entry.promoted ? "ready" : "queued",
-            ready,
-            isQueued: () => !entry.promoted && !entry.released,
-            release: () => {
-                if (entry.released)
-                    return;
-                entry.released = true;
-                if (entry.promoted) {
-                    sharedActive.set(handle, Math.max(0, (sharedActive.get(handle) ?? 1) - 1));
-                }
-                else {
-                    const queue = sharedQueues.get(handle);
-                    const index = queue?.indexOf(entry) ?? -1;
-                    if (queue !== undefined && index >= 0)
-                        queue.splice(index, 1);
-                    if (queue?.length === 0)
-                        sharedQueues.delete(handle);
-                }
-                promoteNext(handle);
-            },
-        };
     };
     let connectedAt = 0; // 本次 WS 连接建立时刻(断开日志算在线时长用)
     initSlog(config.serverUrl, config.machineToken);
     dslog("daemon.start", "daemon 常驻模式启动", { server_url: config.serverUrl, runtime: config.runtimeBin });
     // 并行调度:同一 agent 可并行处理多个【不同任务】(线程/频道),每任务隔离 cwd+work-log。
-    // - running:正在跑的「agent:任务」去重键(同一任务重复唤醒才跳过)。
-    // - agentSlots:每 agent 当前并行数;超过配置上限的进 FIFO 队列(不丢)。
+    // scheduled 重复 run 仍由 running 去重;普通同线程 wake 用 legacyTaskTails 串成 FIFO。
+    // 每 agent 超过并行上限的任务继续进入 sharedQueues(不丢)。
     const running = new Set();
-    const acquireSlot = async (handle) => {
-        await reserveSharedSlot(handle, "legacy").ready;
-    };
-    const releaseSlot = (handle) => {
-        sharedActive.set(handle, Math.max(0, (sharedActive.get(handle) ?? 1) - 1));
-        promoteNext(handle);
-    };
+    const legacyTaskTails = new Map();
     const log = (s) => process.stdout.write(formatDaemonLogLine(s) + "\n");
     function connect() {
         if (stopped)
             return;
-        ws = new WebSocket(wsUrl);
+        ws = createWebSocket(wsUrl);
         ws.on("open", () => {
             backoff = 1000;
             connectedAt = Date.now();
@@ -278,7 +181,7 @@ export function serve(config, opts = {}) {
             })
                 .catch(() => { });
             opts.onOpen?.(ws);
-            void executionReady.then((ready) => ready ? sendSnapshot(`reconnect-${randomUUID()}`) : undefined);
+            void sendSnapshot(`reconnect-${randomUUID()}`);
             void replayExecutionTelemetry().catch((error) => {
                 dslog("execution.telemetry_replay_failed", "execution telemetry 重放失败", {
                     level: "ERROR", error_message: error.message,
@@ -286,6 +189,8 @@ export function serve(config, opts = {}) {
             });
         });
         ws.on("message", async (data) => {
+            if (stopped)
+                return;
             let decoded;
             try {
                 decoded = JSON.parse(data.toString());
@@ -315,7 +220,8 @@ export function serve(config, opts = {}) {
                 }
                 const frame = parsedExecution.data;
                 executionFrameQueue = executionFrameQueue.then(async () => {
-                    const recovered = await executionReady;
+                    if (stopped)
+                        return;
                     if (frame.type === "execution:completion-ack") {
                         await executionJournal.acknowledgeCompletion(frame.executionId).catch(() => { });
                         return;
@@ -342,14 +248,6 @@ export function serve(config, opts = {}) {
                         return;
                     }
                     const spec = frame;
-                    if (!recovered) {
-                        safeExecutionSend(ExecutionRejectedSchema.parse({
-                            type: "execution:rejected", protocolVersion: 1, executionId: spec.executionId,
-                            reason: "resource_limit", message: "Local execution journal recovery failed",
-                            at: new Date().toISOString(),
-                        }));
-                        return;
-                    }
                     const hash = hashExecutionSpec(spec);
                     const knownHash = knownExecutionHashes.get(spec.executionId);
                     if (knownHash !== undefined) {
@@ -369,6 +267,8 @@ export function serve(config, opts = {}) {
                         return;
                     }
                     const durableExisting = await executionJournal.get(spec.executionId);
+                    if (stopped)
+                        return;
                     if (durableExisting !== null) {
                         if (durableExisting.specHash !== hash) {
                             safeExecutionSend(ExecutionRejectedSchema.parse({
@@ -383,19 +283,22 @@ export function serve(config, opts = {}) {
                         return;
                     }
                     knownExecutionHashes.set(spec.executionId, hash);
-                    const reservation = reserveSharedSlot(spec.agent.handle, "execution");
+                    const reservation = sharedSlots.reserve(spec.agent.handle, "execution");
                     executionReservations.set(spec.executionId, reservation);
                     const cancellation = cancellationFor(spec.executionId);
+                    const cleanupExecutionReservation = () => {
+                        reservation.release();
+                        cancellations.delete(spec.executionId);
+                        executionReservations.delete(spec.executionId);
+                        knownExecutionHashes.delete(spec.executionId);
+                    };
                     let availableRuntimes;
                     try {
                         availableRuntimes = opts.execution?.availableRuntimes?.()
                             ?? await (runtimeFacts ?? Promise.resolve(detectedExecutionRuntimes));
                     }
                     catch (error) {
-                        reservation.release();
-                        cancellations.delete(spec.executionId);
-                        executionReservations.delete(spec.executionId);
-                        knownExecutionHashes.delete(spec.executionId);
+                        cleanupExecutionReservation();
                         safeExecutionSend(ExecutionRejectedSchema.parse({
                             type: "execution:rejected", protocolVersion: 1, executionId: spec.executionId,
                             reason: "resource_limit", message: `Runtime detection failed: ${error.message}`,
@@ -403,6 +306,10 @@ export function serve(config, opts = {}) {
                         }));
                         return;
                     }
+                    if (stopped) {
+                        cleanupExecutionReservation();
+                        return;
+                    }
                     const execution = executeProtocol(config, spec, {
                         ...opts.execution?.dependencies,
                         journal: executionJournal,
@@ -416,11 +323,8 @@ export function serve(config, opts = {}) {
                         }),
                         cancellation,
                     }).finally(() => {
-                        reservation.release();
-                        cancellations.delete(spec.executionId);
-                        executionReservations.delete(spec.executionId);
+                        cleanupExecutionReservation();
                         executionRuns.delete(spec.executionId);
-                        knownExecutionHashes.delete(spec.executionId);
                     });
                     executionRuns.set(spec.executionId, execution);
                     void execution.catch(() => { });
@@ -436,8 +340,23 @@ export function serve(config, opts = {}) {
                 && "type" in decoded && decoded.type === "agent:start"
                 ? LegacyAgentStartSchema.safeParse(decoded)
                 : null;
-            if (legacy !== null && !legacy.success)
+            if (legacy !== null && !legacy.success) {
+                // 帧结构不合法(如 server 端已升级到 execution v1 但本 daemon 仍按 legacy 校验)。
+                // 曾经静默 return——只表现为"@了 agent 没反应",且完全没有排查线索。记录字段路径和
+                // zod 错误码,不记录消息正文/附件等可能敏感的字段值。
+                const raw = decoded;
+                dslog("run.legacy_frame_rejected", "agent:start 帧未通过 legacy schema 校验,已丢弃", {
+                    level: "WARN",
+                    agent_handle: typeof raw.agentHandle === "string" ? raw.agentHandle : undefined,
+                    channel_id: typeof raw.channelId === "string" ? raw.channelId : undefined,
+                    reason: typeof raw.reason === "string" ? raw.reason : undefined,
+                    issue_count: legacy.error.issues.length,
+                    issue_paths: legacy.error.issues
+                        .map((issue) => `${issue.path.join(".")}:${issue.code}`)
+                        .join(","),
+                });
                 return;
+            }
             const msg = (legacy?.success ? legacy.data : decoded);
             // 控制面鉴权拒绝:server 端 resolveToken 未命中有效的 machine 凭证(失效/被吊销/
             // 库已重置)。不能静默丢弃这帧——否则只表现为神秘的「每 1s 重连」循环。打印可执行
@@ -534,69 +453,94 @@ export function serve(config, opts = {}) {
                 wake_origin: msg.wake?.origin ?? null,
                 content_preview: (msg.wake?.content ?? "").replace(/\s+/g, " ").slice(0, 120),
             });
-            if (running.has(key)) {
+            if (scheduled && running.has(key)) {
                 log(`↩︎ 跳过(该任务已在运行): ${key}`);
                 dslog("run.dedupe_skip", "跳过唤醒:该任务已在运行", { level: "WARN", ...runKeys });
                 return;
             }
-            running.add(key);
-            // 并行槽:同 agent 超过配置上限的任务在此排队(不丢),有空位再跑。
-            const slotWaitStart = Date.now();
-            await acquireSlot(msg.agentHandle);
-            const queueMs = Date.now() - slotWaitStart;
-            const threadLabel = threadId ?? null;
-            const from = msg.wake?.senderHandle ?? "?";
-            const incoming = msg.wake?.content ?? "";
-            dslog("run.start", `开始运行 ${msg.agentHandle}`, { ...runKeys, queue_ms: queueMs });
+            const queueWaitStart = Date.now();
             const runStartedAt = Date.now();
-            log(`\n${"─".repeat(56)}`);
-            log(`🔔 唤醒 agent=${msg.agentHandle}  reason=${msg.reason ?? "?"}`);
-            log(`   channel = ${msg.channelId}`);
-            log(`   thread  = ${threadLabel ? `${threadLabel} (要求线程内回复)` : "(无,顶层回复)"}`);
-            if (incoming)
-                log(`📥 来信 @${from}: ${incoming.replace(/\s+/g, " ").slice(0, 200)}`);
-            let actSeq = 0;
-            const reportActivity = (a) => {
-                const det = a.detail ? a.detail.replace(/\s+/g, " ").trim() : "";
-                // 发消息时尽量打印回复正文/目标(--content "..." 或 heredoc 首行)
-                let line = `  · ${a.label}`;
-                if (a.kind === "sending") {
-                    const m = det.match(/--content\s+"([^"]*)"/) || det.match(/<<'?\w+'?\s*(.*)/);
-                    line = `  💬 回复${threadLabel ? `(thread ${threadLabel})` : ""}: ${m ? m[1].slice(0, 160) : det.slice(0, 120)}`;
-                }
-                else if (det) {
-                    line += ` ${det.slice(0, 80)}`;
-                }
-                log(line);
-                try {
-                    ws?.send(JSON.stringify({
-                        type: "agent:activity",
-                        agentHandle: msg.agentHandle,
-                        channelId: msg.channelId,
-                        activity: ACTIVITY_MAP[a.kind] ?? "working",
-                        detail: a.detail || a.label,
-                        seq: actSeq++,
-                    }));
-                }
-                catch { /* ws 非 OPEN,忽略 */ }
-            };
-            // 终端透传:把底层 claude 的每条 console 行按线程上送给 server(独立 seq,落库+广播给 web 终端窗口)。
-            let conSeq = 0;
-            const reportConsole = (c) => {
-                try {
-                    ws?.send(JSON.stringify({
-                        type: "agent:console",
-                        agentHandle: msg.agentHandle,
-                        channelId: msg.channelId,
-                        threadId: threadId ?? null,
-                        stream: c.stream,
-                        text: c.text,
-                        seq: conSeq++,
-                    }));
-                }
-                catch { /* ws 非 OPEN,忽略 */ }
-            };
+            const controller = createRuntimeCancellation();
+            let finishLegacyRun;
+            let failLegacyRun;
+            const legacyDone = new Promise((resolveDone, rejectDone) => {
+                finishLegacyRun = resolveDone;
+                failLegacyRun = rejectDone;
+            });
+            void legacyDone.catch(() => undefined);
+            legacyRuns.set(runId, { controller, done: legacyDone });
+            let legacyStopError;
+            let legacyReservation = null;
+            let legacyQueueDone = null;
+            let finishLegacyQueue = () => { };
             try {
+                if (!scheduled) {
+                    const previous = legacyTaskTails.get(key);
+                    legacyQueueDone = new Promise((resolve) => { finishLegacyQueue = resolve; });
+                    legacyTaskTails.set(key, legacyQueueDone);
+                    if (previous) {
+                        log(`⏳ 排队(该任务已在运行): ${key}`);
+                        dslog("run.wake_queued", "唤醒已排队:该任务正在运行", { ...runKeys });
+                        await awaitWithCancellation(previous, controller.cancellation);
+                    }
+                }
+                running.add(key);
+                legacyReservation = sharedSlots.reserve(msg.agentHandle, "legacy");
+                await awaitWithCancellation(legacyReservation.ready, controller.cancellation);
+                const queueMs = Date.now() - queueWaitStart;
+                const threadLabel = threadId ?? null;
+                const from = msg.wake?.senderHandle ?? "?";
+                const incoming = msg.wake?.content ?? "";
+                dslog("run.start", `开始运行 ${msg.agentHandle}`, { ...runKeys, queue_ms: queueMs });
+                log(`\n${"─".repeat(56)}`);
+                log(`🔔 唤醒 agent=${msg.agentHandle}  reason=${msg.reason ?? "?"}`);
+                log(`   channel = ${msg.channelId}`);
+                log(`   thread  = ${threadLabel ? `${threadLabel} (要求线程内回复)` : "(无,顶层回复)"}`);
+                if (incoming)
+                    log(`📥 来信 @${from}: ${incoming.replace(/\s+/g, " ").slice(0, 200)}`);
+                let actSeq = 0;
+                const reportActivity = (a) => {
+                    const det = a.detail ? a.detail.replace(/\s+/g, " ").trim() : "";
+                    // 发消息时尽量打印回复正文/目标(--content "..." 或 heredoc 首行)
+                    let line = `  · ${a.label}`;
+                    if (a.kind === "sending") {
+                        const m = det.match(/--content\s+"([^"]*)"/) || det.match(/<<'?\w+'?\s*(.*)/);
+                        line = `  💬 回复${threadLabel ? `(thread ${threadLabel})` : ""}: ${m ? m[1].slice(0, 160) : det.slice(0, 120)}`;
+                    }
+                    else if (det) {
+                        line += ` ${det.slice(0, 80)}`;
+                    }
+                    log(line);
+                    try {
+                        ws?.send(JSON.stringify({
+                            type: "agent:activity",
+                            agentHandle: msg.agentHandle,
+                            channelId: msg.channelId,
+                            activity: ACTIVITY_MAP[a.kind] ?? "working",
+                            detail: a.detail || a.label,
+                            seq: actSeq++,
+                        }));
+                    }
+                    catch { /* ws 非 OPEN,忽略 */ }
+                };
+                // 终端透传:把底层 claude 的每条 console 行按线程上送给 server(独立 seq,落库+广播给 web 终端窗口)。
+                let conSeq = 0;
+                const reportConsole = (c) => {
+                    try {
+                        ws?.send(JSON.stringify({
+                            type: "agent:console",
+                            agentHandle: msg.agentHandle,
+                            channelId: msg.channelId,
+                            threadId: threadId ?? null,
+                            stream: c.stream,
+                            text: c.text,
+                            // 结构化负载(diff/命令/todo…):前端富渲染用;缺省 = 纯文本行
+                            ...(c.payload !== undefined ? { payload: c.payload } : {}),
+                            seq: conSeq++,
+                        }));
+                    }
+                    catch { /* ws 非 OPEN,忽略 */ }
+                };
                 // 线程聚合:触发消息即任务线程根,你的确认+后续所有回复都要发到它的线程里,
                 // 不要发顶层——这样 task 讨论全部聚合在该 thread 下。
                 const threadHint = threadId
@@ -653,7 +597,7 @@ export function serve(config, opts = {}) {
                         ...(!scheduled && threadId ? { wakeMessageId: threadId } : {}),
                         ...(!scheduled && msg.wake?.seq !== undefined ? { wakeContextUpToSeq: msg.wake.seq } : {}),
                         ...(attemptWake ? { wake: attemptWake } : {}),
-                    }, reportActivity, reportConsole);
+                    }, reportActivity, reportConsole, { cancellation: controller.cancellation });
                 });
                 const result = mergeRunAgentResults(guarded.results);
                 // 本轮 token 用量上报:runner 已从 result 事件提取(含缓存读/写细分),
@@ -734,6 +678,9 @@ export function serve(config, opts = {}) {
                 }
             }
             catch (e) {
+                if (controller.cancellation.isRequested() && !(e instanceof RuntimeCancelledError)) {
+                    legacyStopError = e;
+                }
                 log(`❌ runAgent 失败: ${e.message}`);
                 dslog("run.error", `runAgent 失败: ${e.message}`, {
                     level: "ERROR", ...runKeys, duration_ms: Date.now() - runStartedAt,
@@ -768,7 +715,16 @@ export function serve(config, opts = {}) {
             }
             finally {
                 running.delete(key);
-                releaseSlot(msg.agentHandle);
+                legacyReservation?.release();
+                finishLegacyQueue();
+                if (legacyQueueDone && legacyTaskTails.get(key) === legacyQueueDone) {
+                    legacyTaskTails.delete(key);
+                }
+                legacyRuns.delete(runId);
+                if (legacyStopError === undefined)
+                    finishLegacyRun();
+                else
+                    failLegacyRun(legacyStopError);
                 void flushSlog(); // 每轮收尾冲一次,保证 run.end 尽快可查
             }
         });
@@ -791,22 +747,66 @@ export function serve(config, opts = {}) {
                 running_tasks: [...running].join(","),
             });
             void flushSlog();
-            setTimeout(connect, backoff);
+            reconnectTimer = setTimeout(() => {
+                reconnectTimer = null;
+                connect();
+            }, backoff);
             backoff = Math.min(backoff * 2, maxBackoff);
         });
-        ws.on("error", () => ws?.close());
+        ws.on("error", () => {
+            if (!stopped)
+                ws?.close();
+        });
     }
-    connect();
-    return {
-        stop: () => {
+    const ready = (async () => {
+        await reconcileExecutionJournal(executionJournal, {
+            agentsRoot: config.agentsRoot,
+            serverUrl: config.serverUrl,
+            log: dslog,
+            flush: flushSlog,
+            writeStderr: (line) => process.stderr.write(line),
+        });
+        connect();
+    })();
+    const stop = () => {
+        if (stopPromise !== null)
+            return stopPromise;
+        stopPromise = (async () => {
             stopped = true;
-            ws?.close();
-            for (const executionId of executionRuns.keys())
-                requestCancellation(executionId);
-            void Promise.race([
-                Promise.allSettled([...executionRuns.values()]).then(() => true),
-                new Promise((resolve) => setTimeout(() => resolve(false), 10_000)),
-            ]).then((settled) => settled ? executionJournal.close() : undefined);
-        },
+            const deadline = createShutdownDeadline(shutdownTimeoutMs);
+            if (reconnectTimer !== null) {
+                clearTimeout(reconnectTimer);
+                reconnectTimer = null;
+            }
+            const webSocketClosed = closeWebSocketWithinDeadline(ws, deadline.signal);
+            const pending = [
+                webSocketClosed,
+                executionFrameQueue,
+                ...executionRuns.values(),
+                ...[...legacyRuns.values()].map((run) => run.done),
+                ...(testShutdown.barrier === null ? [] : [testShutdown.barrier]),
+            ];
+            try {
+                for (const executionId of executionRuns.keys())
+                    requestCancellation(executionId);
+                for (const run of legacyRuns.values())
+                    run.controller.request();
+                await deadline.waitFor(Promise.all(pending));
+                await executionJournal.close({ signal: deadline.signal });
+            }
+            finally {
+                deadline.dispose();
+            }
+        })();
+        return stopPromise;
+    };
+    return {
+        ready,
+        stop,
+        shutdownSnapshot: () => ({
+            activeExecutionCount: executionRuns.size,
+            activeLegacyCount: legacyRuns.size,
+            deadlineMs: shutdownTimeoutMs,
+        }),
     };
 }

package/dist/session.js

@@ -1,5 +1,5 @@
 /**
- * per-task claude 会话元数据 —— 让同一任务的重复唤醒用 `--resume` 复用上下文(省 token)。
+ * per-task runtime 会话元数据 —— 让同一任务的重复唤醒复用原生上下文(省 token)。
  *
  * 存在本任务隔离运行目录下(<runDir>/.crew-session.json):天然按 taskKey 隔离、落盘防 daemon
  * 重启丢失。读取一律容错 → 不存在/损坏/字段非法都回退 null(= 当作首轮冷启动),绝不阻断运行。

package/dist/shared-execution-slots.js

@@ -0,0 +1,68 @@
+export function createSharedSlotManager(limits) {
+    const activeByHandle = new Map();
+    const queuesByHandle = new Map();
+    const promoteNext = (handle) => {
+        const queue = queuesByHandle.get(handle) ?? [];
+        while ((activeByHandle.get(handle) ?? 0) < limits.maxParallelPerAgent && queue.length > 0) {
+            const next = queue.shift();
+            if (next.released)
+                continue;
+            next.promoted = true;
+            activeByHandle.set(handle, (activeByHandle.get(handle) ?? 0) + 1);
+            next.resolve();
+        }
+        if (queue.length === 0)
+            queuesByHandle.delete(handle);
+    };
+    return {
+        reserve: (handle, kind) => {
+            const active = activeByHandle.get(handle) ?? 0;
+            const queued = queuesByHandle.get(handle)?.length ?? 0;
+            const facts = { activeForAgent: active, queuedForAgent: queued };
+            if (kind === "execution" && active >= limits.maxParallelPerAgent
+                && queued >= limits.maxQueuedPerAgent) {
+                return { facts, ready: Promise.resolve(), isQueued: () => false, release: () => { } };
+            }
+            let resolveReady;
+            const ready = new Promise((resolve) => { resolveReady = resolve; });
+            const entry = {
+                kind,
+                released: false,
+                promoted: active < limits.maxParallelPerAgent,
+                resolve: resolveReady,
+            };
+            if (entry.promoted) {
+                activeByHandle.set(handle, active + 1);
+                resolveReady();
+            }
+            else {
+                const queue = queuesByHandle.get(handle) ?? [];
+                queue.push(entry);
+                queuesByHandle.set(handle, queue);
+            }
+            return {
+                facts,
+                state: entry.promoted ? "ready" : "queued",
+                ready,
+                isQueued: () => !entry.promoted && !entry.released,
+                release: () => {
+                    if (entry.released)
+                        return;
+                    entry.released = true;
+                    if (entry.promoted) {
+                        activeByHandle.set(handle, Math.max(0, (activeByHandle.get(handle) ?? 1) - 1));
+                    }
+                    else {
+                        const queue = queuesByHandle.get(handle);
+                        const index = queue?.indexOf(entry) ?? -1;
+                        if (queue !== undefined && index >= 0)
+                            queue.splice(index, 1);
+                        if (queue?.length === 0)
+                            queuesByHandle.delete(handle);
+                    }
+                    promoteNext(handle);
+                },
+            };
+        },
+    };
+}