deepseeker-code 1.0.60 → 1.0.61

package/dist/cli.mjs

@@ -4228,7 +4228,7 @@ async function killBackgroundTasksUnder(dirPath) {
   }
   return killed;
 }
-var _winShellCache, resolveWinShell, MAX_BUFFER_CHARS, registry, createBgTask, attachTaskLifecycle, makeTaskExitNotifier, adoptRunningProcess, backgroundTools, killAllBackgroundTasks;
+var _winShellCache, resolveWinShell, MAX_BUFFER_CHARS, registry, createBgTask, attachTaskLifecycle, makeTaskExitNotifier, adoptRunningProcess, BG_WAIT_SECONDS_CAP, clampWaitSeconds, backgroundTools, killAllBackgroundTasks;
 var init_background = __esm({
   "../core/src/tool/registry/background.ts"() {
     "use strict";
@@ -4393,6 +4393,8 @@ var init_background = __esm({
       void attachTaskLifecycle(task, proc, { signal: meta.signal, codec, onExit: meta.onExit });
       return task.taskId;
     };
+    BG_WAIT_SECONDS_CAP = 90;
+    clampWaitSeconds = (v) => Math.min(Math.max(0, Math.floor(v ?? 0)), BG_WAIT_SECONDS_CAP);
     backgroundTools = [
       {
         type: "function",
@@ -4481,13 +4483,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\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",
+          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\u6EE1 wait_seconds \u8FD4\u56DE\u5F53\u524D\u5FEB\u7167\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: "\u540E\u53F0\u4EFB\u52A1\u7684 task_id\uFF08run_in_background \u8FD4\u56DE\uFF0C\u6216 run_command \u8D85\u65F6\u81EA\u52A8\u8F6C\u540E\u53F0\u8FD4\u56DE\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" }
+              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 90 \u79D2\u2014\u2014\u987B\u4F4E\u4E8E\u8C03\u5EA6\u5C42 120s \u5DE5\u5177\u7194\u65AD\u7EBF\uFF0C\u66F4\u957F\u7684 wait \u4F1A\u88AB\u7194\u65AD\u3001\u771F\u5B9E\u7ED3\u679C\u88AB\u4E22\u5F03\u6362\u6210\u8D85\u65F6\u6587\u6848\u3002\u9884\u8BA1\u66F4\u4E45\u5C31\u4F20 90\uFF0C\u8FD4\u56DE\u4ECD running \u5C31\u518D\u8C03\u4E00\u6B21\u63A5\u7740\u7B49\uFF1B\u53EA\u770B\u5F53\u524D\u65E5\u5FD7\u5C31\u7701\u7565\u6B64\u53C2\u6570" }
             },
             required: ["task_id"]
           },
@@ -4498,7 +4500,7 @@ task_id: ${taskId}
             if (!task || task.sessionId !== ctx?.sessionId) {
               return toolFailure(`[\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;
+            const waitMs = clampWaitSeconds(args.wait_seconds) * 1e3;
             if (waitMs > 0 && task.status === "running") {
               const deadline = Date.now() + waitMs;
               while (task.status === "running" && Date.now() < deadline && !ctx?.abortSignal?.aborted) {
@@ -6027,13 +6029,17 @@ var init_toolResultCollect = __esm({
         const idleMs = Number(process.env.DEEP_SEEK_STREAM_IDLE_TIMEOUT_MS) || 12e4;
         while (true) {
           let timer2;
-          const outcome = await Promise.race([
-            ret.next().then((step) => ({ timedOut: false, step })),
-            new Promise((resolve) => {
-              timer2 = setTimeout(() => resolve({ timedOut: true }), idleMs);
-            })
-          ]);
-          if (timer2) clearTimeout(timer2);
+          let outcome;
+          try {
+            outcome = await Promise.race([
+              ret.next().then((step) => ({ timedOut: false, step })),
+              new Promise((resolve) => {
+                timer2 = setTimeout(() => resolve({ timedOut: true }), idleMs);
+              })
+            ]);
+          } finally {
+            if (timer2) clearTimeout(timer2);
+          }
           if (outcome.timedOut) {
             full += `
 
@@ -6054,18 +6060,22 @@ var init_toolResultCollect = __esm({
       const timeoutMs2 = Number(process.env.DEEP_SEEK_STREAM_IDLE_TIMEOUT_MS) || 12e4;
       let timer;
       let onAbort;
-      const raced = await Promise.race([
-        Promise.resolve(ret).then((v2) => ({ kind: "ok", value: v2 })),
-        new Promise((resolve) => {
-          timer = setTimeout(() => resolve({ kind: "timeout" }), timeoutMs2);
-        }),
-        ...signal ? [new Promise((resolve) => {
-          onAbort = () => resolve({ kind: "abort" });
-          signal.addEventListener("abort", onAbort, { once: true });
-        })] : []
-      ]);
-      if (timer) clearTimeout(timer);
-      if (onAbort && signal) signal.removeEventListener("abort", onAbort);
+      let raced;
+      try {
+        raced = await Promise.race([
+          Promise.resolve(ret).then((v2) => ({ kind: "ok", value: v2 })),
+          new Promise((resolve) => {
+            timer = setTimeout(() => resolve({ kind: "timeout" }), timeoutMs2);
+          }),
+          ...signal ? [new Promise((resolve) => {
+            onAbort = () => resolve({ kind: "abort" });
+            signal.addEventListener("abort", onAbort, { once: true });
+          })] : []
+        ]);
+      } finally {
+        if (timer) clearTimeout(timer);
+        if (onAbort && signal) signal.removeEventListener("abort", onAbort);
+      }
       if (raced.kind === "timeout") {
         return { content: `[\u23F3 \u5DE5\u5177\u6267\u884C\u8D85\u65F6\uFF08${Math.round(timeoutMs2 / 1e3)}s \u672A\u8FD4\u56DE\uFF09\uFF0C\u5DF2\u7194\u65AD\u8DF3\u8FC7\u3002\u8BE5\u5DE5\u5177\u53EF\u80FD hang \u6216\u4E0D\u54CD\u5E94\u4E2D\u6B62\u4FE1\u53F7\u3002]`, status: "failed", errorCategory: "runtime" };
       }
@@ -7801,9 +7811,15 @@ ${tail}`,
                 cwd,
                 detached: !isWin,
                 // 非 Win 下支持整个进程组独立
-                env: scrubCommandEnv(),
+                env: scrubCommandEnv()
                 // ★ 剔除 agent 自身凭证（LLM key / 服务端 token / 搜索 key），防 LLM 经 env/printenv 读取外泄
-                signal: ctx?.abortSignal
+                // ★ 中止唯一出口 = 下方 onAbort→killTree（2026-10-27 修「■ 终止无效」）：
+                //   勿把 signal 交给 spawn——Node 内部 abort 监听先于 onAbort 触发，TerminateProcess
+                //   只杀最外层进程；随后 killTree 的 taskkill /T 对已死根「找不到进程」直接失败，
+                //   孙进程（tsx 的 esbuild、node --test 的每文件子进程）存活并持有继承的 stdout 管道，
+                //   close 永不触发 → 工具永不结束（多层进程树命令下点终止永远转圈）。
+                //   根存活时 taskkill /T 才能整树剿灭；进入工具时已 aborted 由上方前置检查拦截，
+                //   pre-check 与 addEventListener 之间全同步无 await，无竞态窗口。
               });
             } catch (e) {
               yield toolFailure(`[\u542F\u52A8\u5931\u8D25]\uFF1Aspawn \u629B\u51FA\u5F02\u5E38\uFF08signal \u5DF2\u4E2D\u6B62\u6216\u547D\u4EE4\u975E\u6CD5\uFF09: ${e?.message ?? e}`).content;
@@ -7813,6 +7829,7 @@ ${tail}`,
             const queue = [];
             let settled = false;
             let exitCode = null;
+            let abortedByUser = false;
             let resolveWaiter = null;
             let idleTimer = null;
             const notifyNewData = () => {
@@ -7866,13 +7883,14 @@ ${tail}`,
               notifyNewData();
             });
             proc.on("close", (code) => {
-              exitCode ??= code == null ? -1 : code;
+              exitCode ??= abortedByUser ? -1 : code == null ? -1 : code;
               if (decoder) queue.push(decoder.decode());
               queue.push(pendingUtf8.decode());
               settled = true;
               notifyNewData();
             });
             const onAbort = () => {
+              abortedByUser = true;
               void killTree(proc);
             };
             ctx?.abortSignal?.addEventListener("abort", onAbort);
@@ -12033,7 +12051,7 @@ var init_autoPermission = __esm({
 
 // ../core/src/agent/toolExecution.ts
 import path36 from "path";
-var applyPrivacyMasking, scaleTruncBudget, failResult, emitValidationFailed, resolveEarlyOutcome, runSecurityGates, executeTool, finalizeOutcome, processToolCall;
+var applyPrivacyMasking, scaleTruncBudget, failResult, emitValidationFailed, resolveEarlyOutcome, runSecurityGates, executeTool, finalizeOutcome, previewArgs, processToolCall, processToolCallInner;
 var init_toolExecution = __esm({
   "../core/src/agent/toolExecution.ts"() {
     "use strict";
@@ -12305,7 +12323,9 @@ ${state.result}`;
       const { calledName, calledArgs, matchedTool } = state;
       state.result = applyPrivacyMasking(matchedTool?.function?.privacyMaskingRules, calledArgs, state.result);
       const fill = contextTokensEst !== void 0 && modelWindow > 0 ? contextTokensEst / modelWindow : void 0;
-      const truncBudget = scaleTruncBudget(matchedTool?.function?.maxOutputCharacters ?? appConfig.MAX_TOOL_RESULT_CHARS, fill);
+      const baseBudget = matchedTool?.function?.maxOutputCharacters ?? appConfig.MAX_TOOL_RESULT_CHARS;
+      const capped = ctx.batchBudgetChars !== void 0 ? Math.min(baseBudget, ctx.batchBudgetChars) : baseBudget;
+      const truncBudget = scaleTruncBudget(capped, fill);
       const sidecarNote = state.result.length > truncBudget ? await writeSidecarArchive(sessionId, String(toolCall.id), state.result) : void 0;
       state.result = truncateToolResult(state.result, truncBudget, sidecarNote);
       const resultStatus = state.resultStatus;
@@ -12322,7 +12342,7 @@ ${state.result}`;
       }
       if (state.postHookOverride !== void 0) {
         console.log(`\u270F\uFE0F [Post-hook] [${calledName}] \u6A21\u578B\u89C6\u56FE\u7ED3\u679C\u5DF2\u88AB hook \u6539\u5199`);
-        const overrideBudget = scaleTruncBudget(matchedTool?.function?.maxOutputCharacters ?? appConfig.MAX_TOOL_RESULT_CHARS, fill);
+        const overrideBudget = scaleTruncBudget(capped, fill);
         const overrideNote = state.postHookOverride.length > overrideBudget ? await writeSidecarArchive(sessionId, String(toolCall.id), state.postHookOverride) : void 0;
         resultForModel = truncateToolResult(state.postHookOverride, overrideBudget, overrideNote);
       }
@@ -12332,7 +12352,36 @@ ${state.result}`;
       }
       return { toolCallId: toolCall.id, calledName, calledArgs, resultForModel, resultForUser, ok, imageAttachments: state.imageAttachments };
     };
+    previewArgs = (raw, max) => raw === void 0 ? void 0 : raw.length > max ? raw.slice(0, max) + `\u2026\uFF08\u5171 ${raw.length} \u5B57\u7B26\uFF09` : raw;
     processToolCall = async (toolCall, ctx) => {
+      try {
+        return await processToolCallInner(toolCall, ctx);
+      } catch (e) {
+        const msg = e instanceof Error ? e.message : String(e);
+        console.error(`\u274C \u5DE5\u5177\u8C03\u7528\u5904\u7406\u5F02\u5E38\uFF08\u5DF2\u9694\u79BB\uFF0C\u4E0D\u5F71\u54CD\u540C\u6279\u5176\u4ED6\u5DE5\u5177\uFF09: ${msg}`);
+        try {
+          ctx.events({
+            sessionId: ctx.sessionId,
+            eventType: "tool.failed",
+            metadata: { depth: ctx.depth, decisionSource: ctx.llmDecisionSource, durationMs: performance.now() - ctx.startTime, round: ctx.round, tools_id: toolCall?.id ?? "", toolName: toolCall?.function?.name ?? "unknown", toolSource: "builtin", ok: false, attempt: ctx.round, errorCategory: "runtime" },
+            payload: { output: `\u5DE5\u5177\u6267\u884C\u5F02\u5E38\uFF1A${msg}` }
+          });
+        } catch {
+        }
+        return {
+          toolCallId: toolCall?.id ?? "",
+          calledName: toolCall?.function?.name ?? "unknown",
+          calledArgs: { _preview: previewArgs(toolCall?.function?.arguments, 300) },
+          // ★ 保留参数上下文（截断预览）：否则 tool.failed 排查时看不到模型当时传了什么
+          resultForModel: `\u5DE5\u5177\u6267\u884C\u5F02\u5E38\uFF1A${msg}\uFF08\u672C\u8C03\u7528\u5DF2\u9694\u79BB\uFF0C\u5176\u4ED6\u5DE5\u5177\u7ED3\u679C\u4E0D\u53D7\u5F71\u54CD\uFF09`,
+          resultForUser: `\u274C \u5DE5\u5177\u6267\u884C\u5F02\u5E38\uFF1A${msg}`,
+          ok: false,
+          aborted: ctx.signal?.aborted ? true : void 0
+          // ★ 不吞 abort
+        };
+      }
+    };
+    processToolCallInner = async (toolCall, ctx) => {
       const state = {
         calledName: "",
         calledArgs: {},
@@ -12354,7 +12403,9 @@ ${state.result}`;
         } catch {
           state.parseFailed = true;
         }
-        console.log(`\u{1F916} \u6A21\u578B\u8BF7\u6C42\u8C03\u7528\u5DE5\u5177: ${state.calledName}\uFF0C\u53C2\u6570:`, state.calledArgs);
+        const argsLog = JSON.stringify(state.calledArgs) ?? "";
+        const argsPreview = process.env.DSC_DEBUG_TOOL_ARGS === "1" ? argsLog : argsLog.length > 200 ? argsLog.slice(0, 200) + `\u2026\uFF08\u5171 ${argsLog.length} \u5B57\u7B26\uFF09` : argsLog;
+        console.log(`\u{1F916} \u6A21\u578B\u8BF7\u6C42\u8C03\u7528\u5DE5\u5177: ${state.calledName}\uFF0C\u53C2\u6570: ${argsPreview}`);
       }
       state.matchedTool = ctx.rawTools.find((t) => t.function.name === state.calledName);
       const early = resolveEarlyOutcome(ctx, toolCall, state);
@@ -12396,13 +12447,14 @@ ${state.result}`;
 });
 
 // ../core/src/agent/toolScheduling.ts
-var dedupeSameRoundCalls, scheduleToolCalls;
+var dedupeSameRoundCalls, BATCH_MIN_CHARS, BATCH_WINDOW_SHARE, CHAR_PER_TOKEN, computeBatchBudget, scheduleToolCalls;
 var init_toolScheduling = __esm({
   "../core/src/agent/toolScheduling.ts"() {
     "use strict";
     init_toolExecution();
     init_transcript();
     init_contentParts();
+    init_contextCore();
     init_config();
     init_tool();
     init_permissions();
@@ -12422,6 +12474,14 @@ var init_toolScheduling = __esm({
       }
       return { batch, plan };
     };
+    BATCH_MIN_CHARS = 12e3;
+    BATCH_WINDOW_SHARE = 0.5;
+    CHAR_PER_TOKEN = 4;
+    computeBatchBudget = (modelWindow, compactRatio, contextTokensEst, batchSize) => {
+      const budgetTokensLeft = Math.max(0, modelWindow * compactRatio - (contextTokensEst ?? 0));
+      const batchCapChars = Math.max(BATCH_MIN_CHARS, Math.floor(budgetTokensLeft * CHAR_PER_TOKEN * BATCH_WINDOW_SHARE));
+      return { batchCapChars, perToolCapChars: Math.floor(batchCapChars / batchSize) };
+    };
     scheduleToolCalls = async function* (assistantMessage, message, ctx) {
       const { sessionId, signal, rawTools } = ctx;
       let abortedDuringTools = false;
@@ -12490,7 +12550,10 @@ var init_toolScheduling = __esm({
             const bp = parseTc(p.tc);
             yield { type: "tool.start", toolCallId: p.tc.id, toolName: bp.name, args: bp.args };
           }
-          const outcomes = await Promise.all(batch.map((btc) => processToolCall(btc, ctx)));
+          const budget = batch.length >= 2 ? computeBatchBudget(ctx.modelWindow, ctx.compactRatio, ctx.contextTokensEst, batch.length) : void 0;
+          const tokensBefore = budget ? estimateTokens(message) : 0;
+          const batchCtx = budget ? { ...ctx, batchBudgetChars: budget.perToolCapChars } : ctx;
+          const outcomes = await Promise.all(batch.map((btc) => processToolCall(btc, batchCtx)));
           const outcomeByTc = /* @__PURE__ */ new Map();
           batch.forEach((btc, i) => outcomeByTc.set(btc, outcomes[i]));
           const batchEntries = [];
@@ -12514,6 +12577,34 @@ var init_toolScheduling = __esm({
             if (oc.aborted) abortedDuringTools = true;
           }
           await appendMessages(sessionId, batchEntries);
+          if (budget) {
+            try {
+              const tokensAfter = estimateTokens(message);
+              ctx.events({
+                sessionId,
+                eventType: "tool.batch.budget",
+                metadata: {
+                  depth: ctx.depth,
+                  decisionSource: ctx.llmDecisionSource,
+                  ok: true,
+                  durationMs: performance.now() - ctx.startTime,
+                  round: ctx.round,
+                  batchSize: batch.length,
+                  batchCapChars: budget.batchCapChars,
+                  perToolCapChars: budget.perToolCapChars
+                },
+                payload: {
+                  output: JSON.stringify({
+                    injectedChars: batch.map((btc) => outcomeByTc.get(btc)?.resultForModel.length ?? 0),
+                    tokensBefore,
+                    tokensAfter,
+                    tokensDelta: tokensAfter - tokensBefore
+                  })
+                }
+              });
+            } catch {
+            }
+          }
         } else {
           yield { type: "tool.start", toolCallId: tc.id, toolName: pname, args: pargs };
           const oc = await processToolCall(tc, ctx);
@@ -12644,9 +12735,10 @@ var init_streamInference = __esm({
         const MAX_STREAM_RETRIES = 2;
         const MAX_API_RETRIES = 3;
         let apiRetries = 0;
+        let idleRetries = 0;
         let compactedThisRound = false;
         let visionDegradedThisRound = false;
-        for (let streamAttempt = 0; ; streamAttempt++) {
+        for (; ; ) {
           try {
             for await (const chunk of activeProvider.streamChat(inferenceMessages, cleanedToolSchemas, { signal, model, thinkingLevel })) {
               if (signal?.aborted) break;
@@ -12692,10 +12784,11 @@ var init_streamInference = __esm({
               }
             );
             const noOutputYet = !contentBuf && !reasoningBuf && toolCallsBuf.size === 0;
-            if (isIdleTimeout && streamAttempt < MAX_STREAM_RETRIES) {
+            if (isIdleTimeout && idleRetries < MAX_STREAM_RETRIES) {
+              idleRetries++;
               if (!noOutputYet) yield { type: "text.reset" };
               const stallShape = noOutputYet ? "\uFF0C\u5C1A\u65E0\u8F93\u51FA" : hasCompleteToolCall ? "\uFF0C\u5DF2\u6709\u5B8C\u6574 tool_call\uFF08\u6D41\u5C3E\u90E8 stall\uFF09" : "\uFF0Ctool_call \u672A\u6D41\u5B8C";
-              console.warn(`\u26A0\uFE0F \u6D41\u5F0F stall\uFF08idle \u8D85\u65F6${stallShape}\uFF09\uFF0C\u7B2C ${streamAttempt + 1}/${MAX_STREAM_RETRIES} \u6B21\u91CD\u8BD5...`);
+              console.warn(`\u26A0\uFE0F \u6D41\u5F0F stall\uFF08idle \u8D85\u65F6${stallShape}\uFF09\uFF0C\u7B2C ${idleRetries}/${MAX_STREAM_RETRIES} \u6B21\u91CD\u8BD5...`);
               contentBuf = "";
               reasoningBuf = "";
               toolCallsBuf.clear();
@@ -13365,6 +13458,280 @@ var init_usageLog = __esm({
   }
 });
 
+// ../core/src/observability/store.ts
+import path38 from "path";
+import fs35 from "fs/promises";
+var getTraceDirPath, getTracePath, tracePathCache, ensuredTraceDirs, ensureTraceDir, getGlobalClockPath, getTraceStorePath;
+var init_store3 = __esm({
+  "../core/src/observability/store.ts"() {
+    "use strict";
+    init_config();
+    init_traceCalculate();
+    init_common();
+    getTraceDirPath = (mainTraceId) => {
+      assertSafeSessionId(mainTraceId, "traceId");
+      return path38.join(appConfig.dataDir, "trace", appConfig.userWorkspaceDir, getFileName(mainTraceId));
+    };
+    getTracePath = () => {
+      return path38.join(appConfig.dataDir, "trace");
+    };
+    tracePathCache = /* @__PURE__ */ new Map();
+    ensuredTraceDirs = /* @__PURE__ */ new Set();
+    ensureTraceDir = async (mainTraceId) => {
+      const dir = getTraceDirPath(mainTraceId);
+      if (ensuredTraceDirs.has(dir)) return;
+      await fs35.mkdir(dir, { recursive: true });
+      ensuredTraceDirs.add(dir);
+    };
+    getGlobalClockPath = () => {
+      return path38.join(getTracePath(), "trace-cleanup-clock.json");
+    };
+    getTraceStorePath = async (mainTraceId) => {
+      assertSafeSessionId(mainTraceId, "traceId");
+      const rootId = getFileName(mainTraceId);
+      const cached2 = tracePathCache.get(rootId);
+      if (cached2) return cached2;
+      await ensureTraceDir(rootId);
+      const dir = getTraceDirPath(rootId);
+      const files = await fs35.readdir(dir);
+      const existedFile = files.find((f) => f.endsWith(`__${rootId}.jsonl`));
+      let fileName = "";
+      if (existedFile) {
+        fileName = existedFile;
+      } else {
+        const todayStr = getTodayDateString();
+        fileName = `trace-${todayStr}__${rootId}.jsonl`;
+      }
+      const resolved = path38.join(dir, fileName);
+      tracePathCache.set(rootId, resolved);
+      return resolved;
+    };
+  }
+});
+
+// ../core/src/observability/trace.ts
+import fs36 from "fs/promises";
+import path39 from "path";
+async function emitTrace(base) {
+  const event = {
+    sessionId: base.sessionId,
+    parentId: base.parentId,
+    eventType: base.eventType,
+    timestamp: base.timestamp ?? (/* @__PURE__ */ new Date()).toISOString(),
+    usage: base.usage,
+    payload: base.payload,
+    metadata: {
+      ...base.metadata || {}
+    }
+  };
+  if (event.payload) {
+    if (typeof event.payload.input === "string") event.payload.input = truncateTracePayload(event.payload.input);
+    if (typeof event.payload.output === "string") event.payload.output = truncateTracePayload(event.payload.output);
+  }
+  try {
+    await appendTraceEvent(event);
+  } catch (error) {
+    console.warn("\u26A0\uFE0F [Trace] \u4E8B\u4EF6\u843D\u76D8\u5931\u8D25\uFF0C\u5DF2\u9632\u5FA1\u6027\u8DF3\u8FC7\uFF08\u4E0D\u5F71\u54CD\u4E3B\u4E1A\u52A1\uFF09:", error);
+  }
+}
+async function appendTraceEvent(event) {
+  const line = JSON.stringify(event) + "\n";
+  const arr = traceBuf.get(event.sessionId);
+  if (arr) arr.push(line);
+  else traceBuf.set(event.sessionId, [line]);
+  if (needImmediateFlush(event)) {
+    await flushTraceBuffer(event.sessionId);
+    return;
+  }
+  if ((traceBuf.get(event.sessionId)?.length ?? 0) >= TRACE_BATCH_LINES) {
+    await flushTraceBuffer(event.sessionId);
+    return;
+  }
+  scheduleTraceTimer(event.sessionId);
+}
+async function maybeCleanupAfterAppend(sessionId) {
+  if (cleanupInProgress2) return;
+  cleanupInProgress2 = true;
+  try {
+    await ensureClockLoaded2();
+    const now = Date.now();
+    const isTimeExpired = now - diskLastCleanupAt2 > CLEANUP_INTERVAL_MS2;
+    const isSizeOverflow = workspaceTraceBytes > MAX_TRACE_FOLDER_BYTES;
+    if (!isTimeExpired && !isSizeOverflow) return;
+    if (isSizeOverflow && !isTimeExpired && now - lastSizeCleanupAt2 < SIZE_CLEANUP_COOLDOWN_MS2) {
+      return;
+    }
+    const reason = isTimeExpired && isSizeOverflow ? "\u5BB9\u91CF+\u65F6\u95F4\u53CC\u95F8" : isSizeOverflow ? "\u5BB9\u91CF\u8D8A\u8FC750MB\u5927\u95F8" : "3\u5929\u51B7\u5374\u5468\u671F\u5DF2\u6EE1";
+    console.log(`\u{1F9F9} [Trace\u8FD0\u7EF4] \u89E6\u53D1\u81EA\u9002\u5E94\u6E05\u7406\uFF08\u539F\u56E0: ${reason}\uFF09`);
+    let deletedCount = 0;
+    deletedCount += await cleanupOldTraceFiles();
+    workspaceTraceBytes = await getDirBytes(getTracePath());
+    if (workspaceTraceBytes > MAX_TRACE_FOLDER_BYTES) {
+      const targetBytes = Math.floor(MAX_TRACE_FOLDER_BYTES * SIZE_RECLAIM_TARGET_RATIO2);
+      deletedCount += await evictOldestForSize2(targetBytes);
+      workspaceTraceBytes = await getDirBytes(getTracePath());
+    }
+    lastSizeCleanupAt2 = now;
+    diskLastCleanupAt2 = now;
+    const clockPath = getGlobalClockPath();
+    await fs36.mkdir(path39.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`);
+    }
+  } catch (error) {
+    console.warn("\u26A0\uFE0F [Trace\u8FD0\u7EF4] \u81EA\u52A8\u6E05\u7406\u53D1\u751F\u8F7B\u5FAE\u5F02\u5E38\uFF0C\u5DF2\u9632\u5FA1\u6027\u8DF3\u8FC7:", error);
+  } finally {
+    cleanupInProgress2 = false;
+  }
+}
+async function cleanupOldTraceFiles() {
+  const dir = getTracePath();
+  const retentionDays = Math.max(1, appConfig.traceRetentionDays || 7);
+  const cutoff = /* @__PURE__ */ new Date();
+  cutoff.setHours(0, 0, 0, 0);
+  cutoff.setDate(cutoff.getDate() - retentionDays);
+  const now = Date.now();
+  let deleted = 0;
+  let relativePaths;
+  try {
+    relativePaths = await fs36.readdir(dir, { recursive: true });
+  } catch {
+    return 0;
+  }
+  const re = /^trace-(\d{4}-\d{2}-\d{2})__([\w-]+)\.jsonl$/;
+  for (const relativePath of relativePaths) {
+    const fileName = path39.basename(relativePath);
+    const m = fileName.match(re);
+    if (!m) continue;
+    const fileBornDay = /* @__PURE__ */ new Date(`${m[1]}T00:00:00`);
+    if (fileBornDay >= cutoff) continue;
+    const fullPath = path39.join(dir, relativePath);
+    try {
+      const st = await fs36.stat(fullPath);
+      if (now - st.mtimeMs < ACTIVE_GRACE_MS2) continue;
+      await fs36.unlink(fullPath);
+      deleted += 1;
+    } catch {
+    }
+  }
+  return deleted;
+}
+async function evictOldestForSize2(targetBytes) {
+  const dir = getTracePath();
+  let relativePaths;
+  try {
+    relativePaths = await fs36.readdir(dir, { recursive: true });
+  } catch {
+    return 0;
+  }
+  const re = /^trace-(\d{4}-\d{2}-\d{2})__([\w-]+)\.jsonl$/;
+  const candidates = [];
+  for (const relativePath of relativePaths) {
+    const fileName = path39.basename(relativePath);
+    if (!re.test(fileName)) continue;
+    try {
+      const st = await fs36.stat(path39.join(dir, relativePath));
+      candidates.push({ mtime: st.mtimeMs, fullPath: path39.join(dir, relativePath), size: st.size });
+    } catch {
+    }
+  }
+  candidates.sort((a, b) => a.mtime - b.mtime);
+  let totalBytes = candidates.reduce((sum, c) => sum + c.size, 0);
+  let deleted = 0;
+  for (const c of candidates) {
+    if (totalBytes <= targetBytes) break;
+    try {
+      await fs36.unlink(c.fullPath);
+      totalBytes -= c.size;
+      deleted += 1;
+    } catch {
+    }
+  }
+  if (deleted > 0) {
+    console.warn(`\u26A0\uFE0F [Trace\u8FD0\u7EF4] \u5BB9\u91CF\u786C\u9A71\u9010\uFF1A\u8D8A\u8FC7\u6D3B\u8DC3\u4FDD\u62A4\u5F3A\u5220 ${deleted} \u4E2A\u6700\u65E7 trace \u6587\u4EF6\uFF08\u78C1\u76D8\u538B\u529B\u515C\u5E95\uFF09\u3002`);
+  }
+  return deleted;
+}
+var CLEANUP_INTERVAL_MS2, ACTIVE_GRACE_MS2, MAX_TRACE_FOLDER_BYTES, SIZE_RECLAIM_TARGET_RATIO2, SIZE_CLEANUP_COOLDOWN_MS2, workspaceTraceBytes, diskLastCleanupAt2, clockLoaded2, lastSizeCleanupAt2, cleanupInProgress2, TRACE_BATCH_LINES, TRACE_BATCH_MS, traceBuf, traceTimers, cleanupTriggerCount, needImmediateFlush, scheduleTraceTimer, flushTraceBuffer, ensureClockLoaded2, tracePayloadMaxChars, truncateTracePayload;
+var init_trace = __esm({
+  "../core/src/observability/trace.ts"() {
+    "use strict";
+    init_config();
+    init_store3();
+    init_traceCalculate();
+    CLEANUP_INTERVAL_MS2 = 3 * 24 * 60 * 60 * 1e3;
+    ACTIVE_GRACE_MS2 = 24 * 60 * 60 * 1e3;
+    MAX_TRACE_FOLDER_BYTES = 50 * 1024 * 1024;
+    SIZE_RECLAIM_TARGET_RATIO2 = 0.8;
+    SIZE_CLEANUP_COOLDOWN_MS2 = 60 * 1e3;
+    workspaceTraceBytes = -1;
+    diskLastCleanupAt2 = 0;
+    clockLoaded2 = false;
+    lastSizeCleanupAt2 = 0;
+    cleanupInProgress2 = false;
+    TRACE_BATCH_LINES = 50;
+    TRACE_BATCH_MS = 200;
+    traceBuf = /* @__PURE__ */ new Map();
+    traceTimers = /* @__PURE__ */ new Map();
+    cleanupTriggerCount = 0;
+    needImmediateFlush = (ev) => ev.metadata?.ok === false || ev.eventType === "user.aborted" || ev.eventType === "tool.repeat_break" || ev.eventType === "session.end";
+    scheduleTraceTimer = (sessionId) => {
+      if (traceTimers.has(sessionId)) return;
+      const t = setTimeout(() => {
+        traceTimers.delete(sessionId);
+        void flushTraceBuffer(sessionId);
+      }, TRACE_BATCH_MS);
+      t.unref?.();
+      traceTimers.set(sessionId, t);
+    };
+    flushTraceBuffer = async (sessionId) => {
+      const ids = sessionId !== void 0 ? [sessionId] : [...traceBuf.keys()];
+      for (const id of ids) {
+        const arr = traceBuf.get(id);
+        if (!arr || arr.length === 0) {
+          traceBuf.delete(id);
+          continue;
+        }
+        traceBuf.set(id, []);
+        const timer = traceTimers.get(id);
+        if (timer) {
+          clearTimeout(timer);
+          traceTimers.delete(id);
+        }
+        try {
+          const joined = arr.join("");
+          const p = await getTraceStorePath(id);
+          await fs36.appendFile(p, joined, "utf-8");
+          if (workspaceTraceBytes < 0) {
+            workspaceTraceBytes = await getDirBytes(getTracePath());
+          }
+          workspaceTraceBytes += Buffer.byteLength(joined, "utf-8");
+          cleanupTriggerCount++;
+          void maybeCleanupAfterAppend(id);
+        } catch (error) {
+          console.warn("\u26A0\uFE0F [Trace] \u6279\u91CF\u843D\u76D8\u5931\u8D25\uFF0C\u4E22\u5F03\u8BE5\u6279\uFF08\u4E0D\u5F71\u54CD\u4E3B\u4E1A\u52A1\uFF09:", error);
+        }
+      }
+    };
+    ensureClockLoaded2 = async () => {
+      if (clockLoaded2) return;
+      clockLoaded2 = true;
+      try {
+        const rawClock = await fs36.readFile(getGlobalClockPath(), "utf-8");
+        diskLastCleanupAt2 = JSON.parse(rawClock).lastCleanupAt || 0;
+      } catch {
+        diskLastCleanupAt2 = 0;
+      }
+    };
+    tracePayloadMaxChars = () => Number(process.env.TRACE_PAYLOAD_MAX_CHARS) || 2e3;
+    truncateTracePayload = (s) => {
+      const max = tracePayloadMaxChars();
+      return s.length > max ? s.slice(0, max) + `\u2026[trace \u622A\u65AD ${s.length - max} \u5B57\u7B26\uFF08\u5171 ${s.length} \u5B57\u7B26\uFF09]` : s;
+    };
+  }
+});
+
 // ../core/src/agent/runAgent.ts
 async function* runAgent(message, options) {
   const sessionId = options.sessionId;
@@ -13633,7 +14000,10 @@ async function* runAgent(message, options) {
           nudges.notePlanWriteRejected(planWriteRej);
         },
         // ★ P1-5 子任务预算熔断：runSubagent 经 toolCtx.budgetCheck 拿到探测闭包，子 runAgent 每轮边界自检
-        budgetCheck: inheritedBudgetCheck
+        budgetCheck: inheritedBudgetCheck,
+        // ★ A 批批级预算：主循环不设（undefined）；仅并行批 ≥2 时由调度层浅拷贝下发（R4/R5：
+        //   required 字段，构造处显式对齐，漏写即 tsc 打红）
+        batchBudgetChars: void 0
       };
       const scheduleResult = yield* scheduleToolCalls(assistantMessage, message, toolCallCtx);
       if (scheduleResult.kind === "aborted") {
@@ -13673,6 +14043,10 @@ async function* runAgent(message, options) {
       await appendEvent(sessionId, { dscEvent: "run.end", runId, stopReason: signal?.aborted ? "aborted" : stopReason, rounds: round, usage: ledger.usageSummary() });
     } catch {
     }
+    try {
+      await flushTraceBuffer();
+    } catch {
+    }
     try {
       const us = ledger.usageSummary();
       void recordUsageRun({
@@ -13751,6 +14125,7 @@ var init_runAgent = __esm({
     init_agentNudges();
     init_runLedger();
     init_usageLog();
+    init_trace();
     init_createModel();
     CALIB_EMA_KEEP = 0.6;
     CALIB_EMA_NEW = 0.4;
@@ -13770,7 +14145,7 @@ var init_runAgent = __esm({
 });
 
 // ../core/src/session/lineage.ts
-import fs35 from "node:fs";
+import fs37 from "node:fs";
 var parentOfSubsession, stringAncestorsOf, readForkedFromSync, lineageClosureOf, ownerCanApprove;
 var init_lineage = __esm({
   "../core/src/session/lineage.ts"() {
@@ -13793,7 +14168,7 @@ var init_lineage = __esm({
     };
     readForkedFromSync = (sessionId) => {
       try {
-        const raw = fs35.readFileSync(getStatePath(sessionId), "utf-8");
+        const raw = fs37.readFileSync(getStatePath(sessionId), "utf-8");
         const v = JSON.parse(raw)?.forkedFrom;
         return typeof v === "string" && v.length > 0 ? v : void 0;
       } catch {
@@ -13922,6 +14297,7 @@ var init_subagent = __esm({
           sessionId: ""
         };
       }
+      const SUBAGENT_REPORT_REQ = `\u3010\u6C47\u62A5\u8981\u6C42\u3011\u6700\u7EC8\u6C47\u62A5\u63A7\u5236\u5728\u4E00\u5C4F\u5185\uFF1A\u5DF2\u5B8C\u6210/\u6539\u52A8\u70B9\uFF08\u6587\u4EF6\u8DEF\u5F84\uFF09/\u9A8C\u8BC1\u7ED3\u679C/\u672A\u5B8C\u6210\u9879\u3002\u4E0D\u8981\u590D\u8FF0\u8FC7\u7A0B\u4E0E\u5DE5\u5177\u8F93\u51FA\u2014\u2014\u7236\u7EA7\u53EF\u76F4\u63A5\u7ECF resume \u8FFD\u95EE\u7EC6\u8282\u3002`;
       const subSystem = manifest ? [
         `# \u5B50 Agent \u8EAB\u4EFD\uFF1A${manifest.name}`,
         manifest.body,
@@ -13930,7 +14306,8 @@ var init_subagent = __esm({
         `\u5F53\u524D\u6240\u5904\u7684\u4EFB\u52A1\u6267\u884C\u5D4C\u5957\u6DF1\u5EA6: Depth ${ctx.depth + 1} / ${MAX_AGENT_DEPTH}`,
         `
 # \u3010\u7EE7\u627F\u7684\u5168\u5C40\u4EE3\u7801\u89C4\u8303\u3011`,
-        parentSystemPrompt
+        parentSystemPrompt,
+        SUBAGENT_REPORT_REQ
       ].filter(Boolean).join("\n") : [
         `# \u4EFB\u52A1\u4E0A\u4E0B\u6587`,
         `\u5F53\u524D\u6240\u5904\u7684\u4EFB\u52A1\u6267\u884C\u5D4C\u5957\u6DF1\u5EA6: Depth ${ctx.depth + 1} / ${MAX_AGENT_DEPTH}`,
@@ -13939,7 +14316,8 @@ var init_subagent = __esm({
         `\u4F60\u76F4\u63A5\u5171\u4EAB\u5E76\u64CD\u4F5C\u672C\u5730\u6587\u4EF6\u7CFB\u7EDF\u3002\u5F53\u4F60\u5BF9\u6587\u4EF6\u5168\u91CF\u5199\u5165\u6216\u5C40\u90E8\u4FEE\u6539\u65F6\uFF0C\u5FC5\u987B\u786E\u4FDD\u64CD\u4F5C\u7684\u7EDD\u5BF9\u7CBE\u51C6\u3002\u5B8C\u6210\u6307\u5B9A\u5B50\u4EFB\u52A1\u540E\uFF0C\u8BF7\u4F7F\u7528\u6700\u7EC8\u7684\u6587\u672C\u603B\u7ED3\u5411\u7236\u7EA7 Agent \u4EA4\u4ED8\u7ED3\u679C\u3002`,
         `
 # \u3010\u7EE7\u627F\u7684\u5168\u5C40\u4EE3\u7801\u89C4\u8303\u3011`,
-        parentSystemPrompt
+        parentSystemPrompt,
+        SUBAGENT_REPORT_REQ
       ].join("\n");
       const subTaskPrompt = [
         role ? manifest ? `# \u672C\u6B21\u89D2\u8272\u8865\u5145: ${role}` : `\u3010\u4F60\u7684\u4E13\u5C5E\u89D2\u8272\u3011: ${role}` : manifest ? "" : `\u3010\u4F60\u7684\u4E13\u5C5E\u89D2\u8272\u3011: \u4E13\u6CE8\u6267\u884C\u7279\u5B9A\u5C40\u90E8\u5B50\u4EFB\u52A1\u7684\u72EC\u7ACB\u667A\u80FD\u4F53\u52A9\u624B`,
@@ -14033,15 +14411,15 @@ var init_subagent = __esm({
 });
 
 // ../core/src/hooks/trust.ts
-import path38 from "path";
-import fs36 from "fs/promises";
+import path40 from "path";
+import fs38 from "fs/promises";
 var TRUSTED_HOOKS_FILE, approved, loaded, ensureLoaded, isHookCommandApproved, approveHookCommand;
 var init_trust2 = __esm({
   "../core/src/hooks/trust.ts"() {
     "use strict";
     init_config();
     init_common();
-    TRUSTED_HOOKS_FILE = path38.join(appConfig.dataDir, "trusted_hooks.json");
+    TRUSTED_HOOKS_FILE = path40.join(appConfig.dataDir, "trusted_hooks.json");
     approved = /* @__PURE__ */ new Set();
     loaded = false;
     ensureLoaded = async () => {
@@ -14061,7 +14439,7 @@ var init_trust2 = __esm({
       if (approved.has(ident)) return;
       approved.add(ident);
       try {
-        await fs36.mkdir(appConfig.dataDir, { recursive: true });
+        await fs38.mkdir(appConfig.dataDir, { recursive: true });
         await atomicWriteJSON(TRUSTED_HOOKS_FILE, [...approved]);
       } catch (e) {
         console.warn(`\u26A0\uFE0F [hooks] \u5BA1\u6279\u8BB0\u5FC6\u843D\u76D8\u5931\u8D25\uFF08\u672C\u6B21\u5DF2\u653E\u884C\uFF0C\u4E0B\u6B21\u9996\u8DD1\u4F1A\u518D\u95EE\uFF09: ${e?.message ?? e}`);
@@ -14071,8 +14449,8 @@ var init_trust2 = __esm({
 });
 
 // ../core/src/hooks/loader.ts
-import fs37 from "fs/promises";
-import path39 from "path";
+import fs39 from "fs/promises";
+import path41 from "path";
 var slimHookContext, readHooksConfig, appendValidated, validateRule, parseStdoutDecision, parseAgentDecision, gateSeq, firstRunGate, compileRule2, loadHooks, initHooks;
 var init_loader4 = __esm({
   "../core/src/hooks/loader.ts"() {
@@ -14101,15 +14479,15 @@ var init_loader4 = __esm({
     readHooksConfig = async (includeProject) => {
       const merged = {};
       const paths = [
-        path39.join(appConfig.dataDir, "settings.json"),
+        path41.join(appConfig.dataDir, "settings.json"),
         // 全局用户级
-        ...includeProject ? [path39.join(process.cwd(), ".deepseeker-code", "settings.json")] : []
+        ...includeProject ? [path41.join(process.cwd(), ".deepseeker-code", "settings.json")] : []
         // 项目级（叠加）；未信任时省略
       ];
       for (const configPath of paths) {
         let raw;
         try {
-          raw = await fs37.readFile(configPath, "utf-8");
+          raw = await fs39.readFile(configPath, "utf-8");
         } catch {
           continue;
         }
@@ -14482,8 +14860,8 @@ ${m.context}`;
 });
 
 // ../core/src/skills/loader.ts
-import fs38 from "fs/promises";
-import path40 from "path";
+import fs40 from "fs/promises";
+import path42 from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 var BUILTIN_DIR, SOURCES2, MAX_SKILL_BODY_BYTES, splitList, parseSkillAt, loadSkills, initSkills;
 var init_loader5 = __esm({
@@ -14494,18 +14872,18 @@ var init_loader5 = __esm({
     init_registry3();
     init_skill();
     init_registry2();
-    BUILTIN_DIR = path40.join(path40.dirname(fileURLToPath2(import.meta.url)), "builtin");
+    BUILTIN_DIR = path42.join(path42.dirname(fileURLToPath2(import.meta.url)), "builtin");
     SOURCES2 = [
       { dir: BUILTIN_DIR, source: "builtin" },
-      { dir: path40.join(appConfig.dataDir, "skills"), source: "global" },
-      { dir: path40.join(process.cwd(), ".deepseeker-code", "skills"), source: "project" }
+      { dir: path42.join(appConfig.dataDir, "skills"), source: "global" },
+      { dir: path42.join(process.cwd(), ".deepseeker-code", "skills"), source: "project" }
     ];
     MAX_SKILL_BODY_BYTES = 64 * 1024;
     splitList = (raw) => (raw ?? "").split(",").map((s) => s.trim()).filter(Boolean);
     parseSkillAt = async (skillFile, dir, source) => {
       let raw;
       try {
-        raw = await fs38.readFile(skillFile, "utf-8");
+        raw = await fs40.readFile(skillFile, "utf-8");
       } catch {
         return null;
       }
@@ -14544,7 +14922,7 @@ var init_loader5 = __esm({
     loadSkills = async (includeProject) => {
       const picked = await scanSources(
         filterSources(SOURCES2, includeProject),
-        (e, dir) => e.isDirectory() ? path40.join(dir, e.name, "SKILL.md") : void 0,
+        (e, dir) => e.isDirectory() ? path42.join(dir, e.name, "SKILL.md") : void 0,
         parseSkillAt
       );
       for (const { item } of picked) registerSkill(item);
@@ -14575,8 +14953,8 @@ var init_loader5 = __esm({
 });
 
 // ../core/src/agents/loader.ts
-import fs39 from "fs/promises";
-import path41 from "path";
+import fs41 from "fs/promises";
+import path43 from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 var BUILTIN_DIR2, SOURCES3, parseAgentAt, initAgents;
 var init_loader6 = __esm({
@@ -14586,16 +14964,16 @@ var init_loader6 = __esm({
     init_frontmatter();
     init_registry4();
     init_registry2();
-    BUILTIN_DIR2 = path41.join(path41.dirname(fileURLToPath3(import.meta.url)), "builtin");
+    BUILTIN_DIR2 = path43.join(path43.dirname(fileURLToPath3(import.meta.url)), "builtin");
     SOURCES3 = [
       { dir: BUILTIN_DIR2, source: "builtin" },
-      { dir: path41.join(appConfig.dataDir, "agents"), source: "global" },
-      { dir: path41.join(process.cwd(), ".deepseeker-code", "agents"), source: "project" }
+      { dir: path43.join(appConfig.dataDir, "agents"), source: "global" },
+      { dir: path43.join(process.cwd(), ".deepseeker-code", "agents"), source: "project" }
     ];
     parseAgentAt = async (file, dir, source) => {
       let raw;
       try {
-        raw = await fs39.readFile(file, "utf-8");
+        raw = await fs41.readFile(file, "utf-8");
       } catch {
         return null;
       }
@@ -14630,7 +15008,7 @@ var init_loader6 = __esm({
         const known = new Set(into.map((t) => t.function.name));
         const picked = await scanSources(
           filterSources(SOURCES3, includeProject),
-          (e, dir) => e.isFile() && e.name.endsWith(".agent.md") ? path41.join(dir, e.name) : void 0,
+          (e, dir) => e.isFile() && e.name.endsWith(".agent.md") ? path43.join(dir, e.name) : void 0,
           parseAgentAt
         );
         for (const { item: m, file, source } of picked) {
@@ -14667,8 +15045,8 @@ var init_registry7 = __esm({
 });
 
 // ../core/src/commands/loader.ts
-import fs40 from "fs/promises";
-import path42 from "path";
+import fs42 from "fs/promises";
+import path44 from "path";
 import { fileURLToPath as fileURLToPath4 } from "url";
 var BUILTIN_DIR3, SOURCES4, MAX_COMMAND_BODY_BYTES, parseCommandAt, loadCommands, initCommands;
 var init_loader7 = __esm({
@@ -14678,17 +15056,17 @@ var init_loader7 = __esm({
     init_frontmatter();
     init_registry7();
     init_registry2();
-    BUILTIN_DIR3 = path42.join(path42.dirname(fileURLToPath4(import.meta.url)), "builtin");
+    BUILTIN_DIR3 = path44.join(path44.dirname(fileURLToPath4(import.meta.url)), "builtin");
     SOURCES4 = [
       { dir: BUILTIN_DIR3, source: "builtin" },
-      { dir: path42.join(appConfig.dataDir, "commands"), source: "global" },
-      { dir: path42.join(process.cwd(), ".deepseeker-code", "commands"), source: "project" }
+      { dir: path44.join(appConfig.dataDir, "commands"), source: "global" },
+      { dir: path44.join(process.cwd(), ".deepseeker-code", "commands"), source: "project" }
     ];
     MAX_COMMAND_BODY_BYTES = 64 * 1024;
     parseCommandAt = async (file, _dir, source) => {
       let raw;
       try {
-        raw = await fs40.readFile(file, "utf-8");
+        raw = await fs42.readFile(file, "utf-8");
       } catch {
         return null;
       }
@@ -14699,7 +15077,7 @@ var init_loader7 = __esm({
       }
       const name = parsed.frontmatter.name;
       const description = parsed.frontmatter.description;
-      const fallbackName = path42.basename(file, ".md");
+      const fallbackName = path44.basename(file, ".md");
       const finalName = name || fallbackName;
       if (!description) {
         console.warn(`\u26A0\uFE0F [commands] \u7F3A\u5C11 description\uFF08${file}\uFF09\uFF0C\u5DF2\u8DF3\u8FC7`);
@@ -14725,7 +15103,7 @@ var init_loader7 = __esm({
     loadCommands = async (includeProject) => {
       const picked = await scanSources(
         filterSources(SOURCES4, includeProject),
-        (e, dir) => e.isFile() && e.name.endsWith(".md") ? path42.join(dir, e.name) : void 0,
+        (e, dir) => e.isFile() && e.name.endsWith(".md") ? path44.join(dir, e.name) : void 0,
         parseCommandAt
       );
       for (const { item } of picked) registerCommand(item);
@@ -14743,8 +15121,8 @@ var init_loader7 = __esm({
 });
 
 // ../core/src/outputStyles/loader.ts
-import fs41 from "fs/promises";
-import path43 from "path";
+import fs43 from "fs/promises";
+import path45 from "path";
 import { fileURLToPath as fileURLToPath5 } from "url";
 var BUILTIN_DIR4, MAX_STYLE_BODY_BYTES, SOURCES5, parseStyleAt, loadOutputStyles, initOutputStyles;
 var init_loader8 = __esm({
@@ -14754,17 +15132,17 @@ var init_loader8 = __esm({
     init_frontmatter();
     init_registry5();
     init_registry2();
-    BUILTIN_DIR4 = path43.join(path43.dirname(fileURLToPath5(import.meta.url)), "builtin");
+    BUILTIN_DIR4 = path45.join(path45.dirname(fileURLToPath5(import.meta.url)), "builtin");
     MAX_STYLE_BODY_BYTES = 64 * 1024;
     SOURCES5 = [
       { dir: BUILTIN_DIR4, source: "builtin" },
-      { dir: path43.join(appConfig.dataDir, "output-styles"), source: "global" },
-      { dir: path43.join(process.cwd(), ".deepseeker-code", "output-styles"), source: "project" }
+      { dir: path45.join(appConfig.dataDir, "output-styles"), source: "global" },
+      { dir: path45.join(process.cwd(), ".deepseeker-code", "output-styles"), source: "project" }
     ];
     parseStyleAt = async (file, _dir, source) => {
       let raw;
       try {
-        raw = await fs41.readFile(file, "utf-8");
+        raw = await fs43.readFile(file, "utf-8");
       } catch {
         return null;
       }
@@ -14796,7 +15174,7 @@ var init_loader8 = __esm({
     loadOutputStyles = async (includeProject) => {
       const picked = await scanSources(
         filterSources(SOURCES5, includeProject),
-        (e, dir) => e.isFile() && e.name.endsWith(".md") ? path43.join(dir, e.name) : void 0,
+        (e, dir) => e.isFile() && e.name.endsWith(".md") ? path45.join(dir, e.name) : void 0,
         parseStyleAt
       );
       for (const { item } of picked) registerOutputStyle(item);
@@ -14877,8 +15255,8 @@ var init_bootstrap = __esm({
 });
 
 // ../core/src/statusLine/config.ts
-import fs42 from "fs/promises";
-import path44 from "path";
+import fs44 from "fs/promises";
+import path46 from "path";
 var parseBlock, readStatusLineConfig;
 var init_config2 = __esm({
   "../core/src/statusLine/config.ts"() {
@@ -14894,16 +15272,16 @@ var init_config2 = __esm({
     };
     readStatusLineConfig = async (includeProject) => {
       const paths = [
-        path44.join(appConfig.dataDir, "settings.json"),
+        path46.join(appConfig.dataDir, "settings.json"),
         // 全局用户级
-        ...includeProject ? [path44.join(process.cwd(), ".deepseeker-code", "settings.json")] : []
+        ...includeProject ? [path46.join(process.cwd(), ".deepseeker-code", "settings.json")] : []
         // 项目级（覆盖）；未信任时省略
       ];
       let result = null;
       for (const configPath of paths) {
         let raw;
         try {
-          raw = await fs42.readFile(configPath, "utf-8");
+          raw = await fs44.readFile(configPath, "utf-8");
         } catch {
           continue;
         }
@@ -14923,8 +15301,8 @@ var init_config2 = __esm({
 
 // ../core/src/statusLine/runner.ts
 import { spawn as spawn5 } from "child_process";
-import fs43 from "fs";
-import path45 from "path";
+import fs45 from "fs";
+import path47 from "path";
 import { fileURLToPath as fileURLToPath6 } from "url";
 var STATUSLINE_TIMEOUT_MS, cachedVersion, runStatusLine;
 var init_runner = __esm({
@@ -14933,16 +15311,16 @@ var init_runner = __esm({
     init_guard();
     STATUSLINE_TIMEOUT_MS = 3e3;
     try {
-      const here = path45.dirname(fileURLToPath6(import.meta.url));
+      const here = path47.dirname(fileURLToPath6(import.meta.url));
       const candidates = [
-        path45.join(here, "../../../package.json"),
+        path47.join(here, "../../../package.json"),
         // src/core/package.json
-        path45.join(here, "../../../../package.json")
+        path47.join(here, "../../../../package.json")
         // 仓库根 package.json
       ];
       for (const p of candidates) {
         try {
-          const pkg = JSON.parse(fs43.readFileSync(p, "utf-8"));
+          const pkg = JSON.parse(fs45.readFileSync(p, "utf-8"));
           if (typeof pkg.version === "string" && pkg.version) {
             cachedVersion = pkg.version;
             break;
@@ -14992,222 +15370,6 @@ var init_runner = __esm({
   }
 });
 
-// ../core/src/observability/store.ts
-import path46 from "path";
-import fs44 from "fs/promises";
-var getTraceDirPath, getTracePath, tracePathCache, ensuredTraceDirs, ensureTraceDir, getGlobalClockPath, getTraceStorePath;
-var init_store3 = __esm({
-  "../core/src/observability/store.ts"() {
-    "use strict";
-    init_config();
-    init_traceCalculate();
-    init_common();
-    getTraceDirPath = (mainTraceId) => {
-      assertSafeSessionId(mainTraceId, "traceId");
-      return path46.join(appConfig.dataDir, "trace", appConfig.userWorkspaceDir, getFileName(mainTraceId));
-    };
-    getTracePath = () => {
-      return path46.join(appConfig.dataDir, "trace");
-    };
-    tracePathCache = /* @__PURE__ */ new Map();
-    ensuredTraceDirs = /* @__PURE__ */ new Set();
-    ensureTraceDir = async (mainTraceId) => {
-      const dir = getTraceDirPath(mainTraceId);
-      if (ensuredTraceDirs.has(dir)) return;
-      await fs44.mkdir(dir, { recursive: true });
-      ensuredTraceDirs.add(dir);
-    };
-    getGlobalClockPath = () => {
-      return path46.join(getTracePath(), "trace-cleanup-clock.json");
-    };
-    getTraceStorePath = async (mainTraceId) => {
-      assertSafeSessionId(mainTraceId, "traceId");
-      const rootId = getFileName(mainTraceId);
-      const cached2 = tracePathCache.get(rootId);
-      if (cached2) return cached2;
-      await ensureTraceDir(rootId);
-      const dir = getTraceDirPath(rootId);
-      const files = await fs44.readdir(dir);
-      const existedFile = files.find((f) => f.endsWith(`__${rootId}.jsonl`));
-      let fileName = "";
-      if (existedFile) {
-        fileName = existedFile;
-      } else {
-        const todayStr = getTodayDateString();
-        fileName = `trace-${todayStr}__${rootId}.jsonl`;
-      }
-      const resolved = path46.join(dir, fileName);
-      tracePathCache.set(rootId, resolved);
-      return resolved;
-    };
-  }
-});
-
-// ../core/src/observability/trace.ts
-import fs45 from "fs/promises";
-import path47 from "path";
-async function emitTrace(base) {
-  const event = {
-    sessionId: base.sessionId,
-    parentId: base.parentId,
-    eventType: base.eventType,
-    timestamp: base.timestamp ?? (/* @__PURE__ */ new Date()).toISOString(),
-    usage: base.usage,
-    payload: base.payload,
-    metadata: {
-      ...base.metadata || {}
-    }
-  };
-  try {
-    await appendTraceEvent(event);
-  } catch (error) {
-    console.warn("\u26A0\uFE0F [Trace] \u4E8B\u4EF6\u843D\u76D8\u5931\u8D25\uFF0C\u5DF2\u9632\u5FA1\u6027\u8DF3\u8FC7\uFF08\u4E0D\u5F71\u54CD\u4E3B\u4E1A\u52A1\uFF09:", error);
-  }
-}
-async function appendTraceEvent(event) {
-  const p = await getTraceStorePath(event.sessionId);
-  const line = JSON.stringify(event) + "\n";
-  await fs45.appendFile(p, line, "utf-8");
-  if (workspaceTraceBytes < 0) {
-    workspaceTraceBytes = await getDirBytes(getTracePath());
-  }
-  workspaceTraceBytes += Buffer.byteLength(line, "utf-8");
-  void maybeCleanupAfterAppend(event.sessionId);
-}
-async function maybeCleanupAfterAppend(sessionId) {
-  if (cleanupInProgress2) return;
-  cleanupInProgress2 = true;
-  try {
-    await ensureClockLoaded2();
-    const now = Date.now();
-    const isTimeExpired = now - diskLastCleanupAt2 > CLEANUP_INTERVAL_MS2;
-    const isSizeOverflow = workspaceTraceBytes > MAX_TRACE_FOLDER_BYTES;
-    if (!isTimeExpired && !isSizeOverflow) return;
-    if (isSizeOverflow && !isTimeExpired && now - lastSizeCleanupAt2 < SIZE_CLEANUP_COOLDOWN_MS2) {
-      return;
-    }
-    const reason = isTimeExpired && isSizeOverflow ? "\u5BB9\u91CF+\u65F6\u95F4\u53CC\u95F8" : isSizeOverflow ? "\u5BB9\u91CF\u8D8A\u8FC750MB\u5927\u95F8" : "3\u5929\u51B7\u5374\u5468\u671F\u5DF2\u6EE1";
-    console.log(`\u{1F9F9} [Trace\u8FD0\u7EF4] \u89E6\u53D1\u81EA\u9002\u5E94\u6E05\u7406\uFF08\u539F\u56E0: ${reason}\uFF09`);
-    let deletedCount = 0;
-    deletedCount += await cleanupOldTraceFiles();
-    workspaceTraceBytes = await getDirBytes(getTracePath());
-    if (workspaceTraceBytes > MAX_TRACE_FOLDER_BYTES) {
-      const targetBytes = Math.floor(MAX_TRACE_FOLDER_BYTES * SIZE_RECLAIM_TARGET_RATIO2);
-      deletedCount += await evictOldestForSize2(targetBytes);
-      workspaceTraceBytes = await getDirBytes(getTracePath());
-    }
-    lastSizeCleanupAt2 = now;
-    diskLastCleanupAt2 = now;
-    const clockPath = getGlobalClockPath();
-    await fs45.mkdir(path47.dirname(clockPath), { recursive: true });
-    await fs45.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`);
-    }
-  } catch (error) {
-    console.warn("\u26A0\uFE0F [Trace\u8FD0\u7EF4] \u81EA\u52A8\u6E05\u7406\u53D1\u751F\u8F7B\u5FAE\u5F02\u5E38\uFF0C\u5DF2\u9632\u5FA1\u6027\u8DF3\u8FC7:", error);
-  } finally {
-    cleanupInProgress2 = false;
-  }
-}
-async function cleanupOldTraceFiles() {
-  const dir = getTracePath();
-  const retentionDays = Math.max(1, appConfig.traceRetentionDays || 7);
-  const cutoff = /* @__PURE__ */ new Date();
-  cutoff.setHours(0, 0, 0, 0);
-  cutoff.setDate(cutoff.getDate() - retentionDays);
-  const now = Date.now();
-  let deleted = 0;
-  let relativePaths;
-  try {
-    relativePaths = await fs45.readdir(dir, { recursive: true });
-  } catch {
-    return 0;
-  }
-  const re = /^trace-(\d{4}-\d{2}-\d{2})__([\w-]+)\.jsonl$/;
-  for (const relativePath of relativePaths) {
-    const fileName = path47.basename(relativePath);
-    const m = fileName.match(re);
-    if (!m) continue;
-    const fileBornDay = /* @__PURE__ */ new Date(`${m[1]}T00:00:00`);
-    if (fileBornDay >= cutoff) continue;
-    const fullPath = path47.join(dir, relativePath);
-    try {
-      const st = await fs45.stat(fullPath);
-      if (now - st.mtimeMs < ACTIVE_GRACE_MS2) continue;
-      await fs45.unlink(fullPath);
-      deleted += 1;
-    } catch {
-    }
-  }
-  return deleted;
-}
-async function evictOldestForSize2(targetBytes) {
-  const dir = getTracePath();
-  let relativePaths;
-  try {
-    relativePaths = await fs45.readdir(dir, { recursive: true });
-  } catch {
-    return 0;
-  }
-  const re = /^trace-(\d{4}-\d{2}-\d{2})__([\w-]+)\.jsonl$/;
-  const candidates = [];
-  for (const relativePath of relativePaths) {
-    const fileName = path47.basename(relativePath);
-    if (!re.test(fileName)) continue;
-    try {
-      const st = await fs45.stat(path47.join(dir, relativePath));
-      candidates.push({ mtime: st.mtimeMs, fullPath: path47.join(dir, relativePath), size: st.size });
-    } catch {
-    }
-  }
-  candidates.sort((a, b) => a.mtime - b.mtime);
-  let totalBytes = candidates.reduce((sum, c) => sum + c.size, 0);
-  let deleted = 0;
-  for (const c of candidates) {
-    if (totalBytes <= targetBytes) break;
-    try {
-      await fs45.unlink(c.fullPath);
-      totalBytes -= c.size;
-      deleted += 1;
-    } catch {
-    }
-  }
-  if (deleted > 0) {
-    console.warn(`\u26A0\uFE0F [Trace\u8FD0\u7EF4] \u5BB9\u91CF\u786C\u9A71\u9010\uFF1A\u8D8A\u8FC7\u6D3B\u8DC3\u4FDD\u62A4\u5F3A\u5220 ${deleted} \u4E2A\u6700\u65E7 trace \u6587\u4EF6\uFF08\u78C1\u76D8\u538B\u529B\u515C\u5E95\uFF09\u3002`);
-  }
-  return deleted;
-}
-var CLEANUP_INTERVAL_MS2, ACTIVE_GRACE_MS2, MAX_TRACE_FOLDER_BYTES, SIZE_RECLAIM_TARGET_RATIO2, SIZE_CLEANUP_COOLDOWN_MS2, workspaceTraceBytes, diskLastCleanupAt2, clockLoaded2, lastSizeCleanupAt2, cleanupInProgress2, ensureClockLoaded2;
-var init_trace = __esm({
-  "../core/src/observability/trace.ts"() {
-    "use strict";
-    init_config();
-    init_store3();
-    init_traceCalculate();
-    CLEANUP_INTERVAL_MS2 = 3 * 24 * 60 * 60 * 1e3;
-    ACTIVE_GRACE_MS2 = 24 * 60 * 60 * 1e3;
-    MAX_TRACE_FOLDER_BYTES = 50 * 1024 * 1024;
-    SIZE_RECLAIM_TARGET_RATIO2 = 0.8;
-    SIZE_CLEANUP_COOLDOWN_MS2 = 60 * 1e3;
-    workspaceTraceBytes = -1;
-    diskLastCleanupAt2 = 0;
-    clockLoaded2 = false;
-    lastSizeCleanupAt2 = 0;
-    cleanupInProgress2 = false;
-    ensureClockLoaded2 = async () => {
-      if (clockLoaded2) return;
-      clockLoaded2 = true;
-      try {
-        const rawClock = await fs45.readFile(getGlobalClockPath(), "utf-8");
-        diskLastCleanupAt2 = JSON.parse(rawClock).lastCleanupAt || 0;
-      } catch {
-        diskLastCleanupAt2 = 0;
-      }
-    };
-  }
-});
-
 // ../core/src/tool/approvalGate.ts
 var approvalGate_exports = {};
 __export(approvalGate_exports, {
@@ -16923,7 +17085,7 @@ var init_StreamingCursor = __esm({
 // src/components/MessageBlock.tsx
 import { Box, Text as Text3 } from "ink";
 import { Fragment, jsx as jsx3, jsxs } from "react/jsx-runtime";
-var UsageFooter, listPrefix, AssistantLine, isFenceMark, isMdRow, isMdSep, mdCells, parseBlocks, fitCell, tableWidths, buildVLines, AssistantVLine, MessageBlock;
+var UsageFooter, listPrefix, AssistantLine, fenceLen, isMdRow, isMdSep, mdCells, parseBlocks, fitCell, tableWidths, buildVLines, AssistantVLine, MessageBlock;
 var init_MessageBlock = __esm({
   "src/components/MessageBlock.tsx"() {
     "use strict";
@@ -16962,7 +17124,10 @@ var init_MessageBlock = __esm({
       }
       return /* @__PURE__ */ jsx3(RichText, { text: line });
     };
-    isFenceMark = (l) => /^\s*```/.test(l);
+    fenceLen = (l, bareOnly) => {
+      const m = l.match(/^\s*(`{3,})([a-z0-9_-]*)\s*$/);
+      return m && (!bareOnly || !m[2]) ? m[1].length : 0;
+    };
     isMdRow = (l) => l.includes("|");
     isMdSep = (l) => /^[ \t|:-]+$/.test(l) && l.includes("-") && l.includes("|");
     mdCells = (l) => l.trim().replace(/^\|/, "").replace(/\|$/, "").split("|").map((c) => c.trim());
@@ -16971,10 +17136,11 @@ var init_MessageBlock = __esm({
       const blocks = [];
       let i = 0;
       while (i < src.length) {
-        if (isFenceMark(src[i])) {
+        const openLen = fenceLen(src[i], false);
+        if (openLen) {
           const body = [];
           i++;
-          while (i < src.length && !isFenceMark(src[i])) body.push(src[i++]);
+          while (i < src.length && fenceLen(src[i], true) < openLen) body.push(src[i++]);
           if (i < src.length) i++;
           blocks.push({ kind: "fence", lines: body });
           continue;

package/package.json

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