@co0ontty/wand 4.3.0 → 4.4.0-beta.gdcdccb2

package/dist/structured-session-manager.js

@@ -1,7 +1,4 @@
 import { randomUUID } from "node:crypto";
-import { spawn } from "node:child_process";
-import { existsSync, readFileSync, statSync } from "node:fs";
-import path from "node:path";
 import { query as sdkQuery } from "@anthropic-ai/claude-agent-sdk";
 import { prepareSessionWorktree } from "./git-worktree.js";
 import { truncateMessagesForTransport } from "./message-truncator.js";
@@ -10,9 +7,11 @@ import { getErrorMessage } from "./error-utils.js";
 import { resolveSdkClaudeBinary } from "./claude-sdk-runner.js";
 import { generateSessionTopic } from "./session-topic.js";
 import { resolveSessionCwd } from "./session-cwd.js";
-import { buildCodexArgs } from "./structured-codex-adapter.js";
-import { buildAppendSystemPromptParts, buildClaudeCliArgs, buildClaudeSdkThinking, derivePermissionPolicy, } from "./structured-claude-adapter.js";
-import { applyOpenCodeEvent, buildOpenCodeArgs } from "./structured-opencode-adapter.js";
+import { CodexRunner } from "./structured-codex-adapter.js";
+import { normalizeStructuredToolResultContent } from "./structured-content.js";
+import { buildAppendSystemPromptParts, buildClaudeSdkThinking, ClaudeCliRunner, derivePermissionPolicy, } from "./structured-claude-adapter.js";
+import { captureTaskMeta, extractClaudeAssistantMessage, extractClaudeModelName, normalizeClaudeToolInput, stampParentTaskResults, stampSelfTask, tagSubagentBlocks, } from "./structured-claude-protocol.js";
+import { OpenCodeRunner } from "./structured-opencode-adapter.js";
 import { defaultStructuredRunner, defaultStructuredState, isStructuredRunnerForProvider, normalizeThinkingEffort, resolveStructuredRunner, } from "./structured-provider-common.js";
 export { isStructuredRunnerForProvider, normalizeThinkingEffort, resolveStructuredRunner, thinkingEffortToClaudeCliEffort, thinkingEffortToCodexReasoningEffort, thinkingEffortToOpenCodeVariant, thinkingEffortToSdkBudget, } from "./structured-provider-common.js";
 /** The runner already persisted/emitted its detailed terminal snapshot. */
@@ -22,430 +21,6 @@ class PersistedStructuredRunnerError extends Error {
         this.name = "PersistedStructuredRunnerError";
     }
 }
-function asRecord(value) {
-    return value && typeof value === "object" && !Array.isArray(value)
-        ? value
-        : null;
-}
-function getString(value) {
-    return typeof value === "string" ? value : "";
-}
-function parseJsonRecord(value) {
-    if (asRecord(value))
-        return value;
-    if (typeof value !== "string" || !value.trim())
-        return {};
-    try {
-        const parsed = JSON.parse(value);
-        return asRecord(parsed) ?? {};
-    }
-    catch {
-        return {};
-    }
-}
-/**
- * Preserve both Responses content-part arrays and arbitrary structured tool output.
- * Arrays without a `type` discriminator (for example Codex tool_search results)
- * are serialized instead of being filtered to an empty result.
- */
-export function normalizeStructuredToolResultContent(content) {
-    if (typeof content === "string")
-        return content;
-    if (Array.isArray(content)) {
-        const parts = content.filter((item) => !!item && typeof item === "object" && typeof item.type === "string");
-        if (parts.length === content.length)
-            return parts;
-        try {
-            return JSON.stringify(content, null, 2);
-        }
-        catch {
-            return String(content);
-        }
-    }
-    return typeof content === "undefined" || content === null ? "" : String(content);
-}
-function codexPatchToolName(kind) {
-    if (kind === "add")
-        return "Write";
-    return "Edit";
-}
-function codexPatchResultText(stdout, stderr, success) {
-    const err = getString(stderr).trim();
-    const out = getString(stdout).trim();
-    if (!success)
-        return err || out || "patch apply failed";
-    return "";
-}
-export function buildCodexPatchApplyBlocks(item) {
-    const changes = asRecord(item.changes);
-    if (!changes)
-        return [];
-    const callId = getString(item.call_id) || getString(item.id) || "patch";
-    const status = getString(item.status) || "completed";
-    const success = item.success !== false && status !== "failed";
-    const resultText = codexPatchResultText(item.stdout, item.stderr, success);
-    const entries = Object.entries(changes);
-    const blocks = [];
-    entries.forEach(([filePath, rawChange], index) => {
-        const change = asRecord(rawChange) ?? {};
-        const kind = getString(change.type) || "update";
-        const unifiedDiff = getString(change.unified_diff);
-        const movePath = getString(change.move_path);
-        const toolUseId = `${callId}#${index}`;
-        const input = {
-            file_path: filePath,
-            kind,
-            status,
-        };
-        if (unifiedDiff)
-            input.unified_diff = unifiedDiff;
-        if (movePath)
-            input.move_path = movePath;
-        blocks.push({
-            type: "tool_use",
-            id: toolUseId,
-            name: codexPatchToolName(kind),
-            description: kind,
-            input,
-        });
-        blocks.push({
-            type: "tool_result",
-            tool_use_id: toolUseId,
-            content: resultText,
-            is_error: !success,
-        });
-    });
-    return blocks;
-}
-const CODEX_FILE_SNAPSHOT_MAX_BYTES = 512 * 1024;
-const CODEX_DIFF_MAX_EDIT_DISTANCE = 512;
-const CODEX_DIFF_MAX_CHARS = 32 * 1024;
-const CODEX_DIFF_CONTEXT_LINES = 3;
-function readCodexFileSnapshot(filePath) {
-    if (!filePath || !existsSync(filePath))
-        return { exists: false, text: "" };
-    try {
-        const stat = statSync(filePath);
-        if (!stat.isFile()) {
-            return { exists: true, text: null, unavailableReason: "目标不是普通文件" };
-        }
-        if (stat.size > CODEX_FILE_SNAPSHOT_MAX_BYTES) {
-            return { exists: true, text: null, unavailableReason: "文件过大，未生成差异正文" };
-        }
-        const content = readFileSync(filePath);
-        if (content.includes(0)) {
-            return { exists: true, text: null, unavailableReason: "二进制文件不支持文本差异" };
-        }
-        return { exists: true, text: content.toString("utf8") };
-    }
-    catch (error) {
-        return {
-            exists: true,
-            text: null,
-            unavailableReason: `读取文件失败：${getErrorMessage(error)}`,
-        };
-    }
-}
-/**
- * Myers line diff. File snapshots are bounded above; the edit-distance guard
- * keeps completely rewritten generated files from consuming quadratic memory.
- */
-function diffCodexLines(before, after) {
-    const max = before.length + after.length;
-    let frontier = new Map([[1, 0]]);
-    const trace = [];
-    let completedDistance = -1;
-    for (let distance = 0; distance <= max && distance <= CODEX_DIFF_MAX_EDIT_DISTANCE; distance++) {
-        trace.push(new Map(frontier));
-        for (let diagonal = -distance; diagonal <= distance; diagonal += 2) {
-            const down = frontier.get(diagonal + 1) ?? Number.NEGATIVE_INFINITY;
-            const right = frontier.get(diagonal - 1) ?? Number.NEGATIVE_INFINITY;
-            let oldIndex = diagonal === -distance || (diagonal !== distance && right < down)
-                ? Math.max(0, down)
-                : Math.max(0, right + 1);
-            let newIndex = oldIndex - diagonal;
-            while (oldIndex < before.length
-                && newIndex < after.length
-                && before[oldIndex] === after[newIndex]) {
-                oldIndex++;
-                newIndex++;
-            }
-            frontier.set(diagonal, oldIndex);
-            if (oldIndex >= before.length && newIndex >= after.length) {
-                completedDistance = distance;
-                break;
-            }
-        }
-        if (completedDistance >= 0)
-            break;
-    }
-    // A very large rewrite is still useful to inspect. This fallback is not
-    // minimal, but remains truthful and is later clipped by transport/UI limits.
-    if (completedDistance < 0) {
-        return [
-            ...before.map((text) => ({ kind: "delete", text })),
-            ...after.map((text) => ({ kind: "add", text })),
-        ];
-    }
-    const reversed = [];
-    let oldIndex = before.length;
-    let newIndex = after.length;
-    for (let distance = completedDistance; distance >= 0; distance--) {
-        const previous = trace[distance];
-        const diagonal = oldIndex - newIndex;
-        const down = previous.get(diagonal + 1) ?? Number.NEGATIVE_INFINITY;
-        const right = previous.get(diagonal - 1) ?? Number.NEGATIVE_INFINITY;
-        const previousDiagonal = diagonal === -distance || (diagonal !== distance && right < down)
-            ? diagonal + 1
-            : diagonal - 1;
-        const previousOldIndex = Math.max(0, previous.get(previousDiagonal) ?? 0);
-        const previousNewIndex = previousOldIndex - previousDiagonal;
-        while (oldIndex > previousOldIndex && newIndex > previousNewIndex) {
-            reversed.push({ kind: "equal", text: before[oldIndex - 1] });
-            oldIndex--;
-            newIndex--;
-        }
-        if (distance === 0)
-            break;
-        if (oldIndex === previousOldIndex) {
-            reversed.push({ kind: "add", text: after[newIndex - 1] });
-            newIndex--;
-        }
-        else {
-            reversed.push({ kind: "delete", text: before[oldIndex - 1] });
-            oldIndex--;
-        }
-    }
-    return reversed.reverse();
-}
-function codexDiffPath(filePath) {
-    return filePath.replace(/[\r\n]/g, " ").replace(/^\/+/, "");
-}
-function codexDiffLines(text) {
-    if (!text)
-        return [];
-    const normalized = text.replace(/\r\n/g, "\n");
-    const lines = normalized.split("\n");
-    if (normalized.endsWith("\n"))
-        lines.pop();
-    return lines;
-}
-function buildCodexUnifiedDiff(filePath, before, after) {
-    if (before.text === null || after.text === null || before.text === after.text)
-        return "";
-    const oldLines = codexDiffLines(before.text);
-    const newLines = codexDiffLines(after.text);
-    const lines = diffCodexLines(oldLines, newLines);
-    const changedIndexes = lines
-        .map((line, index) => line.kind === "equal" ? -1 : index)
-        .filter((index) => index >= 0);
-    if (changedIndexes.length === 0)
-        return "";
-    const oldBefore = [];
-    const newBefore = [];
-    let oldCount = 0;
-    let newCount = 0;
-    lines.forEach((line, index) => {
-        oldBefore[index] = oldCount;
-        newBefore[index] = newCount;
-        if (line.kind !== "add")
-            oldCount++;
-        if (line.kind !== "delete")
-            newCount++;
-    });
-    const hunks = [];
-    for (const changedIndex of changedIndexes) {
-        const start = Math.max(0, changedIndex - CODEX_DIFF_CONTEXT_LINES);
-        const end = Math.min(lines.length, changedIndex + CODEX_DIFF_CONTEXT_LINES + 1);
-        const previous = hunks[hunks.length - 1];
-        if (previous && start <= previous.end)
-            previous.end = Math.max(previous.end, end);
-        else
-            hunks.push({ start, end });
-    }
-    const displayPath = codexDiffPath(filePath);
-    const output = [
-        before.exists ? `--- a/${displayPath}` : "--- /dev/null",
-        after.exists ? `+++ b/${displayPath}` : "+++ /dev/null",
-    ];
-    for (const hunk of hunks) {
-        const hunkLines = lines.slice(hunk.start, hunk.end);
-        const hunkOldCount = hunkLines.filter((line) => line.kind !== "add").length;
-        const hunkNewCount = hunkLines.filter((line) => line.kind !== "delete").length;
-        const hunkOldStart = hunkOldCount === 0 ? oldBefore[hunk.start] : oldBefore[hunk.start] + 1;
-        const hunkNewStart = hunkNewCount === 0 ? newBefore[hunk.start] : newBefore[hunk.start] + 1;
-        output.push(`@@ -${hunkOldStart},${hunkOldCount} +${hunkNewStart},${hunkNewCount} @@`);
-        for (const line of hunkLines) {
-            output.push(`${line.kind === "add" ? "+" : line.kind === "delete" ? "-" : " "}${line.text}`);
-        }
-    }
-    const diff = output.join("\n");
-    if (diff.length <= CODEX_DIFF_MAX_CHARS)
-        return diff;
-    const cutAt = diff.lastIndexOf("\n", CODEX_DIFF_MAX_CHARS);
-    return `${diff.slice(0, cutAt > 0 ? cutAt : CODEX_DIFF_MAX_CHARS)}\n…（差异正文已截断）`;
-}
-export function buildCodexFileChangeBlocks(item, completed, beforeSnapshots = new Map(), afterSnapshots = new Map()) {
-    const id = getString(item.id) || "file-change";
-    const rawChanges = Array.isArray(item.changes) ? item.changes : [];
-    const status = getString(item.status) || (completed ? "completed" : "in_progress");
-    const isError = status === "failed";
-    const blocks = [];
-    rawChanges.forEach((entry, index) => {
-        const change = asRecord(entry);
-        if (!change)
-            return;
-        const filePath = getString(change.path);
-        const kind = getString(change.kind) || "update";
-        const toolUseId = `${id}#${index}`;
-        const input = { file_path: filePath, kind, status };
-        const before = beforeSnapshots.get(toolUseId);
-        const after = afterSnapshots.get(toolUseId);
-        if (completed && before && after) {
-            const unifiedDiff = buildCodexUnifiedDiff(filePath, before, after);
-            if (unifiedDiff)
-                input.unified_diff = unifiedDiff;
-            const unavailableReason = before.unavailableReason || after.unavailableReason;
-            if (!unifiedDiff && unavailableReason)
-                input.diff_unavailable_reason = unavailableReason;
-        }
-        blocks.push({
-            type: "tool_use",
-            id: toolUseId,
-            name: codexPatchToolName(kind),
-            description: kind,
-            input,
-        });
-        if (completed) {
-            blocks.push({
-                type: "tool_result",
-                tool_use_id: toolUseId,
-                content: isError ? `file change failed: ${filePath}` : "",
-                is_error: isError,
-            });
-        }
-    });
-    return blocks;
-}
-/**
- * Codex `exec --json` only publishes authoritative usage with `turn.completed`.
- * Keep the bottom usage row useful while the turn is running by estimating the
- * model-produced text/tool arguments; the final provider value replaces this.
- */
-export function estimateCodexOutputTokens(blocks) {
-    let asciiUnits = 0;
-    let wideUnits = 0;
-    const addText = (value) => {
-        for (const char of value) {
-            if (char.codePointAt(0) <= 0x7f)
-                asciiUnits += 1;
-            else
-                wideUnits += 1;
-        }
-    };
-    for (const block of blocks) {
-        if (block.type === "text")
-            addText(block.text);
-        else if (block.type === "thinking")
-            addText(block.thinking);
-        else if (block.type === "tool_use") {
-            addText(block.name);
-            try {
-                addText(JSON.stringify(block.input));
-            }
-            catch { /* best-effort live estimate */ }
-        }
-    }
-    if (asciiUnits === 0 && wideUnits === 0)
-        return 0;
-    return Math.max(1, Math.ceil(asciiUnits / 4 + wideUnits));
-}
-function refreshEstimatedCodexUsage(turnState) {
-    if (turnState.usage?.estimated !== true)
-        return;
-    turnState.usage = {
-        outputTokens: estimateCodexOutputTokens(turnState.blocks),
-        estimated: true,
-    };
-}
-function captureTaskMeta(blocks, registry) {
-    for (const b of blocks) {
-        if (b.type !== "tool_use")
-            continue;
-        if (registry.has(b.id))
-            continue;
-        const input = b.input ?? {};
-        // Claude SDK 把这类"派 subagent 干活"的内置工具叫做 "Agent"，CLI/旧版本里
-        // 也叫过 "Task"。判定不靠工具名（容易随版本变），而是看 input 是否含有
-        // `subagent_type` 字段——这是 Agent/Task 系列的唯一标志。
-        const agentType = typeof input.subagent_type === "string" ? input.subagent_type : undefined;
-        if (!agentType && b.name !== "Task" && b.name !== "Agent")
-            continue;
-        const description = typeof input.description === "string" ? input.description : undefined;
-        registry.set(b.id, { agentType, description });
-    }
-}
-/**
- * Stamp every block with `__subagent` meta keyed to `parentToolUseId`. When
- * the id has no entry yet (rare race: subagent emits before we see the parent
- * Task tool_use), we still stamp the bare taskId so the UI can group blocks;
- * agentType / description backfill on later updates.
- */
-function tagSubagentBlocks(blocks, parentToolUseId, registry) {
-    if (!parentToolUseId)
-        return blocks;
-    const meta = registry.get(parentToolUseId);
-    const stamp = {
-        taskId: parentToolUseId,
-        ...(meta?.agentType ? { agentType: meta.agentType } : {}),
-        ...(meta?.description ? { taskDescription: meta.description } : {}),
-    };
-    return blocks.map((block) => ({ ...block, __subagent: stamp }));
-}
-/**
- * 给已被 captureTaskMeta 识别为 Task/Agent 的 tool_use block 本身也盖 __subagent 章。
- * taskId 用自己的 block.id —— 与子消息的 parent_tool_use_id（也等于这个 id）保持一致，
- * 前端 splitTurnBySubagent 按 taskId 分组时父 Task tool_use 和 SDK 转发的子消息能合并到同一段。
- */
-function stampSelfTask(blocks, registry) {
-    return blocks.map((b) => {
-        if (b.type !== "tool_use")
-            return b;
-        if (b.__subagent)
-            return b; // 已盖章不重复（防止幂等问题）
-        const meta = registry.get(b.id);
-        if (!meta && b.name !== "Task" && b.name !== "Agent")
-            return b;
-        const stamp = {
-            taskId: b.id,
-            ...(meta?.agentType ? { agentType: meta.agentType } : {}),
-            ...(meta?.description ? { taskDescription: meta.description } : {}),
-        };
-        return { ...b, __subagent: stamp };
-    });
-}
-/**
- * 当父 assistant 在 parentToolUseId === null 的 user turn 里收到 Task 工具的 tool_result 时，
- * tagSubagentBlocks 不会被调用（它只在 parentToolUseId 非空时盖章）。这里按 tool_use_id
- * 反查 registry，给这条 tool_result 单独盖章，让前端能把它归到同一个 subagent 段。
- */
-function stampParentTaskResults(blocks, registry) {
-    return blocks.map((b) => {
-        if (b.type !== "tool_result")
-            return b;
-        if (b.__subagent)
-            return b;
-        const meta = registry.get(b.tool_use_id);
-        if (!meta)
-            return b;
-        const stamp = {
-            taskId: b.tool_use_id,
-            ...(meta.agentType ? { agentType: meta.agentType } : {}),
-            ...(meta.description ? { taskDescription: meta.description } : {}),
-        };
-        return { ...b, __subagent: stamp };
-    });
-}
 const STREAM_EMIT_DEBOUNCE_MS = 16;
 /** Min interval between full saveSession() calls for an in-progress streaming turn.
  *  saveSession serializes the entire messages array, so doing it on every NDJSON
@@ -584,7 +159,7 @@ export class StructuredSessionManager {
     logger;
     sdkQueryFactory;
     sessions = new Map();
-    pendingChildren = new Map();
+    pendingRunnerExecutions = new Map();
     pendingSdkAbort = new Map();
     /**
      * Active SDK Query handle per session, kept around so we can call
@@ -617,12 +192,18 @@ export class StructuredSessionManager {
     archiveTimer = null;
     topicRequests = new Set();
     streamEmitTimers = new Set();
+    claudeCliRunner;
+    codexRunner;
+    openCodeRunner;
     disposed = false;
-    constructor(storage, config, logger = null, sdkQueryFactory = sdkQuery) {
+    constructor(storage, config, logger = null, sdkQueryFactory = sdkQuery, runners = {}) {
         this.storage = storage;
         this.config = config;
         this.logger = logger;
         this.sdkQueryFactory = sdkQueryFactory;
+        this.claudeCliRunner = runners.claudeCli ?? new ClaudeCliRunner({ language: () => this.config.language });
+        this.codexRunner = runners.codex ?? new CodexRunner();
+        this.openCodeRunner = runners.opencode ?? new OpenCodeRunner();
         for (const snapshot of this.storage.loadSessions()) {
             if ((snapshot.sessionKind ?? "pty") !== "structured")
                 continue;
@@ -706,7 +287,7 @@ export class StructuredSessionManager {
             clearTimeout(timer);
         this.streamEmitTimers.clear();
         const activeSessionIds = new Set([
-            ...this.pendingChildren.keys(),
+            ...this.pendingRunnerExecutions.keys(),
             ...this.pendingSdkQueries.keys(),
             ...this.pendingSdkAbort.keys(),
             ...Array.from(this.sessions.values())
@@ -737,18 +318,14 @@ export class StructuredSessionManager {
             }
             catch { /* best-effort shutdown flush */ }
         }
-        for (const child of this.pendingChildren.values()) {
-            try {
-                child.kill();
-            }
-            catch { /* ignore */ }
-        }
+        for (const execution of this.pendingRunnerExecutions.values())
+            execution.interrupt();
         for (const query of this.pendingSdkQueries.values()) {
             void query.interrupt().catch(() => { });
         }
         for (const controller of this.pendingSdkAbort.values())
             controller.abort();
-        this.pendingChildren.clear();
+        this.pendingRunnerExecutions.clear();
         this.pendingSdkQueries.clear();
         this.pendingSdkAbort.clear();
         this.interruptedWith.clear();
@@ -995,17 +572,16 @@ export class StructuredSessionManager {
             }
         }
         if (session.structuredState?.inFlight) {
-            const child = this.pendingChildren.get(id);
+            const runnerExecution = this.pendingRunnerExecutions.get(id);
             const sdkAbort = this.pendingSdkAbort.get(id);
             const sdkQueryHandle = this.pendingSdkQueries.get(id);
-            // ChildProcess.killed only means kill() successfully sent a signal; the
-            // process can keep running until its close/error callback releases this
-            // exact handle. Treat map ownership as the authoritative in-flight state.
-            const childActive = Boolean(child);
+            // interrupt() only requests cancellation; completion can settle later.
+            // Treat runner-map ownership as the authoritative in-flight state.
+            const childActive = Boolean(runnerExecution);
             const sdkAlive = Boolean(sdkQueryHandle || (sdkAbort && !sdkAbort.signal.aborted));
             if (!childActive && !sdkAlive) {
-                if (child)
-                    this.releasePendingChild(id, child);
+                if (runnerExecution)
+                    this.releasePendingRunnerExecution(id, runnerExecution);
                 if (sdkAbort)
                     this.releasePendingSdkAbort(id, sdkAbort);
                 const recovered = {
@@ -1046,12 +622,7 @@ export class StructuredSessionManager {
                 else {
                     this.preserveQueueOnInterrupt.delete(id);
                 }
-                if (childActive && child) {
-                    try {
-                        child.kill("SIGTERM");
-                    }
-                    catch (_err) { /* ignore */ }
-                }
+                runnerExecution?.interrupt();
                 if (sdkQueryHandle) {
                     void sdkQueryHandle.interrupt().catch(() => { });
                 }
@@ -1416,10 +987,10 @@ export class StructuredSessionManager {
             },
         };
         this.sessions.set(id, cancelled);
-        const child = this.pendingChildren.get(id);
-        if (child) {
-            child.kill();
-            this.releasePendingChild(id, child);
+        const runnerExecution = this.pendingRunnerExecutions.get(id);
+        if (runnerExecution) {
+            runnerExecution.interrupt();
+            this.releasePendingRunnerExecution(id, runnerExecution);
         }
         // SDK runner：先尝试 query.interrupt() 优雅停止，失败再走 abort。
         // 两个都清掉避免后续重复操作。
@@ -1439,15 +1010,15 @@ export class StructuredSessionManager {
         return cancelled;
     }
     delete(id) {
-        const child = this.pendingChildren.get(id);
+        const runnerExecution = this.pendingRunnerExecutions.get(id);
         const sdkQuery = this.pendingSdkQueries.get(id);
         const sdkAbort = this.pendingSdkAbort.get(id);
-        // Invalidate callback ownership before signalling the runner. Abort/kill can
-        // synchronously wake listeners in some SDK/ChildProcess implementations.
+        // Invalidate callback ownership before signalling the runner. Cancellation
+        // can synchronously wake listeners in some SDK/adapter implementations.
         this.sessions.delete(id);
-        if (child) {
-            child.kill();
-            this.releasePendingChild(id, child);
+        if (runnerExecution) {
+            runnerExecution.interrupt();
+            this.releasePendingRunnerExecution(id, runnerExecution);
         }
         if (sdkQuery) {
             void sdkQuery.interrupt().catch(() => { });
@@ -1483,10 +1054,10 @@ export class StructuredSessionManager {
         return this.sessions.get(sessionId) ?? null;
     }
     /** Delete a handle only if it still belongs to the execution doing cleanup. */
-    releasePendingChild(sessionId, child) {
-        if (this.pendingChildren.get(sessionId) !== child)
+    releasePendingRunnerExecution(sessionId, execution) {
+        if (this.pendingRunnerExecutions.get(sessionId) !== execution)
             return false;
-        this.pendingChildren.delete(sessionId);
+        this.pendingRunnerExecutions.delete(sessionId);
         return true;
     }
     releasePendingSdkAbort(sessionId, controller) {
@@ -1579,532 +1150,315 @@ export class StructuredSessionManager {
     // ---------------------------------------------------------------------------
     // Streaming codex exec --json execution
     // ---------------------------------------------------------------------------
-    runCodexStreaming(sessionId, session, prompt, requestId) {
-        return new Promise((resolve, reject) => {
-            const args = buildCodexArgs(session);
-            const spawnedAt = new Date().toISOString();
-            const child = spawn("codex", args, {
-                cwd: session.cwd,
-                env: buildChildEnv(this.config.inheritEnv !== false),
-                stdio: ["pipe", "pipe", "pipe"],
-            });
-            this.logger?.appendStructuredSpawn(sessionId, {
-                kind: "codex-exec",
-                provider: "codex",
-                pid: child.pid ?? null,
-                cwd: session.cwd,
-                args,
-                prompt: prompt.slice(0, 2048),
-                promptLength: prompt.length,
-                threadId: session.claudeSessionId,
-                spawnedAt,
-            });
-            this.pendingChildren.set(sessionId, child);
-            child.stdin?.end(prompt);
-            const turnState = {
-                blocks: [],
-                result: "",
-                sessionId: session.claudeSessionId,
-                model: session.selectedModel ?? session.structuredState?.model,
-                usage: { outputTokens: 0, estimated: true },
-                codexBlockIndex: new Map(),
-                codexFileSnapshots: new Map(),
-                cwd: session.cwd,
-            };
-            let lineBuf = "";
-            let stderr = "";
-            let emitTimer = null;
-            let settled = false;
-            // codex 把所有错误（包括重试日志和最终失败原因）都通过 stdout 的 NDJSON 事件
-            // 输出，stderr 通常是空的。我们在 processLine 里收集这些，然后在 close 中
-            // 决定真正的报错文本。
-            const codexErrors = [];
-            let codexTurnFailed = null;
-            const flushEmit = () => {
-                if (emitTimer) {
-                    this.clearStreamEmitTimer(emitTimer);
-                    emitTimer = null;
-                }
-                const current = this.currentSessionForRequest(sessionId, requestId);
-                if (!current)
-                    return;
-                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 syncSnapshot = () => {
-                const current = this.currentSessionForRequest(sessionId, requestId);
-                if (!current)
-                    return;
-                refreshEstimatedCodexUsage(turnState);
-                const inProgressTurn = {
-                    role: "assistant",
-                    content: this.compactContentBlocks([...turnState.blocks], turnState.result),
-                    usage: turnState.usage,
-                };
-                const msgs = [...(current.messages ?? [])];
-                const lastMsg = msgs[msgs.length - 1];
-                if (lastMsg && lastMsg.role === "assistant") {
-                    msgs[msgs.length - 1] = inProgressTurn;
-                }
-                else {
-                    msgs.push(inProgressTurn);
-                }
-                const patched = {
-                    ...current,
-                    claudeSessionId: turnState.sessionId ?? current.claudeSessionId,
-                    messages: msgs,
-                    output: turnState.result || current.output,
-                    structuredState: {
-                        ...current.structuredState,
-                        model: turnState.model ?? current.structuredState?.model,
-                    },
-                };
-                this.sessions.set(sessionId, patched);
-                this.saveStreamingSnapshot(patched);
+    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 processLine = (line) => {
-                if (!this.isCurrentRequest(sessionId, requestId))
-                    return;
-                const trimmed = line.trim();
-                if (!trimmed)
-                    return;
-                let parsed;
-                try {
-                    parsed = JSON.parse(trimmed);
-                }
-                catch {
-                    return;
-                }
-                this.logger?.appendStreamEvent(sessionId, parsed);
-                const event = this.unwrapCodexStreamEvent(parsed);
-                if (event?.type === "thread.started" && typeof event.thread_id === "string") {
-                    turnState.sessionId = event.thread_id;
-                    syncSnapshot();
-                    return;
-                }
-                if (event?.type === "item.started" && asRecord(event.item)) {
-                    this.applyCodexItem(turnState, event.item, "started");
-                    syncSnapshot();
-                    scheduleEmit();
-                    return;
-                }
-                if (event?.type === "item.updated" && asRecord(event.item)) {
-                    // codex `item.updated` 重新发送完整 ThreadItem（不是 delta）。
-                    // 对 text/thinking/TodoWrite 走 codexBlockIndex 替换；对 tool_use
-                    // 仍然按现有 id 复用，避免重复卡片。
-                    this.applyCodexItem(turnState, event.item, "updated");
-                    syncSnapshot();
-                    scheduleEmit();
-                    return;
-                }
-                if (event?.type === "item.completed" && asRecord(event.item)) {
-                    this.applyCodexItem(turnState, event.item, "completed");
-                    syncSnapshot();
-                    scheduleEmit();
-                    return;
-                }
-                if (event?.type === "turn.completed") {
-                    turnState.usage = this.extractCodexUsage(asRecord(event.usage) ?? undefined) ?? turnState.usage;
-                    syncSnapshot();
-                    scheduleEmit();
-                    return;
-                }
-                if (event?.type === "token_count") {
-                    const info = asRecord(event.info);
-                    const lastUsage = asRecord(info?.last_token_usage);
-                    turnState.usage = this.extractCodexUsage(lastUsage ?? undefined) ?? turnState.usage;
-                    syncSnapshot();
-                    scheduleEmit();
-                    return;
-                }
-                if (this.applyCodexLooseEvent(turnState, event)) {
-                    syncSnapshot();
-                    scheduleEmit();
-                    return;
-                }
-                if (event?.type === "error") {
-                    const message = typeof event.message === "string" ? event.message : "";
-                    if (message)
-                        codexErrors.push(message);
-                    return;
-                }
-                if (event?.type === "turn.failed") {
-                    const errObj = (event.error && typeof event.error === "object") ? event.error : null;
-                    const message = (errObj && typeof errObj.message === "string" && errObj.message)
-                        || (typeof event.message === "string" ? event.message : "")
-                        || "codex turn failed";
-                    codexTurnFailed = message;
-                    return;
-                }
+            const messages = [...(current.messages ?? [])];
+            if (messages[messages.length - 1]?.role === "assistant")
+                messages[messages.length - 1] = turn;
+            else
+                messages.push(turn);
+            const patched = {
+                ...current,
+                claudeSessionId: turnState.sessionId ?? current.claudeSessionId,
+                messages,
+                output: turnState.result || current.output,
+                structuredState: {
+                    ...current.structuredState,
+                    model: turnState.model ?? current.structuredState?.model,
+                },
             };
-            child.stdout?.on("data", (chunk) => {
-                if (!this.isCurrentRequest(sessionId, requestId))
-                    return;
-                const text = chunk.toString();
-                this.logger?.appendStructuredStdout(sessionId, text);
-                lineBuf += text;
-                const lines = lineBuf.split("\n");
-                lineBuf = lines.pop() ?? "";
-                for (const line of lines)
-                    processLine(line);
-            });
-            child.stderr?.on("data", (chunk) => {
-                if (!this.isCurrentRequest(sessionId, requestId))
-                    return;
-                const text = chunk.toString();
-                this.logger?.appendStructuredStderr(sessionId, text);
-                stderr += text;
-            });
-            child.on("error", (error) => {
-                const released = this.releasePendingChild(sessionId, child);
-                if (released)
-                    this.cancelStreamingCheckpointTimer(sessionId);
-                if (emitTimer)
-                    this.clearStreamEmitTimer(emitTimer);
-                if (settled)
-                    return;
-                if (!this.isCurrentRequest(sessionId, requestId)) {
-                    settled = true;
-                    resolve();
-                    return;
-                }
-                settled = true;
-                this.logger?.appendStructuredSpawn(sessionId, {
-                    kind: "codex-exec-error",
-                    pid: child.pid ?? null,
-                    spawnedAt,
-                    closedAt: new Date().toISOString(),
-                    spawnError: error.message,
-                });
-                // spawn 直接失败（最常见是 ENOENT —— PATH 里找不到 codex 可执行文件）。
-                // 之前只 reject(error)，外层 catch 会把 error.message 直接当 lastError，
-                // 用户看到的就是裸的 "spawn codex ENOENT"，没法快速反应。这里加一层
-                // 包装把上下文（runner 名 + 常见排查建议）拼好。
-                const nodeErr = error;
-                const hint = nodeErr.code === "ENOENT"
-                    ? "（PATH 中找不到 codex 可执行文件；请确认 codex 已安装，或重跑 `wand service:install` 刷新服务的 PATH）"
-                    : "";
-                reject(new Error(`codex exec 启动失败：${error.message}${hint}`));
-            });
-            child.on("close", (code, signal) => {
-                const released = this.releasePendingChild(sessionId, child);
-                if (released)
-                    this.cancelStreamingCheckpointTimer(sessionId);
-                if (settled)
-                    return;
-                if (!this.isCurrentRequest(sessionId, requestId)) {
-                    if (emitTimer)
-                        this.clearStreamEmitTimer(emitTimer);
-                    settled = true;
-                    resolve();
-                    return;
-                }
-                if (lineBuf.trim()) {
-                    processLine(lineBuf);
-                    lineBuf = "";
-                }
-                flushEmit();
-                const closedAt = new Date().toISOString();
-                this.logger?.appendStructuredSpawn(sessionId, {
-                    kind: "codex-exec-close",
-                    pid: child.pid ?? null,
-                    spawnedAt,
-                    closedAt,
-                    exitCode: code,
-                    stderrTail: stderr.slice(-2048),
-                    codexErrors,
-                    codexTurnFailed,
+            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 current = this.currentSessionForRequest(sessionId, requestId);
-                if (!current) {
-                    settled = true;
-                    resolve();
-                    return;
-                }
-                // 主动中断时（interruptedWith 里有新消息），不走失败路径
-                const interruptedByUser = this.interruptedWith.has(sessionId);
-                const interruptPrompt = this.interruptedWith.get(sessionId);
-                // codex 把模型/网络/沙箱等错误写到 stdout 的 NDJSON 流（type: error / turn.failed），
-                // 而不是 stderr。我们以 turn.failed 的 message 为准，其次是最后一个 error 事件。
-                const codexFailed = codexTurnFailed !== null;
-                if ((codexFailed || (code !== 0 && code !== null) || signal) && !interruptedByUser) {
-                    const errorText = this.formatStructuredExitError("codex exec", code, signal, {
-                        stderr,
-                        primary: codexTurnFailed,
-                        extras: codexErrors,
-                    });
-                    const exitForSnapshot = typeof code === "number" ? code : 1;
-                    const failed = this.finishStructuredFailure(current, exitForSnapshot, errorText, turnState);
-                    this.sessions.set(sessionId, failed);
-                    this.saveAuthoritativeSession(failed);
-                    this.emitStructuredSnapshot(failed);
-                    this.emitStructuredSnapshot(failed, "ended");
-                    settled = true;
-                    reject(new PersistedStructuredRunnerError(errorText));
-                    return;
-                }
-                const msgs = this.buildCompletedAssistantMessages(current, turnState);
-                const keepRunning = !!interruptPrompt;
-                const finished = {
-                    ...current,
-                    status: keepRunning ? "running" : "idle",
-                    exitCode: keepRunning ? null : 0,
-                    endedAt: keepRunning ? null : new Date().toISOString(),
-                    output: turnState.result,
-                    claudeSessionId: turnState.sessionId ?? current.claudeSessionId,
-                    messages: msgs,
-                    queuedMessages: this.resolveQueuedMessagesAfterInterrupt(sessionId, current, interruptPrompt),
-                    pendingEscalation: null,
-                    permissionBlocked: false,
-                    structuredState: {
-                        ...current.structuredState,
-                        model: turnState.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);
-                    // 把"保留队列"标记一并清掉——不属于本次 interrupt 的后续轮次会按
-                    // 默认（清空 queue）行为走，避免 stale flag 影响下一次普通 interrupt。
-                    // 注意：被保留的 queuedMessages 不需要在这里主动 flush，重发的
-                    // interruptPrompt 跑完会自然触发 flushNextQueuedMessage。
-                    this.preserveQueueOnInterrupt.delete(sessionId);
-                    settled = true;
-                    resolve();
-                    setImmediate(() => {
-                        this.sendMessage(sessionId, interruptPrompt).catch((err) => {
-                            console.error("[WAND] codex interrupt-and-send failed:", err);
-                        });
-                    });
-                    return;
-                }
-                settled = true;
-                resolve();
-                setImmediate(() => { void this.flushNextQueuedMessage(sessionId); });
-            });
-        });
-    }
-    runOpenCodeStreaming(sessionId, session, prompt, requestId) {
-        return new Promise((resolve, reject) => {
-            const args = buildOpenCodeArgs(session);
-            const spawnedAt = new Date().toISOString();
-            const child = spawn("opencode", args, {
-                cwd: session.cwd,
-                env: buildChildEnv(this.config.inheritEnv !== false),
-                stdio: ["pipe", "pipe", "pipe"],
-            });
-            this.logger?.appendStructuredSpawn(sessionId, {
-                kind: "opencode-run",
-                provider: "opencode",
-                pid: child.pid ?? null,
-                cwd: session.cwd,
-                args,
-                prompt: prompt.slice(0, 2048),
-                promptLength: prompt.length,
-                sessionId: session.claudeSessionId,
-                spawnedAt,
-            });
-            this.pendingChildren.set(sessionId, child);
-            child.stdin?.end(prompt);
-            const turnState = {
-                blocks: [],
-                result: "",
-                sessionId: session.claudeSessionId,
-                model: session.selectedModel ?? session.structuredState?.model,
-                usage: undefined,
-                codexBlockIndex: new Map(),
-                cwd: session.cwd,
-            };
-            let lineBuf = "";
-            let stderr = "";
-            let primaryError = null;
-            let emitTimer = null;
-            let settled = false;
-            const syncSnapshot = () => {
-                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 = [...(current.messages ?? [])];
-                if (messages[messages.length - 1]?.role === "assistant")
-                    messages[messages.length - 1] = turn;
-                else
-                    messages.push(turn);
-                const patched = {
-                    ...current,
-                    claudeSessionId: turnState.sessionId ?? current.claudeSessionId,
-                    messages,
-                    output: turnState.result || current.output,
-                };
-                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 processLine = (line) => {
-                if (!this.isCurrentRequest(sessionId, requestId))
-                    return;
-                const trimmed = line.trim();
-                if (!trimmed)
-                    return;
-                let event;
-                try {
-                    event = JSON.parse(trimmed);
-                }
-                catch {
-                    return;
-                }
-                this.logger?.appendStreamEvent(sessionId, event);
-                const error = applyOpenCodeEvent(turnState, event);
-                if (error)
-                    primaryError = error;
-                syncSnapshot();
+            }
+        };
+        const scheduleEmit = () => {
+            if (!emitTimer) {
+                emitTimer = this.trackStreamEmitTimer(setTimeout(flushEmit, STREAM_EMIT_DEBOUNCE_MS));
+            }
+        };
+        const execution = this.codexRunner.start({
+            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();
-            };
-            child.stdout?.on("data", (chunk) => {
-                if (!this.isCurrentRequest(sessionId, requestId))
-                    return;
-                const text = chunk.toString();
-                this.logger?.appendStructuredStdout(sessionId, text);
-                lineBuf += text;
-                const lines = lineBuf.split("\n");
-                lineBuf = lines.pop() ?? "";
-                for (const line of lines)
-                    processLine(line);
-            });
-            child.stderr?.on("data", (chunk) => {
-                if (!this.isCurrentRequest(sessionId, requestId))
-                    return;
-                const text = chunk.toString();
-                this.logger?.appendStructuredStderr(sessionId, text);
-                stderr += text;
-            });
-            child.on("error", (error) => {
-                const released = this.releasePendingChild(sessionId, child);
-                if (released)
-                    this.cancelStreamingCheckpointTimer(sessionId);
-                if (emitTimer)
-                    this.clearStreamEmitTimer(emitTimer);
-                if (settled)
-                    return;
-                if (!this.isCurrentRequest(sessionId, requestId)) {
-                    settled = true;
-                    resolve();
-                    return;
-                }
-                settled = true;
-                const nodeError = error;
-                const hint = nodeError.code === "ENOENT"
-                    ? "（PATH 中找不到 opencode；请安装 opencode-ai，或重跑 `wand service:install` 刷新服务 PATH）"
-                    : "";
-                reject(new Error(`opencode run 启动失败：${error.message}${hint}`));
-            });
-            child.on("close", (code, signal) => {
-                const released = this.releasePendingChild(sessionId, child);
-                if (released)
-                    this.cancelStreamingCheckpointTimer(sessionId);
-                if (settled)
-                    return;
-                if (!this.isCurrentRequest(sessionId, requestId)) {
-                    if (emitTimer)
-                        this.clearStreamEmitTimer(emitTimer);
-                    settled = true;
-                    resolve();
-                    return;
-                }
-                if (lineBuf.trim())
-                    processLine(lineBuf);
-                flushEmit();
-                const current = this.currentSessionForRequest(sessionId, requestId);
-                if (!current) {
-                    settled = true;
-                    resolve();
-                    return;
-                }
-                const interruptedByUser = this.interruptedWith.has(sessionId);
-                const interruptPrompt = this.interruptedWith.get(sessionId);
-                if ((primaryError || (code !== 0 && code !== null) || signal) && !interruptedByUser) {
-                    const legacyHint = /unknown command|unknown flag|No help topic for 'run'/i.test(stderr)
-                        ? "\n检测到旧版 OpenCode CLI；请卸载 0.0.x 旧包并安装 `opencode-ai@latest`。"
-                        : "";
-                    const errorText = this.formatStructuredExitError("opencode run", code, signal, { stderr, primary: primaryError }) + legacyHint;
-                    const failed = this.finishStructuredFailure(current, typeof code === "number" ? code : 1, errorText, turnState);
-                    this.sessions.set(sessionId, failed);
-                    this.saveAuthoritativeSession(failed);
-                    this.emitStructuredSnapshot(failed);
-                    this.emitStructuredSnapshot(failed, "ended");
-                    settled = true;
-                    reject(new PersistedStructuredRunnerError(errorText));
-                    return;
-                }
-                const messages = this.buildCompletedAssistantMessages(current, turnState);
-                const keepRunning = !!interruptPrompt;
-                const finished = {
-                    ...current,
-                    status: keepRunning ? "running" : "idle",
-                    exitCode: keepRunning ? null : 0,
-                    endedAt: keepRunning ? null : new Date().toISOString(),
-                    output: turnState.result,
-                    claudeSessionId: turnState.sessionId ?? current.claudeSessionId,
-                    messages,
-                    queuedMessages: this.resolveQueuedMessagesAfterInterrupt(sessionId, current, interruptPrompt),
-                    pendingEscalation: null,
-                    permissionBlocked: false,
-                    structuredState: {
-                        ...current.structuredState,
-                        model: turnState.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);
-                    settled = true;
-                    resolve();
-                    setImmediate(() => {
-                        this.sendMessage(sessionId, interruptPrompt).catch((error) => {
-                            console.error("[WAND] opencode interrupt-and-send failed:", error);
-                        });
-                    });
-                    return;
-                }
-                settled = true;
-                resolve();
-                setImmediate(() => { void this.flushNextQueuedMessage(sessionId); });
+            },
+        });
+        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();
+        if (result.spawnError) {
+            const hint = result.spawnError.code === "ENOENT"
+                ? "（PATH 中找不到 codex 可执行文件；请确认 codex 已安装，或重跑 `wand service:install` 刷新服务的 PATH）"
+                : "";
+            throw new Error(`codex exec 启动失败：${result.spawnError.message}${hint}`);
+        }
+        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: {
+                ...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 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 = [...(current.messages ?? [])];
+            if (messages[messages.length - 1]?.role === "assistant")
+                messages[messages.length - 1] = turn;
+            else
+                messages.push(turn);
+            const patched = {
+                ...current,
+                claudeSessionId: turnState.sessionId ?? current.claudeSessionId,
+                messages,
+                output: turnState.result || current.output,
+            };
+            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 = this.openCodeRunner.start({
+            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();
+        if (result.spawnError) {
+            const hint = result.spawnError.code === "ENOENT"
+                ? "（PATH 中找不到 opencode；请安装 opencode-ai，或重跑 `wand service:install` 刷新服务 PATH）"
+                : "";
+            throw new Error(`opencode run 启动失败：${result.spawnError.message}${hint}`);
+        }
+        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: {
+                ...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
@@ -2120,597 +1474,181 @@ export class StructuredSessionManager {
      * - Root: --permission-mode acceptEdits + --allowedTools (extends approval
      *   outside CWD). stdin is always "ignore" — no ACP bidirectional control.
      */
-    runClaudeStreaming(sessionId, session, prompt, requestId) {
-        return new Promise((resolve, reject) => {
-            const permPolicy = derivePermissionPolicy(session.mode, session.autoApprovePermissions ?? false, session.cwd);
-            const isManaged = session.mode === "managed";
-            const args = buildClaudeCliArgs(session, {
-                permissionPolicy: permPolicy,
-                systemPromptParts: buildAppendSystemPromptParts(this.config.language, session.mode),
-            });
-            // 通过 stdin 传 prompt，避免被 --allowedTools / --disallowedTools 这类
-            // variadic 参数贪婪吞掉（commander 的 <tools...> 会一直吃 positional 直到
-            // 下一个 flag）。表现为 claude 报 "Input must be provided either through
-            // stdin or as a prompt argument when using --print"。
-            //
-            // 思考深度通过 --effort 传给 Claude CLI；prompt 保持用户原文。
-            const spawnedAt = new Date().toISOString();
-            const child = spawn("claude", args, {
-                cwd: session.cwd,
-                env: buildChildEnv(this.config.inheritEnv !== false),
-                stdio: ["pipe", "pipe", "pipe"],
-            });
-            this.logger?.appendStructuredSpawn(sessionId, {
-                kind: "claude-print",
-                provider: "claude",
-                pid: child.pid ?? null,
-                cwd: session.cwd,
-                args,
-                prompt: prompt.slice(0, 2048),
-                promptLength: prompt.length,
-                claudeSessionId: session.claudeSessionId,
-                spawnedAt,
-            });
-            this.pendingChildren.set(sessionId, child);
-            child.stdin?.end(prompt);
-            const turnState = {
-                blocks: [],
-                result: "",
-                sessionId: null,
-                model: undefined,
-                usage: undefined,
-            };
-            // claude -p --output-format stream-json 在同一条消息流式生成期间会重复
-            // emit 同一个 message.id 的 "assistant" 事件，每次 content 略多一些；子
-            // agent 流（Task 工具）则会插入若干 parent_tool_use_id 不同的 message.id。
-            // 朴素的 push(...content) 会让早期片段被反复合并复制，最终被 compact 出
-            // 怪异结果，导致 UI 上 tool_use / 子 agent 输出"显示一下就消失"。
-            // 这里按 (message.id) 去重，相同 id 视作同一消息的更新覆盖；tool_result
-            // 用单调递增的合成 key 顺序追加。每次事件后用插入顺序重建 turnState.blocks。
-            const blocksByKey = new Map();
-            const keyOrder = [];
-            let toolResultSeq = 0;
-            // 本轮 Task tool_use_id → meta map，由父 assistant 消息里的 Task tool_use
-            // 填充；子 agent message（parent_tool_use_id 非空）来时用它给每个 block 盖章。
-            const taskMetaRegistry = new Map();
-            // 估算单个 ContentBlock 的"信息体积"——文字 / thinking / tool input 长度之和。
-            // 用于 upsertBlocks 的防御性合并：同一 message.id 重发时，按位置取信息量更大的
-            // 那个版本，保证已经吐出的文字 / tool_use input 不会被一条更短的同 id 事件
-            // 整段覆盖。
-            const blockVolume = (b) => {
-                if (!b)
-                    return 0;
-                const anyB = b;
-                let total = 0;
-                if (typeof anyB.text === "string")
-                    total += anyB.text.length;
-                if (typeof anyB.thinking === "string")
-                    total += anyB.thinking.length;
-                if (typeof anyB.content === "string")
-                    total += anyB.content.length;
-                if (anyB.input) {
-                    try {
-                        total += JSON.stringify(anyB.input).length;
-                    }
-                    catch (_e) { /* ignore */ }
-                }
-                return total;
-            };
-            const upsertBlocks = (key, blocks) => {
-                const prev = blocksByKey.get(key);
-                if (!prev) {
-                    keyOrder.push(key);
-                    blocksByKey.set(key, blocks);
-                    return;
-                }
-                // claude -p 在同一 message.id 的多次 assistant 事件有两种观察到的协议：
-                //   a) **累积模式**：每次 event 的 content = 之前所有 blocks + 0~N 新 block，
-                //      同位置类型一致。流式 text/thinking 的逐字增量属于这种。
-                //   b) **拼接模式**：SDK 把 thinking 和后续的 tool_use 拆成两条 event 给同
-                //      一 msg.id 发出，第二条只带 tool_use，**不包含**之前的 thinking。
-                //      Opus 4.7 + claude-agent-sdk 实际跑下来就是这种。
-                //
-                // 老逻辑（"同 index 类型不一致 → 保留 prev"）只对 a) 友好，碰上 b) 会让第
-                // 二条事件里的 tool_use 直接被丢掉——表现是 Agent / Read 等 tool_use 永远
-                // 不出现在 messages 里，subagent 多角色无法关联 agentType 到父 Task。
-                //
-                // 先判定 incoming 是不是 prev 的"累积超集"（mode a）：长度不短于 prev，
-                // 且前 prev.length 个 block 类型逐位一致。是 → 走逐位取大 + 末尾追加。
-                let cumulative = blocks.length >= prev.length;
-                if (cumulative) {
-                    for (let i = 0; i < prev.length; i++) {
-                        const a = prev[i];
-                        const b = blocks[i];
-                        if (a && b && a.type !== b.type) {
-                            cumulative = false;
-                            break;
-                        }
-                    }
-                }
-                if (cumulative) {
-                    const merged = [];
-                    const appendix = [];
-                    for (let i = 0; i < blocks.length; i++) {
-                        const a = prev[i];
-                        const b = blocks[i];
-                        if (a && !b) {
-                            merged.push(a);
-                            continue;
-                        }
-                        if (!a && b) {
-                            merged.push(b);
-                            continue;
-                        }
-                        if (a && b) {
-                            if (a.type === b.type) {
-                                // 同类型：取信息量大者，避免短回退覆盖已经累积的内容。
-                                merged.push(blockVolume(b) >= blockVolume(a) ? b : a);
-                            }
-                            else {
-                                // 类型变了：保留 prev[i]，把 incoming block 追加到末尾。
-                                merged.push(a);
-                                appendix.push(b);
-                            }
-                        }
-                    }
-                    for (const b of appendix)
-                        merged.push(b);
-                    blocksByKey.set(key, merged);
-                    return;
-                }
-                // mode b（拼接/splice）：incoming 不是累积超集——SDK 把同一 msg.id 的
-                // thinking / text / 多个 tool_use 拆成一条条「只带新 block」的事件发出
-                // （新版 claude 连发 4 个 TaskCreate 就是这样）。老逻辑 `blocks.length <
-                // prev.length 直接 return` 会把这些单 block 事件整段丢弃，导致 TaskCreate /
-                // Agent / Read 等永远进不了 messages。这里保留 prev 全部，按 block 身份
-                // 增量合并：tool_use 用 id 去重（已存在则取信息量大的就地更新，否则追加）；
-                // text / thinking 仅在没有完全相同内容时追加，挡住「短回退」的重复 frame。
-                const merged = [...prev];
-                const idIndex = new Map();
-                merged.forEach((b, i) => {
-                    const anyB = b;
-                    if (b.type === "tool_use" && typeof anyB.id === "string")
-                        idIndex.set(anyB.id, i);
-                });
-                for (const b of blocks) {
-                    const anyB = b;
-                    if (b.type === "tool_use" && typeof anyB.id === "string") {
-                        const at = idIndex.get(anyB.id);
-                        if (at !== undefined) {
-                            if (blockVolume(b) >= blockVolume(merged[at]))
-                                merged[at] = b;
-                        }
-                        else {
-                            idIndex.set(anyB.id, merged.length);
-                            merged.push(b);
-                        }
-                        continue;
-                    }
-                    if (b.type === "tool_result") {
-                        merged.push(b);
-                        continue;
-                    }
-                    // text / thinking：同类型且文本完全一致视为重复回退，跳过。
-                    const dup = merged.some((x) => x.type === b.type
-                        && x.text === anyB.text
-                        && x.thinking === anyB.thinking);
-                    if (!dup)
-                        merged.push(b);
-                }
-                blocksByKey.set(key, merged);
-            };
-            const rebuildTurnBlocks = () => {
-                const flat = [];
-                for (const key of keyOrder) {
-                    const entry = blocksByKey.get(key);
-                    if (entry && entry.length > 0)
-                        flat.push(...entry);
-                }
-                turnState.blocks = flat;
+    async runClaudeStreaming(sessionId, session, prompt, requestId) {
+        let emitTimer = null;
+        const syncSnapshot = (turnState) => {
+            const current = this.currentSessionForRequest(sessionId, requestId);
+            if (!current)
+                return;
+            const hasAssistantContent = turnState.blocks.length > 0 || !!turnState.result;
+            const messages = [...(current.messages ?? [])];
+            if (hasAssistantContent) {
+                const turn = {
+                    role: "assistant",
+                    content: this.compactContentBlocks([...turnState.blocks], turnState.result),
+                    usage: turnState.usage,
+                };
+                if (messages[messages.length - 1]?.role === "assistant")
+                    messages[messages.length - 1] = turn;
+                else
+                    messages.push(turn);
+            }
+            const patched = {
+                ...current,
+                claudeSessionId: turnState.sessionId ?? current.claudeSessionId,
+                messages,
+                output: turnState.result || current.output,
+                structuredState: {
+                    ...current.structuredState,
+                    model: turnState.model ?? current.structuredState?.model,
+                },
             };
-            // Line buffer for NDJSON: chunks from stdout may split mid-line.
-            let lineBuf = "";
-            // Debounce output events to avoid flooding the WebSocket.
-            let emitTimer = null;
-            let settled = false;
-            // 当 Claude 在非托管模式调用 AskUserQuestion 时，stdin 关闭导致它会 hang 等
-            // tool_result。我们检测到后主动 kill child，让它顺利退出，UI 把 tool_use 卡片
-            // 渲染成可交互选项；用户提交后由 sendMessage() 通过 --resume 续接。
-            let killedForAskUserQuestion = false;
-            const flushEmit = () => {
-                if (emitTimer) {
-                    this.clearStreamEmitTimer(emitTimer);
-                    emitTimer = null;
-                }
-                const current = this.currentSessionForRequest(sessionId, requestId);
-                if (!current)
-                    return;
+            this.sessions.set(sessionId, patched);
+            this.saveStreamingSnapshot(patched, hasAssistantContent ? undefined : { metadata: true });
+        };
+        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));
-                }
-            };
-            /** Update the session snapshot with the current in-progress assistant turn. */
-            const syncSnapshot = () => {
-                const current = this.currentSessionForRequest(sessionId, requestId);
-                if (!current)
-                    return;
-                const inProgressTurn = {
-                    role: "assistant",
-                    content: this.compactContentBlocks([...turnState.blocks], turnState.result),
-                    usage: turnState.usage,
-                };
-                // Replace or append the in-progress assistant turn at the end of messages.
-                const msgs = [...(current.messages ?? [])];
-                const lastMsg = msgs[msgs.length - 1];
-                if (lastMsg && lastMsg.role === "assistant") {
-                    msgs[msgs.length - 1] = inProgressTurn;
-                }
-                else {
-                    msgs.push(inProgressTurn);
-                }
-                const patched = {
-                    ...current,
-                    claudeSessionId: turnState.sessionId ?? current.claudeSessionId,
-                    messages: msgs,
-                    output: turnState.result || current.output,
-                    structuredState: {
-                        ...current.structuredState,
-                        model: turnState.model ?? current.structuredState?.model,
-                    },
-                };
-                this.sessions.set(sessionId, patched);
-                // Persist streaming progress so a server restart does not roll back the
-                // latest assistant turn to the pre-stream snapshot. Throttled because
-                // saveSession serializes the full messages array.
-                this.saveStreamingSnapshot(patched);
-            };
-            // 关键修复：claude -p 的 session_id 出现在 system(init) / assistant / user /
-            // result 全部事件里，并非只在最终的 result。若本轮被中断（用户打断、
-            // AskUserQuestion 主动 kill、ExitPlanMode 自续接）或进程异常退出而没走到
-            // result，旧逻辑只在 result 里取 session_id 会让 claudeSessionId 一直为 null，
-            // 下一轮（含排队消息续接）就不带 --resume → 丢掉全部历史上下文。这里从任何带
-            // session_id 的事件即时捕获并落库，保证 resume 链不因缺少 result 事件而断裂。
-            const captureSessionId = (sid) => {
-                if (typeof sid !== "string" || !sid)
-                    return;
-                if (turnState.sessionId === sid)
-                    return;
-                turnState.sessionId = sid;
-                const current = this.currentSessionForRequest(sessionId, requestId);
-                if (current && current.claudeSessionId !== sid) {
-                    const patched = { ...current, claudeSessionId: sid };
-                    this.sessions.set(sessionId, patched);
-                    this.saveStreamingSnapshot(patched, { metadata: true });
-                }
-            };
-            const processLine = (line) => {
-                if (!this.isCurrentRequest(sessionId, requestId))
-                    return;
-                const trimmed = line.trim();
-                if (!trimmed)
-                    return;
-                let parsed;
-                try {
-                    parsed = JSON.parse(trimmed);
-                }
-                catch {
-                    return;
-                }
-                this.logger?.appendStreamEvent(sessionId, parsed);
-                // 所有事件都可能带顶层 session_id（含 system init）；立即捕获，不等 result。
-                captureSessionId(parsed?.session_id);
-                if (parsed && parsed.type === "assistant" && parsed.message) {
-                    const extracted = this.extractAssistantMessage(parsed.message);
-                    // 用 message.id 作为 key：claude -p 流式重发同一条消息时整段覆盖
-                    // （而不是与早期片段累加），子 agent 的不同消息 id 各占一格、保留
-                    // 父子完整顺序。没有 id 时退化为合成 key 走追加模式。
-                    const msgId = typeof parsed.message.id === "string" && parsed.message.id
-                        ? `assistant:${parsed.message.id}`
-                        : `assistant:anon:${keyOrder.length}`;
-                    // parent_tool_use_id 决定父/子 agent。父 message 里的 Task tool_use 登记
-                    // 到 taskMetaRegistry；子 message 的每个 block 用 __subagent 盖章。
-                    const parentToolUseId = typeof parsed.parent_tool_use_id === "string" && parsed.parent_tool_use_id
-                        ? parsed.parent_tool_use_id
-                        : null;
-                    if (parentToolUseId === null) {
-                        captureTaskMeta(extracted.content, taskMetaRegistry);
-                    }
-                    const stamped = parentToolUseId === null
-                        ? stampSelfTask(extracted.content, taskMetaRegistry)
-                        : tagSubagentBlocks(extracted.content, parentToolUseId, taskMetaRegistry);
-                    if (stamped.length > 0) {
-                        upsertBlocks(msgId, stamped);
-                        rebuildTurnBlocks();
-                    }
-                    // NOTE: usage from streaming "assistant" events contains partial/incremental
-                    // token counts (e.g. output_tokens=1 during streaming) and is NOT accurate.
-                    // We only use the authoritative usage from the final "result" event.
-                    syncSnapshot();
-                    scheduleEmit();
-                    // 非托管模式下检测 AskUserQuestion：claude -p 的 stdin 被 ignore，无法回传
-                    // tool_result，进程会 hang 住。主动 SIGTERM 让它退出；后续用户提交答案时由
-                    // sendMessage() 注入伪造的 tool_result 并通过 --resume 续接。
-                    if (!isManaged && !killedForAskUserQuestion) {
-                        const askBlock = extracted.content.find((b) => b.type === "tool_use" && b.name === "AskUserQuestion");
-                        if (askBlock) {
-                            killedForAskUserQuestion = true;
-                            flushEmit();
-                            try {
-                                child.kill("SIGTERM");
-                            }
-                            catch (_err) { /* ignore */ }
-                        }
-                    }
-                    return;
-                }
-                if (parsed && parsed.type === "user" && parsed.message && Array.isArray(parsed.message.content)) {
-                    // tool_result 没有自身 id，按到达顺序用合成 key 追加（永远不被覆盖）。
-                    const collected = [];
-                    for (const block of parsed.message.content) {
-                        if (block && block.type === "tool_result") {
-                            collected.push({
-                                type: "tool_result",
-                                tool_use_id: typeof block.tool_use_id === "string" ? block.tool_use_id : "",
-                                content: this.normalizeToolResultContent(block.content),
-                                is_error: block.is_error === true,
-                            });
-                        }
-                    }
-                    const parentToolUseId = typeof parsed.parent_tool_use_id === "string" && parsed.parent_tool_use_id
-                        ? parsed.parent_tool_use_id
-                        : null;
-                    const stamped = parentToolUseId === null
-                        ? stampParentTaskResults(collected, taskMetaRegistry)
-                        : tagSubagentBlocks(collected, parentToolUseId, taskMetaRegistry);
-                    if (stamped.length > 0) {
-                        upsertBlocks(`tool_result:${toolResultSeq++}`, stamped);
-                        rebuildTurnBlocks();
-                    }
-                    syncSnapshot();
-                    scheduleEmit();
-                    return;
-                }
-                if (parsed && parsed.type === "result") {
-                    if (typeof parsed.result === "string") {
-                        turnState.result = parsed.result.trim();
-                    }
-                    // session_id 已由顶部 captureSessionId 统一捕获，这里不再重复赋值。
-                    turnState.model = this.extractModelName(parsed.modelUsage) ?? turnState.model;
-                    turnState.usage = this.extractUsage(parsed) ?? turnState.usage;
-                    syncSnapshot();
-                    scheduleEmit();
-                }
-            };
-            let stderr = "";
-            // 兜底：当 stderr 是空、JSON 也没解析到任何错误事件时，把最后一段非空
-            // stdout 文本作为上下文塞给错误信息。claude -p 偶尔会把 fatal error 以
-            // 纯文本（非 JSON）打到 stdout 然后非零退出，之前的实现会丢掉这部分。
-            let lastRawStdoutChunk = "";
-            child.stdout?.on("data", (chunk) => {
-                if (!this.isCurrentRequest(sessionId, requestId))
-                    return;
-                const text = chunk.toString();
-                this.logger?.appendStructuredStdout(sessionId, text);
-                const trimmed = text.trim();
-                if (trimmed)
-                    lastRawStdoutChunk = trimmed.slice(-1024);
-                lineBuf += text;
-                const lines = lineBuf.split("\n");
-                // Keep the last (possibly incomplete) segment in the buffer.
-                lineBuf = lines.pop() ?? "";
-                for (const line of lines) {
-                    processLine(line);
-                }
-            });
-            child.stderr?.on("data", (chunk) => {
-                if (!this.isCurrentRequest(sessionId, requestId))
-                    return;
-                const text = chunk.toString();
-                this.logger?.appendStructuredStderr(sessionId, text);
-                stderr += text;
+            }
+        };
+        const scheduleEmit = () => {
+            if (!emitTimer)
+                emitTimer = this.trackStreamEmitTimer(setTimeout(flushEmit, STREAM_EMIT_DEBOUNCE_MS));
+        };
+        const execution = this.claudeCliRunner.start({
+            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: "claude-print",
+            provider: "claude",
+            pid: execution.pid,
+            cwd: session.cwd,
+            args: execution.args,
+            prompt: prompt.slice(0, 2048),
+            promptLength: prompt.length,
+            claudeSessionId: 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();
+        if (result.spawnError) {
+            const hint = result.spawnError.code === "ENOENT"
+                ? "（PATH 中找不到 claude 可执行文件；请确认 claude 已安装，或重跑 `wand service:install` 刷新服务的 PATH）"
+                : "";
+            throw new Error(`claude -p 启动失败：${result.spawnError.message}${hint}`);
+        }
+        this.logger?.appendStructuredSpawn(sessionId, {
+            kind: "claude-print-close",
+            pid: execution.pid,
+            spawnedAt: execution.spawnedAt,
+            closedAt: new Date().toISOString(),
+            exitCode: result.exitCode,
+            stderrTail: result.stderr.slice(-2048),
+        });
+        const current = this.currentSessionForRequest(sessionId, requestId);
+        if (!current)
+            return;
+        const interruptedByUser = this.interruptedWith.has(sessionId);
+        const interruptedForQuestion = result.stopReason === "ask-user-question";
+        const failedExit = (result.exitCode !== null && result.exitCode !== 0) || result.signal !== null;
+        if (failedExit && !interruptedByUser && !interruptedForQuestion) {
+            const errorText = this.formatStructuredExitError("claude -p", result.exitCode, result.signal, {
+                stderr: result.stderr,
+                stdoutTail: result.stdoutTail,
             });
-            child.on("error", (error) => {
-                const released = this.releasePendingChild(sessionId, child);
-                if (released)
-                    this.cancelStreamingCheckpointTimer(sessionId);
-                if (emitTimer)
-                    this.clearStreamEmitTimer(emitTimer);
-                if (settled)
-                    return;
-                if (!this.isCurrentRequest(sessionId, requestId)) {
-                    settled = true;
-                    resolve();
-                    return;
-                }
-                settled = true;
-                this.logger?.appendStructuredSpawn(sessionId, {
-                    kind: "claude-print-error",
-                    pid: child.pid ?? null,
-                    spawnedAt,
-                    closedAt: new Date().toISOString(),
-                    spawnError: error.message,
+            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 interruptPrompt = this.interruptedWith.get(sessionId);
+        const keepRunning = interruptedForQuestion || !!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: {
+                ...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] interrupt-and-send failed:", error);
                 });
-                // 同 codex 那边：spawn ENOENT 最常见，提示用户去 service:install 刷 PATH。
-                const nodeErr = error;
-                const hint = nodeErr.code === "ENOENT"
-                    ? "（PATH 中找不到 claude 可执行文件；请确认 claude 已安装，或重跑 `wand service:install` 刷新服务的 PATH）"
-                    : "";
-                reject(new Error(`claude -p 启动失败：${error.message}${hint}`));
             });
-            child.on("close", (code, signal) => {
-                const released = this.releasePendingChild(sessionId, child);
-                if (released)
-                    this.cancelStreamingCheckpointTimer(sessionId);
-                if (settled)
-                    return;
-                if (!this.isCurrentRequest(sessionId, requestId)) {
-                    if (emitTimer)
-                        this.clearStreamEmitTimer(emitTimer);
-                    settled = true;
-                    resolve();
-                    return;
-                }
-                this.logger?.appendStructuredSpawn(sessionId, {
-                    kind: "claude-print-close",
-                    pid: child.pid ?? null,
-                    spawnedAt,
-                    closedAt: new Date().toISOString(),
-                    exitCode: code,
-                    stderrTail: stderr.slice(-2048),
-                });
-                // Process any remaining data in the line buffer.
-                if (lineBuf.trim()) {
-                    processLine(lineBuf);
-                    lineBuf = "";
-                }
-                // Flush any pending debounced emit before finalizing.
-                flushEmit();
-                // Finalize the session snapshot.
-                const current = this.currentSessionForRequest(sessionId, requestId);
-                if (!current) {
-                    settled = true;
-                    resolve();
-                    return;
-                }
-                // 如果是用户主动中断（interruptedWith 里有新消息），claude -p 收到 SIGTERM 后
-                // 可能以非零 exit code 退出（内部 handler 调了 exit(1)）。这种情况属于正常
-                // 中断流程，不应走失败路径——后续 interruptedWith 逻辑会发送新消息。
-                const interruptedByUser = this.interruptedWith.has(sessionId);
-                const failedExit = (code !== null && code !== 0) || signal !== null;
-                if (failedExit && !interruptedByUser && !killedForAskUserQuestion) {
-                    const errorText = this.formatStructuredExitError("claude -p", code, signal, {
-                        stderr,
-                        // claude -p 没有 codex 那种独立的 turn.failed 事件，所以 primary 留空；
-                        // 退路是 stderr / stdoutTail。
-                        stdoutTail: lastRawStdoutChunk,
-                    });
-                    const failureTurn = {
-                        role: "assistant",
-                        content: [{ type: "text", text: `结构化会话执行失败：${errorText}` }],
-                    };
-                    const msgs = [...(current.messages ?? [])];
-                    const lastMsg = msgs[msgs.length - 1];
-                    if (lastMsg && lastMsg.role === "assistant") {
-                        msgs[msgs.length - 1] = failureTurn;
-                    }
-                    else {
-                        msgs.push(failureTurn);
-                    }
-                    // 仅 signal 终止时 code 为 null；用 1 占位，让 UI 的"exitCode !== 0"判定也能命中。
-                    const exitForSnapshot = typeof code === "number" ? code : 1;
-                    const failed = {
-                        ...current,
-                        status: "failed",
-                        exitCode: exitForSnapshot,
-                        endedAt: new Date().toISOString(),
-                        output: errorText,
-                        claudeSessionId: turnState.sessionId ?? current.claudeSessionId,
-                        messages: msgs,
-                        pendingEscalation: null,
-                        permissionBlocked: false,
-                        structuredState: {
-                            ...current.structuredState,
-                            model: turnState.model ?? current.structuredState?.model,
-                            inFlight: false,
-                            activeRequestId: null,
-                            lastError: errorText,
-                        },
-                    };
-                    this.sessions.set(sessionId, failed);
-                    this.saveAuthoritativeSession(failed);
-                    this.emitStructuredSnapshot(failed);
-                    this.emitStructuredSnapshot(failed, "ended");
-                    settled = true;
-                    reject(new PersistedStructuredRunnerError(errorText));
-                    return;
-                }
-                const msgs = this.buildCompletedAssistantMessages(current, turnState);
-                // 被 AskUserQuestion 检测或用户中断主动 kill 时，保持 status="running"
-                // 让 UI 不跳到"已停止"。inFlight=false 才能触发后续 sendMessage。
-                const interruptPrompt = this.interruptedWith.get(sessionId);
-                const keepRunning = killedForAskUserQuestion || !!interruptPrompt;
-                const finished = {
-                    ...current,
-                    status: keepRunning ? "running" : "idle",
-                    exitCode: keepRunning ? null : 0,
-                    endedAt: keepRunning ? null : new Date().toISOString(),
-                    output: turnState.result,
-                    claudeSessionId: turnState.sessionId ?? current.claudeSessionId,
-                    messages: msgs,
-                    queuedMessages: this.resolveQueuedMessagesAfterInterrupt(sessionId, current, interruptPrompt),
-                    pendingEscalation: null,
-                    permissionBlocked: false,
-                    structuredState: {
-                        ...current.structuredState,
-                        model: turnState.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);
-                    // 把"保留队列"标记一并清掉——不属于本次 interrupt 的后续轮次会按
-                    // 默认（清空 queue）行为走，避免 stale flag 影响下一次普通 interrupt。
-                    // 注意：被保留的 queuedMessages 不需要在这里主动 flush，重发的
-                    // interruptPrompt 跑完会自然触发 flushNextQueuedMessage。
-                    this.preserveQueueOnInterrupt.delete(sessionId);
-                    settled = true;
-                    resolve();
-                    setImmediate(() => {
-                        this.sendMessage(sessionId, interruptPrompt).catch((err) => {
-                            console.error("[WAND] interrupt-and-send failed:", err);
-                        });
-                    });
-                    return;
-                }
-                if (killedForAskUserQuestion) {
-                    settled = true;
-                    resolve();
-                    // An answer can arrive after AskUserQuestion triggered SIGTERM but
-                    // before close finalized the turn. It was queued while inFlight; now
-                    // advance it normally so it becomes the matching tool_result.
-                    if ((finished.queuedMessages?.length ?? 0) > 0) {
-                        setImmediate(() => { void this.flushNextQueuedMessage(sessionId); });
-                    }
-                    return;
-                }
-                // Auto-continue after plan mode exit: when Claude calls ExitPlanMode,
-                // the `-p` process exits because stdin is "ignore" and it cannot get
-                // user confirmation.  Detect this and automatically resume execution
-                // so the plan is actually carried out.
-                const lastToolUse = [...turnState.blocks].reverse().find((b) => b.type === "tool_use");
-                if (lastToolUse && lastToolUse.name === "ExitPlanMode" && turnState.sessionId) {
-                    settled = true;
-                    resolve();
-                    setImmediate(() => {
-                        this.sendMessage(sessionId, "Plan approved. Proceed with the implementation.").catch((err) => {
-                            console.error("[WAND] Auto-continue after ExitPlanMode failed:", err);
-                        });
-                    });
-                    return;
-                }
-                settled = true;
-                resolve();
-                setImmediate(() => {
-                    void this.flushNextQueuedMessage(sessionId);
+            return;
+        }
+        if (interruptedForQuestion) {
+            if ((finished.queuedMessages?.length ?? 0) > 0) {
+                setImmediate(() => { void this.flushNextQueuedMessage(sessionId); });
+            }
+            return;
+        }
+        const lastToolUse = [...result.state.blocks].reverse().find((block) => block.type === "tool_use");
+        if (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);
                 });
             });
-        });
+            return;
+        }
+        setImmediate(() => { void this.flushNextQueuedMessage(sessionId); });
     }
     // ---------------------------------------------------------------------------
     // Streaming claude-agent-sdk execution
@@ -2865,7 +1803,7 @@ export class StructuredSessionManager {
                         }
                         catch { /* partial json */ }
                     }
-                    block = { type: "tool_use", id: sb.id, name: sb.name, input: this.normalizeToolInput(sb.name, input) };
+                    block = { type: "tool_use", id: sb.id, name: sb.name, input: normalizeClaudeToolInput(sb.name, input) };
                 }
                 if (!block)
                     continue;
@@ -3010,7 +1948,7 @@ export class StructuredSessionManager {
                 // append to it instead of erasing it.
                 if (msg.type === "assistant") {
                     const assistantMsg = msg;
-                    const extracted = this.extractAssistantMessage(assistantMsg.message);
+                    const extracted = extractClaudeAssistantMessage(assistantMsg.message);
                     // 父 assistant 的 Task tool_use → 注册到本轮 taskMeta map；
                     // 子 agent 的 message（parent_tool_use_id 非空）→ 给每个 block 盖章。
                     const parentToolUseId = assistantMsg.parent_tool_use_id ?? null;
@@ -3088,7 +2026,7 @@ export class StructuredSessionManager {
                         turnState.result = resultMsg.result.trim();
                     if (typeof resultMsg.session_id === "string")
                         turnState.sessionId = resultMsg.session_id;
-                    turnState.model = this.extractModelName(resultMsg.modelUsage) ?? turnState.model;
+                    turnState.model = extractClaudeModelName(resultMsg.modelUsage) ?? turnState.model;
                     turnState.usage = this.extractSdkUsage(resultMsg);
                     syncSnapshot();
                     scheduleEmit();
@@ -3196,36 +2134,6 @@ export class StructuredSessionManager {
     // ---------------------------------------------------------------------------
     // Parsing helpers (unchanged logic, extracted from previous implementation)
     // ---------------------------------------------------------------------------
-    extractAssistantMessage(message) {
-        const rawContent = Array.isArray(message.content) ? message.content : [];
-        const content = [];
-        for (const block of rawContent) {
-            if (!block || typeof block !== "object")
-                continue;
-            const typedBlock = block;
-            if (typedBlock.type === "text" && typeof typedBlock.text === "string") {
-                content.push({ type: "text", text: typedBlock.text });
-                continue;
-            }
-            if (typedBlock.type === "thinking" && typeof typedBlock.thinking === "string") {
-                content.push({ type: "thinking", thinking: typedBlock.thinking });
-                continue;
-            }
-            if (typedBlock.type === "tool_use" && typeof typedBlock.id === "string" && typeof typedBlock.name === "string") {
-                content.push({
-                    type: "tool_use",
-                    id: typedBlock.id,
-                    name: typedBlock.name,
-                    description: typeof typedBlock.description === "string" ? typedBlock.description : undefined,
-                    input: this.normalizeToolInput(typedBlock.name, typedBlock.input),
-                });
-            }
-        }
-        return {
-            content,
-            usage: this.extractUsage({ usage: message.usage }),
-        };
-    }
     compactContentBlocks(blocks, fallbackResult) {
         const compacted = [];
         for (const block of blocks) {
@@ -3275,618 +2183,9 @@ export class StructuredSessionManager {
             return [];
         return current.queuedMessages;
     }
-    normalizeToolInput(name, input) {
-        if (!input || typeof input !== "object" || Array.isArray(input)) {
-            return {};
-        }
-        const record = input;
-        // `claude -p --output-format stream-json`（默认结构化 runner）有时把数组型工具参数
-        // 当成 JSON 字符串吐出来——例如 TodoWrite 的 todos 会是 "[{...}]" 而非真正的数组。
-        // 所有客户端（web / iOS / Android）读的都是数组，拿到字符串就解析不出待办，进度条
-        // 与 AskUserQuestion 卡片整段消失。这里按工具名把已知的数组字段反序列化回数组，
-        // 让线上协议恢复成「block.input.todos = [{content,status,activeForm}]」的契约。
-        const arrayFieldsByTool = {
-            TodoWrite: "todos",
-            AskUserQuestion: "questions",
-        };
-        const field = typeof name === "string" ? arrayFieldsByTool[name] : undefined;
-        if (field && typeof record[field] === "string") {
-            try {
-                const parsed = JSON.parse(record[field]);
-                if (Array.isArray(parsed))
-                    record[field] = parsed;
-            }
-            catch {
-                /* 保留原字符串：宁可不改也不要丢数据 */
-            }
-        }
-        return record;
-    }
     normalizeToolResultContent(content) {
         return normalizeStructuredToolResultContent(content);
     }
-    unwrapCodexStreamEvent(parsed) {
-        const event = asRecord(parsed);
-        if (!event)
-            return null;
-        const type = getString(event.type);
-        if ((type === "response_item" || type === "event_msg") && asRecord(event.payload)) {
-            return event.payload;
-        }
-        return event;
-    }
-    applyCodexLooseEvent(turnState, event) {
-        if (!event)
-            return false;
-        const type = getString(event.type);
-        const supported = new Set([
-            "message",
-            "agent_message",
-            "reasoning",
-            "function_call",
-            "function_call_output",
-            "custom_tool_call",
-            "custom_tool_call_output",
-            "command_execution",
-            "patch_apply_end",
-            "file_change",
-            "mcp_tool_call",
-            "mcp_tool_call_end",
-            "web_search_call",
-            "web_search_end",
-            "web_search",
-            "tool_search_call",
-            "tool_search_output",
-            "collab_tool_call",
-            "todo_list",
-        ]);
-        if (!supported.has(type))
-            return false;
-        this.applyCodexItem(turnState, event, "completed");
-        return true;
-    }
-    codexFunctionToolUse(item) {
-        const rawName = getString(item.name) || "function_call";
-        const callId = getString(item.call_id) || getString(item.id) || rawName;
-        const args = parseJsonRecord(item.arguments);
-        const input = { ...args };
-        if (rawName === "exec_command") {
-            const command = getString(args.cmd) || getString(args.command);
-            if (command)
-                input.command = command;
-            return {
-                type: "tool_use",
-                id: callId,
-                name: "Bash",
-                description: getString(args.workdir) || undefined,
-                input,
-            };
-        }
-        if (rawName === "write_stdin") {
-            return {
-                type: "tool_use",
-                id: callId,
-                name: "Bash",
-                description: "write stdin",
-                input: {
-                    ...input,
-                    command: `write_stdin ${getString(args.session_id) || getString(args.sessionId) || ""}`.trim(),
-                },
-            };
-        }
-        if (rawName === "update_plan" && Array.isArray(args.plan)) {
-            const todos = args.plan.map((entry) => {
-                const rec = asRecord(entry) ?? {};
-                const status = getString(rec.status);
-                return {
-                    content: getString(rec.step),
-                    activeForm: getString(rec.step),
-                    status: status === "completed" ? "completed" : status === "in_progress" ? "in_progress" : "pending",
-                };
-            });
-            return {
-                type: "tool_use",
-                id: callId,
-                name: "TodoWrite",
-                description: getString(args.explanation) || undefined,
-                input: { todos },
-            };
-        }
-        if (rawName === "view_image") {
-            const filePath = getString(args.path);
-            return {
-                type: "tool_use",
-                id: callId,
-                name: "Read",
-                description: "view image",
-                input: filePath ? { ...input, file_path: filePath } : input,
-            };
-        }
-        if (rawName === "js") {
-            return {
-                type: "tool_use",
-                id: callId,
-                name: "node_repl__js",
-                description: getString(args.title) || undefined,
-                input,
-            };
-        }
-        return {
-            type: "tool_use",
-            id: callId,
-            name: rawName,
-            input,
-        };
-    }
-    codexMcpToolBlocks(item) {
-        const callId = getString(item.call_id) || getString(item.id) || "mcp";
-        const invocation = asRecord(item.invocation) ?? {};
-        const server = getString(invocation.server) || "mcp";
-        const tool = getString(invocation.tool) || "tool";
-        const args = asRecord(invocation.arguments) ?? {};
-        const result = asRecord(item.result);
-        const isError = !!result?.Err || getString(item.status) === "failed";
-        const ok = asRecord(result?.Ok);
-        const content = ok ? this.extractCodexText(ok.content) || JSON.stringify(ok).slice(0, 4096) : this.extractCodexText(result);
-        return [
-            { type: "tool_use", id: callId, name: `${server}__${tool}`, input: args },
-            { type: "tool_result", tool_use_id: callId, content, is_error: isError },
-        ];
-    }
-    extractCodexText(value) {
-        if (typeof value === "string")
-            return value;
-        if (!value || typeof value !== "object")
-            return "";
-        if (Array.isArray(value)) {
-            return value.map((item) => this.extractCodexText(item)).filter(Boolean).join("");
-        }
-        const record = value;
-        for (const key of ["text", "output_text", "message", "content", "summary"]) {
-            const extracted = this.extractCodexText(record[key]);
-            if (extracted)
-                return extracted;
-        }
-        return "";
-    }
-    /**
-     * Merge one codex `item.*` event into `turnState.blocks`.
-     *
-     * 三种 phase 行为：
-     *   - "started":   首次出现的 item，块直接 push（tool_result 走 upsert 配对）。
-     *                  text/thinking/TodoWrite 这种"靠 id 替换"的块记录到
-     *                  codexBlockIndex 里，方便后续 updated/completed 找回原位。
-     *   - "updated":   codex 重发完整 ThreadItem（不是 delta）。已记录过的块就
-     *                  替换；新块按 started 路径处理。
-     *   - "completed": 把"in_progress"卡片定型——text 同时更新 turnState.result
-     *                  以便 result fallback 不为空；tool_use ↔ tool_result 通过
-     *                  共享 id 配对到一起（包括 file_change 子项的 `${id}#i`）。
-     */
-    applyCodexItem(turnState, item, phase) {
-        const completed = phase === "completed";
-        const itemId = typeof item.id === "string" ? item.id : "";
-        const itemType = getString(item.type);
-        let afterSnapshots;
-        if (itemType === "file_change" && itemId) {
-            const snapshots = turnState.codexFileSnapshots ??= new Map();
-            const rawChanges = Array.isArray(item.changes) ? item.changes : [];
-            if (phase === "started") {
-                rawChanges.forEach((entry, index) => {
-                    const filePath = getString(asRecord(entry)?.path);
-                    const absolutePath = path.isAbsolute(filePath)
-                        ? filePath
-                        : path.resolve(turnState.cwd || process.cwd(), filePath);
-                    snapshots.set(`${itemId}#${index}`, readCodexFileSnapshot(absolutePath));
-                });
-            }
-            else if (completed) {
-                afterSnapshots = new Map();
-                rawChanges.forEach((entry, index) => {
-                    const filePath = getString(asRecord(entry)?.path);
-                    const absolutePath = path.isAbsolute(filePath)
-                        ? filePath
-                        : path.resolve(turnState.cwd || process.cwd(), filePath);
-                    afterSnapshots?.set(`${itemId}#${index}`, readCodexFileSnapshot(absolutePath));
-                });
-            }
-        }
-        const blocks = this.extractCodexItemBlock(item, completed, turnState.codexFileSnapshots, afterSnapshots);
-        if (blocks.length === 0)
-            return;
-        const index = turnState.codexBlockIndex ??= new Map();
-        for (const block of blocks) {
-            // text / thinking / TodoWrite tool_use 的卡片是"按 item id 整体替换"语义，
-            // 否则一个 agent_message 在 updated/completed 时会被重复 push 多次。
-            const replaceable = block.type === "text"
-                || block.type === "thinking"
-                || (block.type === "tool_use" && block.name === "TodoWrite");
-            if (replaceable && itemId) {
-                const existing = index.get(itemId);
-                if (existing !== undefined && existing < turnState.blocks.length) {
-                    turnState.blocks[existing] = block;
-                }
-                else {
-                    index.set(itemId, turnState.blocks.length);
-                    turnState.blocks.push(block);
-                }
-                if (block.type === "text" && completed) {
-                    turnState.result = block.text;
-                }
-                continue;
-            }
-            // 其它块（tool_use 非 Todo / tool_result / 文件改动的多 sub-id 块）
-            // 仍然走原有 upsert：tool_result 按 tool_use_id 配对，其余直接 push。
-            this.upsertCodexBlock(turnState.blocks, block);
-        }
-        if (completed && itemType === "file_change") {
-            for (const key of [...(turnState.codexFileSnapshots?.keys() ?? [])]) {
-                if (key.startsWith(`${itemId}#`))
-                    turnState.codexFileSnapshots?.delete(key);
-            }
-        }
-    }
-    /**
-     * Map a codex `item.{started,updated,completed}` payload into wand's
-     * `ContentBlock[]` so the chat UI's existing tool/diff/todo cards just work.
-     *
-     * Codex `exec --json` emits 8 item.type values (see
-     * `codex-rs/exec/src/exec_events.rs`); below they're routed to whatever wand
-     * tool name reuses an existing renderer:
-     *
-     *   agent_message     → text
-     *   reasoning         → thinking
-     *   command_execution → tool_use "Bash" + tool_result
-     *   file_change       → one Edit/Write per file; snapshots taken between
-     *                       item.started/completed restore the omitted diff body
-     *   mcp_tool_call     → tool_use named "<server>__<tool>" + tool_result
-     *   web_search        → tool_use "WebSearch" + tool_result (results not in stream)
-     *   todo_list         → tool_use "TodoWrite" (replaced in place on each update)
-     *   error             → text block prefixed with ❌
-     *
-     * Returns [] when there is nothing to emit yet (e.g. agent_message at
-     * `item.started` before any text has been produced).
-     *
-     * Callers handle in-place replacement for `item.updated` via
-     * `turnState.codexBlockIndex`; tool_use ↔ tool_result pairing still goes
-     * through `upsertCodexBlock` by matching ids.
-     */
-    extractCodexItemBlock(item, completed, beforeSnapshots, afterSnapshots) {
-        const id = typeof item.id === "string" ? item.id : randomUUID();
-        const type = typeof item.type === "string" ? item.type : "unknown";
-        if (type === "message") {
-            const role = getString(item.role);
-            if (role !== "assistant")
-                return [];
-            const text = this.extractCodexText(item.content);
-            return text ? [{ type: "text", text }] : [];
-        }
-        if (type === "agent_message") {
-            const text = this.extractCodexText(item);
-            return text ? [{ type: "text", text }] : [];
-        }
-        if (type === "reasoning") {
-            const text = this.extractCodexText(item);
-            return text ? [{ type: "thinking", thinking: text }] : [];
-        }
-        if (type === "command_execution") {
-            const command = typeof item.command === "string" ? item.command : "";
-            const aggregatedOutput = typeof item.aggregated_output === "string" ? item.aggregated_output : "";
-            const exitCode = typeof item.exit_code === "number" ? item.exit_code : null;
-            const status = typeof item.status === "string" ? item.status : completed ? "completed" : "in_progress";
-            const input = { command, status };
-            if (exitCode !== null)
-                input.exit_code = exitCode;
-            if (!completed) {
-                return [{
-                        type: "tool_use",
-                        id,
-                        name: "Bash",
-                        description: "running",
-                        input,
-                    }];
-            }
-            // codex 的 status 可能是 declined（sandbox 拒了命令）/ failed（执行失败）—
-            // 这时 exit_code 经常是 null，光靠 exitCode !== 0 判 is_error 会漏。
-            const isError = status === "failed" || status === "declined"
-                || (typeof exitCode === "number" && exitCode !== 0);
-            const fallbackText = status === "declined"
-                ? "command declined by sandbox"
-                : (exitCode === null ? "" : `exit_code: ${exitCode}`);
-            return [
-                {
-                    type: "tool_use",
-                    id,
-                    name: "Bash",
-                    description: exitCode === null ? status : `${status} · exit ${exitCode}`,
-                    input,
-                },
-                {
-                    type: "tool_result",
-                    tool_use_id: id,
-                    content: aggregatedOutput || fallbackText,
-                    is_error: isError,
-                },
-            ];
-        }
-        if (type === "function_call") {
-            const block = this.codexFunctionToolUse(item);
-            return block ? [block] : [];
-        }
-        if (type === "function_call_output") {
-            const callId = getString(item.call_id) || id;
-            return [{
-                    type: "tool_result",
-                    tool_use_id: callId,
-                    content: this.normalizeToolResultContent(item.output),
-                }];
-        }
-        if (type === "custom_tool_call") {
-            const callId = getString(item.call_id) || id;
-            const name = getString(item.name) || "custom_tool_call";
-            return [{
-                    type: "tool_use",
-                    id: callId,
-                    name,
-                    description: getString(item.status) || undefined,
-                    input: {
-                        input: getString(item.input),
-                        status: getString(item.status) || (completed ? "completed" : "in_progress"),
-                    },
-                }];
-        }
-        if (type === "custom_tool_call_output") {
-            const callId = getString(item.call_id) || id;
-            return [{
-                    type: "tool_result",
-                    tool_use_id: callId,
-                    content: this.normalizeToolResultContent(item.output),
-                }];
-        }
-        if (type === "patch_apply_end") {
-            return buildCodexPatchApplyBlocks(item);
-        }
-        if (type === "file_change") {
-            return buildCodexFileChangeBlocks(item, completed, beforeSnapshots, afterSnapshots);
-        }
-        if (type === "mcp_tool_call_end") {
-            return this.codexMcpToolBlocks(item);
-        }
-        if (type === "mcp_tool_call") {
-            const server = typeof item.server === "string" ? item.server : "mcp";
-            const tool = typeof item.tool === "string" ? item.tool : "tool";
-            const args = item.arguments && typeof item.arguments === "object" ? item.arguments : {};
-            const errObj = item.error && typeof item.error === "object" ? item.error : null;
-            const status = typeof item.status === "string" ? item.status : completed ? "completed" : "in_progress";
-            const isError = !!errObj || status === "failed";
-            const input = { ...args, status };
-            if (!completed) {
-                return [{
-                        type: "tool_use",
-                        id,
-                        name: `${server}__${tool}`,
-                        description: status,
-                        input,
-                    }];
-            }
-            let resultText = "";
-            if (errObj && typeof errObj.message === "string") {
-                resultText = errObj.message;
-            }
-            else if (item.result && typeof item.result === "object") {
-                const resultRec = item.result;
-                const inner = this.extractCodexText(resultRec.content);
-                resultText = inner || JSON.stringify(resultRec).slice(0, 4096);
-            }
-            return [
-                {
-                    type: "tool_use",
-                    id,
-                    name: `${server}__${tool}`,
-                    description: status,
-                    input,
-                },
-                {
-                    type: "tool_result",
-                    tool_use_id: id,
-                    content: resultText,
-                    is_error: isError,
-                },
-            ];
-        }
-        if (type === "web_search_call") {
-            const callId = getString(item.call_id) || id;
-            return [{
-                    type: "tool_use",
-                    id: callId,
-                    name: "WebSearch",
-                    description: getString(item.status) || "searching",
-                    input: {},
-                }];
-        }
-        if (type === "web_search_end") {
-            const callId = getString(item.call_id) || id;
-            const action = asRecord(item.action);
-            const query = getString(item.query);
-            const actionType = getString(action?.type);
-            return [
-                {
-                    type: "tool_use",
-                    id: callId,
-                    name: "WebSearch",
-                    description: actionType || "completed",
-                    input: query ? { query, action: actionType } : { action: actionType },
-                },
-                {
-                    type: "tool_result",
-                    tool_use_id: callId,
-                    content: query ? `query: ${query}` : "",
-                },
-            ];
-        }
-        if (type === "tool_search_call") {
-            const callId = getString(item.call_id) || id;
-            const args = asRecord(item.arguments) ?? {};
-            return [{
-                    type: "tool_use",
-                    id: callId,
-                    name: "tool_search",
-                    description: getString(item.status) || undefined,
-                    input: args,
-                }];
-        }
-        if (type === "tool_search_output") {
-            const callId = getString(item.call_id) || id;
-            return [{
-                    type: "tool_result",
-                    tool_use_id: callId,
-                    content: this.normalizeToolResultContent(item.tools),
-                }];
-        }
-        if (type === "web_search") {
-            const query = typeof item.query === "string" ? item.query : "";
-            const action = item.action && typeof item.action === "object" ? item.action : null;
-            const actionType = action && typeof action.type === "string" ? action.type : "";
-            const queries = action && Array.isArray(action.queries)
-                ? action.queries.filter((v) => typeof v === "string")
-                : [];
-            const input = { query };
-            if (actionType)
-                input.action = actionType;
-            if (queries.length > 0)
-                input.queries = queries;
-            if (!completed) {
-                return [{
-                        type: "tool_use",
-                        id,
-                        name: "WebSearch",
-                        description: actionType || "searching",
-                        input,
-                    }];
-            }
-            return [
-                {
-                    type: "tool_use",
-                    id,
-                    name: "WebSearch",
-                    description: actionType || "completed",
-                    input,
-                },
-                {
-                    type: "tool_result",
-                    tool_use_id: id,
-                    // codex 不在 exec 流里回 search 结果，这里给个占位让 UI 卡片完成态。
-                    content: queries.length > 0 ? queries.map((q) => `query: ${q}`).join("\n") : (query ? `query: ${query}` : ""),
-                },
-            ];
-        }
-        if (type === "collab_tool_call") {
-            // codex 的子-agent 编排（spawn_agent / send_input / wait / close_agent）。
-            // 没有对应 Claude tool，所以名称用 "Codex/<op>" 让 UI 默认 tool 卡渲染时
-            // 一眼能看出来是 codex 多 agent 操作。
-            const tool = typeof item.tool === "string" ? item.tool : "collab";
-            const prompt = typeof item.prompt === "string" ? item.prompt : "";
-            const senderId = typeof item.sender_thread_id === "string" ? item.sender_thread_id : "";
-            const receiverIds = Array.isArray(item.receiver_thread_ids)
-                ? item.receiver_thread_ids.filter((v) => typeof v === "string")
-                : [];
-            const agentsStates = item.agents_states && typeof item.agents_states === "object"
-                ? item.agents_states
-                : {};
-            const status = typeof item.status === "string" ? item.status : completed ? "completed" : "in_progress";
-            const toolName = `Codex/${tool}`;
-            const input = { tool };
-            if (prompt)
-                input.prompt = prompt;
-            if (senderId)
-                input.sender_thread_id = senderId;
-            if (receiverIds.length > 0)
-                input.receiver_thread_ids = receiverIds;
-            if (Object.keys(agentsStates).length > 0)
-                input.agents_states = agentsStates;
-            if (!completed) {
-                return [{ type: "tool_use", id, name: toolName, input }];
-            }
-            // 完成态：把每个 receiver agent 的最终状态汇总成可读 result。
-            const summaryLines = [];
-            for (const [tid, state] of Object.entries(agentsStates)) {
-                if (!state || typeof state !== "object")
-                    continue;
-                const rec = state;
-                const s = typeof rec.status === "string" ? rec.status : "?";
-                const msg = typeof rec.message === "string" && rec.message ? ` — ${rec.message}` : "";
-                summaryLines.push(`${tid.slice(0, 8)}: ${s}${msg}`);
-            }
-            const isError = status === "failed"
-                || summaryLines.some((l) => /errored|not_found|interrupted/.test(l));
-            const content = summaryLines.length > 0
-                ? summaryLines.join("\n")
-                : (status === "completed" ? "ok" : status);
-            return [
-                { type: "tool_use", id, name: toolName, input },
-                { type: "tool_result", tool_use_id: id, content, is_error: isError },
-            ];
-        }
-        if (type === "todo_list") {
-            // codex 的 todo: { items: [{ text, completed: bool }] }
-            // wand UI（renderTodoWrite）读的是 block.input.todos = [{content, status, activeForm}]
-            // 这里做形状翻译；in_progress 状态 codex 不区分，全部 pending → completed 二值。
-            const rawItems = Array.isArray(item.items) ? item.items : [];
-            const todos = rawItems.map((entry) => {
-                const rec = (entry && typeof entry === "object") ? entry : {};
-                const text = typeof rec.text === "string" ? rec.text : "";
-                const done = rec.completed === true;
-                return {
-                    content: text,
-                    status: done ? "completed" : "pending",
-                    activeForm: text,
-                };
-            });
-            return [{
-                    type: "tool_use",
-                    id,
-                    name: "TodoWrite",
-                    input: { todos },
-                }];
-        }
-        if (type === "error") {
-            // item-level error（不是 top-level error 事件，那个走 codexErrors / 退出报错路径）
-            const message = this.extractCodexText(item) || "codex item error";
-            return [{ type: "text", text: `❌ ${message}` }];
-        }
-        // unknown / 兜底：completed 时尝试取 text 字段免得 silently 丢
-        if (completed) {
-            const text = this.extractCodexText(item);
-            if (text)
-                return [{ type: "text", text }];
-        }
-        return [];
-    }
-    upsertCodexBlock(blocks, block) {
-        // tool_use 按 id 去重——file_change 在 item.started 已经 push 过一份 tool_use，
-        // 到 item.completed 还会再发一份相同 id 的（带 status 更新），不去重就出现
-        // 两张同名卡片。command_execution 不受影响（它在 completed 只 emit tool_result）。
-        if (block.type === "tool_use") {
-            const existingIndex = blocks.findIndex((existing) => existing.type === "tool_use" && existing.id === block.id);
-            if (existingIndex >= 0) {
-                blocks[existingIndex] = block;
-                return;
-            }
-        }
-        if (block.type === "tool_result") {
-            const toolUseIndex = blocks.findIndex((existing) => existing.type === "tool_use" && existing.id === block.tool_use_id);
-            if (toolUseIndex >= 0) {
-                const nextIndex = toolUseIndex + 1;
-                if (blocks[nextIndex]?.type === "tool_result" && blocks[nextIndex].tool_use_id === block.tool_use_id) {
-                    blocks[nextIndex] = block;
-                }
-                else {
-                    blocks.splice(nextIndex, 0, block);
-                }
-                return;
-            }
-        }
-        blocks.push(block);
-    }
     /**
      * 组装结构化 runner 退出失败时的可读错误字符串。
      *
@@ -3947,33 +2246,6 @@ export class StructuredSessionManager {
             },
         };
     }
-    extractModelName(modelUsage) {
-        if (!modelUsage)
-            return undefined;
-        const names = Object.keys(modelUsage);
-        return names.length > 0 ? names[0] : undefined;
-    }
-    extractUsage(source) {
-        if (!source || !source.usage || typeof source.usage !== "object") {
-            return undefined;
-        }
-        const usage = source.usage;
-        const value = {
-            inputTokens: typeof usage.input_tokens === "number" ? usage.input_tokens : undefined,
-            outputTokens: typeof usage.output_tokens === "number" ? usage.output_tokens : undefined,
-            cacheReadInputTokens: typeof usage.cache_read_input_tokens === "number" ? usage.cache_read_input_tokens : undefined,
-            cacheCreationInputTokens: typeof usage.cache_creation_input_tokens === "number" ? usage.cache_creation_input_tokens : undefined,
-            totalCostUsd: typeof source.total_cost_usd === "number" ? source.total_cost_usd : undefined,
-        };
-        if (value.inputTokens === undefined
-            && value.outputTokens === undefined
-            && value.cacheReadInputTokens === undefined
-            && value.cacheCreationInputTokens === undefined
-            && value.totalCostUsd === undefined) {
-            return undefined;
-        }
-        return value;
-    }
     /** Extract usage from an SDKResultSuccess message (sdk runner). */
     extractSdkUsage(result) {
         const usage = result?.usage;
@@ -3988,21 +2260,4 @@ export class StructuredSessionManager {
             return undefined;
         return value;
     }
-    extractCodexUsage(source) {
-        if (!source || typeof source !== "object")
-            return undefined;
-        const value = {
-            inputTokens: typeof source.input_tokens === "number" ? source.input_tokens : undefined,
-            outputTokens: typeof source.output_tokens === "number" ? source.output_tokens : undefined,
-            cacheReadInputTokens: typeof source.cached_input_tokens === "number" ? source.cached_input_tokens : undefined,
-            reasoningOutputTokens: typeof source.reasoning_output_tokens === "number" ? source.reasoning_output_tokens : undefined,
-        };
-        if (value.inputTokens === undefined
-            && value.outputTokens === undefined
-            && value.cacheReadInputTokens === undefined
-            && value.reasoningOutputTokens === undefined) {
-            return undefined;
-        }
-        return value;
-    }
 }