@co0ontty/wand 1.18.0 → 1.18.12

package/dist/process-manager.d.ts

@@ -29,7 +29,8 @@ export declare class ProcessManager extends EventEmitter {
     private readonly storage;
     private readonly sessions;
     private readonly logger;
-    private readonly lifecycleManager;
+    /** 24h archive scan timer */
+    private archiveTimer;
     /** Per-session debounce timers for throttled persist calls */
     private readonly persistDebounceTimers;
     /** Last persisted message state per session — used to skip redundant message writes */

package/dist/process-manager.js

@@ -6,7 +6,6 @@ import process from "node:process";
 import os from "node:os";
 import pty from "node-pty";
 import { SessionLogger } from "./session-logger.js";
-import { SessionLifecycleManager } from "./session-lifecycle.js";
 import { ClaudePtyBridge } from "./claude-pty-bridge.js";
 import { truncateMessagesForTransport } from "./message-truncator.js";
 import { appendWindow, hasExplicitConfirmSyntax, hasPermissionActionContext, normalizePromptText } from "./pty-text-utils.js";
@@ -352,7 +351,6 @@ function listAllClaudeHistorySessions() {
 function shouldAutoResumeSession(record) {
     return record.status === "exited"
         && !record.archived
-        && !record.resumedToSessionId
         && record.ptyProcess === null
         && hasResumeEligibleConversation(record);
 }
@@ -451,7 +449,8 @@ export class ProcessManager extends EventEmitter {
     storage;
     sessions = new Map();
     logger;
-    lifecycleManager;
+    /** 24h archive scan timer */
+    archiveTimer = null;
     /** Per-session debounce timers for throttled persist calls */
     persistDebounceTimers = new Map();
     /** Last persisted message state per session — used to skip redundant message writes */
@@ -461,16 +460,6 @@ export class ProcessManager extends EventEmitter {
         this.config = config;
         this.storage = storage;
         this.logger = new SessionLogger(configDir || path.join(process.env.HOME || process.cwd(), ".wand"), config.shortcutLogMaxBytes);
-        // Initialize lifecycle manager
-        this.lifecycleManager = new SessionLifecycleManager({
-            onStateChange: (sessionId, oldState, newState) => {
-                this.emitEvent({ type: "status", sessionId, data: { oldState, newState } });
-            },
-            onIdle: (_sessionId) => { },
-            onArchived: (sessionId, reason) => {
-                console.error(`[ProcessManager] Session ${sessionId} archived: ${reason}`);
-            },
-        });
         for (const snapshot of this.storage.loadSessions()) {
             if ((snapshot.sessionKind ?? "pty") !== "pty") {
                 continue;
@@ -520,7 +509,6 @@ export class ProcessManager extends EventEmitter {
                     claudeSessionId: resumeCommandSessionId ?? updated.claudeSessionId,
                     approvalStats: { tool: 0, command: 0, file: 0, total: 0 }
                 });
-                this.lifecycleManager.register(snapshot.id, "idle");
                 console.error(`[ProcessManager] Restored session ${snapshot.id} marked as exited (PTY orphaned)`);
             }
             else {
@@ -554,7 +542,6 @@ export class ProcessManager extends EventEmitter {
                     claudeSessionId: resumeCommandSessionId ?? snapshot.claudeSessionId,
                     approvalStats: { tool: 0, command: 0, file: 0, total: 0 }
                 });
-                this.lifecycleManager.register(snapshot.id, "archived");
             }
         }
         // Defer expensive file-system scanning and auto-recovery so the server
@@ -564,6 +551,15 @@ export class ProcessManager extends EventEmitter {
             this.autoRecoverExitedSessions();
         });
         this.archiveExpiredSessions();
+        this.archiveTimer = setInterval(() => {
+            try {
+                this.archiveExpiredSessions();
+            }
+            catch (err) {
+                console.error(`[ProcessManager] archive scan failed: ${String(err)}`);
+            }
+        }, 60 * 1000);
+        this.archiveTimer.unref?.();
     }
     on(event, listener) {
         return super.on("process", listener);
@@ -670,7 +666,7 @@ export class ProcessManager extends EventEmitter {
             ptyPermissionBlocked: false,
             lastAutoConfirmAt: 0,
             autoApprovePermissions: this.shouldAutoApprovePermissions(command, effectiveMode, provider),
-            resumedFromSessionId: opts?.resumedFromSessionId ?? null,
+            resumedFromSessionId: opts?.resumedFromSessionId ?? (opts?.reuseId ? opts.reuseId : null),
             autoRecovered: opts?.autoRecovered ?? false,
             rememberedEscalationScopes: new Set(),
             rememberedEscalationTargets: new Set(),
@@ -704,7 +700,6 @@ export class ProcessManager extends EventEmitter {
             this.claudeHistoryCache = null;
         }
         this.cleanupOldSessions();
-        this.lifecycleManager.register(id, "initializing");
         const shellArgs = this.buildShellArgs(processedCommand);
         let child;
         try {
@@ -727,14 +722,12 @@ export class ProcessManager extends EventEmitter {
             record.exitCode = -1;
             record.endedAt = new Date().toISOString();
             record.ptyProcess = null;
-            this.lifecycleManager.archive(id, "Session spawn failed", "error");
             this.persist(record);
             return this.snapshot(record);
         }
         record.processId = child.pid;
         record.ptyProcess = child;
         record.status = "running";
-        this.lifecycleManager.setState(id, "running");
         child.onExit(({ exitCode }) => {
             const current = this.sessions.get(id);
             if (!current)
@@ -757,7 +750,6 @@ export class ProcessManager extends EventEmitter {
             current.exitCode = current.stopRequested ? null : exitCode;
             current.endedAt = new Date().toISOString();
             current.ptyProcess = null;
-            this.lifecycleManager.archive(id, `Session ${current.status}`, current.stopRequested ? "user" : "error");
             this.flushPersist(current);
             this.storage.saveSession(this.snapshot(current));
             this.emitEvent({ type: "ended", sessionId: id, data: this.snapshot(current) });
@@ -877,14 +869,12 @@ export class ProcessManager extends EventEmitter {
         return this.snapshot(record);
     }
     list() {
-        this.archiveExpiredSessions();
         return Array.from(this.sessions.values())
             .sort((a, b) => b.startedAt.localeCompare(a.startedAt))
             .map((session) => this.snapshot(session));
     }
     /** Return lightweight snapshots for the session list (no output/messages). */
     listSlim() {
-        this.archiveExpiredSessions();
         return Array.from(this.sessions.values())
             .sort((a, b) => b.startedAt.localeCompare(a.startedAt))
             .map((session) => this.snapshotSlim(session));
@@ -947,7 +937,6 @@ export class ProcessManager extends EventEmitter {
         return deleted;
     }
     get(id) {
-        this.archiveExpiredSessions();
         const record = this.sessions.get(id);
         if (!record) {
             // Fallback: check SQLite for sessions that were evicted from memory
@@ -990,8 +979,6 @@ export class ProcessManager extends EventEmitter {
             throw new SessionInputError("Session is not running.", "SESSION_NOT_RUNNING", id, record.status);
         }
         // Update lifecycle
-        this.lifecycleManager.touch(id);
-        this.lifecycleManager.startThinking(id);
         if (!record.ptyProcess) {
             console.error(`[ProcessManager] Rejecting input: session ${id} has no PTY`);
             throw new SessionInputError("Session is not running.", "SESSION_NO_PTY", id, record.status);
@@ -1003,7 +990,7 @@ export class ProcessManager extends EventEmitter {
             const ctx = {
                 mode: record.mode,
                 autoApprove: record.autoApprovePermissions,
-                permissionBlocked: record.ptyPermissionBlocked || !!record.pendingEscalation,
+                permissionBlocked: this.isPermissionBlocked(record),
                 input,
             };
             this.logger.appendShortcutLog(id, shortcutKey, tailLines, ctx);
@@ -1093,7 +1080,6 @@ export class ProcessManager extends EventEmitter {
             record.ptyBridge = null;
         }
         // Update lifecycle
-        this.lifecycleManager.archive(id, "Session stopped by user", "user");
         this.persist(record);
         return this.snapshot(record);
     }
@@ -1130,7 +1116,6 @@ export class ProcessManager extends EventEmitter {
             record.ptyBridge.removeAllListeners();
             record.ptyBridge = null;
         }
-        this.lifecycleManager.unregister(record.id);
     }
     delete(id) {
         const record = this.mustGet(id);
@@ -1183,7 +1168,6 @@ export class ProcessManager extends EventEmitter {
         this.deleteClaudeCache(record);
         this.sessions.delete(id);
         this.lastPersistedMessageState.delete(id);
-        this.lifecycleManager.unregister(id);
         if (record.claudeSessionId) {
             this.claudeHistoryCache = null;
         }
@@ -1246,7 +1230,6 @@ export class ProcessManager extends EventEmitter {
             claudeSessionId: record.claudeSessionId || null,
             messages: messages.length > 0 ? messages : undefined,
             resumedFromSessionId: record.resumedFromSessionId ?? undefined,
-            resumedToSessionId: record.resumedToSessionId ?? undefined,
             autoRecovered: record.autoRecovered ?? false,
             autoApprovePermissions: record.autoApprovePermissions || undefined,
             approvalStats: record.approvalStats.total > 0 ? record.approvalStats : undefined,
@@ -1265,7 +1248,7 @@ export class ProcessManager extends EventEmitter {
         };
     }
     isPermissionBlocked(record) {
-        return record.ptyBridge?.isPermissionBlocked() ?? record.pendingEscalation !== null;
+        return record.ptyPermissionBlocked || record.pendingEscalation !== null;
     }
     defaultAutonomyPolicy(mode) {
         if (mode === "agent" || mode === "agent-max" || mode === "managed" || mode === "native" || mode === "full-access") {
@@ -1357,7 +1340,6 @@ export class ProcessManager extends EventEmitter {
             endedAt: record.endedAt,
             claudeSessionId: record.claudeSessionId,
             resumedFromSessionId: record.resumedFromSessionId ?? null,
-            resumedToSessionId: record.resumedToSessionId ?? null,
             autoRecovered: record.autoRecovered ?? false,
         });
         if (shouldSaveMessages) {
@@ -1637,8 +1619,6 @@ export class ProcessManager extends EventEmitter {
                 record.ptyBridge?.clearRememberedPermissions();
                 record.rememberedEscalationScopes.clear();
                 record.rememberedEscalationTargets.clear();
-                this.lifecycleManager.stopThinking(record.id);
-                this.lifecycleManager.waitingInput(record.id);
                 this.persist(record);
                 this.storage.saveSession(this.snapshot(record));
                 break;

package/dist/pty-text-utils.d.ts

@@ -1,7 +1,5 @@
 /**
- * Shared PTY text processing utilities.
- * Used by both claude-pty-bridge.ts and message-parser.ts to ensure
- * consistent ANSI stripping and noise filtering.
+ * Shared PTY text processing utilities for consistent ANSI stripping and noise filtering.
  */
 /** Strip ANSI escape sequences and control characters from raw PTY output. */
 export declare function stripAnsi(text: string): string;

package/dist/pty-text-utils.js

@@ -1,7 +1,5 @@
 /**
- * Shared PTY text processing utilities.
- * Used by both claude-pty-bridge.ts and message-parser.ts to ensure
- * consistent ANSI stripping and noise filtering.
+ * Shared PTY text processing utilities for consistent ANSI stripping and noise filtering.
  */
 /** Strip ANSI escape sequences and control characters from raw PTY output. */
 export function stripAnsi(text) {

package/dist/server-session-routes.js

@@ -1,5 +1,4 @@
 import express from "express";
-import { parseMessages } from "./message-parser.js";
 import { SessionInputError } from "./process-manager.js";
 import { checkSessionWorktreeMergeability, cleanupSessionWorktree, getWorktreeMergeErrorCode, mergeSessionWorktree, WorktreeMergeError } from "./git-worktree.js";
 export function getErrorMessage(error, fallback) {
@@ -198,9 +197,10 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
     });
     app.post("/api/structured-sessions/:id/messages", express.json(), async (req, res) => {
         const input = String(req.body?.input ?? "");
-        console.log("[WAND] POST /api/structured-sessions/:id/messages id:", req.params.id, "input:", input.substring(0, 50));
+        const interrupt = !!req.body?.interrupt;
+        console.log("[WAND] POST /api/structured-sessions/:id/messages id:", req.params.id, "input:", input.substring(0, 50), "interrupt:", interrupt);
         try {
-            const snapshot = await structured.sendMessage(req.params.id, input);
+            const snapshot = await structured.sendMessage(req.params.id, input, { interrupt });
             res.json(snapshot);
         }
         catch (error) {
@@ -362,13 +362,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
             ? processes.getPtyTranscript(snapshot.id) ?? snapshot.output
             : snapshot.output;
         if (req.query.format === "chat") {
-            const allowFallback = (snapshot.sessionKind ?? "pty") === "pty";
-            const fallbackOutput = allowFallback ? transcriptOutput : "";
-            const messages = snapshot.messages && snapshot.messages.length > 0
-                ? snapshot.messages
-                : allowFallback
-                    ? parseMessages(fallbackOutput, snapshot.command)
-                    : [];
+            const messages = snapshot.messages ?? [];
             res.json({ ...snapshot, output: transcriptOutput, messages });
         }
         else {
@@ -407,7 +401,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
             const newMode = body.mode ? normalizeMode(body.mode, defaultMode) : normalizeMode(existingSession.mode, defaultMode);
             const resumeCommand = `${command} --resume ${claudeSessionId}`;
             const newSnapshot = processes.start(resumeCommand, existingSession.cwd, newMode, undefined, { reuseId: sessionId });
-            res.status(201).json({ resumedFromSessionId: sessionId, ...newSnapshot });
+            res.status(201).json(newSnapshot);
         }
         catch (error) {
             res.status(400).json({ error: getErrorMessage(error, "无法恢复会话。") });
@@ -444,7 +438,7 @@ export function registerSessionRoutes(app, processes, structured, storage, defau
                 const newMode = body.mode ? normalizeMode(body.mode, defaultMode) : normalizeMode(existingSession.mode, defaultMode);
                 const resumeCommand = `${command} --resume ${claudeSessionId}`;
                 const newSnapshot = processes.start(resumeCommand, existingSession.cwd, newMode, undefined, { reuseId: existingSession.id });
-                res.status(201).json({ resumedFromSessionId: existingSession.id, resumedClaudeSessionId: claudeSessionId, ...newSnapshot });
+                res.status(201).json({ resumedClaudeSessionId: claudeSessionId, ...newSnapshot });
             }
             else {
                 const cwd = body.cwd?.trim();

package/dist/storage.js

@@ -54,12 +54,12 @@ function mapWorktreeMergeFields(row) {
 }
 function sessionSelectFields() {
     return `id, provider, session_kind, runner, command, cwd, mode, status, exit_code, started_at, ended_at, output, archived, archived_at, claude_session_id, messages, queued_messages, structured_state
-             , resumed_from_session_id, resumed_to_session_id, auto_recovered, worktree_enabled, worktree_info, worktree_merge_status, worktree_merge_info`;
+             , resumed_from_session_id, auto_recovered, worktree_enabled, worktree_info, worktree_merge_status, worktree_merge_info`;
 }
 function sessionPersistFields() {
     return `id, command, cwd, mode, status, exit_code, started_at, ended_at, output
              , archived, archived_at, claude_session_id, provider, session_kind, runner, messages, queued_messages, structured_state
-             , resumed_from_session_id, resumed_to_session_id, auto_recovered, worktree_enabled, worktree_info, worktree_merge_status, worktree_merge_info`;
+             , resumed_from_session_id, auto_recovered, worktree_enabled, worktree_info, worktree_merge_status, worktree_merge_info`;
 }
 function sessionPersistAssignments() {
     return `command = excluded.command,
@@ -80,7 +80,6 @@ function sessionPersistAssignments() {
              queued_messages = excluded.queued_messages,
              structured_state = excluded.structured_state,
              resumed_from_session_id = excluded.resumed_from_session_id,
-             resumed_to_session_id = excluded.resumed_to_session_id,
              auto_recovered = excluded.auto_recovered,
              worktree_enabled = excluded.worktree_enabled,
              worktree_info = excluded.worktree_info,
@@ -92,7 +91,7 @@ function sessionMetadataAssignments() {
            started_at = ?, ended_at = ?, output = ?,
            archived = ?, archived_at = ?, claude_session_id = ?,
            provider = ?, session_kind = ?, runner = ?, structured_state = ?,
-           resumed_from_session_id = ?, resumed_to_session_id = ?, auto_recovered = ?,
+           resumed_from_session_id = ?, auto_recovered = ?,
            worktree_enabled = ?, worktree_info = ?, worktree_merge_status = ?, worktree_merge_info = ?`;
 }
 function sessionPersistValues(snapshot) {
@@ -116,7 +115,6 @@ function sessionPersistValues(snapshot) {
         snapshot.queuedMessages ? JSON.stringify(snapshot.queuedMessages) : null,
         snapshot.structuredState ? JSON.stringify(snapshot.structuredState) : null,
         snapshot.resumedFromSessionId ?? null,
-        snapshot.resumedToSessionId ?? null,
         snapshot.autoRecovered ? 1 : 0,
         snapshot.worktreeEnabled ? 1 : 0,
         serializeWorktreeInfo(snapshot.worktree),
@@ -142,7 +140,6 @@ function sessionMetadataValues(snapshot) {
         snapshot.runner ?? null,
         snapshot.structuredState ? JSON.stringify(snapshot.structuredState) : null,
         snapshot.resumedFromSessionId ?? null,
-        snapshot.resumedToSessionId ?? null,
         snapshot.autoRecovered ? 1 : 0,
         snapshot.worktreeEnabled ? 1 : 0,
         serializeWorktreeInfo(snapshot.worktree),
@@ -173,7 +170,6 @@ function mapSessionCore(row) {
         queuedMessages: parseQueuedMessages(row.queued_messages),
         structuredState: safeJsonParse(row.structured_state),
         resumedFromSessionId: row.resumed_from_session_id ?? undefined,
-        resumedToSessionId: row.resumed_to_session_id ?? undefined,
         autoRecovered: Boolean(row.auto_recovered),
         worktreeEnabled: Boolean(row.worktree_enabled),
         worktree: parseWorktreeInfo(row.worktree_info) ?? null,
@@ -309,7 +305,7 @@ export class WandStorage {
             this.db
                 .prepare(`INSERT INTO command_sessions (
            ${sessionPersistFields()}
-           ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+           ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
            ON CONFLICT(id) DO UPDATE SET
              ${sessionPersistAssignments()}`)
                 .run(...sessionPersistValues(snapshot));

package/dist/structured-session-manager.d.ts

@@ -14,15 +14,20 @@ export declare class StructuredSessionManager {
     private readonly config;
     private readonly sessions;
     private readonly pendingChildren;
+    private readonly interruptedWith;
     private emitEvent;
+    private archiveTimer;
     constructor(storage: WandStorage, config: WandConfig);
+    private archiveExpiredSessions;
     setEventEmitter(emitEvent: (event: ProcessEvent) => void): void;
     list(): SessionSnapshot[];
     /** Return lightweight snapshots for the session list (no output/messages). */
     listSlim(): SessionSnapshot[];
     get(id: string): SessionSnapshot | null;
     createSession(options: CreateStructuredSessionOptions): SessionSnapshot;
-    sendMessage(id: string, input: string): Promise<SessionSnapshot>;
+    sendMessage(id: string, input: string, opts?: {
+        interrupt?: boolean;
+    }): Promise<SessionSnapshot>;
     /** Approve a pending permission request. */
     approvePermission(sessionId: string): SessionSnapshot;
     /** Deny a pending permission request. */

package/dist/structured-session-manager.js

@@ -2,9 +2,44 @@ import { randomUUID } from "node:crypto";
 import { spawn } from "node:child_process";
 import { prepareSessionWorktree } from "./git-worktree.js";
 const STREAM_EMIT_DEBOUNCE_MS = 16;
+const ARCHIVE_AFTER_MS = 1000 * 60 * 60 * 24;
 function isRunningAsRoot() {
     return process.getuid?.() === 0 || process.geteuid?.() === 0;
 }
+/**
+ * 找出最后一条 assistant turn 中尚未配对 tool_result 的 AskUserQuestion tool_use。
+ * 用来识别"刚被 SIGTERM 中断、正在等用户提交答案"的状态。
+ */
+function findUnpairedAskUserQuestion(messages) {
+    for (let i = messages.length - 1; i >= 0; i--) {
+        const turn = messages[i];
+        if (turn.role !== "assistant")
+            continue;
+        for (const block of turn.content) {
+            if (block.type === "tool_use" && block.name === "AskUserQuestion") {
+                const toolUseId = block.id;
+                // 检查后续 turn 中是否已有对应 tool_result
+                let answered = false;
+                for (let j = i + 1; j < messages.length; j++) {
+                    const nextTurn = messages[j];
+                    for (const nb of nextTurn.content) {
+                        if (nb.type === "tool_result" && nb.tool_use_id === toolUseId) {
+                            answered = true;
+                            break;
+                        }
+                    }
+                    if (answered)
+                        break;
+                }
+                if (!answered)
+                    return { id: toolUseId };
+            }
+        }
+        // 只检查最后一条 assistant turn
+        return null;
+    }
+    return null;
+}
 /** Enrich a snapshot with a derived summary from the first user message. */
 function withSummary(snapshot) {
     if (snapshot.summary)
@@ -51,7 +86,9 @@ export class StructuredSessionManager {
     config;
     sessions = new Map();
     pendingChildren = new Map();
+    interruptedWith = new Map();
     emitEvent = null;
+    archiveTimer = null;
     constructor(storage, config) {
         this.storage = storage;
         this.config = config;
@@ -83,6 +120,30 @@ export class StructuredSessionManager {
             this.sessions.set(restored.id, restored);
             this.storage.saveSession(restored);
         }
+        this.archiveExpiredSessions();
+        this.archiveTimer = setInterval(() => {
+            try {
+                this.archiveExpiredSessions();
+            }
+            catch (err) {
+                console.error(`[StructuredSessionManager] archive scan failed: ${String(err)}`);
+            }
+        }, 60 * 1000);
+        this.archiveTimer.unref?.();
+    }
+    archiveExpiredSessions() {
+        const now = Date.now();
+        for (const session of this.sessions.values()) {
+            if (session.archived || session.status === "running")
+                continue;
+            const referenceTime = session.endedAt ?? session.startedAt;
+            const endedAtMs = Date.parse(referenceTime);
+            if (!Number.isFinite(endedAtMs) || now - endedAtMs < ARCHIVE_AFTER_MS)
+                continue;
+            session.archived = true;
+            session.archivedAt = new Date(now).toISOString();
+            this.storage.saveSession(session);
+        }
     }
     setEventEmitter(emitEvent) {
         this.emitEvent = emitEvent;
@@ -155,7 +216,7 @@ export class StructuredSessionManager {
         }
         return snapshot;
     }
-    async sendMessage(id, input) {
+    async sendMessage(id, input, opts) {
         let session = this.requireSession(id);
         const prompt = input.trim();
         if (!prompt)
@@ -181,6 +242,14 @@ export class StructuredSessionManager {
                 this.storage.saveSession(recovered);
                 session = recovered;
             }
+            else if (opts?.interrupt) {
+                this.interruptedWith.set(id, prompt);
+                try {
+                    child.kill("SIGTERM");
+                }
+                catch (_err) { /* ignore */ }
+                return session;
+            }
             else {
                 const queue = [...(session.queuedMessages ?? [])];
                 if (queue.length >= 10) {
@@ -196,10 +265,26 @@ export class StructuredSessionManager {
                 return queued;
             }
         }
-        const userTurn = {
-            role: "user",
-            content: [{ type: "text", text: prompt }],
-        };
+        // 检测上一轮 assistant 是否有未配对的 AskUserQuestion tool_use（说明前一次
+        // child 是被 SIGTERM 主动 kill 的，正在等用户回答）。如果有，把这次的输入打包
+        // 成 tool_result 注入到 messages，让 UI 把卡片渲染为 answered。
+        const pendingAsk = findUnpairedAskUserQuestion(session.messages ?? []);
+        const userTurn = pendingAsk
+            ? {
+                role: "user",
+                content: [
+                    {
+                        type: "tool_result",
+                        tool_use_id: pendingAsk.id,
+                        content: prompt,
+                        is_error: false,
+                    },
+                ],
+            }
+            : {
+                role: "user",
+                content: [{ type: "text", text: prompt }],
+            };
         const requestId = randomUUID();
         const updated = {
             ...session,
@@ -222,8 +307,13 @@ export class StructuredSessionManager {
             sessionId: id,
             data: { status: "running", sessionKind: "structured", queuedMessages: updated.queuedMessages, structuredState: updated.structuredState },
         });
+        // 续接 AskUserQuestion 时给 Claude 加上下文，避免它把刚才悬挂的 tool_use 当作
+        // 异常重试。结构化模式 (claude -p) 没有 tool_result 回传通道，所以用文本告知。
+        const claudePrompt = pendingAsk
+            ? `[对刚才 AskUserQuestion 工具的回答 — 结构化模式不支持工具结果回传，下面是用户从选项中的选择]\n${prompt}`
+            : prompt;
         try {
-            await this.runClaudeStreaming(id, updated, prompt);
+            await this.runClaudeStreaming(id, updated, claudePrompt);
             const finished = this.requireSession(id);
             return finished;
         }
@@ -325,6 +415,7 @@ export class StructuredSessionManager {
     }
     stop(id) {
         const session = this.requireSession(id);
+        this.interruptedWith.delete(id);
         const child = this.pendingChildren.get(id);
         if (child) {
             child.kill();
@@ -529,17 +620,27 @@ export class StructuredSessionManager {
             if (modelChoice && modelChoice !== "default") {
                 args.push("--model", modelChoice);
             }
+            // 托管模式：禁用 AskUserQuestion，让 agent 自己拍板，不要等用户决策。
+            // 非托管模式：保留工具，靠 processLine 检测后主动 kill child 触发"中断+续接"流程。
+            const isManaged = session.mode === "managed";
+            if (isManaged) {
+                args.push("--disallowedTools", "AskUserQuestion");
+            }
             if (session.claudeSessionId) {
                 args.push("--resume", session.claudeSessionId);
             }
-            args.push(prompt);
+            // 通过 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"。
             const child = spawn("claude", args, {
                 cwd: session.cwd,
                 env: process.env,
-                stdio: ["ignore", "pipe", "pipe"],
+                stdio: ["pipe", "pipe", "pipe"],
             });
-            console.log("[WAND] spawned claude -p pid:", child.pid, "args:", args.filter(a => a !== prompt).join(" "));
+            console.log("[WAND] spawned claude -p pid:", child.pid, "args:", args.join(" "));
             this.pendingChildren.set(sessionId, child);
+            child.stdin?.end(prompt);
             const turnState = {
                 blocks: [],
                 result: "",
@@ -551,6 +652,10 @@ export class StructuredSessionManager {
             let lineBuf = "";
             // Debounce output events to avoid flooding the WebSocket.
             let emitTimer = null;
+            // 当 Claude 在非托管模式调用 AskUserQuestion 时，stdin 关闭导致它会 hang 等
+            // tool_result。我们检测到后主动 kill child，让它顺利退出，UI 把 tool_use 卡片
+            // 渲染成可交互选项；用户提交后由 sendMessage() 通过 --resume 续接。
+            let killedForAskUserQuestion = false;
             const flushEmit = () => {
                 if (emitTimer) {
                     clearTimeout(emitTimer);
@@ -625,6 +730,20 @@ export class StructuredSessionManager {
                     // 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)) {
@@ -746,14 +865,19 @@ export class StructuredSessionManager {
                 else {
                     msgs.push(assistantTurn);
                 }
+                // 被 AskUserQuestion 检测或用户中断主动 kill 时，保持 status="running"
+                // 让 UI 不跳到"已停止"。inFlight=false 才能触发后续 sendMessage。
+                const interruptPrompt = this.interruptedWith.get(sessionId);
+                const keepRunning = killedForAskUserQuestion || !!interruptPrompt;
                 const finished = {
                     ...current,
-                    status: "stopped",
-                    exitCode: 0,
-                    endedAt: new Date().toISOString(),
+                    status: keepRunning ? "running" : "stopped",
+                    exitCode: keepRunning ? null : 0,
+                    endedAt: keepRunning ? null : new Date().toISOString(),
                     output: turnState.result,
                     claudeSessionId: turnState.sessionId ?? current.claudeSessionId,
                     messages: msgs,
+                    queuedMessages: interruptPrompt ? [] : current.queuedMessages,
                     pendingEscalation: null,
                     permissionBlocked: false,
                     structuredState: {
@@ -767,7 +891,26 @@ export class StructuredSessionManager {
                 this.sessions.set(sessionId, finished);
                 this.storage.saveSession(finished);
                 this.emitStructuredSnapshot(finished);
-                this.emitStructuredSnapshot(finished, "ended");
+                if (!keepRunning) {
+                    this.emitStructuredSnapshot(finished, "ended");
+                }
+                // 等待用户回答 AskUserQuestion 时，跳过后续自续接和队列推进。
+                if (killedForAskUserQuestion) {
+                    resolve();
+                    return;
+                }
+                // 用户中断当前回复：保存部分回复后立即发送新消息。
+                if (interruptPrompt) {
+                    this.interruptedWith.delete(sessionId);
+                    console.log("[WAND] interrupt-and-send for session:", sessionId, "prompt:", interruptPrompt.substring(0, 50));
+                    resolve();
+                    setImmediate(() => {
+                        this.sendMessage(sessionId, interruptPrompt).catch((err) => {
+                            console.error("[WAND] interrupt-and-send failed:", err);
+                        });
+                    });
+                    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