deepseeker-code 1.0.42 → 1.0.45

package/README.md

@@ -70,12 +70,16 @@ deepseeker-code --plan
 | `/lang <zh\|en>` | 切换语言 |
 | `/output-style <名称>` | 切换输出风格（人格） |
 | `/sessions` | 列出并续接历史会话 |
+| `/fork` | 从当前会话某轮回复处分叉出新会话 |
 | `/clear` | 新会话 |
 | `/status` / `/usage` / `/context` | 查看状态 / 用量 / 上下文 |
 | `/permissions` / `/mcp` / `/hooks` | 查看已加载的权限规则 / MCP / Hooks |
+| `/trust` | 管理已信任目录（列出 / 撤销） |
 | `/debug` | 调试信息 |
 | `/exit` / `/quit` | 退出 |
 
+> 菜单超出屏高时随选中项滚动（底栏显示 `n/m 条`）；`commands/` 目录下的自定义命令引擎就绪后自动并入菜单。启动时界面先行渲染，引擎（MCP/skills/命令）后台加载，首次提交前自动等待就绪。
+
 **快捷键**：`Ctrl+C` 退出 · `Esc` 中止/清输入 · `Ctrl+G` 中止当前轮 · `Ctrl+T` 展开/收起思考 · 模态/菜单 `↑↓ Enter`。
 
 ---

package/dist/cli.mjs

@@ -569,7 +569,7 @@ import { randomUUID } from "node:crypto";
 import fs from "fs/promises";
 import { execFile } from "node:child_process";
 import { promisify } from "node:util";
-var getFileName, createUUID, SAFE_SESSION_ID_RE, isSafeSessionId, assertSafeSessionId, readJSONFile, atomicWriteJSON, createSemaphore, injectMarkedBlock, decodeProcessOutput, execFileSmart;
+var getFileName, createUUID, SAFE_SESSION_ID_RE, isSafeSessionId, assertSafeSessionId, detectTextLocale, readJSONFile, atomicWriteJSON, createSemaphore, injectMarkedBlock, decodeProcessOutput, execFileSmart;
 var init_common = __esm({
   "../core/src/common/index.ts"() {
     "use strict";
@@ -592,6 +592,15 @@ var init_common = __esm({
         throw new Error(`\u{1F6D1} [SECURITY] \u975E\u6CD5 ${label}: ${JSON.stringify(sessionId.slice(0, 48))}\uFF08\u4EC5\u5141\u8BB8\u5B57\u6BCD/\u6570\u5B57/\u4E0B\u5212\u7EBF/\u8FDE\u5B57\u7B26\uFF09`);
       }
     };
+    detectTextLocale = (text) => {
+      const stripped = (text || "").replace(/```[\s\S]*?```/g, " ").replace(/`[^`]*`/g, " ").replace(/\s+/g, " ");
+      const cjk = (stripped.match(/[㐀-䶿一-鿿]/g) || []).length;
+      const latin = (stripped.match(/[A-Za-z]/g) || []).length;
+      if (cjk === 0 && latin === 0) return null;
+      if (cjk === 0) return "en";
+      if (latin === 0) return "zh";
+      return cjk / (cjk + latin) >= 0.2 ? "zh" : "en";
+    };
     readJSONFile = async (file, fallback = null) => {
       try {
         const raw = await fs.readFile(file, "utf-8");
@@ -2805,12 +2814,13 @@ task_id: ${taskId}
         type: "function",
         function: {
           name: "get_background_output",
-          description: "\u67E5\u770B\u6307\u5B9A\u540E\u53F0\u4EFB\u52A1\u7684\u6700\u8FD1\u8F93\u51FA\u65E5\u5FD7\u4E0E\u8FD0\u884C\u72B6\u6001\uFF08running/exited/killed + \u9000\u51FA\u7801\uFF09\u3002\u7EAF\u8BFB\uFF0C\u514D\u5BA1\u6279\u3002\u7528\u4E8E\u786E\u8BA4 dev server \u662F\u5426\u542F\u52A8\u6210\u529F\u3001\u67E5\u770B\u62A5\u9519\u7B49\u3002",
+          description: "\u67E5\u770B\u6307\u5B9A\u540E\u53F0\u4EFB\u52A1\u7684\u6700\u8FD1\u8F93\u51FA\u65E5\u5FD7\u4E0E\u8FD0\u884C\u72B6\u6001\uFF08running/exited/killed + \u9000\u51FA\u7801\uFF09\u3002\u7EAF\u8BFB\uFF0C\u514D\u5BA1\u6279\u3002\u7528\u4E8E\u786E\u8BA4 dev server \u662F\u5426\u542F\u52A8\u6210\u529F\u3001\u67E5\u770B\u62A5\u9519\u7B49\u3002\u7B49\u957F\u4EFB\u52A1\uFF08\u6784\u5EFA/\u6D4B\u8BD5\uFF09\u8DD1\u5B8C\uFF1A\u5E26 wait_seconds \u963B\u585E\u7B49\u5F85\u4EFB\u52A1\u9000\u51FA\u540E\u518D\u8FD4\u56DE\uFF08\u4ECD\u5728\u8DD1\u5219\u7B49\u5230\u8D85\u65F6\u8FD4\u56DE\u5F53\u524D\u72B6\u6001\uFF09\u2014\u2014\u7528\u5B83\u7B49\uFF0C\u4E0D\u8981\u4E0D\u5E26 wait \u53CD\u590D\u8F6E\u8BE2\u67E5\u8BE2\u3002",
           parameters: {
             type: "object",
             properties: {
               task_id: { type: "string", description: "run_in_background \u8FD4\u56DE\u7684 task_id" },
-              tail_lines: { type: "number", description: "\u53EA\u8FD4\u56DE\u6700\u540E N \u884C\u65E5\u5FD7\uFF08\u9ED8\u8BA4 50\uFF0C\u907F\u514D\u4E00\u6B21\u704C\u5165\u8FC7\u591A\uFF09" }
+              tail_lines: { type: "number", description: "\u53EA\u8FD4\u56DE\u6700\u540E N \u884C\u65E5\u5FD7\uFF08\u9ED8\u8BA4 50\uFF0C\u907F\u514D\u4E00\u6B21\u704C\u5165\u8FC7\u591A\uFF09" },
+              wait_seconds: { type: "number", description: "\u963B\u585E\u7B49\u5F85\u4EFB\u52A1\u9000\u51FA\uFF08\u6216\u5230\u8FBE\u6B64\u65F6\u957F\uFF09\u540E\u518D\u8FD4\u56DE\uFF0C\u4E0A\u9650 120 \u79D2\uFF1B\u4EFB\u52A1\u5DF2\u5728\u8DD1\u4E14\u9700\u8981\u7B49\u7ED3\u679C\u65F6\u4F7F\u7528\uFF0C\u4E0D\u9700\u8981\u7B49\u5C31\u7701\u7565" }
             },
             required: ["task_id"]
           },
@@ -2821,6 +2831,13 @@ task_id: ${taskId}
             if (!task || task.sessionId !== ctx?.sessionId) {
               return `\u274C [\u67E5\u8BE2\u5931\u8D25]\uFF1A\u672A\u627E\u5230 task_id=${args.task_id}\uFF08\u53EF\u80FD\u5DF2\u968F\u670D\u52A1\u91CD\u542F\u4E22\u5931\uFF0C\u6216\u4E0D\u5C5E\u4E8E\u5F53\u524D\u4F1A\u8BDD\uFF09\u3002`;
             }
+            const waitMs = Math.min(Math.max(0, args.wait_seconds ?? 0), 120) * 1e3;
+            if (waitMs > 0 && task.status === "running") {
+              const deadline = Date.now() + waitMs;
+              while (task.status === "running" && Date.now() < deadline && !ctx?.abortSignal?.aborted) {
+                await new Promise((r) => setTimeout(r, 500));
+              }
+            }
             const tail = Math.max(1, args.tail_lines ?? 50);
             const allLines = task.outputBuffer.split("\n");
             const tailText = allLines.slice(-tail).join("\n").trim();
@@ -3883,26 +3900,31 @@ var init_repeatBreaker = __esm({
       const recentSignatures = [];
       const recentPollTargets = [];
       const POLL_TARGET_KEYS = { get_background_output: ["task_id"] };
+      const parseArgs2 = (tc) => {
+        try {
+          return JSON.parse(tc?.function?.arguments || "{}") ?? {};
+        } catch {
+          return {};
+        }
+      };
       const pollTarget = (tc) => {
         const name = tc?.function?.name;
         const keys = name ? POLL_TARGET_KEYS[name] : void 0;
         if (!keys) return null;
-        let args = {};
-        try {
-          args = JSON.parse(tc?.function?.arguments || "{}");
-        } catch {
-        }
+        const args = parseArgs2(tc);
         const picked = {};
         for (const k of keys) if (k in args) picked[k] = args[k];
         return `${name}:${JSON.stringify(picked)}`;
       };
+      const isWaitPoll = (tc) => tc?.function?.name === "get_background_output" && Number(parseArgs2(tc).wait_seconds ?? 0) > 0;
       const check = (toolCalls, round, lastContent) => {
-        const sig = toolCalls.map((t) => `${t.function.name}:${t.function.arguments}`).join("|");
+        const effCalls = toolCalls.filter((t) => !isWaitPoll(t));
+        const sig = effCalls.map((t) => `${t.function.name}:${t.function.arguments}`).join("|");
         const tooName = toolCalls.map((t) => `${t.function.name}`).join("|");
         recentSignatures.push(sig);
         if (recentSignatures.length > 6) recentSignatures.shift();
         const last3 = recentSignatures.slice(-3);
-        if (last3.length === 3 && last3.every((s) => s === last3[0])) {
+        if (sig && last3.length === 3 && last3.every((s) => s === sig)) {
           const text = (lastContent || "") + "\n\uFF08\u68C0\u6D4B\u5230\u91CD\u590D\u5DE5\u5177\u8C03\u7528\uFF0C\u5DF2\u505C\u6B62\uFF09";
           events({
             sessionId,
@@ -3921,31 +3943,28 @@ var init_repeatBreaker = __esm({
           });
           return { tripped: true, kind: "full", text, toolName: tooName };
         }
-        const pollTargets = toolCalls.map(pollTarget).filter(Boolean);
-        if (pollTargets.length) {
-          const pollSig = pollTargets.join("|");
-          recentPollTargets.push(pollSig);
-          if (recentPollTargets.length > 8) recentPollTargets.shift();
-          const last4 = recentPollTargets.slice(-4);
-          if (last4.length === 4 && last4.every((s) => s === last4[0])) {
-            const text = (lastContent || "") + "\n\uFF08\u68C0\u6D4B\u5230\u540E\u53F0\u4EFB\u52A1\u8F6E\u8BE2\u6B7B\u5FAA\u73AF\uFF08\u53CD\u590D\u67E5\u8BE2\u540C\u4E00\u4EFB\u52A1\uFF09\uFF0C\u5DF2\u505C\u6B62\uFF09";
-            events({
-              sessionId,
-              eventType: "tool.repeat_break",
-              metadata: {
-                depth,
-                decisionSource: llmDecisionSource,
-                durationMs: performance.now() - startTime,
-                round,
-                toolName: tooName,
-                toolSource: "builtin",
-                ok: false,
-                attempt: round
-              },
-              payload: { output: text }
-            });
-            return { tripped: true, kind: "names", text, toolName: tooName };
-          }
+        const pollSig = effCalls.map(pollTarget).filter(Boolean).join("|");
+        recentPollTargets.push(pollSig);
+        if (recentPollTargets.length > 8) recentPollTargets.shift();
+        const last4 = recentPollTargets.slice(-4);
+        if (pollSig && last4.length === 4 && last4.every((s) => s === pollSig)) {
+          const text = (lastContent || "") + "\n\uFF08\u68C0\u6D4B\u5230\u540E\u53F0\u4EFB\u52A1\u8F6E\u8BE2\u6B7B\u5FAA\u73AF\uFF08\u53CD\u590D\u67E5\u8BE2\u540C\u4E00\u4EFB\u52A1\uFF09\uFF0C\u5DF2\u505C\u6B62\uFF09";
+          events({
+            sessionId,
+            eventType: "tool.repeat_break",
+            metadata: {
+              depth,
+              decisionSource: llmDecisionSource,
+              durationMs: performance.now() - startTime,
+              round,
+              toolName: tooName,
+              toolSource: "builtin",
+              ok: false,
+              attempt: round
+            },
+            payload: { output: text }
+          });
+          return { tripped: true, kind: "names", text, toolName: tooName };
         }
         events({
           sessionId,
@@ -4363,10 +4382,23 @@ var init_systemInjections = __esm({
         function: { name: t.function.name, description: t.function.description, parameters: t.function.parameters }
       }));
       ensureSummarySlot(message);
-      if (locale2) {
-        const hint = locale2 === "zh" ? "\u8BF7\u59CB\u7EC8\u7528\u4E2D\u6587\u56DE\u590D\u7528\u6237\u3002" : "Always reply to the user in English.";
-        injectMarkedBlock(message, "\u27E6DSC:LOCALE\u27E7", hint);
-      }
+      const LOCALE_HINTS = {
+        zh: "\u59CB\u7EC8\u7528\u4E2D\u6587\u8F93\u51FA\u6240\u6709\u9762\u5411\u7528\u6237\u7684\u5185\u5BB9\uFF1A\u4F60\u7684\u56DE\u590D\u3001\u4E2D\u95F4\u53D9\u8FF0\u3001todo \u4EFB\u52A1\u9879\u6807\u9898\u3001\u901A\u8FC7 exit_plan_mode \u63D0\u4EA4\u7684\u65B9\u6848\u6587\u672C\u3001\u4EE3\u7801\u6CE8\u91CA\u4E0E\u63D0\u4EA4\u4FE1\u606F\u3002\u4EE3\u7801\u6807\u8BC6\u7B26\u4FDD\u6301\u539F\u6837\uFF1B\u5DE5\u5177\u7ED3\u679C\u4E0E\u7CFB\u7EDF\u6307\u4EE4\u53EF\u80FD\u5939\u6742\u5176\u4ED6\u8BED\u8A00\u2014\u2014\u5FC5\u8981\u65F6\u7167\u5F15\u539F\u6587\uFF0C\u4F46\u4F60\u81EA\u5DF1\u7684\u53D9\u8FF0\u4E0E\u89E3\u91CA\u4E00\u5F8B\u7528\u4E2D\u6587\u3002",
+        en: "Always produce ALL user-facing output in English: your replies, interim narration, todo item titles, the plan text you submit via exit_plan_mode, code comments, and commit messages. Keep code identifiers as-is; tool results and system instructions may arrive in Chinese \u2014 quote them verbatim where needed, but your own narration and explanations must stay in English."
+      };
+      const lastUserText = (() => {
+        for (let i = message.length - 1; i >= 0; i--) {
+          const m = message[i];
+          if (m?.role !== "user") continue;
+          const c = m.content;
+          if (typeof c === "string") return c;
+          if (Array.isArray(c)) return c.filter((p) => typeof p?.text === "string").map((p) => p.text).join(" ");
+          return "";
+        }
+        return "";
+      })();
+      const effLocale = detectTextLocale(lastUserText) ?? locale2;
+      if (effLocale) injectMarkedBlock(message, "\u27E6DSC:LOCALE\u27E7", LOCALE_HINTS[effLocale]);
       injectOutputStyle(message, outputStyle);
       injectSkillCatalog(message);
       injectAgentCatalog(message);
@@ -4389,13 +4421,14 @@ var init_agent = __esm({
         type: "function",
         function: {
           name: "spawn_agent",
-          description: "\u521B\u5EFA\u4E00\u4E2A\u62E5\u6709\u72EC\u7ACB\u6267\u884C\u73AF\u5883\u7684\u5B50 agent \u5904\u7406\u9694\u79BB\u7684\u7279\u5B9A\u5B50\u4EFB\u52A1\uFF0C\u5B50\u4EFB\u52A1\u5B8C\u6210\u540E\u81EA\u52A8\u6C47\u603B\u6539\u52A8\u70B9\u4E0E\u7ED3\u8BBA\u8FD4\u56DE\u3002\u53EF\u901A\u8FC7 name \u6307\u5B9A\u58F0\u660E\u5F0F\u5B50 Agent\uFF08\u89C1\u7CFB\u7EDF\u63D0\u793A\u8BCD\u3010\u53EF\u7528\u5B50 Agent \u76EE\u5F55\u3011\uFF09\u4EE5\u5957\u7528\u5176\u4E13\u957F\u7CFB\u7EDF\u8BCD/\u5DE5\u5177\u767D\u540D\u5355/model\uFF1B\u4E0D\u4F20 name \u8D70\u9ED8\u8BA4\u901A\u7528\u5B50 agent\u3002",
+          description: "\u521B\u5EFA\u4E00\u4E2A\u62E5\u6709\u72EC\u7ACB\u6267\u884C\u73AF\u5883\u7684\u5B50 agent \u5904\u7406\u9694\u79BB\u7684\u7279\u5B9A\u5B50\u4EFB\u52A1\uFF0C\u5B50\u4EFB\u52A1\u5B8C\u6210\u540E\u81EA\u52A8\u6C47\u603B\u6539\u52A8\u70B9\u4E0E\u7ED3\u8BBA\u8FD4\u56DE\u3002\u53EF\u901A\u8FC7 name \u6307\u5B9A\u58F0\u660E\u5F0F\u5B50 Agent\uFF08\u89C1\u7CFB\u7EDF\u63D0\u793A\u8BCD\u3010\u53EF\u7528\u5B50 Agent \u76EE\u5F55\u3011\uFF09\u4EE5\u5957\u7528\u5176\u4E13\u957F\u7CFB\u7EDF\u8BCD/\u5DE5\u5177\u767D\u540D\u5355/model\uFF1B\u4E0D\u4F20 name \u8D70\u9ED8\u8BA4\u901A\u7528\u5B50 agent\u3002\u652F\u6301\u7EED\u8DD1\uFF1A\u4F20 resume_session_id\uFF08\u6B64\u524D\u8FD4\u56DE\u7684 agent_id\uFF09\u590D\u7528\u8BE5\u5B50 Agent \u7684\u5B8C\u6574\u5386\u53F2\u8BB0\u5FC6\uFF0C\u9002\u5408\u8FFD\u95EE\u3001\u7EE7\u7EED\u672A\u5B8C\u6210\u7684\u4EFB\u52A1\u3002",
           parameters: {
             type: "object",
             properties: {
-              task: { type: "string", description: "\u4EA4\u7ED9\u5B50 agent \u7684\u5177\u4F53\u5FAE\u89C2\u4EFB\u52A1\u63CF\u8FF0\uFF08\u5982 '\u7F16\u5199 Button \u7EC4\u4EF6\u7684\u5355\u5143\u6D4B\u8BD5'\uFF09" },
+              task: { type: "string", description: "\u4EA4\u7ED9\u5B50 agent \u7684\u5177\u4F53\u5FAE\u89C2\u4EFB\u52A1\u63CF\u8FF0\uFF08\u5982 '\u7F16\u5199 Button \u7EC4\u4EF6\u7684\u5355\u5143\u6D4B\u8BD5'\uFF09\uFF1B\u7EED\u8DD1\u65F6\u4E3A\u65B0\u6307\u4EE4\uFF08\u5982 '\u7EE7\u7EED\u5B8C\u6210\u5269\u4F59\u7528\u4F8B'\uFF09" },
               name: { type: "string", description: "\u58F0\u660E\u5F0F\u5B50 Agent \u540D\u79F0\uFF08\u987B\u4E0E\u7CFB\u7EDF\u63D0\u793A\u8BCD\u4E2D\u3010\u53EF\u7528\u5B50 Agent \u76EE\u5F55\u3011\u4E00\u81F4\uFF09\u3002\u63D0\u4F9B\u65F6\u6309\u5176\u58F0\u660E\u52A0\u8F7D\u7CFB\u7EDF\u8BCD/\u5DE5\u5177\u767D\u540D\u5355/model\uFF1B\u4E0D\u63D0\u4F9B\u5219\u8D70\u9ED8\u8BA4\u901A\u7528\u5B50 agent\u3002" },
-              role: { type: "string", description: "\u5B50 agent \u7684\u89D2\u8272/\u4E13\u957F\uFF08\u53EF\u9009\uFF0C\u5982 '\u6D4B\u8BD5\u4E13\u5BB6'\u3001'\u91CD\u6784\u5148\u950B'\uFF09\u3002\u58F0\u660E\u5F0F agent \u81EA\u5E26 role \u65F6\u4F5C\u8865\u5145\u3002" }
+              role: { type: "string", description: "\u5B50 agent \u7684\u89D2\u8272/\u4E13\u957F\uFF08\u53EF\u9009\uFF0C\u5982 '\u6D4B\u8BD5\u4E13\u5BB6'\u3001'\u91CD\u6784\u5148\u950B'\uFF09\u3002\u58F0\u660E\u5F0F agent \u81EA\u5E26 role \u65F6\u4F5C\u8865\u5145\u3002" },
+              resume_session_id: { type: "string", description: "\u7EED\u8DD1\u65E2\u6709\u5B50 Agent\uFF1A\u4F20\u6B64\u524D spawn_agent \u8FD4\u56DE\u7684 agent_id\uFF0C\u5176\u78C1\u76D8\u4E0A\u7684\u5386\u53F2\u4E0E\u8BB0\u5FC6\u5C06\u5B8C\u6574\u6062\u590D\u3002\u6CE8\u610F\uFF1A\u5B50 Agent \u72B6\u6001\u4E0D\u968F\u4E3B\u4F1A\u8BDD fork \u56DE\u6EDA\u2014\u2014fork \u53EA\u5206\u53C9\u5BF9\u8BDD\uFF0C\u7EED\u8DD1\u62FF\u5230\u7684\u662F\u5B50\u4F1A\u8BDD\u78C1\u76D8\u6700\u65B0\u72B6\u6001\u3002\u7F3A\u7701\u5219\u65B0\u5EFA\u5B50 Agent\u3002" }
             },
             required: ["task"]
           },
@@ -4403,10 +4436,17 @@ var init_agent = __esm({
           isSync: true,
           async execute(args, ctx) {
             if (!ctx) return "\u274C [\u6D3E\u751F\u5931\u8D25]\uFF1Aspawn_agent \u7F3A\u5C11\u5FC5\u987B\u7684\u667A\u80FD\u4F53\u8FD0\u884C\u4E0A\u4E0B\u6587\u3002";
-            const res = await runSubagent(args, ctx, getGlobalTools);
+            const res = await runSubagent(
+              { task: args.task, name: args.name, role: args.role, resumeSessionId: args.resume_session_id },
+              ctx,
+              getGlobalTools
+            );
             if (!res.ok) return res.output;
             return [
-              `\u{1F389} [\u5B50 Agent \u6267\u884C\u5B8C\u6BD5] \u6D3E\u751F\u5B50\u4EFB\u52A1\u6C47\u62A5\u5982\u4E0B\uFF1A
+              `\u{1F389} [\u5B50 Agent \u6267\u884C\u5B8C\u6BD5${args.resume_session_id ? "\xB7\u7EED\u8DD1" : ""}] \u6D3E\u751F\u5B50\u4EFB\u52A1\u6C47\u62A5\u5982\u4E0B\uFF1A
+`,
+              `\u{1F194} agent_id: ${res.sessionId}
+\uFF08\u9700\u8981\u7EE7\u7EED\u8BE5\u5B50 Agent \u7684\u4EFB\u52A1\u6216\u8FFD\u95EE\u65F6\uFF0C\u8C03\u7528 spawn_agent \u4F20 resume_session_id=${res.sessionId}\uFF0C\u5176\u5386\u53F2\u8BB0\u5FC6\u5B8C\u6574\u4FDD\u7559\uFF09
 `,
               `==================================================
 `,
@@ -9978,6 +10018,7 @@ var init_agentNudges = __esm({
     createNudgeScheduler = (opts = {}) => {
       const firstPrompt = opts.firstPrompt ?? "";
       const planMode = !!opts.planMode;
+      const noEarlyFinal = !!opts.noEarlyFinal;
       let phantomRetries = 0;
       let phantomPending = null;
       let earlyFinalNudges = 0;
@@ -10040,7 +10081,7 @@ ${TOOL_DIGEST_TEXT}` };
 ${PHANTOM_TEXT}` };
             return true;
           }
-          if (text !== "" && round <= EARLY_FINAL_TURN_THRESHOLD && earlyFinalNudges < EARLY_FINAL_MAX && !looksComplete(finalText)) {
+          if (!noEarlyFinal && text !== "" && round <= EARLY_FINAL_TURN_THRESHOLD && earlyFinalNudges < EARLY_FINAL_MAX && !looksComplete(finalText)) {
             earlyFinalNudges++;
             earlyFinalPending = { role: "system", content: `${EARLY_FINAL_FENCE}
 ${EARLY_FINAL_TEXT(round)}` };
@@ -10125,7 +10166,7 @@ async function* runAgent(message, options) {
     const m = message.find((x) => x?.role === "user");
     return typeof m?.content === "string" ? m.content : "";
   })();
-  const nudges = createNudgeScheduler({ firstPrompt, planMode: !!options.planMode });
+  const nudges = createNudgeScheduler({ firstPrompt, planMode: !!options.planMode, noEarlyFinal: !!options.noEarlyFinal });
   const userDecisionSource = depth > 0 ? "spawn_agent" : "user";
   const llmDecisionSource = depth > 0 ? "llm_spawn_agent" : "llm";
   const startTime = performance.now();
@@ -10254,7 +10295,6 @@ async function* runAgent(message, options) {
       if (assistantMessage.content) {
         lastContent = assistantMessage.content;
       }
-      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 : "") || "";
@@ -10499,8 +10539,61 @@ var init_content = __esm({
   }
 });
 
+// ../core/src/session/lineage.ts
+import fs27 from "node:fs";
+var parentOfSubsession, stringAncestorsOf, readForkedFromSync, lineageClosureOf, ownerCanApprove;
+var init_lineage = __esm({
+  "../core/src/session/lineage.ts"() {
+    "use strict";
+    init_store();
+    parentOfSubsession = (sessionId) => {
+      const i = sessionId.lastIndexOf("__sub__");
+      return i > 0 ? sessionId.slice(0, i) : void 0;
+    };
+    stringAncestorsOf = (sessionId) => {
+      const out = [sessionId];
+      let cur = sessionId;
+      for (; ; ) {
+        const p = parentOfSubsession(cur);
+        if (p === void 0) break;
+        out.push(p);
+        cur = p;
+      }
+      return out;
+    };
+    readForkedFromSync = (sessionId) => {
+      try {
+        const raw = fs27.readFileSync(getStatePath(sessionId), "utf-8");
+        const v = JSON.parse(raw)?.forkedFrom;
+        return typeof v === "string" && v.length > 0 ? v : void 0;
+      } catch {
+        return void 0;
+      }
+    };
+    lineageClosureOf = (sessionId) => {
+      const closure = /* @__PURE__ */ new Set();
+      const expand = (id) => {
+        if (closure.has(id)) return;
+        const ancestors = stringAncestorsOf(id);
+        for (const a of ancestors) closure.add(a);
+        const root = ancestors[ancestors.length - 1];
+        const from = readForkedFromSync(root);
+        if (from && !closure.has(from)) expand(from);
+      };
+      expand(sessionId);
+      return closure;
+    };
+    ownerCanApprove = (entrySessionId, approverSessionId) => {
+      if (entrySessionId === approverSessionId) return true;
+      if (!entrySessionId.includes("__sub__")) return false;
+      const closure = lineageClosureOf(approverSessionId);
+      return stringAncestorsOf(entrySessionId).some((a, i) => i > 0 && closure.has(a));
+    };
+  }
+});
+
 // ../core/src/agent/subagent.ts
-var SUBAGENT_DENYLIST, runSubagent;
+var SUBAGENT_DENYLIST, activeSubagents, RESUME_NOTE, runSubagent;
 var init_subagent = __esm({
   "../core/src/agent/subagent.ts"() {
     "use strict";
@@ -10511,9 +10604,18 @@ var init_subagent = __esm({
     init_type();
     init_registry4();
     init_hooks();
+    init_lineage();
     SUBAGENT_DENYLIST = /* @__PURE__ */ new Set(["run_command", "delete_path"]);
+    activeSubagents = /* @__PURE__ */ new Set();
+    RESUME_NOTE = [
+      `
+# \u3010\u7EED\u8DD1\u8BF4\u660E\u3011`,
+      `\u4F60\u6B64\u524D\u7684\u5DE5\u4F5C\u5386\u53F2\u5DF2\u5B8C\u6574\u6062\u590D\u5230\u672C\u6B21\u4E0A\u4E0B\u6587\uFF08\u78C1\u76D8\u6700\u65B0\u72B6\u6001\uFF0C\u53EF\u80FD\u6BD4\u4F60\u4E0A\u6B21\u8BB0\u5FC6\u66F4\u65B0\uFF09\u3002`,
+      `\u8BF7\u5148\u5BF9\u7167\u5386\u53F2\u7B80\u8981\u56DE\u987E\u5DF2\u5B8C\u6210 / \u672A\u5B8C\u6210\u90E8\u5206\uFF0C\u518D\u7EE7\u7EED\u6267\u884C\u65B0\u4EFB\u52A1\uFF1B\u6700\u7EC8\u6C47\u62A5\u4E5F\u8BF7\u5148\u6982\u8FF0\u6B64\u524D\u8FDB\u5C55\u3002`
+    ].join("\n");
     runSubagent = async (spec, ctx, getGlobalTools) => {
-      const { task, name, role } = spec;
+      const { task, name, role, resumeSessionId } = spec;
+      const resuming = typeof resumeSessionId === "string" && resumeSessionId.length > 0;
       if (ctx.depth >= MAX_AGENT_DEPTH) {
         return {
           ok: false,
@@ -10521,7 +10623,39 @@ var init_subagent = __esm({
           sessionId: ""
         };
       }
-      const subSessionId = `${ctx.sessionId}__sub__${createUUID()}`;
+      if (resuming) {
+        const target = resumeSessionId;
+        if (!target.includes("__sub__")) {
+          return {
+            ok: false,
+            output: `\u274C [\u7EED\u8DD1\u5931\u8D25]\uFF1A${target} \u4E0D\u662F\u5B50 Agent \u4F1A\u8BDD ID\uFF08\u5E94\u5F62\u5982 <\u4F1A\u8BDD>__sub__<uuid>\uFF0C\u6765\u81EA\u6B64\u524D spawn_agent \u8FD4\u56DE\u7684 agent_id\uFF09\u3002`,
+            sessionId: ""
+          };
+        }
+        if (!ownerCanApprove(target, ctx.sessionId)) {
+          return {
+            ok: false,
+            output: `\u274C [\u7EED\u8DD1\u5931\u8D25]\uFF1A\u5B50\u4F1A\u8BDD ${target} \u4E0D\u5C5E\u4E8E\u5F53\u524D\u4F1A\u8BDD\uFF08\u53CA\u5176 fork \u8840\u7F18\uFF09\uFF0C\u7981\u6B62\u8DE8\u4F1A\u8BDD\u590D\u6D3B\u3002\u8BF7\u6838\u5BF9 agent_id \u6216\u6539\u7528\u65B0\u5EFA\u6D3E\u751F\u3002`,
+            sessionId: ""
+          };
+        }
+        if (activeSubagents.has(target)) {
+          return {
+            ok: false,
+            output: `\u274C [\u7EED\u8DD1\u5931\u8D25]\uFF1A\u5B50 Agent ${target} \u6B63\u5728\u6267\u884C\u4E2D\uFF0C\u7981\u6B62\u5E76\u53D1\u7EED\u8DD1\u540C\u4E00\u5B50\u4F1A\u8BDD\uFF08\u4F1A\u4EA4\u53C9\u5199\u574F\u8F6C\u5F55\uFF09\u3002\u8BF7\u7B49\u5F85\u5176\u5B8C\u6210\u540E\u518D\u8BD5\u3002`,
+            sessionId: ""
+          };
+        }
+        const existing = await readTranscriptLines(target);
+        if (existing.length === 0) {
+          return {
+            ok: false,
+            output: `\u274C [\u7EED\u8DD1\u5931\u8D25]\uFF1A\u5B50\u4F1A\u8BDD ${target} \u7684\u8F6C\u5F55\u4E0D\u5B58\u5728\u6216\u4E3A\u7A7A\uFF0C\u65E0\u6CD5\u7EED\u8DD1\u3002\u8BF7\u6539\u7528\u65B0\u5EFA\u6D3E\u751F\u3002`,
+            sessionId: ""
+          };
+        }
+      }
+      const subSessionId = resuming ? resumeSessionId : `${ctx.sessionId}__sub__${createUUID()}`;
       const parentSystemPrompt = ctx.parentSystemPrompt || "";
       const manifest = name ? getAgent(name) : void 0;
       if (name && !manifest) {
@@ -10531,7 +10665,7 @@ var init_subagent = __esm({
           sessionId: ""
         };
       }
-      const subSystem = manifest ? [
+      const subSystem = (manifest ? [
         `# \u5B50 Agent \u8EAB\u4EFD\uFF1A${manifest.name}`,
         manifest.body,
         `
@@ -10554,11 +10688,12 @@ var init_subagent = __esm({
         `
 # \u3010\u7EE7\u627F\u7684\u5168\u5C40\u4EE3\u7801\u89C4\u8303\u3011`,
         parentSystemPrompt
-      ].join("\n");
+      ].join("\n")) + (resuming ? RESUME_NOTE : "");
       const allTools = getGlobalTools();
       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)}..."`);
+      console.log(`${resuming ? "\u{1F501} \u7EED\u8DD1" : "\u{1F423} \u6D3E\u751F"}\u5B50 Agent [\u6DF1\u5EA6: ${ctx.depth + 1}/${MAX_AGENT_DEPTH}][${subSessionId}]${manifest ? ` \u58F0\u660E\u5F0F=${manifest.name}` : ""} \u4EFB\u52A1: "${task.slice(0, 50)}..."`);
+      activeSubagents.add(subSessionId);
       try {
         const subMessages = await buildContextMessages(subSessionId, { role: "user", content: task }, subSystem);
         await appendMessage({ sessionId: subSessionId, role: "user", content: task });
@@ -10582,6 +10717,8 @@ var init_subagent = __esm({
           // ★ 同步透传宿主审批钩子，子 agent 高危工具仍走同一审批通道
           permissionMode: ctx.permissionMode,
           // ★ P1-6 透传：子 agent 工作区文件编辑也走 auto 分类器
+          noEarlyFinal: true,
+          // ★ 子 agent final 是交付父级的汇报，EARLY_FINAL 误推一轮纯浪费；父可经续跑纠错
           model: manifest?.model
           // ★ per-agent 模型覆盖；undefined 时 model.ts 回退全局 MODEL_NAME
         };
@@ -10615,13 +10752,15 @@ var init_subagent = __esm({
         return result ?? { ok: false, output: `\u274C [\u6D3E\u751F\u6267\u884C\u5931\u8D25]: \u672A\u77E5\u9519\u8BEF`, sessionId: subSessionId, manifestName: manifest?.name };
       } catch (error) {
         return { ok: false, output: `\u274C [\u6D3E\u751F\u6267\u884C\u5931\u8D25]: ${error.message}`, sessionId: subSessionId, manifestName: manifest?.name };
+      } finally {
+        activeSubagents.delete(subSessionId);
       }
     };
   }
 });
 
 // ../core/src/hooks/loader.ts
-import fs27 from "fs/promises";
+import fs28 from "fs/promises";
 import path30 from "path";
 var readHooksConfig, appendValidated, validateRule, parseStdoutDecision, parseAgentDecision, compileRule2, loadHooks, initHooks;
 var init_loader4 = __esm({
@@ -10645,7 +10784,7 @@ var init_loader4 = __esm({
       for (const configPath of paths) {
         let raw;
         try {
-          raw = await fs27.readFile(configPath, "utf-8");
+          raw = await fs28.readFile(configPath, "utf-8");
         } catch {
           continue;
         }
@@ -10975,7 +11114,7 @@ ${m.context}`;
 });
 
 // ../core/src/skills/loader.ts
-import fs28 from "fs/promises";
+import fs29 from "fs/promises";
 import path31 from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 var BUILTIN_DIR, SOURCES2, MAX_SKILL_BODY_BYTES, splitList, parseSkillAt, loadSkills, initSkills;
@@ -10998,7 +11137,7 @@ var init_loader5 = __esm({
     parseSkillAt = async (skillFile, dir, source) => {
       let raw;
       try {
-        raw = await fs28.readFile(skillFile, "utf-8");
+        raw = await fs29.readFile(skillFile, "utf-8");
       } catch {
         return null;
       }
@@ -11068,7 +11207,7 @@ var init_loader5 = __esm({
 });
 
 // ../core/src/agents/loader.ts
-import fs29 from "fs/promises";
+import fs30 from "fs/promises";
 import path32 from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 var BUILTIN_DIR2, SOURCES3, parseAgentAt, initAgents;
@@ -11088,7 +11227,7 @@ var init_loader6 = __esm({
     parseAgentAt = async (file, dir, source) => {
       let raw;
       try {
-        raw = await fs29.readFile(file, "utf-8");
+        raw = await fs30.readFile(file, "utf-8");
       } catch {
         return null;
       }
@@ -11160,7 +11299,7 @@ var init_registry7 = __esm({
 });
 
 // ../core/src/commands/loader.ts
-import fs30 from "fs/promises";
+import fs31 from "fs/promises";
 import path33 from "path";
 import { fileURLToPath as fileURLToPath4 } from "url";
 var BUILTIN_DIR3, SOURCES4, MAX_COMMAND_BODY_BYTES, parseCommandAt, loadCommands, initCommands;
@@ -11181,7 +11320,7 @@ var init_loader7 = __esm({
     parseCommandAt = async (file, _dir, source) => {
       let raw;
       try {
-        raw = await fs30.readFile(file, "utf-8");
+        raw = await fs31.readFile(file, "utf-8");
       } catch {
         return null;
       }
@@ -11236,7 +11375,7 @@ var init_loader7 = __esm({
 });
 
 // ../core/src/outputStyles/loader.ts
-import fs31 from "fs/promises";
+import fs32 from "fs/promises";
 import path34 from "path";
 import { fileURLToPath as fileURLToPath5 } from "url";
 var BUILTIN_DIR4, MAX_STYLE_BODY_BYTES, SOURCES5, parseStyleAt, loadOutputStyles, initOutputStyles;
@@ -11257,7 +11396,7 @@ var init_loader8 = __esm({
     parseStyleAt = async (file, _dir, source) => {
       let raw;
       try {
-        raw = await fs31.readFile(file, "utf-8");
+        raw = await fs32.readFile(file, "utf-8");
       } catch {
         return null;
       }
@@ -11370,7 +11509,7 @@ var init_bootstrap = __esm({
 });
 
 // ../core/src/statusLine/config.ts
-import fs32 from "fs/promises";
+import fs33 from "fs/promises";
 import path35 from "path";
 var parseBlock, readStatusLineConfig;
 var init_config2 = __esm({
@@ -11396,7 +11535,7 @@ var init_config2 = __esm({
       for (const configPath of paths) {
         let raw;
         try {
-          raw = await fs32.readFile(configPath, "utf-8");
+          raw = await fs33.readFile(configPath, "utf-8");
         } catch {
           continue;
         }
@@ -11416,7 +11555,7 @@ var init_config2 = __esm({
 
 // ../core/src/statusLine/runner.ts
 import { spawn as spawn5 } from "child_process";
-import fs33 from "fs";
+import fs34 from "fs";
 import path36 from "path";
 import { fileURLToPath as fileURLToPath6 } from "url";
 var STATUSLINE_TIMEOUT_MS, cachedVersion, runStatusLine;
@@ -11435,7 +11574,7 @@ var init_runner = __esm({
       ];
       for (const p of candidates) {
         try {
-          const pkg = JSON.parse(fs33.readFileSync(p, "utf-8"));
+          const pkg = JSON.parse(fs34.readFileSync(p, "utf-8"));
           if (typeof pkg.version === "string" && pkg.version) {
             cachedVersion = pkg.version;
             break;
@@ -11495,7 +11634,7 @@ var init_createModel = __esm({
 
 // ../core/src/observability/store.ts
 import path37 from "path";
-import fs34 from "fs/promises";
+import fs35 from "fs/promises";
 var getTraceDirPath, getTracePath, tracePathCache, ensuredTraceDirs, ensureTraceDir, getGlobalClockPath, getTraceStorePath;
 var init_store3 = __esm({
   "../core/src/observability/store.ts"() {
@@ -11515,7 +11654,7 @@ var init_store3 = __esm({
     ensureTraceDir = async (mainTraceId) => {
       const dir = getTraceDirPath(mainTraceId);
       if (ensuredTraceDirs.has(dir)) return;
-      await fs34.mkdir(dir, { recursive: true });
+      await fs35.mkdir(dir, { recursive: true });
       ensuredTraceDirs.add(dir);
     };
     getGlobalClockPath = () => {
@@ -11528,7 +11667,7 @@ var init_store3 = __esm({
       if (cached2) return cached2;
       await ensureTraceDir(rootId);
       const dir = getTraceDirPath(rootId);
-      const files = await fs34.readdir(dir);
+      const files = await fs35.readdir(dir);
       const existedFile = files.find((f) => f.endsWith(`__${rootId}.jsonl`));
       let fileName = "";
       if (existedFile) {
@@ -11545,7 +11684,7 @@ var init_store3 = __esm({
 });
 
 // ../core/src/observability/trace.ts
-import fs35 from "fs/promises";
+import fs36 from "fs/promises";
 import path38 from "path";
 async function emitTrace(base) {
   const event = {
@@ -11568,7 +11707,7 @@ async function emitTrace(base) {
 async function appendTraceEvent(event) {
   const p = await getTraceStorePath(event.sessionId);
   const line = JSON.stringify(event) + "\n";
-  await fs35.appendFile(p, line, "utf-8");
+  await fs36.appendFile(p, line, "utf-8");
   if (workspaceTraceBytes < 0) {
     workspaceTraceBytes = await getDirBytes(getTracePath());
   }
@@ -11600,8 +11739,8 @@ async function maybeCleanupAfterAppend(sessionId) {
     lastSizeCleanupAt2 = now;
     diskLastCleanupAt2 = now;
     const clockPath = getGlobalClockPath();
-    await fs35.mkdir(path38.dirname(clockPath), { recursive: true });
-    await fs35.writeFile(clockPath, JSON.stringify({ lastCleanupAt: now, updatedAt: (/* @__PURE__ */ new Date()).toISOString() }, null, 2), "utf-8");
+    await fs36.mkdir(path38.dirname(clockPath), { recursive: true });
+    await fs36.writeFile(clockPath, JSON.stringify({ lastCleanupAt: now, updatedAt: (/* @__PURE__ */ new Date()).toISOString() }, null, 2), "utf-8");
     if (deletedCount > 0) {
       console.log(`\u2728 [Trace\u8FD0\u7EF4] \u5171\u9500\u6BC1 ${deletedCount} \u4E2A\u4F1A\u8BDD\u65E5\u5FD7\uFF08\u8F6F\u89C4\u5219\u8FC7\u671F\u6E05\u7406 + \u5BB9\u91CF\u786C\u9A71\u9010\uFF09\uFF0C\u78C1\u76D8\u6C34\u4F4D\u56DE\u843D\u3002`);
     }
@@ -11621,7 +11760,7 @@ async function cleanupOldTraceFiles() {
   let deleted = 0;
   let relativePaths;
   try {
-    relativePaths = await fs35.readdir(dir, { recursive: true });
+    relativePaths = await fs36.readdir(dir, { recursive: true });
   } catch {
     return 0;
   }
@@ -11634,9 +11773,9 @@ async function cleanupOldTraceFiles() {
     if (fileBornDay >= cutoff) continue;
     const fullPath = path38.join(dir, relativePath);
     try {
-      const st = await fs35.stat(fullPath);
+      const st = await fs36.stat(fullPath);
       if (now - st.mtimeMs < ACTIVE_GRACE_MS2) continue;
-      await fs35.unlink(fullPath);
+      await fs36.unlink(fullPath);
       deleted += 1;
     } catch {
     }
@@ -11647,7 +11786,7 @@ async function evictOldestForSize2(targetBytes) {
   const dir = getTracePath();
   let relativePaths;
   try {
-    relativePaths = await fs35.readdir(dir, { recursive: true });
+    relativePaths = await fs36.readdir(dir, { recursive: true });
   } catch {
     return 0;
   }
@@ -11657,7 +11796,7 @@ async function evictOldestForSize2(targetBytes) {
     const fileName = path38.basename(relativePath);
     if (!re.test(fileName)) continue;
     try {
-      const st = await fs35.stat(path38.join(dir, relativePath));
+      const st = await fs36.stat(path38.join(dir, relativePath));
       candidates.push({ mtime: st.mtimeMs, fullPath: path38.join(dir, relativePath), size: st.size });
     } catch {
     }
@@ -11668,7 +11807,7 @@ async function evictOldestForSize2(targetBytes) {
   for (const c of candidates) {
     if (totalBytes <= targetBytes) break;
     try {
-      await fs35.unlink(c.fullPath);
+      await fs36.unlink(c.fullPath);
       totalBytes -= c.size;
       deleted += 1;
     } catch {
@@ -11700,7 +11839,7 @@ var init_trace = __esm({
       if (clockLoaded2) return;
       clockLoaded2 = true;
       try {
-        const rawClock = await fs35.readFile(getGlobalClockPath(), "utf-8");
+        const rawClock = await fs36.readFile(getGlobalClockPath(), "utf-8");
         diskLastCleanupAt2 = JSON.parse(rawClock).lastCleanupAt || 0;
       } catch {
         diskLastCleanupAt2 = 0;
@@ -11719,6 +11858,7 @@ var pendingLocks, waitForUserApproval, resolveUserApprovalLock;
 var init_approvalGate = __esm({
   "../core/src/tool/approvalGate.ts"() {
     "use strict";
+    init_lineage();
     pendingLocks = /* @__PURE__ */ new Map();
     waitForUserApproval = async (sessionId, toolsId, signal) => {
       if (signal?.aborted) return "deny";
@@ -11746,7 +11886,7 @@ var init_approvalGate = __esm({
     resolveUserApprovalLock = (sessionId, toolsId, decision) => {
       const entry = pendingLocks.get(toolsId);
       if (!entry) return false;
-      const isOwner = entry.sessionId === sessionId || entry.sessionId.startsWith(`${sessionId}__sub__`);
+      const isOwner = ownerCanApprove(entry.sessionId, sessionId);
       if (!isOwner) return false;
       entry.resolver(decision);
       pendingLocks.delete(toolsId);
@@ -11846,7 +11986,7 @@ ${PLAN_MODE_AUTO_ENTER_HINT}
 
 // ../core/src/serve/chatProcessing.ts
 import path39 from "path";
-import fs36 from "fs";
+import fs37 from "fs";
 var handleUnifiedChat;
 var init_chatProcessing = __esm({
   "../core/src/serve/chatProcessing.ts"() {
@@ -11900,7 +12040,7 @@ ${inject}`;
       if (roots.length > 1) {
         let activeReal = getActiveWorkspaceRoot();
         try {
-          activeReal = fs36.realpathSync(activeReal);
+          activeReal = fs37.realpathSync(activeReal);
         } catch {
         }
         const lines = roots.map((r) => `- ${path39.basename(r) || r}: ${r}${r === activeReal ? "\uFF08\u9ED8\u8BA4\u6839\uFF1A\u76F8\u5BF9\u8DEF\u5F84/\u547D\u4EE4\u57FA\u51C6\uFF09" : "\uFF08\u53EF\u76F4\u63A5\u8BFB\u5199\uFF09"}`);
@@ -11997,7 +12137,7 @@ ${lines.join("\n")}
 });
 
 // ../core/src/session/fork.ts
-import fs37 from "fs/promises";
+import fs38 from "fs/promises";
 var listForkAnchors, derivePrefix, forkSession;
 var init_fork = __esm({
   "../core/src/session/fork.ts"() {
@@ -12069,7 +12209,7 @@ var init_fork = __esm({
       const prefix = derivePrefix(lines, upToLineId);
       const newId = createUUID();
       await ensureSessionsDir(newId);
-      const rawText = await fs37.readFile(getTranscriptPath(sourceId), "utf-8");
+      const rawText = await fs38.readFile(getTranscriptPath(sourceId), "utf-8");
       const kept = [];
       let good = 0;
       for (const s of rawText.split("\n")) {
@@ -12085,7 +12225,7 @@ var init_fork = __esm({
       }
       let payload = kept.join("\n");
       if (payload.length > 0 && !payload.endsWith("\n")) payload += "\n";
-      await fs37.writeFile(getTranscriptPath(newId), payload, "utf-8");
+      await fs38.writeFile(getTranscriptPath(newId), payload, "utf-8");
       const srcState = await readStore(sourceId);
       const srcRolling = await getRollingState(sourceId);
       const legacy = !lines.some(isEventLine);
@@ -12101,6 +12241,9 @@ var init_fork = __esm({
         rollingSummary,
         consecutiveFailures: 0,
         title: `${srcTitle}(\u5206\u53C9)`.slice(0, 200),
+        // ★ fork 血缘元数据：新 ID 是纯 UUID（字符串上无痕），血缘回溯全靠此字段
+        //   （session/lineage.ts 消费：审批网关归属 / 子 Agent 续跑归属）。
+        forkedFrom: sourceId,
         // ★ 校准数据透传：fork 首轮压缩判定不从 1.4 重来（纯收益，语义同源会话续接）
         calibRatio: srcRolling.calibRatio,
         lastRealPromptTokens: srcRolling.lastRealPromptTokens,
@@ -13661,8 +13804,8 @@ var init_SlashMenu = __esm({
     init_theme();
     MAX_ROWS = 10;
     SlashMenu = ({ entries, selectedIndex, cols }) => {
-      const visible = entries.slice(0, MAX_ROWS);
-      const more = entries.length > MAX_ROWS;
+      const start = entries.length <= MAX_ROWS ? 0 : Math.max(0, Math.min(selectedIndex - MAX_ROWS + 1, selectedIndex, entries.length - MAX_ROWS));
+      const visible = entries.slice(start, start + 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__ */ jsxs12(Box12, { flexDirection: "column", borderStyle: "round", borderColor: THEME.coral, paddingX: 1, paddingY: 0, marginTop: 1, children: [
@@ -13680,9 +13823,11 @@ var init_SlashMenu = __esm({
             /* @__PURE__ */ jsx14(Text14, { color: active ? THEME.gray : THEME.grayDim, children: desc })
           ] }, e.name);
         }),
-        more ? /* @__PURE__ */ jsxs12(Text14, { color: THEME.coralMuted, children: [
-          "\u2026 \u8FD8\u6709 ",
-          entries.length - MAX_ROWS,
+        entries.length > MAX_ROWS ? /* @__PURE__ */ jsxs12(Text14, { color: THEME.coralMuted, children: [
+          "\u2191\u2193 \u6EDA\u52A8 \xB7 ",
+          selectedIndex + 1,
+          "/",
+          entries.length,
           " \u6761"
         ] }) : null
       ] });
@@ -13778,11 +13923,11 @@ var init_TopPanel = __esm({
   }
 });
 
-// src/inspect.ts
-import fs38 from "fs";
+// ../core/src/observability/inspect.ts
+import fs39 from "fs";
 var CWD, fmt, readTrace, inspectUsage, inspectContext, inspectPermissions, inspectMcp, inspectHooks, inspectDebug;
 var init_inspect = __esm({
-  "src/inspect.ts"() {
+  "../core/src/observability/inspect.ts"() {
     "use strict";
     init_config();
     init_permissions();
@@ -13797,7 +13942,7 @@ var init_inspect = __esm({
       if (!sessionId) return [];
       try {
         const p = await getTraceStorePath(sessionId);
-        const text = await fs38.promises.readFile(p, "utf8");
+        const text = await fs39.promises.readFile(p, "utf8");
         const out = [];
         for (const line of text.split("\n")) {
           if (!line.trim()) continue;
@@ -13967,7 +14112,7 @@ var init_App = __esm({
       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 }) => {
+    App = ({ resumeSessionId, initialPlanMode, initialAutoMode, initialIncludeProject, engineReady }) => {
       const state = useChatState(resumeSessionId, initialPlanMode, initialAutoMode);
       const { exit } = useApp();
       const { stdout } = useStdout();
@@ -13979,6 +14124,16 @@ var init_App = __esm({
       const [selectIdx, setSelectIdx] = useState4(0);
       const [modelDisplay, setModelDisplay] = useState4(MODEL_NAME);
       const [tick, setTick] = useState4(0);
+      const [engineReadyFlag, setEngineReadyFlag] = useState4(false);
+      useEffect4(() => {
+        let alive = true;
+        void engineReady.then(() => {
+          if (alive) setEngineReadyFlag(true);
+        });
+        return () => {
+          alive = false;
+        };
+      }, [engineReady]);
       const [planEditing, setPlanEditing] = useState4(false);
       const [planDraft, setPlanDraft] = useState4("");
       const [planCursor, setPlanCursor] = useState4(0);
@@ -14092,7 +14247,7 @@ var init_App = __esm({
         for (const name of LOCAL_COMMAND_NAMES) map.set(name, { name, description: descOf(name) });
         for (const c of listCommands()) if (!map.has(c.name)) map.set(c.name, { name: c.name, description: c.description });
         return [...map.values()];
-      }, [tick]);
+      }, [tick, engineReadyFlag]);
       const filteredCommands = useMemo(() => {
         if (!input.startsWith("/")) return [];
         const q = input.slice(1).toLowerCase();
@@ -14256,12 +14411,18 @@ ${listText}`);
             return false;
         }
       };
+      const ensureEngine = async () => {
+        if (engineReadyFlag) return;
+        state.pushInfo("\u23F3 \u5F15\u64CE\u52A0\u8F7D\u4E2D\uFF08MCP/skills/commands\uFF09\u2026");
+        await engineReady;
+      };
       const executeSlash = async (fullText) => {
         const text = fullText.trim();
         if (!text.startsWith("/")) {
           await state.submit(text);
           return;
         }
+        await ensureEngine();
         if (await runLocalSlash(text)) return;
         const name = text.slice(1).split(/\s+/)[0] ?? "";
         if (listCommands().some((c) => c.name === name)) {
@@ -14288,6 +14449,7 @@ ${listText}`);
           await executeSlash(v);
           return;
         }
+        await ensureEngine();
         await state.submit(v);
       };
       const confirmPlanEdit = () => {
@@ -14657,9 +14819,9 @@ var main = async () => {
     Promise.resolve().then(() => (init_App(), App_exports)),
     Promise.resolve().then(() => (init_config(), config_exports))
   ]);
-  const dispose = await initEngine2(agentTools2, { includeProject });
+  const engineReady = initEngine2(agentTools2, { includeProject });
   const onExit = () => {
-    dispose();
+    void engineReady.then((dispose) => dispose());
   };
   process.on("SIGINT", () => {
     onExit();
@@ -14691,7 +14853,7 @@ var main = async () => {
     resumeId = await getMostRecentSessionId2() ?? void 0;
   }
   const { waitUntilExit } = render(
-    /* @__PURE__ */ jsx18(App2, { resumeSessionId: resumeId, initialPlanMode: args.plan, initialAutoMode: args.auto, initialIncludeProject: includeProject }),
+    /* @__PURE__ */ jsx18(App2, { resumeSessionId: resumeId, initialPlanMode: args.plan, initialAutoMode: args.auto, initialIncludeProject: includeProject, engineReady }),
     // exitOnCtrlC:false：Ctrl+C 交由 App useInput 处理（统一退出/中止语义）；
     // patchConsole:false：避免 console 劫持与全屏重绘叠加闪屏。
     { exitOnCtrlC: false, patchConsole: false }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "deepseeker-code",
-    "version": "1.0.42",
+    "version": "1.0.45",
     "description": "DeepSeeker-Code 终端客户端（React Ink，in-process 直驱 runAgent）",
     "homepage": "https://github.com/xknk/deepSeekCode#readme",
     "repository": {