pi-web-ui 0.97.0 → 0.98.0

package/dist/server/delegate-mode.js

@@ -15,7 +15,7 @@
  *
  * 判定全部是纯函数（无 IO），单测见 tests/unit/delegate-mode.test.ts。
  */
-import { bashCommandIsReadOnly } from "./plan-mode.js";
+import { bashCommandIsReadOnly, SESSION_DISPATCH_TOOLS } from "./plan-mode.js";
 /** 审查者模式下确定禁止的工具：与计划模式同名单（写 / 改 / 增删 / git 写 / 形态变换）。 */
 const BLOCKED_TOOLS = new Set([
     "write",
@@ -47,6 +47,8 @@ const BLOCKED_TOOLS = new Set([
     "truncate",
     "rename",
     "git",
+    // 代码求值（eval 沙箱可写真实文件系统 —— 主对话只审阅不施工，#436）
+    "eval",
     "format",
     "prettier",
     "lint_fix",
@@ -57,18 +59,10 @@ const BLOCKED_TOOLS = new Set([
  * 模型再自己 spawn 一个只会绕开「一个常驻执行对话」这条语义线（多份上下文、
  * 多份配额、左栏一堆对话），而且落盘对话占项目会话名额。
  * 与计划模式禁它的理由不同：那边是「别绕开只读约束」，这边是「别绕开统一派活」。
+ * 名单 = 三闸门共用的真实注册派发工具（SESSION_DISPATCH_TOOLS，#436 前是一堆
+ * 幽灵名）+ subagent 整工具（这里不分 action，审查者对话一概不派不问）。
  */
-const DISPATCH_TOOLS = new Set([
-    "spawn",
-    "subagent_spawn",
-    "subagent",
-    "delegate_task",
-    "spawn_subagent",
-    "schedule",
-    "set_goal",
-    "start_goal_wizard",
-    "set_plan_mode",
-]);
+const DISPATCH_TOOLS = new Set([...SESSION_DISPATCH_TOOLS, "subagent"]);
 /** bash 家族（要逐条判命令是否只读）。 */
 const BASH_TOOLS = new Set(["bash", "shell", "sh", "zsh", "terminal", "terminal_bash", "run_command", "exec"]);
 /** 从工具参数里取命令文本（各工具字段名不同）。 */

package/dist/server/dsh/dsh-agent-service.js

@@ -24,8 +24,9 @@
  * 引擎无关模块复用：FilesService（文件树/预览）、scm.ts（git 查询）、
  * BgServerTracker（后台任务）、TerminalManager（PTY）、uploads.ts。
  */
-import { existsSync, mkdirSync, readFileSync, statSync, writeFileSync } from "node:fs";
+import { existsSync, mkdirSync, readFileSync, statSync } from "node:fs";
 import { basename, dirname, join, resolve, sep } from "node:path";
+import { writeJsonAtomicSync } from "../atomic-file.js";
 import { randomUUID } from "node:crypto";
 import { homedir } from "node:os";
 import { BgServerTracker } from "../bg-servers.js";
@@ -45,6 +46,7 @@ import { previewKind } from "../text-sniff.js";
 import { removeQueuedByIndexOrText } from "../queue-utils.js";
 import { launchOrigin, toServiceInfo } from "../launch-origin.js";
 import { DshRuntime, loadDeepSeekKey } from "./dsh-client.js";
+import { formatTextQuote, readTextQuote, messageTextWithQuotes } from "../text-quote.js";
 import { DshStreamAccumulator, assistantMessageEventToUiMessage, toolResultEventToUiMessage, userMessageEventToUiMessage, } from "./dsh-serialize.js";
 import { firstUserText, findSessionFilesForCwd, readSessionLog, replayEventsToMessages, sessionLogPermission, sessionLogPreset, } from "./dsh-sessions.js";
 import { generatePresetClones, PRESET_DEFAULT_ID } from "./preset-clones.js";
@@ -902,9 +904,8 @@ export class DshClientSession {
                     break;
                 const msg = userMessageEventToUiMessage(ev.data);
                 // 重复文本（DSH 有时重放同一用户消息）→ 去重。
-                const text = msg.content.map((c) => ("text" in c ? c.text : "")).join("");
-                if (text &&
-                    conv.messages.some((m) => m.role === "user" && m.content.map((c) => ("text" in c ? c.text : "")).join("") === text)) {
+                const text = messageTextWithQuotes(msg);
+                if (text && conv.messages.some((m) => m.role === "user" && messageTextWithQuotes(m) === text)) {
                     break;
                 }
                 this.appendMessage(conv, msg);
@@ -1579,7 +1580,7 @@ export class DshClientSession {
         // 磁盘回放会话（switch_session）没有 live runtime session —— DSH 的
         // JSON-RPC 面不支持恢复（id collision），自动 fork 新会话继续：把历史
         // 作为上下文注入首条 prompt，前端提示。
-        if (conv.fromDisk && text.trim()) {
+        if (conv.fromDisk && (text.trim() || attachments?.some((a) => a.mode === "quote" && readTextQuote(a.quote)))) {
             const histText = this.histToContext(conv);
             conv = this.forkConversation(conv);
             if (histText.trim()) {
@@ -1688,6 +1689,12 @@ export class DshClientSession {
                         : []),
                 ],
                 timestamp: Date.now(),
+                details: {
+                    quotes: (attachments ?? [])
+                        .filter((a) => a.mode === "quote")
+                        .map((a) => readTextQuote(a.quote))
+                        .filter((q) => q !== null),
+                },
             };
             this.appendMessage(conv, optimistic);
             this.flushSnapshot();
@@ -1721,7 +1728,7 @@ export class DshClientSession {
     histToContext(conv) {
         return conv.messages
             .map((m) => {
-            const blocks = m.content.map((c) => ("text" in c ? c.text : "")).join("\n");
+            const blocks = messageTextWithQuotes(m);
             return blocks ? `[${m.role === "assistant" ? "AI" : m.role}] ${blocks}` : "";
         })
             .filter(Boolean)
@@ -1756,10 +1763,7 @@ export class DshClientSession {
         for (let i = conv.messages.length - 1; i >= 0; i--) {
             const m = conv.messages[i];
             if (m.role === "user") {
-                lastUser = m.content
-                    .map((c) => ("text" in c ? c.text : ""))
-                    .join("")
-                    .trim();
+                lastUser = messageTextWithQuotes(m).trim();
                 if (lastUser)
                     break;
             }
@@ -1794,6 +1798,19 @@ export class DshClientSession {
         if (!Array.isArray(attachments))
             return blocks;
         for (const a of attachments) {
+            if (a.mode === "quote") {
+                const quote = readTextQuote(a.quote);
+                if (quote)
+                    blocks.push({ type: "text", text: formatTextQuote(quote) });
+                else
+                    this.emit({
+                        type: "notice",
+                        level: "warning",
+                        text: "引用内容无效，请重新选择文字",
+                        textEn: "Select the text again to add a quote.",
+                    });
+                continue;
+            }
             const resolved = a.path ? workspacePath(this.cwd, a.path) : null;
             if (a.imageData) {
                 // 视觉桥：base64 图片 → attachment store → 真 image 块（模型可看图）。
@@ -2306,7 +2323,7 @@ export class DshClientSession {
     // 项目 / 文件 / SCM / 搜索
     // -----------------------------------------------------------------------
     async pushProjects() {
-        const recent = this.stateStore.getRecentProjects(this.clientId);
+        const recent = await this.stateStore.getRecentProjects(this.clientId);
         const removedKeys = new Set(this.stateStore.getRemovedProjects(this.clientId).map(normalizePathKey));
         const projects = new Map();
         for (const p of recent) {
@@ -2580,11 +2597,6 @@ export class DshClientSession {
         }
         this.flushSnapshot(true);
     }
-    async cycleModel() {
-        const idx = DSH_MODELS.findIndex((m) => m.id === this.model);
-        const next = DSH_MODELS[(idx + 1) % DSH_MODELS.length];
-        await this.setModel(next.id);
-    }
     setThinking(level) {
         if (level !== "high") {
             this.emit({
@@ -2598,15 +2610,6 @@ export class DshClientSession {
         this.thinkingLevel = level;
         this.flushSnapshot();
     }
-    cycleThinking() {
-        // DSH 固定 high。
-        this.emit({
-            type: "notice",
-            level: "info",
-            text: "DeepSeek V4 仅支持高思考强度",
-            textEn: "DeepSeek V4 only supports high thinking intensity",
-        });
-    }
     // -----------------------------------------------------------------------
     // 设置 / 系统提示词
     // -----------------------------------------------------------------------
@@ -3779,8 +3782,7 @@ export class DshClientSession {
                 /* new file */
             }
             auth[this.normalizeDshProvider(provider)] = { type: "api_key", key };
-            mkdirSync(dirname(authPath), { recursive: true });
-            writeFileSync(authPath, JSON.stringify(auth, null, 2) + "\n");
+            writeJsonAtomicSync(authPath, auth);
             this.emit({
                 type: "notice",
                 level: "info",
@@ -3810,7 +3812,7 @@ export class DshClientSession {
                 return;
             }
             delete auth[pid];
-            writeFileSync(authPath, JSON.stringify(auth, null, 2) + "\n");
+            writeJsonAtomicSync(authPath, auth);
             this.emit({
                 type: "notice",
                 level: "info",
@@ -3989,11 +3991,11 @@ export class DshClientSession {
             const fresh = this.addConversation(newSessionId, this.cwd, false);
             // 回放编辑点之前的消息（作为会话初始上下文：DSH 无 seed 机制，v1 用
             // 简化——直接把历史作为一条提示词说明附上）。
-            const head = conv.messages.slice(0, idx + 1);
+            const head = conv.messages.slice(0, idx);
             // 把编辑前的对话内容写进新会话的 prompt（尽力保留上下文）。
             const contextNote = head
                 .map((m) => {
-                const blocks = m.content.map((c) => ("text" in c ? c.text : "")).join("\n");
+                const blocks = messageTextWithQuotes(m);
                 return `[${m.role}] ${blocks}`;
             })
                 .join("\n");

package/dist/server/dsh/dsh-client.js

@@ -78,6 +78,7 @@ export class DshRuntime {
     notificationHandler = null;
     stderrTail = "";
     closed = false;
+    disposed = false;
     initialized = false;
     /** PI_WEB_DSH_DEBUG=1 时把 RPC 帧/生命周期事件打到 stderr（诊断用，默认关）。 */
     debugEnabled = process.env.PI_WEB_DSH_DEBUG === "1";
@@ -122,6 +123,9 @@ export class DshRuntime {
     }
     /** 启动子进程 + initialize 握手（幂等；并发调用共享同一个启动任务）。 */
     start() {
+        if (this.disposed) {
+            return Promise.reject(new DshTransportError(bilingual("client has been disposed", "客户端已销毁")));
+        }
         if (this.alive && this.initialized)
             return Promise.resolve();
         if (!this.startPromise) {
@@ -270,7 +274,10 @@ export class DshRuntime {
         if (!proc || !proc.stdin || proc.stdin.destroyed) {
             throw new DshTransportError(bilingual("runtime not started", "runtime 未启动"));
         }
-        proc.stdin.write(JSON.stringify(msg) + "\n");
+        const ok = proc.stdin.write(JSON.stringify(msg) + "\n");
+        if (!ok) {
+            this.debug("stdin buffer full, backpressure triggered");
+        }
     }
     /**
      * 向一个会话排队 prompt。返回持久化收据 messageId（运行时接受即 resolve）。
@@ -411,8 +418,9 @@ export class DshRuntime {
     }
     /** 优雅关闭：shutdown 握手 → stdin EOF → SIGTERM → SIGKILL 阶梯。 */
     async close() {
-        if (this.closed)
+        if (this.disposed)
             return;
+        this.disposed = true;
         this.closed = true;
         const proc = this.proc;
         if (!proc || proc.exitCode !== null) {
@@ -487,16 +495,44 @@ export class DshRuntime {
         this.failPending(new DshTransportError(bilingual("runtime killed (interrupt)", "运行时已被终止（中断）")));
         try {
             if (process.platform === "win32") {
-                const killer = spawn("taskkill", ["/pid", String(pid), "/T", "/F"], {
-                    stdio: "ignore",
-                    windowsHide: true,
-                });
-                killer.on("error", () => {
+                await new Promise((resolve) => {
+                    let settled = false;
+                    const done = () => {
+                        if (!settled) {
+                            settled = true;
+                            clearTimeout(timer);
+                            resolve();
+                        }
+                    };
+                    const timer = setTimeout(done, 1500);
                     try {
-                        proc.kill("SIGKILL");
+                        const killer = spawn("taskkill", ["/pid", String(pid), "/T", "/F"], {
+                            stdio: "ignore",
+                            windowsHide: true,
+                        });
+                        killer.on("close", (code) => {
+                            if (code !== 0) {
+                                try {
+                                    proc.kill("SIGKILL");
+                                }
+                                catch { }
+                            }
+                            done();
+                        });
+                        killer.on("error", () => {
+                            try {
+                                proc.kill("SIGKILL");
+                            }
+                            catch { }
+                            done();
+                        });
                     }
                     catch {
-                        /* already dead */
+                        try {
+                            proc.kill("SIGKILL");
+                        }
+                        catch { }
+                        done();
                     }
                 });
             }

package/dist/server/dsh/dsh-serialize.js

@@ -23,15 +23,8 @@
  *   - streamingMessage：由 assistant/chunk 增量累积（reasoning→thinking、
  *     text→text、tool-call→toolCall），id 用 stream-<会话seq> 稳定跨快照。
  */
-const TEXT_CAP = 200_000;
-const TOOL_OUTPUT_CAP = 100_000;
-const ARGS_CAP = 20_000;
-function truncate(s, cap) {
-    const str = typeof s === "string" ? s : String(s ?? "");
-    if (str.length <= cap)
-        return { text: str, truncated: false };
-    return { text: `${str.slice(0, cap)}\n\n… [truncated]`, truncated: true };
-}
+import { parseTextQuote } from "../text-quote.js";
+import { ARGS_CAP, TEXT_CAP, TOOL_OUTPUT_CAP, truncate } from "../serialize.js";
 /** DSH user-role content blocks → UiContentBlock[]。 */
 export function serializeUserBlocks(blocks) {
     if (!Array.isArray(blocks) || blocks.length === 0) {
@@ -102,10 +95,19 @@ export function toolResultEventToUiMessage(data) {
 }
 /** user/message 事件 data → UiMessage。 */
 export function userMessageEventToUiMessage(data) {
+    const quotes = [];
+    const content = (data.content ?? []).filter((block) => {
+        const quote = block.type === "text" ? parseTextQuote(block.text ?? "") : null;
+        if (!quote)
+            return true;
+        quotes.push(quote);
+        return false;
+    });
     return {
         id: `u-${data.id ?? "?"}`,
         role: "user",
-        content: serializeUserBlocks(data.content ?? []),
+        content: serializeUserBlocks(content),
+        ...(quotes.length ? { details: { quotes } } : {}),
         timestamp: data.time,
     };
 }

package/dist/server/dsh/dsh-sessions.js

@@ -84,14 +84,28 @@ function zstdDecompressAll(buf) {
         }
     }
     let out = "";
-    for (let i = 0; i < starts.length; i++) {
+    let i = 0;
+    while (i < starts.length) {
         const from = starts[i];
-        const to = i + 1 < starts.length ? starts[i + 1] : buf.length;
-        try {
-            out += zstdDecompressSync(buf.subarray(from, to)).toString("utf8");
+        let nextIdx = i + 1;
+        let decompressed = null;
+        // 贪心尝试：若数据体内部误命中魔数导致切帧错误，向后试探合并到下一个魔数直至解压成功（issue #467）
+        while (nextIdx <= starts.length) {
+            const to = nextIdx < starts.length ? starts[nextIdx] : buf.length;
+            try {
+                decompressed = zstdDecompressSync(buf.subarray(from, to));
+                break;
+            }
+            catch {
+                nextIdx++;
+            }
         }
-        catch {
-            /* skip unreadable frame */
+        if (decompressed) {
+            out += decompressed.toString("utf8");
+            i = nextIdx;
+        }
+        else {
+            i++;
         }
     }
     return out || buf.toString("utf8");

package/dist/server/dsh/runtime/goal-rpc.mjs

@@ -870,10 +870,19 @@ class DshGoalJsonRpcServer extends HarnessSdkJsonRpcServer {
 		return new Promise((resolve, reject) => {
 			const timer = setTimeout(() => {
 				const queued = this.questionBridge.queue.findIndex((q) => q.qid === qid);
-				if (queued >= 0) this.questionBridge.queue.splice(queued, 1);
+				if (queued >= 0) {
+					this.questionBridge.queue.splice(queued, 1);
+					// #459：排队条目超时也必须 settle——此前只 splice 不 reject，
+					// 该 ask 的 Promise 永不落定，agent-loop 卡死在工具调用上。
+					reject(new Error("提问超时（等待回答过久）"));
+					return;
+				}
 				if (this.questionBridge.pending?.qid === qid) {
 					this.questionBridge.pending = null;
 					reject(new Error("提问超时（等待回答过久）"));
+					// #459：pending 腾出后必须派发下一个排队提问——否则队列无人派发，
+					// 后续条目只能等各自超时且永不 settle，整条提问桥永久停摆。
+					this.dispatchNextQuestion();
 				}
 			}, QUESTION_TIMEOUT_MS);
 			timer.unref?.();
@@ -939,6 +948,10 @@ class DshGoalJsonRpcServer extends HarnessSdkJsonRpcServer {
 		}
 		const bytes = new Uint8Array(Buffer.from(params.data, "base64"));
 		if (bytes.length === 0) throw new TypeError("attachment/save: empty image data");
+		const MAX_ATTACHMENT_BYTES = 20 * 1024 * 1024; // 20MB 上限
+		if (bytes.length > MAX_ATTACHMENT_BYTES) {
+			throw new RangeError(`attachment/save: image data exceeds 20MB limit (${bytes.length} bytes)`);
+		}
 		const ref = await this.ctx.attachments.saveImage({
 			data: bytes,
 			mediaType,

package/dist/server/dsh/runtime/runtime-root.mjs

@@ -1,5 +1,5 @@
 // Shared runtime-tree resolution for the pi-web-ui DSH runtime.
-// Used by launcher.mjs (boot-time) and probe-mixed.mjs (self-check).
+// Used by launcher.mjs (boot-time) and dev/dsh-probes/probe-mixed.mjs (self-check).
 //
 // A "runtime tree" is a node_modules root that directly contains the dsh
 // runtime packages: `@deepseek-ai/dsh-base` (with its cordis.patch.yml

package/dist/server/ensure-bash.js

@@ -11,9 +11,10 @@
  * Download is fire-and-forget at server start and never throws: on failure
  * the terminal simply falls back to $COMSPEC (cmd.exe) as before.
  */
-import { copyFileSync, existsSync, mkdirSync, renameSync, rmSync, writeFileSync } from "node:fs";
+import { copyFileSync, existsSync, mkdirSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
+import { writeAtomicSync } from "./atomic-file.js";
 /** Official busybox-w32 64-bit Unicode build (Win10 1903+ / Win11). */
 const BUSYBOX_URL = "https://frippery.org/files/busybox/busybox64u.exe";
 /** busybox.exe is ~660KB; anything far smaller is an error page, not a binary. */
@@ -55,7 +56,6 @@ export async function ensureWindowsBash() {
         return null; // Git Bash preferred — nothing to install.
     const dir = windowsBashDir();
     mkdirSync(dir, { recursive: true });
-    const tmp = join(dir, `busybox-${process.pid}.tmp`);
     try {
         const res = await fetch(BUSYBOX_URL, {
             signal: AbortSignal.timeout(DOWNLOAD_TIMEOUT_MS),
@@ -65,13 +65,11 @@ export async function ensureWindowsBash() {
         const buf = Buffer.from(await res.arrayBuffer());
         if (buf.length < MIN_SIZE)
             return null; // error/HTML page, not the exe.
-        writeFileSync(tmp, buf);
-        renameSync(tmp, join(dir, "busybox.exe"));
+        writeAtomicSync(join(dir, "busybox.exe"), buf);
         copyFileSync(join(dir, "busybox.exe"), target);
         return target;
     }
     catch {
-        rmSync(tmp, { force: true });
         return null;
     }
 }

package/dist/server/eval-tool.js

@@ -287,8 +287,9 @@ class EvalKernel {
             this.proc = spawn(pyCmd, ["-u", "-c", PYTHON_DRIVER_SCRIPT], spawnOpts);
         }
         else {
-            // js / ts：独立 node -e 驱动，避免 eval 里的死循环卡住服务端事件循环。
-            this.proc = spawn(process.execPath, ["-e", NODE_DRIVER_SCRIPT], spawnOpts);
+            // js / ts：独立 node -e 驱动，ts 时带 --experimental-strip-types 支持 TypeScript 原生剥离执行。
+            const nodeArgs = this.language === "ts" ? ["--experimental-strip-types", "-e", NODE_DRIVER_SCRIPT] : ["-e", NODE_DRIVER_SCRIPT];
+            this.proc = spawn(process.execPath, nodeArgs, spawnOpts);
         }
         // stderr 必须持续排空：驱动只把用户的 print/console 劫进 StringIO，但
         // os.write(2, …) / 原生扩展 / eval 里再 spawn 的子进程仍写真实 fd 2。
@@ -569,8 +570,11 @@ export function makeEvalTool(opts) {
             }
             catch (err) {
                 const durationMs = Date.now() - startTime;
-                const errMsg = err.message;
-                const text = `[eval:${language} error (${durationMs}ms)]\n${errMsg}`;
+                let errMsg = err.message;
+                if (errMsg.includes("Python executable not found in PATH")) {
+                    errMsg = pick(lang, "未在系统 PATH 中找到 Python 可执行程序，请安装 Python 或使用 language: 'js'。", "Python executable not found in PATH. Please install Python or use language: 'js'.");
+                }
+                const text = `${pick(lang, `[eval:${language} 出错 (${durationMs}ms)]`, `[eval:${language} error (${durationMs}ms)]`)}\n${errMsg}`;
                 return {
                     content: [{ type: "text", text }],
                     details: {

package/dist/server/goal-review-gate.js

@@ -16,7 +16,7 @@
  * 同样被包裹；但之后经 refreshPluginTools 动态补入已有会话的不在覆盖面。
  * 自研插件若绕过 wrapper 直接写文件同样拦不住 —— 只读是硬闸门，不是安全边界。
  */
-import { bashCommandIsReadOnly } from "./plan-mode.js";
+import { bashCommandIsReadOnly, SESSION_DISPATCH_TOOLS } from "./plan-mode.js";
 /** 审查回合禁写的工具：与计划/审查者模式同名单（写 / 改 / 增删 / git 写 / 形态变换）。 */
 const WRITE_TOOLS = new Set([
     // 文件写入与编辑（第一方 + SDK 内置 + 编辑器类扩展的常见名）
@@ -51,6 +51,8 @@ const WRITE_TOOLS = new Set([
     "rename",
     // 版本控制写（git add/commit/checkout/reset…；只读子命令走 bash 白名单）
     "git",
+    // 代码求值（eval 沙箱可写真实文件系统 —— 审查回合只读核实，#436）
+    "eval",
     // 形态变换（会重写整个文件树）
     "format",
     "prettier",
@@ -60,27 +62,12 @@ const WRITE_TOOLS = new Set([
 /**
  * 审查回合禁掉的「派发类」工具：轮次由服务端控制（D6）—— 派生 / 等待 / 指挥
  * 别的对话、排程、改模式 / 开新目标都会绕开「一轮 = 派活 + 判定」的口径。
- * 只读的 `conversation_read` / `subagent_get_result` / `subagent_list` 不在名单里：
+ * 名单 = 三闸门共用的真实注册派发工具（SESSION_DISPATCH_TOOLS，#436 前是一堆
+ * 幽灵名）。subagent 不在此列：上面的按 action 判定已拦掉全部写向 action，
+ * 只读的 `conversation_read` / subagent get_result/list/templates 放行 ——
  * 审查者可以按需看执行者的转录（契约要求看实际状态，而不是信描述）。
  */
-const DISPATCH_TOOLS = new Set([
-    "spawn",
-    "spawn_agent",
-    "subagent_spawn",
-    "spawn_subagent",
-    "subagent_steer",
-    "subagent_stop",
-    "subagent_wait_all",
-    "subagent_handoff",
-    "delegate_task",
-    "schedule",
-    "schedule_agent",
-    "host_schedule",
-    "create_goal",
-    "set_goal",
-    "start_goal_wizard",
-    "set_plan_mode",
-]);
+const DISPATCH_TOOLS = SESSION_DISPATCH_TOOLS;
 /** bash 家族（要逐条判命令是否只读；与审查者模式同名单）。 */
 const BASH_TOOLS = new Set(["bash", "shell", "sh", "zsh", "terminal", "terminal_bash", "run_command", "exec"]);
 /** 引号感知的命令切分（按 | ; && || 换行拆段；含 $( / 反引号时整条视为一段交白名单判

package/dist/server/goal-service.js

@@ -817,10 +817,15 @@ export class GoalService {
                             aborted = true;
                         };
                         ac.signal.addEventListener("abort", onAbort, { once: true });
-                        const choose = isChoice ? ctx.ui.select(qTitle, params.options) : ctx.ui.input(qTitle);
-                        const ans = (await choose);
-                        ac.signal.removeEventListener("abort", onAbort);
-                        clearIdle();
+                        let ans;
+                        try {
+                            const choose = isChoice ? ctx.ui.select(qTitle, params.options) : ctx.ui.input(qTitle);
+                            ans = (await choose);
+                        }
+                        finally {
+                            ac.signal.removeEventListener("abort", onAbort);
+                            clearIdle();
+                        }
                         if (aborted || ac.signal.aborted) {
                             return {
                                 content: [
@@ -1398,7 +1403,7 @@ export class GoalService {
         conv.goal.roles = {};
         return exec?.convId;
     }
-    stopDelegated(conv) {
+    async stopDelegated(conv) {
         // 排队的启动请求一并作废：setGoal 会在后面按新代次重新排，clearGoal 则不需要。
         this.delegatedPending.delete(conv.id);
         conv.awaitingVerdict = undefined;
@@ -1411,6 +1416,30 @@ export class GoalService {
             settle("gone");
         }
         const execId = this.detachRoleExec(conv);
+        if (execId) {
+            try {
+                await this.host.stopRoleAgent?.(execId);
+            }
+            catch { }
+            try {
+                // issue #464: 必须等待执行者完全 dismiss 移出会话表，避免立即重设目标时误报容量超限
+                await this.host.dismissRoleAgent?.(execId);
+            }
+            catch { }
+        }
+        conv.goal.phase = "idle";
+    }
+    /** 会话过户时清理目标审查态并唤醒等待者（issue #457）。 */
+    notifyTakeover(conv) {
+        this.delegatedPending.delete(conv.id);
+        conv.awaitingVerdict = undefined;
+        void this.flushDeferredPrompts(conv);
+        const settle = this.verdictWaiters.get(conv.id);
+        if (settle) {
+            this.verdictWaiters.delete(conv.id);
+            settle("gone");
+        }
+        const execId = this.detachRoleExec(conv);
         if (execId) {
             void this.host.stopRoleAgent?.(execId).catch(() => { });
             void this.host.dismissRoleAgent?.(execId).catch(() => { });
@@ -1581,6 +1610,14 @@ export class GoalService {
                 // 落盘对话在左栏/历史里没有「子代理」微标，用带前缀的标题保持可辨识。
                 title: this.roleConvTitle(goalText),
             });
+            // #490/案1：spawn 的长 await 期间目标可能被重设/清除（goalGeneration 已变，
+            // stopDelegated 当时无可停执行者）——老循环不得把带着老目标首轮 prompt 的
+            // 执行者写回 conv.roleExec，否则新循环会把它当现役执行者 steer（上下文被
+            // 老目标污染，新目标首轮产出混入老目标工作）。就地停掉并让老循环按代次退出。
+            if (conv.goalGeneration !== goalGeneration) {
+                void host.stopRoleAgent?.(convId).catch(() => { });
+                return undefined;
+            }
             conv.roleExec = { convId, generation: (conv.roleExec?.generation ?? 0) + 1 };
             g.roles = { ...g.roles, executor: { convId, spawned: true } };
             this.beginRoundVitals(conv, convId);
@@ -1762,6 +1799,13 @@ export class GoalService {
             phase: "start",
             round,
         });
+        // #490/案2：pushReviewCard 的 await 窗口里 setGoal/clearGoal 可能已清掉
+        // awaitingVerdict（此刻 verdictWaiters 尚未登记，stopDelegated 的 settle 落空）
+        // ——不复检就会继续登记 waiter 并把老目标的审查指令投进主对话：主对话白烧
+        // 一轮审查、老循环干等 20 分钟超时，新目标的 pending 循环全程无法启动。
+        if (!conv.awaitingVerdict || conv.awaitingVerdict.round !== round) {
+            return "gone";
+        }
         const verdict = await new Promise((resolve) => {
             let settled = false;
             let timer;