@co0ontty/wand 4.89.5 → 4.90.0

package/dist/structured-session-manager.js

@@ -1,4 +1,4 @@
-import { defaultModelGroupSelector, isAutoAssignSelector, resolveModelGroupModels } from "./model-groups.js";
+import { isAutoAssignSelector, resolveModelGroupModels } from "./model-groups.js";
 import { resolveAutoAssign } from "./model-auto-assign.js";
 import { withModelGroups } from "./model-group-runner.js";
 import { classifyStructuredFailure, hasStructuredExecutionProgress } from "./structured-failure.js";
@@ -9,7 +9,8 @@ import { truncateMessagesForTransport } from "./message-truncator.js";
 import { stampNewToolUseTimes } from "./tool-use-timestamps.js";
 import { buildChildEnv } from "./env-utils.js";
 import { getErrorMessage } from "./error-utils.js";
-import { getDefaultModelForProvider } from "./config.js";
+import { compactTransportAvatar } from "./fixed-employee-avatar.js";
+import { fallbackProviderModel } from "./session-model.js";
 import { isLocalDecisionModel } from "./decision-expert-identity.js";
 import { selectEmployeeCandidate } from "./silicon-employee-dispatch.js";
 import { recordIterationPrompt } from "./iteration-log.js";
@@ -22,6 +23,7 @@ import { withDecisionAccess } from "./decision-runner.js";
 import { signalNameFromNumber } from "./signal-utils.js";
 import { provisionalSessionTopic, SessionNativeTitleTracker, SessionTopicCoordinator, sessionTopicBlocklistForSnapshot, shouldAcceptGeneratedSessionTitle, shouldGenerateSessionTopicFromInput, } from "./session-topic.js";
 import { resolveSessionCwd } from "./session-cwd.js";
+import { isScheduledConversationSession } from "./conversation-session-preview.js";
 import { isSessionProvider, providerCliCommand } from "./session-provider.js";
 import { resolveSessionProvider, resolveSystemAiContext } from "./session-ai-context.js";
 import { readNativeSessionTitle } from "./native-session-title.js";
@@ -36,10 +38,9 @@ import { QoderRunner } from "./structured-qoder-adapter.js";
 import { PiRunner, applyPiEvent, isMissingPiSession } from "./structured-pi-adapter.js";
 import { GeminiRunner, applyGeminiEvent, isMissingGeminiSession } from "./structured-gemini-adapter.js";
 import { structuredRunId, } from "./structured-exec-host.js";
-import { defaultStructuredRunner, defaultStructuredState, isStructuredRunnerForProvider, normalizeThinkingEffort, resolveStructuredRunner, } from "./structured-provider-common.js";
+import { defaultStructuredRunner, defaultStructuredState, isStructuredRunnerForProvider, normalizeThinkingEffort, normalizeTurnAnchors, resolveStructuredRunner, } from "./structured-provider-common.js";
 import { TurnQuietHeartbeat } from "./turn-heartbeat.js";
 import { enrichStructuredMessages, WAND_PROTOCOL_VERSION } from "./structured-client-protocol.js";
-import { RETENTION_IDLE_MS } from "./retention.js";
 class PersistedStructuredRunnerError extends Error {
     constructor(message) {
         super(message);
@@ -167,6 +168,12 @@ function recoveredCommandLabel(runner) {
     }
 }
 const STREAM_EMIT_DEBOUNCE_MS = 16;
+/**
+ * 员工候选链的启动看门狗：CLI 进程起来后这么久没有任何协议事件，就认定这一候选本轮没有开始
+ * 执行（无输出、无用量、无工具调用），按未接受输入处理并沿候选链降级，而不是让会话无限停在
+ * 「运行中」。取 3 分钟：慢模型的首个事件与真正卡死之间留出足够余量。
+ */
+const EMPLOYEE_CANDIDATE_STARTUP_TIMEOUT_MS = 180_000;
 /** Min interval between full saveSession() calls for an in-progress streaming turn.
  *  saveSession serializes the entire messages array, so doing it on every NDJSON
  *  event is N². close-path always calls saveSession unconditionally to take the
@@ -177,7 +184,6 @@ const STREAM_EMIT_DEBOUNCE_MS = 16;
 // second on the event loop.
 const STREAM_SAVE_THROTTLE_MS = 1_000;
 const DETACHED_RECOVERY_RETRY_MS = 500;
-const ARCHIVE_AFTER_MS = RETENTION_IDLE_MS;
 /**
  * 找出最后一条 assistant turn 中尚未配对 tool_result 的 AskUserQuestion tool_use。
  * 用来识别"刚被 SIGTERM 中断、正在等用户提交答案"的状态。
@@ -233,6 +239,26 @@ function withSummary(snapshot) {
 function shouldAutoApproveForMode(mode) {
     return mode === "full-access" || mode === "managed" || mode === "auto-edit";
 }
+/** Quiet heartbeat is a status ping, not another copy of the transcript or uploaded avatar. */
+export function structuredQuietStatusData(session) {
+    return {
+        sessionKind: "structured",
+        status: session.status,
+        exitCode: session.exitCode,
+        structuredState: normalizeTurnAnchors(session.structuredState),
+        provider: session.provider,
+        runner: session.runner,
+        selectedModel: session.selectedModel,
+        thinkingEffort: session.thinkingEffort,
+        employeeId: session.employeeId,
+        employeeName: session.employeeName,
+        employeeAvatar: compactTransportAvatar(session.employeeAvatar),
+        employeeCandidateIndex: session.employeeCandidateIndex,
+        title: session.title,
+        description: session.description,
+        summary: session.description ?? session.summary,
+    };
+}
 function buildStructuredOutputPayload(snapshot) {
     return {
         wandProtocolVersion: WAND_PROTOCOL_VERSION,
@@ -247,7 +273,7 @@ function buildStructuredOutputPayload(snapshot) {
         thinkingEffort: snapshot.thinkingEffort,
         employeeId: snapshot.employeeId,
         employeeName: snapshot.employeeName,
-        employeeAvatar: snapshot.employeeAvatar,
+        employeeAvatar: compactTransportAvatar(snapshot.employeeAvatar),
         employeeCandidateIndex: snapshot.employeeCandidateIndex,
         title: snapshot.title,
         description: snapshot.description,
@@ -467,7 +493,6 @@ export class StructuredSessionManager {
     seenIdempotencyKeys = new Map();
     relayHandlers = new Map();
     emitEvent = null;
-    archiveTimer = null;
     /**
      * 静默期心跳：回合在飞且连续 TURN_QUIET_HEARTBEAT_MS 没有任何事件时，用现有的
      * status 事件重发一次权威快照（含最新 turn 锚点）。timer 只在 inFlight 期间存在。
@@ -476,6 +501,8 @@ export class StructuredSessionManager {
     topicCoordinator = new SessionTopicCoordinator();
     nativeTitles = new SessionNativeTitleTracker();
     streamEmitTimers = new Set();
+    /** 员工候选链的「本轮还没开始执行」看门狗，按会话一个；首个协议事件或回合收敛即撤销。 */
+    candidateStartupWatchdogs = new Map();
     claudeCliRunner;
     codexRunner;
     openCodeRunner;
@@ -578,30 +605,6 @@ export class StructuredSessionManager {
             if (!recoverableDetachedRun)
                 this.storage.saveSession(restored);
         }
-        this.archiveExpiredSessions();
-        this.archiveTimer = setInterval(() => {
-            try {
-                this.archiveExpiredSessions();
-            }
-            catch (err) {
-                console.error(`[StructuredSessionManager] archive scan failed: ${String(err)}`);
-            }
-        }, 60 * 1000);
-        this.archiveTimer.unref?.();
-    }
-    archiveExpiredSessions() {
-        const now = Date.now();
-        for (const session of this.sessions.values()) {
-            if (session.archived || session.status === "running")
-                continue;
-            const referenceTime = session.endedAt ?? session.startedAt;
-            const endedAtMs = Date.parse(referenceTime);
-            if (!Number.isFinite(endedAtMs) || now - endedAtMs < ARCHIVE_AFTER_MS)
-                continue;
-            session.archived = true;
-            session.archivedAt = new Date(now).toISOString();
-            this.storage.updateSessionRuntimeMetadata(session);
-        }
     }
     setEventEmitter(emitEvent) {
         if (this.disposed)
@@ -653,10 +656,6 @@ export class StructuredSessionManager {
         this.unacceptedTeamStarts.clear();
         // 静默心跳不跨服务关闭存活（会话级 timer 不允许泄漏）。
         this.turnHeartbeat.dispose();
-        if (this.archiveTimer) {
-            clearInterval(this.archiveTimer);
-            this.archiveTimer = null;
-        }
         if (this.detachedRecoveryRetryTimer) {
             clearTimeout(this.detachedRecoveryRetryTimer);
             this.detachedRecoveryRetryTimer = null;
@@ -714,6 +713,9 @@ export class StructuredSessionManager {
         for (const timer of this.streamCheckpointTimers.values())
             clearTimeout(timer);
         this.streamCheckpointTimers.clear();
+        for (const timer of this.candidateStartupWatchdogs.values())
+            clearTimeout(timer);
+        this.candidateStartupWatchdogs.clear();
         this.streamCheckpointDirty.clear();
         this.lastStreamSaveAt.clear();
         this.topicCoordinator.clear();
@@ -1229,6 +1231,13 @@ export class StructuredSessionManager {
         const s = this.sessions.get(id);
         return s ? withSummary(s) : null;
     }
+    getSlim(id) {
+        const session = this.get(id);
+        if (!session)
+            return null;
+        const { messages: _messages, output: _output, ...metadata } = session;
+        return { ...metadata, output: "" };
+    }
     setSessionWorkspace(id, membership) {
         const updated = { ...this.requireSession(id), ...membership };
         this.sessions.set(id, updated);
@@ -1296,6 +1305,10 @@ export class StructuredSessionManager {
             return;
         // 迭代提示词记录：和会话标题共用同一套「有没有信息量」判断，用户不用多做一步。
         recordIterationPrompt(this.storage, session, input, "session");
+        // The plan names this execution. Preserve that name and avoid a second model
+        // call merely to rename background work before it reaches its chosen employee.
+        if (isScheduledConversationSession(session))
+            return;
         const blockedTitles = sessionTopicBlocklistForSnapshot(session, this.storage);
         // CLI 自己起了名字就归它，模型标题与输入首行都不再覆盖；取不到原生标题才走系统硅基员工。
         const hasNativeTitle = this.nativeTitles.has(id);
@@ -1490,43 +1503,50 @@ export class StructuredSessionManager {
             && !session.structuredState?.activeRequestId && !session.structuredState?.inFlight ? fact.failure : null;
     }
     employeeCandidateModel(agent) {
-        return agent.model === "default"
-            ? defaultModelGroupSelector(this.config.modelGroups, agent.provider, getDefaultModelForProvider(this.config, agent.provider))
-                || getDefaultModelForProvider(this.config, agent.provider) || null : agent.model;
+        return agent.model === "default" ? fallbackProviderModel(this.config, agent.provider) ?? null : agent.model;
     }
-    /** Only an unstarted employee conversation may replay its explicitly rejected first input. */
+    /**
+     * A turn the provider rejected before it accepted any input may replay on the next candidate.
+     * Same-tool switches carry the conversation as it stood before this turn — history plus the native
+     * session it already had — so they also cover an already-started chat. A cross-tool switch cannot
+     * hand that context over, so it stays limited to conversations that have not produced a turn yet.
+     */
     retryEmployeeCandidate(id, original, prompt, error) {
         // Team runs own candidate scheduling; keep the snapshot without a second retry loop.
         if (original.automationId?.startsWith("ai-team:") || !(error instanceof UnacceptedStructuredInputError))
             return null;
+        if (!original.employeeId || !error.failure.retryable)
+            return null;
         const candidates = original.employeeCandidates ?? [];
         const index = original.employeeCandidateIndex ?? 0;
+        const selected = candidates[index];
         let nextIndex = index + 1;
         // LAYA has no chat adapter; keep original candidate indices while skipping bounded-only models.
         while (nextIndex < candidates.length && isLocalDecisionModel(candidates[nextIndex].model))
             nextIndex += 1;
-        if (!original.employeeId || (original.messages?.length ?? 0) !== 0 || original.claudeSessionId
-            || !error.failure.retryable || nextIndex >= candidates.length)
+        if (nextIndex >= candidates.length)
             return null;
-        const selected = candidates[index];
         // Explicit tool/model changes, including changes during the pending request, remain authoritative.
         if (!selected || original.provider !== selected.provider
             || (original.structuredState?.engine && (original.structuredState.engine === "core" ? "sdk" : "cli") !== (selected.engine ?? "cli"))
             || (original.selectedModel && original.selectedModel !== this.employeeCandidateModel(selected)))
             return null;
+        const next = candidates[nextIndex];
+        const sameTool = next.provider === selected.provider && (next.engine ?? "cli") === (selected.engine ?? "cli");
+        if (!sameTool && ((original.messages?.length ?? 0) !== 0 || original.claudeSessionId))
+            return null;
         const current = this.sessions.get(id);
         if (!current || current.status !== "running" || current.provider !== original.provider
             || current.selectedModel !== original.selectedModel || current.mode !== original.mode
             || current.piSettings !== original.piSettings)
             return null;
-        const next = candidates[nextIndex];
         const runner = resolveStructuredRunner(next.provider, undefined);
         const model = this.employeeCandidateModel(next);
-        const sameTool = next.provider === original.provider && (next.engine ?? "cli") === (selected.engine ?? "cli");
         const piSettings = next.provider !== "pi" ? undefined : sameTool ? current.piSettings
             : next.engine === "sdk" ? defaultPiSessionSettings(this.config.harness?.compaction?.enabled ?? true)
                 : { ...(this.storage.getPiSessionDefaults() ?? defaultPiCliSessionSettings()),
                     autoCompaction: this.config.harness?.compaction?.enabled ?? true };
+        const carried = current.structuredState;
         const retry = {
             ...current,
             provider: next.provider,
@@ -1538,21 +1558,25 @@ export class StructuredSessionManager {
             thinkingEffort: next.thinkingEffort,
             employeeCandidateIndex: nextIndex,
             piSettings,
-            claudeSessionId: null,
-            harnessContext: undefined,
-            harnessExtensionState: undefined,
-            messages: [],
-            output: "",
+            // Replay resumes the state this turn started from, not what the rejected attempt produced:
+            // its native session may already hold the input we are about to send again.
+            claudeSessionId: sameTool ? original.claudeSessionId : null,
+            harnessContext: sameTool ? original.harnessContext : undefined,
+            harnessExtensionState: sameTool ? original.harnessExtensionState : undefined,
+            messages: sameTool ? original.messages ?? [] : [],
+            output: sameTool ? original.output ?? "" : "",
             status: "idle",
             exitCode: null,
             endedAt: null,
             structuredState: {
                 ...defaultStructuredState(next.provider, runner),
+                ...(sameTool ? { engine: carried?.engine, engineReason: carried?.engineReason,
+                    contextUsage: carried?.contextUsage, compactions: carried?.compactions } : {}),
                 model: model ?? undefined,
             },
         };
         this.logger?.appendStructuredSpawn(id, { kind: "candidate-fallback", failureKind: error.failure.kind,
-            fromProvider: original.provider, toProvider: next.provider, candidateIndex: nextIndex });
+            fromProvider: original.provider, toProvider: next.provider, candidateIndex: nextIndex, sameTool });
         this.sessions.set(id, retry);
         this.saveAuthoritativeSession(retry);
         // sendMessage publishes the new running snapshot synchronously; do not expose a transient idle slot.
@@ -1803,16 +1827,24 @@ export class StructuredSessionManager {
                 throw new Error(`会话 runner ${String(runner)} 与 provider ${provider} 不匹配。`);
             }
             if (provider === "codex") {
-                await this.runCodexStreaming(id, updated, prompt, requestId);
+                await this.runStructuredStreaming(id, updated, prompt, requestId, {
+                    runner: this.codexRunner, provider: "codex", commandLabel: "codex exec", logKind: "codex-exec",
+                });
             }
             else if (provider === "opencode") {
-                await this.runOpenCodeStreaming(id, updated, prompt, requestId);
+                await this.runStructuredStreaming(id, updated, prompt, requestId, {
+                    runner: this.openCodeRunner, provider: "opencode", commandLabel: "opencode run", logKind: "opencode-run",
+                    installHint: "请安装 opencode-ai，或重跑 `wand service:install` 刷新服务 PATH",
+                });
             }
             else if (provider === "grok") {
-                await this.runGrokStreaming(id, updated, prompt, requestId);
+                await this.runStructuredStreaming(id, updated, prompt, requestId, {
+                    runner: this.grokRunner, provider: "grok", commandLabel: "grok", logKind: "grok-headless",
+                    installHint: "请安装 Grok Build CLI，或重跑 `wand service:install` 刷新服务 PATH",
+                });
             }
             else if (provider === "qoder") {
-                await this.runClaudeStreaming(id, updated, prompt, requestId, {
+                await this.runStructuredStreaming(id, updated, prompt, requestId, {
                     runner: this.qoderRunner,
                     provider: "qoder",
                     commandLabel: "qodercli -p",
@@ -1841,7 +1873,7 @@ export class StructuredSessionManager {
                 };
                 this.sessions.set(id, enginePatched);
                 if (resolution.engine === "core") {
-                    await this.runClaudeStreaming(id, enginePatched, prompt, requestId, {
+                    await this.runStructuredStreaming(id, enginePatched, prompt, requestId, {
                         runner: this.coreRunner,
                         provider: "pi",
                         commandLabel: "Wand Agent（SDK）",
@@ -1849,7 +1881,7 @@ export class StructuredSessionManager {
                     });
                 }
                 else {
-                    await this.runClaudeStreaming(id, enginePatched, prompt, requestId, {
+                    await this.runStructuredStreaming(id, enginePatched, prompt, requestId, {
                         runner: this.piRunner,
                         provider: "pi",
                         commandLabel: "pi --mode json --print",
@@ -1859,7 +1891,7 @@ export class StructuredSessionManager {
                 }
             }
             else if (provider === "gemini") {
-                await this.runClaudeStreaming(id, updated, prompt, requestId, {
+                await this.runStructuredStreaming(id, updated, prompt, requestId, {
                     runner: this.geminiRunner,
                     provider: "gemini",
                     commandLabel: "gemini -p --output-format stream-json",
@@ -1868,7 +1900,7 @@ export class StructuredSessionManager {
                 });
             }
             else {
-                await this.runClaudeStreaming(id, updated, cliClaudePrompt, requestId);
+                await this.runStructuredStreaming(id, updated, cliClaudePrompt, requestId);
             }
             const finished = this.requireSession(id);
             return finished;
@@ -2143,7 +2175,7 @@ export class StructuredSessionManager {
         const candidate = candidateIndex >= 0 ? candidates[candidateIndex] : undefined;
         const runner = defaultStructuredRunner(provider);
         const model = candidate && candidate.model !== "default" ? candidate.model
-            : defaultModelGroupSelector(this.config.modelGroups, provider, getDefaultModelForProvider(this.config, provider)) || getDefaultModelForProvider(this.config, provider) || null;
+            : fallbackProviderModel(this.config, provider) ?? null;
         const effort = normalizeThinkingEffort(candidate?.thinkingEffort ?? this.config.defaultThinkingEffort);
         const thinkingEffort = effort?.includes(":") && !effort.startsWith(`${provider}:`) ? "off" : effort;
         const requestedMode = candidate?.mode ?? session.mode;
@@ -2177,7 +2209,8 @@ export class StructuredSessionManager {
             type: "status",
             sessionId: updated.id,
             data: { ...buildStructuredOutputPayload(updated), command: updated.command,
-                mode: updated.mode, autoApprovePermissions: updated.autoApprovePermissions },
+                mode: updated.mode, autoApprovePermissions: updated.autoApprovePermissions,
+                employeeAvatar: updated.employeeAvatar },
         });
         return updated;
     }
@@ -2553,9 +2586,7 @@ export class StructuredSessionManager {
             type: "status",
             sessionId,
             data: {
-                ...buildStructuredOutputPayload(session),
-                status: session.status,
-                exitCode: session.exitCode,
+                ...structuredQuietStatusData(session),
             },
         });
         return true;
@@ -2650,455 +2681,8 @@ export class StructuredSessionManager {
         stats.total++;
         session.approvalStats = stats;
     }
-    // ---------------------------------------------------------------------------
-    // Streaming codex exec --json execution
-    // ---------------------------------------------------------------------------
-    async runCodexStreaming(sessionId, session, prompt, requestId) {
-        let emitTimer = null;
-        const syncSnapshot = (turnState) => {
-            const current = this.currentSessionForRequest(sessionId, requestId);
-            if (!current)
-                return;
-            const turn = {
-                role: "assistant",
-                content: this.compactContentBlocks([...turnState.blocks], turnState.result),
-                usage: turnState.usage,
-            };
-            const messages = upsertAssistantMessage(current.messages, turn);
-            const patched = {
-                ...current,
-                claudeSessionId: turnState.sessionId ?? current.claudeSessionId,
-                messages,
-                output: turnState.result || current.output,
-                structuredState: this.noteTurnActivity(sessionId, {
-                    ...current.structuredState,
-                    model: turnState.model ?? current.structuredState?.model,
-                }),
-            };
-            this.sessions.set(sessionId, patched);
-            this.saveStreamingSnapshot(patched);
-        };
-        const flushEmit = () => {
-            if (emitTimer)
-                this.clearStreamEmitTimer(emitTimer);
-            emitTimer = null;
-            const current = this.currentSessionForRequest(sessionId, requestId);
-            if (current) {
-                this.emit({
-                    type: "output",
-                    sessionId,
-                    data: buildIncrementalStructuredPayload(current, this.config.cardDefaults ?? {}),
-                });
-            }
-        };
-        const scheduleEmit = () => {
-            if (!emitTimer) {
-                emitTimer = this.trackStreamEmitTimer(setTimeout(flushEmit, STREAM_EMIT_DEBOUNCE_MS));
-            }
-        };
-        const execution = startEmployeeKnowledgeRunner(this.storage, this.codexRunner, {
-            session,
-            prompt,
-            env: buildChildEnv(this.config.inheritEnv !== false),
-        }, {
-            isActive: () => this.isCurrentRequest(sessionId, requestId),
-            onStdout: (text) => this.logger?.appendStructuredStdout(sessionId, text),
-            onStderr: (text) => this.logger?.appendStructuredStderr(sessionId, text),
-            onEvent: (event) => this.logger?.appendStreamEvent(sessionId, event),
-            onUpdate: (turnState) => {
-                syncSnapshot(turnState);
-                scheduleEmit();
-            },
-        });
-        this.pendingRunnerExecutions.set(sessionId, execution);
-        this.logger?.appendStructuredSpawn(sessionId, {
-            kind: "codex-exec",
-            provider: "codex",
-            pid: execution.pid,
-            cwd: session.cwd,
-            args: execution.args,
-            prompt: prompt.slice(0, 2048),
-            promptLength: prompt.length,
-            threadId: session.claudeSessionId,
-            spawnedAt: execution.spawnedAt,
-        });
-        let result;
-        try {
-            result = await execution.completion;
-        }
-        finally {
-            const released = this.releasePendingRunnerExecution(sessionId, execution);
-            if (released)
-                this.cancelStreamingCheckpointTimer(sessionId);
-        }
-        if (!this.isCurrentRequest(sessionId, requestId)) {
-            if (emitTimer)
-                this.clearStreamEmitTimer(emitTimer);
-            return;
-        }
-        flushEmit();
-        this.throwUnacceptedInput(sessionId, result, "codex exec", "（PATH 中找不到 codex 可执行文件；请确认 codex 已安装，或重跑 `wand service:install` 刷新服务的 PATH）");
-        this.logger?.appendStructuredSpawn(sessionId, {
-            kind: "codex-exec-close",
-            pid: execution.pid,
-            spawnedAt: execution.spawnedAt,
-            closedAt: new Date().toISOString(),
-            exitCode: result.exitCode,
-            stderrTail: result.stderr.slice(-2048),
-            codexErrors: result.errors,
-            codexTurnFailed: result.primaryError,
-        });
-        const current = this.currentSessionForRequest(sessionId, requestId);
-        if (!current)
-            return;
-        const interruptedByUser = this.interruptedWith.has(sessionId);
-        const interruptPrompt = this.interruptedWith.get(sessionId);
-        if ((result.primaryError || (result.exitCode !== 0 && result.exitCode !== null) || result.signal) && !interruptedByUser) {
-            const errorText = this.formatStructuredExitError("codex exec", result.exitCode, result.signal, { stderr: result.stderr, primary: result.primaryError, extras: result.errors });
-            const failed = this.finishStructuredFailure(current, typeof result.exitCode === "number" ? result.exitCode : 1, errorText, result.state);
-            this.sessions.set(sessionId, failed);
-            this.saveAuthoritativeSession(failed);
-            this.emitStructuredSnapshot(failed);
-            this.emitStructuredSnapshot(failed, "ended");
-            throw new PersistedStructuredRunnerError(errorText);
-        }
-        const messages = this.buildCompletedAssistantMessages(current, result.state);
-        const keepRunning = !!interruptPrompt;
-        const finished = {
-            ...current,
-            status: keepRunning ? "running" : "idle",
-            exitCode: keepRunning ? null : 0,
-            endedAt: keepRunning ? null : new Date().toISOString(),
-            output: result.state.result,
-            claudeSessionId: result.state.sessionId ?? current.claudeSessionId,
-            messages,
-            queuedMessages: this.resolveQueuedMessagesAfterInterrupt(sessionId, current, interruptPrompt),
-            pendingEscalation: null,
-            permissionBlocked: false,
-            structuredState: {
-                ...this.settleTurn(sessionId, current.structuredState),
-                model: result.state.model ?? current.structuredState?.model,
-                inFlight: false,
-                activeRequestId: null,
-                lastError: null,
-            },
-        };
-        this.sessions.set(sessionId, finished);
-        this.saveAuthoritativeSession(finished);
-        this.emitStructuredSnapshot(finished);
-        if (!keepRunning)
-            this.emitStructuredSnapshot(finished, "ended");
-        if (interruptPrompt) {
-            this.interruptedWith.delete(sessionId);
-            this.preserveQueueOnInterrupt.delete(sessionId);
-            setImmediate(() => {
-                this.sendMessage(sessionId, interruptPrompt).catch((error) => {
-                    console.error("[WAND] codex interrupt-and-send failed:", error);
-                });
-            });
-            return;
-        }
-        setImmediate(() => { void this.flushNextQueuedMessage(sessionId); });
-    }
-    async runGrokStreaming(sessionId, session, prompt, requestId) {
-        let emitTimer = null;
-        const syncSnapshot = (turnState) => {
-            const current = this.currentSessionForRequest(sessionId, requestId);
-            if (!current)
-                return;
-            const turn = {
-                role: "assistant",
-                content: this.compactContentBlocks([...turnState.blocks], turnState.result),
-                usage: turnState.usage,
-            };
-            const messages = upsertAssistantMessage(current.messages, turn);
-            const patched = {
-                ...current,
-                claudeSessionId: turnState.sessionId ?? current.claudeSessionId,
-                messages,
-                output: turnState.result || current.output,
-                // 每个 provider 帧都是本轮还在活动的证据：刷新 lastActivityAt 并重挂静默窗口。
-                structuredState: this.noteTurnActivity(sessionId, current.structuredState),
-            };
-            this.sessions.set(sessionId, patched);
-            this.saveStreamingSnapshot(patched);
-        };
-        const flushEmit = () => {
-            if (emitTimer)
-                this.clearStreamEmitTimer(emitTimer);
-            emitTimer = null;
-            const current = this.currentSessionForRequest(sessionId, requestId);
-            if (current)
-                this.emit({
-                    type: "output",
-                    sessionId,
-                    data: buildIncrementalStructuredPayload(current, this.config.cardDefaults ?? {}),
-                });
-        };
-        const scheduleEmit = () => {
-            if (!emitTimer)
-                emitTimer = this.trackStreamEmitTimer(setTimeout(flushEmit, STREAM_EMIT_DEBOUNCE_MS));
-        };
-        const execution = startEmployeeKnowledgeRunner(this.storage, this.grokRunner, {
-            session,
-            prompt,
-            env: buildChildEnv(this.config.inheritEnv !== false),
-        }, {
-            isActive: () => this.isCurrentRequest(sessionId, requestId),
-            onStdout: (text) => this.logger?.appendStructuredStdout(sessionId, text),
-            onStderr: (text) => this.logger?.appendStructuredStderr(sessionId, text),
-            onEvent: (event) => this.logger?.appendStreamEvent(sessionId, event),
-            onUpdate: (turnState) => { syncSnapshot(turnState); scheduleEmit(); },
-        });
-        this.pendingRunnerExecutions.set(sessionId, execution);
-        this.logger?.appendStructuredSpawn(sessionId, {
-            kind: "grok-headless",
-            provider: "grok",
-            pid: execution.pid,
-            cwd: session.cwd,
-            args: execution.args,
-            prompt: prompt.slice(0, 2048),
-            promptLength: prompt.length,
-            sessionId: session.claudeSessionId,
-            spawnedAt: execution.spawnedAt,
-        });
-        let result;
-        try {
-            result = await execution.completion;
-        }
-        finally {
-            const released = this.releasePendingRunnerExecution(sessionId, execution);
-            if (released)
-                this.cancelStreamingCheckpointTimer(sessionId);
-        }
-        if (!this.isCurrentRequest(sessionId, requestId)) {
-            if (emitTimer)
-                this.clearStreamEmitTimer(emitTimer);
-            return;
-        }
-        flushEmit();
-        this.throwUnacceptedInput(sessionId, result, "grok", "（PATH 中找不到 grok；请安装 Grok Build CLI，或重跑 `wand service:install` 刷新服务 PATH）");
-        this.logger?.appendStructuredSpawn(sessionId, {
-            kind: "grok-headless-close",
-            pid: execution.pid,
-            spawnedAt: execution.spawnedAt,
-            closedAt: new Date().toISOString(),
-            exitCode: result.exitCode,
-            stderrTail: result.stderr.slice(-2048),
-            primaryError: result.primaryError,
-        });
-        const current = this.currentSessionForRequest(sessionId, requestId);
-        if (!current)
-            return;
-        const interruptedByUser = this.interruptedWith.has(sessionId);
-        const interruptPrompt = this.interruptedWith.get(sessionId);
-        if ((result.primaryError || (result.exitCode !== 0 && result.exitCode !== null) || result.signal) && !interruptedByUser) {
-            const errorText = this.formatStructuredExitError("grok", result.exitCode, result.signal, { stderr: result.stderr, primary: result.primaryError });
-            const failed = this.finishStructuredFailure(current, typeof result.exitCode === "number" ? result.exitCode : 1, errorText, result.state);
-            this.sessions.set(sessionId, failed);
-            this.saveAuthoritativeSession(failed);
-            this.emitStructuredSnapshot(failed);
-            this.emitStructuredSnapshot(failed, "ended");
-            throw new PersistedStructuredRunnerError(errorText);
-        }
-        const messages = this.buildCompletedAssistantMessages(current, result.state);
-        const keepRunning = !!interruptPrompt;
-        const finished = {
-            ...current,
-            status: keepRunning ? "running" : "idle",
-            exitCode: keepRunning ? null : 0,
-            endedAt: keepRunning ? null : new Date().toISOString(),
-            output: result.state.result,
-            claudeSessionId: result.state.sessionId ?? current.claudeSessionId,
-            messages,
-            queuedMessages: this.resolveQueuedMessagesAfterInterrupt(sessionId, current, interruptPrompt),
-            pendingEscalation: null,
-            permissionBlocked: false,
-            structuredState: {
-                ...this.settleTurn(sessionId, current.structuredState),
-                model: result.state.model ?? current.structuredState?.model,
-                inFlight: false,
-                activeRequestId: null,
-                lastError: null,
-            },
-        };
-        this.sessions.set(sessionId, finished);
-        this.saveAuthoritativeSession(finished);
-        this.emitStructuredSnapshot(finished);
-        if (!keepRunning)
-            this.emitStructuredSnapshot(finished, "ended");
-        if (interruptPrompt) {
-            this.interruptedWith.delete(sessionId);
-            this.preserveQueueOnInterrupt.delete(sessionId);
-            setImmediate(() => this.sendMessage(sessionId, interruptPrompt).catch((error) => {
-                console.error("[WAND] grok interrupt-and-send failed:", error);
-            }));
-            return;
-        }
-        setImmediate(() => { void this.flushNextQueuedMessage(sessionId); });
-    }
-    async runOpenCodeStreaming(sessionId, session, prompt, requestId) {
-        let emitTimer = null;
-        const syncSnapshot = (turnState) => {
-            const current = this.currentSessionForRequest(sessionId, requestId);
-            if (!current)
-                return;
-            const turn = {
-                role: "assistant",
-                content: this.compactContentBlocks([...turnState.blocks], turnState.result),
-                usage: turnState.usage,
-            };
-            const messages = upsertAssistantMessage(current.messages, turn);
-            const patched = {
-                ...current,
-                claudeSessionId: turnState.sessionId ?? current.claudeSessionId,
-                messages,
-                output: turnState.result || current.output,
-                // 每个 provider 帧都是本轮还在活动的证据：刷新 lastActivityAt 并重挂静默窗口。
-                structuredState: this.noteTurnActivity(sessionId, current.structuredState),
-            };
-            this.sessions.set(sessionId, patched);
-            this.saveStreamingSnapshot(patched);
-        };
-        const flushEmit = () => {
-            if (emitTimer)
-                this.clearStreamEmitTimer(emitTimer);
-            emitTimer = null;
-            const current = this.currentSessionForRequest(sessionId, requestId);
-            if (current) {
-                this.emit({
-                    type: "output",
-                    sessionId,
-                    data: buildIncrementalStructuredPayload(current, this.config.cardDefaults ?? {}),
-                });
-            }
-        };
-        const scheduleEmit = () => {
-            if (!emitTimer) {
-                emitTimer = this.trackStreamEmitTimer(setTimeout(flushEmit, STREAM_EMIT_DEBOUNCE_MS));
-            }
-        };
-        const execution = startEmployeeKnowledgeRunner(this.storage, this.openCodeRunner, {
-            session,
-            prompt,
-            env: buildChildEnv(this.config.inheritEnv !== false),
-        }, {
-            isActive: () => this.isCurrentRequest(sessionId, requestId),
-            onStdout: (text) => this.logger?.appendStructuredStdout(sessionId, text),
-            onStderr: (text) => this.logger?.appendStructuredStderr(sessionId, text),
-            onEvent: (event) => this.logger?.appendStreamEvent(sessionId, event),
-            onUpdate: (turnState) => {
-                syncSnapshot(turnState);
-                scheduleEmit();
-            },
-        });
-        this.pendingRunnerExecutions.set(sessionId, execution);
-        this.logger?.appendStructuredSpawn(sessionId, {
-            kind: "opencode-run",
-            provider: "opencode",
-            pid: execution.pid,
-            cwd: session.cwd,
-            args: execution.args,
-            prompt: prompt.slice(0, 2048),
-            promptLength: prompt.length,
-            sessionId: session.claudeSessionId,
-            spawnedAt: execution.spawnedAt,
-        });
-        let result;
-        try {
-            result = await execution.completion;
-        }
-        finally {
-            const released = this.releasePendingRunnerExecution(sessionId, execution);
-            if (released)
-                this.cancelStreamingCheckpointTimer(sessionId);
-        }
-        if (!this.isCurrentRequest(sessionId, requestId)) {
-            if (emitTimer)
-                this.clearStreamEmitTimer(emitTimer);
-            return;
-        }
-        flushEmit();
-        this.throwUnacceptedInput(sessionId, result, "opencode run", "（PATH 中找不到 opencode；请安装 opencode-ai，或重跑 `wand service:install` 刷新服务 PATH）");
-        this.logger?.appendStructuredSpawn(sessionId, {
-            kind: "opencode-run-close",
-            pid: execution.pid,
-            spawnedAt: execution.spawnedAt,
-            closedAt: new Date().toISOString(),
-            exitCode: result.exitCode,
-            stderrTail: result.stderr.slice(-2048),
-            primaryError: result.primaryError,
-        });
-        const current = this.currentSessionForRequest(sessionId, requestId);
-        if (!current)
-            return;
-        const interruptedByUser = this.interruptedWith.has(sessionId);
-        const interruptPrompt = this.interruptedWith.get(sessionId);
-        if ((result.primaryError || (result.exitCode !== 0 && result.exitCode !== null) || result.signal) && !interruptedByUser) {
-            const legacyHint = /unknown command|unknown flag|No help topic for 'run'/i.test(result.stderr)
-                ? "\n检测到旧版 OpenCode CLI；请卸载 0.0.x 旧包并安装 `opencode-ai@latest`。"
-                : "";
-            const errorText = this.formatStructuredExitError("opencode run", result.exitCode, result.signal, { stderr: result.stderr, primary: result.primaryError }) + legacyHint;
-            const failed = this.finishStructuredFailure(current, typeof result.exitCode === "number" ? result.exitCode : 1, errorText, result.state);
-            this.sessions.set(sessionId, failed);
-            this.saveAuthoritativeSession(failed);
-            this.emitStructuredSnapshot(failed);
-            this.emitStructuredSnapshot(failed, "ended");
-            throw new PersistedStructuredRunnerError(errorText);
-        }
-        const messages = this.buildCompletedAssistantMessages(current, result.state);
-        const keepRunning = !!interruptPrompt;
-        const finished = {
-            ...current,
-            status: keepRunning ? "running" : "idle",
-            exitCode: keepRunning ? null : 0,
-            endedAt: keepRunning ? null : new Date().toISOString(),
-            output: result.state.result,
-            claudeSessionId: result.state.sessionId ?? current.claudeSessionId,
-            messages,
-            queuedMessages: this.resolveQueuedMessagesAfterInterrupt(sessionId, current, interruptPrompt),
-            pendingEscalation: null,
-            permissionBlocked: false,
-            structuredState: {
-                ...this.settleTurn(sessionId, current.structuredState),
-                model: result.state.model ?? current.structuredState?.model,
-                inFlight: false,
-                activeRequestId: null,
-                lastError: null,
-            },
-        };
-        this.sessions.set(sessionId, finished);
-        this.saveAuthoritativeSession(finished);
-        this.emitStructuredSnapshot(finished);
-        if (!keepRunning)
-            this.emitStructuredSnapshot(finished, "ended");
-        if (interruptPrompt) {
-            this.interruptedWith.delete(sessionId);
-            this.preserveQueueOnInterrupt.delete(sessionId);
-            setImmediate(() => {
-                this.sendMessage(sessionId, interruptPrompt).catch((error) => {
-                    console.error("[WAND] opencode interrupt-and-send failed:", error);
-                });
-            });
-            return;
-        }
-        setImmediate(() => { void this.flushNextQueuedMessage(sessionId); });
-    }
-    // ---------------------------------------------------------------------------
-    // Streaming claude -p execution
-    // ---------------------------------------------------------------------------
-    /**
-     * Spawn `claude -p --output-format stream-json` and parse NDJSON lines as
-     * they arrive, emitting incremental WebSocket events so the UI can render
-     * text / thinking / tool_use blocks in real-time.
-     *
-     * Permission handling:
-     * - Non-root + full-access/managed: --permission-mode bypassPermissions
-     * - Non-root + auto-edit: --permission-mode acceptEdits
-     * - Root: --permission-mode acceptEdits + --allowedTools (extends approval
-     *   outside CWD). stdin is always "ignore" — no ACP bidirectional control.
-     */
-    async runClaudeStreaming(sessionId, session, prompt, requestId, options = {}) {
+    /** One turn lifecycle for every structured adapter; provider protocol reducers stay separate. */
+    async runStructuredStreaming(sessionId, session, prompt, requestId, options = {}) {
         let emitTimer = null;
         const syncSnapshot = (turnState) => {
             const current = this.currentSessionForRequest(sessionId, requestId);
@@ -3150,21 +2734,46 @@ export class StructuredSessionManager {
         const provider = options.provider ?? "claude";
         const commandLabel = options.commandLabel ?? "claude -p";
         const logKind = options.logKind ?? "claude-print";
+        // 只在有多条候选可退的员工会话上看门：单候选会话没有可退的下一条链路，终止它只会丢工作。
+        const candidateChain = !!session.employeeId && (session.employeeCandidates?.length ?? 0) > 1;
+        let startupTimedOut = false;
+        let turnCompleted = false;
+        const disarmStartupWatchdog = () => {
+            const timer = this.candidateStartupWatchdogs.get(sessionId);
+            if (!timer)
+                return;
+            clearTimeout(timer);
+            this.candidateStartupWatchdogs.delete(sessionId);
+        };
         const execution = startEmployeeKnowledgeRunner(this.storage, runner, {
             session,
             prompt,
             env: buildChildEnv(this.config.inheritEnv !== false),
         }, {
             isActive: () => this.isCurrentRequest(sessionId, requestId),
-            onStdout: (text) => this.logger?.appendStructuredStdout(sessionId, text),
+            onStdout: (text) => {
+                if (text)
+                    disarmStartupWatchdog();
+                this.logger?.appendStructuredStdout(sessionId, text);
+            },
             onStderr: (text) => this.logger?.appendStructuredStderr(sessionId, text),
             onEvent: (event) => this.logger?.appendStreamEvent(sessionId, event),
             onUpdate: (turnState) => {
+                disarmStartupWatchdog();
                 syncSnapshot(turnState);
                 scheduleEmit();
             },
         });
         this.pendingRunnerExecutions.set(sessionId, execution);
+        if (candidateChain) {
+            this.candidateStartupWatchdogs.set(sessionId, setTimeout(() => {
+                this.candidateStartupWatchdogs.delete(sessionId);
+                if (turnCompleted || !this.isCurrentRequest(sessionId, requestId))
+                    return;
+                startupTimedOut = true;
+                execution.interrupt();
+            }, EMPLOYEE_CANDIDATE_STARTUP_TIMEOUT_MS));
+        }
         this.logger?.appendStructuredSpawn(sessionId, {
             kind: logKind,
             provider,
@@ -3174,6 +2783,7 @@ export class StructuredSessionManager {
             prompt: prompt.slice(0, 2048),
             promptLength: prompt.length,
             claudeSessionId: session.claudeSessionId,
+            ...(provider === "codex" ? { threadId: session.claudeSessionId } : { sessionId: session.claudeSessionId }),
             spawnedAt: execution.spawnedAt,
         });
         let result;
@@ -3181,6 +2791,8 @@ export class StructuredSessionManager {
             result = await execution.completion;
         }
         finally {
+            turnCompleted = true;
+            disarmStartupWatchdog();
             const released = this.releasePendingRunnerExecution(sessionId, execution);
             if (released)
                 this.cancelStreamingCheckpointTimer(sessionId);
@@ -3191,7 +2803,18 @@ export class StructuredSessionManager {
             return;
         }
         flushEmit();
-        this.throwUnacceptedInput(sessionId, result, commandLabel, `（PATH 中找不到 ${provider === "qoder" ? "qodercli" : provider === "gemini" ? "gemini" : provider === "pi" ? "pi" : "claude"} 可执行文件；${options.installHint ?? "请确认 claude 已安装，或重跑 `wand service:install` 刷新服务的 PATH"}）`);
+        // 看门狗只在本轮确实没有产出任何东西时才算「未开始执行」；已经出过内容的那一轮维持原判定。
+        if (startupTimedOut && !hasStructuredExecutionProgress(result.state)) {
+            const unaccepted = { kind: "preflight", delivery: "rejected", retryable: true };
+            result = {
+                ...result,
+                inputAccepted: false,
+                primaryError: result.primaryError?.trim()
+                    || `${commandLabel} 在 ${EMPLOYEE_CANDIDATE_STARTUP_TIMEOUT_MS / 1000} 秒内没有任何协议输出，本轮未开始执行。`,
+                failure: unaccepted,
+            };
+        }
+        this.throwUnacceptedInput(sessionId, result, commandLabel, `（PATH 中找不到 ${providerCliCommand(provider)} 可执行文件；${options.installHint ?? `请确认 ${providerCliCommand(provider)} 已安装，或重跑 wand service:install 刷新服务的 PATH`}）`);
         this.logger?.appendStructuredSpawn(sessionId, {
             kind: `${logKind}-close`,
             pid: execution.pid,
@@ -3199,24 +2822,31 @@ export class StructuredSessionManager {
             closedAt: new Date().toISOString(),
             exitCode: result.exitCode,
             stderrTail: result.stderr.slice(-2048),
+            primaryError: result.primaryError,
+            ...(provider === "codex" ? { codexErrors: result.errors, codexTurnFailed: result.primaryError } : {}),
         });
         const current = this.currentSessionForRequest(sessionId, requestId);
         if (!current)
             return;
         const interruptedByUser = this.interruptedWith.has(sessionId);
-        const interruptedForQuestion = result.stopReason === "ask-user-question";
+        const supportsToolContinuation = provider !== "codex" && provider !== "opencode" && provider !== "grok";
+        const interruptedForQuestion = supportsToolContinuation && result.stopReason === "ask-user-question";
         const failedExit = (result.exitCode !== null && result.exitCode !== 0) || result.signal !== null;
         // A protocol failure remains a failure even if the CLI exits 0 or already produced work.
         // Earlier work is preserved below and must never be replayed on another candidate.
         const failure = result.failure ?? classifyStructuredFailure(result);
         if (failure && !interruptedByUser && !interruptedForQuestion) {
-            const errorText = !failedExit && result.primaryError
+            let errorText = supportsToolContinuation && !failedExit && result.primaryError
                 ? result.primaryError.trim()
                 : this.formatStructuredExitError(commandLabel, result.exitCode, result.signal, {
                     stderr: result.stderr,
                     stdoutTail: result.stdoutTail,
                     primary: result.primaryError,
+                    extras: result.errors,
                 });
+            if (provider === "opencode" && /unknown command|unknown flag|No help topic for 'run'/i.test(result.stderr)) {
+                errorText += "\n检测到旧版 OpenCode CLI；请卸载 0.0.x 旧包并安装 `opencode-ai@latest`。";
+            }
             const failed = this.finishStructuredFailure(current, failedExit && typeof result.exitCode === "number" ? result.exitCode : 1, errorText, result.state);
             if (provider === "pi" && isMissingPiSession(result.stderr, current.claudeSessionId)) {
                 failed.claudeSessionId = null;
@@ -3282,7 +2912,7 @@ export class StructuredSessionManager {
             return;
         }
         const lastToolUse = [...result.state.blocks].reverse().find((block) => block.type === "tool_use");
-        if (lastToolUse?.name === "ExitPlanMode" && result.state.sessionId) {
+        if (supportsToolContinuation && lastToolUse?.name === "ExitPlanMode" && result.state.sessionId) {
             setImmediate(() => {
                 this.sendMessage(sessionId, "Plan approved. Proceed with the implementation.").catch((error) => {
                     console.error("[WAND] Auto-continue after ExitPlanMode failed:", error);