deepseeker-code 1.0.3 → 1.0.4

package/dist/cli.mjs

@@ -52,6 +52,9 @@ var init_strings = __esm({
         approvalDeny: "\u62D2\u7EDD",
         errAborted: "\u5DF2\u4E2D\u6B62\u5F53\u524D\u8F6E\u3002",
         busyBlockSend: "\u23F3 \u6B63\u5728\u751F\u6210\uFF0C\u8BF7\u7B49\u5F85\u6216\u6309 Esc \u4E2D\u6B62\u540E\u518D\u53D1\u9001\u3002",
+        inboxQueued: "\u{1F4EE} \u5DF2\u6392\u961F\uFF0C\u5C06\u5728\u56DE\u5408\u8FB9\u754C\u9001\u8FBE\u6A21\u578B\uFF08Esc \u4ECD\u53EF\u4E2D\u6B62\uFF09\u3002",
+        inboxClaimed: (n) => `\u{1F4EC} \u5DF2\u9001\u8FBE\u6A21\u578B\uFF08${n} \u6761\u8865\u5145\u8F93\u5165\uFF09`,
+        inboxCarryover: (n) => `\u{1F4EC} \u672C\u8F6E\u7ED3\u675F\u65F6 ${n} \u6761\u8865\u5145\u8F93\u5165\u672A\u5728\u56DE\u5408\u8FB9\u754C\u9001\u8FBE\uFF0C\u5DF2\u5199\u5165\u4F1A\u8BDD\u5386\u53F2\uFF0C\u4E0B\u8F6E\u5BF9\u8BDD\u81EA\u52A8\u5E26\u5165\u3002`,
         cmdHint: "/help \u5E2E\u52A9 \xB7 /plan \u8BA1\u5212\u6A21\u5F0F \xB7 /auto \u81EA\u52A8\u6A21\u5F0F \xB7 /model \u5207\u6362\u6A21\u578B \xB7 /thinking \u601D\u8003\u7B49\u7EA7 \xB7 /lang \u8BED\u8A00 \xB7 /sessions \u5386\u53F2 \xB7 /clear \u6E05\u5C4F \xB7 /exit \u9000\u51FA",
         statusStreaming: "\u751F\u6210\u4E2D",
         statusIdle: "\u5C31\u7EEA",
@@ -98,6 +101,12 @@ ${dim}  \u8FD0\u884C npm i -g deepseeker-code@latest \u66F4\u65B0${reset}
         sessionsPrompt: "\u2191\u2193 \u9009\u62E9 \xB7 Enter \u8F7D\u5165 \xB7 Esc \u53D6\u6D88",
         noHistory: "\uFF08\u6682\u65E0\u5386\u53F2\u4F1A\u8BDD\uFF09",
         sessionLoaded: (id) => `\u5DF2\u8F7D\u5165\u4F1A\u8BDD ${id}\uFF08\u7EE7\u7EED\u5BF9\u8BDD\u5C06\u7EED\u63A5\u6B64\u4F1A\u8BDD\uFF09`,
+        cmdFork: "\u4ECE\u5F53\u524D\u4F1A\u8BDD\u7684\u67D0\u8F6E\u56DE\u590D\u5904\u5206\u53C9\u51FA\u65B0\u4F1A\u8BDD",
+        forkTitle: "\u{1F33F} \u5206\u53C9\u5F53\u524D\u4F1A\u8BDD\uFF08\u2191\u2193 \u9009\u68C0\u67E5\u70B9 \xB7 Enter \u5206\u53C9\uFF09",
+        forkPrompt: "\u2191\u2193 \u9009\u62E9 \xB7 Enter \u5206\u53C9 \xB7 Esc \u53D6\u6D88",
+        forkEmpty: "\uFF08\u5F53\u524D\u4F1A\u8BDD\u6682\u65E0\u53EF\u5206\u53C9\u7684\u68C0\u67E5\u70B9\uFF09",
+        forkDone: (id, roundNo) => `\u5DF2\u4ECE\u7B2C ${roundNo} \u8F6E\u5206\u53C9 \u2192 \u65B0\u4F1A\u8BDD ${id}\uFF08\u5DF2\u8F7D\u5165\uFF0C\u540E\u7EED\u5BF9\u8BDD\u5199\u5165\u65B0\u4F1A\u8BDD\uFF0C\u539F\u4F1A\u8BDD\u4E0D\u53D8\uFF09`,
+        forkFailed: (e) => `\u5206\u53C9\u5931\u8D25\uFF1A${e}`,
         relTime: (iso) => {
           const t = Date.parse(iso);
           if (!t) return "";
@@ -133,6 +142,7 @@ DeepSeeker-Code \u5C06\u5728\u6B64\u76EE\u5F55\u8BFB\u53D6\u3001\u7F16\u8F91\u54
           `/thinking [off|high|max] \u2014 \u5207\u6362\u601D\u8003\u7B49\u7EA7\uFF08\u5F53\u524D ${thinking}\uFF09`,
           `/lang [zh|en] \u2014 \u5207\u6362\u754C\u9762\u8BED\u8A00\uFF08\u5F53\u524D ${locale2}\uFF09`,
           "/sessions  \u2014 \u9009\u62E9\u5E76\u8F7D\u5165\u5386\u53F2\u4F1A\u8BDD\uFF08\u7EED\u63A5\u5BF9\u8BDD\uFF09",
+          "/fork      \u2014 \u4ECE\u5F53\u524D\u4F1A\u8BDD\u7684\u67D0\u8F6E\u56DE\u590D\u5904\u5206\u53C9\u51FA\u65B0\u4F1A\u8BDD",
           "/trust  \u2014 \u7BA1\u7406\u5DF2\u4FE1\u4EFB\u76EE\u5F55\uFF08\u9879\u76EE\u7EA7 hooks/skills \u7B49\u4EC5\u5728\u4FE1\u4EFB\u76EE\u5F55\u52A0\u8F7D\uFF1BCI \u7528 --trust \u663E\u5F0F\u4FE1\u4EFB\uFF09",
           "Ctrl+C \u9000\u51FA \xB7 Esc \u4E2D\u6B62/\u6E05\u8F93\u5165 \xB7 Ctrl+G \u4E2D\u6B62 \xB7 Ctrl+T \u5C55\u5F00/\u6536\u8D77\u601D\u8003"
         ].join("\n"),
@@ -180,6 +190,9 @@ DeepSeeker-Code \u5C06\u5728\u6B64\u76EE\u5F55\u8BFB\u53D6\u3001\u7F16\u8F91\u54
         approvalDeny: "Deny",
         errAborted: "Aborted current turn.",
         busyBlockSend: "\u23F3 Still generating\u2014wait or press Esc to abort before sending.",
+        inboxQueued: "\u{1F4EE} Queued\u2014will reach the model at the next round boundary (Esc still aborts).",
+        inboxClaimed: (n) => `\u{1F4EC} Delivered to the model (${n} supplemental input${n > 1 ? "s" : ""})`,
+        inboxCarryover: (n) => `\u{1F4EC} ${n} supplemental input${n > 1 ? "s" : ""} not claimed at a round boundary before this run ended; saved to session history and carried into the next turn.`,
         cmdHint: "/help help \xB7 /plan plan mode \xB7 /auto auto mode \xB7 /model switch model \xB7 /thinking thinking level \xB7 /lang language \xB7 /sessions history \xB7 /clear clear \xB7 /exit quit",
         statusStreaming: "streaming",
         statusIdle: "ready",
@@ -226,6 +239,12 @@ ${dim}  Run npm i -g deepseeker-code@latest to update${reset}
         sessionsPrompt: "\u2191\u2193 pick \xB7 Enter resume \xB7 Esc cancel",
         noHistory: "(no past sessions)",
         sessionLoaded: (id) => `Resumed session ${id} (new messages continue it)`,
+        cmdFork: "Fork the current session from a past round",
+        forkTitle: "\u{1F33F} Fork current session (\u2191\u2193 to pick \xB7 Enter to fork)",
+        forkPrompt: "\u2191\u2193 pick \xB7 Enter fork \xB7 Esc cancel",
+        forkEmpty: "(no checkpoints to fork from in this session)",
+        forkDone: (id, roundNo) => `Forked from round ${roundNo} \u2192 new session ${id} (loaded; new messages go to the fork, source untouched)`,
+        forkFailed: (e) => `Fork failed: ${e}`,
         relTime: (iso) => {
           const t = Date.parse(iso);
           if (!t) return "";
@@ -261,6 +280,7 @@ DeepSeeker-Code will read, edit, and execute files here.`,
           `/thinking [off|high|max] \u2014 Switch thinking level (current ${thinking})`,
           `/lang [zh|en] \u2014 Switch interface language (current ${locale2})`,
           "/sessions  \u2014 Pick a past session to resume",
+          "/fork      \u2014 Fork the current session from a past round",
           "/trust  \u2014 Manage trusted dirs (project hooks/skills load only when trusted; CI uses --trust)",
           "Ctrl+C exit \xB7 Esc abort/clear input \xB7 Ctrl+G abort \xB7 Ctrl+T toggle thinking"
         ].join("\n"),
@@ -281,7 +301,7 @@ DeepSeeker-Code will read, edit, and execute files here.`,
     S = new Proxy({}, {
       get: (_t, k) => typeof k === "string" ? STRINGS[locale][k] : void 0
     });
-    LOCAL_COMMAND_NAMES = ["help", "status", "plan", "auto", "model", "thinking", "lang", "output-style", "sessions", "usage", "context", "permissions", "mcp", "hooks", "trust", "debug", "clear", "exit"];
+    LOCAL_COMMAND_NAMES = ["help", "status", "plan", "auto", "model", "thinking", "lang", "output-style", "sessions", "fork", "usage", "context", "permissions", "mcp", "hooks", "trust", "debug", "clear", "exit"];
   }
 });
 
@@ -289,13 +309,15 @@ DeepSeeker-Code will read, edit, and execute files here.`,
 var config_exports = {};
 __export(config_exports, {
   ENGINE_OVERRIDE_KEYS: () => ENGINE_OVERRIDE_KEYS,
-  appConfig: () => appConfig
+  ENV_SOURCES: () => ENV_SOURCES,
+  appConfig: () => appConfig,
+  configSources: () => configSources
 });
 import path2 from "path";
 import os2 from "os";
 import { readFileSync as readFileSync2 } from "fs";
 import { createHash } from "crypto";
-var _DataDir, appConfig, ENGINE_OVERRIDE_VALIDATORS, ENGINE_OVERRIDE_KEYS, applyEngineOverrides;
+var _DataDir, appConfig, ENV_SOURCES, configSources, ENGINE_OVERRIDE_VALIDATORS, ENGINE_OVERRIDE_KEYS, applyEngineOverrides;
 var init_config = __esm({
   "../core/src/config/index.ts"() {
     "use strict";
@@ -370,8 +392,51 @@ var init_config = __esm({
       workflowMaxSteps: Number(process.env.DEEP_SEEK_WORKFLOW_MAX_STEPS) || 8,
       /** P0-3 run_workflow 单个子 agent 结果的字符预算：超出按头尾截断，避免单个巨型结果挤占聚合输出。
        *  最终聚合再受工具 maxOutputCharacters 兜底。 */
-      workflowPerStepChars: 6e3
-    };
+      workflowPerStepChars: 6e3,
+      /** ★ P0-A 计划模式强制位置：'runtime'（默认）= 工具表全会话恒定（两态统一 appendPlanControlTools），
+       *  计划期写工具由 processToolCall 执行层按 PLAN_ALLOWED_TOOLS 拒绝——保 DeepSeek 前缀缓存
+       *  （tools 参数序列化在请求头部，计划模式裁表翻转 = 全会话历史 re-prefill 两次）；
+       *  'schema' = 旧路径（计划期裁成只读白名单子表）。env DEEP_SEEK_PLAN_ENFORCEMENT=schema 回退。 */
+      planEnforcement: process.env.DEEP_SEEK_PLAN_ENFORCEMENT === "schema" ? "schema" : "runtime",
+      /** ★ P1-MCP 工具暴露模式：'dispatcher'（默认）= 只注入恒定 schema 的 mcp_list_tools + mcp_call
+       *  （目录按需查、审批/权限用合成名 mcp__<server>__<tool> 匹配既有规则；工具表不随 MCP server
+       *  工具数增长，L1 恒定）；'schemas' = 旧路径（每个 MCP 工具独立 schema 常驻）。
+       *  env DEEP_SEEK_MCP_EXPOSE_MODE=schemas 回退。 */
+      mcpExposeMode: process.env.DEEP_SEEK_MCP_EXPOSE_MODE === "schemas" ? "schemas" : "dispatcher",
+      /** ★ 事件日志化：transcript 追加 turn/step 边界事件行（run.start/round.end/run.end/compaction/
+       *  run.abandoned，带 dscEvent 标记，readMessages 自动过滤）——崩溃恢复从盲扫启发式升级为事件确认，
+       *  compaction 事件携带归档计数+摘要文本使 transcript 自包含（分叉/审计不再押 state.json 单点）。
+       *  关闭时 appendEvent 全 no-op、恢复走纯内存启发式（= 改造前行为）。env DEEP_SEEK_TRANSCRIPT_EVENTS=0 回退。 */
+      transcriptEvents: process.env.DEEP_SEEK_TRANSCRIPT_EVENTS !== "0",
+      /** ★ inbox steering（第二梯队 #2）：agent 运行中用户补充输入进 per-session 队列，runAgent 回合边界
+       *  claim 注入上下文并落盘 transcript（长任务中途补指示不再只能中止重跑）。
+       *  关闭时全链路 no-op：端点 501 / CLI 回退 busy 提示 / VSCode 不排队。env DEEP_SEEK_INBOX=0 回退。 */
+      inboxSteering: process.env.DEEP_SEEK_INBOX !== "0",
+      /** ★ hooks 改写型拦截点（第二梯队 #3）：PreToolUse 可改 args（argsOverride，前置到全部安全门禁
+       *  之前生效——门禁/审批评估的是改写后参数）、PostToolUse 可改 resultForModel（仅模型视图，
+       *  用户视图 resultForUser 不变）。关闭时 PreToolUse 回退旧位（审批后、仅 deny），改写字段全忽略，
+       *  行为与改造前一致。env DEEP_SEEK_HOOK_REWRITE=0 回退。 */
+      hookRewrite: process.env.DEEP_SEEK_HOOK_REWRITE !== "0"
+    };
+    ENV_SOURCES = {
+      dataDir: "DEEPSEEKER_CODE_DATA_DIR",
+      searchProvider: "SEARCH_PROVIDER",
+      tavilyApiKey: "TAVILY_API_KEY",
+      webFetchAllowPrivate: "WEB_FETCH_ALLOW_PRIVATE",
+      parallelSafeTools: "DEEP_SEEK_PARALLEL_SAFE_TOOLS",
+      workflowConcurrency: "DEEP_SEEK_WORKFLOW_CONCURRENCY",
+      workflowMaxSteps: "DEEP_SEEK_WORKFLOW_MAX_STEPS",
+      planEnforcement: "DEEP_SEEK_PLAN_ENFORCEMENT",
+      mcpExposeMode: "DEEP_SEEK_MCP_EXPOSE_MODE",
+      transcriptEvents: "DEEP_SEEK_TRANSCRIPT_EVENTS",
+      inboxSteering: "DEEP_SEEK_INBOX",
+      hookRewrite: "DEEP_SEEK_HOOK_REWRITE"
+    };
+    configSources = {};
+    for (const [key, envName] of Object.entries(ENV_SOURCES)) {
+      const v = process.env[envName];
+      if (v !== void 0 && v !== "") configSources[key] = "env";
+    }
     ENGINE_OVERRIDE_VALIDATORS = {
       undoEnabled: (v) => typeof v === "boolean" ? v : void 0,
       undoBackupSensitive: (v) => v === "skip" || v === "deny" || v === "allow" ? v : void 0,
@@ -382,12 +447,12 @@ var init_config = __esm({
     ENGINE_OVERRIDE_KEYS = Object.keys(ENGINE_OVERRIDE_VALIDATORS);
     applyEngineOverrides = (cfg) => {
       const paths = [
-        path2.join(cfg.dataDir, "settings.json"),
+        { scope: "settings.global", configPath: path2.join(cfg.dataDir, "settings.json") },
         // 全局用户级
-        path2.join(process.cwd(), ".deepseeker-code", "settings.json")
+        { scope: "settings.project", configPath: path2.join(process.cwd(), ".deepseeker-code", "settings.json") }
         // 项目级（覆盖全局）
       ];
-      for (const configPath of paths) {
+      for (const { scope, configPath } of paths) {
         let raw;
         try {
           raw = readFileSync2(configPath, "utf-8");
@@ -411,6 +476,7 @@ var init_config = __esm({
             continue;
           }
           cfg[key] = valid;
+          configSources[key] = scope;
         }
       }
     };
@@ -491,13 +557,20 @@ var init_common = __esm({
     injectMarkedBlock = (message, fence, body) => {
       const sys = message[0];
       if (!sys || sys.role !== "system" || typeof sys.content !== "string") return;
-      if (sys.content.includes(fence)) {
-        sys.content = sys.content.split(fence)[0].trimEnd();
-      }
-      sys.content += `
+      const idx = sys.content.indexOf(fence);
+      if (idx === -1) {
+        sys.content += `
 
 ${fence}
 ${body}`;
+        return;
+      }
+      const after = sys.content.slice(idx + fence.length);
+      const next = after.match(/\n\n⟦[^\n]*?⟧/);
+      const oldBody = next?.index !== void 0 ? after.slice(0, next.index) : after;
+      if (oldBody === `
+${body}`) return;
+      console.warn(`\u26A0\uFE0F ${fence} \u5DF2\u9501\u5B9A\uFF08\u4F1A\u8BDD\u5185\u4E0D\u53D8\u4EE5\u4FDD\u524D\u7F00\u7F13\u5B58\uFF09\uFF0C\u5185\u5BB9\u53D8\u5316\u5C06\u4E8E\u4E0B\u4E2A\u65B0\u4F1A\u8BDD\u751F\u6548\u3002`);
     };
     decodeProcessOutput = (buf) => {
       const utf8 = buf.toString("utf8");
@@ -811,17 +884,120 @@ var init_deepseek = __esm({
   }
 });
 
+// ../core/src/llm/providers/replay/index.ts
+var createReplayProvider;
+var init_replay = __esm({
+  "../core/src/llm/providers/replay/index.ts"() {
+    "use strict";
+    createReplayProvider = (script) => {
+      const turns = Array.isArray(script.turns) ? script.turns : [];
+      let cursor = 0;
+      let attemptCounts = [];
+      const calls = [];
+      const makeFaultError = (fault) => {
+        const msg = fault.message ?? (fault.type === "idle" ? "stream_idle_timeout" : fault.type === "context_length" ? "context_length_exceeded\uFF08\u56DE\u653E\u6CE8\u5165\uFF09" : fault.type === "transient" ? "HTTP 429 rate limit\uFF08\u56DE\u653E\u6CE8\u5165\uFF09" : "\u56DE\u653E\u81F4\u547D\u9519\u8BEF\uFF08fatal\uFF09");
+        const e = new Error(msg);
+        e.replayFault = fault.type;
+        if (fault.type === "transient") e.status = 429;
+        return e;
+      };
+      const streamChat2 = async function* (messages, tools, opts) {
+        const turnIndex = cursor;
+        calls.push({ turnIndex, messages: [...messages], tools, opts });
+        const turn = turns[turnIndex];
+        if (!turn) return;
+        const attempt = attemptCounts[turnIndex] ?? 0;
+        attemptCounts[turnIndex] = attempt + 1;
+        const fault = turn.fault;
+        const shouldFault = !!fault && (fault.type === "fatal" || attempt < (fault.times ?? 1));
+        if (shouldFault) {
+          const f = fault;
+          const n = Math.min(f.afterChars ?? 0, (turn.content ?? "").length);
+          if (n > 0) yield { kind: "text", text: (turn.content ?? "").slice(0, n) };
+          throw makeFaultError(f);
+        }
+        if (turn.reasoning) yield { kind: "reasoning", text: turn.reasoning };
+        if (turn.content) yield { kind: "text", text: turn.content };
+        const tcs = turn.toolCalls ?? [];
+        for (let i = 0; i < tcs.length; i++) {
+          const tc = tcs[i];
+          yield { kind: "tool_call_delta", index: i, id: tc.id ?? `call_replay_${turnIndex}_${i}`, type: "function", nameDelta: tc.name };
+          yield { kind: "tool_call_delta", index: i, argumentsDelta: JSON.stringify(tc.args ?? {}) };
+        }
+        if (turn.usage) yield { kind: "usage", usage: turn.usage };
+        cursor++;
+      };
+      const summarize2 = async (_messages, _tools, _opts) => ({
+        id: "replay-summary",
+        object: "chat.completion",
+        created: 0,
+        // 确定性：固定值（回放产物不掺时间戳，diff 稳定）
+        model: "replay",
+        choices: [{
+          index: 0,
+          message: { role: "assistant", content: script.summarizeText ?? "\uFF08\u56DE\u653E\u6458\u8981\uFF1A\u538B\u7F29\u8DEF\u5F84\u7684\u786E\u5B9A\u6027\u5360\u4F4D\u6587\u672C\uFF09", refusal: null },
+          finish_reason: "stop",
+          logprobs: null
+        }],
+        usage: { prompt_tokens: 0, completion_tokens: 0, total_tokens: 0 }
+      });
+      return {
+        id: "replay",
+        displayName: "Replay",
+        modelLabel: "Replay",
+        streamChat: streamChat2,
+        summarize: summarize2,
+        classifyRisk: async () => script.riskVerdict ?? "safe",
+        buildAssistantMessage: (parts) => {
+          const m = { role: "assistant", content: parts.content };
+          if (parts.reasoning) m.reasoning_content = parts.reasoning;
+          if (parts.toolCalls?.length) m.tool_calls = parts.toolCalls;
+          return m;
+        },
+        // 自识别回放注入的故障（streamInference 经 activeProvider 调用这两个分类器驱动重试通道）
+        isContextLengthError: (e) => e?.replayFault === "context_length",
+        isTransientError: (e) => e?.replayFault === "transient",
+        get calls() {
+          return calls;
+        },
+        get cursor() {
+          return cursor;
+        },
+        reset: () => {
+          cursor = 0;
+          attemptCounts = [];
+          calls.length = 0;
+        }
+      };
+    };
+  }
+});
+
 // ../core/src/llm/model.ts
-var activeProvider, chatWithModelWithSummary, classifyToolRisk, isContextLengthError2, isTransientApiError;
+import { readFileSync as readFileSync3 } from "fs";
+var resolveInitialProvider, activeProvider, chatWithModelWithSummary, classifyToolRisk;
 var init_model = __esm({
   "../core/src/llm/model.ts"() {
     "use strict";
     init_deepseek();
-    activeProvider = deepseekProvider;
-    chatWithModelWithSummary = deepseekProvider.summarize;
-    classifyToolRisk = deepseekProvider.classifyRisk;
-    isContextLengthError2 = deepseekProvider.isContextLengthError;
-    isTransientApiError = deepseekProvider.isTransientError;
+    init_replay();
+    resolveInitialProvider = () => {
+      if (process.env.DEEP_SEEK_PROVIDER !== "replay") return deepseekProvider;
+      const scriptPath = process.env.DEEP_SEEK_REPLAY_SCRIPT;
+      if (!scriptPath) {
+        throw new Error("DEEP_SEEK_PROVIDER=replay \u9700\u540C\u65F6\u8BBE\u7F6E DEEP_SEEK_REPLAY_SCRIPT=<script.json>\uFF08\u56DE\u653E\u5267\u672C\u8DEF\u5F84\uFF09");
+      }
+      let raw;
+      try {
+        raw = JSON.parse(readFileSync3(scriptPath, "utf-8"));
+      } catch (e) {
+        throw new Error(`\u56DE\u653E\u5267\u672C\u52A0\u8F7D\u5931\u8D25\uFF08${scriptPath}\uFF09: ${e?.message ?? e}`);
+      }
+      return createReplayProvider(Array.isArray(raw) ? { turns: raw } : raw);
+    };
+    activeProvider = resolveInitialProvider();
+    chatWithModelWithSummary = (messages, tools, opts) => activeProvider.summarize(messages, tools, opts);
+    classifyToolRisk = (toolName, args, detail, signal) => activeProvider.classifyRisk(toolName, args, detail, signal);
   }
 });
 
@@ -1139,6 +1315,7 @@ var init_store = __esm({
             } catch {
               continue;
             }
+            if (typeof msg?.dscEvent === "string") continue;
             messageCount++;
             if (!preview && msg?.role === "user" && typeof msg.content === "string") {
               const t = msg.content.replace(/\s+/g, " ").trim();
@@ -1193,6 +1370,87 @@ var init_store = __esm({
   }
 });
 
+// ../core/src/session/transcript.ts
+import fs5 from "fs/promises";
+var isEventLine, readTranscriptLines, appendLineWithRetry, appendMessage, appendEvent;
+var init_transcript = __esm({
+  "../core/src/session/transcript.ts"() {
+    "use strict";
+    init_store();
+    init_common();
+    init_config();
+    isEventLine = (l) => typeof l?.dscEvent === "string";
+    readTranscriptLines = async (sessionId) => {
+      await ensureSessionsDir(sessionId);
+      const p = getTranscriptPath(sessionId);
+      try {
+        const text = await fs5.readFile(p, "utf-8");
+        const lines = [];
+        for (const s of text.split("\n")) {
+          const line = s.trim();
+          if (line.length === 0) continue;
+          try {
+            lines.push(JSON.parse(line));
+          } catch {
+            console.warn(`\u26A0\uFE0F [transcript] \u8DF3\u8FC7\u65E0\u6CD5\u89E3\u6790\u7684\u635F\u574F\u884C: ${line.slice(0, 120)}`);
+          }
+        }
+        return lines;
+      } catch (err) {
+        if (err?.code === "ENOENT") return [];
+        throw err;
+      }
+    };
+    appendLineWithRetry = async (p, payload) => {
+      const MAX_ATTEMPTS = 3;
+      for (let attempt = 1; attempt <= MAX_ATTEMPTS; attempt++) {
+        let beforeSize = 0;
+        try {
+          beforeSize = (await fs5.stat(p)).size;
+        } catch {
+        }
+        try {
+          await fs5.appendFile(p, payload, "utf-8");
+          return;
+        } catch (e) {
+          try {
+            await fs5.truncate(p, beforeSize);
+          } catch {
+          }
+          if (attempt === MAX_ATTEMPTS) throw e;
+          await new Promise((r) => setTimeout(r, 50 * attempt));
+        }
+      }
+    };
+    appendMessage = async (entry) => {
+      try {
+        await ensureSessionsDir(entry.sessionId);
+        const { sessionId, ...rest } = entry;
+        const line = { id: createUUID(), ...rest };
+        const p = getTranscriptPath(sessionId);
+        const payload = JSON.stringify(line) + "\n";
+        if (payload.includes("\uFFFD")) {
+          const fffdCount = (payload.match(/\uFFFD/g) || []).length;
+          console.warn(`\u26A0\uFE0F [transcript] \u6D88\u606F\u542B ${fffdCount} \u4E2A\u4E71\u7801\u5B57\u7B26\uFF08U+FFFD\uFF09\uFF0C\u5DF2\u539F\u6837\u5199\u5165\u5386\u53F2\u3002\u6765\u6E90\u53EF\u80FD\u662F GBK \u5B50\u8FDB\u7A0B\u8F93\u51FA\u6216\u4E71\u7801\u7C98\u8D34\u3002`);
+        }
+        await appendLineWithRetry(p, payload);
+      } catch (e) {
+        console.warn(`\u26A0\uFE0F \u6D88\u606F\u843D\u76D8\u5931\u8D25\uFF08\u5DF2\u91CD\u8BD5 3 \u6B21\uFF0C\u5185\u5B58\u4E0E\u78C1\u76D8\u8F6C\u5F55\u53EF\u80FD\u4E0D\u4E00\u81F4\uFF09:`, e);
+      }
+    };
+    appendEvent = async (sessionId, ev) => {
+      if (!appConfig.transcriptEvents) return;
+      try {
+        await ensureSessionsDir(sessionId);
+        const line = { id: createUUID(), ts: (/* @__PURE__ */ new Date()).toISOString(), ...ev };
+        await appendLineWithRetry(getTranscriptPath(sessionId), JSON.stringify(line) + "\n");
+      } catch (e) {
+        console.warn(`\u26A0\uFE0F [transcript] \u4E8B\u4EF6\u884C\u843D\u76D8\u5931\u8D25\uFF08${ev.dscEvent}\uFF0C\u6062\u590D/\u5206\u53C9\u5C06\u56DE\u9000\u542F\u53D1\u5F0F\uFF09:`, e);
+      }
+    };
+  }
+});
+
 // ../core/src/hooks/types.ts
 var INTERCEPTABLE_EVENTS, TOOL_EVENTS, ALL_EVENTS, DEFAULT_TIMEOUT_BY_EVENT;
 var init_types = __esm({
@@ -1340,12 +1598,13 @@ var init_shellExecutor = __esm({
 });
 
 // ../core/src/hooks/registry.ts
-var rules, matches, registerHooks, listHooks, dispatch, runPreHooks, HOOK_RESULT_MAX, truncateForHook, runPostHooks;
+var rules, matches, registerHooks, listHooks, isPlainObject, dispatch, runPreHooks, HOOK_RESULT_MAX, truncateForHook, runPostHooks;
 var init_registry = __esm({
   "../core/src/hooks/registry.ts"() {
     "use strict";
     init_types();
     init_shellExecutor();
+    init_config();
     rules = [];
     matches = (matcher, toolName) => {
       if (typeof matcher === "string") return matcher === "*" || matcher === toolName;
@@ -1368,6 +1627,7 @@ var init_registry = __esm({
       };
       return rules.map((r) => ({ event: r.event, matcher: strMatcher(r.matcher), source: r.source, onError: r.onError }));
     };
+    isPlainObject = (v) => v !== null && typeof v === "object" && !Array.isArray(v);
     dispatch = async (event, ctx) => {
       const interceptable = INTERCEPTABLE_EVENTS.has(event);
       const isToolEvent = TOOL_EVENTS.has(event);
@@ -1395,14 +1655,29 @@ var init_registry = __esm({
           )
         ));
         const additions2 = [];
-        for (const r of results) if (r?.contextAdditions) additions2.push(...r.contextAdditions);
-        return pack(additions2);
+        let resultOverride;
+        for (const r of results) {
+          if (r?.contextAdditions) additions2.push(...r.contextAdditions);
+          if (event === "PostToolUse" && appConfig.hookRewrite && typeof r?.resultOverride === "string" && r.resultOverride) {
+            resultOverride = r.resultOverride;
+          }
+        }
+        return { ...pack(additions2), resultOverride };
       }
       const additions = [];
+      let argsOverride = void 0;
       for (const rule of matched) {
         try {
           const res = await rule.run(ctx);
           if (res?.contextAdditions) additions.push(...res.contextAdditions);
+          if (event === "PreToolUse" && appConfig.hookRewrite && res?.argsOverride !== void 0) {
+            if (isPlainObject(res.argsOverride)) {
+              ctx.args = res.argsOverride;
+              argsOverride = res.argsOverride;
+            } else {
+              console.warn(`\u26A0\uFE0F [hook:PreToolUse] argsOverride \u987B\u4E3A\u666E\u901A\u5BF9\u8C61\uFF0C\u5DF2\u5FFD\u7565`);
+            }
+          }
           if (res && res.deny) {
             return { deny: true, reason: res.reason, contextAdditions: additions.length > 0 ? additions : void 0 };
           }
@@ -1415,7 +1690,7 @@ var init_registry = __esm({
           console.warn(`\u26A0\uFE0F [hook:${event}] \u6267\u884C\u5F02\u5E38\uFF0C\u6309\u653E\u884C\u5904\u7406: ${msg}`);
         }
       }
-      return pack(additions);
+      return { ...pack(additions), argsOverride };
     };
     runPreHooks = async (toolName, args, ctx) => {
       return dispatch("PreToolUse", {
@@ -1431,7 +1706,7 @@ var init_registry = __esm({
     truncateForHook = (s) => s.length <= HOOK_RESULT_MAX ? s : s.slice(0, HOOK_RESULT_MAX) + `
 \u2026[hook \u89C6\u56FE\u622A\u65AD\uFF0C\u5171 ${s.length} \u5B57\u7B26]`;
     runPostHooks = async (toolName, args, result, ctx) => {
-      await dispatch("PostToolUse", {
+      return dispatch("PostToolUse", {
         sessionId: ctx.sessionId,
         cwd: ctx.cwd,
         env: ctx.env,
@@ -1475,6 +1750,7 @@ var init_truncate = __esm({
     init_model();
     init_contextCore();
     init_store();
+    init_transcript();
     init_hooks();
     ANSI_ESCAPE = /\u001b\[[\d;?]*[ -/]*[@-~]|\u001b\][^\u0007]*(?:\u0007|\u001b\\)/g;
     getFileAccessRoots = () => {
@@ -1630,6 +1906,11 @@ ${line}` : line;
               consecutiveFailures: 0,
               updatedAt: (/* @__PURE__ */ new Date()).toISOString()
             });
+            await appendEvent(event.sessionId, {
+              dscEvent: "compaction",
+              archivedMessageCount: store.archivedMessageCount,
+              summary: summaryMsg.content
+            });
           } else if (keep > 1) {
             keep--;
             continue;
@@ -1644,6 +1925,11 @@ ${line}` : line;
               consecutiveFailures: 0,
               updatedAt: (/* @__PURE__ */ new Date()).toISOString()
             });
+            await appendEvent(event.sessionId, {
+              dscEvent: "compaction",
+              archivedMessageCount: store.archivedMessageCount,
+              summary: summaryMsg.content
+            });
           } else {
             break;
           }
@@ -1750,7 +2036,7 @@ ${line}` : line;
 });
 
 // ../core/src/tool/permissions.ts
-import fs5 from "fs/promises";
+import fs6 from "fs/promises";
 import path8 from "path";
 var PRIMARY_ARG, rules2, trustedProject, globCache, globToRegex, DANGER_COMMAND_TOOLS, compileRule, readPermissionConfig, toolNameMatches, ruleMatches, initPermissions, checkPermission, listPermissionRules, buildScopedAllowRule, resolveSettingsPath, addPermissionRule;
 var init_permissions = __esm({
@@ -1821,7 +2107,7 @@ var init_permissions = __esm({
       for (const configPath of paths) {
         let raw;
         try {
-          raw = await fs5.readFile(configPath, "utf-8");
+          raw = await fs6.readFile(configPath, "utf-8");
         } catch {
           continue;
         }
@@ -1918,7 +2204,7 @@ var init_permissions = __esm({
         const arr = Array.isArray(cfg.permissions[kind]) ? cfg.permissions[kind] : cfg.permissions[kind] = [];
         if (!arr.includes(ruleStr)) {
           arr.push(ruleStr);
-          await fs5.mkdir(path8.dirname(file), { recursive: true });
+          await fs6.mkdir(path8.dirname(file), { recursive: true });
           await atomicWriteJSON(file, cfg);
         }
         if (!rules2[kind].some((r) => r.raw === compiled.raw)) rules2[kind].push(compiled);
@@ -1956,7 +2242,7 @@ var init_sessionRegistry = __esm({
 });
 
 // ../core/src/tool/guard.ts
-import fs6 from "fs/promises";
+import fs7 from "fs/promises";
 import fsSync from "fs";
 import path9 from "path";
 import ignore from "ignore";
@@ -2134,11 +2420,11 @@ var init_guard = __esm({
     };
     scanIgnoreFilesRecursive = async (dirPath, base, engine) => {
       try {
-        const entries = await fs6.readdir(dirPath, { withFileTypes: true });
+        const entries = await fs7.readdir(dirPath, { withFileTypes: true });
         for (const entry of entries) {
           if (entry.isFile() && (entry.name === ".gitignore" || entry.name === ".agentignore")) {
             const fullPath = path9.join(dirPath, entry.name);
-            const content = await fs6.readFile(fullPath, "utf-8");
+            const content = await fs7.readFile(fullPath, "utf-8");
             const relDir = path9.relative(base, dirPath).replace(/\\/g, "/");
             const rules3 = content.split(/\r?\n/).map((line) => {
               const trimmed = line.trim();
@@ -3035,7 +3321,7 @@ ${capped || JSON.stringify(result)}`;
 });
 
 // ../core/src/tool/mcp/loader.ts
-import fs7 from "fs/promises";
+import fs8 from "fs/promises";
 import path11 from "path";
 import { homedir } from "os";
 function sanitize(s) {
@@ -3045,7 +3331,7 @@ async function readMcpConfig() {
   const configPath = process.env.MCP_CONFIG || path11.join(appConfig.dataDir, "mcp.json");
   let raw;
   try {
-    raw = await fs7.readFile(configPath, "utf-8");
+    raw = await fs8.readFile(configPath, "utf-8");
   } catch {
     return {};
   }
@@ -3136,9 +3422,14 @@ async function loadMcpTools() {
 }
 async function initMcpTools(into) {
   const mcpTools = await loadMcpTools();
-  if (mcpTools.length > 0) {
+  if (appConfig.mcpExposeMode === "dispatcher") {
+    if (clients.length > 0) {
+      into.push(...mcpDispatcherTools);
+      console.log(`\u{1F50C} [MCP] dispatcher \u6A21\u5F0F\uFF1A\u6CE8\u5165 mcp_list_tools + mcp_call\uFF08\u8986\u76D6 ${clients.length} \u4E2A server / ${mcpTools.length} \u4E2A\u5DE5\u5177\uFF09`);
+    }
+  } else if (mcpTools.length > 0) {
     into.push(...mcpTools);
-    console.log(`\u{1F50C} [MCP] \u5171\u6CE8\u5165 ${mcpTools.length} \u4E2A MCP \u5DE5\u5177`);
+    console.log(`\u{1F50C} [MCP] \u5171\u6CE8\u5165 ${mcpTools.length} \u4E2A MCP \u5DE5\u5177 schema\uFF08schemas \u6A21\u5F0F\uFF09`);
   }
   if (clients.some((c) => c.supportsResources)) {
     into.push(...mcpResourceTools);
@@ -3174,7 +3465,7 @@ async function listMcpClients() {
   }
   return out;
 }
-var clients, expandPlaceholders, expandServerConfig, mcpResourceTools, mcpPromptTools;
+var clients, expandPlaceholders, expandServerConfig, mcpResourceTools, mcpPromptTools, resolveMcpPermissionName, mcpDispatcherTools;
 var init_loader = __esm({
   "../core/src/tool/mcp/loader.ts"() {
     "use strict";
@@ -3338,6 +3629,88 @@ ${text}`;
         }
       }
     ];
+    resolveMcpPermissionName = (calledName, args) => {
+      if (calledName !== "mcp_call") return calledName;
+      const server = typeof args?.server === "string" ? sanitize(args.server) : "";
+      const tool = typeof args?.tool === "string" ? sanitize(args.tool) : "";
+      return server && tool ? `mcp__${server}__${tool}` : calledName;
+    };
+    mcpDispatcherTools = [
+      {
+        type: "function",
+        function: {
+          name: "mcp_list_tools",
+          description: "\u5217\u51FA\u5DF2\u8FDE\u63A5 MCP server \u7684\u5916\u90E8\u5DE5\u5177\u76EE\u5F55\uFF08server / \u5DE5\u5177\u540D / \u4E00\u884C\u63CF\u8FF0 / \u53C2\u6570\u540D\uFF0C\u5FC5\u586B\u53C2\u6570\u5E26 *\uFF09\u3002\u8C03\u7528 MCP \u5DE5\u5177\u7528 mcp_call\uFF08\u987B\u4F20\u56DE server \u4E0E\u5DE5\u5177\u539F\u540D\uFF09\u3002\u76EE\u5F55\u5B9E\u65F6\u67E5\u8BE2\u2014\u2014\u65B0\u589E server \u540E\u5373\u67E5\u5373\u89C1\uFF0C\u65E0\u9700\u4EFB\u4F55\u53D8\u66F4\u3002",
+          parameters: {
+            type: "object",
+            properties: {
+              server: { type: "string", description: "\u4EC5\u5217\u51FA\u8BE5 server \u7684\u5DE5\u5177\uFF08\u7F3A\u7701\u5217\u51FA\u5168\u90E8\u5DF2\u8FDE\u63A5 server\uFF09" }
+            }
+          },
+          safetyLevel: "safe" /* SAFE */,
+          isSync: true,
+          async execute(args) {
+            const server = args?.server;
+            const lines = [];
+            for (const c of clients) {
+              if (server && c.serverName !== server) continue;
+              try {
+                const ts = await c.listTools();
+                for (const t of ts) {
+                  const props = t?.inputSchema?.properties && typeof t.inputSchema.properties === "object" ? Object.keys(t.inputSchema.properties) : [];
+                  const required = Array.isArray(t?.inputSchema?.required) ? t.inputSchema.required : [];
+                  const argList = props.map((p) => required.includes(p) ? `${p}*` : p).join(", ");
+                  lines.push(`- [${c.serverName}] ${t.name}${t.description ? `\uFF1A${String(t.description).split("\n")[0]}` : ""}${argList ? `\uFF08\u53C2\u6570\uFF1A${argList}\uFF09` : ""}`);
+                }
+              } catch (e) {
+                console.warn(`\u26A0\uFE0F [MCP] listTools "${c.serverName}" \u5931\u8D25\uFF08\u5DF2\u8DF3\u8FC7\uFF09: ${e?.message ?? e}`);
+              }
+            }
+            if (lines.length === 0) return server ? `(server "${server}" \u672A\u8FDE\u63A5\u6216\u65E0\u5DE5\u5177)` : "(\u65E0\u5DF2\u8FDE\u63A5\u7684 MCP server)";
+            return `[MCP tools]
+${lines.join("\n")}`;
+          }
+        }
+      },
+      {
+        type: "function",
+        function: {
+          name: "mcp_call",
+          description: '\u8C03\u7528\u6307\u5B9A MCP server \u7684\u5916\u90E8\u5DE5\u5177\u3002server \u4E0E\u5DE5\u5177\u540D\u5FC5\u586B\u2014\u2014\u5747\u6765\u81EA mcp_list_tools \u7684\u76EE\u5F55\u8F93\u51FA\uFF08\u7528\u539F\u540D\uFF0C\u4E0D\u8981\u6539\u5199\uFF09\u3002args \u4E3A\u8BE5\u5DE5\u5177\u53C2\u6570\u7684 JSON \u5B57\u7B26\u4E32\uFF08\u53C2\u6570\u540D\u89C1\u76EE\u5F55\uFF1B\u65E0\u53C2\u6570\u4F20 "{}"\uFF09\u3002\u6267\u884C\u5916\u90E8\u903B\u8F91\uFF0C\u6BCF\u6B21\u8C03\u7528\u9700\u5BA1\u6279\u3002',
+          parameters: {
+            type: "object",
+            properties: {
+              server: { type: "string", description: "MCP server \u540D\uFF08\u89C1 mcp_list_tools \u8F93\u51FA\uFF09" },
+              tool: { type: "string", description: "\u5DE5\u5177\u540D\uFF08\u89C1 mcp_list_tools \u8F93\u51FA\uFF0C\u7528\u539F\u540D\uFF09" },
+              args: { type: "string", description: '\u5DE5\u5177\u53C2\u6570\u7684 JSON \u5B57\u7B26\u4E32\uFF0C\u5982 {"query":"..."}\uFF1B\u65E0\u53C2\u6570\u4F20 "{}"' }
+            },
+            required: ["server", "tool"]
+          },
+          safetyLevel: "danger" /* DANGER */,
+          isSync: true,
+          requireApproval: (args) => `\u26A0\uFE0F\u3010MCP \u5DE5\u5177\u5BA1\u6279\u3011
+\u670D\u52A1: ${args?.server} / \u5DE5\u5177: ${args?.tool}
+\u53C2\u6570: ${args?.args}`,
+          async execute(args) {
+            const { server, tool } = args ?? {};
+            if (!server || !tool) return "\u274C [mcp_call] \u7F3A\u5C11 server \u6216 tool\uFF08\u5148\u7528 mcp_list_tools \u67E5\u76EE\u5F55\uFF09\u3002";
+            let parsed = {};
+            if (typeof args.args === "string" && args.args.trim() && args.args.trim() !== "{}") {
+              try {
+                parsed = JSON.parse(args.args);
+              } catch {
+                return `\u274C [mcp_call] args \u4E0D\u662F\u5408\u6CD5 JSON\uFF1A${String(args.args).slice(0, 200)}\u3002\u8BF7\u4F20\u8BE5\u5DE5\u5177\u53C2\u6570\u7684 JSON \u5B57\u7B26\u4E32\uFF08\u65E0\u53C2\u6570\u4F20 "{}"\uFF09\u3002`;
+              }
+            }
+            const c = findClient(server);
+            if (!c) return `\u274C \u672A\u8FDE\u63A5\u7684 MCP server\uFF1A${server}\uFF08\u7528 mcp_list_tools \u67E5\u770B\u5DF2\u8FDE\u63A5\u5217\u8868\uFF09`;
+            const result = await c.callTool(tool, parsed);
+            return `[MCP ${server}/${tool}]
+${result}`;
+          }
+        }
+      }
+    ];
   }
 });
 
@@ -3373,68 +3746,44 @@ var init_httpExecutor = __esm({
   }
 });
 
-// ../core/src/session/transcript.ts
-import fs8 from "fs/promises";
-var readMessages, appendMessage;
-var init_transcript = __esm({
-  "../core/src/session/transcript.ts"() {
+// ../core/src/agent/inbox.ts
+var INBOX_MAX_ITEMS, sessionInboxes, pushSessionInbox, claimSessionInbox, flushLeftoverToTranscript;
+var init_inbox = __esm({
+  "../core/src/agent/inbox.ts"() {
     "use strict";
-    init_store();
-    init_common();
-    readMessages = async (sessionId) => {
-      await ensureSessionsDir(sessionId);
-      const p = getTranscriptPath(sessionId);
-      try {
-        const text = await fs8.readFile(p, "utf-8");
-        const lines = [];
-        for (const s of text.split("\n")) {
-          const line = s.trim();
-          if (line.length === 0) continue;
-          try {
-            lines.push(JSON.parse(line));
-          } catch {
-            console.warn(`\u26A0\uFE0F [transcript] \u8DF3\u8FC7\u65E0\u6CD5\u89E3\u6790\u7684\u635F\u574F\u884C: ${line.slice(0, 120)}`);
-          }
-        }
-        return lines;
-      } catch (err) {
-        if (err?.code === "ENOENT") return [];
-        throw err;
+    init_transcript();
+    init_config();
+    INBOX_MAX_ITEMS = 50;
+    sessionInboxes = /* @__PURE__ */ new Map();
+    pushSessionInbox = (sessionId, content) => {
+      if (!appConfig.inboxSteering) return false;
+      const text = (content ?? "").trim();
+      if (!text) return false;
+      const q = sessionInboxes.get(sessionId) ?? [];
+      if (q.length >= INBOX_MAX_ITEMS) {
+        console.warn(`[inbox] \u4F1A\u8BDD ${sessionId} \u961F\u5217\u5DF2\u6EE1\uFF08${INBOX_MAX_ITEMS}\uFF09\uFF0C\u4E22\u5F03\u65B0\u8F93\u5165`);
+        return false;
       }
+      q.push(text);
+      sessionInboxes.set(sessionId, q);
+      return true;
     };
-    appendMessage = async (entry) => {
-      try {
-        await ensureSessionsDir(entry.sessionId);
-        const { sessionId, ...rest } = entry;
-        const line = { id: createUUID(), ...rest };
-        const p = getTranscriptPath(sessionId);
-        const payload = JSON.stringify(line) + "\n";
-        if (payload.includes("\uFFFD")) {
-          const fffdCount = (payload.match(/\uFFFD/g) || []).length;
-          console.warn(`\u26A0\uFE0F [transcript] \u6D88\u606F\u542B ${fffdCount} \u4E2A\u4E71\u7801\u5B57\u7B26\uFF08U+FFFD\uFF09\uFF0C\u5DF2\u539F\u6837\u5199\u5165\u5386\u53F2\u3002\u6765\u6E90\u53EF\u80FD\u662F GBK \u5B50\u8FDB\u7A0B\u8F93\u51FA\u6216\u4E71\u7801\u7C98\u8D34\u3002`);
-        }
-        const MAX_ATTEMPTS = 3;
-        for (let attempt = 1; attempt <= MAX_ATTEMPTS; attempt++) {
-          let beforeSize = 0;
-          try {
-            beforeSize = (await fs8.stat(p)).size;
-          } catch {
-          }
-          try {
-            await fs8.appendFile(p, payload, "utf-8");
-            return;
-          } catch (e) {
-            try {
-              await fs8.truncate(p, beforeSize);
-            } catch {
-            }
-            if (attempt === MAX_ATTEMPTS) throw e;
-            await new Promise((r) => setTimeout(r, 50 * attempt));
-          }
-        }
-      } catch (e) {
-        console.warn(`\u26A0\uFE0F \u6D88\u606F\u843D\u76D8\u5931\u8D25\uFF08\u5DF2\u91CD\u8BD5 3 \u6B21\uFF0C\u5185\u5B58\u4E0E\u78C1\u76D8\u8F6C\u5F55\u53EF\u80FD\u4E0D\u4E00\u81F4\uFF09:`, e);
+    claimSessionInbox = (sessionId) => {
+      if (!appConfig.inboxSteering) return [];
+      const q = sessionInboxes.get(sessionId);
+      if (!q || q.length === 0) return [];
+      sessionInboxes.delete(sessionId);
+      return q;
+    };
+    flushLeftoverToTranscript = async (sessionId) => {
+      const texts = claimSessionInbox(sessionId);
+      for (const t of texts) {
+        await appendMessage({ sessionId, role: "user", content: t });
       }
+      if (texts.length > 0) {
+        console.warn(`[inbox] \u4F1A\u8BDD ${sessionId} \u7ED3\u675F\u65F6 ${texts.length} \u6761\u8865\u5145\u8F93\u5165\u672A\u8BA4\u9886\uFF0C\u5DF2\u5199\u5165 transcript\uFF08\u4E0B\u8F6E\u81EA\u52A8\u5E26\u5165\uFF09`);
+      }
+      return texts.length;
     };
   }
 });
@@ -3561,6 +3910,9 @@ var init_planMode = __esm({
       "git_status",
       "git_log",
       "inspect_dependencies",
+      "get_diagnostics",
+      "goto_definition",
+      // ★ P0-A 补漏：LSP 导航/诊断恰是调研阶段最需要的（原白名单漂移漏登记，schema 档与 runtime 档共用此表）
       "web_fetch",
       "web_search"
       // 只读研究类（虽为 DANGER 但不写本地状态；仍走各自审批）
@@ -3738,7 +4090,7 @@ var init_inject2 = __esm({
     init_registry4();
     AGENT_CATALOG_MARKER = "\u3010\u53EF\u7528\u5B50 Agent \u76EE\u5F55\u3011";
     AGENT_CATALOG_FENCE = "\u27E6DSC:AGENT_CATALOG\u27E7";
-    AGENT_USAGE_HINT = '\u5F53\u67D0\u5B50\u4EFB\u52A1\u5339\u914D\u4E0B\u5217\u67D0\u4E2A\u5B50 Agent \u7684\u4E13\u957F\u65F6\uFF0C\u8C03\u7528 spawn_agent \u5E76\u4F20\u5165\u5BF9\u5E94 name \u53C2\u6570\uFF08\u5982 spawn_agent(name="code-reviewer", task="..."\uFF09\uFF09\u5C06\u5176\u59D4\u6D3E\u7ED9\u8BE5\u58F0\u660E\u5F0F\u5B50 Agent\uFF1B\u4E0D\u4F20 name \u5219\u8D70\u9ED8\u8BA4\u901A\u7528\u5B50 agent\u3002';
+    AGENT_USAGE_HINT = '\u5F53\u67D0\u5B50\u4EFB\u52A1\u5339\u914D\u4E0B\u5217\u67D0\u4E2A\u5B50 Agent \u7684\u4E13\u957F\u65F6\uFF0C\u8C03\u7528 spawn_agent \u5E76\u4F20\u5165\u5BF9\u5E94 name \u53C2\u6570\uFF08\u5982 spawn_agent(name="code-reviewer", task="..."\uFF09\uFF09\u5C06\u5176\u59D4\u6D3E\u7ED9\u8BE5\u58F0\u660E\u5F0F\u5B50 Agent\uFF1B\u4E0D\u4F20 name \u5219\u8D70\u9ED8\u8BA4\u901A\u7528\u5B50 agent\u3002\n\u59D4\u6D3E\u4F18\u5148\u539F\u5219\uFF08P1-C\uFF09\uFF1A\u9700\u8981\u4E00\u5927\u5768\u4E13\u7528\u5DE5\u5177\u6216\u72EC\u7ACB\u4E0A\u4E0B\u6587\u7684\u5B50\u4EFB\u52A1\uFF08\u6DF1\u5EA6 web \u8C03\u7814\u3001\u6279\u91CF MCP \u5DE5\u5177\u64CD\u4F5C\u3001\u72EC\u7ACB worktree \u8BD5\u9A8C\u7B49\uFF09\uFF0C\u4F18\u5148\u59D4\u6D3E\u7ED9\u5BF9\u5E94\u5B50 Agent\uFF0C\u800C\u975E\u5728\u4E3B\u4F1A\u8BDD\u5806\u53E0\u8C03\u7528\u2014\u2014\u5B50 Agent \u6709\u81EA\u5DF1\u7684\u5DE5\u5177\u767D\u540D\u5355\u4E0E\u72EC\u7ACB\u4E0A\u4E0B\u6587\uFF0C\u4E3B\u4F1A\u8BDD\u4FDD\u6301\u7CBE\u7B80\u3001\u5DE5\u5177\u8868\u4FDD\u6301\u6052\u5B9A\u3002';
     injectAgentCatalog = (message) => {
       const catalog = getAgentCatalog();
       if (!catalog) return;
@@ -3894,6 +4246,7 @@ var prepareToolsAndInjections;
 var init_systemInjections = __esm({
   "../core/src/agent/systemInjections.ts"() {
     "use strict";
+    init_config();
     init_planMode();
     init_toolFilter();
     init_truncate();
@@ -3905,7 +4258,7 @@ var init_systemInjections = __esm({
     init_common();
     prepareToolsAndInjections = async (message, options, events) => {
       const { toolSchemas, planMode, locale: locale2, outputStyle } = options;
-      const rawToolsPreEnv = planMode ? filterToolsForPlanMode(toolSchemas ?? []) : appendPlanControlTools(toolSchemas ?? []);
+      const rawToolsPreEnv = planMode && appConfig.planEnforcement === "schema" ? filterToolsForPlanMode(toolSchemas ?? []) : appendPlanControlTools(toolSchemas ?? []);
       const validationCtx = {
         sessionId: options.sessionId,
         cwd: options.cwd ?? process.cwd(),
@@ -8811,6 +9164,9 @@ var init_toolExecution = __esm({
     init_backgroundTool();
     init_backup();
     init_autoPermission();
+    init_loader();
+    init_config();
+    init_planMode();
     applyPrivacyMasking = (rules3, args, output) => {
       if (!rules3) return output;
       try {
@@ -8836,6 +9192,7 @@ var init_toolExecution = __esm({
         rawTools,
         events,
         permissionMode,
+        planMode,
         onUIEvent,
         requestApproval: hostRequestApproval,
         requestQuestion: hostRequestQuestion,
@@ -8862,6 +9219,10 @@ var init_toolExecution = __esm({
         return { toolCallId: toolCall.id, calledName, calledArgs, resultForModel: note, resultForUser: note, ok: true, terminal: { kind: "exit_plan_mode", plan } };
       }
       if (calledName === "enter_plan_mode") {
+        if (planMode) {
+          const note2 = "\uFF08\u5DF2\u5728\u8BA1\u5212\u6A21\u5F0F\u4E2D\uFF0C\u65E0\u9700\u91CD\u590D\u8FDB\u5165\u3002\u8BF7\u7EE7\u7EED\u53EA\u8BFB\u8C03\u7814\uFF0C\u5B8C\u6210\u540E\u8C03 exit_plan_mode \u63D0\u4EA4\u65B9\u6848\u3002\uFF09";
+          return { toolCallId: toolCall.id, calledName, calledArgs, resultForModel: note2, resultForUser: note2, ok: true };
+        }
         const reason = typeof calledArgs?.reason === "string" ? calledArgs.reason : "";
         const note = "\u{1F4CB} [\u8FDB\u5165\u8BA1\u5212\u6A21\u5F0F] \u6A21\u578B\u8BF7\u6C42\u5148\u4EE5\u53EA\u8BFB\u65B9\u5F0F\u8C03\u7814\u5E76\u89C4\u5212\u65B9\u6848\uFF0C\u5DF2\u5207\u6362\u81F3\u8BA1\u5212\u6A21\u5F0F\u3002";
         return { toolCallId: toolCall.id, calledName, calledArgs, resultForModel: note, resultForUser: note, ok: true, terminal: { kind: "enter_plan_mode", reason } };
@@ -8870,10 +9231,16 @@ var init_toolExecution = __esm({
         const placeholder = "\uFF08\u5DF2\u4E2D\u6B62\uFF0C\u672A\u6267\u884C\uFF09";
         return { toolCallId: toolCall.id, calledName, calledArgs, resultForModel: placeholder, resultForUser: placeholder, ok: false, aborted: true };
       }
+      if (!parseFailed && planMode && appConfig.planEnforcement === "runtime" && calledName !== "enter_plan_mode" && calledName !== "exit_plan_mode" && !PLAN_ALLOWED_TOOLS.has(calledName)) {
+        const note = `\u274C [\u8BA1\u5212\u6A21\u5F0F] \u5F53\u524D\u4E3A\u53EA\u8BFB\u8C03\u7814\u9636\u6BB5\uFF0C\u7981\u6B62 ${calledName}\u3002\u5B8C\u6210\u65B9\u6848\u8BF7\u8C03 exit_plan_mode \u63D0\u4EA4\uFF0C\u7ECF\u7528\u6237\u5BA1\u6279\u540E\u8FDB\u5165\u5B9E\u73B0\u9636\u6BB5\u3002`;
+        events({ sessionId, eventType: "tool.validation.failed", metadata: { depth, decisionSource: llmDecisionSource, durationMs: performance.now() - startTime, round, tools_id: toolCall.id, toolName: calledName, toolSource: "builtin", ok: false, attempt: round }, payload: { output: note } });
+        return { toolCallId: toolCall.id, calledName, calledArgs, resultForModel: note, resultForUser: note, ok: false };
+      }
       const matchedTool = rawTools.find((t) => t.function.name === calledName);
       const toolCtx = { sessionId, cwd: getActiveWorkspaceRoot(), abortSignal: signal, depth, keepRecentUnits, compactRatio, modelWindow, parentSystemPrompt, events, onUIEvent, requestApproval: hostRequestApproval, requestQuestion: hostRequestQuestion, emitProgress: (m) => onUIEvent?.({ type: "tool.progress", toolsId: toolCall.id, toolName: calledName, message: m }), permissionMode };
       let result = "";
       let explicitOk = null;
+      let postHookOverride;
       if (parseFailed) {
         result = `\u53C2\u6570\u89E3\u6790\u5931\u8D25\uFF1A\u6A21\u578B\u8FD4\u56DE\u7684 arguments \u4E0D\u662F\u5408\u6CD5 JSON${JSON.stringify(toolCall).slice(0, 300)}`;
         events({ sessionId, eventType: "tool.validation.failed", metadata: { depth, decisionSource: llmDecisionSource, durationMs: performance.now() - startTime, round, tools_id: toolCall.id, toolName: calledName, toolSource: "builtin", ok: false, attempt: round }, payload: { output: result } });
@@ -8881,6 +9248,23 @@ var init_toolExecution = __esm({
         const level = matchedTool.function.safetyLevel;
         let needApproval = level === "mutation" /* MUTATION */ || level === "danger" /* DANGER */;
         let denied = false;
+        let preHooksAdvanced = false;
+        if (appConfig.hookRewrite) {
+          preHooksAdvanced = true;
+          let veto;
+          try {
+            veto = await runPreHooks(calledName, calledArgs, toolCtx);
+          } catch (e) {
+            veto = { deny: true, reason: `\u274C [Pre-hook \u5F02\u5E38]\uFF1A${e?.message ?? e}\u3002\u51FA\u4E8E\u5B89\u5168\u9ED8\u8BA4\u62D2\u7EDD [${calledName}] \u7684\u6267\u884C\u3002` };
+          }
+          if (veto.deny) {
+            denied = true;
+            result = veto.reason || `\u274C [Hook \u62E6\u622A]\uFF1Apre-hook \u62D2\u7EDD\u4E86 [${calledName}] \u7684\u6267\u884C\u3002`;
+          } else if (veto.argsOverride !== void 0 && veto.argsOverride !== null && typeof veto.argsOverride === "object" && !Array.isArray(veto.argsOverride)) {
+            console.log(`\u270F\uFE0F [Pre-hook] [${calledName}] args \u5DF2\u88AB hook \u6539\u5199`);
+            calledArgs = veto.argsOverride;
+          }
+        }
         const protectedPaths = calledName === "move_file" ? [calledArgs?.source, calledArgs?.destination] : isUndoTrigger(calledName) ? [calledArgs?.path] : [];
         const hitProtected = protectedPaths.find((p) => typeof p === "string" && isProtectedWrite(p, toolCtx.cwd));
         if (hitProtected) {
@@ -8889,7 +9273,7 @@ var init_toolExecution = __esm({
         }
         let perm = null;
         try {
-          perm = checkPermission(calledName, calledArgs);
+          perm = checkPermission(resolveMcpPermissionName(calledName, calledArgs), calledArgs);
           if (perm === "deny") {
             denied = true;
             result = `\u274C [\u6743\u9650\u89C4\u5219]\uFF1A[${calledName}] \u88AB\u6743\u9650\u89C4\u5219 deny \u62D2\u7EDD\u3002`;
@@ -8915,7 +9299,7 @@ var init_toolExecution = __esm({
           result = `\u{1F512} [\u4E92\u65A5\u9501\u963B\u585E]\uFF1A\u5DF2\u6709\u540E\u53F0\u4EFB\u52A1\u6301\u6709\u9501 [${lockKey}]\uFF0C[${calledName}] \u8C03\u7528\u88AB\u8DF3\u8FC7\u3002`;
         }
         if (needApproval && !denied) {
-          const auto = await runAutoCheck(calledName, calledArgs, toolCtx, permissionMode === "auto");
+          const auto = await runAutoCheck(resolveMcpPermissionName(calledName, calledArgs), calledArgs, toolCtx, permissionMode === "auto");
           if (auto === "allow") {
             needApproval = false;
           } else if (auto === "deny") {
@@ -8946,7 +9330,7 @@ var init_toolExecution = __esm({
             }
           }
         }
-        if (!denied) {
+        if (!denied && !preHooksAdvanced) {
           let veto;
           try {
             veto = await runPreHooks(calledName, calledArgs, toolCtx);
@@ -8990,9 +9374,12 @@ ${result}`;
             result = `\u5DE5\u5177\u6267\u884C\u5931\u8D25: ${err instanceof Error ? err.message : String(err)}`;
             events({ sessionId, eventType: "tool.failed", metadata: { depth, decisionSource: llmDecisionSource, durationMs: performance.now() - startTime, round, tools_id: toolCall.id, toolName: calledName, toolSource: "builtin", ok: false, attempt: round }, payload: { output: result } });
           }
-          await runPostHooks(calledName, calledArgs, result, toolCtx).catch((e) => {
+          try {
+            const post = await runPostHooks(calledName, calledArgs, result, toolCtx);
+            postHookOverride = post?.resultOverride;
+          } catch (e) {
             console.warn(`\u26A0\uFE0F post-hook [${calledName}] \u5F02\u5E38\uFF08\u5DF2\u5FFD\u7565\uFF09:`, e?.message ?? e);
-          });
+          }
         }
       } else {
         result = `\u9519\u8BEF\uFF1A\u672A\u77E5\u5DE5\u5177 "${calledName}" \u6216\u8BE5\u5DE5\u5177\u65E0\u53EF\u6267\u884C\u51FD\u6570`;
@@ -9013,6 +9400,10 @@ ${result}`;
         } catch {
         }
       }
+      if (postHookOverride !== void 0) {
+        console.log(`\u270F\uFE0F [Post-hook] [${calledName}] \u6A21\u578B\u89C6\u56FE\u7ED3\u679C\u5DF2\u88AB hook \u6539\u5199`);
+        resultForModel = truncateToolResult(postHookOverride, matchedTool?.function?.maxOutputCharacters);
+      }
       return { toolCallId: toolCall.id, calledName, calledArgs, resultForModel, resultForUser, ok };
     };
   }
@@ -9536,6 +9927,18 @@ async function* runAgent(message, options) {
   let lastRealPromptTokens = persistedCalib.lastRealPromptTokens;
   let lastCachedTokens = persistedCalib.lastCachedTokens;
   const breaker = createRepeatBreaker({ sessionId, depth, llmDecisionSource, startTime, events });
+  const runId = createUUID();
+  let usageSum;
+  const addUsage = (u) => {
+    if (!u) return;
+    usageSum = {
+      prompt_tokens: (usageSum?.prompt_tokens ?? 0) + (u.prompt_tokens ?? 0),
+      completion_tokens: (usageSum?.completion_tokens ?? 0) + (u.completion_tokens ?? 0),
+      total_tokens: (usageSum?.total_tokens ?? 0) + (u.total_tokens ?? 0),
+      cached_tokens: (usageSum?.cached_tokens ?? 0) + (u.cached_tokens ?? 0)
+    };
+  };
+  await appendEvent(sessionId, { dscEvent: "run.start", runId, depth });
   try {
     while (true) {
       round++;
@@ -9563,6 +9966,14 @@ async function* runAgent(message, options) {
         yield { type: "final", text: lastContent || "\uFF08\u5DF2\u4E2D\u6B62\uFF09" };
         return;
       }
+      const inboxTexts = claimSessionInbox(sessionId);
+      if (inboxTexts.length > 0) {
+        for (const t of inboxTexts) {
+          message.push({ role: "user", content: t });
+          await appendMessage({ sessionId, role: "user", content: t });
+        }
+        yield { type: "inbox.claimed", texts: inboxTexts };
+      }
       yield { type: "round.start", round };
       try {
         await ensureFitsWindow(
@@ -9629,6 +10040,7 @@ async function* runAgent(message, options) {
         lastRealPromptTokens = infResult.usage.prompt_tokens;
         lastCachedTokens = infResult.usage.cached_tokens;
       }
+      addUsage(infResult.usage);
       const assistantMessage = infResult.assistantMessage;
       message.push(assistantMessage);
       await appendMessage({ ...assistantMessage, sessionId });
@@ -9637,6 +10049,7 @@ async function* runAgent(message, options) {
       }
       const tcCount = assistantMessage.tool_calls?.length ?? 0;
       if (!assistantMessage.tool_calls || assistantMessage.tool_calls.length === 0) {
+        await appendEvent(sessionId, { dscEvent: "round.end", runId, round, usage: infResult.usage });
         const finalText = (typeof assistantMessage.content === "string" ? assistantMessage.content : "") || "";
         const intercepted = nudges.interceptFinal(finalText, round);
         if (intercepted) continue;
@@ -9647,6 +10060,11 @@ async function* runAgent(message, options) {
       const repeatVerdict = breaker.check(assistantMessage.tool_calls, round, lastContent);
       if (repeatVerdict.tripped) {
         stopReason = "repeat";
+        for (const tc of assistantMessage.tool_calls) {
+          const ph = "\uFF08\u91CD\u590D\u8C03\u7528\u7194\u65AD\uFF0C\u672A\u6267\u884C\uFF09";
+          message.push({ role: "tool", tool_call_id: tc.id, content: ph });
+          await appendMessage({ sessionId, role: "tool", tool_call_id: tc.id, content: ph });
+        }
         yield { type: "final", text: repeatVerdict.text };
         return;
       }
@@ -9661,6 +10079,8 @@ async function* runAgent(message, options) {
         rawTools,
         events,
         permissionMode: options.permissionMode,
+        planMode: !!options.planMode,
+        // ★ P0-A runtime 档：计划期写工具在 processToolCall 执行层拒绝（工具表恒定不裁剪）
         onUIEvent: options.onUIEvent,
         requestApproval: options.requestApproval,
         requestQuestion: options.requestQuestion,
@@ -9678,6 +10098,7 @@ async function* runAgent(message, options) {
         yield { type: "final", text: scheduleResult.terminalText };
         return;
       }
+      await appendEvent(sessionId, { dscEvent: "round.end", runId, round, usage: infResult.usage });
     }
   } catch (toolErr) {
     if (signal?.aborted) {
@@ -9691,6 +10112,14 @@ async function* runAgent(message, options) {
 \uFF08\u5DE5\u5177\u6267\u884C\u5F02\u5E38\uFF1A${errMsg}\uFF09` };
     return;
   } finally {
+    try {
+      await flushLeftoverToTranscript(sessionId);
+    } catch {
+    }
+    try {
+      await appendEvent(sessionId, { dscEvent: "run.end", runId, stopReason: signal?.aborted ? "aborted" : stopReason, rounds: round, usage: usageSum });
+    } catch {
+    }
     try {
       const reason = signal?.aborted ? "aborted" : stopReason;
       await dispatch("Stop", { sessionId, cwd, lastText: lastContent || "", reason });
@@ -9706,6 +10135,8 @@ var init_runAgent = __esm({
   "../core/src/agent/runAgent.ts"() {
     "use strict";
     init_transcript();
+    init_inbox();
+    init_common();
     init_contextCore();
     init_store();
     init_truncate();
@@ -9718,17 +10149,30 @@ var init_runAgent = __esm({
   }
 });
 
-// ../core/src/session/content.ts
-var repairOrphanToolCalls, decayOldToolResults, buildContextMessages;
-var init_content = __esm({
-  "../core/src/session/content.ts"() {
+// ../core/src/session/recovery.ts
+var detectInterruption, repairOrphanToolCalls, reconcileCompaction, recoverSession;
+var init_recovery = __esm({
+  "../core/src/session/recovery.ts"() {
     "use strict";
-    init_contextCore();
     init_transcript();
     init_store();
-    init_config();
-    repairOrphanToolCalls = (msgs) => {
+    detectInterruption = (lines) => {
+      let sawEvents = false;
+      let lastStart;
+      const closed = /* @__PURE__ */ new Set();
+      for (const l of lines) {
+        if (!isEventLine(l)) continue;
+        sawEvents = true;
+        if (l.dscEvent === "run.start") lastStart = l;
+        else if (l.dscEvent === "run.end" || l.dscEvent === "run.abandoned") closed.add(l.runId);
+      }
+      if (!sawEvents || !lastStart) return { kind: "legacy" };
+      return closed.has(lastStart.runId) ? { kind: "clean" } : { kind: "crashed", runId: lastStart.runId };
+    };
+    repairOrphanToolCalls = (msgs, confirmedCrash) => {
+      const placeholder = confirmedCrash ? "\uFF08\u4E0A\u6B21\u4F1A\u8BDD\u5728\u5DE5\u5177\u6267\u884C\u4E2D\u5D29\u6E83\uFF08run \u672A\u95ED\u5408\uFF09\uFF0C\u8BE5\u8C03\u7528\u672A\u6267\u884C\uFF0C\u5DF2\u8DF3\u8FC7\u3002\uFF09" : "\uFF08\u8BE5\u5DE5\u5177\u8C03\u7528\u56E0\u4E0A\u6B21\u4F1A\u8BDD\u5F02\u5E38\u4E2D\u65AD\u672A\u7559\u4E0B\u7ED3\u679C\uFF0C\u5DF2\u8DF3\u8FC7\u3002\uFF09";
       const out = [];
+      const repairedToolCallIds = [];
       for (let i = 0; i < msgs.length; i++) {
         const m = msgs[i];
         out.push(m);
@@ -9741,13 +10185,60 @@ var init_content = __esm({
           }
           for (const tc of m.tool_calls) {
             if (tc.id && !answered.has(tc.id)) {
-              out.push({ role: "tool", tool_call_id: tc.id, content: "\uFF08\u8BE5\u5DE5\u5177\u8C03\u7528\u56E0\u4E0A\u6B21\u4F1A\u8BDD\u5F02\u5E38\u4E2D\u65AD\u672A\u7559\u4E0B\u7ED3\u679C\uFF0C\u5DF2\u8DF3\u8FC7\u3002\uFF09" });
+              out.push({ role: "tool", tool_call_id: tc.id, content: placeholder });
+              repairedToolCallIds.push(tc.id);
             }
           }
         }
       }
-      return out;
+      return { msgs: out, repairedToolCallIds, confirmedCrash };
     };
+    reconcileCompaction = (state, lines) => {
+      let last;
+      for (const l of lines) {
+        if (isEventLine(l) && l.dscEvent === "compaction") last = l;
+      }
+      if (!last) return { archivedMessageCount: state.archivedMessageCount, rollingSummary: state.rollingSummary, desync: "legacy" };
+      let desync = "none";
+      if (last.archivedMessageCount !== state.archivedMessageCount) {
+        desync = state.archivedMessageCount > last.archivedMessageCount ? "state-ahead" : "event-ahead";
+        console.warn(
+          `\u26A0\uFE0F [recovery] \u538B\u7F29\u72B6\u6001 desync\uFF08${desync}\uFF09\uFF1Astate.json archivedMessageCount=${state.archivedMessageCount} vs \u672B\u4E2A compaction \u4E8B\u4EF6=${last.archivedMessageCount}\u3002\u4EE5 state \u4E3A\u51C6\uFF08slice \u6267\u884C\u95F8\u95E8\uFF09\uFF0C\u4E8B\u4EF6\u4FA7\u4EC5\u955C\u50CF\u3002`
+        );
+      }
+      return { archivedMessageCount: state.archivedMessageCount, rollingSummary: state.rollingSummary, desync };
+    };
+    recoverSession = async (sessionId) => {
+      const lines = await readTranscriptLines(sessionId);
+      const interruption = detectInterruption(lines);
+      if (interruption.kind === "crashed") {
+        await appendEvent(sessionId, {
+          dscEvent: "run.abandoned",
+          runId: interruption.runId,
+          reason: "run.end missing: interrupted by process exit/kill"
+        });
+        console.warn(`\u27E6recovery\u27E7 \u68C0\u6D4B\u5230\u672A\u95ED\u5408 run\uFF08${interruption.runId.slice(0, 8)}\u2026\uFF09\u2192 \u5DF2\u8865 run.abandoned \u95ED\u5893\u6807\u8BB0\uFF1B\u5B64\u513F\u4FEE\u590D\u6309\u300C\u5D29\u6E83\u786E\u8BA4\u300D\u6863\u6267\u884C\u3002`);
+      }
+      const state = await getRollingState(sessionId);
+      const compaction = reconcileCompaction(
+        { archivedMessageCount: state.archivedMessageCount, rollingSummary: state.rollingSummary },
+        lines
+      );
+      return { interruption, compaction };
+    };
+  }
+});
+
+// ../core/src/session/content.ts
+var decayOldToolResults, buildContextMessages;
+var init_content = __esm({
+  "../core/src/session/content.ts"() {
+    "use strict";
+    init_contextCore();
+    init_transcript();
+    init_store();
+    init_config();
+    init_recovery();
     decayOldToolResults = (msgs) => {
       const units = groupUnits(msgs);
       const cutoffUnitIdx = Math.max(0, units.length - appConfig.KEEP_RECENT_UNITS);
@@ -9773,21 +10264,28 @@ var init_content = __esm({
       });
     };
     buildContextMessages = async (sessionId, currentUserMsg, systemPrompt) => {
-      const all = (await readMessages(sessionId)).map(cleanMsg);
+      const lines = await readTranscriptLines(sessionId);
       const store = await getRollingState(sessionId);
+      const eventAware = appConfig.transcriptEvents || lines.some(isEventLine);
+      const recovery = eventAware ? await recoverSession(sessionId) : {
+        interruption: { kind: "legacy" },
+        compaction: { archivedMessageCount: store.archivedMessageCount, rollingSummary: store.rollingSummary, desync: "legacy" }
+      };
+      const all = lines.filter((l) => !isEventLine(l)).map(cleanMsg);
       const result = [
         { role: "system", content: systemPrompt },
         // 存储系统提示词
-        { role: "system", content: store.rollingSummary }
+        { role: "system", content: recovery.compaction.rollingSummary }
         // 后续存储摘要使用
       ];
-      const archivedMessageCount = store.archivedMessageCount;
+      const archivedMessageCount = recovery.compaction.archivedMessageCount;
       const messageAll = all.slice(archivedMessageCount);
       if (messageAll.length === 0) {
         result.push(currentUserMsg);
         return result;
       }
-      result.push(...decayOldToolResults(repairOrphanToolCalls(messageAll)));
+      const repair = repairOrphanToolCalls(messageAll, recovery.interruption.kind === "crashed");
+      result.push(...decayOldToolResults(repair.msgs));
       result.push(currentUserMsg);
       return result;
     };
@@ -9851,7 +10349,8 @@ var init_subagent = __esm({
         parentSystemPrompt
       ].join("\n");
       const allTools = getGlobalTools();
-      const toolSchemas = manifest && manifest.tools.length > 0 ? allTools.filter((t) => manifest.tools.includes(t.function.name)) : allTools.filter((t) => !SUBAGENT_DENYLIST.has(t.function.name));
+      const wantsMcp = manifest?.tools.some((t) => t === "mcp_call" || t === "mcp_list_tools" || t.startsWith("mcp__")) ?? false;
+      const toolSchemas = manifest && manifest.tools.length > 0 ? allTools.filter((t) => manifest.tools.includes(t.function.name) || wantsMcp && (t.function.name === "mcp_call" || t.function.name === "mcp_list_tools")) : allTools.filter((t) => !SUBAGENT_DENYLIST.has(t.function.name));
       console.log(`\u{1F423} \u6D3E\u751F\u5B50 Agent [\u6DF1\u5EA6: ${ctx.depth + 1}/${MAX_AGENT_DEPTH}]${manifest ? ` \u58F0\u660E\u5F0F=${manifest.name}` : ""} \u4EFB\u52A1: "${task.slice(0, 50)}..."`);
       try {
         const subMessages = await buildContextMessages(subSessionId, { role: "user", content: task }, subSystem);
@@ -9917,7 +10416,7 @@ var init_subagent = __esm({
 // ../core/src/hooks/loader.ts
 import fs27 from "fs/promises";
 import path29 from "path";
-var readHooksConfig, appendValidated, validateRule, parseAgentDecision, compileRule2, loadHooks, initHooks;
+var readHooksConfig, appendValidated, validateRule, parseStdoutDecision, parseAgentDecision, compileRule2, loadHooks, initHooks;
 var init_loader4 = __esm({
   "../core/src/hooks/loader.ts"() {
     "use strict";
@@ -10061,6 +10560,24 @@ var init_loader4 = __esm({
         requireApproval: raw.requireApproval === true ? true : void 0
       };
     };
+    parseStdoutDecision = (stdout) => {
+      const s = (stdout ?? "").trim();
+      if (!s || !s.startsWith("{")) return void 0;
+      try {
+        const parsed = JSON.parse(s);
+        if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return void 0;
+        const out = {};
+        if (parsed.deny === true) {
+          out.deny = true;
+          if (typeof parsed.reason === "string" && parsed.reason) out.reason = parsed.reason;
+        }
+        if (parsed.argsOverride !== void 0) out.argsOverride = parsed.argsOverride;
+        if (typeof parsed.resultOverride === "string" && parsed.resultOverride) out.resultOverride = parsed.resultOverride;
+        return out.deny !== void 0 || out.argsOverride !== void 0 || out.resultOverride !== void 0 ? out : void 0;
+      } catch {
+        return void 0;
+      }
+    };
     parseAgentDecision = (output) => {
       const lines = (output ?? "").split(/\r?\n/);
       for (let i = lines.length - 1; i >= 0; i--) {
@@ -10129,9 +10646,15 @@ var init_loader4 = __esm({
             }
             try {
               const parsed = JSON.parse(res.responseBody);
-              if (parsed && typeof parsed === "object" && parsed.deny === true) {
-                const reason = typeof parsed.reason === "string" ? parsed.reason : `hook http \u62D2\u7EDD\uFF08status ${res.status}\uFF09`;
-                return { deny: true, reason };
+              if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+                if (parsed.deny === true) {
+                  const reason = typeof parsed.reason === "string" ? parsed.reason : `hook http \u62D2\u7EDD\uFF08status ${res.status}\uFF09`;
+                  return { deny: true, reason };
+                }
+                const out = {};
+                if (parsed.argsOverride !== void 0) out.argsOverride = parsed.argsOverride;
+                if (typeof parsed.resultOverride === "string" && parsed.resultOverride) out.resultOverride = parsed.resultOverride;
+                if (out.argsOverride !== void 0 || out.resultOverride !== void 0) return out;
               }
             } catch {
             }
@@ -10160,6 +10683,10 @@ var init_loader4 = __esm({
             const detail = res.stderr ? `\uFF1A${res.stderr.slice(0, 200)}` : "";
             return { deny: true, reason: `hook \u9000\u51FA\u7801 ${res.exitCode}${detail}` };
           }
+          if (res.exitCode === 0) {
+            const out = parseStdoutDecision(res.stdout);
+            if (out) return out;
+          }
           return { deny: false };
         }
       };
@@ -10394,9 +10921,9 @@ var init_loader6 = __esm({
         );
         for (const { item: m, file, source } of picked) {
           if (m.tools.length > 0) {
-            const unknown = m.tools.filter((t) => !known.has(t));
+            const unknown = m.tools.filter((t) => !known.has(t) && !t.startsWith("mcp__"));
             if (unknown.length) console.warn(`\u26A0\uFE0F [agents] ${m.name} \u58F0\u660E\u4E86\u672A\u77E5\u5DE5\u5177 [${unknown.join(", ")}]\uFF0C\u5DF2\u5254\u9664`);
-            m.tools = m.tools.filter((t) => known.has(t));
+            m.tools = m.tools.filter((t) => known.has(t) || t.startsWith("mcp__"));
           }
           if (source === "project") {
             console.warn(`\u26A0\uFE0F\u3010\u5B89\u5168\u63D0\u793A\u3011\u5DF2\u52A0\u8F7D\u9879\u76EE\u7EA7\u58F0\u660E\u5F0F\u5B50 Agent [${m.name}]\uFF08${file}\uFF09\u3002\u5176 tools \u767D\u540D\u5355\u53EF\u663E\u5F0F\u6388\u6743\u9AD8\u5371\u5DE5\u5177\uFF0C\u8BF7\u5728\u4FE1\u4EFB\u8BE5\u9879\u76EE\u65F6\u542F\u7528\uFF1B\u514B\u9686\u672A\u77E5\u4ED3\u5E93\u524D\u8BF7\u6838\u67E5 .deepseeker-code/agents/\u3002`);
@@ -11262,6 +11789,124 @@ ${lines.join("\n")}
   }
 });
 
+// ../core/src/session/fork.ts
+import fs37 from "fs/promises";
+var listForkAnchors, derivePrefix, forkSession;
+var init_fork = __esm({
+  "../core/src/session/fork.ts"() {
+    "use strict";
+    init_common();
+    init_transcript();
+    init_store();
+    listForkAnchors = (lines) => {
+      const anchors = [];
+      let lastUser = "";
+      for (const l of lines) {
+        if (isEventLine(l)) continue;
+        const row = l;
+        if (row?.role === "user") {
+          lastUser = typeof row.content === "string" ? row.content : "";
+        } else if (row?.role === "assistant") {
+          const content = typeof row.content === "string" ? row.content : "";
+          const names = Array.isArray(row.tool_calls) ? row.tool_calls.map((tc) => tc?.function?.name ?? "").filter(Boolean).join(", ") : "";
+          anchors.push({
+            lineId: row.id,
+            roundNo: anchors.length + 1,
+            userPreview: lastUser,
+            assistantPreview: content || (names ? `\u{1F527} ${names}` : "(\u7A7A\u56DE\u590D)")
+          });
+        }
+      }
+      return anchors;
+    };
+    derivePrefix = (lines, upToLineId) => {
+      let endIdx = lines.length - 1;
+      if (upToLineId !== void 0) {
+        const idx = lines.findIndex((l) => l?.id === upToLineId);
+        if (idx < 0) throw new Error(`upToLineId\uFF08${upToLineId}\uFF09\u5728\u6E90\u4F1A\u8BDD\u8F6C\u5F55\u4E2D\u672A\u627E\u5230`);
+        endIdx = idx;
+      } else {
+        let lastEnd = -1;
+        let lastStart = -1;
+        lines.forEach((l, i) => {
+          if (!isEventLine(l)) return;
+          if (l.dscEvent === "run.end" || l.dscEvent === "run.abandoned") lastEnd = i;
+          else if (l.dscEvent === "run.start") lastStart = i;
+        });
+        if (lastEnd >= 0) endIdx = lastEnd;
+        else if (lastStart >= 0) endIdx = lastStart - 1;
+      }
+      const prefix = endIdx < 0 ? [] : lines.slice(0, endIdx + 1);
+      let archivedMessageCount = 0;
+      let rollingSummary = "";
+      let lastStartRunId;
+      const closed = /* @__PURE__ */ new Set();
+      for (const l of prefix) {
+        if (!isEventLine(l)) continue;
+        if (l.dscEvent === "compaction") {
+          archivedMessageCount = l.archivedMessageCount;
+          rollingSummary = l.summary;
+        } else if (l.dscEvent === "run.start") {
+          lastStartRunId = l.runId;
+        } else if (l.dscEvent === "run.end" || l.dscEvent === "run.abandoned") {
+          closed.add(l.runId);
+        }
+      }
+      const unclosedRunId = lastStartRunId && !closed.has(lastStartRunId) ? lastStartRunId : void 0;
+      return { lines: prefix, archivedMessageCount, rollingSummary, unclosedRunId };
+    };
+    forkSession = async (sourceId, upToLineId) => {
+      assertSafeSessionId(sourceId);
+      const lines = await readTranscriptLines(sourceId);
+      if (lines.length === 0) throw new Error("\u6E90\u4F1A\u8BDD\u4E0D\u5B58\u5728\u6216\u8F6C\u5F55\u4E3A\u7A7A");
+      const prefix = derivePrefix(lines, upToLineId);
+      const newId = createUUID();
+      await ensureSessionsDir(newId);
+      const rawText = await fs37.readFile(getTranscriptPath(sourceId), "utf-8");
+      const kept = [];
+      let good = 0;
+      for (const s of rawText.split("\n")) {
+        if (good >= prefix.lines.length) break;
+        kept.push(s);
+        const t = s.trim();
+        if (!t) continue;
+        try {
+          JSON.parse(t);
+          good++;
+        } catch {
+        }
+      }
+      let payload = kept.join("\n");
+      if (payload.length > 0 && !payload.endsWith("\n")) payload += "\n";
+      await fs37.writeFile(getTranscriptPath(newId), payload, "utf-8");
+      const srcState = await readStore(sourceId);
+      const srcRolling = await getRollingState(sourceId);
+      const legacy = !lines.some(isEventLine);
+      const wholeFile = prefix.lines.length === lines.length;
+      const archivedMessageCount = legacy && wholeFile ? srcRolling.archivedMessageCount : prefix.archivedMessageCount;
+      const rollingSummary = legacy && wholeFile ? srcRolling.rollingSummary : prefix.rollingSummary;
+      const srcTitle = typeof srcState?.title === "string" && srcState.title ? srcState.title : "\u4F1A\u8BDD";
+      await writeStore(newId, {
+        sessionId: newId,
+        createAt: (/* @__PURE__ */ new Date()).toISOString(),
+        updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
+        archivedMessageCount,
+        rollingSummary,
+        consecutiveFailures: 0,
+        title: `${srcTitle}(\u5206\u53C9)`.slice(0, 200),
+        // ★ 校准数据透传：fork 首轮压缩判定不从 1.4 重来（纯收益，语义同源会话续接）
+        calibRatio: srcRolling.calibRatio,
+        lastRealPromptTokens: srcRolling.lastRealPromptTokens,
+        lastCachedTokens: srcRolling.lastCachedTokens
+      });
+      if (prefix.unclosedRunId) {
+        await appendEvent(newId, { dscEvent: "run.abandoned", runId: prefix.unclosedRunId, reason: "forked from interrupted run" });
+      }
+      return { sessionId: newId, copiedLines: prefix.lines.length, archivedMessageCount };
+    };
+  }
+});
+
 // src/cliHost.ts
 var createCliRequestApproval, createCliRequestQuestion;
 var init_cliHost = __esm({
@@ -11346,13 +11991,47 @@ var init_util = __esm({
 
 // src/replay.ts
 var buildReplayRows;
-var init_replay = __esm({
+var init_replay2 = __esm({
   "src/replay.ts"() {
     "use strict";
-    buildReplayRows = (msgs, nid) => {
+    init_transcript();
+    buildReplayRows = (lines, nid) => {
       const rows = [];
       const pending = /* @__PURE__ */ new Map();
-      for (const m of msgs) {
+      let lastStartRunId;
+      const closedRuns = /* @__PURE__ */ new Set();
+      const attachUsage = (u) => {
+        for (let i = rows.length - 1; i >= 0; i--) {
+          const r = rows[i];
+          if (r.kind === "assistant") {
+            rows[i] = {
+              ...r,
+              usage: {
+                ...r.usage ?? {},
+                prompt_tokens: u.prompt_tokens,
+                completion_tokens: u.completion_tokens,
+                total_tokens: u.total_tokens,
+                prompt_cache_hit_tokens: u.cached_tokens
+              }
+            };
+            return;
+          }
+        }
+      };
+      for (const line of lines) {
+        if (isEventLine(line)) {
+          if (line.dscEvent === "run.start") lastStartRunId = line.runId;
+          else if (line.dscEvent === "run.end" || line.dscEvent === "run.abandoned") closedRuns.add(line.runId);
+          if ((line.dscEvent === "round.end" || line.dscEvent === "run.end") && line.usage && (line.usage.prompt_tokens != null || line.usage.total_tokens != null)) {
+            const last = [...rows].reverse().find((r) => r.kind === "assistant");
+            if (line.dscEvent === "round.end" || !last?.usage) attachUsage(line.usage);
+          }
+          if (line.dscEvent === "run.abandoned") {
+            rows.push({ id: nid(), kind: "info", text: "\u26A0\uFE0F \u6B64\u56DE\u5408\u88AB\u4E2D\u65AD\uFF0C\u672A\u5B8C\u6210" });
+          }
+          continue;
+        }
+        const m = line;
         const role = m?.role;
         if (role === "user") {
           const text = typeof m.content === "string" ? m.content : Array.isArray(m.content) ? m.content.filter((p) => typeof p?.text === "string").map((p) => p.text).join("") : "";
@@ -11402,6 +12081,9 @@ var init_replay = __esm({
           rows[idx] = { ...r, result: r.result ?? "", ok: false, status: "done" };
         }
       }
+      if (lastStartRunId && !closedRuns.has(lastStartRunId)) {
+        rows.push({ id: nid(), kind: "info", text: "\u26A0\uFE0F \u6B64\u56DE\u5408\u88AB\u4E2D\u65AD\uFF0C\u672A\u5B8C\u6210" });
+      }
       return rows;
     };
   }
@@ -11416,13 +12098,15 @@ var init_useChatState = __esm({
     init_chatProcessing();
     init_store();
     init_transcript();
+    init_fork();
+    init_inbox();
     init_contextCore();
     init_createModel();
     init_tool();
     init_cliHost();
     init_strings();
     init_util();
-    init_replay();
+    init_replay2();
     FLUSH_MS = 120;
     ABORT_GRACE_MS = 8e3;
     ENTER_PLAN_RESEARCH_PROMPT = "\uFF08\u5DF2\u8FDB\u5165\u8BA1\u5212\u6A21\u5F0F\u3002\u8BF7\u4EE5\u53EA\u8BFB\u65B9\u5F0F\u5B8C\u6210\u8C03\u7814\uFF0C\u7136\u540E\u8C03\u7528 exit_plan_mode \u63D0\u4EA4\u5B8C\u6574\u5B9E\u73B0\u65B9\u6848\u3002\uFF09";
@@ -11440,6 +12124,7 @@ var init_useChatState = __esm({
       const [pendingQuestion, setPendingQuestion] = useState(null);
       const [pendingPlan, setPendingPlan] = useState(null);
       const [pendingSessions, setPendingSessions] = useState(null);
+      const [pendingFork, setPendingFork] = useState(null);
       const nextId = useRef(1);
       const assistantStreamingId = useRef(null);
       const thinkingStreamingId = useRef(null);
@@ -11452,6 +12137,7 @@ var init_useChatState = __esm({
       const currentAcRef = useRef(null);
       const turnGenRef = useRef(0);
       const abortGuardRef = useRef(null);
+      const queuedUnclaimedRef = useRef(0);
       const proposedPlanRef = useRef(null);
       const enterPlanReasonRef = useRef(null);
       const modelRef = useRef("");
@@ -11466,8 +12152,8 @@ var init_useChatState = __esm({
         if (!initialSessionId) return;
         void (async () => {
           try {
-            const msgs = await readMessages(initialSessionId);
-            const seeded = buildReplayRows(msgs, newRowId);
+            const lines = await readTranscriptLines(initialSessionId);
+            const seeded = buildReplayRows(lines, newRowId);
             if (seeded.length) setRows(seeded);
           } catch {
           }
@@ -11650,10 +12336,18 @@ var init_useChatState = __esm({
           }
           case "approval_request":
             break;
+          case "inbox.claimed": {
+            const n = Array.isArray(obj.texts) ? obj.texts.length : 0;
+            if (n > 0) {
+              queuedUnclaimedRef.current = Math.max(0, queuedUnclaimedRef.current - n);
+              pushInfo(S.inboxClaimed(n));
+            }
+            break;
+          }
           default:
             break;
         }
-      }, [closeStreaming, flush, scheduleFlush]);
+      }, [closeStreaming, flush, scheduleFlush, pushInfo]);
       const askApproval = useCallback((detail, toolName) => new Promise((resolve) => setPendingApproval({ detail, toolName, resolve })), []);
       const resolveApproval = useCallback((v) => {
         setPendingApproval((prev) => {
@@ -11733,9 +12427,13 @@ var init_useChatState = __esm({
               clearTimeout(abortGuardRef.current);
               abortGuardRef.current = null;
             }
+            if (queuedUnclaimedRef.current > 0) {
+              pushInfo(S.inboxCarryover(queuedUnclaimedRef.current));
+              queuedUnclaimedRef.current = 0;
+            }
           }
         }
-      }, [askApproval, autoRequestApproval, flush, onTrace, pushEvent]);
+      }, [askApproval, autoRequestApproval, flush, onTrace, pushEvent, pushInfo]);
       const approveAndImplement = useCallback(async (sid, plan) => {
         const res = await setPlan(plan);
         if (res.action === "accept") {
@@ -11753,6 +12451,15 @@ ${finalPlan}`, false, res.autoExecute);
         const plan = takeProposedPlan();
         if (plan != null) await approveAndImplement(sid, plan);
       }, [runOnce, takeProposedPlan, approveAndImplement]);
+      const queueInput = useCallback((content) => {
+        const text = content.trim();
+        const sid = sessionIdRef.current;
+        if (!text || !sid || !pushSessionInbox(sid, text)) return false;
+        pushUser(text);
+        pushInfo(S.inboxQueued);
+        queuedUnclaimedRef.current++;
+        return true;
+      }, [pushUser, pushInfo]);
       const submit = useCallback(async (content) => {
         const text = content.trim();
         if (!text || busy) return;
@@ -11813,8 +12520,8 @@ ${finalPlan}`, false, res.autoExecute);
         sessionIdRef.current = id;
         clearRows();
         try {
-          const msgs = await readMessages(id);
-          const seeded = buildReplayRows(msgs, newRowId);
+          const lines = await readTranscriptLines(id);
+          const seeded = buildReplayRows(lines, newRowId);
           if (seeded.length) setRows(seeded);
         } catch {
         }
@@ -11835,6 +12542,37 @@ ${finalPlan}`, false, res.autoExecute);
         const picked = await new Promise((resolve) => setPendingSessions({ sessions: sessions2, resolve }));
         if (picked) await loadSession(picked);
       }, [pushInfo, loadSession]);
+      const resolveFork = useCallback((anchor) => {
+        setPendingFork((prev) => {
+          prev?.resolve(anchor);
+          return null;
+        });
+      }, []);
+      const openForkPicker = useCallback(async () => {
+        const sid = sessionIdRef.current;
+        if (!sid) {
+          pushInfo(S.forkEmpty);
+          return;
+        }
+        let anchors = [];
+        try {
+          anchors = listForkAnchors(await readTranscriptLines(sid));
+        } catch {
+        }
+        if (anchors.length === 0) {
+          pushInfo(S.forkEmpty);
+          return;
+        }
+        const picked = await new Promise((resolve) => setPendingFork({ anchors, resolve }));
+        if (!picked) return;
+        try {
+          const r = await forkSession(sid, picked.lineId);
+          await loadSession(r.sessionId);
+          pushInfo(S.forkDone(truncateMiddle(r.sessionId, 12), picked.roundNo));
+        } catch (e) {
+          pushInfo(S.forkFailed(e?.message ?? String(e)));
+        }
+      }, [pushInfo, loadSession]);
       const setModelOverride = useCallback((m) => {
         modelRef.current = m;
       }, []);
@@ -11864,9 +12602,11 @@ ${finalPlan}`, false, res.autoExecute);
         pendingQuestion,
         pendingPlan,
         pendingSessions,
+        pendingFork,
         sessionIdRef,
         // 动作
         submit,
+        queueInput,
         abortCurrent,
         pushUser,
         pushInfo,
@@ -11889,7 +12629,9 @@ ${finalPlan}`, false, res.autoExecute);
         getOutputStyle: getOutputStyle2,
         openSessionPicker,
         resolveSession,
-        loadSession
+        loadSession,
+        openForkPicker,
+        resolveFork
       };
     };
   }
@@ -12491,9 +13233,45 @@ var init_SessionPicker = __esm({
   }
 });
 
-// src/components/SlashMenu.tsx
+// src/components/ForkPicker.tsx
 import { Box as Box11, Text as Text13 } from "ink";
 import { jsx as jsx13, jsxs as jsxs11 } from "react/jsx-runtime";
+var PAGE_SIZE2, ForkPicker;
+var init_ForkPicker = __esm({
+  "src/components/ForkPicker.tsx"() {
+    "use strict";
+    init_theme();
+    init_strings();
+    init_util();
+    PAGE_SIZE2 = 8;
+    ForkPicker = ({ anchors, selectedIndex, wrapW }) => {
+      const start = Math.floor(selectedIndex / PAGE_SIZE2) * PAGE_SIZE2;
+      const visible = anchors.slice(start, start + PAGE_SIZE2);
+      const contentW = Math.max(24, wrapW);
+      const userW = Math.max(10, Math.floor(contentW * 0.45));
+      const replyW = Math.max(10, contentW - userW - 4);
+      return /* @__PURE__ */ jsxs11(Box11, { flexDirection: "column", borderStyle: "round", borderColor: THEME.blue, paddingX: 1, paddingY: 1, marginTop: 1, children: [
+        /* @__PURE__ */ jsx13(Text13, { color: THEME.blue, bold: true, children: S.forkTitle }),
+        /* @__PURE__ */ jsx13(Text13, { color: THEME.grayDim, children: S.forkPrompt }),
+        /* @__PURE__ */ jsx13(Box11, { flexDirection: "column", marginTop: 0.5, children: visible.map((a, i) => {
+          const active = start + i === selectedIndex;
+          const user = truncateMiddle(a.userPreview || "(\u65E0\u63D0\u95EE)", userW);
+          const reply = truncateMiddle(a.assistantPreview, replyW);
+          return /* @__PURE__ */ jsxs11(Box11, { flexDirection: "row", children: [
+            /* @__PURE__ */ jsx13(Text13, { color: active ? THEME.coralBright : void 0, bold: true, children: active ? "\u203A " : "  " }),
+            /* @__PURE__ */ jsx13(Text13, { color: active ? THEME.white : THEME.gray, bold: active, children: `#${a.roundNo} ${user}` }),
+            /* @__PURE__ */ jsx13(Text13, { color: THEME.grayDim, children: ` \u2192 ${reply}` })
+          ] }, a.lineId);
+        }) }),
+        anchors.length > PAGE_SIZE2 ? /* @__PURE__ */ jsx13(Text13, { color: THEME.grayDim, children: `\u7B2C ${start + 1}-${Math.min(start + PAGE_SIZE2, anchors.length)} / ${anchors.length} \u4E2A\uFF08\u2191\u2193 \u9009\u62E9\xB7\u81EA\u52A8\u7FFB\u9875\uFF09` }) : null
+      ] });
+    };
+  }
+});
+
+// src/components/SlashMenu.tsx
+import { Box as Box12, Text as Text14 } from "ink";
+import { jsx as jsx14, jsxs as jsxs12 } from "react/jsx-runtime";
 var MAX_ROWS, SlashMenu;
 var init_SlashMenu = __esm({
   "src/components/SlashMenu.tsx"() {
@@ -12505,22 +13283,22 @@ var init_SlashMenu = __esm({
       const more = entries.length > MAX_ROWS;
       const cmdW = Math.min(22, Math.max(8, ...visible.map((e) => e.name.length)) + 1);
       const descMax = Math.max(12, cols - cmdW - 6);
-      return /* @__PURE__ */ jsxs11(Box11, { flexDirection: "column", borderStyle: "round", borderColor: THEME.coral, paddingX: 1, paddingY: 0, marginTop: 1, children: [
+      return /* @__PURE__ */ jsxs12(Box12, { flexDirection: "column", borderStyle: "round", borderColor: THEME.coral, paddingX: 1, paddingY: 0, marginTop: 1, children: [
         visible.map((e, i) => {
           const active = i === selectedIndex;
           const desc = e.description.length > descMax ? `${e.description.slice(0, descMax - 1)}\u2026` : e.description;
           const gap = Math.max(1, cmdW - e.name.length);
-          return /* @__PURE__ */ jsxs11(Box11, { flexDirection: "row", children: [
-            /* @__PURE__ */ jsx13(Text13, { color: active ? THEME.coralBright : void 0, bold: true, children: active ? "\u276F " : "  " }),
-            /* @__PURE__ */ jsxs11(Text13, { color: active ? THEME.white : THEME.gray, bold: active, children: [
+          return /* @__PURE__ */ jsxs12(Box12, { flexDirection: "row", children: [
+            /* @__PURE__ */ jsx14(Text14, { color: active ? THEME.coralBright : void 0, bold: true, children: active ? "\u276F " : "  " }),
+            /* @__PURE__ */ jsxs12(Text14, { color: active ? THEME.white : THEME.gray, bold: active, children: [
               "/",
               e.name
             ] }),
-            /* @__PURE__ */ jsx13(Text13, { color: THEME.grayDim, children: " ".repeat(gap) }),
-            /* @__PURE__ */ jsx13(Text13, { color: active ? THEME.gray : THEME.grayDim, children: desc })
+            /* @__PURE__ */ jsx14(Text14, { color: THEME.grayDim, children: " ".repeat(gap) }),
+            /* @__PURE__ */ jsx14(Text14, { color: active ? THEME.gray : THEME.grayDim, children: desc })
           ] }, e.name);
         }),
-        more ? /* @__PURE__ */ jsxs11(Text13, { color: THEME.coralMuted, children: [
+        more ? /* @__PURE__ */ jsxs12(Text14, { color: THEME.coralMuted, children: [
           "\u2026 \u8FD8\u6709 ",
           entries.length - MAX_ROWS,
           " \u6761"
@@ -12531,8 +13309,8 @@ var init_SlashMenu = __esm({
 });
 
 // src/components/StatusStrip.tsx
-import { Box as Box12, Text as Text14 } from "ink";
-import { jsx as jsx14, jsxs as jsxs12 } from "react/jsx-runtime";
+import { Box as Box13, Text as Text15 } from "ink";
+import { jsx as jsx15, jsxs as jsxs13 } from "react/jsx-runtime";
 var StatusStrip;
 var init_StatusStrip = __esm({
   "src/components/StatusStrip.tsx"() {
@@ -12549,18 +13327,18 @@ var init_StatusStrip = __esm({
         `state: ${stateText}`,
         sessionShort ? `session: ${sessionShort}` : ""
       ].filter(Boolean);
-      return /* @__PURE__ */ jsxs12(Box12, { flexDirection: "column", flexShrink: 0, children: [
-        /* @__PURE__ */ jsx14(Text14, { color: THEME.coralMuted, children: customLine && customLine.trim() ? customLine : bits.join("   \xB7   ") }),
-        /* @__PURE__ */ jsx14(Text14, { color: stateColor, children: "" }),
-        /* @__PURE__ */ jsx14(Text14, { color: THEME.grayDim, children: S.cmdHint })
+      return /* @__PURE__ */ jsxs13(Box13, { flexDirection: "column", flexShrink: 0, children: [
+        /* @__PURE__ */ jsx15(Text15, { color: THEME.coralMuted, children: customLine && customLine.trim() ? customLine : bits.join("   \xB7   ") }),
+        /* @__PURE__ */ jsx15(Text15, { color: stateColor, children: "" }),
+        /* @__PURE__ */ jsx15(Text15, { color: THEME.grayDim, children: S.cmdHint })
       ] });
     };
   }
 });
 
 // src/components/TopPanel.tsx
-import { Box as Box13, Text as Text15 } from "ink";
-import { jsx as jsx15, jsxs as jsxs13 } from "react/jsx-runtime";
+import { Box as Box14, Text as Text16 } from "ink";
+import { jsx as jsx16, jsxs as jsxs14 } from "react/jsx-runtime";
 var ROBOT, INNER_H, TopPanel;
 var init_TopPanel = __esm({
   "src/components/TopPanel.tsx"() {
@@ -12580,36 +13358,36 @@ var init_TopPanel = __esm({
       const leftW = Math.floor(innerW * 0.33);
       const rightW = innerW - leftW - 1;
       const ruleLen = Math.max(8, rightW - 2);
-      const VDivider = /* @__PURE__ */ jsx15(Box13, { flexDirection: "column", width: 1, flexShrink: 0, children: Array.from({ length: INNER_H }).map((_, i) => /* @__PURE__ */ jsx15(Text15, { color: THEME.coral, children: "\u2502" }, i)) });
-      return /* @__PURE__ */ jsxs13(Box13, { flexDirection: "column", width: panelW, marginBottom: 1, children: [
-        /* @__PURE__ */ jsxs13(Text15, { children: [
-          /* @__PURE__ */ jsx15(Text15, { color: THEME.coralBright, bold: true, children: "* Welcome to " }),
-          /* @__PURE__ */ jsx15(Text15, { bold: true, color: THEME.white, children: "deep" }),
-          /* @__PURE__ */ jsx15(Text15, { bold: true, color: THEME.coralBright, children: "Seek" }),
-          /* @__PURE__ */ jsx15(Text15, { bold: true, color: THEME.white, children: "Code" }),
-          /* @__PURE__ */ jsxs13(Text15, { color: THEME.coralMuted, children: [
+      const VDivider = /* @__PURE__ */ jsx16(Box14, { flexDirection: "column", width: 1, flexShrink: 0, children: Array.from({ length: INNER_H }).map((_, i) => /* @__PURE__ */ jsx16(Text16, { color: THEME.coral, children: "\u2502" }, i)) });
+      return /* @__PURE__ */ jsxs14(Box14, { flexDirection: "column", width: panelW, marginBottom: 1, children: [
+        /* @__PURE__ */ jsxs14(Text16, { children: [
+          /* @__PURE__ */ jsx16(Text16, { color: THEME.coralBright, bold: true, children: "* Welcome to " }),
+          /* @__PURE__ */ jsx16(Text16, { bold: true, color: THEME.white, children: "deep" }),
+          /* @__PURE__ */ jsx16(Text16, { bold: true, color: THEME.coralBright, children: "Seek" }),
+          /* @__PURE__ */ jsx16(Text16, { bold: true, color: THEME.white, children: "Code" }),
+          /* @__PURE__ */ jsxs14(Text16, { color: THEME.coralMuted, children: [
             "  ",
             VERSION
           ] })
         ] }),
-        /* @__PURE__ */ jsx15(Text15, { color: THEME.grayDim, children: cwd }),
-        /* @__PURE__ */ jsxs13(Box13, { flexDirection: "row", borderStyle: "round", borderColor: THEME.coral, marginTop: 1, paddingX: 0, paddingY: 0, children: [
-          /* @__PURE__ */ jsxs13(Box13, { flexDirection: "column", width: leftW, height: INNER_H, alignItems: "center", justifyContent: "center", children: [
-            /* @__PURE__ */ jsx15(Text15, { color: THEME.white, bold: true, children: "Welcome back!" }),
-            ROBOT.map((l, i) => /* @__PURE__ */ jsx15(Text15, { color: THEME.coralBright, children: l }, i)),
-            /* @__PURE__ */ jsx15(Text15, { color: THEME.grayDim, children: "Ctrl+C \u9000\u51FA \xB7 Esc \u4E2D\u6B62" }),
-            /* @__PURE__ */ jsx15(Text15, { color: THEME.grayDim, children: "\u8F93\u5165 / \u67E5\u770B\u547D\u4EE4" })
+        /* @__PURE__ */ jsx16(Text16, { color: THEME.grayDim, children: cwd }),
+        /* @__PURE__ */ jsxs14(Box14, { flexDirection: "row", borderStyle: "round", borderColor: THEME.coral, marginTop: 1, paddingX: 0, paddingY: 0, children: [
+          /* @__PURE__ */ jsxs14(Box14, { flexDirection: "column", width: leftW, height: INNER_H, alignItems: "center", justifyContent: "center", children: [
+            /* @__PURE__ */ jsx16(Text16, { color: THEME.white, bold: true, children: "Welcome back!" }),
+            ROBOT.map((l, i) => /* @__PURE__ */ jsx16(Text16, { color: THEME.coralBright, children: l }, i)),
+            /* @__PURE__ */ jsx16(Text16, { color: THEME.grayDim, children: "Ctrl+C \u9000\u51FA \xB7 Esc \u4E2D\u6B62" }),
+            /* @__PURE__ */ jsx16(Text16, { color: THEME.grayDim, children: "\u8F93\u5165 / \u67E5\u770B\u547D\u4EE4" })
           ] }),
           VDivider,
-          /* @__PURE__ */ jsxs13(Box13, { flexDirection: "column", width: rightW, height: INNER_H, justifyContent: "space-between", paddingX: 1, children: [
-            /* @__PURE__ */ jsxs13(Box13, { flexDirection: "column", children: [
-              /* @__PURE__ */ jsx15(Text15, { color: THEME.coralBright, bold: true, children: "Tips for getting started" }),
-              /* @__PURE__ */ jsx15(Text15, { color: THEME.white, children: "\u8F93\u5165\u9700\u6C42\u5F00\u59CB\uFF0C\u8F93\u5165 / \u5524\u51FA\u547D\u4EE4\u3002" })
+          /* @__PURE__ */ jsxs14(Box14, { flexDirection: "column", width: rightW, height: INNER_H, justifyContent: "space-between", paddingX: 1, children: [
+            /* @__PURE__ */ jsxs14(Box14, { flexDirection: "column", children: [
+              /* @__PURE__ */ jsx16(Text16, { color: THEME.coralBright, bold: true, children: "Tips for getting started" }),
+              /* @__PURE__ */ jsx16(Text16, { color: THEME.white, children: "\u8F93\u5165\u9700\u6C42\u5F00\u59CB\uFF0C\u8F93\u5165 / \u5524\u51FA\u547D\u4EE4\u3002" })
             ] }),
-            /* @__PURE__ */ jsx15(Text15, { color: THEME.grayDim, children: "\u2500".repeat(ruleLen) }),
-            /* @__PURE__ */ jsxs13(Box13, { flexDirection: "column", children: [
-              /* @__PURE__ */ jsx15(Text15, { color: THEME.coralBright, bold: true, children: "What's new" }),
-              /* @__PURE__ */ jsx15(Text15, { color: THEME.white, children: "\u5DF2\u5BF9\u63A5\u672C\u5730 Tool Call \u667A\u80FD\u51FD\u6570\u8C03\u7528\u3002" })
+            /* @__PURE__ */ jsx16(Text16, { color: THEME.grayDim, children: "\u2500".repeat(ruleLen) }),
+            /* @__PURE__ */ jsxs14(Box14, { flexDirection: "column", children: [
+              /* @__PURE__ */ jsx16(Text16, { color: THEME.coralBright, bold: true, children: "What's new" }),
+              /* @__PURE__ */ jsx16(Text16, { color: THEME.white, children: "\u5DF2\u5BF9\u63A5\u672C\u5730 Tool Call \u667A\u80FD\u51FD\u6570\u8C03\u7528\u3002" })
             ] })
           ] })
         ] })
@@ -12619,7 +13397,7 @@ var init_TopPanel = __esm({
 });
 
 // src/inspect.ts
-import fs37 from "fs";
+import fs38 from "fs";
 var CWD, fmt, readTrace, inspectUsage, inspectContext, inspectPermissions, inspectMcp, inspectHooks, inspectDebug;
 var init_inspect = __esm({
   "src/inspect.ts"() {
@@ -12637,7 +13415,7 @@ var init_inspect = __esm({
       if (!sessionId) return [];
       try {
         const p = await getTraceStorePath(sessionId);
-        const text = await fs37.promises.readFile(p, "utf8");
+        const text = await fs38.promises.readFile(p, "utf8");
         const out = [];
         for (const line of text.split("\n")) {
           if (!line.trim()) continue;
@@ -12760,8 +13538,8 @@ __export(App_exports, {
   App: () => App
 });
 import { useCallback as useCallback2, useEffect as useEffect4, useMemo, useRef as useRef2, useState as useState4 } from "react";
-import { Box as Box14, Static, Text as Text16, useApp, useInput as useInput2, useStdout } from "ink";
-import { jsx as jsx16, jsxs as jsxs14 } from "react/jsx-runtime";
+import { Box as Box15, Static, Text as Text17, useApp, useInput as useInput2, useStdout } from "ink";
+import { jsx as jsx17, jsxs as jsxs15 } from "react/jsx-runtime";
 var KNOWN_MODELS, CWD2, RowView, isDynamicRow, App;
 var init_App = __esm({
   "src/App.tsx"() {
@@ -12786,6 +13564,7 @@ var init_App = __esm({
     init_PlanModal();
     init_PlanEditor();
     init_SessionPicker();
+    init_ForkPicker();
     init_SlashMenu();
     init_MultilineInput();
     init_StatusStrip();
@@ -12794,16 +13573,16 @@ var init_App = __esm({
     KNOWN_MODELS = ["deepseek-v4", "deepseek-v4-flash"];
     CWD2 = process.cwd();
     RowView = ({ row, wrapW, streamTail, showThinking }) => {
-      if (row.kind === "todos") return /* @__PURE__ */ jsx16(TodosPanel, { todos: row.todos, wrapW });
-      if (row.kind === "tool") return /* @__PURE__ */ jsx16(ToolCard, { toolName: row.toolName, args: row.args, result: row.result, ok: row.ok, status: row.status, progress: row.progress, wrapW });
-      if (row.kind === "thinking") return /* @__PURE__ */ jsx16(ThinkingBlock, { streaming: row.streaming ?? false, startedAt: row.startedAt, durationMs: row.durationMs, tokens: row.tokens, text: row.text, expanded: showThinking, wrapW });
+      if (row.kind === "todos") return /* @__PURE__ */ jsx17(TodosPanel, { todos: row.todos, wrapW });
+      if (row.kind === "tool") return /* @__PURE__ */ jsx17(ToolCard, { toolName: row.toolName, args: row.args, result: row.result, ok: row.ok, status: row.status, progress: row.progress, wrapW });
+      if (row.kind === "thinking") return /* @__PURE__ */ jsx17(ThinkingBlock, { streaming: row.streaming ?? false, startedAt: row.startedAt, durationMs: row.durationMs, tokens: row.tokens, text: row.text, expanded: showThinking, wrapW });
       if (row.kind === "user") {
-        return /* @__PURE__ */ jsxs14(Box14, { flexDirection: "column", marginTop: 1, children: [
-          /* @__PURE__ */ jsx16(Text16, { color: THEME.grayDim, children: "\u2500".repeat(Math.max(8, wrapW)) }),
-          /* @__PURE__ */ jsx16(MessageBlock, { row, wrapW, streamTail })
+        return /* @__PURE__ */ jsxs15(Box15, { flexDirection: "column", marginTop: 1, children: [
+          /* @__PURE__ */ jsx17(Text17, { color: THEME.grayDim, children: "\u2500".repeat(Math.max(8, wrapW)) }),
+          /* @__PURE__ */ jsx17(MessageBlock, { row, wrapW, streamTail })
         ] });
       }
-      return /* @__PURE__ */ jsx16(MessageBlock, { row, wrapW, streamTail });
+      return /* @__PURE__ */ jsx17(MessageBlock, { row, wrapW, streamTail });
     };
     isDynamicRow = (r) => r.kind === "assistant" && !!r.streaming || r.kind === "thinking" && !!r.streaming || r.kind === "tool" && r.status === "running" || r.kind === "todos" && !!r.active;
     App = ({ resumeSessionId, initialPlanMode, initialAutoMode, initialIncludeProject }) => {
@@ -12903,6 +13682,8 @@ var init_App = __esm({
               return S.cmdOutputStyle;
             case "sessions":
               return S.cmdSessions;
+            case "fork":
+              return S.cmdFork;
             case "usage":
               return S.cmdUsage;
             case "context":
@@ -12935,13 +13716,13 @@ var init_App = __esm({
         const q = input.slice(1).toLowerCase();
         return menuEntries.filter((c) => c.name.toLowerCase().startsWith(q));
       }, [input, menuEntries]);
-      const menuActive = state.pendingApproval != null || state.pendingQuestion != null || state.pendingPlan != null || state.pendingSessions != null;
+      const menuActive = state.pendingApproval != null || state.pendingQuestion != null || state.pendingPlan != null || state.pendingSessions != null || state.pendingFork != null;
       const slashVisible = !menuActive && input.startsWith("/") && filteredCommands.length > 0;
       const inputActive = !menuActive;
       useEffect4(() => {
         setSelectIdx(0);
         setPlanEditing(false);
-      }, [state.pendingApproval, state.pendingQuestion, state.pendingPlan, state.pendingSessions, slashVisible, filteredCommands.length]);
+      }, [state.pendingApproval, state.pendingQuestion, state.pendingPlan, state.pendingSessions, state.pendingFork, slashVisible, filteredCommands.length]);
       useEffect4(() => {
         setQCursor(0);
         setQChecked(/* @__PURE__ */ new Set());
@@ -12960,6 +13741,9 @@ var init_App = __esm({
           case "/sessions":
             void state.openSessionPicker();
             return true;
+          case "/fork":
+            void state.openForkPicker();
+            return true;
           case "/help":
             state.pushInfo(S.helpText(modelDisplay, state.getThinkingLevel(), getLocale()));
             return true;
@@ -13108,7 +13892,12 @@ ${listText}`);
         const v = inputRef.current.trim();
         if (!v) return;
         if (busyRef.current) {
-          state.pushEvent({ type: "error", message: S.busyBlockSend });
+          if (!v.startsWith("/") && state.queueInput(v)) {
+            setInput("");
+            setCursor(0);
+          } else {
+            state.pushEvent({ type: "error", message: S.busyBlockSend });
+          }
           return;
         }
         setInput("");
@@ -13190,6 +13979,16 @@ ${listText}`);
           } else if (key.escape || key.ctrl && ch === "g") state.resolveSession(null);
           return;
         }
+        if (state.pendingFork) {
+          const list = state.pendingFork.anchors;
+          if (key.upArrow) setSelectIdx((i) => (i - 1 + list.length) % list.length);
+          else if (key.downArrow) setSelectIdx((i) => (i + 1) % list.length);
+          else if (key.return) {
+            const sel = list[Math.min(selectIdxRef.current, list.length - 1)];
+            state.resolveFork(sel ?? null);
+          } else if (key.escape || key.ctrl && ch === "g") state.resolveFork(null);
+          return;
+        }
         if (key.ctrl && ch === "t") {
           state.toggleShowThinking();
           return;
@@ -13230,19 +14029,19 @@ ${listText}`);
         }
       });
       const sessionShort = state.sessionIdRef.current ? truncateMiddle(state.sessionIdRef.current, 12) : "";
-      return /* @__PURE__ */ jsxs14(Box14, { flexDirection: "column", width: cols, children: [
-        /* @__PURE__ */ jsx16(Static, { items: staticItems, children: (item) => item.kind === "__header" ? /* @__PURE__ */ jsx16(TopPanel, { cwd: CWD2, cols }, "header") : /* @__PURE__ */ jsx16(RowView, { row: item, wrapW, streamTail, showThinking: state.showThinkingText }, item.id) }),
-        /* @__PURE__ */ jsxs14(Box14, { flexDirection: "column", width: cols, children: [
-          menuActive ? null : /* @__PURE__ */ jsxs14(Box14, { flexDirection: "column", paddingX: 1, children: [
-            dynamicRows.map((row) => /* @__PURE__ */ jsx16(RowView, { row, wrapW, streamTail, showThinking: state.showThinkingText }, row.id)),
-            state.busy ? /* @__PURE__ */ jsx16(Box14, { marginTop: 0.5, children: /* @__PURE__ */ jsxs14(Text16, { color: THEME.coralBright, children: [
+      return /* @__PURE__ */ jsxs15(Box15, { flexDirection: "column", width: cols, children: [
+        /* @__PURE__ */ jsx17(Static, { items: staticItems, children: (item) => item.kind === "__header" ? /* @__PURE__ */ jsx17(TopPanel, { cwd: CWD2, cols }, "header") : /* @__PURE__ */ jsx17(RowView, { row: item, wrapW, streamTail, showThinking: state.showThinkingText }, item.id) }),
+        /* @__PURE__ */ jsxs15(Box15, { flexDirection: "column", width: cols, children: [
+          menuActive ? null : /* @__PURE__ */ jsxs15(Box15, { flexDirection: "column", paddingX: 1, children: [
+            dynamicRows.map((row) => /* @__PURE__ */ jsx17(RowView, { row, wrapW, streamTail, showThinking: state.showThinkingText }, row.id)),
+            state.busy ? /* @__PURE__ */ jsx17(Box15, { marginTop: 0.5, children: /* @__PURE__ */ jsxs15(Text17, { color: THEME.coralBright, children: [
               "\u25CF ",
               S.generating
             ] }) }) : null
           ] }),
-          /* @__PURE__ */ jsxs14(Box14, { flexDirection: "column", paddingX: 1, flexShrink: 0, children: [
-            state.pendingApproval ? /* @__PURE__ */ jsx16(ApprovalModal, { toolName: state.pendingApproval.toolName, detail: state.pendingApproval.detail, selectedIndex: selectIdx, wrapW }) : null,
-            state.pendingQuestion ? /* @__PURE__ */ jsx16(
+          /* @__PURE__ */ jsxs15(Box15, { flexDirection: "column", paddingX: 1, flexShrink: 0, children: [
+            state.pendingApproval ? /* @__PURE__ */ jsx17(ApprovalModal, { toolName: state.pendingApproval.toolName, detail: state.pendingApproval.detail, selectedIndex: selectIdx, wrapW }) : null,
+            state.pendingQuestion ? /* @__PURE__ */ jsx17(
               QuestionModal,
               {
                 question: state.pendingQuestion.req.question,
@@ -13253,7 +14052,7 @@ ${listText}`);
                 wrapW
               }
             ) : null,
-            state.pendingPlan ? planEditing ? /* @__PURE__ */ jsx16(
+            state.pendingPlan ? planEditing ? /* @__PURE__ */ jsx17(
               PlanEditor,
               {
                 value: planDraft,
@@ -13264,13 +14063,14 @@ ${listText}`);
                 },
                 onSubmit: confirmPlanEdit
               }
-            ) : /* @__PURE__ */ jsx16(PlanModal, { selectedIndex: selectIdx }) : null,
-            state.pendingSessions ? /* @__PURE__ */ jsx16(SessionPicker, { sessions: state.pendingSessions.sessions, selectedIndex: selectIdx, wrapW }) : null,
-            slashVisible ? /* @__PURE__ */ jsx16(SlashMenu, { entries: filteredCommands, selectedIndex: selectIdx, cols }) : null
+            ) : /* @__PURE__ */ jsx17(PlanModal, { selectedIndex: selectIdx }) : null,
+            state.pendingSessions ? /* @__PURE__ */ jsx17(SessionPicker, { sessions: state.pendingSessions.sessions, selectedIndex: selectIdx, wrapW }) : null,
+            state.pendingFork ? /* @__PURE__ */ jsx17(ForkPicker, { anchors: state.pendingFork.anchors, selectedIndex: selectIdx, wrapW }) : null,
+            slashVisible ? /* @__PURE__ */ jsx17(SlashMenu, { entries: filteredCommands, selectedIndex: selectIdx, cols }) : null
           ] }),
-          /* @__PURE__ */ jsxs14(Box14, { flexDirection: "column", paddingX: 1, marginTop: 1, flexShrink: 0, children: [
-            /* @__PURE__ */ jsx16(Text16, { dimColor: true, color: THEME.gray, children: dimRule(cols) }),
-            /* @__PURE__ */ jsx16(
+          /* @__PURE__ */ jsxs15(Box15, { flexDirection: "column", paddingX: 1, marginTop: 1, flexShrink: 0, children: [
+            /* @__PURE__ */ jsx17(Text17, { dimColor: true, color: THEME.gray, children: dimRule(cols) }),
+            /* @__PURE__ */ jsx17(
               MultilineInput,
               {
                 value: input,
@@ -13288,7 +14088,7 @@ ${listText}`);
               }
             )
           ] }),
-          /* @__PURE__ */ jsx16(Box14, { paddingX: 1, marginTop: 1, flexShrink: 0, children: /* @__PURE__ */ jsx16(StatusStrip, { model: modelDisplay, busy: state.busy, aborting: state.aborting, planMode: state.getPlanMode(), autoMode: state.getAutoMode(), sessionShort, cols, customLine: statusLineText }) })
+          /* @__PURE__ */ jsx17(Box15, { paddingX: 1, marginTop: 1, flexShrink: 0, children: /* @__PURE__ */ jsx17(StatusStrip, { model: modelDisplay, busy: state.busy, aborting: state.aborting, planMode: state.getPlanMode(), autoMode: state.getAutoMode(), sessionShort, cols, customLine: statusLineText }) })
         ] })
       ] });
     };
@@ -13302,7 +14102,7 @@ __export(updateCheck_exports, {
   readLocalVersion: () => readLocalVersion,
   refreshUpdateCache: () => refreshUpdateCache
 });
-import { readFileSync as readFileSync3, writeFileSync, mkdirSync } from "node:fs";
+import { readFileSync as readFileSync4, writeFileSync, mkdirSync } from "node:fs";
 import path39 from "node:path";
 import os4 from "os";
 import { fileURLToPath as fileURLToPath6 } from "node:url";
@@ -13318,7 +14118,7 @@ var init_updateCheck = __esm({
     readLocalVersion = () => {
       try {
         const here = path39.dirname(fileURLToPath6(import.meta.url));
-        return JSON.parse(readFileSync3(path39.join(here, "..", "package.json"), "utf8")).version ?? "0.0.0";
+        return JSON.parse(readFileSync4(path39.join(here, "..", "package.json"), "utf8")).version ?? "0.0.0";
       } catch {
         return "0.0.0";
       }
@@ -13334,7 +14134,7 @@ var init_updateCheck = __esm({
     };
     readCache = () => {
       try {
-        const obj = JSON.parse(readFileSync3(cacheFile(), "utf8"));
+        const obj = JSON.parse(readFileSync4(cacheFile(), "utf8"));
         return typeof obj.latestVersion === "string" && typeof obj.lastCheck === "number" ? obj : null;
       } catch {
         return null;
@@ -13422,7 +14222,7 @@ import { render } from "ink";
 import os5 from "os";
 import path40 from "path";
 import { emitKeypressEvents } from "node:readline";
-import { jsx as jsx17 } from "react/jsx-runtime";
+import { jsx as jsx18 } from "react/jsx-runtime";
 var parseArgs = (argv) => {
   const out = {};
   for (let i = 0; i < argv.length; i++) {
@@ -13566,7 +14366,7 @@ var main = async () => {
     resumeId = await getMostRecentSessionId2() ?? void 0;
   }
   const { waitUntilExit } = render(
-    /* @__PURE__ */ jsx17(App2, { resumeSessionId: resumeId, initialPlanMode: args.plan, initialAutoMode: args.auto, initialIncludeProject: includeProject }),
+    /* @__PURE__ */ jsx18(App2, { resumeSessionId: resumeId, initialPlanMode: args.plan, initialAutoMode: args.auto, initialIncludeProject: includeProject }),
     // exitOnCtrlC:false：Ctrl+C 交由 App useInput 处理（统一退出/中止语义）；
     // patchConsole:false：避免 console 劫持与全屏重绘叠加闪屏。
     { exitOnCtrlC: false, patchConsole: false }