@co0ontty/wand 4.80.0 → 4.80.1-beta.g1fbbefb

package/dist/structured-session-manager.js

@@ -1,5 +1,4 @@
 import { randomUUID } from "node:crypto";
-import { query as sdkQuery } from "@anthropic-ai/claude-agent-sdk";
 import { prepareSessionWorktree } from "./git-worktree.js";
 import { truncateMessagesForTransport } from "./message-truncator.js";
 import { buildChildEnv } from "./env-utils.js";
@@ -7,17 +6,16 @@ import { getErrorMessage } from "./error-utils.js";
 import { getDefaultModelForProvider } from "./config.js";
 import { recordIterationPrompt } from "./iteration-log.js";
 import { signalNameFromNumber } from "./signal-utils.js";
-import { resolveSdkClaudeBinary } from "./claude-sdk-runner.js";
-import { provisionalSessionTopic, SessionTopicCoordinator, sessionTopicBlocklistForSnapshot, shouldAcceptGeneratedSessionTitle, shouldGenerateSessionTopicFromInput, } from "./session-topic.js";
+import { provisionalSessionTopic, SessionNativeTitleTracker, SessionTopicCoordinator, sessionTopicBlocklistForSnapshot, shouldAcceptGeneratedSessionTitle, shouldGenerateSessionTopicFromInput, } from "./session-topic.js";
 import { resolveSessionCwd } from "./session-cwd.js";
 import { isSessionProvider, providerCliCommand } from "./session-provider.js";
-import { resolveSystemAiContext } from "./session-ai-context.js";
+import { resolveSessionProvider, resolveSystemAiContext } from "./session-ai-context.js";
+import { readNativeSessionTitle } from "./native-session-title.js";
 import { CodexRunner } from "./structured-codex-adapter.js";
 import { CodexProtocolReducer } from "./structured-codex-protocol.js";
 import { normalizeStructuredToolResultContent } from "./structured-content.js";
-import { buildClaudeSdkThinking, buildSessionSystemPromptParts, ClaudeCliRunner, derivePermissionPolicy, } from "./structured-claude-adapter.js";
-import { inferStructuredEscalation, structuredPermissionDenied } from "./structured-permission.js";
-import { captureTaskMeta, extractClaudeAssistantMessage, extractClaudeModelName, normalizeClaudeToolInput, stampParentTaskResults, stampSelfTask, tagSubagentBlocks, ClaudeCliProtocolReducer, } from "./structured-claude-protocol.js";
+import { ClaudeCliRunner, } from "./structured-claude-adapter.js";
+import { ClaudeCliProtocolReducer, } from "./structured-claude-protocol.js";
 import { OpenCodeRunner, applyOpenCodeEvent } from "./structured-opencode-adapter.js";
 import { GrokRunner, applyGrokEvent } from "./structured-grok-adapter.js";
 import { QoderRunner } from "./structured-qoder-adapter.js";
@@ -220,7 +218,6 @@ function buildStructuredOutputPayload(snapshot) {
         output: snapshot.output,
         messages: snapshot.messages ? enrichStructuredMessages(snapshot.messages, snapshot.id) : undefined,
         queuedMessages: snapshot.queuedMessages,
-        queuedMessageSkills: snapshot.queuedMessageSkills,
         sessionKind: "structured",
         structuredState: snapshot.structuredState,
         provider: snapshot.provider,
@@ -288,7 +285,6 @@ function buildIncrementalStructuredPayload(snapshot, cardDefaults) {
         wandProtocolVersion: WAND_PROTOCOL_VERSION,
         incremental: true,
         queuedMessages: snapshot.queuedMessages,
-        queuedMessageSkills: snapshot.queuedMessageSkills,
         sessionKind: "structured",
         structuredState: snapshot.structuredState,
         lastMessage,
@@ -398,30 +394,10 @@ export class StructuredSessionManager {
     storage;
     config;
     logger;
-    sdkQueryFactory;
     execHost;
     sessions = new Map();
     pendingRunnerExecutions = new Map();
-    pendingSdkAbort = new Map();
-    /**
-     * Active SDK Query handle per session, kept around so we can call
-     * `query.interrupt()` for a graceful stop instead of aborting via signal.
-     * Only populated while an SDK call is in flight.
-     */
-    pendingSdkQueries = new Map();
-    /** In-flight canUseTool waiters. One pending prompt per session. */
-    pendingPermissions = new Map();
-    /** approve_turn memory, scoped to the current SDK query. */
-    turnApprovalMemory = new Map();
     interruptedWith = new Map();
-    interruptedSkills = new Map();
-    /**
-     * Sessions where the current interrupt is a "queue promote" (用户从排队条点了「立即」
-     * 把队首插队到 now)。退出处理三个分支默认会把 queuedMessages 清空——因为常规的
-     * interrupt 语义是"算了，做这个"，把队列也作废。但 queue-promote 的语义是
-     * "先做这条，剩下的队列还要继续"，所以这里打个标记，让退出 handler 保留 queue。
-     * 收到后必须 delete 掉，避免下一次普通 interrupt 误带 flag。
-     */
     preserveQueueOnInterrupt = new Set();
     /** Last wall-clock time (ms) a streaming checkpoint reached SQLite. */
     lastStreamSaveAt = new Map();
@@ -439,6 +415,7 @@ export class StructuredSessionManager {
     emitEvent = null;
     archiveTimer = null;
     topicCoordinator = new SessionTopicCoordinator();
+    nativeTitles = new SessionNativeTitleTracker();
     streamEmitTimers = new Set();
     claudeCliRunner;
     codexRunner;
@@ -453,11 +430,10 @@ export class StructuredSessionManager {
     detachedRecoveryRetryTimer = null;
     detachedRecoveryFailureLogged = false;
     disposed = false;
-    constructor(storage, config, logger = null, sdkQueryFactory = sdkQuery, runners = {}, execHost) {
+    constructor(storage, config, logger = null, runners = {}, execHost) {
         this.storage = storage;
         this.config = config;
         this.logger = logger;
-        this.sdkQueryFactory = sdkQueryFactory;
         this.execHost = execHost;
         this.claudeCliRunner = runners.claudeCli ?? new ClaudeCliRunner({ language: () => this.config.language }, this.execHost);
         this.codexRunner = runners.codex ?? new CodexRunner(undefined, this.execHost);
@@ -477,9 +453,8 @@ export class StructuredSessionManager {
             // rely on the provider/runner invariant without making startup fail.
             const runner = isStructuredRunnerForProvider(provider, storedRunner)
                 ? storedRunner
-                : defaultStructuredRunner(provider, this.config.structuredRunner);
+                : defaultStructuredRunner(provider);
             const recoverableDetachedRun = snapshot.status === "running"
-                && runner !== "claude-sdk"
                 && this.execHost?.persistent === true;
             if (recoverableDetachedRun)
                 this.pendingRecoveryIds.push(snapshot.id);
@@ -494,7 +469,6 @@ export class StructuredSessionManager {
                 autoApprovePermissions: snapshot.autoApprovePermissions ?? shouldAutoApproveForMode(snapshot.mode),
                 approvalStats: snapshot.approvalStats ?? { tool: 0, command: 0, file: 0, total: 0 },
                 queuedMessages: snapshot.queuedMessages ?? [],
-                queuedMessageSkills: (snapshot.queuedMessages ?? []).map((_, index) => snapshot.queuedMessageSkills?.[index] ?? []),
                 pendingEscalation: null,
                 permissionBlocked: false,
                 structuredState: {
@@ -567,8 +541,6 @@ export class StructuredSessionManager {
         this.streamEmitTimers.clear();
         const activeSessionIds = new Set([
             ...this.pendingRunnerExecutions.keys(),
-            ...this.pendingSdkQueries.keys(),
-            ...this.pendingSdkAbort.keys(),
             ...Array.from(this.sessions.values())
                 .filter((session) => session.structuredState?.inFlight)
                 .map((session) => session.id),
@@ -580,7 +552,7 @@ export class StructuredSessionManager {
             const session = this.sessions.get(id);
             if (!session)
                 continue;
-            if (detachSafe && session.runner !== "claude-sdk")
+            if (detachSafe)
                 continue;
             const cancelled = {
                 ...session,
@@ -603,25 +575,12 @@ export class StructuredSessionManager {
             catch { /* best-effort shutdown flush */ }
         }
         for (const [executionId, execution] of this.pendingRunnerExecutions) {
-            if (detachSafe && this.sessions.get(executionId)?.runner !== "claude-sdk")
+            if (detachSafe)
                 continue;
             execution.interrupt();
         }
-        for (const [sessionId, waiter] of this.pendingPermissions) {
-            waiter.resolve(structuredPermissionDenied("服务已关闭"));
-            this.pendingPermissions.delete(sessionId);
-        }
-        this.turnApprovalMemory.clear();
-        for (const query of this.pendingSdkQueries.values()) {
-            void query.interrupt().catch(() => { });
-        }
-        for (const controller of this.pendingSdkAbort.values())
-            controller.abort();
         this.pendingRunnerExecutions.clear();
-        this.pendingSdkQueries.clear();
-        this.pendingSdkAbort.clear();
         this.interruptedWith.clear();
-        this.interruptedSkills.clear();
         this.preserveQueueOnInterrupt.clear();
         for (const timer of this.streamCheckpointTimers.values())
             clearTimeout(timer);
@@ -629,6 +588,7 @@ export class StructuredSessionManager {
         this.streamCheckpointDirty.clear();
         this.lastStreamSaveAt.clear();
         this.topicCoordinator.clear();
+        this.nativeTitles.clear();
         this.emitEvent = null;
     }
     // ---------------------------------------------------------------------------
@@ -1142,8 +1102,11 @@ export class StructuredSessionManager {
         // 迭代提示词记录：和会话标题共用同一套「有没有信息量」判断，用户不用多做一步。
         recordIterationPrompt(this.storage, session, input, "session");
         const blockedTitles = sessionTopicBlocklistForSnapshot(session, this.storage);
+        // CLI 自己起了名字就归它，模型标题与输入首行都不再覆盖；取不到原生标题才走系统硅基员工。
+        const hasNativeTitle = this.nativeTitles.has(id);
         const provisional = provisionalSessionTopic(input, blockedTitles);
         if (provisional
+            && !hasNativeTitle
             && shouldGenerateSessionTopicFromInput(input)
             && (session.title !== provisional.title || session.description !== provisional.description)) {
             this.setSessionTopic(id, provisional.title, provisional.description);
@@ -1154,12 +1117,22 @@ export class StructuredSessionManager {
             cwd: session.cwd,
             language: this.config.language,
             ai: resolveSystemAiContext(session, this.config, this.storage.getSystemSiliconEmployee()),
+            readNativeTitle: () => readNativeSessionTitle(resolveSessionProvider(session), session.claudeSessionId, session.cwd),
+            hasNativeTitle,
             onGenerating: (generating) => {
                 if (!this.disposed)
                     this.setSessionTopicGenerating(id, generating);
             },
-            onTopic: ({ title, description }) => {
-                if (!this.disposed && this.sessions.has(id) && shouldAcceptGeneratedSessionTitle(title, blockedTitles)) {
+            onTopic: ({ title, description, source }) => {
+                if (this.disposed || !this.sessions.has(id))
+                    return;
+                if (source === "native") {
+                    this.applyNativeSessionTitle(id, title, blockedTitles);
+                    return;
+                }
+                if (this.nativeTitles.has(id))
+                    return;
+                if (shouldAcceptGeneratedSessionTitle(title, blockedTitles)) {
                     this.setSessionTopic(id, title, description);
                 }
             },
@@ -1168,6 +1141,16 @@ export class StructuredSessionManager {
             },
         });
     }
+    /** 原生标题优先于模型标题：只受「不能是任务名/目录名」约束，命中且变化时才落库。 */
+    applyNativeSessionTitle(id, title, blockedTitles) {
+        this.nativeTitles.record(id, title);
+        const current = this.sessions.get(id);
+        if (!current || !shouldAcceptGeneratedSessionTitle(title, blockedTitles))
+            return;
+        if (current.title === title && current.description === title)
+            return;
+        this.setSessionTopic(id, title, title);
+    }
     createSession(options) {
         if (this.disposed)
             throw new Error("StructuredSessionManager has been disposed.");
@@ -1178,7 +1161,7 @@ export class StructuredSessionManager {
             throw new Error(`不支持的结构化 provider: ${String(requestedProvider)}`);
         }
         const provider = requestedProvider;
-        const runner = resolveStructuredRunner(provider, options.runner, this.config.structuredRunner);
+        const runner = resolveStructuredRunner(provider, options.runner);
         const baseCwd = resolveSessionCwd(options.cwd, this.config.defaultCwd);
         const worktreeSetup = options.worktreeEnabled
             ? prepareSessionWorktree({ cwd: baseCwd, sessionId: id, spec: options.worktreeSpec })
@@ -1212,8 +1195,8 @@ export class StructuredSessionManager {
                                 ? "pi --mode json --print"
                                 : provider === "gemini"
                                     ? "gemini -p --output-format stream-json"
-                                    : runner === "claude-sdk"
-                                        ? "claude-agent-sdk (stream-json)"
+                                    : runner === "claude-cli-print"
+                                        ? "claude -p (stream-json)"
                                         : "claude -p --output-format stream-json",
             cwd: worktreeSetup?.cwd ?? baseCwd,
             mode: options.mode,
@@ -1268,7 +1251,7 @@ export class StructuredSessionManager {
         return titled;
     }
     /** Only an unstarted employee conversation may change CLI after a failed first turn. */
-    retryEmployeeCandidate(id, original, prompt, error, skills) {
+    retryEmployeeCandidate(id, original, prompt, error) {
         const candidates = original.employeeCandidates ?? [];
         const nextIndex = (original.employeeCandidateIndex ?? 0) + 1;
         if (!original.employeeId || (original.messages?.length ?? 0) !== 0 || nextIndex >= candidates.length)
@@ -1281,7 +1264,7 @@ export class StructuredSessionManager {
         if (!(error instanceof UnacceptedStructuredSpawnError))
             return null;
         const next = candidates[nextIndex];
-        const runner = resolveStructuredRunner(next.provider, undefined, this.config.structuredRunner);
+        const runner = resolveStructuredRunner(next.provider, undefined);
         const model = next.model === "default"
             ? getDefaultModelForProvider(this.config, next.provider) || null
             : next.model;
@@ -1308,7 +1291,7 @@ export class StructuredSessionManager {
         this.sessions.set(id, retry);
         this.saveAuthoritativeSession(retry);
         this.emitStructuredSnapshot(retry);
-        return this.sendMessage(id, prompt, { skills });
+        return this.sendMessage(id, prompt);
     }
     /** 往转发会话里追加别的参与者的发言。 */
     appendRelayTurns(id, turns) {
@@ -1349,7 +1332,6 @@ export class StructuredSessionManager {
             }
             return this.sessions.get(id) ?? posted;
         }
-        const skills = opts?.skills ?? [];
         if (opts?.idempotencyKey) {
             const mapKey = `${id}:${opts.idempotencyKey}`;
             if (this.seenIdempotencyKeys.has(mapKey)) {
@@ -1369,17 +1351,12 @@ export class StructuredSessionManager {
         this.maybeGenerateSessionTopic(id, prompt);
         if (session.structuredState?.inFlight) {
             const runnerExecution = this.pendingRunnerExecutions.get(id);
-            const sdkAbort = this.pendingSdkAbort.get(id);
-            const sdkQueryHandle = this.pendingSdkQueries.get(id);
             // 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 (!childActive) {
                 if (runnerExecution)
                     this.releasePendingRunnerExecution(id, runnerExecution);
-                if (sdkAbort)
-                    this.releasePendingSdkAbort(id, sdkAbort);
                 const recovered = {
                     ...session,
                     status: "idle",
@@ -1396,7 +1373,6 @@ export class StructuredSessionManager {
             }
             else if (opts?.interrupt) {
                 this.interruptedWith.set(id, prompt);
-                this.interruptedSkills.set(id, skills);
                 if (opts.preserveQueue) {
                     this.preserveQueueOnInterrupt.add(id);
                     // 「立即发送」排队条某一条：interrupt 把它作为新输入重发，但该条仍留在
@@ -1409,12 +1385,7 @@ export class StructuredSessionManager {
                         const removeAt = queue.indexOf(prompt);
                         if (removeAt !== -1) {
                             const trimmedQueue = queue.slice(0, removeAt).concat(queue.slice(removeAt + 1));
-                            const queuedMessageSkills = session.queuedMessageSkills ?? [];
-                            session = {
-                                ...session,
-                                queuedMessages: trimmedQueue,
-                                queuedMessageSkills: queuedMessageSkills.slice(0, removeAt).concat(queuedMessageSkills.slice(removeAt + 1)),
-                            };
+                            session = { ...session, queuedMessages: trimmedQueue };
                             this.sessions.set(id, session);
                             this.storage.updateSessionRuntimeMetadata(session);
                             this.emitStructuredSnapshot(session);
@@ -1425,11 +1396,6 @@ export class StructuredSessionManager {
                     this.preserveQueueOnInterrupt.delete(id);
                 }
                 runnerExecution?.interrupt();
-                if (sdkQueryHandle) {
-                    void sdkQueryHandle.interrupt().catch(() => { });
-                }
-                if (sdkAbort)
-                    sdkAbort.abort();
                 return session;
             }
             else {
@@ -1445,7 +1411,6 @@ export class StructuredSessionManager {
                 const queued = {
                     ...session,
                     queuedMessages: [...queue, prompt],
-                    queuedMessageSkills: [...queue.map((_, index) => session.queuedMessageSkills?.[index] ?? []), skills],
                 };
                 this.sessions.set(id, queued);
                 this.storage.updateSessionRuntimeMetadata(queued);
@@ -1554,9 +1519,6 @@ export class StructuredSessionManager {
                     installHint: "请安装 @google/gemini-cli ≥ 0.11（`npm i -g @google/gemini-cli@latest`），或重跑 `wand service:install` 刷新服务的 PATH",
                 });
             }
-            else if (runner === "claude-sdk") {
-                await this.runClaudeSdkStreaming(id, updated, prompt, requestId, skills);
-            }
             else {
                 await this.runClaudeStreaming(id, updated, cliClaudePrompt, requestId);
             }
@@ -1569,7 +1531,7 @@ export class StructuredSessionManager {
             // the detailed failure. Re-throw even if an ended-event listener removed
             // the session synchronously; there is no request-id marker to leak.
             if (error instanceof PersistedStructuredRunnerError) {
-                const retry = this.retryEmployeeCandidate(id, session, prompt, error, skills);
+                const retry = this.retryEmployeeCandidate(id, session, prompt, error);
                 if (retry)
                     return await retry;
                 throw error;
@@ -1582,11 +1544,9 @@ export class StructuredSessionManager {
             if (!this.isCurrentRequest(id, requestId)) {
                 return current;
             }
-            const retry = this.retryEmployeeCandidate(id, session, prompt, error, skills);
+            const retry = this.retryEmployeeCandidate(id, session, prompt, error);
             if (retry)
                 return await retry;
-            this.settlePendingPermission(id, undefined, structuredPermissionDenied("会话执行失败"));
-            this.turnApprovalMemory.delete(id);
             const failed = {
                 ...current,
                 status: "failed",
@@ -1637,7 +1597,6 @@ export class StructuredSessionManager {
         const updated = {
             ...session,
             queuedMessages: reordered,
-            queuedMessageSkills: order.map((idx) => (session.queuedMessageSkills ?? [])[idx] ?? []),
         };
         this.sessions.set(sessionId, updated);
         this.storage.updateSessionRuntimeMetadata(updated);
@@ -1673,11 +1632,9 @@ export class StructuredSessionManager {
             throw new Error("排队消息已变化，请按最新顺序重试。");
         }
         const next = queue.slice(0, index).concat(queue.slice(index + 1));
-        const skills = session.queuedMessageSkills ?? [];
         const updated = {
             ...session,
             queuedMessages: next,
-            queuedMessageSkills: skills.slice(0, index).concat(skills.slice(index + 1)),
         };
         this.sessions.set(sessionId, updated);
         this.storage.updateSessionRuntimeMetadata(updated);
@@ -1702,15 +1659,11 @@ export class StructuredSessionManager {
             throw new Error("排队消息已变化，请按最新顺序重试。");
         }
         const prompt = queue[index];
-        const skills = (session.queuedMessageSkills ?? [])[index] ?? [];
         const remaining = queue.slice(0, index).concat(queue.slice(index + 1));
-        const remainingSkills = (session.queuedMessageSkills ?? []).slice(0, index)
-            .concat((session.queuedMessageSkills ?? []).slice(index + 1));
         const inFlight = session.status === "running" && session.structuredState?.inFlight === true;
         const updated = {
             ...session,
             queuedMessages: remaining,
-            queuedMessageSkills: remainingSkills,
         };
         this.sessions.set(sessionId, updated);
         this.storage.updateSessionRuntimeMetadata(updated);
@@ -1721,7 +1674,6 @@ export class StructuredSessionManager {
                 preserveQueue: inFlight,
                 queueAlreadyRemoved: true,
                 idempotencyKey,
-                skills,
             });
         }
         catch {
@@ -1736,7 +1688,7 @@ export class StructuredSessionManager {
         if (!session.queuedMessages || session.queuedMessages.length === 0) {
             return session;
         }
-        const updated = { ...session, queuedMessages: [], queuedMessageSkills: [] };
+        const updated = { ...session, queuedMessages: [] };
         this.sessions.set(sessionId, updated);
         this.storage.updateSessionRuntimeMetadata(updated);
         this.emitStructuredSnapshot(updated);
@@ -1863,12 +1815,6 @@ export class StructuredSessionManager {
         if (approved && scope) {
             this.incrementApprovalStats(session, scope);
         }
-        if (approved && resolution === "approve_turn") {
-            this.rememberTurnApproval(sessionId, pending.scope, pending.target);
-        }
-        this.settlePendingPermission(sessionId, pending.requestId, approved
-            ? { behavior: "allow" }
-            : structuredPermissionDenied("User rejected permission request"));
         const updated = {
             ...session,
             pendingEscalation: null,
@@ -1889,11 +1835,8 @@ export class StructuredSessionManager {
         return updated;
     }
     stop(id) {
-        this.settlePendingPermission(id, undefined, structuredPermissionDenied("已停止"));
-        this.turnApprovalMemory.delete(id);
         const session = this.requireSession(id);
         this.interruptedWith.delete(id);
-        this.interruptedSkills.delete(id);
         this.preserveQueueOnInterrupt.delete(id);
         // Clearing activeRequestId is the generation barrier: late data/close callbacks
         // from the cancelled runner can no longer mutate this session or a replacement turn.
@@ -1919,47 +1862,22 @@ export class StructuredSessionManager {
             runnerExecution.interrupt();
             this.releasePendingRunnerExecution(id, runnerExecution);
         }
-        // SDK runner：先尝试 query.interrupt() 优雅停止，失败再走 abort。
-        // 两个都清掉避免后续重复操作。
-        const sdkQuery = this.pendingSdkQueries.get(id);
-        if (sdkQuery) {
-            void sdkQuery.interrupt().catch(() => { });
-            this.releasePendingSdkQuery(id, sdkQuery);
-        }
-        const sdkAbort = this.pendingSdkAbort.get(id);
-        if (sdkAbort) {
-            sdkAbort.abort();
-            this.releasePendingSdkAbort(id, sdkAbort);
-        }
         this.saveAuthoritativeSession(cancelled);
         // 仍发 "ended" 事件让各端停掉"回复中"指示 / 灵动岛，但携带的 status 是 idle。
         this.emitStructuredSnapshot(cancelled, "ended");
         return cancelled;
     }
     delete(id) {
-        this.settlePendingPermission(id, undefined, structuredPermissionDenied("会话已删除"));
-        this.turnApprovalMemory.delete(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. Cancellation
-        // can synchronously wake listeners in some SDK/adapter implementations.
+        // can synchronously wake listeners in some adapter implementations.
         this.sessions.delete(id);
         if (runnerExecution) {
             runnerExecution.interrupt();
             this.releasePendingRunnerExecution(id, runnerExecution);
         }
-        if (sdkQuery) {
-            void sdkQuery.interrupt().catch(() => { });
-            this.releasePendingSdkQuery(id, sdkQuery);
-        }
-        if (sdkAbort) {
-            sdkAbort.abort();
-            this.releasePendingSdkAbort(id, sdkAbort);
-        }
         this.clearStreamingCheckpoint(id);
         this.interruptedWith.delete(id);
-        this.interruptedSkills.delete(id);
         this.preserveQueueOnInterrupt.delete(id);
         this.storage.deleteSession(id);
         this.logger?.deleteSession(id);
@@ -1993,18 +1911,6 @@ export class StructuredSessionManager {
         this.execHost?.forgetRun(structuredRunId(sessionId));
         return true;
     }
-    releasePendingSdkAbort(sessionId, controller) {
-        if (this.pendingSdkAbort.get(sessionId) !== controller)
-            return false;
-        this.pendingSdkAbort.delete(sessionId);
-        return true;
-    }
-    releasePendingSdkQuery(sessionId, query) {
-        if (this.pendingSdkQueries.get(sessionId) !== query)
-            return false;
-        this.pendingSdkQueries.delete(sessionId);
-        return true;
-    }
     emitStructuredSnapshot(session, eventType = "output") {
         // 排队消息只通过 payload.queuedMessages 单独下发，由各端在消息卡片外的「排队条」
         // 里纵向渲染——绝不再把它们当成 __queued 占位 turn 混进 messages 消息流里，否则会
@@ -2035,17 +1941,15 @@ export class StructuredSessionManager {
         if (!nextInput) {
             return;
         }
-        const [nextSkills = [], ...restSkills] = current.queuedMessageSkills ?? [];
         const nextSession = {
             ...current,
             queuedMessages: restQueue,
-            queuedMessageSkills: restSkills,
         };
         this.sessions.set(sessionId, nextSession);
         this.storage.updateSessionRuntimeMetadata(nextSession);
         this.emitStructuredSnapshot(nextSession);
         try {
-            await this.sendMessage(sessionId, nextInput, { skills: nextSkills });
+            await this.sendMessage(sessionId, nextInput);
         }
         catch (error) {
             console.error("[WAND] flushNextQueuedMessage failed:", error);
@@ -2055,7 +1959,6 @@ export class StructuredSessionManager {
                 const rescued = {
                     ...afterFail,
                     queuedMessages: [nextInput, ...(afterFail.queuedMessages ?? [])],
-                    queuedMessageSkills: [nextSkills, ...(afterFail.queuedMessageSkills ?? [])],
                 };
                 this.sessions.set(sessionId, rescued);
                 this.storage.updateSessionRuntimeMetadata(rescued);
@@ -2083,123 +1986,6 @@ export class StructuredSessionManager {
         stats.total++;
         session.approvalStats = stats;
     }
-    rememberTurnApproval(sessionId, scope, target) {
-        let memory = this.turnApprovalMemory.get(sessionId);
-        if (!memory) {
-            memory = { scopes: new Set(), targets: new Set() };
-            this.turnApprovalMemory.set(sessionId, memory);
-        }
-        memory.scopes.add(scope);
-        if (target)
-            memory.targets.add(target);
-    }
-    settlePendingPermission(sessionId, requestId, result) {
-        const waiter = this.pendingPermissions.get(sessionId);
-        if (!waiter)
-            return;
-        if (requestId !== undefined && waiter.requestId !== requestId)
-            return;
-        this.pendingPermissions.delete(sessionId);
-        waiter.resolve(result);
-    }
-    async handleCanUseTool(sessionId, requestId, toolName, input, ctx) {
-        const deny = (message) => structuredPermissionDenied(message);
-        if (ctx.signal.aborted || this.disposed)
-            return deny("已取消");
-        const current = this.currentSessionForRequest(sessionId, requestId);
-        if (!current)
-            return deny("会话已结束");
-        const inferred = inferStructuredEscalation(toolName, input, ctx);
-        if (current.autoApprovePermissions) {
-            this.incrementApprovalStats(current, inferred.scope);
-            this.storage.updateSessionRuntimeMetadata(current);
-            return { behavior: "allow" };
-        }
-        const memory = this.turnApprovalMemory.get(sessionId);
-        if (memory && (memory.scopes.has(inferred.scope) || (inferred.target && memory.targets.has(inferred.target)))) {
-            return { behavior: "allow" };
-        }
-        const existing = this.pendingPermissions.get(sessionId);
-        if (existing) {
-            await new Promise((resolve) => {
-                const previous = existing.resolve;
-                existing.resolve = (result) => {
-                    previous(result);
-                    resolve(result);
-                };
-            });
-            if (ctx.signal.aborted || this.disposed)
-                return deny("已取消");
-            return this.handleCanUseTool(sessionId, requestId, toolName, input, ctx);
-        }
-        const escalation = {
-            requestId: ctx.toolUseID ? `sdk-${ctx.toolUseID}` : `sdk-${Date.now()}`,
-            scope: inferred.scope,
-            runner: "json",
-            source: "tool_permission_request",
-            target: inferred.target,
-            reason: inferred.reason,
-        };
-        return await new Promise((resolve) => {
-            let settled = false;
-            const finish = (result) => {
-                if (settled)
-                    return;
-                settled = true;
-                ctx.signal.removeEventListener("abort", onAbort);
-                if (this.pendingPermissions.get(sessionId)?.requestId === escalation.requestId) {
-                    this.pendingPermissions.delete(sessionId);
-                }
-                resolve(result);
-            };
-            const onAbort = () => {
-                finish(deny("已取消"));
-                const latest = this.currentSessionForRequest(sessionId, requestId);
-                if (latest?.pendingEscalation?.requestId === escalation.requestId) {
-                    const cleared = {
-                        ...latest,
-                        pendingEscalation: null,
-                        permissionBlocked: false,
-                    };
-                    this.sessions.set(sessionId, cleared);
-                    this.storage.updateSessionRuntimeMetadata(cleared);
-                    this.emit({
-                        type: "status",
-                        sessionId,
-                        data: { permissionBlocked: false, sessionKind: "structured" },
-                    });
-                }
-            };
-            ctx.signal.addEventListener("abort", onAbort, { once: true });
-            this.pendingPermissions.set(sessionId, { requestId: escalation.requestId, resolve: finish });
-            const latest = this.currentSessionForRequest(sessionId, requestId);
-            if (!latest || ctx.signal.aborted) {
-                finish(deny("会话已结束"));
-                return;
-            }
-            const updated = {
-                ...latest,
-                pendingEscalation: escalation,
-                permissionBlocked: true,
-            };
-            this.sessions.set(sessionId, updated);
-            this.storage.updateSessionRuntimeMetadata(updated);
-            this.emit({
-                type: "status",
-                sessionId,
-                data: {
-                    sessionKind: "structured",
-                    permissionBlocked: true,
-                    permissionRequest: {
-                        scope: escalation.scope,
-                        target: escalation.target,
-                        prompt: escalation.reason,
-                    },
-                    pendingEscalation: escalation,
-                },
-            });
-        });
-    }
     // ---------------------------------------------------------------------------
     // Streaming codex exec --json execution
     // ---------------------------------------------------------------------------
@@ -2328,7 +2114,6 @@ export class StructuredSessionManager {
             claudeSessionId: result.state.sessionId ?? current.claudeSessionId,
             messages,
             queuedMessages: this.resolveQueuedMessagesAfterInterrupt(sessionId, current, interruptPrompt),
-            queuedMessageSkills: this.resolveQueuedMessageSkillsAfterInterrupt(sessionId, current, interruptPrompt),
             pendingEscalation: null,
             permissionBlocked: false,
             structuredState: {
@@ -2345,12 +2130,10 @@ export class StructuredSessionManager {
         if (!keepRunning)
             this.emitStructuredSnapshot(finished, "ended");
         if (interruptPrompt) {
-            const interruptedSkills = this.interruptedSkills.get(sessionId) ?? [];
             this.interruptedWith.delete(sessionId);
-            this.interruptedSkills.delete(sessionId);
             this.preserveQueueOnInterrupt.delete(sessionId);
             setImmediate(() => {
-                this.sendMessage(sessionId, interruptPrompt, { skills: interruptedSkills }).catch((error) => {
+                this.sendMessage(sessionId, interruptPrompt).catch((error) => {
                     console.error("[WAND] codex interrupt-and-send failed:", error);
                 });
             });
@@ -2473,7 +2256,6 @@ export class StructuredSessionManager {
             claudeSessionId: result.state.sessionId ?? current.claudeSessionId,
             messages,
             queuedMessages: this.resolveQueuedMessagesAfterInterrupt(sessionId, current, interruptPrompt),
-            queuedMessageSkills: this.resolveQueuedMessageSkillsAfterInterrupt(sessionId, current, interruptPrompt),
             pendingEscalation: null,
             permissionBlocked: false,
             structuredState: {
@@ -2490,11 +2272,9 @@ export class StructuredSessionManager {
         if (!keepRunning)
             this.emitStructuredSnapshot(finished, "ended");
         if (interruptPrompt) {
-            const interruptedSkills = this.interruptedSkills.get(sessionId) ?? [];
             this.interruptedWith.delete(sessionId);
-            this.interruptedSkills.delete(sessionId);
             this.preserveQueueOnInterrupt.delete(sessionId);
-            setImmediate(() => this.sendMessage(sessionId, interruptPrompt, { skills: interruptedSkills }).catch((error) => {
+            setImmediate(() => this.sendMessage(sessionId, interruptPrompt).catch((error) => {
                 console.error("[WAND] grok interrupt-and-send failed:", error);
             }));
             return;
@@ -2624,7 +2404,6 @@ export class StructuredSessionManager {
             claudeSessionId: result.state.sessionId ?? current.claudeSessionId,
             messages,
             queuedMessages: this.resolveQueuedMessagesAfterInterrupt(sessionId, current, interruptPrompt),
-            queuedMessageSkills: this.resolveQueuedMessageSkillsAfterInterrupt(sessionId, current, interruptPrompt),
             pendingEscalation: null,
             permissionBlocked: false,
             structuredState: {
@@ -2641,12 +2420,10 @@ export class StructuredSessionManager {
         if (!keepRunning)
             this.emitStructuredSnapshot(finished, "ended");
         if (interruptPrompt) {
-            const interruptedSkills = this.interruptedSkills.get(sessionId) ?? [];
             this.interruptedWith.delete(sessionId);
-            this.interruptedSkills.delete(sessionId);
             this.preserveQueueOnInterrupt.delete(sessionId);
             setImmediate(() => {
-                this.sendMessage(sessionId, interruptPrompt, { skills: interruptedSkills }).catch((error) => {
+                this.sendMessage(sessionId, interruptPrompt).catch((error) => {
                     console.error("[WAND] opencode interrupt-and-send failed:", error);
                 });
             });
@@ -2816,7 +2593,6 @@ export class StructuredSessionManager {
             claudeSessionId: result.state.sessionId ?? current.claudeSessionId,
             messages,
             queuedMessages: this.resolveQueuedMessagesAfterInterrupt(sessionId, current, interruptPrompt),
-            queuedMessageSkills: this.resolveQueuedMessageSkillsAfterInterrupt(sessionId, current, interruptPrompt),
             pendingEscalation: null,
             permissionBlocked: false,
             structuredState: {
@@ -2834,12 +2610,10 @@ export class StructuredSessionManager {
         if (!keepRunning)
             this.emitStructuredSnapshot(finished, "ended");
         if (interruptPrompt) {
-            const interruptedSkills = this.interruptedSkills.get(sessionId) ?? [];
             this.interruptedWith.delete(sessionId);
-            this.interruptedSkills.delete(sessionId);
             this.preserveQueueOnInterrupt.delete(sessionId);
             setImmediate(() => {
-                this.sendMessage(sessionId, interruptPrompt, { skills: interruptedSkills }).catch((error) => {
+                this.sendMessage(sessionId, interruptPrompt).catch((error) => {
                     console.error("[WAND] interrupt-and-send failed:", error);
                 });
             });
@@ -2863,494 +2637,6 @@ export class StructuredSessionManager {
         setImmediate(() => { void this.flushNextQueuedMessage(sessionId); });
     }
     // ---------------------------------------------------------------------------
-    // Streaming claude-agent-sdk execution
-    // ---------------------------------------------------------------------------
-    /**
-     * Use @anthropic-ai/claude-agent-sdk instead of spawning claude -p directly.
-     * The SDK still spawns the claude binary but provides typed AsyncGenerator<SDKMessage>
-     * messages, so we skip NDJSON parsing. Options are 1:1 with the CLI flags.
-     *
-     * Streaming is enabled via includePartialMessages: true — the SDK emits
-     * SDKPartialAssistantMessage (type: "stream_event") with BetaRawMessageStreamEvent
-     * payloads for incremental text/thinking/tool_use updates, followed by a final
-     * SDKAssistantMessage with the authoritative complete content.
-     */
-    async runClaudeSdkStreaming(sessionId, session, prompt, requestId, skills) {
-        const abortController = new AbortController();
-        this.pendingSdkAbort.set(sessionId, abortController);
-        this.turnApprovalMemory.delete(sessionId);
-        const isManaged = session.mode === "managed";
-        let killedForAskUserQuestion = false;
-        // 权限策略 + 系统提示词都通过共享 helper 派生，与 CLI runner 一字不差。
-        const permPolicy = derivePermissionPolicy(session.mode, session.autoApprovePermissions ?? false, session.cwd);
-        const systemPromptParts = buildSessionSystemPromptParts(session, this.config.language);
-        const sdkClaudeBinary = resolveSdkClaudeBinary();
-        // SDK 默认会把整个 process.env 透传给 claude 子进程；这里显式按 inheritEnv 配置组装，
-        // 否则关闭"继承环境变量"开关时 SDK 路径会被静默忽略。
-        const sdkEnv = buildChildEnv(this.config.inheritEnv !== false);
-        const sdkThinking = buildClaudeSdkThinking(session.thinkingEffort);
-        const sdkOptions = {
-            cwd: session.cwd,
-            abortController,
-            env: sdkEnv,
-            permissionMode: permPolicy.permissionMode,
-            ...(permPolicy.permissionMode === "bypassPermissions" ? { allowDangerouslySkipPermissions: true } : {}),
-            ...(permPolicy.permissionMode !== "bypassPermissions"
-                ? {
-                    canUseTool: (toolName, input, ctx) => this.handleCanUseTool(sessionId, requestId, toolName, input, ctx),
-                }
-                : {}),
-            ...(permPolicy.allowedTools ? { allowedTools: permPolicy.allowedTools } : {}),
-            ...(isManaged ? { disallowedTools: ["AskUserQuestion"] } : {}),
-            skills,
-            thinking: sdkThinking,
-            includePartialMessages: true,
-            // 把子 agent 的 text/thinking 也转发回来，UI 才能把"被 Task 召唤来的协作者"
-            // 渲染成独立角色的群聊消息。关掉这个开关时只会收到子 agent 的 tool_use/tool_result，
-            // text/thinking 被 SDK 吞掉。
-            forwardSubagentText: true,
-            ...(systemPromptParts.length > 0 ? { appendSystemPrompt: systemPromptParts.join("\n\n") } : {}),
-            ...(sdkClaudeBinary ? { pathToClaudeCodeExecutable: sdkClaudeBinary } : {}),
-        };
-        if (session.claudeSessionId)
-            sdkOptions.resume = session.claudeSessionId;
-        const modelChoice = session.selectedModel?.trim();
-        if (modelChoice && modelChoice !== "default")
-            sdkOptions.model = modelChoice;
-        // Streaming input mode：把这一轮的 user turn 重建成一条 SDKUserMessage 喂给 SDK。
-        // 上层 sendMessage 已经把 userTurn 写进 session.messages 末尾——如果它的内容是
-        // tool_result，说明本次是用户在回答上一轮 AskUserQuestion，否则就是普通文本。
-        // 走 streaming input 而非 string prompt 的好处：tool_result 是真的 tool_result
-        // block，对 Claude 来说就是标准工具回传，不需要 "[对刚才工具的回答…]" 这种文本
-        // 提示让模型脑补语义。
-        const lastUserTurn = (session.messages ?? []).slice().reverse().find((m) => m.role === "user");
-        const lastUserBlock = lastUserTurn?.content?.[0];
-        let sdkInitialMessage;
-        if (lastUserBlock?.type === "tool_result") {
-            // Anthropic 的 tool_result.content 原生支持 string 或 content-block 数组（text/image
-            // 等）。wand 内部 ToolResultBlock 的 array 形态是 `{type: string; ...}` 比官方 union
-            // 宽，但实际取值都是 `{type: "text", text}`，结构上兼容；用 `as` 把宽类型缩到 SDK
-            // 接受的形态即可，比 JSON.stringify 把数组拍成一坨 JSON 文本更忠实。
-            sdkInitialMessage = {
-                type: "user",
-                message: {
-                    role: "user",
-                    content: [
-                        {
-                            type: "tool_result",
-                            tool_use_id: lastUserBlock.tool_use_id,
-                            content: lastUserBlock.content,
-                            is_error: lastUserBlock.is_error === true,
-                        },
-                    ],
-                },
-                parent_tool_use_id: null,
-            };
-        }
-        else {
-            sdkInitialMessage = {
-                type: "user",
-                message: {
-                    role: "user",
-                    content: [{ type: "text", text: prompt }],
-                },
-                parent_tool_use_id: null,
-            };
-        }
-        async function* singleShotPrompt() {
-            yield sdkInitialMessage;
-        }
-        const turnState = {
-            blocks: [],
-            result: "",
-            sessionId: null,
-            model: undefined,
-            usage: undefined,
-        };
-        // Tracks in-progress streaming blocks keyed by content_block index from stream_event.
-        // The map is cleared whenever a complete `assistant` message arrives — its blocks
-        // are then promoted into `finalizedBlocks` below.
-        //
-        // `parentToolUseId` carries through from SDKPartialAssistantMessage so we can
-        // stamp streaming blocks with subagent persona *during* streaming, not only
-        // after the completion event. Without it, subagent text shows up under the
-        // parent's avatar for tens of ms then snaps to the subagent — visible flicker.
-        const streamingBlockByIndex = new Map();
-        // Blocks from messages that have already completed within this turn — including
-        // the parent assistant's prior messages, every subagent assistant message, and
-        // every tool_result. Subagent (Task tool) flows produce many assistant messages
-        // back-to-back; without this list, each new streaming message would visually
-        // erase everything that came before it in the same turn.
-        const finalizedBlocks = [];
-        // Per-turn Task tool_use_id → meta map; populated from the parent assistant's
-        // Task tool_use blocks and consulted when subagent messages arrive.
-        const taskMetaRegistry = new Map();
-        let emitTimer = 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));
-        };
-        // Rebuild ContentBlock[] from finalized history + the in-progress streaming map.
-        // Returning only the streaming blocks would drop every prior parent/subagent
-        // message in this turn (the original disappearing-output bug).
-        const rebuildStreamingBlocks = () => {
-            const sorted = [...streamingBlockByIndex.entries()].sort((a, b) => a[0] - b[0]);
-            const streaming = [];
-            for (const [, sb] of sorted) {
-                let block = null;
-                if (sb.type === "text") {
-                    block = { type: "text", text: sb.text };
-                }
-                else if (sb.type === "thinking") {
-                    block = { type: "thinking", thinking: sb.thinking };
-                }
-                else if (sb.type === "tool_use" && sb.id && sb.name) {
-                    let input = {};
-                    if (sb.finalized && sb.partialInput) {
-                        try {
-                            input = JSON.parse(sb.partialInput);
-                        }
-                        catch { /* partial json */ }
-                    }
-                    block = { type: "tool_use", id: sb.id, name: sb.name, input: normalizeClaudeToolInput(sb.name, input) };
-                }
-                if (!block)
-                    continue;
-                if (sb.parentToolUseId) {
-                    const [stamped] = tagSubagentBlocks([block], sb.parentToolUseId, taskMetaRegistry);
-                    streaming.push(stamped);
-                }
-                else {
-                    streaming.push(block);
-                }
-            }
-            // 流式阶段就给 Task/Agent tool_use 本身盖章，防止"先显示工具卡片几秒再跳为
-            // handoff 行"的闪烁。content_block_start 阶段就有 name=Task/Agent，
-            // stampSelfTask 据此即可命中；agentType 字段藏在 input 里，delta 累计后再由
-            // 后续 captureTaskMeta 回填 registry，下次 rebuild 自动补上更完整的 stamp。
-            captureTaskMeta(streaming, taskMetaRegistry);
-            const stampedStreaming = stampSelfTask(streaming, taskMetaRegistry);
-            return [...finalizedBlocks, ...stampedStreaming];
-        };
-        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,
-            };
-            const msgs = upsertAssistantMessage(current.messages, 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);
-        };
-        const spawnedAt = new Date().toISOString();
-        this.logger?.appendStructuredSpawn(sessionId, {
-            kind: "claude-sdk",
-            provider: "claude",
-            cwd: session.cwd,
-            permissionMode: permPolicy.permissionMode,
-            prompt: prompt.slice(0, 2048),
-            promptLength: prompt.length,
-            claudeSessionId: session.claudeSessionId,
-            spawnedAt,
-        });
-        let queryHandle;
-        try {
-            queryHandle = this.sdkQueryFactory({ prompt: singleShotPrompt(), options: sdkOptions });
-        }
-        catch (error) {
-            this.releasePendingSdkAbort(sessionId, abortController);
-            throw error;
-        }
-        this.pendingSdkQueries.set(sessionId, queryHandle);
-        try {
-            for await (const msg of queryHandle) {
-                if (abortController.signal.aborted || !this.isCurrentRequest(sessionId, requestId))
-                    break;
-                // 同 CLI runner 的关键修复：从任何带 session_id 的 SDK 消息（system / assistant /
-                // user / result）即时捕获并落库。AskUserQuestion 的 interrupt 发生在 assistant
-                // 之后、result 之前，若只在 result 捕获，被 interrupt 的轮次会丢掉 session_id，
-                // 续接时不 resume → 上下文丢失。stream_event 等无 session_id 的消息被 guard 跳过。
-                const msgSessionId = msg.session_id;
-                if (typeof msgSessionId === "string" && msgSessionId && turnState.sessionId !== msgSessionId) {
-                    turnState.sessionId = msgSessionId;
-                    const cur = this.currentSessionForRequest(sessionId, requestId);
-                    if (cur && cur.claudeSessionId !== msgSessionId) {
-                        const patched = { ...cur, claudeSessionId: msgSessionId };
-                        this.sessions.set(sessionId, patched);
-                        this.saveStreamingSnapshot(patched, { metadata: true });
-                    }
-                }
-                // Incremental streaming events (opt-in via includePartialMessages: true)
-                if (msg.type === "stream_event") {
-                    const partial = msg;
-                    const ev = partial.event;
-                    const partialParentId = partial.parent_tool_use_id ?? null;
-                    if (ev.type === "content_block_start") {
-                        const cb = ev.content_block;
-                        const blockType = cb.type;
-                        if (blockType === "text" || blockType === "thinking" || blockType === "tool_use") {
-                            streamingBlockByIndex.set(ev.index, {
-                                type: blockType,
-                                id: typeof cb.id === "string" ? cb.id : undefined,
-                                name: typeof cb.name === "string" ? cb.name : undefined,
-                                text: typeof cb.text === "string" ? cb.text : "",
-                                thinking: typeof cb.thinking === "string" ? cb.thinking : "",
-                                partialInput: "",
-                                finalized: false,
-                                parentToolUseId: partialParentId,
-                            });
-                            turnState.blocks = rebuildStreamingBlocks();
-                            syncSnapshot();
-                            scheduleEmit();
-                        }
-                    }
-                    else if (ev.type === "content_block_delta") {
-                        const sb = streamingBlockByIndex.get(ev.index);
-                        if (sb) {
-                            const delta = ev.delta;
-                            if (delta.type === "text_delta" && typeof delta.text === "string") {
-                                sb.text += delta.text;
-                                turnState.result = sb.text;
-                            }
-                            else if (delta.type === "thinking_delta" && typeof delta.thinking === "string") {
-                                sb.thinking += delta.thinking;
-                            }
-                            else if (delta.type === "input_json_delta" && typeof delta.partial_json === "string") {
-                                sb.partialInput += delta.partial_json;
-                            }
-                            turnState.blocks = rebuildStreamingBlocks();
-                            syncSnapshot();
-                            scheduleEmit();
-                        }
-                    }
-                    else if (ev.type === "content_block_stop") {
-                        const sb = streamingBlockByIndex.get(ev.index);
-                        if (sb) {
-                            sb.finalized = true;
-                            turnState.blocks = rebuildStreamingBlocks();
-                            syncSnapshot();
-                            scheduleEmit();
-                        }
-                    }
-                    continue;
-                }
-                // Complete assistant turn — promote streaming content into the finalized
-                // history so subsequent messages (subagents, follow-up parent messages)
-                // append to it instead of erasing it.
-                if (msg.type === "assistant") {
-                    const assistantMsg = msg;
-                    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;
-                    if (parentToolUseId === null) {
-                        captureTaskMeta(extracted.content, taskMetaRegistry);
-                        finalizedBlocks.push(...stampSelfTask(extracted.content, taskMetaRegistry));
-                    }
-                    else {
-                        finalizedBlocks.push(...tagSubagentBlocks(extracted.content, parentToolUseId, taskMetaRegistry));
-                    }
-                    streamingBlockByIndex.clear();
-                    turnState.blocks = rebuildStreamingBlocks();
-                    if (assistantMsg.session_id)
-                        turnState.sessionId = assistantMsg.session_id;
-                    syncSnapshot();
-                    scheduleEmit();
-                    // Non-managed mode: detect AskUserQuestion. Prefer query.interrupt()
-                    // (streaming input mode 的 control message，让 SDK 优雅地停掉当前 turn）
-                    // 而不是 abortController.abort()——abort 会让 SDK throw AbortError，整段
-                    // try/catch 走异常路径；interrupt 让 for-await 自然结束，行为更干净。
-                    // 失败时 fallback 到 abort，保证一定能跳出。
-                    //
-                    // 注意：interrupt 之后下一次 sendMessage 会重新 spawn 一次 SDK 调用并通过
-                    // resume 续接 + tool_result block 回答，不用文本伪造。
-                    if (!isManaged && !killedForAskUserQuestion) {
-                        const askBlock = extracted.content.find((b) => b.type === "tool_use" && b.name === "AskUserQuestion");
-                        if (askBlock) {
-                            killedForAskUserQuestion = true;
-                            flushEmit();
-                            try {
-                                await queryHandle.interrupt();
-                            }
-                            catch (_err) {
-                                // interrupt 在某些情况下（已经结束 / SDK 版本不支持）会 reject，
-                                // 兜底用 abort 强制退出。
-                                abortController.abort();
-                            }
-                        }
-                    }
-                    continue;
-                }
-                // Tool results fed back from the claude subprocess (parent's view of a
-                // tool call, or a subagent's tool_result during Task execution).
-                if (msg.type === "user") {
-                    const userMsg = msg;
-                    const parentToolUseId = userMsg.parent_tool_use_id ?? null;
-                    const content = Array.isArray(userMsg.message?.content) ? userMsg.message.content : [];
-                    const collected = [];
-                    for (const block of content) {
-                        const b = block;
-                        if (b?.type === "tool_result") {
-                            collected.push({
-                                type: "tool_result",
-                                tool_use_id: typeof b.tool_use_id === "string" ? b.tool_use_id : "",
-                                content: this.normalizeToolResultContent(b.content),
-                                is_error: b.is_error === true,
-                            });
-                        }
-                    }
-                    if (parentToolUseId === null) {
-                        finalizedBlocks.push(...stampParentTaskResults(collected, taskMetaRegistry));
-                    }
-                    else {
-                        finalizedBlocks.push(...tagSubagentBlocks(collected, parentToolUseId, taskMetaRegistry));
-                    }
-                    turnState.blocks = rebuildStreamingBlocks();
-                    syncSnapshot();
-                    scheduleEmit();
-                    continue;
-                }
-                // Final result — capture session_id, usage, model
-                if (msg.type === "result") {
-                    const resultMsg = msg;
-                    if (typeof resultMsg.result === "string")
-                        turnState.result = resultMsg.result.trim();
-                    if (typeof resultMsg.session_id === "string")
-                        turnState.sessionId = resultMsg.session_id;
-                    turnState.model = extractClaudeModelName(resultMsg.modelUsage) ?? turnState.model;
-                    turnState.usage = this.extractSdkUsage(resultMsg);
-                    syncSnapshot();
-                    scheduleEmit();
-                    continue;
-                }
-            }
-        }
-        catch (err) {
-            // AbortError from abortController.abort() is intentional — fall through to finish logic
-            const isAbort = abortController.signal.aborted || (err instanceof Error && err.name === "AbortError");
-            if (!isAbort) {
-                const releasedAbort = this.releasePendingSdkAbort(sessionId, abortController);
-                const releasedQuery = this.releasePendingSdkQuery(sessionId, queryHandle);
-                if (releasedAbort || releasedQuery)
-                    this.cancelStreamingCheckpointTimer(sessionId);
-                if (emitTimer)
-                    this.clearStreamEmitTimer(emitTimer);
-                if (!this.isCurrentRequest(sessionId, requestId))
-                    return;
-                this.logger?.appendStructuredSpawn(sessionId, {
-                    kind: "claude-sdk-error",
-                    spawnedAt,
-                    closedAt: new Date().toISOString(),
-                    error: getErrorMessage(err),
-                });
-                throw err;
-            }
-        }
-        // Cleanup
-        this.settlePendingPermission(sessionId, undefined, structuredPermissionDenied("本轮已结束"));
-        this.turnApprovalMemory.delete(sessionId);
-        const releasedAbort = this.releasePendingSdkAbort(sessionId, abortController);
-        const releasedQuery = this.releasePendingSdkQuery(sessionId, queryHandle);
-        if (releasedAbort || releasedQuery)
-            this.cancelStreamingCheckpointTimer(sessionId);
-        if (emitTimer)
-            this.clearStreamEmitTimer(emitTimer);
-        if (!this.isCurrentRequest(sessionId, requestId))
-            return;
-        flushEmit();
-        const current = this.currentSessionForRequest(sessionId, requestId);
-        if (!current)
-            return;
-        this.logger?.appendStructuredSpawn(sessionId, {
-            kind: "claude-sdk-close",
-            spawnedAt,
-            closedAt: new Date().toISOString(),
-            killedForAskUserQuestion,
-            sessionId: turnState.sessionId,
-        });
-        const msgs = this.buildCompletedAssistantMessages(current, turnState);
-        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),
-            queuedMessageSkills: this.resolveQueuedMessageSkillsAfterInterrupt(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) {
-            const interruptedSkills = this.interruptedSkills.get(sessionId) ?? [];
-            this.interruptedWith.delete(sessionId);
-            this.interruptedSkills.delete(sessionId);
-            // 与 codex/cli runner 对齐：清掉"保留队列"标记，避免 stale flag 影响下一次普通 interrupt。
-            this.preserveQueueOnInterrupt.delete(sessionId);
-            setImmediate(() => {
-                this.sendMessage(sessionId, interruptPrompt, { skills: interruptedSkills }).catch((err) => {
-                    console.error("[WAND] sdk interrupt-and-send failed:", err);
-                });
-            });
-            return;
-        }
-        if (killedForAskUserQuestion) {
-            if ((finished.queuedMessages?.length ?? 0) > 0) {
-                setImmediate(() => { void this.flushNextQueuedMessage(sessionId); });
-            }
-            return;
-        }
-        // Auto-continue after ExitPlanMode (same as CLI runner)
-        const lastToolUse = [...turnState.blocks].reverse().find((b) => b.type === "tool_use");
-        if (lastToolUse && lastToolUse.name === "ExitPlanMode" && turnState.sessionId) {
-            setImmediate(() => {
-                this.sendMessage(sessionId, "Plan approved. Proceed with the implementation.").catch((err) => {
-                    console.error("[WAND] sdk auto-continue after ExitPlanMode failed:", err);
-                });
-            });
-            return;
-        }
-        setImmediate(() => { void this.flushNextQueuedMessage(sessionId); });
-    }
-    // ---------------------------------------------------------------------------
     // Parsing helpers (unchanged logic, extracted from previous implementation)
     // ---------------------------------------------------------------------------
     compactContentBlocks(blocks, fallbackResult) {
@@ -3413,12 +2699,6 @@ export class StructuredSessionManager {
             return [];
         return current.queuedMessages;
     }
-    resolveQueuedMessageSkillsAfterInterrupt(sessionId, current, interruptPrompt) {
-        if (interruptPrompt && !this.preserveQueueOnInterrupt.has(sessionId))
-            return [];
-        const queue = current.queuedMessages ?? [];
-        return queue.map((_, index) => current.queuedMessageSkills?.[index] ?? []);
-    }
     normalizeToolResultContent(content) {
         return normalizeStructuredToolResultContent(content);
     }