deepseeker-code 1.0.52 → 1.0.53

package/dist/cli.mjs

@@ -181,6 +181,9 @@ ${dim}  \u8FD0\u884C npm i -g deepseeker-code@latest \u66F4\u65B0${reset}
         sessionsPrompt: "\u2191\u2193 \u9009\u62E9 \xB7 Enter \u8F7D\u5165 \xB7 Esc \u53D6\u6D88",
         noHistory: "\uFF08\u6682\u65E0\u5386\u53F2\u4F1A\u8BDD\uFF09",
         sessionLoaded: (id) => `\u5DF2\u8F7D\u5165\u4F1A\u8BDD ${id}\uFF08\u7EE7\u7EED\u5BF9\u8BDD\u5C06\u7EED\u63A5\u6B64\u4F1A\u8BDD\uFF09`,
+        cmdNew: "\u5F00\u542F\u65B0\u4F1A\u8BDD\uFF08\u6E05\u5C4F\uFF1B\u65E7\u4F1A\u8BDD\u4FDD\u7559\uFF0C/sessions \u53EF\u627E\u56DE\uFF09",
+        sessionNew: (id) => `\u{1F195} \u5DF2\u5F00\u542F\u65B0\u4F1A\u8BDD ${id}\uFF08\u65E7\u4F1A\u8BDD\u5B8C\u6574\u4FDD\u7559\uFF0C/sessions \u53EF\u627E\u56DE\uFF09`,
+        sessionNewBusy: "\u751F\u6210\u4E2D\u2014\u2014\u5148 Esc/Ctrl+G \u4E2D\u6B62\u5F53\u524D\u56DE\u590D\uFF0C\u518D\u5F00\u65B0\u4F1A\u8BDD",
         cmdFork: "\u4ECE\u5F53\u524D\u4F1A\u8BDD\u7684\u67D0\u8F6E\u56DE\u590D\u5904\u5206\u53C9\u51FA\u65B0\u4F1A\u8BDD",
         forkTitle: "\u{1F33F} \u5206\u53C9\u5F53\u524D\u4F1A\u8BDD\uFF08\u2191\u2193 \u9009\u68C0\u67E5\u70B9 \xB7 Enter \u5206\u53C9\uFF09",
         forkPrompt: "\u2191\u2193 \u9009\u62E9 \xB7 Enter \u5206\u53C9 \xB7 Esc \u53D6\u6D88",
@@ -229,6 +232,7 @@ DeepSeeker-Code \u5C06\u5728\u6B64\u76EE\u5F55\u8BFB\u53D6\u3001\u7F16\u8F91\u54
           `/thinking [off|high|max] \u2014 \u5207\u6362\u601D\u8003\u7B49\u7EA7\uFF08\u5F53\u524D ${thinking}\uFF09`,
           `/lang [zh|en] \u2014 \u5207\u6362\u754C\u9762\u8BED\u8A00\uFF08\u5F53\u524D ${locale2}\uFF09`,
           "/sessions  \u2014 \u9009\u62E9\u5E76\u8F7D\u5165\u5386\u53F2\u4F1A\u8BDD\uFF08\u7EED\u63A5\u5BF9\u8BDD\uFF09",
+          "/new       \u2014 \u5F00\u542F\u65B0\u4F1A\u8BDD\uFF08\u65E7\u4F1A\u8BDD\u4FDD\u7559\uFF0C/sessions \u53EF\u627E\u56DE\uFF09",
           "/fork      \u2014 \u4ECE\u5F53\u524D\u4F1A\u8BDD\u7684\u67D0\u8F6E\u56DE\u590D\u5904\u5206\u53C9\u51FA\u65B0\u4F1A\u8BDD",
           "/trust  \u2014 \u7BA1\u7406\u5DF2\u4FE1\u4EFB\u76EE\u5F55\uFF08\u9879\u76EE\u7EA7 hooks/skills \u7B49\u4EC5\u5728\u4FE1\u4EFB\u76EE\u5F55\u52A0\u8F7D\uFF1BCI \u7528 --trust \u663E\u5F0F\u4FE1\u4EFB\uFF09",
           "Ctrl+C \u9000\u51FA \xB7 Esc \u4E2D\u6B62/\u6E05\u8F93\u5165 \xB7 Ctrl+G \u4E2D\u6B62 \xB7 Ctrl+T \u5C55\u5F00/\u6536\u8D77\u601D\u8003"
@@ -330,6 +334,9 @@ ${dim}  Run npm i -g deepseeker-code@latest to update${reset}
         sessionsPrompt: "\u2191\u2193 pick \xB7 Enter resume \xB7 Esc cancel",
         noHistory: "(no past sessions)",
         sessionLoaded: (id) => `Resumed session ${id} (new messages continue it)`,
+        cmdNew: "Start a new session (clears screen; old ones remain via /sessions)",
+        sessionNew: (id) => `\u{1F195} New session ${id} started (old sessions kept, resume via /sessions)`,
+        sessionNewBusy: "Busy \u2014 abort the current reply first (Esc/Ctrl+G), then start a new session",
         cmdFork: "Fork the current session from a past round",
         forkTitle: "\u{1F33F} Fork current session (\u2191\u2193 to pick \xB7 Enter to fork)",
         forkPrompt: "\u2191\u2193 pick \xB7 Enter fork \xB7 Esc cancel",
@@ -378,6 +385,7 @@ DeepSeeker-Code will read, edit, and execute files here.`,
           `/thinking [off|high|max] \u2014 Switch thinking level (current ${thinking})`,
           `/lang [zh|en] \u2014 Switch interface language (current ${locale2})`,
           "/sessions  \u2014 Pick a past session to resume",
+          "/new       \u2014 Start a new session (old ones remain via /sessions)",
           "/fork      \u2014 Fork the current session from a past round",
           "/trust  \u2014 Manage trusted dirs (project hooks/skills load only when trusted; CI uses --trust)",
           "Ctrl+C exit \xB7 Esc abort/clear input \xB7 Ctrl+G abort \xB7 Ctrl+T toggle thinking"
@@ -399,7 +407,7 @@ DeepSeeker-Code will read, edit, and execute files here.`,
     S = new Proxy({}, {
       get: (_t, k) => typeof k === "string" ? STRINGS[locale][k] : void 0
     });
-    LOCAL_COMMAND_NAMES = ["help", "status", "plan", "auto", "model", "switch", "thinking", "lang", "output-style", "sessions", "fork", "usage", "context", "permissions", "mcp", "hooks", "trust", "debug", "clear", "exit"];
+    LOCAL_COMMAND_NAMES = ["help", "status", "plan", "auto", "model", "switch", "thinking", "lang", "output-style", "new", "sessions", "fork", "usage", "context", "permissions", "mcp", "hooks", "trust", "debug", "clear", "exit"];
   }
 });
 
@@ -498,7 +506,7 @@ var init_config = __esm({
        *  最终聚合再受工具 maxOutputCharacters 兜底。 */
       workflowPerStepChars: 6e3,
       /** ★ P0-A 计划模式强制位置：'runtime'（默认）= 工具表全会话恒定（两态统一 appendPlanControlTools），
-       *  计划期写工具由 processToolCall 执行层按 PLAN_ALLOWED_TOOLS 拒绝——保 DeepSeek 前缀缓存
+       *  计划期写工具由 processToolCall 执行层按工具声明 planAllowed 拒绝——保 DeepSeek 前缀缓存
        *  （tools 参数序列化在请求头部，计划模式裁表翻转 = 全会话历史 re-prefill 两次）；
        *  'schema' = 旧路径（计划期裁成只读白名单子表）。env DEEP_SEEK_PLAN_ENFORCEMENT=schema 回退。 */
       planEnforcement: process.env.DEEP_SEEK_PLAN_ENFORCEMENT === "schema" ? "schema" : "runtime",
@@ -783,7 +791,7 @@ var init_trust = __esm({
 });
 
 // ../core/src/tool/type.ts
-var MAX_AGENT_DEPTH, ToolSafetyLevel, ToolExecutionResultStatus;
+var MAX_AGENT_DEPTH, ToolSafetyLevel, ToolExecutionResultStatus, asToolFailure, toolFailure;
 var init_type = __esm({
   "../core/src/tool/type.ts"() {
     "use strict";
@@ -797,10 +805,45 @@ var init_type = __esm({
     ToolExecutionResultStatus = /* @__PURE__ */ ((ToolExecutionResultStatus2) => {
       ToolExecutionResultStatus2["SUCCESS"] = "success";
       ToolExecutionResultStatus2["FAILED"] = "failed";
-      ToolExecutionResultStatus2["TIMEOUT"] = "timeout";
-      ToolExecutionResultStatus2["ABORTED"] = "aborted";
       return ToolExecutionResultStatus2;
     })(ToolExecutionResultStatus || {});
+    asToolFailure = (content, errorCategory = "runtime") => ({ content, status: "failed", errorCategory });
+    toolFailure = (msg, errorCategory = "runtime") => asToolFailure(`\u274C ${msg}`, errorCategory);
+  }
+});
+
+// ../core/src/tool/argsValidator.ts
+import { Ajv } from "ajv";
+var ajv, compiled, validateToolArgs;
+var init_argsValidator = __esm({
+  "../core/src/tool/argsValidator.ts"() {
+    "use strict";
+    ajv = new Ajv({
+      coerceTypes: true,
+      // 数字/布尔字符串化容错（就地修正 args）
+      strict: false,
+      // 手写 schema 可能含非严格关键字（注释性字段等），宽松编译防误伤
+      allErrors: false
+      // 首错即返：早退文案只报第一处，引导逐个修
+    });
+    compiled = /* @__PURE__ */ new WeakMap();
+    validateToolArgs = (schema, args) => {
+      let validate = compiled.get(schema);
+      if (!validate) {
+        try {
+          validate = ajv.compile(schema);
+          compiled.set(schema, validate);
+        } catch (e) {
+          console.warn(`\u26A0\uFE0F [argsValidator] schema \u7F16\u8BD1\u5931\u8D25\uFF08fail-open \u653E\u884C\uFF09: ${e?.message ?? e}`);
+          return { ok: true };
+        }
+      }
+      if (validate(args)) return { ok: true };
+      const err = validate.errors?.[0];
+      const where = err?.instancePath || "(\u9876\u5C42)";
+      const what = err?.message ?? "\u4E0D\u7B26\u5408\u5DE5\u5177 parameters schema";
+      return { ok: false, message: `${where} ${err?.keyword ? `[${err.keyword}] ` : ""}${what}` };
+    };
   }
 });
 
@@ -1095,7 +1138,7 @@ var init_visionCapability = __esm({
 });
 
 // ../core/src/session/contentParts.ts
-var MAX_IMAGE_BYTES, msgText, imageUrlsOf, hasImagePart, VISION_DEGRADE_NOTE, isVisionEnabled, estimateImageTokens, toWireUserContent, toIngestContents, replaceImageParts, collapseToText, degradeImagesForAux;
+var MAX_IMAGE_BYTES, msgText, imageUrlsOf, hasImagePart, VISION_DEGRADE_NOTE, isVisionEnabled, estimateImageTokens, toWireUserContent, toIngestContents, replaceImageParts, collapseToText, degradeImagesForAux, buildImageFollowUpParts;
 var init_contentParts = __esm({
   "../core/src/session/contentParts.ts"() {
     "use strict";
@@ -1197,6 +1240,20 @@ ${paths.join("\n")}
       return { ...m, content: text };
     };
     degradeImagesForAux = (m) => collapseToText(m, "[\u56FE\u7247\u5DF2\u5F52\u6863]");
+    buildImageFollowUpParts = (images) => {
+      const labels = images.map((img, i) => `  ${i + 1}. ${img.name || "image"}\uFF08${img.mime}\uFF09`).join("\n");
+      return [
+        {
+          type: "text",
+          text: `\uFF08\u7CFB\u7EDF\u6CE8\u5165\uFF1A\u4E0A\u4E00\u6761\u5DE5\u5177\u7ED3\u679C\u8BFB\u53D6\u4E86 ${images.length} \u5F20\u56FE\u7247\uFF0C\u9644\u4E8E\u672C\u6D88\u606F\u4F9B\u89C6\u89C9\u5206\u6790\u3002\u82E5\u770B\u4E0D\u6E05\u6216\u65E0\u6CD5\u8BFB\u53D6\uFF0C\u8BF7\u544A\u77E5\u7528\u6237\u5F53\u524D\u6A21\u578B\u53EF\u80FD\u4E0D\u652F\u6301\u56FE\u7247\u8F93\u5165\u3002\uFF09
+${labels}`
+        },
+        ...images.map((img) => ({
+          type: "image_url",
+          image_url: { url: `data:${img.mime};base64,${img.base64}` }
+        }))
+      ];
+    };
   }
 });
 
@@ -1321,7 +1378,7 @@ var init_model = __esm({
 });
 
 // ../core/src/session/contextCore.ts
-var isCjkCodePoint, estimateTextTokens, estimateTokens, cleanMsg, groupUnits, splitUntils;
+var isCjkCodePoint, estimateTextTokens, computeMessageTokens, msgTokenCache, messageTokens, estimateTokens, cleanMsg, groupUnits, splitUntils;
 var init_contextCore = __esm({
   "../core/src/session/contextCore.ts"() {
     "use strict";
@@ -1345,35 +1402,48 @@ var init_contextCore = __esm({
       }
       return cjk + Math.ceil(rest / divisor);
     };
-    estimateTokens = (messagesArr) => {
-      return messagesArr.reduce((total, m) => {
-        let pureText = "";
-        let imageCount = 0;
-        if (m.content) {
-          if (typeof m.content === "string") {
-            pureText += m.content;
-          } else if (Array.isArray(m.content)) {
-            pureText += msgText(m.content);
-            imageCount += imageUrlsOf(m.content).length;
+    computeMessageTokens = (m) => {
+      let pureText = "";
+      let imageCount = 0;
+      if (m.content) {
+        if (typeof m.content === "string") {
+          pureText += m.content;
+        } else if (Array.isArray(m.content)) {
+          pureText += msgText(m.content);
+          imageCount += imageUrlsOf(m.content).length;
+        }
+      }
+      if (m.tool_calls && Array.isArray(m.tool_calls)) {
+        for (const call of m.tool_calls) {
+          if (call.function) {
+            pureText += ` ${call.function.name} ${call.function.arguments || ""}`;
           }
         }
-        if (m.tool_calls && Array.isArray(m.tool_calls)) {
-          for (const call of m.tool_calls) {
-            if (call.function) {
-              pureText += ` ${call.function.name} ${call.function.arguments || ""}`;
-            }
-          }
-        }
-        const knownKeys = ["content", "tool_calls"];
-        for (const key of Object.keys(m)) {
-          if (!knownKeys.includes(key) && typeof m[key] === "string") {
-            pureText += ` ${m[key]}`;
-          }
+      }
+      const knownKeys = ["content", "tool_calls"];
+      for (const key of Object.keys(m)) {
+        if (!knownKeys.includes(key) && typeof m[key] === "string") {
+          pureText += ` ${m[key]}`;
         }
-        const isStructured = m.role === "tool" || Array.isArray(m.tool_calls) && m.tool_calls.length > 0;
-        const tokens = estimateTextTokens(pureText, isStructured ? 4 : 4.8) + imageCount * estimateImageTokens() + 4;
-        return total + (isNaN(tokens) ? 0 : tokens);
-      }, 0);
+      }
+      const isStructured = m.role === "tool" || Array.isArray(m.tool_calls) && m.tool_calls.length > 0;
+      const imagePrice = imageCount > 0 ? estimateImageTokens() : 0;
+      const tokens = estimateTextTokens(pureText, isStructured ? 4 : 4.8) + imageCount * imagePrice + 4;
+      return { tokens: isNaN(tokens) ? 0 : tokens, imageCount, imagePrice };
+    };
+    msgTokenCache = /* @__PURE__ */ new WeakMap();
+    messageTokens = (m) => {
+      const toolCalls = m.tool_calls;
+      const cached2 = msgTokenCache.get(m);
+      if (cached2 && cached2.role === m.role && cached2.toolCalls === toolCalls && cached2.content === m.content && (cached2.imageCount === 0 || cached2.imagePrice === estimateImageTokens())) {
+        return cached2.tokens;
+      }
+      const { tokens, imageCount, imagePrice } = computeMessageTokens(m);
+      msgTokenCache.set(m, { content: m.content, toolCalls, role: m.role, imageCount, imagePrice, tokens });
+      return tokens;
+    };
+    estimateTokens = (messagesArr) => {
+      return messagesArr.reduce((total, m) => total + messageTokens(m), 0);
     };
     cleanMsg = (m) => {
       const { id, sessionId, ts, ...rest } = m;
@@ -1473,7 +1543,7 @@ async function setTodos(sessionId, todos) {
     await writeStore(sessionId, store);
   });
 }
-var getSessionsDirPath, getWorkspaceSessionsDir, getStatePath, getTranscriptPath, ensureSessionsDir, migrateLegacyFiles, writeStore, storeLocks, withStoreLock, getOrCreateSessionId, readStore, updateCalibration, listSessions, getMostRecentSessionId, renameSession, deleteSession;
+var getSessionsDirPath, getWorkspaceSessionsDir, getStatePath, getTranscriptPath, ensuredSessionDirs, ensureSessionsDir, migrateLegacyFiles, writeStore, storeLocks, withStoreLock, getOrCreateSessionId, readStore, updateCalibration, listSessions, getMostRecentSessionId, renameSession, deleteSession;
 var init_store = __esm({
   "../core/src/session/store.ts"() {
     "use strict";
@@ -1494,10 +1564,14 @@ var init_store = __esm({
       assertSafeSessionId(sessionId);
       return path7.join(getSessionsDirPath(sessionId), `${sessionId}.jsonl`);
     };
+    ensuredSessionDirs = /* @__PURE__ */ new Set();
     ensureSessionsDir = async (sessionId) => {
-      await fs5.mkdir(getSessionsDirPath(sessionId), { recursive: true });
+      const dir = getSessionsDirPath(sessionId);
+      if (ensuredSessionDirs.has(dir)) return;
+      await fs5.mkdir(dir, { recursive: true });
       await migrateLegacyFiles(sessionId).catch(() => {
       });
+      ensuredSessionDirs.add(dir);
     };
     migrateLegacyFiles = async (sessionId) => {
       assertSafeSessionId(sessionId);
@@ -1676,8 +1750,34 @@ var init_store = __esm({
       return summaries;
     };
     getMostRecentSessionId = async () => {
-      const list = await listSessions();
-      return list.length > 0 ? list[0].sessionId : null;
+      const root = getWorkspaceSessionsDir();
+      let entries;
+      try {
+        entries = await fs5.readdir(root, { withFileTypes: true });
+      } catch {
+        return null;
+      }
+      let best;
+      let noTimestampFirst;
+      for (const entry of entries) {
+        if (!entry.isDirectory()) continue;
+        const sessionId = entry.name;
+        if (!isSafeSessionId(sessionId)) continue;
+        const state = await readJSONFile(getStatePath(sessionId));
+        let updatedAt = state?.updatedAt;
+        if (!updatedAt) {
+          try {
+            updatedAt = (await fs5.stat(path7.join(root, sessionId))).mtime.toISOString();
+          } catch {
+          }
+        }
+        if (!updatedAt) {
+          noTimestampFirst ??= sessionId;
+          continue;
+        }
+        if (!best || updatedAt > best.updatedAt) best = { sessionId, updatedAt };
+      }
+      return best?.sessionId ?? noTimestampFirst ?? null;
     };
     renameSession = async (sessionId, title) => {
       assertSafeSessionId(sessionId);
@@ -1693,13 +1793,14 @@ var init_store = __esm({
       assertSafeSessionId(sessionId);
       const dir = getSessionsDirPath(sessionId);
       await fs5.rm(dir, { recursive: true, force: true });
+      ensuredSessionDirs.delete(dir);
     };
   }
 });
 
 // ../core/src/session/transcript.ts
 import fs6 from "fs/promises";
-var isEventLine, readTranscriptLines, appendLineWithRetry, appendMessage, appendEvent;
+var isEventLine, readTranscriptLines, appendSizeCache, appendLineWithRetry, appendMessage, appendEvent;
 var init_transcript = __esm({
   "../core/src/session/transcript.ts"() {
     "use strict";
@@ -1728,22 +1829,29 @@ var init_transcript = __esm({
         throw err;
       }
     };
+    appendSizeCache = /* @__PURE__ */ new Map();
     appendLineWithRetry = async (p, payload) => {
       const MAX_ATTEMPTS = 3;
+      const payloadBytes = Buffer.byteLength(payload, "utf-8");
       for (let attempt = 1; attempt <= MAX_ATTEMPTS; attempt++) {
-        let beforeSize = 0;
-        try {
-          beforeSize = (await fs6.stat(p)).size;
-        } catch {
+        let beforeSize = appendSizeCache.get(p);
+        if (beforeSize === void 0) {
+          beforeSize = 0;
+          try {
+            beforeSize = (await fs6.stat(p)).size;
+          } catch {
+          }
         }
         try {
           await fs6.appendFile(p, payload, "utf-8");
+          appendSizeCache.set(p, beforeSize + payloadBytes);
           return;
         } catch (e) {
           try {
             await fs6.truncate(p, beforeSize);
           } catch {
           }
+          appendSizeCache.set(p, beforeSize);
           if (attempt === MAX_ATTEMPTS) throw e;
           await new Promise((r) => setTimeout(r, 50 * attempt));
         }
@@ -1778,6 +1886,161 @@ var init_transcript = __esm({
   }
 });
 
+// ../core/src/session/recovery.ts
+var detectInterruption, repairOrphanToolCalls, reconcileCompaction, recoverSession;
+var init_recovery = __esm({
+  "../core/src/session/recovery.ts"() {
+    "use strict";
+    init_transcript();
+    init_store();
+    detectInterruption = (lines) => {
+      let sawEvents = false;
+      let lastStart;
+      const closed = /* @__PURE__ */ new Set();
+      for (const l of lines) {
+        if (!isEventLine(l)) continue;
+        sawEvents = true;
+        if (l.dscEvent === "run.start") lastStart = l;
+        else if (l.dscEvent === "run.end" || l.dscEvent === "run.abandoned") closed.add(l.runId);
+      }
+      if (!sawEvents || !lastStart) return { kind: "legacy" };
+      return closed.has(lastStart.runId) ? { kind: "clean" } : { kind: "crashed", runId: lastStart.runId };
+    };
+    repairOrphanToolCalls = (msgs, confirmedCrash) => {
+      const placeholder = confirmedCrash ? "\uFF08\u4E0A\u6B21\u4F1A\u8BDD\u5728\u5DE5\u5177\u6267\u884C\u4E2D\u5D29\u6E83\uFF08run \u672A\u95ED\u5408\uFF09\uFF0C\u8BE5\u8C03\u7528\u672A\u6267\u884C\uFF0C\u5DF2\u8DF3\u8FC7\u3002\uFF09" : "\uFF08\u8BE5\u5DE5\u5177\u8C03\u7528\u56E0\u4E0A\u6B21\u4F1A\u8BDD\u5F02\u5E38\u4E2D\u65AD\u672A\u7559\u4E0B\u7ED3\u679C\uFF0C\u5DF2\u8DF3\u8FC7\u3002\uFF09";
+      const out = [];
+      const repairedToolCallIds = [];
+      for (let i = 0; i < msgs.length; i++) {
+        const m = msgs[i];
+        out.push(m);
+        if (m.role === "assistant" && Array.isArray(m.tool_calls) && m.tool_calls.length > 0) {
+          const answered = /* @__PURE__ */ new Set();
+          let j = i + 1;
+          while (j < msgs.length && msgs[j].role === "tool") {
+            answered.add(msgs[j].tool_call_id);
+            j++;
+          }
+          for (const tc of m.tool_calls) {
+            if (tc.id && !answered.has(tc.id)) {
+              out.push({ role: "tool", tool_call_id: tc.id, content: placeholder });
+              repairedToolCallIds.push(tc.id);
+            }
+          }
+        }
+      }
+      return { msgs: out, repairedToolCallIds, confirmedCrash };
+    };
+    reconcileCompaction = (state, lines) => {
+      let last;
+      for (const l of lines) {
+        if (isEventLine(l) && l.dscEvent === "compaction") last = l;
+      }
+      if (!last) return { archivedMessageCount: state.archivedMessageCount, rollingSummary: state.rollingSummary, desync: "legacy" };
+      let desync = "none";
+      if (last.archivedMessageCount !== state.archivedMessageCount) {
+        desync = state.archivedMessageCount > last.archivedMessageCount ? "state-ahead" : "event-ahead";
+        console.warn(
+          `\u26A0\uFE0F [recovery] \u538B\u7F29\u72B6\u6001 desync\uFF08${desync}\uFF09\uFF1Astate.json archivedMessageCount=${state.archivedMessageCount} vs \u672B\u4E2A compaction \u4E8B\u4EF6=${last.archivedMessageCount}\u3002\u4EE5 state \u4E3A\u51C6\uFF08slice \u6267\u884C\u95F8\u95E8\uFF09\uFF0C\u4E8B\u4EF6\u4FA7\u4EC5\u955C\u50CF\u3002`
+        );
+      }
+      return { archivedMessageCount: state.archivedMessageCount, rollingSummary: state.rollingSummary, desync };
+    };
+    recoverSession = async (sessionId, precomputed) => {
+      const lines = precomputed?.lines ?? await readTranscriptLines(sessionId);
+      const interruption = detectInterruption(lines);
+      if (interruption.kind === "crashed") {
+        await appendEvent(sessionId, {
+          dscEvent: "run.abandoned",
+          runId: interruption.runId,
+          reason: "run.end missing: interrupted by process exit/kill"
+        });
+        console.warn(`\u27E6recovery\u27E7 \u68C0\u6D4B\u5230\u672A\u95ED\u5408 run\uFF08${interruption.runId.slice(0, 8)}\u2026\uFF09\u2192 \u5DF2\u8865 run.abandoned \u95ED\u5893\u6807\u8BB0\uFF1B\u5B64\u513F\u4FEE\u590D\u6309\u300C\u5D29\u6E83\u786E\u8BA4\u300D\u6863\u6267\u884C\u3002`);
+      }
+      const state = precomputed?.state ?? await getRollingState(sessionId);
+      const compaction = reconcileCompaction(
+        { archivedMessageCount: state.archivedMessageCount, rollingSummary: state.rollingSummary },
+        lines
+      );
+      return { interruption, compaction };
+    };
+  }
+});
+
+// ../core/src/session/content.ts
+var decayOldToolResults, enforceVisionGate, buildContextMessages;
+var init_content = __esm({
+  "../core/src/session/content.ts"() {
+    "use strict";
+    init_contextCore();
+    init_contentParts();
+    init_transcript();
+    init_store();
+    init_config();
+    init_visionCapability();
+    init_recovery();
+    decayOldToolResults = (msgs) => {
+      const units = groupUnits(msgs);
+      const cutoffUnitIdx = Math.max(0, units.length - appConfig.KEEP_RECENT_UNITS);
+      if (cutoffUnitIdx === 0) return msgs;
+      const decayIds = /* @__PURE__ */ new Set();
+      let hasOldImage = false;
+      for (let u = 0; u < cutoffUnitIdx; u++) {
+        for (const m of units[u]) {
+          const mm = m;
+          if (mm.role === "tool" && typeof mm.tool_call_id === "string") decayIds.add(mm.tool_call_id);
+          if (hasImagePart(m.content)) hasOldImage = true;
+        }
+      }
+      if (decayIds.size === 0 && !hasOldImage) return msgs;
+      const keep = appConfig.BOUNDARY_TOOL_KEEP_CHARS;
+      const oldRefs = /* @__PURE__ */ new Set();
+      for (let u = 0; u < cutoffUnitIdx; u++) for (const m of units[u]) oldRefs.add(m);
+      return msgs.map((m) => {
+        if (!oldRefs.has(m)) return m;
+        const mm = m;
+        if (mm.role === "tool" && decayIds.has(mm.tool_call_id) && typeof mm.content === "string" && mm.content.length > keep) {
+          const head = mm.content.slice(0, keep);
+          return { ...mm, content: `${head}
+
+[\u2026 \u5386\u53F2\u5DE5\u5177\u8F93\u51FA\u5DF2\u6298\u53E0\uFF08\u5171 ${mm.content.length} \u5B57\u7B26\uFF09\uFF1A\u7EC6\u8282\u5148\u7528 recall \u5DE5\u5177\u6309\u5173\u952E\u8BCD\u68C0\u7D22\u672C\u4F1A\u8BDD\u5386\u53F2\uFF08\u539F\u6587\u82E5\u66FE\u622A\u65AD\u5B58\u6863\uFF0Crecall \u4F20 with_full="${mm.tool_call_id}" \u53EF\u53D6\u56DE\u5168\u6587\uFF09\uFF0C\u65E0\u679C\u518D\u91CD\u65B0\u8C03\u7528\u5DE5\u5177 \u2026]` };
+        }
+        return replaceImageParts(mm, "[\u5386\u53F2\u56FE\u7247\u5DF2\u6298\u53E0\uFF1A\u539F\u56FE\u4ECD\u5728\u4F1A\u8BDD\u5F52\u6863\u4E2D\uFF0C\u5982\u9700\u518D\u6B21\u67E5\u770B\u8BF7\u91CD\u65B0\u63D0\u4F9B\u8BE5\u56FE\u7247]");
+      });
+    };
+    enforceVisionGate = (msgs, modelId) => isVisionEnabled(modelId) ? msgs : msgs.map((m) => collapseToText(m, VISION_DEGRADE_NOTE));
+    buildContextMessages = async (sessionId, currentUserMsg, systemPrompt, modelId) => {
+      await ensureVisionCacheLoaded();
+      const lines = await readTranscriptLines(sessionId);
+      const store = await getRollingState(sessionId);
+      const eventAware = appConfig.transcriptEvents || lines.some(isEventLine);
+      const recovery = eventAware ? await recoverSession(sessionId, {
+        lines,
+        state: { archivedMessageCount: store.archivedMessageCount, rollingSummary: store.rollingSummary }
+      }) : {
+        interruption: { kind: "legacy" },
+        compaction: { archivedMessageCount: store.archivedMessageCount, rollingSummary: store.rollingSummary, desync: "legacy" }
+      };
+      const all = lines.filter((l) => !isEventLine(l)).map(cleanMsg);
+      const result = [
+        { role: "system", content: systemPrompt },
+        // 存储系统提示词
+        { role: "system", content: recovery.compaction.rollingSummary }
+        // 后续存储摘要使用
+      ];
+      const archivedMessageCount = recovery.compaction.archivedMessageCount;
+      const messageAll = all.slice(archivedMessageCount);
+      if (messageAll.length === 0) {
+        result.push(currentUserMsg);
+        return enforceVisionGate(result, modelId);
+      }
+      const repair = repairOrphanToolCalls(messageAll, recovery.interruption.kind === "crashed");
+      result.push(...decayOldToolResults(repair.msgs));
+      result.push(currentUserMsg);
+      return enforceVisionGate(result, modelId);
+    };
+  }
+});
+
 // ../core/src/hooks/types.ts
 var INTERCEPTABLE_EVENTS, TOOL_EVENTS, ALL_EVENTS, DEFAULT_TIMEOUT_BY_EVENT;
 var init_types = __esm({
@@ -1964,7 +2227,7 @@ var init_registry = __esm({
         if (m instanceof RegExp) return `${m.toString()}`;
         return "[fn]";
       };
-      return rules.map((r) => ({ event: r.event, matcher: strMatcher(r.matcher), source: r.source, onError: r.onError }));
+      return rules.map((r) => ({ event: r.event, matcher: strMatcher(r.matcher), source: r.source, onError: r.onError, firstRunApproval: r.firstRunApproval === true ? true : void 0 }));
     };
     isPlainObject = (v) => v !== null && typeof v === "object" && !Array.isArray(v);
     dispatch = async (event, ctx) => {
@@ -2069,6 +2332,7 @@ var init_hooks = __esm({
 // ../core/src/agent/truncate.ts
 import path9 from "path";
 function stripAnsi(text) {
+  if (!text || !text.includes(ANSI_ESC_CHAR)) return text;
   return text.replace(ANSI_ESCAPE, "");
 }
 function microcompactTextContent(raw) {
@@ -2077,10 +2341,7 @@ function microcompactTextContent(raw) {
   s = s.replace(/\n{3,}/g, "\n\n").trim();
   return s;
 }
-function isAsyncGenerator(x) {
-  return x != null && typeof x[Symbol.asyncIterator] === "function";
-}
-var ANSI_ESCAPE, getFileAccessRoots, relativizeWorkspacePathsInText, truncateToolResult, truncateApprovalDetail, batchSummaryPrompt, compactBatch, ARCHIVE_INDEX_MAX_ENTRIES, ARCHIVE_INDEX_BATCH_CAP, extractArchiveEntities, parseSummarySlot, mergeSummarySlot, CHECKPOINT_MAX_CHARS, SLOT_PLACEHOLDER, CHECKPOINT_FORMAT, checkpointRules, checkpointPrompt, checkpointDirectPrompt, assembleSlot, parseSlotNarrativeState, synthesizeSlotNarrative, synthesizeSlotNarrativeFromBatch, compactSlotNarrative, splitIntoBatches, compactBatches, ensureSummarySlot, SUMMARY_SELF_COMPACT_THRESHOLD, persistCompaction, ensureFitsWindow, collectToolResult;
+var ANSI_ESCAPE, getFileAccessRoots, rootPathRegexCache, relativizeWorkspacePathsInText, ANSI_ESC_CHAR, truncateToolResult, truncateApprovalDetail, batchSummaryPrompt, compactBatch, ARCHIVE_INDEX_MAX_ENTRIES, ARCHIVE_INDEX_BATCH_CAP, entityMinLen, extractArchiveEntities, parseSummarySlot, mergeSummarySlot, CHECKPOINT_MAX_CHARS, SLOT_PLACEHOLDER, CHECKPOINT_FORMAT, checkpointRules, checkpointPrompt, checkpointDirectPrompt, assembleSlot, parseSlotNarrativeState, synthesizeSlotNarrative, synthesizeSlotNarrativeFromBatch, compactSlotNarrative, MAX_BATCH_TOKENS, PRETRUNCATE_FLOOR_TOKENS, foldableTokensOf, foldTextToTarget, foldArguments, foldMessageTo, pretruncateOversizedUnit, splitIntoBatches, compactBatches, ensureSummarySlot, SUMMARY_SELF_COMPACT_THRESHOLD, persistCompaction, ensureFitsWindow;
 var init_truncate = __esm({
   "../core/src/agent/truncate.ts"() {
     "use strict";
@@ -2088,6 +2349,7 @@ var init_truncate = __esm({
     init_model();
     init_contextCore();
     init_contentParts();
+    init_content();
     init_store();
     init_transcript();
     init_hooks();
@@ -2102,6 +2364,7 @@ var init_truncate = __esm({
         return norm;
       });
     };
+    rootPathRegexCache = /* @__PURE__ */ new Map();
     relativizeWorkspacePathsInText = (text) => {
       if (!text) return text;
       const roots = /* @__PURE__ */ new Set();
@@ -2114,20 +2377,25 @@ var init_truncate = __esm({
           }
         }
       } catch {
-        return text.replace(ANSI_ESCAPE, "");
+        return stripAnsi(text);
       }
       let out = text;
       for (const root of roots) {
         const norm = root.replace(/\\/g, "/");
         if (norm.length < 3) continue;
-        const re = new RegExp(
-          norm.replace(/[.*+?^${}()|[\]\\]/g, "\\$&") + "(\\/|\\\\|$)",
-          "gi"
-        );
+        let re = rootPathRegexCache.get(norm);
+        if (!re) {
+          re = new RegExp(
+            norm.replace(/[.*+?^${}()|[\]\\]/g, "\\$&") + "(\\/|\\\\|$)",
+            "gi"
+          );
+          rootPathRegexCache.set(norm, re);
+        }
         out = out.replace(re, "./$1");
       }
       return out;
     };
+    ANSI_ESC_CHAR = String.fromCharCode(27);
     truncateToolResult = (result, maxChars, sidecarNote) => {
       const finalMaxChars = maxChars ?? appConfig.MAX_TOOL_RESULT_CHARS;
       const newResult = microcompactTextContent(result);
@@ -2164,25 +2432,36 @@ ${tail}`;
     };
     ARCHIVE_INDEX_MAX_ENTRIES = 120;
     ARCHIVE_INDEX_BATCH_CAP = 60;
+    entityMinLen = (s) => /[一-鿿]/.test(s) ? 2 : 3;
     extractArchiveEntities = (batch) => {
-      let text = "";
+      let contentText = "";
+      let argsText = "";
       for (const m of batch) {
-        if (m.content) text += ` ${msgText(m.content)}`;
+        if (m.content) contentText += ` ${msgText(m.content)}`;
         const calls = m.tool_calls;
-        if (Array.isArray(calls)) for (const c of calls) text += ` ${c?.function?.name ?? ""} ${c?.function?.arguments ?? ""}`;
+        if (Array.isArray(calls)) for (const c of calls) argsText += ` ${c?.function?.name ?? ""} ${c?.function?.arguments ?? ""}`;
       }
       const found = [];
       const seen = /* @__PURE__ */ new Set();
       const push = (raw) => {
         const s = raw.trim();
-        if (!s || s.length < 3 || s.length > 60 || seen.has(s)) return;
+        if (!s || s.length < entityMinLen(s) || s.length > 60 || seen.has(s.toLowerCase()) || s.includes("|")) return;
         const lastSeg = s.split(/[\\/]/).pop() ?? "";
         if (/^[\d.]+$/.test(lastSeg)) return;
-        seen.add(s);
+        seen.add(s.toLowerCase());
         found.push(s);
       };
-      for (const m of text.match(/(?:[A-Za-z]:)?[\w.\-]+(?:[/\\][\w.\-]+)+\.[A-Za-z0-9]{1,6}/g) ?? []) push(m);
-      for (const m of text.match(/`([^`\n]{2,48})`/g) ?? []) push(m.slice(1, -1));
+      const scanSurfaces = [contentText, argsText];
+      for (const text2 of scanSurfaces) {
+        for (const m of text2.match(/(?:[A-Za-z]:)?[\w.\-一-鿿]+(?:[/\\][\w.\-一-鿿]+)+\.[A-Za-z0-9]{1,6}/g) ?? []) push(m);
+        for (const m of text2.match(/`([^`\n]{2,48})`/g) ?? []) push(m.slice(1, -1));
+        for (const m of text2.match(/https?:\/\/[^\s"'<>（）【】，。]+/g) ?? []) push(m);
+      }
+      const text = contentText;
+      for (const m of text.match(/"([^"\n]{2,48})"/g) ?? []) push(m.slice(1, -1));
+      for (const m of text.match(/[「“]([^」”\n]{2,48})[」”]/g) ?? []) push(m.slice(1, -1));
+      for (const m of text.match(/'([^'\n]{2,48})'/g) ?? []) if (!m.slice(1, -1).includes(" ")) push(m.slice(1, -1));
+      for (const m of text.match(/[一-鿿][一-鿿0-9A-Za-z_]+/g) ?? []) if (m.length <= 14) push(m);
       return found.slice(0, ARCHIVE_INDEX_BATCH_CAP);
     };
     parseSummarySlot = (content) => {
@@ -2201,8 +2480,8 @@ ${tail}`;
       const merged = [];
       const seen = /* @__PURE__ */ new Set();
       for (const e of [...newEntities, ...index]) {
-        if (!e || seen.has(e)) continue;
-        seen.add(e);
+        if (!e || seen.has(e.toLowerCase())) continue;
+        seen.add(e.toLowerCase());
         merged.push(e);
         if (merged.length >= ARCHIVE_INDEX_MAX_ENTRIES) break;
       }
@@ -2265,14 +2544,80 @@ ${lines}
       return assembleSlot(index, newNotes);
     };
     compactSlotNarrative = async (slotContent, _modelWindow, signal) => synthesizeSlotNarrative(slotContent, "", signal);
+    MAX_BATCH_TOKENS = 16e3;
+    PRETRUNCATE_FLOOR_TOKENS = 512;
+    foldableTokensOf = (m) => Math.max(0, estimateTokens([m]) - 4);
+    foldTextToTarget = (text, curTokens, targetTokens) => {
+      const density = text.length / Math.max(1, curTokens);
+      const keepChars = Math.max(64, Math.floor(targetTokens * density));
+      const half = Math.floor(keepChars / 2);
+      const totalLines = text.split("\n").length;
+      const omitted = Math.max(0, totalLines - text.slice(0, half).split("\n").length - text.slice(-half).split("\n").length);
+      return [text.slice(0, half), "", `\u2026[\u538B\u7F29\u9884\u622A\u65AD\uFF1A\u8D85\u51FA\u5355\u6279\u538B\u7F29\u9884\u7B97\uFF0C\u5DF2\u53BB\u4E2D\u6BB5\u7EA6 ${omitted} \u884C\uFF08\u5171 ${totalLines} \u884C\uFF09\uFF1B\u5B8C\u6574\u5185\u5BB9\u53EF\u7ECF recall \u5DE5\u5177\u68C0\u7D22]\u2026`, "", text.slice(-half)].join("\n");
+    };
+    foldArguments = (args, maxChars) => {
+      if (args.length <= maxChars) return args;
+      try {
+        const walk = (v) => {
+          if (typeof v === "string") return v.length > maxChars ? `\u2026[\u5DF2\u6298\u53E0 ${v.length} \u5B57\u7B26]` : v;
+          if (Array.isArray(v)) return v.map(walk);
+          if (v && typeof v === "object") {
+            for (const k of Object.keys(v)) v[k] = walk(v[k]);
+          }
+          return v;
+        };
+        return JSON.stringify(walk(JSON.parse(args)));
+      } catch {
+        return JSON.stringify(`[\u5DE5\u5177\u53C2\u6570\u8FC7\u957F\u5DF2\u6298\u53E0\uFF0C\u539F ${args.length} \u5B57\u7B26]`);
+      }
+    };
+    foldMessageTo = (m, targetTokens) => {
+      const mm = m;
+      const keepChars = Math.max(256, targetTokens * 4);
+      if (Array.isArray(mm.tool_calls) && mm.tool_calls.length > 0) {
+        let content = mm.content;
+        if (typeof content === "string" && content.length > keepChars) {
+          content = foldTextToTarget(content, Math.max(1, foldableTokensOf(m)), targetTokens);
+        }
+        return {
+          ...mm,
+          content,
+          tool_calls: mm.tool_calls.map((c) => c?.function?.arguments ? { ...c, function: { ...c.function, arguments: foldArguments(String(c.function.arguments), keepChars) } } : c)
+        };
+      }
+      if (typeof mm.content === "string" && mm.content.length > 0) {
+        return { ...mm, content: foldTextToTarget(mm.content, Math.max(1, foldableTokensOf(m)), targetTokens) };
+      }
+      return m;
+    };
+    pretruncateOversizedUnit = (unit, budgetTokens = MAX_BATCH_TOKENS) => {
+      let out = unit.map((m) => Array.isArray(m.content) ? collapseToText(m) : m);
+      let guard = unit.length * 16 + 16;
+      while (estimateTokens(out) > budgetTokens && guard-- > 0) {
+        let idx = -1, maxT = 0;
+        for (let i = 0; i < out.length; i++) {
+          const t = foldableTokensOf(out[i]);
+          if (t > maxT) {
+            maxT = t;
+            idx = i;
+          }
+        }
+        if (idx < 0 || maxT <= PRETRUNCATE_FLOOR_TOKENS) break;
+        out[idx] = foldMessageTo(out[idx], Math.floor(maxT / 2));
+      }
+      return out;
+    };
     splitIntoBatches = (toCompact) => {
-      const MAX_BATCH_TOKENS = 16e3;
       const units = groupUnits(toCompact);
       const batches = [];
       let batch = [];
       let batchTokens = 0;
-      for (const unit of units) {
-        const size = estimateTokens(unit);
+      for (let unit of units) {
+        let size = estimateTokens(unit);
+        if (size > MAX_BATCH_TOKENS) {
+          unit = pretruncateOversizedUnit(unit);
+          size = estimateTokens(unit);
+        }
         if (batchTokens + size > MAX_BATCH_TOKENS && batch.length > 0) {
           batches.push(batch);
           batch = [];
@@ -2318,6 +2663,16 @@ ${lines}
       const cacheFactor = hitRate == null ? 1 : Math.min(1.1, Math.max(0.9, 0.9 + hitRate * 0.2));
       const effectiveRatio = Math.min(event.compactRatio * cacheFactor, 0.82);
       if (estReal(event.messageArr) <= event.modelWindow * effectiveRatio) return;
+      const preDecaySize = estReal(event.messageArr);
+      const decayedArr = decayOldToolResults(event.messageArr);
+      if (decayedArr !== event.messageArr) {
+        event.messageArr.length = 0;
+        event.messageArr.push(...decayedArr);
+      }
+      if (estReal(event.messageArr) <= event.modelWindow * effectiveRatio) {
+        console.log(`\u{1F4C9} [\u7A97\u53E3\u6CBB\u7406] \u514D\u8D39\u8870\u51CF\uFF08\u65E7\u5DE5\u5177\u7ED3\u679C\u6298\u53E0\uFF09\u540E\u56DE\u5230\u9608\u503C\u5185\uFF08${Math.round(preDecaySize)} \u2192 ${Math.round(estReal(event.messageArr))} token\uFF09\uFF0C\u8DF3\u8FC7 LLM \u538B\u7F29`);
+        return;
+      }
       const tokensThreshold = Math.round(event.modelWindow * effectiveRatio);
       await dispatch("PreCompact", { sessionId: event.sessionId, depth: event.depth, tokensBefore: Math.round(estReal(event.messageArr)), tokensThreshold });
       const systemMsg = event.messageArr[0];
@@ -2408,7 +2763,9 @@ ${lines}
             }
           });
           if (nextFailures >= 3) {
-            throw new Error(`\u274C [\u7269\u7406\u7194\u65AD] \u4E0A\u4E0B\u6587\u538B\u7F29\u5DF2\u8FDE\u7EED\u906D\u9047 ${nextFailures} \u6B21\u5931\u8D25\u3002\u4E3A\u9632\u6B62\u5929\u4EF7\u8D26\u5355\u6B7B\u5FAA\u73AF\uFF0C\u7CFB\u7EDF\u5DF2\u5F3A\u884C\u62E6\u622A\u3002\u8BF7\u6392\u67E5\u7F51\u7EDC\u6216\u5927\u6A21\u578B\u63D0\u4F9B\u5546\u662F\u5426\u5D29\u6E83\u3002`);
+            throw new Error(
+              `\u274C [\u538B\u7F29\u7194\u65AD] \u4E0A\u4E0B\u6587\u538B\u7F29\u8FDE\u7EED ${nextFailures} \u6B21\u5931\u8D25\uFF0C\u4E3A\u9632\u5929\u4EF7\u8D26\u5355\u6B7B\u5FAA\u73AF\u5DF2\u6682\u505C\u81EA\u52A8\u538B\u7F29\u3002\u5E38\u89C1\u6839\u56E0\uFF1A\u6458\u8981\u8F85\u52A9\u6A21\u578B\u670D\u52A1\u5F02\u5E38\u6216\u7F51\u7EDC\u4E0D\u901A\uFF08\u53EF\u67E5 DEEP_SEEK_AUX_MODEL \u670D\u52A1\u53EF\u7528\u6027\uFF1B\u8D85\u957F\u5DE5\u5177\u7ED3\u679C\u5DF2\u7531\u7CFB\u7EDF\u81EA\u52A8\u9884\u622A\u65AD\uFF0C\u4E00\u822C\u4E0D\u518D\u662F\u4E3B\u56E0\uFF09\u3002\u81EA\u6108\uFF1A\u76F4\u63A5\u91CD\u53D1\u6D88\u606F\u5373\u53EF\u91CD\u8BD5\uFF08\u6210\u529F\u538B\u7F29\u4E00\u6B21\u8BA1\u6570\u5373\u6E05\u96F6\uFF09\uFF1B\u6216 /fork \u5206\u53C9\u7EED\u63A5\u3001/new \u5F00\u65B0\u4F1A\u8BDD\u3002`
+            );
           }
           break;
         }
@@ -2424,83 +2781,18 @@ ${lines}
         throw new Error(`\u4E0A\u4E0B\u6587\u8D85\u51FA\u6A21\u578B\u7A97\u53E3\u4E0A\u9650\uFF08\u6821\u51C6\u7EA6 ${Math.round(finalTokens)} / ${event.modelWindow} token\uFF0C\u515C\u5E95 ${hardLimitRatio}\xD7window\uFF09\uFF0C\u5373\u4F7F\u5168\u91CF\u538B\u7F29\u4ECD\u65E0\u6CD5\u5BB9\u7EB3\u3002\u4EFB\u52A1\u8FC7\u5927\uFF0C\u8BF7\u62C6\u5206\u4EFB\u52A1\u3001\u51CF\u5C0F\u5355\u6B21\u8BFB\u53D6\u91CF\uFF0C\u6216\u589E\u5927 modelWindow\u3002`);
       }
     };
-    collectToolResult = async (ret, onChunk, signal) => {
-      if (isAsyncGenerator(ret)) {
-        let full = "";
-        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);
-          if (outcome.timedOut) {
-            full += `
-
-[\u23F3 \u5DE5\u5177\u6D41\u5F0F\u8F93\u51FA idle \u8D85\u65F6\uFF08${Math.round(idleMs / 1e3)}s \u65E0\u65B0\u5757\uFF09\uFF0C\u5DF2\u7194\u65AD\u8FD4\u56DE\u5DF2\u6536\u96C6\u5185\u5BB9]`;
-            try {
-              await ret.return(void 0);
-            } catch {
-            }
-            break;
-          }
-          if (outcome.step.done) break;
-          full += outcome.step.value;
-          onChunk?.(outcome.step.value);
-        }
-        return full;
-      }
-      const timeoutMs2 = Number(process.env.DEEP_SEEK_STREAM_IDLE_TIMEOUT_MS) || 12e4;
-      let timer;
-      const raced = await Promise.race([
-        Promise.resolve(ret).then((v) => ({ kind: "ok", value: typeof v === "string" ? v : JSON.stringify(v) })),
-        new Promise((resolve) => {
-          timer = setTimeout(() => resolve({ kind: "timeout" }), timeoutMs2);
-        }),
-        ...signal ? [new Promise((resolve) => {
-          signal.addEventListener("abort", () => resolve({ kind: "abort" }), { once: true });
-        })] : []
-      ]);
-      if (timer) clearTimeout(timer);
-      if (raced.kind === "timeout") {
-        return `[\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]`;
-      }
-      if (raced.kind === "abort") {
-        throw new Error("aborted");
-      }
-      return raced.value;
-    };
   }
 });
 
 // ../core/src/tool/permissions.ts
 import fs7 from "fs/promises";
 import path10 from "path";
-var PRIMARY_ARG, rules2, trustedProject, globCache, globToRegex, DANGER_COMMAND_TOOLS, compileRule, readPermissionConfig, toolNameMatches, ruleMatches, initPermissions, checkPermission, listPermissionRules, buildScopedAllowRule, resolveSettingsPath, addPermissionRule;
+var rules2, trustedProject, globCache, globToRegex, DANGER_COMMAND_TOOLS, compileRule, readPermissionConfig, toolNameMatches, ruleMatches, initPermissions, checkPermission, listPermissionRules, buildScopedAllowRule, resolveSettingsPath, addPermissionRule;
 var init_permissions = __esm({
   "../core/src/tool/permissions.ts"() {
     "use strict";
     init_config();
     init_common();
-    PRIMARY_ARG = {
-      run_command: "command",
-      run_in_background: "command",
-      web_fetch: "url",
-      web_search: "query",
-      read_file: "path",
-      list_dir: "path",
-      edit_file: "path",
-      create_file: "path",
-      write_file: "path",
-      delete_path: "path",
-      notebook_edit: "path",
-      move_file: "src",
-      search_grep: "query",
-      glob: "pattern"
-    };
     rules2 = { allow: [], deny: [], ask: [] };
     trustedProject = false;
     globCache = /* @__PURE__ */ new Map();
@@ -2566,8 +2858,8 @@ var init_permissions = __esm({
           if (!Array.isArray(list)) continue;
           for (const item of list) {
             if (typeof item !== "string") continue;
-            const compiled = compileRule(item, configPath, key);
-            if (compiled) merged[key].push(compiled);
+            const compiled2 = compileRule(item, configPath, key);
+            if (compiled2) merged[key].push(compiled2);
           }
         }
       }
@@ -2578,12 +2870,11 @@ var init_permissions = __esm({
       if (pattern.endsWith("*") && name.startsWith(pattern.slice(0, -1))) return true;
       return false;
     };
-    ruleMatches = (rule, toolName, args) => {
+    ruleMatches = (rule, toolName, args, primaryArg) => {
       if (!toolNameMatches(rule.toolName, toolName)) return false;
       if (rule.argRegex === null) return true;
-      const argKey = PRIMARY_ARG[toolName];
-      if (!argKey) return true;
-      const val = args?.[argKey];
+      if (!primaryArg) return true;
+      const val = args?.[primaryArg];
       if (typeof val !== "string") return false;
       return rule.argRegex.test(val);
     };
@@ -2600,11 +2891,11 @@ var init_permissions = __esm({
         rules2 = { allow: [], deny: [], ask: [] };
       }
     };
-    checkPermission = (toolName, args) => {
+    checkPermission = (toolName, args, primaryArg) => {
       try {
-        for (const r of rules2.deny) if (ruleMatches(r, toolName, args)) return "deny";
-        for (const r of rules2.ask) if (ruleMatches(r, toolName, args)) return "ask";
-        for (const r of rules2.allow) if (ruleMatches(r, toolName, args)) return "allow";
+        for (const r of rules2.deny) if (ruleMatches(r, toolName, args, primaryArg)) return "deny";
+        for (const r of rules2.ask) if (ruleMatches(r, toolName, args, primaryArg)) return "ask";
+        for (const r of rules2.allow) if (ruleMatches(r, toolName, args, primaryArg)) return "allow";
         return null;
       } catch {
         return null;
@@ -2614,8 +2905,8 @@ var init_permissions = __esm({
       const proj = (rs) => rs.map((r) => ({ toolName: r.toolName, raw: r.raw }));
       return { allow: proj(rules2.allow), deny: proj(rules2.deny), ask: proj(rules2.ask) };
     };
-    buildScopedAllowRule = (toolName, args) => {
-      const argKey = PRIMARY_ARG[toolName];
+    buildScopedAllowRule = (toolName, args, primaryArg) => {
+      const argKey = primaryArg;
       const val = argKey ? args?.[argKey] : void 0;
       if (!argKey || typeof val !== "string" || !val) return null;
       if (argKey === "command") {
@@ -2636,8 +2927,8 @@ var init_permissions = __esm({
     resolveSettingsPath = (scope) => scope === "global" ? path10.join(appConfig.dataDir, "settings.json") : path10.join(process.cwd(), ".deepseeker-code", "settings.json");
     addPermissionRule = async (scope, kind, ruleStr) => {
       if (scope === "project" && !trustedProject) return false;
-      const compiled = compileRule(ruleStr, `runtime:addPermissionRule(${scope})`, kind);
-      if (!compiled) return false;
+      const compiled2 = compileRule(ruleStr, `runtime:addPermissionRule(${scope})`, kind);
+      if (!compiled2) return false;
       try {
         const file = resolveSettingsPath(scope);
         const cfg = await readJSONFile(file, {}) ?? {};
@@ -2648,7 +2939,7 @@ var init_permissions = __esm({
           await fs7.mkdir(path10.dirname(file), { recursive: true });
           await atomicWriteJSON(file, cfg);
         }
-        if (!rules2[kind].some((r) => r.raw === compiled.raw)) rules2[kind].push(compiled);
+        if (!rules2[kind].some((r) => r.raw === compiled2.raw)) rules2[kind].push(compiled2);
         return true;
       } catch (e) {
         console.warn(`\u26A0\uFE0F [permissions] addPermissionRule \u5199\u5165\u5931\u8D25\uFF08${scope}/${kind} ${ruleStr}\uFF09: ${e?.message ?? e}`);
@@ -2688,7 +2979,7 @@ import fsSync from "fs";
 import path11 from "path";
 import ignore from "ignore";
 import { AsyncLocalStorage } from "node:async_hooks";
-var WORKSPACE_ROOT, workspaceAls, getActiveWorkspaceRoot, runWithWorkspaceRoot, runWithSessionContext, BUILTIN_IGNORE_RULES, ignoreCache, ignoreBuilding, allowedRootsReal, getAllowedWorkspaceRoots, getContainingRoot, allowedBoundaryRoots, resolveSafePath, resolveReadablePath, assertWithinWorkspace, PROTECTED_WRITE_DIRS, COMMAND_ENV_DENYLIST, SENSITIVE_ENV_PATTERN, scrubCommandEnv, isProtectedWrite, scanIgnoreFilesRecursive, buildIgnoreEngine, getIgnoreForBase, initializeWorkspaceIgnore, checkIsPathIgnored, requestApproval;
+var WORKSPACE_ROOT, workspaceAls, getActiveWorkspaceRoot, runWithWorkspaceRoot, runWithSessionContext, BUILTIN_IGNORE_RULES, ignoreCache, ignoreBuilding, allowedRootsReal, getAllowedWorkspaceRoots, realpathNativeSync, getContainingRoot, allowedBoundaryRoots, resolveSafePath, resolveReadablePath, assertWithinWorkspace, PROTECTED_WRITE_DIRS, COMMAND_ENV_DENYLIST, SENSITIVE_ENV_PATTERN, scrubCommandEnv, isProtectedWrite, SCAN_PRUNE_DIRS, scanIgnoreFilesRecursive, buildIgnoreEngine, getIgnoreForBase, initializeWorkspaceIgnore, checkIsPathIgnored, requestApproval;
 var init_guard = __esm({
   "../core/src/tool/guard.ts"() {
     "use strict";
@@ -2738,15 +3029,24 @@ var init_guard = __esm({
     ignoreBuilding = /* @__PURE__ */ new Map();
     allowedRootsReal = [];
     getAllowedWorkspaceRoots = () => [...allowedRootsReal];
+    realpathNativeSync = (p) => {
+      try {
+        return fsSync.realpathSync.native(p);
+      } catch {
+        return p;
+      }
+    };
     getContainingRoot = (absPath) => {
+      const target = realpathNativeSync(absPath);
       let best;
       for (const r of allowedBoundaryRoots()) {
-        const rel = path11.relative(r, absPath);
+        const rReal = realpathNativeSync(r);
+        const rel = path11.relative(rReal, target);
         if (!rel.startsWith("..") && !path11.isAbsolute(rel)) {
-          if (!best || r.length > best.length) best = r;
+          if (!best || rReal.length > best.length) best = rReal;
         }
       }
-      return best ?? getActiveWorkspaceRoot();
+      return best ?? realpathNativeSync(getActiveWorkspaceRoot());
     };
     allowedBoundaryRoots = () => {
       if (allowedRootsReal.length > 0) return allowedRootsReal;
@@ -2864,6 +3164,26 @@ var init_guard = __esm({
         return false;
       }
     };
+    SCAN_PRUNE_DIRS = /* @__PURE__ */ new Set([
+      "node_modules",
+      ".git",
+      "vendor",
+      "__pycache__",
+      ".venv",
+      ".pytest_cache",
+      ".gradle",
+      "build",
+      "target",
+      ".settings",
+      ".vs",
+      "Debug",
+      "Release",
+      "out",
+      ".DerivedData",
+      "Pods",
+      ".idea",
+      ".vscode"
+    ]);
     scanIgnoreFilesRecursive = async (dirPath, base, engine) => {
       try {
         const entries = await fs8.readdir(dirPath, { withFileTypes: true });
@@ -2881,7 +3201,7 @@ var init_guard = __esm({
           }
         }
         for (const entry of entries) {
-          if (entry.isDirectory() && entry.name !== "node_modules" && entry.name !== ".git") {
+          if (entry.isDirectory() && !SCAN_PRUNE_DIRS.has(entry.name)) {
             await scanIgnoreFilesRecursive(path11.join(dirPath, entry.name), base, engine);
           }
         }
@@ -2923,7 +3243,7 @@ var init_guard = __esm({
         return false;
       }
     };
-    requestApproval = async (toolName, toolCallId, detail, ctx, safetyLevel, args) => {
+    requestApproval = async (toolName, toolCallId, detail, ctx, safetyLevel, args, primaryArg) => {
       const safeDetail = truncateApprovalDetail(detail);
       if (!ctx.requestApproval) {
         ctx.onUIEvent?.({ type: "tool.denied", toolsId: toolCallId, toolName });
@@ -2933,11 +3253,11 @@ var init_guard = __esm({
       await dispatch("PermissionRequest", { sessionId: ctx.sessionId, cwd: ctx.cwd, toolName, toolCallId, detail: safeDetail, safetyLevel, args }).catch(() => {
       });
       const decision = await ctx.requestApproval(safeDetail, { toolName, toolCallId, sessionId: ctx.sessionId });
-      const approved = decision !== "deny";
-      if (!approved) {
+      const approved2 = decision !== "deny";
+      if (!approved2) {
         ctx.onUIEvent?.({ type: "tool.denied", toolsId: toolCallId, toolName });
       } else if (decision === "allow-always") {
-        const ruleStr = buildScopedAllowRule(toolName, args);
+        const ruleStr = buildScopedAllowRule(toolName, args, primaryArg);
         if (ruleStr) {
           const persisted = await addPermissionRule("project", "allow", ruleStr).catch(() => false);
           console.log(persisted ? `\u{1F4CC} [\u5BA1\u6279\u8BB0\u5FC6] \u5DF2\u5199\u6301\u4E45 allow \u89C4\u5219\uFF1A${ruleStr}\uFF08\u9879\u76EE .deepseeker-code/settings.json\uFF09\uFF0C\u540E\u7EED\u547D\u4E2D\u8BE5\u4F5C\u7528\u57DF\u514D\u5BA1` : `\u267B\uFE0F [\u5BA1\u6279] ${toolName} \u672C\u6B21\u653E\u884C${safetyLevel ? ` (${safetyLevel})` : ""}\uFF08\u672A\u6301\u4E45\u5316\uFF1A\u672A\u4FE1\u4EFB\u76EE\u5F55\u6216\u5199\u5165\u5931\u8D25\uFF09`);
@@ -2945,7 +3265,7 @@ var init_guard = __esm({
           console.log(`\u267B\uFE0F [\u5BA1\u6279] ${toolName} \u672C\u6B21\u653E\u884C${safetyLevel ? ` (${safetyLevel})` : ""}\uFF08\u672A\u6301\u4E45\u5316\uFF1A\u65E0\u6CD5\u5B89\u5168\u751F\u6210\u4F5C\u7528\u57DF\uFF0C\u907F\u514D\u88F8\u5DE5\u5177\u540D\u9759\u9ED8\u653E\u884C\u5168\u90E8\u8C03\u7528\uFF09`);
         }
       }
-      return approved;
+      return approved2;
     };
   }
 });
@@ -3138,6 +3458,8 @@ var init_background = __esm({
         type: "function",
         function: {
           name: "run_in_background",
+          primaryArg: "command",
+          autoApproval: "command",
           description: "\u5728\u540E\u53F0\u542F\u52A8\u4E00\u4E2A\u957F\u65F6 shell \u547D\u4EE4\u5E76\u7ACB\u5373\u8FD4\u56DE task_id\uFF0C\u4E0D\u963B\u585E\u540E\u7EED\u63A8\u7406\u3002\u9002\u7528\u4E24\u7C7B\u573A\u666F\uFF1A\u2460 \u957F\u8FDE\u63A5/\u5E38\u9A7B\u8FDB\u7A0B\uFF08dev server\u3001watch\u3001tail -f\uFF09\u2014\u2014\u5148\u8D77\u670D\u52A1\u518D\u7EE7\u7EED\u5E72\u522B\u7684\u6D3B\uFF1B\u2461 \u9884\u8BA1\u8FD0\u884C\u6570\u5206\u949F\u4EE5\u4E0A\u3001\u65E0\u9700\u5B9E\u65F6\u76EF\u770B\u7684\u6709\u9650\u957F\u4EFB\u52A1\uFF08\u5168\u91CF\u6D4B\u8BD5 / \u5927\u6784\u5EFA / \u5927\u4F53\u79EF\u5B89\u88C5\u2014\u2014\u8DD1\u5B8C\u7528 get_background_output \u5E26 wait_seconds \u7B49\u7ED3\u679C\uFF0C\u4E0D\u8981\u7528\u524D\u53F0 run_command \u5E72\u7B49\uFF09\u3002\u7528 get_background_output \u67E5\u65E5\u5FD7\u4E0E\u72B6\u6001\uFF0Cstop_background_task \u7EC8\u6B62\u3002",
           parameters: {
             type: "object",
@@ -3185,7 +3507,7 @@ var init_background = __esm({
               proc = spawn2(args.command, { shell: isWin ? resolveWinShell() ?? true : true, cwd, detached: !isWin, env: scrubCommandEnv() });
               proc.unref?.();
             } catch (e) {
-              yield `\u274C [\u540E\u53F0\u542F\u52A8\u5931\u8D25]\uFF1A${e.message}`;
+              yield toolFailure(`[\u540E\u53F0\u542F\u52A8\u5931\u8D25]\uFF1A${e.message}`);
               return;
             }
             const codec = {
@@ -3229,7 +3551,7 @@ task_id: ${taskId}
           async execute(args, ctx) {
             const task = registry.get(args.task_id);
             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`;
+              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;
             if (waitMs > 0 && task.status === "running") {
@@ -3269,7 +3591,7 @@ task_id: ${taskId}
           async execute(args, ctx) {
             const task = registry.get(args.task_id);
             if (!task || task.sessionId !== ctx?.sessionId) {
-              return `\u274C [\u7EC8\u6B62\u5931\u8D25]\uFF1A\u672A\u627E\u5230 task_id=${args.task_id}\uFF08\u6216\u4E0D\u5C5E\u4E8E\u5F53\u524D\u4F1A\u8BDD\uFF09\u3002`;
+              return toolFailure(`[\u7EC8\u6B62\u5931\u8D25]\uFF1A\u672A\u627E\u5230 task_id=${args.task_id}\uFF08\u6216\u4E0D\u5C5E\u4E8E\u5F53\u524D\u4F1A\u8BDD\uFF09\u3002`);
             }
             if (task.status !== "running") {
               return `\u2139\uFE0F [stop]\uFF1A\u4EFB\u52A1 ${args.task_id} \u5F53\u524D\u72B6\u6001\u4E3A ${task.status}\uFF08\u5DF2\u4E0D\u5728\u8FD0\u884C\uFF09\uFF0C\u65E0\u9700\u7EC8\u6B62\u3002`;
@@ -3307,6 +3629,7 @@ var init_client2 = __esm({
     "use strict";
     init_background();
     init_config();
+    init_type();
     REQUEST_TIMEOUT_MS = 3e4;
     PROTOCOL_VERSION_STDIO = "2024-11-05";
     PROTOCOL_VERSION_HTTP = "2025-03-26";
@@ -3320,8 +3643,8 @@ var init_client2 = __esm({
       const text = content.filter((c) => c?.type === "text" && typeof c.text === "string").map((c) => c.text).join("\n");
       const capped = capResultText(text);
       if (result?.isError) {
-        return `\u274C [MCP \u5DE5\u5177\u62A5\u9519]
-${capped || JSON.stringify(result)}`;
+        return toolFailure(`[MCP \u5DE5\u5177\u62A5\u9519]
+${capped || JSON.stringify(result)}`).content;
       }
       return capped || JSON.stringify(result);
     };
@@ -3972,6 +4295,7 @@ var init_loader = __esm({
   "../core/src/tool/mcp/loader.ts"() {
     "use strict";
     init_type();
+    init_argsValidator();
     init_config();
     init_client2();
     clients = [];
@@ -4050,10 +4374,10 @@ ${out.map((r) => `- [${r.server}] ${r.uri}\uFF08${r.name}${r.description ? `\uFF
 \uFF08\u5C06\u628A MCP server \u63D0\u4F9B\u7684\u5185\u5BB9\u62C9\u5165\u6A21\u578B\u4E0A\u4E0B\u6587\uFF1B\u8BF7\u786E\u8BA4\u6765\u6E90\u53EF\u4FE1\u3001\u4E0D\u542B\u654F\u611F\u6570\u636E\uFF09`,
           async execute(args) {
             const { server, uri } = args ?? {};
-            if (!server || !uri) return "\u274C [read_mcp_resource] \u7F3A\u5C11 server \u6216 uri\u3002";
+            if (!server || !uri) return toolFailure("[read_mcp_resource] \u7F3A\u5C11 server \u6216 uri\u3002");
             const c = findClient(server);
-            if (!c) return `\u274C \u672A\u8FDE\u63A5\u7684 MCP server\uFF1A${server}`;
-            if (!c.supportsResources) return `\u274C server "${server}" \u4E0D\u652F\u6301 resources\u3002`;
+            if (!c) return toolFailure(`\u672A\u8FDE\u63A5\u7684 MCP server\uFF1A${server}`);
+            if (!c.supportsResources) return toolFailure(`server "${server}" \u4E0D\u652F\u6301 resources\u3002`);
             const text = await c.readResource(uri);
             return `[MCP resource ${server}${uri}]
 ${text}`;
@@ -4120,10 +4444,10 @@ ${out.map((p) => `- [${p.server}] ${p.name}${p.description ? `\uFF1A${p.descript
 \uFF08\u5C06\u628A MCP server \u6E32\u67D3\u7684 prompt \u6587\u672C\u62C9\u5165\u6A21\u578B\u4E0A\u4E0B\u6587\uFF1B\u8BF7\u786E\u8BA4\u6765\u6E90\u53EF\u4FE1\uFF09`,
           async execute(args) {
             const { server, name, arguments: pargs } = args ?? {};
-            if (!server || !name) return "\u274C [get_mcp_prompt] \u7F3A\u5C11 server \u6216 name\u3002";
+            if (!server || !name) return toolFailure("[get_mcp_prompt] \u7F3A\u5C11 server \u6216 name\u3002");
             const c = findClient(server);
-            if (!c) return `\u274C \u672A\u8FDE\u63A5\u7684 MCP server\uFF1A${server}`;
-            if (!c.supportsPrompts) return `\u274C server "${server}" \u4E0D\u652F\u6301 prompts\u3002`;
+            if (!c) return toolFailure(`\u672A\u8FDE\u63A5\u7684 MCP server\uFF1A${server}`);
+            if (!c.supportsPrompts) return toolFailure(`server "${server}" \u4E0D\u652F\u6301 prompts\u3002`);
             const text = await c.getPrompt(name, pargs);
             return `[MCP prompt ${server}/${name}]
 ${text}`;
@@ -4178,34 +4502,63 @@ ${lines.join("\n")}`;
         type: "function",
         function: {
           name: "mcp_call",
-          description: '\u8C03\u7528\u6307\u5B9A MCP server \u7684\u5916\u90E8\u5DE5\u5177\u3002server \u4E0E\u5DE5\u5177\u540D\u5FC5\u586B\u2014\u2014\u5747\u6765\u81EA mcp_list_tools \u7684\u76EE\u5F55\u8F93\u51FA\uFF08\u7528\u539F\u540D\uFF0C\u4E0D\u8981\u6539\u5199\uFF09\u3002args \u4E3A\u8BE5\u5DE5\u5177\u53C2\u6570\u7684 JSON \u5B57\u7B26\u4E32\uFF08\u53C2\u6570\u540D\u89C1\u76EE\u5F55\uFF1B\u65E0\u53C2\u6570\u4F20 "{}"\uFF09\u3002\u6267\u884C\u5916\u90E8\u903B\u8F91\uFF0C\u6BCF\u6B21\u8C03\u7528\u9700\u5BA1\u6279\u3002',
+          description: "\u8C03\u7528\u6307\u5B9A MCP server \u7684\u5916\u90E8\u5DE5\u5177\u3002server \u4E0E\u5DE5\u5177\u540D\u5FC5\u586B\u2014\u2014\u5747\u6765\u81EA mcp_list_tools \u7684\u76EE\u5F55\u8F93\u51FA\uFF08\u7528\u539F\u540D\uFF0C\u4E0D\u8981\u6539\u5199\uFF09\u3002args \u4E3A\u8BE5\u5DE5\u5177\u53C2\u6570\u7684\u5BF9\u8C61\uFF08\u53C2\u6570\u540D\u89C1\u76EE\u5F55\uFF1B\u65E0\u53C2\u6570\u4F20 {}\uFF09\uFF1B\u5386\u53F2\u517C\u5BB9\u4E5F\u63A5\u53D7 JSON \u5B57\u7B26\u4E32\u3002\u6267\u884C\u5916\u90E8\u903B\u8F91\uFF0C\u6BCF\u6B21\u8C03\u7528\u9700\u5BA1\u6279\u3002",
           parameters: {
             type: "object",
             properties: {
               server: { type: "string", description: "MCP server \u540D\uFF08\u89C1 mcp_list_tools \u8F93\u51FA\uFF09" },
               tool: { type: "string", description: "\u5DE5\u5177\u540D\uFF08\u89C1 mcp_list_tools \u8F93\u51FA\uFF0C\u7528\u539F\u540D\uFF09" },
-              args: { type: "string", description: '\u5DE5\u5177\u53C2\u6570\u7684 JSON \u5B57\u7B26\u4E32\uFF0C\u5982 {"query":"..."}\uFF1B\u65E0\u53C2\u6570\u4F20 "{}"' }
+              args: {
+                // #8c：收回结构化 object（历史 JSON 字符串兼容保留——防旧 prompt 缓存/模型惯性）。
+                // anyOf 双形态而非仅 object：否则旧形态调用会被执行层 #8c 参数校验早退，兼容形同虚设。
+                anyOf: [
+                  { type: "object", additionalProperties: true, description: '\u5DE5\u5177\u53C2\u6570\u5BF9\u8C61\uFF0C\u5982 {"query":"..."}\uFF1B\u65E0\u53C2\u6570\u4F20 {}' },
+                  { type: "string", description: '\uFF08\u5386\u53F2\u517C\u5BB9\uFF09\u5DE5\u5177\u53C2\u6570\u7684 JSON \u5B57\u7B26\u4E32\uFF0C\u5982 "{\\"query\\":\\"...\\"}"\uFF1B\u65E0\u53C2\u6570\u4F20 "{}"' }
+                ]
+              }
             },
             required: ["server", "tool"]
           },
           safetyLevel: "danger" /* DANGER */,
           isSync: true,
-          requireApproval: (args) => `\u26A0\uFE0F\u3010MCP \u5DE5\u5177\u5BA1\u6279\u3011
+          requireApproval: (args) => {
+            const a = args?.args;
+            const rendered = a === void 0 || a === null ? "{}" : typeof a === "string" ? a : JSON.stringify(a);
+            return `\u26A0\uFE0F\u3010MCP \u5DE5\u5177\u5BA1\u6279\u3011
 \u670D\u52A1: ${args?.server} / \u5DE5\u5177: ${args?.tool}
-\u53C2\u6570: ${args?.args}`,
+\u53C2\u6570: ${rendered}`;
+          },
           async execute(args) {
             const { server, tool } = args ?? {};
-            if (!server || !tool) return "\u274C [mcp_call] \u7F3A\u5C11 server \u6216 tool\uFF08\u5148\u7528 mcp_list_tools \u67E5\u76EE\u5F55\uFF09\u3002";
+            if (!server || !tool) return toolFailure("[mcp_call] \u7F3A\u5C11 server \u6216 tool\uFF08\u5148\u7528 mcp_list_tools \u67E5\u76EE\u5F55\uFF09\u3002");
             let parsed = {};
-            if (typeof args.args === "string" && args.args.trim() && args.args.trim() !== "{}") {
-              try {
-                parsed = JSON.parse(args.args);
-              } catch {
-                return `\u274C [mcp_call] args \u4E0D\u662F\u5408\u6CD5 JSON\uFF1A${String(args.args).slice(0, 200)}\u3002\u8BF7\u4F20\u8BE5\u5DE5\u5177\u53C2\u6570\u7684 JSON \u5B57\u7B26\u4E32\uFF08\u65E0\u53C2\u6570\u4F20 "{}"\uFF09\u3002`;
+            if (args.args !== void 0 && args.args !== null) {
+              if (typeof args.args === "string") {
+                if (args.args.trim() && args.args.trim() !== "{}") {
+                  try {
+                    parsed = JSON.parse(args.args);
+                  } catch {
+                    return toolFailure(`[mcp_call] args \u4E0D\u662F\u5408\u6CD5 JSON\uFF1A${String(args.args).slice(0, 200)}\u3002\u8BF7\u4F20\u8BE5\u5DE5\u5177\u53C2\u6570\u7684\u5BF9\u8C61\uFF08\u65E0\u53C2\u6570\u4F20 {}\uFF09\u3002`, "syntax");
+                  }
+                }
+              } else if (typeof args.args === "object" && !Array.isArray(args.args)) {
+                parsed = args.args;
+              } else {
+                return toolFailure(`[mcp_call] args \u9700\u4E3A\u53C2\u6570\u5BF9\u8C61\u6216 JSON \u5B57\u7B26\u4E32\uFF0C\u6536\u5230 ${typeof args.args}\u3002\u8BF7\u4FEE\u6B63\u540E\u91CD\u8BD5\u3002`, "syntax");
               }
             }
             const c = findClient(server);
-            if (!c) return `\u274C \u672A\u8FDE\u63A5\u7684 MCP server\uFF1A${server}\uFF08\u7528 mcp_list_tools \u67E5\u770B\u5DF2\u8FDE\u63A5\u5217\u8868\uFF09`;
+            if (!c) return toolFailure(`\u672A\u8FDE\u63A5\u7684 MCP server\uFF1A${server}\uFF08\u7528 mcp_list_tools \u67E5\u770B\u5DF2\u8FDE\u63A5\u5217\u8868\uFF09`);
+            try {
+              const target = (await c.listTools()).find((t) => t.name === tool);
+              if (target?.inputSchema && typeof target.inputSchema === "object") {
+                const verdict = validateToolArgs(target.inputSchema, parsed);
+                if (!verdict.ok) {
+                  return toolFailure(`\u53C2\u6570\u6821\u9A8C\u5931\u8D25\uFF1A${server}/${tool} ${verdict.message}\uFF1B\u8BF7\u4FEE\u6B63 args \u540E\u91CD\u8BD5\uFF08schema \u89C1 mcp_list_tools \u76EE\u5F55\uFF09\u3002`, "syntax");
+                }
+              }
+            } catch {
+            }
             const result = await c.callTool(tool, parsed);
             return `[MCP ${server}/${tool}]
 ${result}`;
@@ -4388,7 +4741,7 @@ var init_repeatBreaker = __esm({
 
 // ../core/src/agent/planMode.ts
 function filterToolsForPlanMode(tools) {
-  const allowed = tools.filter((t) => PLAN_ALLOWED_TOOLS.has(t.function.name));
+  const allowed = tools.filter((t) => t.function.planAllowed === true);
   return [...allowed, exitPlanModeToolSchema];
 }
 function appendPlanControlTools(tools) {
@@ -4398,30 +4751,10 @@ function appendPlanControlTools(tools) {
     exitPlanModeToolSchema
   ];
 }
-var PLAN_ALLOWED_TOOLS, exitPlanModeToolSchema, enterPlanModeToolSchema, PLAN_MODE_AUTO_ENTER_HINT;
+var exitPlanModeToolSchema, enterPlanModeToolSchema, PLAN_MODE_AUTO_ENTER_HINT;
 var init_planMode = __esm({
   "../core/src/agent/planMode.ts"() {
     "use strict";
-    PLAN_ALLOWED_TOOLS = /* @__PURE__ */ new Set([
-      "read_file",
-      "list_dir",
-      "view_symbol_outline",
-      "read_project_guide",
-      "search_grep",
-      "glob",
-      "get_git_diff",
-      "git_status",
-      "git_log",
-      "inspect_dependencies",
-      "get_diagnostics",
-      "goto_definition",
-      // ★ P0-A 补漏：LSP 导航/诊断恰是调研阶段最需要的（原白名单漂移漏登记，schema 档与 runtime 档共用此表）
-      "recall",
-      // 只读检索本会话历史（长调研中早前轮次可能已被压缩归档，调研阶段恰是 recall 主场景）
-      "web_fetch",
-      "web_search"
-      // 只读研究类（虽为 DANGER 但不写本地状态；仍走各自审批）
-    ]);
     exitPlanModeToolSchema = {
       type: "function",
       function: {
@@ -4702,7 +5035,7 @@ ${style.body}`);
 });
 
 // ../core/src/memory/registry.ts
-var memories, registerMemory, listMemories, getMemory, unregisterMemory, clearMemories, getMemoryIndex;
+var memories, registerMemory, listMemories, getMemory, unregisterMemory, clearMemories, memoryIndexLine, getMemoryIndex;
 var init_registry6 = __esm({
   "../core/src/memory/registry.ts"() {
     "use strict";
@@ -4720,10 +5053,11 @@ var init_registry6 = __esm({
       return true;
     };
     clearMemories = memories.clear;
+    memoryIndexLine = (m) => `- **${m.name}** (${m.type}) \u2014 ${m.description}`;
     getMemoryIndex = () => {
       const all = memories.list();
       if (all.length === 0) return null;
-      return all.slice().sort((a, b) => a.name.localeCompare(b.name)).map((m) => `- **${m.name}** (${m.type}) \u2014 ${m.description}`).join("\n");
+      return all.slice().sort((a, b) => a.name.localeCompare(b.name)).map(memoryIndexLine).join("\n");
     };
   }
 });
@@ -4747,7 +5081,7 @@ ${index}`);
 });
 
 // ../core/src/agent/systemInjections.ts
-var prepareToolsAndInjections;
+var cleanedSchemaCache, cleanToolSchema, prepareToolsAndInjections;
 var init_systemInjections = __esm({
   "../core/src/agent/systemInjections.ts"() {
     "use strict";
@@ -4761,6 +5095,19 @@ var init_systemInjections = __esm({
     init_inject4();
     init_inject5();
     init_common();
+    cleanedSchemaCache = /* @__PURE__ */ new WeakMap();
+    cleanToolSchema = (t) => {
+      let entry = cleanedSchemaCache.get(t);
+      if (!entry) {
+        const cleaned = {
+          type: t.type,
+          function: { name: t.function.name, description: t.function.description, parameters: t.function.parameters }
+        };
+        entry = { cleaned, fragment: JSON.stringify(cleaned) };
+        cleanedSchemaCache.set(t, entry);
+      }
+      return entry;
+    };
     prepareToolsAndInjections = async (message, options, events) => {
       const { toolSchemas, planMode, locale: locale2, outputStyle } = options;
       const rawToolsPreEnv = planMode && appConfig.planEnforcement === "schema" ? filterToolsForPlanMode(toolSchemas ?? []) : appendPlanControlTools(toolSchemas ?? []);
@@ -4779,11 +5126,10 @@ var init_systemInjections = __esm({
         requestQuestion: options.requestQuestion
       };
       const rawTools = await filterByEnvironment(rawToolsPreEnv, validationCtx);
-      const cleanedToolSchemas = rawTools.map((t) => ({
-        type: t.type,
-        function: { name: t.function.name, description: t.function.description, parameters: t.function.parameters }
-      }));
-      const toolsTokens = Math.round(JSON.stringify(cleanedToolSchemas).length / 4);
+      const cleanedEntries = rawTools.map((t) => cleanToolSchema(t));
+      const cleanedToolSchemas = cleanedEntries.map((e) => e.cleaned);
+      const schemaJsonLen = cleanedEntries.length === 0 ? 2 : cleanedEntries.reduce((sum, e) => sum + e.fragment.length, 0) + cleanedEntries.length + 1;
+      const toolsTokens = Math.round(schemaJsonLen / 4);
       ensureSummarySlot(message);
       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",
@@ -4813,6 +5159,73 @@ var init_systemInjections = __esm({
   }
 });
 
+// ../core/src/agent/toolResultCollect.ts
+function isAsyncGenerator(x) {
+  return x != null && typeof x[Symbol.asyncIterator] === "function";
+}
+var collectToolResult;
+var init_toolResultCollect = __esm({
+  "../core/src/agent/toolResultCollect.ts"() {
+    "use strict";
+    collectToolResult = async (ret, onChunk, signal) => {
+      if (isAsyncGenerator(ret)) {
+        let full = "";
+        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);
+          if (outcome.timedOut) {
+            full += `
+
+[\u23F3 \u5DE5\u5177\u6D41\u5F0F\u8F93\u51FA idle \u8D85\u65F6\uFF08${Math.round(idleMs / 1e3)}s \u65E0\u65B0\u5757\uFF09\uFF0C\u5DF2\u7194\u65AD\u8FD4\u56DE\u5DF2\u6536\u96C6\u5185\u5BB9]`;
+            try {
+              await ret.return(void 0);
+            } catch {
+            }
+            return { content: full, status: "failed", errorCategory: "runtime" };
+          }
+          if (outcome.step.done) break;
+          const chunk = typeof outcome.step.value === "string" ? outcome.step.value : String(outcome.step.value?.content ?? outcome.step.value ?? "");
+          full += chunk;
+          onChunk?.(chunk);
+        }
+        return { content: full, status: "success" };
+      }
+      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);
+      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" };
+      }
+      if (raced.kind === "abort") {
+        throw new Error("aborted");
+      }
+      const v = raced.value;
+      if (typeof v === "string") return { content: v, status: "success" };
+      if (v && typeof v === "object" && typeof v.content === "string" && (v.status === "success" || v.status === "failed")) return v;
+      return { content: JSON.stringify(v), status: "success" };
+    };
+  }
+});
+
 // ../core/src/tool/registry/agent.ts
 var createAgentTools;
 var init_agent = __esm({
@@ -4839,13 +5252,13 @@ var init_agent = __esm({
           safetyLevel: "safe" /* SAFE */,
           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";
+            if (!ctx) return toolFailure("[\u6D3E\u751F\u5931\u8D25]\uFF1Aspawn_agent \u7F3A\u5C11\u5FC5\u987B\u7684\u667A\u80FD\u4F53\u8FD0\u884C\u4E0A\u4E0B\u6587\u3002");
             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;
+            if (!res.ok) return asToolFailure(res.output);
             return [
               `\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
 `,
@@ -5015,18 +5428,19 @@ var validateWorkflowArgs, stepLabel, buildPipelineTask, formatWorkflowResult;
 var init_workflowHelpers = __esm({
   "../core/src/tool/registry/workflowHelpers.ts"() {
     "use strict";
+    init_type();
     validateWorkflowArgs = (args, maxSteps) => {
       const steps = args?.steps;
       if (!Array.isArray(steps) || steps.length === 0) {
-        return "\u274C [\u5DE5\u4F5C\u6D41] steps \u5FC5\u987B\u662F\u975E\u7A7A\u6570\u7EC4\uFF08\u81F3\u5C11 1 \u4E2A\u6B65\u9AA4\uFF09\u3002";
+        return toolFailure("[\u5DE5\u4F5C\u6D41] steps \u5FC5\u987B\u662F\u975E\u7A7A\u6570\u7EC4\uFF08\u81F3\u5C11 1 \u4E2A\u6B65\u9AA4\uFF09\u3002");
       }
       if (steps.length > maxSteps) {
-        return `\u274C [\u5DE5\u4F5C\u6D41] \u6B65\u9AA4\u6570 ${steps.length} \u8D85\u8FC7\u4E0A\u9650 ${maxSteps}\uFF08\u9632\u5931\u63A7\u6D3E\u751F\u70E7 token\uFF09\u3002\u8BF7\u62C6\u5206\u4E3A\u591A\u6B21 run_workflow \u8C03\u7528\uFF0C\u6216\u7CBE\u7B80\u6B65\u9AA4\u3002`;
+        return toolFailure(`[\u5DE5\u4F5C\u6D41] \u6B65\u9AA4\u6570 ${steps.length} \u8D85\u8FC7\u4E0A\u9650 ${maxSteps}\uFF08\u9632\u5931\u63A7\u6D3E\u751F\u70E7 token\uFF09\u3002\u8BF7\u62C6\u5206\u4E3A\u591A\u6B21 run_workflow \u8C03\u7528\uFF0C\u6216\u7CBE\u7B80\u6B65\u9AA4\u3002`);
       }
       for (let i = 0; i < steps.length; i++) {
         const s = steps[i];
         if (!s || typeof s.task !== "string" || !s.task.trim()) {
-          return `\u274C [\u5DE5\u4F5C\u6D41] steps[${i}].task \u5FC5\u987B\u662F\u975E\u7A7A\u5B57\u7B26\u4E32\u3002`;
+          return toolFailure(`[\u5DE5\u4F5C\u6D41] steps[${i}].task \u5FC5\u987B\u662F\u975E\u7A7A\u5B57\u7B26\u4E32\u3002`);
         }
       }
       return null;
@@ -5143,14 +5557,14 @@ var init_workflow = __esm({
           // 聚合输出整体兜底截断（各子 agent 结果已按 workflowPerStepChars 单独截断）。
           maxOutputCharacters: 18e3,
           async execute(args, ctx) {
-            if (!ctx) return "\u274C [\u5DE5\u4F5C\u6D41]\uFF1Arun_workflow \u7F3A\u5C11\u5FC5\u987B\u7684\u667A\u80FD\u4F53\u8FD0\u884C\u4E0A\u4E0B\u6587\u3002";
+            if (!ctx) return toolFailure("[\u5DE5\u4F5C\u6D41]\uFF1Arun_workflow \u7F3A\u5C11\u5FC5\u987B\u7684\u667A\u80FD\u4F53\u8FD0\u884C\u4E0A\u4E0B\u6587\u3002");
             const maxSteps = appConfig.workflowMaxSteps;
             const validationError = validateWorkflowArgs(args, maxSteps);
             if (validationError) return validationError;
             const mode = args.mode === "pipeline" ? "pipeline" : "parallel";
             const isolation = args.isolation === "worktree" ? "worktree" : "none";
             if (isolation === "worktree" && mode === "pipeline") {
-              return '\u274C [\u5DE5\u4F5C\u6D41]\uFF1Aisolation="worktree" \u6682\u4EC5\u652F\u6301 parallel \u6A21\u5F0F\uFF08pipeline \u4E32\u884C\u65E0\u9700\u9694\u79BB\uFF09\u3002\u8BF7\u6539 mode=parallel \u6216 isolation=none\u3002';
+              return toolFailure('[\u5DE5\u4F5C\u6D41]\uFF1Aisolation="worktree" \u6682\u4EC5\u652F\u6301 parallel \u6A21\u5F0F\uFF08pipeline \u4E32\u884C\u65E0\u9700\u9694\u79BB\uFF09\u3002\u8BF7\u6539 mode=parallel \u6216 isolation=none\u3002');
             }
             const steps = args.steps.map((s) => ({
               task: String(s.task),
@@ -5159,7 +5573,7 @@ var init_workflow = __esm({
               key: s.key ? String(s.key) : void 0
             }));
             if (ctx.depth >= MAX_AGENT_DEPTH) {
-              return `\u274C [\u5B89\u5168\u7194\u65AD]\uFF1A\u5DF2\u8FBE\u5230\u6700\u5927 Agent \u5D4C\u5957\u6DF1\u5EA6\uFF08${MAX_AGENT_DEPTH}\u5C42\uFF09\uFF0C\u65E0\u6CD5\u6D3E\u751F\u5DE5\u4F5C\u6D41\u5B50 agent\u3002\u8BF7\u5728\u672C\u5C42\u7EA7\u81EA\u884C\u6D88\u5316\u4EFB\u52A1\u3002`;
+              return toolFailure(`[\u5B89\u5168\u7194\u65AD]\uFF1A\u5DF2\u8FBE\u5230\u6700\u5927 Agent \u5D4C\u5957\u6DF1\u5EA6\uFF08${MAX_AGENT_DEPTH}\u5C42\uFF09\uFF0C\u65E0\u6CD5\u6D3E\u751F\u5DE5\u4F5C\u6D41\u5B50 agent\u3002\u8BF7\u5728\u672C\u5C42\u7EA7\u81EA\u884C\u6D88\u5316\u4EFB\u52A1\u3002`);
             }
             const approvalMutex = createSemaphore(1);
             const serializedApproval = ctx.requestApproval ? async (...raArgs) => {
@@ -5193,7 +5607,7 @@ var init_workflow = __esm({
               try {
                 wt = await createWorktree(ctx.sessionId, String(index));
               } catch (e) {
-                const msg = `\u274C [worktree \u521B\u5EFA\u5931\u8D25]\uFF1A${e?.message ?? e}\uFF08worktree \u9694\u79BB\u9700\u8981\u4E3B\u5DE5\u4F5C\u533A\u662F git \u4ED3\u5E93\uFF09\u3002\u8BE5\u6B65\u9AA4\u672A\u6267\u884C\u3002`;
+                const msg = toolFailure(`[worktree \u521B\u5EFA\u5931\u8D25]\uFF1A${e?.message ?? e}\uFF08worktree \u9694\u79BB\u9700\u8981\u4E3B\u5DE5\u4F5C\u533A\u662F git \u4ED3\u5E93\uFF09\u3002\u8BE5\u6B65\u9AA4\u672A\u6267\u884C\u3002`).content;
                 done++;
                 ctx.emitProgress?.(`\u5E76\u884C\u7F16\u6392\uFF1A${done}/${total} worktree \u521B\u5EFA\u5931\u8D25\uFF08${stepLabel(step, index)}\uFF09`);
                 return { ok: false, output: msg, label: stepLabel(step, index) };
@@ -5243,7 +5657,7 @@ var init_workflow = __esm({
                 outcomes = await Promise.all(running);
               }
             } catch (err) {
-              return `\u274C [\u5DE5\u4F5C\u6D41\u7F16\u6392\u5F02\u5E38]\uFF1A${err?.message ?? err}`;
+              return toolFailure(`[\u5DE5\u4F5C\u6D41\u7F16\u6392\u5F02\u5E38]\uFF1A${err?.message ?? err}`);
             }
             return formatWorkflowResult(mode, outcomes);
           }
@@ -5256,11 +5670,12 @@ var init_workflow = __esm({
 // ../core/src/tool/tsHost.ts
 import fsSync3 from "fs";
 import path16 from "path";
-var _ts, _tsTried, getTs, buildDefaultOptions, findTsConfigBounded, resolveTsConfig, createProjectHost, lsCache, getLanguageService, realpathNative, posToLineCol, SUPPORTED_SOURCE_EXTS, checkSupportedSourceExt, lineColToPos;
+var _ts, _tsTried, getTs, buildDefaultOptions, findTsConfigBounded, tsconfigWalkCache, tsconfigParseCache, resolveTsConfig, createProjectHost, lsCache, getLanguageService, realpathNative, posToLineCol, SUPPORTED_SOURCE_EXTS, checkSupportedSourceExt, lineColToPos;
 var init_tsHost = __esm({
   "../core/src/tool/tsHost.ts"() {
     "use strict";
     init_guard();
+    init_type();
     _ts = null;
     _tsTried = false;
     getTs = async () => {
@@ -5303,16 +5718,38 @@ var init_tsHost = __esm({
       }
       return void 0;
     };
+    tsconfigWalkCache = /* @__PURE__ */ new Map();
+    tsconfigParseCache = /* @__PURE__ */ new Map();
     resolveTsConfig = (ts, absPath) => {
-      const tsConfigPath = findTsConfigBounded(ts, absPath);
+      const startDir = path16.dirname(absPath);
+      let tsConfigPath = tsconfigWalkCache.get(startDir);
+      if (!tsConfigPath) {
+        tsConfigPath = findTsConfigBounded(ts, absPath) ?? "";
+        if (tsConfigPath) tsconfigWalkCache.set(startDir, tsConfigPath);
+      }
       if (!tsConfigPath) {
         return { options: buildDefaultOptions(ts), fileNames: [], projectRoot: getContainingRoot(absPath) };
       }
+      let st;
+      try {
+        st = fsSync3.statSync(tsConfigPath, { throwIfNoEntry: false });
+      } catch {
+        st = void 0;
+      }
+      const cached2 = tsconfigParseCache.get(tsConfigPath);
+      if (cached2 && st && st.mtimeMs === cached2.mtimeMs) return cached2.resolved;
+      if (!st) {
+        tsconfigParseCache.delete(tsConfigPath);
+        for (const [dir, p] of tsconfigWalkCache) if (p === tsConfigPath) tsconfigWalkCache.delete(dir);
+        return resolveTsConfig(ts, absPath);
+      }
       const basePath = path16.dirname(tsConfigPath);
       const raw = ts.readConfigFile(tsConfigPath, ts.sys.readFile);
       if (raw.error) return { options: buildDefaultOptions(ts), fileNames: [], projectRoot: basePath };
       const parsed = ts.parseJsonConfigFileContent(raw.config, ts.sys, basePath);
-      return { options: parsed.options, fileNames: parsed.fileNames, projectRoot: basePath };
+      const resolved = { options: parsed.options, fileNames: parsed.fileNames, projectRoot: basePath };
+      tsconfigParseCache.set(tsConfigPath, { mtimeMs: st.mtimeMs, resolved });
+      return resolved;
     };
     createProjectHost = (ts, projectRoot, options, rootFileNames) => {
       const cache = /* @__PURE__ */ new Map();
@@ -5406,7 +5843,7 @@ var init_tsHost = __esm({
     checkSupportedSourceExt = (displayPath) => {
       const ext = path16.extname(displayPath).toLowerCase();
       if (SUPPORTED_SOURCE_EXTS.has(ext)) return null;
-      return `\u274C [\u6587\u4EF6\u7C7B\u578B\u4E0D\u652F\u6301]\uFF1A[${displayPath}] \u7684\u6269\u5C55\u540D ${ext || "(\u65E0)"} \u4E0D\u5728 TS \u5F15\u64CE\u652F\u6301\u8303\u56F4\uFF08\u4EC5 .ts/.tsx/.js/.jsx/.mjs/.cjs\uFF09\u3002\u8BF7\u6539\u7528 read_file/grep \u67E5\u770B\u5185\u5BB9\uFF1B\u7F16\u8BD1/\u7C7B\u578B\u7C7B\u9A8C\u8BC1\u7528 run_command \u8DD1\u5BF9\u5E94\u8BED\u8A00\u5DE5\u5177\u94FE\uFF08\u5982 mvn compile / tsc --noEmit\uFF09\u3002`;
+      return toolFailure(`[\u6587\u4EF6\u7C7B\u578B\u4E0D\u652F\u6301]\uFF1A[${displayPath}] \u7684\u6269\u5C55\u540D ${ext || "(\u65E0)"} \u4E0D\u5728 TS \u5F15\u64CE\u652F\u6301\u8303\u56F4\uFF08\u4EC5 .ts/.tsx/.js/.jsx/.mjs/.cjs\uFF09\u3002\u8BF7\u6539\u7528 read_file/grep \u67E5\u770B\u5185\u5BB9\uFF1B\u7F16\u8BD1/\u7C7B\u578B\u7C7B\u9A8C\u8BC1\u7528 run_command \u8DD1\u5BF9\u5E94\u8BED\u8A00\u5DE5\u5177\u94FE\uFF08\u5982 mvn compile / tsc --noEmit\uFF09\u3002`);
     };
     lineColToPos = (ts, sf, line1, col1) => ts.getPositionOfLineAndCharacter(sf, Math.max(0, line1 - 1), Math.max(0, col1 - 1));
   }
@@ -5417,13 +5854,22 @@ import fs13 from "fs/promises";
 import path17 from "path";
 import { createReadStream } from "fs";
 import * as readline from "readline";
-var isSensitiveReadTarget, stripReadFileLineNumbers, maskSecretsInContent, makeTmpPath, ATOMIC_TMP_RE, sweepStaleAtomicTmp, assertReadable, stripEdgeBlankLines, matchLineBlockWith, diagnoseOldStr, reindentToBase, alignIndentsByAnchor, applyOneEditToContent, fsTools;
+var IMAGE_MIME_BY_EXT, isSensitiveReadTarget, stripReadFileLineNumbers, maskSecretsInContent, makeTmpPath, ATOMIC_TMP_RE, sweepStaleAtomicTmp, assertReadable, stripEdgeBlankLines, matchLineBlockWith, diagnoseOldStr, reindentToBase, alignIndentsByAnchor, applyOneEditToContent, fsTools;
 var init_fs = __esm({
   "../core/src/tool/registry/fs.ts"() {
     "use strict";
     init_type();
     init_tsHost();
     init_guard();
+    init_contentParts();
+    IMAGE_MIME_BY_EXT = {
+      ".png": "image/png",
+      ".jpg": "image/jpeg",
+      ".jpeg": "image/jpeg",
+      ".gif": "image/gif",
+      ".webp": "image/webp",
+      ".bmp": "image/bmp"
+    };
     isSensitiveReadTarget = (resolvedPath) => {
       const p = resolvedPath.toLowerCase().replace(/\\/g, "/");
       return [
@@ -5639,15 +6085,15 @@ var init_fs = __esm({
             };
           }
           if (lm.reason === "conflict") {
-            return { ok: false, error: `\u274C [\u4EE3\u7801\u4FEE\u8865\u5931\u8D25]\uFF1A\u4EE3\u7801\u51B2\u7A81\uFF01old_str\uFF08${tag}\u5F52\u4E00\u540E\uFF09\u5728\u5168\u6587\u4E2D\u4E0D\u552F\u4E00\uFF08\u5171 ${lm.count} \u5904\uFF09\u3002\u8BF7\u591A\u5305\u88F9\u51E0\u884C\u4E0A\u4E0B\u6587\uFF0C\u6216\u663E\u5F0F\u8BBE replace_all=true \u6279\u91CF\u66FF\u6362\u3002` };
+            return { ok: false, error: toolFailure(`[\u4EE3\u7801\u4FEE\u8865\u5931\u8D25]\uFF1A\u4EE3\u7801\u51B2\u7A81\uFF01old_str\uFF08${tag}\u5F52\u4E00\u540E\uFF09\u5728\u5168\u6587\u4E2D\u4E0D\u552F\u4E00\uFF08\u5171 ${lm.count} \u5904\uFF09\u3002\u8BF7\u591A\u5305\u88F9\u51E0\u884C\u4E0A\u4E0B\u6587\uFF0C\u6216\u663E\u5F0F\u8BBE replace_all=true \u6279\u91CF\u66FF\u6362\u3002`) };
           }
         }
         const diag = diagnoseOldStr(normalizedContent, normalizedOldRaw);
-        return { ok: false, error: `\u274C [\u4EE3\u7801\u4FEE\u8865\u5931\u8D25]\uFF1A\u672A\u80FD\u5728\u6587\u4EF6\u4E2D\u627E\u5230\u6307\u5B9A\u7684 old_str \u65E7\u4EE3\u7801\u5757\u3002${diag}\u5E38\u89C1\u539F\u56E0\uFF1A\u2460 \u8BEF\u5E26\u4E86 read_file \u7684\u300C<\u884C\u53F7>: \u300D\u524D\u7F00\uFF1B\u2461 \u7F29\u8FDB\uFF08Tab/\u7A7A\u683C\uFF09\u4E0D\u4E00\u81F4\uFF1B\u2462 \u884C\u5C3E\u591A\u4F59\u7A7A\u683C\uFF1B\u2463 \u6587\u4EF6\u5DF2\u88AB\u6539\u52A8/old_str \u975E\u8FDE\u7EED\u6574\u6BB5\u3002\u8BF7\u7528 read_file \u91CD\u65B0\u6838\u5BF9\u8BE5\u5904\u7247\u6BB5\uFF08\u53BB\u6389\u300C<\u884C\u53F7>: \u300D\u524D\u7F00\u3001\u4FDD\u7559\u539F\u59CB Tab/\u7A7A\u683C\u7F29\u8FDB\uFF09\u540E\u91CD\u8BD5\u3002\u26A0\uFE0F \u4E25\u7981\u6539\u7528 run_command \u8C03\u7528 python/node/sed/awk \u7B49\u811A\u672C\u7ED5\u8FC7\u672C\u5DE5\u5177\u4FEE\u6539\u6587\u4EF6\u3002` };
+        return { ok: false, error: toolFailure(`[\u4EE3\u7801\u4FEE\u8865\u5931\u8D25]\uFF1A\u672A\u80FD\u5728\u6587\u4EF6\u4E2D\u627E\u5230\u6307\u5B9A\u7684 old_str \u65E7\u4EE3\u7801\u5757\u3002${diag}\u5E38\u89C1\u539F\u56E0\uFF1A\u2460 \u8BEF\u5E26\u4E86 read_file \u7684\u300C<\u884C\u53F7>: \u300D\u524D\u7F00\uFF1B\u2461 \u7F29\u8FDB\uFF08Tab/\u7A7A\u683C\uFF09\u4E0D\u4E00\u81F4\uFF1B\u2462 \u884C\u5C3E\u591A\u4F59\u7A7A\u683C\uFF1B\u2463 \u6587\u4EF6\u5DF2\u88AB\u6539\u52A8/old_str \u975E\u8FDE\u7EED\u6574\u6BB5\u3002\u8BF7\u7528 read_file \u91CD\u65B0\u6838\u5BF9\u8BE5\u5904\u7247\u6BB5\uFF08\u53BB\u6389\u300C<\u884C\u53F7>: \u300D\u524D\u7F00\u3001\u4FDD\u7559\u539F\u59CB Tab/\u7A7A\u683C\u7F29\u8FDB\uFF09\u540E\u91CD\u8BD5\u3002\u26A0\uFE0F \u4E25\u7981\u6539\u7528 run_command \u8C03\u7528 python/node/sed/awk \u7B49\u811A\u672C\u7ED5\u8FC7\u672C\u5DE5\u5177\u4FEE\u6539\u6587\u4EF6\u3002`) };
       }
       const matchCount = normalizedContent.split(normalizedOld).length - 1;
       if (!replaceAll && matchCount > 1) {
-        return { ok: false, error: `\u274C [\u4EE3\u7801\u4FEE\u8865\u5931\u8D25]\uFF1A\u4EE3\u7801\u51B2\u7A81\uFF01old_str \u5728\u5168\u6587\u4E2D\u4E0D\u552F\u4E00\uFF08\u5171\u53D1\u73B0\u4E86 ${matchCount} \u5904\uFF09\u3002\u8BF7\u5411\u4E0A\u6216\u5411\u4E0B\u591A\u5305\u88F9\u51E0\u884C\u4E0A\u4E0B\u6587\u518D\u63D0\u8BF7\u4FEE\u6539\uFF0C\u6216\u663E\u5F0F\u8BBE replace_all=true \u6279\u91CF\u66FF\u6362\u3002` };
+        return { ok: false, error: toolFailure(`[\u4EE3\u7801\u4FEE\u8865\u5931\u8D25]\uFF1A\u4EE3\u7801\u51B2\u7A81\uFF01old_str \u5728\u5168\u6587\u4E2D\u4E0D\u552F\u4E00\uFF08\u5171\u53D1\u73B0\u4E86 ${matchCount} \u5904\uFF09\u3002\u8BF7\u5411\u4E0A\u6216\u5411\u4E0B\u591A\u5305\u88F9\u51E0\u884C\u4E0A\u4E0B\u6587\u518D\u63D0\u8BF7\u4FEE\u6539\uFF0C\u6216\u663E\u5F0F\u8BBE replace_all=true \u6279\u91CF\u66FF\u6362\u3002`) };
       }
       const oldFirstNonBlank = normalizedOld.split("\n").find((l) => l.trim() !== "") ?? "";
       const baseIndent = oldFirstNonBlank.match(/^[ \t]*/)?.[0] ?? "";
@@ -5664,7 +6110,10 @@ var init_fs = __esm({
         type: "function",
         function: {
           name: "read_file",
-          description: "\u8BFB\u53D6\u6307\u5B9A\u3010\u6587\u672C\u3011\u6587\u4EF6\u7684\u6587\u672C\u5185\u5BB9\uFF0C\u5E76\u81EA\u52A8\u5E26\u4E0A\u7528\u4E8E\u5BF9\u9F50\u5B9A\u4F4D\u7684\u7269\u7406\u884C\u53F7\u3002\u652F\u6301\u5927\u6587\u4EF6\u5206\u7247\u8BFB\u53D6\uFF0C\u9632\u6B62 Token \u7206\u70B8\u3002\u2605 \u4EC5\u5904\u7406\u6587\u672C\u6587\u4EF6\u2014\u2014\u4E8C\u8FDB\u5236\u6587\u4EF6\u4F1A\u8BFB\u51FA\u4E71\u7801\uFF1A.xlsx \u6539\u7528 read_xlsx\uFF0C.docx \u6539\u7528 read_docx\uFF0C.pdf \u6539\u7528 read_pdf\u3002",
+          // ★ #8a 策略声明：计划模式可用；权限规则作用域主参数
+          planAllowed: true,
+          primaryArg: "path",
+          description: "\u8BFB\u53D6\u6307\u5B9A\u3010\u6587\u672C\u3011\u6587\u4EF6\u7684\u6587\u672C\u5185\u5BB9\uFF0C\u5E76\u81EA\u52A8\u5E26\u4E0A\u7528\u4E8E\u5BF9\u9F50\u5B9A\u4F4D\u7684\u7269\u7406\u884C\u53F7\u3002\u652F\u6301\u5927\u6587\u4EF6\u5206\u7247\u8BFB\u53D6\uFF0C\u9632\u6B62 Token \u7206\u70B8\u3002\u2605 \u4EC5\u5904\u7406\u6587\u672C\u6587\u4EF6\u2014\u2014\u4E8C\u8FDB\u5236\u6587\u4EF6\u4F1A\u8BFB\u51FA\u4E71\u7801\uFF1A.xlsx \u6539\u7528 read_xlsx\uFF0C.docx \u6539\u7528 read_docx\uFF0C.pdf \u6539\u7528 read_pdf\u3002\u2605 \u9700\u8BFB\u591A\u4E2A\u6587\u4EF6\u65F6\uFF0C\u628A\u591A\u4E2A read_file \u8C03\u7528\u653E\u8FDB\u540C\u4E00\u6761\u6D88\u606F\u5E76\u884C\u53D1\u51FA\uFF08\u81EA\u52A8\u5E76\u53D1\u6267\u884C\uFF09\uFF0C\u52FF\u8BFB\u5B8C\u4E00\u4E2A\u518D\u53D1\u4E0B\u4E00\u4E2A\u3002",
           parameters: {
             type: "object",
             properties: {
@@ -5685,6 +6134,7 @@ var init_fs = __esm({
             try {
               const absPath = resolveReadablePath(args.path);
               const lowerExt = absPath.toLowerCase();
+              if (IMAGE_MIME_BY_EXT[path17.extname(lowerExt)]) return `\u{1F5BC} [${args.path}] \u662F\u56FE\u7247\u6587\u4EF6\uFF0Cread_file \u8BFB\u4E0D\u51FA\u6709\u7528\u5185\u5BB9\u3002\u8BF7\u6539\u7528 read_image \u8BFB\u53D6\uFF08\u56FE\u50CF\u4F1A\u4EE5\u89C6\u89C9\u9644\u4EF6\u76F4\u63A5\u63D0\u4F9B\u7ED9\u6A21\u578B\u5206\u6790\uFF09\u3002`;
               if (lowerExt.endsWith(".xlsx")) return `\u26A0\uFE0F [${args.path}] \u662F Excel \u4E8C\u8FDB\u5236\u6587\u4EF6\uFF0Cread_file \u8BFB\u4E0D\u4E86\uFF08UTF-8 \u89E3\u7801\u6EE1\u5C4F\u4E71\u7801\uFF09\u3002\u8BF7\u6539\u7528 read_xlsx\uFF08\u652F\u6301 sheet \u9009\u62E9 / \u7FFB\u9875 / Markdown \u8868\u683C\u8F93\u51FA\uFF09\u3002`;
               if (lowerExt.endsWith(".docx")) return `\u26A0\uFE0F [${args.path}] \u662F Word \u4E8C\u8FDB\u5236\u6587\u6863\uFF0Cread_file \u8BFB\u4E0D\u4E86\u3002\u8BF7\u6539\u7528 read_docx \u63D0\u53D6\u6B63\u6587\u6587\u672C\u3002`;
               if (lowerExt.endsWith(".pdf")) return `\u26A0\uFE0F [${args.path}] \u662F PDF \u4E8C\u8FDB\u5236\u6587\u6863\uFF0Cread_file \u8BFB\u4E0D\u4E86\u3002\u8BF7\u6539\u7528 read_pdf \u63D0\u53D6\u6587\u5B57\u5C42\u3002`;
@@ -5719,7 +6169,7 @@ ${formattedCode}${hasMore ? `
 
 [... \u540E\u9762\u8FD8\u6709\u4EE3\u7801\u5DF2\u88AB\u9690\u85CF\uFF0C\u4F60\u53EF\u4EE5\u8C03\u6574 start_line \u7EE7\u7EED\u5206\u7247\u8BFB\u53D6\u3002]` : ""}`;
             } catch (error) {
-              return `\u8BFB\u53D6\u6587\u4EF6\u5931\u8D25 [${args.path}]: ${error.message}`;
+              return toolFailure(`\u8BFB\u53D6\u6587\u4EF6\u5931\u8D25 [${args.path}]: ${error.message}`);
             }
           }
         }
@@ -5728,7 +6178,9 @@ ${formattedCode}${hasMore ? `
         type: "function",
         function: {
           name: "list_dir",
-          description: "\u626B\u63CF\u5E76\u7CBE\u7B80\u5217\u51FA\u5F53\u524D\u9879\u76EE\u7684\u5DE5\u4F5C\u533A\u76EE\u5F55\u6811\u3002\u672C\u5DE5\u5177\u81EA\u52A8\u5408\u5E76\u901A\u7528\u5FFD\u7565\u89C4\u5219\u4E0E\u591A\u5C42\u5B50\u76EE\u5F55\u7EA7 .gitignore \u89C4\u8303\u3002",
+          planAllowed: true,
+          primaryArg: "path",
+          description: "\u626B\u63CF\u5E76\u7CBE\u7B80\u5217\u51FA\u5F53\u524D\u9879\u76EE\u7684\u5DE5\u4F5C\u533A\u76EE\u5F55\u6811\u3002\u672C\u5DE5\u5177\u81EA\u52A8\u5408\u5E76\u901A\u7528\u5FFD\u7565\u89C4\u5219\u4E0E\u591A\u5C42\u5B50\u76EE\u5F55\u7EA7 .gitignore \u89C4\u8303\u3002\u2605 \u53EA\u8BFB\u5B89\u5168\uFF0C\u53EF\u4E0E\u5176\u5B83\u53EA\u8BFB\u5DE5\u5177\u5728\u540C\u4E00\u6761\u6D88\u606F\u91CC\u5E76\u884C\u8C03\u7528\u3002",
           parameters: {
             type: "object",
             properties: {
@@ -5781,7 +6233,7 @@ ${formattedCode}${hasMore ? `
               return `[Workspace Universal Tree | Max Depth: ${maxDepth}]
 ${treeResult}`;
             } catch (error) {
-              return `\u9879\u76EE\u6811\u626B\u63CF\u5931\u8D25: ${error.message}`;
+              return toolFailure(`\u9879\u76EE\u6811\u626B\u63CF\u5931\u8D25: ${error.message}`);
             }
           }
         }
@@ -5790,6 +6242,10 @@ ${treeResult}`;
         type: "function",
         function: {
           name: "edit_file",
+          // ★ #8a 策略声明：undo 备份（快照原内容）+ 分类器作用域 + 权限主参数；计划模式缺省拒绝
+          triggersUndo: "overwrite",
+          autoApproval: "file",
+          primaryArg: "path",
           description: "\u5BF9\u6587\u4EF6\u505A\u5C40\u90E8\u7CBE\u51C6\u4FEE\u6539\u3002\u2605 \u540C\u4E00\u6587\u4EF6\u591A\u5904\u8981\u6539\u65F6\u4E00\u6B21\u4F20 edits \u6570\u7EC4\u5168\u90E8\u5B8C\u6210\uFF08\u6309\u5E8F\u5E94\u7528\u3001\u6574\u4F53\u539F\u5B50\uFF1A\u4EFB\u4E00\u5904\u5931\u8D25\u5168\u90E8\u4E0D\u5199\u5165\uFF09\uFF0C\u52FF\u9010\u5904\u591A\u6B21\u8C03\u7528\u3002old_str \u987B\u4E0E\u6587\u4EF6\u539F\u6587\u9010\u5B57\u7B26\u4E00\u81F4\uFF1A\u53BB\u6389 read_file \u8FD4\u56DE\u7684\u300C<\u884C\u53F7>: \u300D\u524D\u7F00\uFF0C\u4FDD\u7559\u539F\u7F29\u8FDB\uFF08Tab/\u7A7A\u683C\uFF09\u4E0E\u884C\u5C3E\u7A7A\u767D\u3002\u9ED8\u8BA4\u987B\u5168\u6587\u552F\u4E00\uFF1Breplace_all=true \u66FF\u6362\u5168\u90E8\u5339\u914D\uFF08\u6279\u91CF\u91CD\u547D\u540D/\u7EDF\u4E00\u6539\u5199\uFF09\u3002",
           parameters: {
             type: "object",
@@ -5830,7 +6286,7 @@ ${patches}`;
             try {
               const editList = args.edits && args.edits.length > 0 ? args.edits : [{ old_str: args.old_str ?? "", new_str: args.new_str ?? "", replace_all: args.replace_all }];
               if (editList.length === 0 || editList.some((e) => typeof e.old_str !== "string" || e.old_str.length === 0)) {
-                return `\u274C [\u53C2\u6570\u7F3A\u5931]\uFF1A\u8BF7\u4F20\u5165 edits \u6570\u7EC4\uFF08\u6BCF\u6761\u542B old_str/new_str\uFF09\u4E00\u6B21\u5B8C\u6210\u591A\u5904\u4FEE\u6539\uFF0C\u6216\u9876\u5C42 old_str + new_str \u4FEE\u6539\u5355\u5904\u3002old_str \u4E0D\u80FD\u4E3A\u7A7A\u3002`;
+                return toolFailure(`[\u53C2\u6570\u7F3A\u5931]\uFF1A\u8BF7\u4F20\u5165 edits \u6570\u7EC4\uFF08\u6BCF\u6761\u542B old_str/new_str\uFF09\u4E00\u6B21\u5B8C\u6210\u591A\u5904\u4FEE\u6539\uFF0C\u6216\u9876\u5C42 old_str + new_str \u4FEE\u6539\u5355\u5904\u3002old_str \u4E0D\u80FD\u4E3A\u7A7A\u3002`);
               }
               const absPath = resolveSafePath(args.path);
               const rawContent = await fs13.readFile(absPath, "utf-8");
@@ -5840,7 +6296,7 @@ ${patches}`;
               for (let i = 0; i < editList.length; i++) {
                 const r = applyOneEditToContent(content, editList[i].old_str, editList[i].new_str ?? "", !!editList[i].replace_all);
                 if (!r.ok) {
-                  return editList.length === 1 ? r.error : `\u274C [\u4EE3\u7801\u4FEE\u8865\u5931\u8D25]\uFF1Aedits \u7B2C ${i + 1}/${editList.length} \u6761\u672A\u547D\u4E2D\uFF0C\u5DF2\u6574\u4F53\u653E\u5F03\uFF08\u6587\u4EF6\u672A\u505A\u4EFB\u4F55\u6539\u52A8\uFF0C\u53EF\u4FEE\u6B63\u8BE5\u6761\u540E\u6574\u7EC4\u91CD\u8BD5\uFF09\u3002${r.error.replace(/^❌ \[代码修补失败\]：/, "")}`;
+                  return editList.length === 1 ? r.error : toolFailure(`[\u4EE3\u7801\u4FEE\u8865\u5931\u8D25]\uFF1Aedits \u7B2C ${i + 1}/${editList.length} \u6761\u672A\u547D\u4E2D\uFF0C\u5DF2\u6574\u4F53\u653E\u5F03\uFF08\u6587\u4EF6\u672A\u505A\u4EFB\u4F55\u6539\u52A8\uFF0C\u53EF\u4FEE\u6B63\u8BE5\u6761\u540E\u6574\u7EC4\u91CD\u8BD5\uFF09\u3002${r.error.content.replace(/^❌ \[代码修补失败\]：/, "")}`);
                 }
                 content = r.content;
                 summaries.push(editList.length === 1 ? r.summary : `  ${i + 1}. ${r.summary}`);
@@ -5850,7 +6306,7 @@ ${patches}`;
               return editList.length === 1 ? `\u2705 [\u4EE3\u7801\u4FEE\u8865\u6210\u529F]\uFF1A\u6587\u4EF6 [${args.path}] ${summaries[0]}` : `\u2705 [\u4EE3\u7801\u4FEE\u8865\u6210\u529F]\uFF1A\u6587\u4EF6 [${args.path}] \u5DF2\u6309\u5E8F\u5B8C\u6210 ${editList.length} \u5904\u4FEE\u6539\uFF08\u5355\u6B21\u539F\u5B50\u5199\u5165\uFF09\uFF1A
 ${summaries.join("\n")}`;
             } catch (error) {
-              return `\u64CD\u4F5C\u5931\u8D25: ${error.message}`;
+              return toolFailure(`\u64CD\u4F5C\u5931\u8D25: ${error.message}`);
             }
           }
         }
@@ -5859,6 +6315,9 @@ ${summaries.join("\n")}`;
         type: "function",
         function: {
           name: "create_file",
+          triggersUndo: "create",
+          autoApproval: "file",
+          primaryArg: "path",
           description: "\u5728\u5DE5\u4F5C\u533A\u5185\u521B\u5EFA\u4E00\u4E2A\u5168\u65B0\u7684\u6587\u4EF6\uFF0C\u5E76\u5199\u5165\u521D\u59CB\u5185\u5BB9\u3002\u5982\u679C\u6587\u4EF6\u5DF2\u5B58\u5728\uFF0C\u672C\u5DE5\u5177\u4F1A\u62D2\u7EDD\u6267\u884C\u4EE5\u9632\u6B62\u6E90\u7801\u88AB\u5168\u91CF\u8BEF\u8986\u76D6\u3002\u8BF7\u76F4\u63A5\u5199\u5165\u7528\u6237\u6307\u5B9A\u7684\u6700\u7EC8\u8DEF\u5F84\uFF0C\u52FF\u81EA\u884C\u53D1\u660E\u6682\u5B58/\u4E34\u65F6\u76EE\u5F55\uFF08\u5982 .dsc_tmp\uFF09\u2014\u2014\u4EA7\u7269\u4F1A\u771F\u5B9E\u843D\u76D8\u4E14\u5BF9\u7528\u6237\u53EF\u89C1\u3002",
           parameters: {
             type: "object",
@@ -5877,7 +6336,7 @@ ${summaries.join("\n")}`;
               const absPath = resolveSafePath(args.path);
               try {
                 await fs13.access(absPath);
-                return `\u274C [\u521B\u5EFA\u5931\u8D25]\uFF1A\u6587\u4EF6 [${args.path}] \u5DF2\u5B58\u5728\u3002create_file \u4EC5\u7528\u4E8E\u65B0\u5EFA\u6587\u4EF6\uFF1B\u5982\u9700\u4FEE\u6539\u8BF7\u7528 edit_file\uFF0C\u5982\u9700\u8986\u76D6\u8BF7\u7528 write_file\u3002`;
+                return toolFailure(`[\u521B\u5EFA\u5931\u8D25]\uFF1A\u6587\u4EF6 [${args.path}] \u5DF2\u5B58\u5728\u3002create_file \u4EC5\u7528\u4E8E\u65B0\u5EFA\u6587\u4EF6\uFF1B\u5982\u9700\u4FEE\u6539\u8BF7\u7528 edit_file\uFF0C\u5982\u9700\u8986\u76D6\u8BF7\u7528 write_file\u3002`);
               } catch (e) {
                 if (e?.code !== "ENOENT") throw e;
               }
@@ -5889,7 +6348,7 @@ ${summaries.join("\n")}`;
               await fs13.rename(tmpPath, absPath);
               return `\u2705 [\u521B\u5EFA\u6210\u529F]\uFF1A\u65B0\u6587\u4EF6 [${args.path}] \u5DF2\u521B\u5EFA\uFF0C\u5199\u5165 ${content.length} \u5B57\u7B26\u3002`;
             } catch (error) {
-              return `\u64CD\u4F5C\u5931\u8D25: ${error.message}`;
+              return toolFailure(`\u64CD\u4F5C\u5931\u8D25: ${error.message}`);
             } finally {
               if (tmpPath) {
                 try {
@@ -5905,6 +6364,9 @@ ${summaries.join("\n")}`;
         type: "function",
         function: {
           name: "delete_path",
+          triggersUndo: "delete",
+          autoApproval: "file",
+          primaryArg: "path",
           description: "\u4ECE\u672C\u5730\u78C1\u76D8\u5185\u6C38\u4E45\u5220\u9664\u4E00\u4E2A\u6307\u5B9A\u7684\u6587\u4EF6\u6216\u8005\u4E00\u6574\u4E2A\u6587\u4EF6\u5939\u76EE\u5F55\u3002\u5982\u679C\u662F\u76EE\u5F55\uFF0C\u5DE5\u5177\u4F1A\u81EA\u52A8\u6267\u884C\u6DF1\u5EA6\u9012\u5F52\u5F3A\u884C\u9500\u6BC1\u3002\u6B64\u64CD\u4F5C\u4E0D\u53EF\u9006\uFF0C\u8BF7\u4E07\u5206\u5C0F\u5FC3\u3002",
           parameters: {
             type: "object",
@@ -5940,18 +6402,18 @@ ${summaries.join("\n")}`;
             try {
               const cleanPath = (args.path || "").trim();
               if (!cleanPath || cleanPath === "." || cleanPath === "./" || cleanPath === "/") {
-                return `\u274C [\u5B89\u5168\u7194\u65AD]\uFF1A\u7981\u6B62\u901A\u8FC7\u672C\u5DE5\u5177\u76F4\u63A5\u6467\u6BC1\u9879\u76EE\u6839\u76EE\u5F55\u6216\u4F20\u5165\u7A7A\u8DEF\u5F84\uFF01`;
+                return toolFailure(`[\u5B89\u5168\u7194\u65AD]\uFF1A\u7981\u6B62\u901A\u8FC7\u672C\u5DE5\u5177\u76F4\u63A5\u6467\u6BC1\u9879\u76EE\u6839\u76EE\u5F55\u6216\u4F20\u5165\u7A7A\u8DEF\u5F84\uFF01`);
               }
               const absPath = resolveSafePath(cleanPath);
               const rel = path17.relative(getActiveWorkspaceRoot(), absPath);
               if (!rel || rel === "" || rel === "src" || rel.startsWith("..") || path17.isAbsolute(rel)) {
-                return `\u274C [\u5B89\u5168\u7194\u65AD]\uFF1A\u62D2\u7EDD\u9500\u6BC1\u5DE5\u4F5C\u533A\u6839\u76EE\u5F55 / src \u6E90\u7801\u6839 / \u8D8A\u754C\u8DEF\u5F84 [${cleanPath}]\uFF01`;
+                return toolFailure(`[\u5B89\u5168\u7194\u65AD]\uFF1A\u62D2\u7EDD\u9500\u6BC1\u5DE5\u4F5C\u533A\u6839\u76EE\u5F55 / src \u6E90\u7801\u6839 / \u8D8A\u754C\u8DEF\u5F84 [${cleanPath}]\uFF01`);
               }
               let stat;
               try {
                 stat = await fs13.stat(absPath);
               } catch {
-                return `\u274C [\u9500\u6BC1\u5931\u8D25]\uFF1A\u5728\u5DE5\u4F5C\u533A\u5185\u672A\u627E\u5230\u6307\u5B9A\u7684\u8DEF\u5F84 [${cleanPath}]\u3002`;
+                return toolFailure(`[\u9500\u6BC1\u5931\u8D25]\uFF1A\u5728\u5DE5\u4F5C\u533A\u5185\u672A\u627E\u5230\u6307\u5B9A\u7684\u8DEF\u5F84 [${cleanPath}]\u3002`);
               }
               const isDirectory = stat.isDirectory();
               assertWithinWorkspace(absPath);
@@ -5963,7 +6425,7 @@ ${summaries.join("\n")}`;
               const targetTypeLabel = isDirectory ? "\u4E00\u6574\u4E2A\u6587\u4EF6\u5939\u76EE\u5F55" : "\u7EAF\u7269\u7406\u6587\u4EF6";
               return `\u2705 [\u8DEF\u5F84\u9500\u6BC1\u6210\u529F]\uFF1A\u5DF2\u6210\u529F\u6C38\u4E45\u9500\u6BC1${targetTypeLabel} [${cleanPath}]\u3002`;
             } catch (error) {
-              return `\u64CD\u4F5C\u5931\u8D25: ${error.message}`;
+              return toolFailure(`\u64CD\u4F5C\u5931\u8D25: ${error.message}`);
             }
           }
         }
@@ -5972,6 +6434,9 @@ ${summaries.join("\n")}`;
         type: "function",
         function: {
           name: "write_file",
+          triggersUndo: "overwrite",
+          autoApproval: "file",
+          primaryArg: "path",
           description: "\u5C06\u5B8C\u6574\u5185\u5BB9\u5168\u91CF\u5199\u5165\u6307\u5B9A\u6587\u4EF6\uFF08\u8986\u76D6\uFF09\u3002\u6587\u4EF6\u4E0D\u5B58\u5728\u5219\u65B0\u5EFA\uFF08\u542B\u7236\u76EE\u5F55\uFF09\uFF1B\u5DF2\u5B58\u5728\u5219\u6574\u4F53\u8986\u76D6\u3002\u2605 \u4EC5\u7528\u4E8E\u3010\u65B0\u5EFA\u6587\u4EF6\u3011\u6216\u3010\u5F7B\u5E95\u91CD\u5199\u6574\u4E2A\u6587\u4EF6\u3011\uFF1B\u4FEE\u6539\u65E2\u6709\u6587\u4EF6\u4E00\u5F8B\u6539\u7528 edit_file\uFF08\u5C40\u90E8\u7CBE\u51C6\u66FF\u6362\u3001\u6700\u5C0F diff\uFF09\u3002",
           parameters: {
             type: "object",
@@ -6001,7 +6466,7 @@ ${summaries.join("\n")}`;
                 } catch {
                 }
               }
-              return `\u64CD\u4F5C\u5931\u8D25: ${error.message}`;
+              return toolFailure(`\u64CD\u4F5C\u5931\u8D25: ${error.message}`);
             }
           }
         }
@@ -6010,7 +6475,8 @@ ${summaries.join("\n")}`;
         type: "function",
         function: {
           name: "view_symbol_outline",
-          description: "\u901A\u8FC7\u62BD\u8C61\u8BED\u6CD5\u6811(AST)\u5FEB\u901F\u63D0\u53D6\u6307\u5B9A TS/JS \u6E90\u6587\u4EF6\u4E2D\u7684\u7B26\u53F7\u5927\u7EB2\uFF08\u7C7B\u3001\u63A5\u53E3\u3001\u51FD\u6570\u540D\u3001\u5BFC\u51FA\u9879\u3001\u5165\u53C2\u7B7E\u540D\u7B49\uFF09\u3002\u9002\u5408\u5728\u4E0D\u8BFB\u53D6\u51E0\u5343\u884C\u5177\u4F53\u4EE3\u7801\u7684\u524D\u63D0\u4E0B\uFF0C\u5B8F\u89C2\u4E86\u89E3\u6587\u4EF6\u67B6\u6784\u3002\u4EC5\u652F\u6301 .ts/.tsx/.js/.jsx/.mjs/.cjs\uFF1B\u5176\u4ED6\u7C7B\u578B\u6587\u4EF6\uFF08.java/.vue/.py \u7B49\uFF09\u76F4\u63A5\u62D2\u7EDD\uFF0C\u8BF7\u6539\u7528 read_file\u3002",
+          planAllowed: true,
+          description: "\u901A\u8FC7\u62BD\u8C61\u8BED\u6CD5\u6811(AST)\u5FEB\u901F\u63D0\u53D6\u6307\u5B9A TS/JS \u6E90\u6587\u4EF6\u4E2D\u7684\u7B26\u53F7\u5927\u7EB2\uFF08\u7C7B\u3001\u63A5\u53E3\u3001\u51FD\u6570\u540D\u3001\u5BFC\u51FA\u9879\u3001\u5165\u53C2\u7B7E\u540D\u7B49\uFF09\u3002\u9002\u5408\u5728\u4E0D\u8BFB\u53D6\u51E0\u5343\u884C\u5177\u4F53\u4EE3\u7801\u7684\u524D\u63D0\u4E0B\uFF0C\u5B8F\u89C2\u4E86\u89E3\u6587\u4EF6\u67B6\u6784\u3002\u4EC5\u652F\u6301 .ts/.tsx/.js/.jsx/.mjs/.cjs\uFF1B\u5176\u4ED6\u7C7B\u578B\u6587\u4EF6\uFF08.java/.vue/.py \u7B49\uFF09\u76F4\u63A5\u62D2\u7EDD\uFF0C\u8BF7\u6539\u7528 read_file\u3002\u2605 \u53EA\u8BFB\u5B89\u5168\uFF0C\u53EF\u4E0E\u5176\u5B83\u53EA\u8BFB\u5DE5\u5177\u5728\u540C\u4E00\u6761\u6D88\u606F\u91CC\u5E76\u884C\u8C03\u7528\u3002",
           parameters: {
             type: "object",
             properties: {
@@ -6084,7 +6550,7 @@ ${summaries.join("\n")}`;
               return `[File Symbol Outline: ${args.path}]
 ` + outlineLines.join("\n");
             } catch (error) {
-              return `\u7B26\u53F7\u5927\u7EB2\u5206\u6790\u5931\u8D25 [${args.path}]: ${error.message}`;
+              return toolFailure(`\u7B26\u53F7\u5927\u7EB2\u5206\u6790\u5931\u8D25 [${args.path}]: ${error.message}`);
             }
           }
         }
@@ -6097,6 +6563,11 @@ ${summaries.join("\n")}`;
           // 注：move 涉及双路径（source+destination），超出当前 Undo 单路径 schema，暂不纳入写前备份（不可回退），
           //   已在描述中明示；后续若扩展 UndoRecord 双路径字段可再接入。
           name: "move_file",
+          // ★ #8a 策略声明：双路径都受保护路径硬规则检查（P0-3 洞的声明化收口；特判已退役）。
+          //   刻意不声明 triggersUndo：move 语义可手动移回，维持「不在 Undo 回退范围」现状。
+          primaryArg: "src",
+          autoApproval: "file",
+          pathArgs: ["source", "destination"],
           description: "\u79FB\u52A8\u6216\u91CD\u547D\u540D\u6587\u4EF6/\u76EE\u5F55\uFF08\u540C\u5377\u539F\u5B50\u64CD\u4F5C\uFF09\u3002\u6E90\u4E0D\u5B58\u5728\u5219\u5931\u8D25\uFF1B\u76EE\u6807\u5DF2\u5B58\u5728\u5219\u62D2\u7EDD\uFF08\u9632\u8BEF\u8986\u76D6\uFF0C\u5982\u9700\u8986\u76D6\u8BF7\u5148 delete_path \u518D move_file\uFF09\u3002\u81EA\u52A8\u521B\u5EFA\u76EE\u6807\u7236\u76EE\u5F55\u3002\u26A0\uFE0F \u672C\u64CD\u4F5C\u6682\u4E0D\u5728 Undo \u56DE\u9000\u8303\u56F4\u5185\uFF08\u4E0D\u53EF\u64A4\u9500\uFF09\u3002",
           parameters: {
             type: "object",
@@ -6116,11 +6587,11 @@ ${summaries.join("\n")}`;
               try {
                 await fs13.access(srcAbs);
               } catch {
-                return `\u274C [\u79FB\u52A8\u5931\u8D25]\uFF1A\u6E90\u8DEF\u5F84 [${args.source}] \u4E0D\u5B58\u5728\u3002`;
+                return toolFailure(`[\u79FB\u52A8\u5931\u8D25]\uFF1A\u6E90\u8DEF\u5F84 [${args.source}] \u4E0D\u5B58\u5728\u3002`);
               }
               try {
                 await fs13.access(dstAbs);
-                return `\u274C [\u79FB\u52A8\u5931\u8D25]\uFF1A\u76EE\u6807 [${args.destination}] \u5DF2\u5B58\u5728\u3002\u5982\u9700\u8986\u76D6\u8BF7\u5148 delete_path \u518D move_file\u3002`;
+                return toolFailure(`[\u79FB\u52A8\u5931\u8D25]\uFF1A\u76EE\u6807 [${args.destination}] \u5DF2\u5B58\u5728\u3002\u5982\u9700\u8986\u76D6\u8BF7\u5148 delete_path \u518D move_file\u3002`);
               } catch {
               }
               assertWithinWorkspace(srcAbs);
@@ -6129,7 +6600,51 @@ ${summaries.join("\n")}`;
               await fs13.rename(srcAbs, dstAbs);
               return `\u2705 [\u79FB\u52A8\u6210\u529F]\uFF1A[${args.source}] \u2192 [${args.destination}]\u3002`;
             } catch (error) {
-              return `\u64CD\u4F5C\u5931\u8D25: ${error.message}`;
+              return toolFailure(`\u64CD\u4F5C\u5931\u8D25: ${error.message}`);
+            }
+          }
+        }
+      },
+      {
+        type: "function",
+        function: {
+          name: "read_image",
+          // ★ #8a 策略声明：计划模式可用（只读）；权限规则作用域主参数
+          planAllowed: true,
+          primaryArg: "path",
+          description: "\u8BFB\u53D6\u6307\u5B9A\u3010\u56FE\u7247\u3011\u6587\u4EF6\u5E76\u628A\u56FE\u50CF\u5185\u5BB9\u63D0\u4F9B\u7ED9\u6A21\u578B\u505A\u89C6\u89C9\u5206\u6790\uFF08png/jpg/jpeg/gif/webp/bmp\uFF0C\u22648MB\uFF09\u3002\u9002\u7528\uFF1A\u622A\u56FE\u8C03\u8BD5\u3001UI \u5BF9\u7167\u8FD8\u539F\u3001\u67E5\u770B\u56FE\u7247\u7D20\u6750\u3002\u56FE\u50CF\u4EE5\u89C6\u89C9\u9644\u4EF6\u6CE8\u5165\u5BF9\u8BDD\uFF08\u968F\u540E\u7684\u4E00\u6761\u6D88\u606F\uFF09\uFF0C\u4E0D\u8BA1\u5165\u672C\u5DE5\u5177\u7684\u6587\u672C\u8F93\u51FA\uFF1B\u5F53\u524D\u6A21\u578B\u4E0D\u652F\u6301\u89C6\u89C9\u65F6\u4F1A\u660E\u786E\u63D0\u793A\u3002\u6587\u672C\u6587\u4EF6\u8BF7\u7528 read_file\u3002",
+          parameters: {
+            type: "object",
+            properties: {
+              path: { type: "string", description: "\u56FE\u7247\u8DEF\u5F84\uFF1A\u76F8\u5BF9\u6D3B\u52A8\u5DE5\u4F5C\u533A\u6839\uFF08\u652F\u6301 ../ \u8DE8\u5144\u5F1F\u9879\u76EE\uFF09\u3001\u6216\u7EDD\u5BF9\u8DEF\u5F84" }
+            },
+            required: ["path"]
+          },
+          safetyLevel: "safe" /* SAFE */,
+          isSync: true,
+          async execute(args) {
+            try {
+              const absPath = resolveReadablePath(args.path);
+              const readBlock = await assertReadable(absPath, args.path);
+              if (readBlock) return readBlock;
+              const mime = IMAGE_MIME_BY_EXT[path17.extname(absPath).toLowerCase()];
+              if (!mime) return toolFailure(`[read_image] \u4E0D\u652F\u6301\u7684\u56FE\u7247\u683C\u5F0F [${args.path}]\uFF1A\u4EC5\u652F\u6301 png/jpg/jpeg/gif/webp/bmp\u3002\u6587\u672C\u6587\u4EF6\u8BF7\u7528 read_file\u3002`);
+              const st = await fs13.stat(absPath).catch(() => null);
+              if (!st || !st.isFile()) return toolFailure(`[read_image] \u56FE\u7247\u4E0D\u5B58\u5728\u6216\u4E0D\u662F\u6587\u4EF6\uFF1A${args.path}`);
+              if (st.size > MAX_IMAGE_BYTES) {
+                return toolFailure(`[read_image] \u56FE\u7247 ${(st.size / 1024 / 1024).toFixed(1)}MB \u8D85\u8FC7 ${Math.round(MAX_IMAGE_BYTES / 1024 / 1024)}MB \u4E0A\u9650\uFF1A\u8BF7\u538B\u7F29\u540E\u91CD\u8BD5\uFF0C\u6216\u88C1\u526A\u5230\u9700\u8981\u7684\u533A\u57DF\u3002`);
+              }
+              if (!isVisionEnabled()) {
+                return toolFailure(`[read_image] \u5F53\u524D\u6A21\u578B\u4E0D\u652F\u6301\u56FE\u7247\u8F93\u5165\uFF08\u89C6\u89C9\u80FD\u529B\u6309\u7AEF\u70B9\u5B9E\u6D4B\u81EA\u52A8\u5224\u5B9A\uFF1B\u53EF\u5207\u6362 vision \u6A21\u578B\u6216\u8BBE DEEP_SEEK_VISION=1 \u5F3A\u5F00\u540E\u91CD\u8BD5\uFF09\u3002\u56FE\u7247\u672A\u8BFB\u53D6\uFF1A${args.path}`);
+              }
+              const buf = await fs13.readFile(absPath);
+              return {
+                content: `\u{1F5BC} [read_image] \u5DF2\u8BFB\u53D6\u56FE\u7247 ${args.path}\uFF08${mime}\uFF0C${st.size} \u5B57\u8282\uFF09\u3002\u56FE\u50CF\u5185\u5BB9\u89C1\u968F\u540E\u7684\u9644\u4EF6\u6D88\u606F\uFF0C\u8BF7\u76F4\u63A5\u5BF9\u56FE\u7247\u8FDB\u884C\u5206\u6790/\u5BF9\u7167\u3002`,
+                status: "success",
+                images: [{ name: path17.basename(absPath), mime, base64: buf.toString("base64") }]
+              };
+            } catch (error) {
+              return toolFailure(`\u8BFB\u53D6\u56FE\u7247\u5931\u8D25 [${args.path}]: ${error.message}`);
             }
           }
         }
@@ -6158,7 +6673,9 @@ var init_search = __esm({
         type: "function",
         function: {
           name: "search_grep",
-          description: "\u5728\u5DE5\u4F5C\u533A\u6587\u4EF6\u4E2D\u68C0\u7D22\u5339\u914D\u7684\u4EE3\u7801\u884C\uFF0C\u6BCF\u4E2A\u547D\u4E2D\u9ED8\u8BA4\u5E26\u524D\u540E\u5404 2 \u884C\u4E0A\u4E0B\u6587\uFF08\u53EF\u76F4\u63A5\u5224\u65AD\u7528\u6CD5\uFF1B\u6784\u9020 edit_file \u7684 old_str \u524D\u53EF\u7528 context \u8C03\u5927\u4E00\u6B21\u62FF\u8DB3\uFF09\u3002\u9ED8\u8BA4\u5B57\u9762\u91CF\u5339\u914D\uFF0C\u6B63\u5219\u4F20 is_regex=true\u3002\u2605 \u591A\u5173\u952E\u8BCD\u7528 is_regex=true \u4EE5 | \u5408\u5E76\uFF08\u5982 'uploadVisible|uploadTip'\uFF09\u4E00\u6B21\u67E5\u5B8C\uFF0C\u52FF\u9010\u8BCD\u591A\u6B21\u8C03\u7528\u3002path \u53EF\u9650\u5B9A\u76EE\u5F55\u6216\u6587\u4EF6\uFF08\u5355\u5927\u6587\u4EF6\u591A\u5904\u5B9A\u4F4D\u4F20\u6587\u4EF6\u8DEF\u5F84\u6700\u9AD8\u6548\uFF09\u3002\u591A\u6839\u5DE5\u4F5C\u533A\uFF1Apath \u53EF\u4F20\u9879\u76EE\u76EE\u5F55\u540D\uFF08\u5982 'frontend'\uFF09\u3001\u7EDD\u5BF9\u8DEF\u5F84\u6216 ../\u5144\u5F1F\u76EE\u5F55\u3002\u2605 \u7528\u6237\u6307\u660E\u4E86\u9879\u76EE\u65F6\u52A1\u5FC5\u628A\u8BE5\u9879\u76EE\u4F5C\u4E3A path \u4F20\u5165\u2014\u2014\u7F3A\u7701\u53EA\u641C\u6D3B\u52A8\u6839\uFF0C\u5E38\u4E0E\u610F\u56FE\u4E0D\u7B26\u3002",
+          planAllowed: true,
+          primaryArg: "query",
+          description: "\u5728\u5DE5\u4F5C\u533A\u6587\u4EF6\u4E2D\u68C0\u7D22\u5339\u914D\u7684\u4EE3\u7801\u884C\uFF0C\u6BCF\u4E2A\u547D\u4E2D\u9ED8\u8BA4\u5E26\u524D\u540E\u5404 2 \u884C\u4E0A\u4E0B\u6587\uFF08\u53EF\u76F4\u63A5\u5224\u65AD\u7528\u6CD5\uFF1B\u6784\u9020 edit_file \u7684 old_str \u524D\u53EF\u7528 context \u8C03\u5927\u4E00\u6B21\u62FF\u8DB3\uFF09\u3002\u9ED8\u8BA4\u5B57\u9762\u91CF\u5339\u914D\uFF0C\u6B63\u5219\u4F20 is_regex=true\u3002\u2605 \u591A\u5173\u952E\u8BCD\u7528 is_regex=true \u4EE5 | \u5408\u5E76\uFF08\u5982 'uploadVisible|uploadTip'\uFF09\u4E00\u6B21\u67E5\u5B8C\uFF0C\u52FF\u9010\u8BCD\u591A\u6B21\u8C03\u7528\u3002path \u53EF\u9650\u5B9A\u76EE\u5F55\u6216\u6587\u4EF6\uFF08\u5355\u5927\u6587\u4EF6\u591A\u5904\u5B9A\u4F4D\u4F20\u6587\u4EF6\u8DEF\u5F84\u6700\u9AD8\u6548\uFF09\u3002\u591A\u6839\u5DE5\u4F5C\u533A\uFF1Apath \u53EF\u4F20\u9879\u76EE\u76EE\u5F55\u540D\uFF08\u5982 'frontend'\uFF09\u3001\u7EDD\u5BF9\u8DEF\u5F84\u6216 ../\u5144\u5F1F\u76EE\u5F55\u3002\u2605 \u7528\u6237\u6307\u660E\u4E86\u9879\u76EE\u65F6\u52A1\u5FC5\u628A\u8BE5\u9879\u76EE\u4F5C\u4E3A path \u4F20\u5165\u2014\u2014\u7F3A\u7701\u53EA\u641C\u6D3B\u52A8\u6839\uFF0C\u5E38\u4E0E\u610F\u56FE\u4E0D\u7B26\u3002\u2605 \u53EA\u8BFB\u5B89\u5168\uFF0C\u53EF\u4E0E\u5176\u5B83\u53EA\u8BFB\u5DE5\u5177\u5728\u540C\u4E00\u6761\u6D88\u606F\u91CC\u5E76\u884C\u8C03\u7528\u3002",
           parameters: {
             type: "object",
             properties: {
@@ -6178,7 +6695,7 @@ var init_search = __esm({
           async execute(args, ctx) {
             try {
               const cleanQuery = (args.query || "").trim();
-              if (!cleanQuery) return "\u274C [\u68C0\u7D22\u5931\u8D25]\uFF1A\u4F20\u5165\u7684\u68C0\u7D22\u5173\u952E\u8BCD\u4E0D\u80FD\u4E3A\u7A7A\u3002";
+              if (!cleanQuery) return toolFailure("[\u68C0\u7D22\u5931\u8D25]\uFF1A\u4F20\u5165\u7684\u68C0\u7D22\u5173\u952E\u8BCD\u4E0D\u80FD\u4E3A\u7A7A\u3002");
               const pattern = args.is_regex ? cleanQuery : escapeRegExp(cleanQuery);
               const resolveSearchRoot = () => {
                 if (!args.path) return ctx?.cwd ?? getActiveWorkspaceRoot();
@@ -6253,8 +6770,8 @@ var init_search = __esm({
               return resultLines.join("\n");
             } catch (error) {
               if (error.code === 1) return `\u672A\u627E\u5230\u4E0E "${args.query}" \u76F8\u5173\u7684\u4EFB\u4F55\u4EE3\u7801\u5339\u914D\u9879\u3002`;
-              if (error.killed || error.signal) return `\u23F3 [\u68C0\u7D22\u8D85\u65F6]\uFF1A30s \u5185\u672A\u5B8C\u6210\uFF08\u7591\u4F3C\u547D\u4E2D\u5DE8\u578B/\u5F02\u5E38\u6587\u4EF6\uFF09\u3002\u5EFA\u8BAE\u7F29\u5C0F\u5173\u952E\u8BCD\u6216\u9650\u5B9A\u76EE\u5F55\u540E\u91CD\u8BD5\u3002`;
-              return `\u68C0\u7D22\u5931\u8D25: ${error.message}`;
+              if (error.killed || error.signal) return toolFailure(`\u23F3 [\u68C0\u7D22\u8D85\u65F6]\uFF1A30s \u5185\u672A\u5B8C\u6210\uFF08\u7591\u4F3C\u547D\u4E2D\u5DE8\u578B/\u5F02\u5E38\u6587\u4EF6\uFF09\u3002\u5EFA\u8BAE\u7F29\u5C0F\u5173\u952E\u8BCD\u6216\u9650\u5B9A\u76EE\u5F55\u540E\u91CD\u8BD5\u3002`);
+              return toolFailure(`\u68C0\u7D22\u5931\u8D25: ${error.message}`);
             }
           }
         }
@@ -6263,6 +6780,7 @@ var init_search = __esm({
         type: "function",
         function: {
           name: "read_project_guide",
+          planAllowed: true,
           description: "\u8BFB\u53D6\u9879\u76EE\u6839\u76EE\u5F55\u4E0B\u7684\u4E13\u5C5E AI \u884C\u4E3A\u6307\u5F15\u4E0E\u5F00\u53D1\u6307\u5357\uFF08\u4F9D\u6B21\u5C1D\u8BD5 CLAUDE.md / AGENTS.md / AGENT.md\uFF0C\u547D\u4E2D\u7B2C\u4E00\u4E2A\uFF09\u3002\u8BE5\u6307\u5357\u56FA\u5316\u4E86\u672C\u9879\u76EE\u7684\u6784\u5EFA\u547D\u4EE4\u3001\u8FD0\u884C\u6D4B\u8BD5\u89C4\u8303\u3001\u6838\u5FC3\u6280\u672F\u6808\u53CA\u4EE3\u7801\u98CE\u683C\u9650\u5236\u3002\u5728\u5BF9\u964C\u751F\u9879\u76EE\u5B9E\u65BD\u4EFB\u4F55\u6784\u5EFA\u6216\u6D4B\u8BD5\u547D\u4EE4\u524D\uFF0C\u5FC5\u987B\u4F18\u5148\u8BFB\u53D6\u6B64\u5DE5\u5177\u3002",
           parameters: {
             type: "object",
@@ -6328,6 +6846,8 @@ var init_command = __esm({
         type: "function",
         function: {
           name: "run_command",
+          primaryArg: "command",
+          autoApproval: "command",
           description: "\u5728\u5DE5\u4F5C\u533A\u6267\u884C shell \u547D\u4EE4\uFF08\u77ED\u5E73\u5FEB\u7684\u6D4B\u8BD5 / \u6784\u5EFA / git \u7B49\uFF09\uFF0C\u6D41\u5F0F\u8FD4\u56DE stdout/stderr \u5E76\u9644\u5E26\u9000\u51FA\u7801\u3002\u5C5E\u4E8E\u9AD8\u5371\u64CD\u4F5C\uFF0C\u6BCF\u6B21\u6267\u884C\u90FD\u9700\u8981\u7528\u6237\u5BA1\u6279\u3002\u9884\u8BA1\u8FD0\u884C\u6570\u5206\u949F\u4EE5\u4E0A\u7684\u957F\u4EFB\u52A1\uFF08\u5168\u91CF\u6D4B\u8BD5 / \u5927\u6784\u5EFA / \u5927\u4F53\u79EF\u5B89\u88C5\uFF09\u8BF7\u6539\u7528 run_in_background \u540E\u53F0\u6267\u884C\uFF1B\u82E5\u672C\u5DE5\u5177\u6267\u884C\u8FC7\u4E45\u4ECD\u672A\u7ED3\u675F\uFF0C\u7CFB\u7EDF\u4F1A\u81EA\u52A8\u628A\u8FDB\u7A0B\u8F6C\u5165\u540E\u53F0\u5E76\u8FD4\u56DE task_id\uFF08\u7528 get_background_output \u67E5\u7ED3\u679C\u3001stop_background_task \u7EC8\u6B62\uFF09\u3002",
           parameters: {
             type: "object",
@@ -6384,7 +6904,7 @@ ${tail}`,
             let degradeReason = null;
             const isWin = process.platform === "win32";
             if (ctx?.abortSignal?.aborted) {
-              yield `\u274C [\u5DF2\u4E2D\u6B62]\uFF1A\u547D\u4EE4 [${args.command}] \u672A\u6267\u884C\uFF08\u7528\u6237\u5DF2\u4E2D\u65AD\uFF09\u3002`;
+              yield toolFailure(`[\u5DF2\u4E2D\u6B62]\uFF1A\u547D\u4EE4 [${args.command}] \u672A\u6267\u884C\uFF08\u7528\u6237\u5DF2\u4E2D\u65AD\uFF09\u3002`).content;
               yield EXIT_SENTINEL(-1);
               return;
             }
@@ -6401,7 +6921,7 @@ ${tail}`,
                 signal: ctx?.abortSignal
               });
             } catch (e) {
-              yield `\u274C [\u542F\u52A8\u5931\u8D25]\uFF1Aspawn \u629B\u51FA\u5F02\u5E38\uFF08signal \u5DF2\u4E2D\u6B62\u6216\u547D\u4EE4\u975E\u6CD5\uFF09: ${e?.message ?? 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;
               yield EXIT_SENTINEL(-1);
               return;
             }
@@ -6643,7 +7163,9 @@ var init_glob = __esm({
         type: "function",
         function: {
           name: "glob",
-          description: "\u6309\u6587\u4EF6\u540D glob \u6A21\u5F0F\u5FEB\u901F\u67E5\u627E\u6587\u4EF6\uFF08\u5982 '**/*.ts'\u3001'src/**/test*'\u3001'**/*.test.ts'\uFF09\u3002\u2605 \u652F\u6301\u82B1\u62EC\u53F7\u591A\u9009\uFF1A'**/*.{ts,tsx,vue}'\u3001'src/{api,components}/**' \u4E00\u6B21\u67E5\u591A\u7C7B\u578B/\u591A\u76EE\u5F55\uFF0C\u52FF\u5206\u591A\u6B21\u8C03\u7528\u3002\u4E0E search_grep\uFF08\u6309\u5185\u5BB9\u68C0\u7D22\uFF09\u4E92\u8865\u3002\u81EA\u52A8\u5957\u7528 .gitignore / \u901A\u7528\u9ED1\u540D\u5355\u8FC7\u6EE4\u3002",
+          planAllowed: true,
+          primaryArg: "pattern",
+          description: "\u6309\u6587\u4EF6\u540D glob \u6A21\u5F0F\u5FEB\u901F\u67E5\u627E\u6587\u4EF6\uFF08\u5982 '**/*.ts'\u3001'src/**/test*'\u3001'**/*.test.ts'\uFF09\u3002\u2605 \u652F\u6301\u82B1\u62EC\u53F7\u591A\u9009\uFF1A'**/*.{ts,tsx,vue}'\u3001'src/{api,components}/**' \u4E00\u6B21\u67E5\u591A\u7C7B\u578B/\u591A\u76EE\u5F55\uFF0C\u52FF\u5206\u591A\u6B21\u8C03\u7528\u3002\u4E0E search_grep\uFF08\u6309\u5185\u5BB9\u68C0\u7D22\uFF09\u4E92\u8865\u3002\u81EA\u52A8\u5957\u7528 .gitignore / \u901A\u7528\u9ED1\u540D\u5355\u8FC7\u6EE4\u3002\u2605 \u53EA\u8BFB\u5B89\u5168\uFF0C\u53EF\u4E0E\u5176\u5B83\u53EA\u8BFB\u5DE5\u5177\u5728\u540C\u4E00\u6761\u6D88\u606F\u91CC\u5E76\u884C\u8C03\u7528\u3002",
           parameters: {
             type: "object",
             properties: {
@@ -6657,7 +7179,7 @@ var init_glob = __esm({
           async execute(args, ctx) {
             try {
               const cleanPattern = (args.pattern || "").trim();
-              if (!cleanPattern) return "\u274C [Glob\u5931\u8D25]\uFF1A\u4F20\u5165\u7684\u68C0\u7D22 pattern \u4E0D\u80FD\u4E3A\u7A7A\u3002";
+              if (!cleanPattern) return toolFailure("[Glob\u5931\u8D25]\uFF1A\u4F20\u5165\u7684\u68C0\u7D22 pattern \u4E0D\u80FD\u4E3A\u7A7A\u3002");
               const activeRoot = ctx?.cwd ?? getActiveWorkspaceRoot();
               const root = args.path ? resolveReadablePath(args.path) : activeRoot;
               const re = globToRegex2(cleanPattern);
@@ -6701,7 +7223,7 @@ var init_glob = __esm({
               return `${prefix}[Glob: ${cleanPattern} | ${hits.length} \u4E2A\u5339\u914D]
 ` + hits.join("\n");
             } catch (error) {
-              return `glob \u68C0\u7D22\u5931\u8D25: ${error.message}`;
+              return toolFailure(`glob \u68C0\u7D22\u5931\u8D25: ${error.message}`);
             }
           }
         }
@@ -6730,7 +7252,8 @@ var init_git = __esm({
         type: "function",
         function: {
           name: "get_git_diff",
-          description: "\u83B7\u53D6\u5F53\u524D\u5DE5\u4F5C\u533A\u4E2D\u6240\u6709\u76F8\u6BD4\u4E8E Git \u6682\u5B58\u533A/\u6700\u8FD1\u4E00\u6B21\u63D0\u4EA4\u7684\u672A\u63D0\u4EA4\u4EE3\u7801\u6539\u52A8\uFF08\u7EA2\u7EFF\u8272 Diff \u5DEE\u5F02\uFF09\u3002\u9002\u5408\u5728\u4FEE\u6539\u4EE3\u7801\u540E\u3001\u6216\u8FD0\u884C\u6D4B\u8BD5\u524D\uFF0C\u81EA\u4E3B\u8D70\u67E5\u4FEE\u6539\u662F\u5426\u7CBE\u51C6\u65E0\u4F4E\u7EA7\u9519\u8BEF\u3002",
+          planAllowed: true,
+          description: "\u83B7\u53D6\u5F53\u524D\u5DE5\u4F5C\u533A\u4E2D\u6240\u6709\u76F8\u6BD4\u4E8E Git \u6682\u5B58\u533A/\u6700\u8FD1\u4E00\u6B21\u63D0\u4EA4\u7684\u672A\u63D0\u4EA4\u4EE3\u7801\u6539\u52A8\uFF08\u7EA2\u7EFF\u8272 Diff \u5DEE\u5F02\uFF09\u3002\u9002\u5408\u5728\u4FEE\u6539\u4EE3\u7801\u540E\u3001\u6216\u8FD0\u884C\u6D4B\u8BD5\u524D\uFF0C\u81EA\u4E3B\u8D70\u67E5\u4FEE\u6539\u662F\u5426\u7CBE\u51C6\u65E0\u4F4E\u7EA7\u9519\u8BEF\u3002\u2605 \u53EA\u8BFB\u5B89\u5168\uFF0C\u53EF\u4E0E\u5176\u5B83\u53EA\u8BFB\u5DE5\u5177\u5728\u540C\u4E00\u6761\u6D88\u606F\u91CC\u5E76\u884C\u8C03\u7528\u3002",
           parameters: {
             type: "object",
             properties: {
@@ -6774,9 +7297,9 @@ var init_git = __esm({
 ${stdout}`;
             } catch (error) {
               if (isNotARepoError2(error)) {
-                return `\u274C [Diff \u5931\u8D25]\uFF1A\u5F53\u524D\u5DE5\u4F5C\u533A\u5C1A\u672A\u521D\u59CB\u5316 Git \u4ED3\u5E93\uFF0C\u65E0\u6CD5\u55C5\u63A2\u4EE3\u7801\u7248\u672C\u6539\u52A8\u5DEE\u5F02\u3002`;
+                return toolFailure(`[Diff \u5931\u8D25]\uFF1A\u5F53\u524D\u5DE5\u4F5C\u533A\u5C1A\u672A\u521D\u59CB\u5316 Git \u4ED3\u5E93\uFF0C\u65E0\u6CD5\u55C5\u63A2\u4EE3\u7801\u7248\u672C\u6539\u52A8\u5DEE\u5F02\u3002`);
               }
-              return `\u8BFB\u53D6\u4EE3\u7801\u5DEE\u5F02\u5931\u8D25: ${error.message}`;
+              return toolFailure(`\u8BFB\u53D6\u4EE3\u7801\u5DEE\u5F02\u5931\u8D25: ${error.message}`);
             }
           }
         }
@@ -6785,7 +7308,8 @@ ${stdout}`;
         type: "function",
         function: {
           name: "git_status",
-          description: "\u67E5\u770B\u5F53\u524D Git \u5DE5\u4F5C\u533A\u72B6\u6001\uFF08\u5F53\u524D\u5206\u652F\u3001\u4E0E\u8FDC\u7AEF\u7684\u9886\u5148/\u843D\u540E\u3001\u4EE5\u53CA\u6539\u52A8/\u6682\u5B58/\u672A\u8DDF\u8E2A\u6587\u4EF6\u7684\u7CBE\u7B80\u6E05\u5355\uFF09\u3002\u7EAF\u8BFB\uFF0C\u514D\u5BA1\u6279\uFF0C\u7528\u4E8E\u66FF\u4EE3\u8D70 run_command \u8DD1 git status \u7684\u7E41\u7410\u3002",
+          planAllowed: true,
+          description: "\u67E5\u770B\u5F53\u524D Git \u5DE5\u4F5C\u533A\u72B6\u6001\uFF08\u5F53\u524D\u5206\u652F\u3001\u4E0E\u8FDC\u7AEF\u7684\u9886\u5148/\u843D\u540E\u3001\u4EE5\u53CA\u6539\u52A8/\u6682\u5B58/\u672A\u8DDF\u8E2A\u6587\u4EF6\u7684\u7CBE\u7B80\u6E05\u5355\uFF09\u3002\u7EAF\u8BFB\uFF0C\u514D\u5BA1\u6279\uFF0C\u7528\u4E8E\u66FF\u4EE3\u8D70 run_command \u8DD1 git status \u7684\u7E41\u7410\u3002\u2605 \u53EF\u4E0E\u5176\u5B83\u53EA\u8BFB\u5DE5\u5177\u5728\u540C\u4E00\u6761\u6D88\u606F\u91CC\u5E76\u884C\u8C03\u7528\u3002",
           parameters: {
             type: "object",
             properties: {}
@@ -6802,9 +7326,9 @@ ${stdout}`;
 ${stdout.trim()}`;
             } catch (error) {
               if (isNotARepoError2(error)) {
-                return `\u274C [Git Status \u5931\u8D25]\uFF1A\u5F53\u524D\u5DE5\u4F5C\u533A\u5C1A\u672A\u521D\u59CB\u5316 Git \u4ED3\u5E93\u3002`;
+                return toolFailure(`[Git Status \u5931\u8D25]\uFF1A\u5F53\u524D\u5DE5\u4F5C\u533A\u5C1A\u672A\u521D\u59CB\u5316 Git \u4ED3\u5E93\u3002`);
               }
-              return `\u8BFB\u53D6 Git \u72B6\u6001\u5931\u8D25: ${error.message}`;
+              return toolFailure(`\u8BFB\u53D6 Git \u72B6\u6001\u5931\u8D25: ${error.message}`);
             }
           }
         }
@@ -6813,7 +7337,8 @@ ${stdout.trim()}`;
         type: "function",
         function: {
           name: "git_log",
-          description: "\u67E5\u770B\u5F53\u524D\u5206\u652F\u7684\u6700\u8FD1\u82E5\u5E72\u6761\u63D0\u4EA4\u5386\u53F2\uFF08\u77ED\u54C8\u5E0C + \u65E5\u671F + \u63D0\u4EA4\u8BF4\u660E\uFF09\u3002\u7EAF\u8BFB\uFF0C\u514D\u5BA1\u6279\u3002\u7528\u4E8E\u4E86\u89E3\u9879\u76EE\u6F14\u8FDB\u3001\u5B9A\u4F4D\u67D0\u6B21\u6539\u52A8\u6216\u786E\u8BA4\u63D0\u4EA4\u662F\u5426\u6210\u529F\u3002",
+          planAllowed: true,
+          description: "\u67E5\u770B\u5F53\u524D\u5206\u652F\u7684\u6700\u8FD1\u82E5\u5E72\u6761\u63D0\u4EA4\u5386\u53F2\uFF08\u77ED\u54C8\u5E0C + \u65E5\u671F + \u63D0\u4EA4\u8BF4\u660E\uFF09\u3002\u7EAF\u8BFB\uFF0C\u514D\u5BA1\u6279\u3002\u7528\u4E8E\u4E86\u89E3\u9879\u76EE\u6F14\u8FDB\u3001\u5B9A\u4F4D\u67D0\u6B21\u6539\u52A8\u6216\u786E\u8BA4\u63D0\u4EA4\u662F\u5426\u6210\u529F\u3002\u2605 \u53EF\u4E0E\u5176\u5B83\u53EA\u8BFB\u5DE5\u5177\u5728\u540C\u4E00\u6761\u6D88\u606F\u91CC\u5E76\u884C\u8C03\u7528\u3002",
           parameters: {
             type: "object",
             properties: {
@@ -6840,9 +7365,9 @@ ${stdout.trim()}`;
 ${stdout.trim()}`;
             } catch (error) {
               if (isNotARepoError2(error)) {
-                return `\u274C [Git Log \u5931\u8D25]\uFF1A\u5F53\u524D\u5DE5\u4F5C\u533A\u5C1A\u672A\u521D\u59CB\u5316 Git \u4ED3\u5E93\u3002`;
+                return toolFailure(`[Git Log \u5931\u8D25]\uFF1A\u5F53\u524D\u5DE5\u4F5C\u533A\u5C1A\u672A\u521D\u59CB\u5316 Git \u4ED3\u5E93\u3002`);
               }
-              return `\u8BFB\u53D6 Git \u5386\u53F2\u5931\u8D25: ${error.message}`;
+              return toolFailure(`\u8BFB\u53D6 Git \u5386\u53F2\u5931\u8D25: ${error.message}`);
             }
           }
         }
@@ -6851,6 +7376,8 @@ ${stdout.trim()}`;
         type: "function",
         function: {
           name: "git_commit",
+          // ★ #8a：分类器仅 /auto 激进档纳入（不可 undo，显式 opt-in）
+          autoApproval: "aggressive",
           description: "\u5C06\u5F53\u524D\u6682\u5B58\u533A\u7684\u6539\u52A8\u63D0\u4EA4\u4E3A\u4E00\u6B21\u65B0\u7684 Git commit\u3002\u53EF\u9009 stage_all=true \u4E00\u5E76\u6267\u884C git add -A\uFF08\u6682\u5B58\u5168\u90E8\u6539\u52A8\u542B\u65B0\u589E/\u5220\u9664\uFF09\u540E\u518D\u63D0\u4EA4\u3002\u6CE8\u610F\uFF1A\u4E0D\u4F1A\u81EA\u52A8 push\u3002",
           parameters: {
             type: "object",
@@ -6878,13 +7405,13 @@ ${stdout.trim()}`;
 ${summary}`;
             } catch (error) {
               if (isNotARepoError2(error)) {
-                return `\u274C [Git Commit \u5931\u8D25]\uFF1A\u5F53\u524D\u5DE5\u4F5C\u533A\u5C1A\u672A\u521D\u59CB\u5316 Git \u4ED3\u5E93\u3002`;
+                return toolFailure(`[Git Commit \u5931\u8D25]\uFF1A\u5F53\u524D\u5DE5\u4F5C\u533A\u5C1A\u672A\u521D\u59CB\u5316 Git \u4ED3\u5E93\u3002`);
               }
               const text = `${error?.stderr || error?.message || ""}`;
               if (text.toLowerCase().includes("nothing to commit")) {
                 return `\u2139\uFE0F [git_commit]\uFF1A\u6CA1\u6709\u53EF\u63D0\u4EA4\u7684\u6539\u52A8\uFF08nothing to commit\uFF09\u3002\u5982\u9700\u63D0\u4EA4\u8BF7\u5148\u6682\u5B58\uFF08stage_all=true \u6216 git add\uFF09\u3002`;
               }
-              return `\u274C [git_commit \u5931\u8D25]\uFF1A${text.trim()}`;
+              return toolFailure(`[git_commit \u5931\u8D25]\uFF1A${text.trim()}`);
             }
           }
         }
@@ -6925,7 +7452,7 @@ var init_inspect_dependencies = __esm({
               };
               return JSON.stringify(result, null, 2);
             } catch (error) {
-              return `\u274C \u8BFB\u53D6\u4F9D\u8D56\u6E05\u5355\u5931\u8D25\uFF0C\u672A\u627E\u5230 package.json \u6216\u6587\u4EF6\u683C\u5F0F\u635F\u574F: ${error.message}`;
+              return toolFailure(`\u8BFB\u53D6\u4F9D\u8D56\u6E05\u5355\u5931\u8D25\uFF0C\u672A\u627E\u5230 package.json \u6216\u6587\u4EF6\u683C\u5F0F\u635F\u574F: ${error.message}`);
             }
           }
         }
@@ -7325,6 +7852,9 @@ var init_web = __esm({
         type: "function",
         function: {
           name: "web_fetch",
+          planAllowed: true,
+          primaryArg: "url",
+          autoApproval: "aggressive",
           description: "\u6293\u53D6\u6307\u5B9A\u516C\u5F00 URL \u7684\u7F51\u9875\u5185\u5BB9\u5E76\u8F6C\u4E3A\u5E72\u51C0\u7684 Markdown \u6587\u672C\uFF0C\u7528\u4E8E\u67E5\u9605 API \u6587\u6863\u3001\u62A5\u9519\u8BF4\u660E\u3001\u5B98\u65B9 changelog \u7B49\u5916\u90E8\u8D44\u6599\u3002\u4EC5\u652F\u6301 http/https\uFF0C\u9ED8\u8BA4\u62E6\u622A\u5185\u7F51/\u56DE\u73AF/\u94FE\u8DEF\u672C\u5730\u5730\u5740\uFF08\u9632 SSRF\uFF09\uFF1B\u672C\u5730\u5F00\u53D1/\u81EA\u52A8\u5316\u6D4B\u8BD5\u9700\u6293 localhost \u670D\u52A1\u6216\u5185\u7F51\u9875\u9762\u65F6\uFF0C\u4F20 allow_private=true \u653E\u884C\uFF08\u4E91\u5143\u6570\u636E\u7AEF\u70B9\u4ECD\u62E6\uFF09\u3002",
           parameters: {
             type: "object",
@@ -7349,10 +7879,10 @@ var init_web = __esm({
             try {
               parsed = new URL(args.url);
             } catch {
-              return `\u274C [\u6293\u53D6\u5931\u8D25]\uFF1AURL \u683C\u5F0F\u4E0D\u5408\u6CD5\uFF1A${args.url}`;
+              return toolFailure(`[\u6293\u53D6\u5931\u8D25]\uFF1AURL \u683C\u5F0F\u4E0D\u5408\u6CD5\uFF1A${args.url}`);
             }
             if (parsed.protocol !== "http:" && parsed.protocol !== "https:") {
-              return `\u274C [\u5B89\u5168\u7194\u65AD]\uFF1A\u4EC5\u5141\u8BB8 http/https \u534F\u8BAE\uFF0C\u62D2\u7EDD ${parsed.protocol}`;
+              return toolFailure(`[\u5B89\u5168\u7194\u65AD]\uFF1A\u4EC5\u5141\u8BB8 http/https \u534F\u8BAE\uFF0C\u62D2\u7EDD ${parsed.protocol}`);
             }
             const signals = [AbortSignal.timeout(FETCH_TIMEOUT_MS2)];
             if (ctx?.abortSignal) signals.push(ctx.abortSignal);
@@ -7362,7 +7892,7 @@ var init_web = __esm({
                 "Accept": "text/html,application/xhtml+xml,text/plain,application/json,application/xml;q=0.9,*/*;q=0.8"
               }, signals, allowPrivate);
               if (!res.ok) {
-                return `\u274C [\u6293\u53D6\u5931\u8D25]\uFF1AHTTP ${res.status} ${res.statusText}\uFF08${parsed.href}\uFF09`;
+                return toolFailure(`[\u6293\u53D6\u5931\u8D25]\uFF1AHTTP ${res.status} ${res.statusText}\uFF08${parsed.href}\uFF09`);
               }
               const contentType = res.headers.get("content-type") || "";
               if (!/(text|html|json|xml|plain|markdown)/i.test(contentType)) {
@@ -7391,12 +7921,12 @@ var init_web = __esm({
 ${body}${truncNote}`;
             } catch (error) {
               if (error?.name === "TimeoutError") {
-                return `\u274C [\u6293\u53D6\u8D85\u65F6]\uFF1A${FETCH_TIMEOUT_MS2 / 1e3}s \u5185\u672A\u54CD\u5E94\uFF1A${parsed.href}`;
+                return toolFailure(`[\u6293\u53D6\u8D85\u65F6]\uFF1A${FETCH_TIMEOUT_MS2 / 1e3}s \u5185\u672A\u54CD\u5E94\uFF1A${parsed.href}`);
               }
               if (error?.name === "AbortError") {
                 return `\u23F9\uFE0F [\u5DF2\u4E2D\u6B62]\uFF1A\u7528\u6237\u4E2D\u65AD\u4E86\u6293\u53D6\uFF1A${parsed.href}`;
               }
-              return `\u274C [\u6293\u53D6\u5931\u8D25]\uFF1A${error.message}`;
+              return toolFailure(`[\u6293\u53D6\u5931\u8D25]\uFF1A${error.message}`);
             }
           }
         }
@@ -7405,6 +7935,9 @@ ${body}${truncNote}`;
         type: "function",
         function: {
           name: "web_search",
+          planAllowed: true,
+          primaryArg: "query",
+          autoApproval: "aggressive",
           description: "\u8054\u7F51\u641C\u7D22\u5916\u90E8\u8D44\u6599\uFF08API \u6587\u6863\u3001\u62A5\u9519\u89E3\u6CD5\u3001\u5E93\u7528\u6CD5\u3001\u6700\u65B0\u4FE1\u606F\u7B49\uFF09\uFF0C\u8FD4\u56DE\u7ED3\u679C\u5217\u8868\uFF08\u6807\u9898/URL/\u7247\u6BB5\uFF09\u3002\u9ED8\u8BA4\u7528 Bing\uFF08\u514D\u6CE8\u518C\u3001\u4E2D\u56FD/\u5168\u7403\u7686\u53EF\u7528\uFF09\uFF1B\u914D\u7F6E\u4E86 TAVILY_API_KEY \u4F1A\u81EA\u52A8\u5347\u7EA7\u5230 Tavily\uFF08\u7ED3\u679C\u66F4\u5E72\u51C0\u3001\u5E26\u6458\u8981\uFF09\uFF1B\u53EF\u7528\u73AF\u5883\u53D8\u91CF SEARCH_PROVIDER=bing|ddg|tavily \u5F3A\u5236\u6307\u5B9A\u3002\u67E5\u8BE2\u964C\u751F\u5E93\u6216\u62A5\u9519\u65F6\u4F18\u5148\u7528\u672C\u5DE5\u5177\u66FF\u4EE3\u51ED\u8BB0\u5FC6\u4F5C\u7B54\u3002\u7ED3\u679C\u6309\u957F\u5EA6\u7194\u65AD\u3002",
           parameters: {
             type: "object",
@@ -7432,12 +7965,12 @@ ${body}${truncNote}`;
               return formatSearchResults(args.query, provider, resp);
             } catch (error) {
               if (error?.name === "TimeoutError") {
-                return `\u274C [web_search \u8D85\u65F6]\uFF1A${SEARCH_TIMEOUT_MS / 1e3}s \u5185\u672A\u54CD\u5E94\u3002`;
+                return toolFailure(`[web_search \u8D85\u65F6]\uFF1A${SEARCH_TIMEOUT_MS / 1e3}s \u5185\u672A\u54CD\u5E94\u3002`);
               }
               if (error?.name === "AbortError") {
                 return `\u23F9\uFE0F [\u5DF2\u4E2D\u6B62]\uFF1A\u7528\u6237\u4E2D\u65AD\u4E86\u641C\u7D22\u3002`;
               }
-              return `\u274C [web_search \u5931\u8D25 | ${provider}]\uFF1A${error.message}`;
+              return toolFailure(`[web_search \u5931\u8D25 | ${provider}]\uFF1A${error.message}`);
             }
           }
         }
@@ -7495,17 +8028,17 @@ var init_http = __esm({
           async execute(args, ctx) {
             const method = (args.method || "GET").toUpperCase();
             if (!ALLOWED_METHODS.includes(method)) {
-              return `\u274C [http_request] \u4E0D\u652F\u6301\u7684\u65B9\u6CD5\uFF1A${args.method}\uFF08\u5141\u8BB8 ${ALLOWED_METHODS.join("/")})`;
+              return toolFailure(`[http_request] \u4E0D\u652F\u6301\u7684\u65B9\u6CD5\uFF1A${args.method}\uFF08\u5141\u8BB8 ${ALLOWED_METHODS.join("/")})`);
             }
             const maxChars = args.max_length && args.max_length > 0 ? args.max_length : DEFAULT_MAX_CHARS2;
             let parsed;
             try {
               parsed = new URL(args.url);
             } catch {
-              return `\u274C [http_request] URL \u4E0D\u5408\u6CD5\uFF1A${args.url}`;
+              return toolFailure(`[http_request] URL \u4E0D\u5408\u6CD5\uFF1A${args.url}`);
             }
             if (parsed.protocol !== "http:" && parsed.protocol !== "https:") {
-              return `\u274C [http_request] \u4EC5\u5141\u8BB8 http/https\uFF0C\u62D2\u7EDD ${parsed.protocol}`;
+              return toolFailure(`[http_request] \u4EC5\u5141\u8BB8 http/https\uFF0C\u62D2\u7EDD ${parsed.protocol}`);
             }
             const headers = {
               "User-Agent": USER_AGENT2,
@@ -7544,12 +8077,12 @@ var init_http = __esm({
               ].join("\n");
             } catch (error) {
               if (error?.name === "TimeoutError") {
-                return `\u274C [http_request \u8D85\u65F6]\uFF1A${HTTP_TIMEOUT_MS / 1e3}s \u5185\u672A\u54CD\u5E94\uFF1A${parsed.href}`;
+                return toolFailure(`[http_request \u8D85\u65F6]\uFF1A${HTTP_TIMEOUT_MS / 1e3}s \u5185\u672A\u54CD\u5E94\uFF1A${parsed.href}`);
               }
               if (error?.name === "AbortError") {
                 return `\u23F9\uFE0F [http_request \u5DF2\u4E2D\u6B62]\uFF1A\u7528\u6237\u4E2D\u65AD\uFF1A${parsed.href}`;
               }
-              return `\u274C [http_request \u5931\u8D25 | ${method}]\uFF1A${error.message}`;
+              return toolFailure(`[http_request \u5931\u8D25 | ${method}]\uFF1A${error.message}`);
             }
           }
         }
@@ -7595,7 +8128,7 @@ var init_typescript = __esm({
       try {
         const absPath = realpathNative(resolveReadablePath(displayPath));
         const block = await precheck(displayPath, absPath);
-        if (block) return { ok: false, text: block };
+        if (block) return { ok: false, result: typeof block === "string" ? asToolFailure(block) : block };
         const { ls } = await getLanguageService(TS, absPath, { checkJs });
         const syntactic = ls.getSyntacticDiagnostics(absPath);
         const semantic = ls.getSemanticDiagnostics(absPath);
@@ -7637,7 +8170,7 @@ var init_typescript = __esm({
         return { ok: true, errors, warnings, text: `[Diagnostics: ${displayPath}] ${errors} error(s), ${warnings} warning(s)
 ${body}${tail}` };
       } catch (e) {
-        return { ok: false, text: `\u274C \u7C7B\u578B\u8BCA\u65AD\u5931\u8D25 [${displayPath}]: ${e?.message ?? e}` };
+        return { ok: false, result: toolFailure(`\u7C7B\u578B\u8BCA\u65AD\u5931\u8D25 [${displayPath}]: ${e?.message ?? e}`) };
       }
     };
     typescriptTools = [
@@ -7645,7 +8178,8 @@ ${body}${tail}` };
         type: "function",
         function: {
           name: "get_diagnostics",
-          description: "\u5BF9\u4E00\u4E2A\u6216\u591A\u4E2A TS/JS \u6587\u4EF6\u53D6\u7C7B\u578B+\u8BED\u4E49\u8BCA\u65AD\uFF08\u7C7B\u578B\u9519\u8BEF/\u672A\u7528\u53D8\u91CF/\u4E0D\u53EF\u8FBE\u4EE3\u7801\uFF09\uFF0C\u8F93\u51FA\u884C:\u5217/\u4E25\u91CD\u5EA6/TS \u9519\u8BEF\u7801\uFF0C\u683C\u5F0F\u5BF9\u9F50 tsc\u3002\u2605 \u6539\u5B8C\u591A\u4E2A\u6587\u4EF6\u540E\u9A8C\u8BC1\uFF1A\u4F20 paths \u6570\u7EC4\u4E00\u6B21\u8BCA\u65AD\u5168\u90E8\uFF08\u6700\u591A 20 \u4E2A\uFF09\uFF0C\u52FF\u9010\u6587\u4EF6\u591A\u6B21\u8C03\u7528\u3002\u652F\u6301 .ts/.tsx/.js/.jsx/.mjs/.cjs\uFF1B.vue SFC \u4E0E\u5176\u4ED6\u8BED\u8A00\u6269\u5C55\u540D\uFF08.java/.py \u7B49\uFF09\u76F4\u63A5\u62D2\u7EDD\u3001\u52FF\u4F20\u5165\u3002\u9879\u76EE\u7EA7\u5168\u91CF\u8BCA\u65AD\u7528 run_command \u8DD1 `tsc --noEmit`\u3002",
+          planAllowed: true,
+          description: "\u5BF9\u4E00\u4E2A\u6216\u591A\u4E2A TS/JS \u6587\u4EF6\u53D6\u7C7B\u578B+\u8BED\u4E49\u8BCA\u65AD\uFF08\u7C7B\u578B\u9519\u8BEF/\u672A\u7528\u53D8\u91CF/\u4E0D\u53EF\u8FBE\u4EE3\u7801\uFF09\uFF0C\u8F93\u51FA\u884C:\u5217/\u4E25\u91CD\u5EA6/TS \u9519\u8BEF\u7801\uFF0C\u683C\u5F0F\u5BF9\u9F50 tsc\u3002\u2605 \u6539\u5B8C\u591A\u4E2A\u6587\u4EF6\u540E\u9A8C\u8BC1\uFF1A\u4F20 paths \u6570\u7EC4\u4E00\u6B21\u8BCA\u65AD\u5168\u90E8\uFF08\u6700\u591A 20 \u4E2A\uFF09\uFF0C\u52FF\u9010\u6587\u4EF6\u591A\u6B21\u8C03\u7528\u3002\u652F\u6301 .ts/.tsx/.js/.jsx/.mjs/.cjs\uFF1B.vue SFC \u4E0E\u5176\u4ED6\u8BED\u8A00\u6269\u5C55\u540D\uFF08.java/.py \u7B49\uFF09\u76F4\u63A5\u62D2\u7EDD\u3001\u52FF\u4F20\u5165\u3002\u9879\u76EE\u7EA7\u5168\u91CF\u8BCA\u65AD\u7528 run_command \u8DD1 `tsc --noEmit`\u3002\u2605 \u53EA\u8BFB\u5B89\u5168\uFF0C\u53EF\u4E0E\u5176\u5B83\u53EA\u8BFB\u5DE5\u5177\u5728\u540C\u4E00\u6761\u6D88\u606F\u91CC\u5E76\u884C\u8C03\u7528\u3002",
           parameters: {
             type: "object",
             properties: {
@@ -7666,11 +8200,11 @@ ${body}${tail}` };
               const TS = await getTs();
               if (!TS) return `\u26A0\uFE0F [\u7C7B\u578B\u8BCA\u65AD\u4E0D\u53EF\u7528]\uFF1Atypescript \u6A21\u5757\u672A\u52A0\u8F7D\uFF08VSCode \u6269\u5C55\u5185\u53EF\u7528\uFF1BCLI \u73AF\u5883\u672A\u5FC5\u5B89\u88C5 typescript\uFF09\u3002\u53EF\u6539\u7528 run_command \u8DD1 \`tsc --noEmit\`\u3002`;
               const targets = args.paths && args.paths.length > 0 ? args.paths : args.path ? [args.path] : [];
-              if (targets.length === 0) return `\u274C [\u53C2\u6570\u7F3A\u5931]\uFF1A\u8BF7\u4F20 path\uFF08\u5355\u6587\u4EF6\uFF09\u6216 paths\uFF08\u6279\u91CF\uFF0C\u6539\u5B8C\u591A\u4E2A\u6587\u4EF6\u540E\u4E00\u6B21\u9A8C\u8BC1\uFF09\u3002`;
-              if (targets.length > MAX_DIAG_FILES) return `\u274C [\u53C2\u6570\u8D85\u9650]\uFF1A\u5355\u6B21\u6279\u91CF\u8BCA\u65AD\u6700\u591A ${MAX_DIAG_FILES} \u4E2A\u6587\u4EF6\uFF08\u6536\u5230 ${targets.length} \u4E2A\uFF09\u3002\u8BF7\u5206\u6279\u8C03\u7528\uFF0C\u6216\u7528 run_command \u8DD1 \`tsc --noEmit\` \u505A\u9879\u76EE\u7EA7\u5168\u91CF\u8BCA\u65AD\u3002`;
+              if (targets.length === 0) return toolFailure(`[\u53C2\u6570\u7F3A\u5931]\uFF1A\u8BF7\u4F20 path\uFF08\u5355\u6587\u4EF6\uFF09\u6216 paths\uFF08\u6279\u91CF\uFF0C\u6539\u5B8C\u591A\u4E2A\u6587\u4EF6\u540E\u4E00\u6B21\u9A8C\u8BC1\uFF09\u3002`);
+              if (targets.length > MAX_DIAG_FILES) return toolFailure(`[\u53C2\u6570\u8D85\u9650]\uFF1A\u5355\u6B21\u6279\u91CF\u8BCA\u65AD\u6700\u591A ${MAX_DIAG_FILES} \u4E2A\u6587\u4EF6\uFF08\u6536\u5230 ${targets.length} \u4E2A\uFF09\u3002\u8BF7\u5206\u6279\u8C03\u7528\uFF0C\u6216\u7528 run_command \u8DD1 \`tsc --noEmit\` \u505A\u9879\u76EE\u7EA7\u5168\u91CF\u8BCA\u65AD\u3002`);
               const results = [];
               for (const p of targets) results.push(await diagnoseOneFile(TS, p, args.check_js));
-              if (results.length === 1) return results[0].text;
+              if (results.length === 1) return results[0].ok ? results[0].text : results[0].result;
               let totalErr = 0, totalWarn = 0, clean = 0, failed = 0;
               const sections = [];
               for (let i = 0; i < results.length; i++) {
@@ -7678,7 +8212,7 @@ ${body}${tail}` };
                 if (!r.ok) {
                   failed++;
                   sections.push(`\u2014\u2014 ${targets[i]}\uFF08\u8BCA\u65AD\u672A\u4EA7\u51FA\uFF09\u2014\u2014
-${r.text}`);
+${r.result.content}`);
                   continue;
                 }
                 totalErr += r.errors;
@@ -7691,7 +8225,7 @@ ${r.text}`);
 
 ${sections.join("\n\n")}`;
             } catch (e) {
-              return `\u274C \u7C7B\u578B\u8BCA\u65AD\u5931\u8D25: ${e?.message ?? e}`;
+              return toolFailure(`\u7C7B\u578B\u8BCA\u65AD\u5931\u8D25: ${e?.message ?? e}`);
             }
           }
         }
@@ -7700,7 +8234,8 @@ ${sections.join("\n\n")}`;
         type: "function",
         function: {
           name: "goto_definition",
-          description: "\u8DF3\u8F6C\u5230 TS/JS \u6587\u4EF6\u67D0\u884C\u67D0\u5217\u7B26\u53F7\u7684\u5B9A\u4E49\u4F4D\u7F6E\uFF0C\u8FD4\u56DE rel/path:line:col\uFF08\u53EF\u591A\u5904\uFF09\u3002\u8DE8\u6587\u4EF6\u8FFD\u8E2A\u51FD\u6570/\u7C7B\u578B/\u53D8\u91CF\u7684\u6765\u6E90\uFF0C\u66FF\u4EE3 grep \u731C\u6D4B\u3002\u843D\u70B9\u5728 node_modules/.d.ts \u65F6\u6807\u6CE8 (declaration/library)\u3002\u884C\u5217 1-based\u3002\u652F\u6301 .ts/.tsx/.js/.jsx/.mjs/.cjs\uFF1B.vue SFC \u4E0E\u5176\u4ED6\u8BED\u8A00\u6269\u5C55\u540D\u76F4\u63A5\u62D2\u7EDD\u3001\u52FF\u4F20\u5165\u3002",
+          planAllowed: true,
+          description: "\u8DF3\u8F6C\u5230 TS/JS \u6587\u4EF6\u67D0\u884C\u67D0\u5217\u7B26\u53F7\u7684\u5B9A\u4E49\u4F4D\u7F6E\uFF0C\u8FD4\u56DE rel/path:line:col\uFF08\u53EF\u591A\u5904\uFF09\u3002\u8DE8\u6587\u4EF6\u8FFD\u8E2A\u51FD\u6570/\u7C7B\u578B/\u53D8\u91CF\u7684\u6765\u6E90\uFF0C\u66FF\u4EE3 grep \u731C\u6D4B\u3002\u843D\u70B9\u5728 node_modules/.d.ts \u65F6\u6807\u6CE8 (declaration/library)\u3002\u884C\u5217 1-based\u3002\u652F\u6301 .ts/.tsx/.js/.jsx/.mjs/.cjs\uFF1B.vue SFC \u4E0E\u5176\u4ED6\u8BED\u8A00\u6269\u5C55\u540D\u76F4\u63A5\u62D2\u7EDD\u3001\u52FF\u4F20\u5165\u3002\u2605 \u53EA\u8BFB\u5B89\u5168\uFF0C\u53EF\u4E0E\u5176\u5B83\u53EA\u8BFB\u5DE5\u5177\u5728\u540C\u4E00\u6761\u6D88\u606F\u91CC\u5E76\u884C\u8C03\u7528\u3002",
           parameters: {
             type: "object",
             properties: {
@@ -7724,9 +8259,9 @@ ${sections.join("\n\n")}`;
               if (block) return block;
               const { ls } = await getLanguageService(TS, absPath);
               const program = ls.getProgram();
-              if (!program) return `\u274C \u65E0\u6CD5\u53D6\u5F97 TS program\uFF08\u5185\u90E8\u9519\u8BEF\uFF09\u3002`;
+              if (!program) return toolFailure(`\u65E0\u6CD5\u53D6\u5F97 TS program\uFF08\u5185\u90E8\u9519\u8BEF\uFF09\u3002`);
               const sf = program.getSourceFile(absPath);
-              if (!sf) return `\u274C \u6587\u4EF6\u672A\u7EB3\u5165 program\uFF1A${displayPath}\uFF08\u53EF\u80FD\u65E0\u5BF9\u5E94 tsconfig \u6216\u89E3\u6790\u5931\u8D25\uFF09\u3002`;
+              if (!sf) return toolFailure(`\u6587\u4EF6\u672A\u7EB3\u5165 program\uFF1A${displayPath}\uFF08\u53EF\u80FD\u65E0\u5BF9\u5E94 tsconfig \u6216\u89E3\u6790\u5931\u8D25\uFF09\u3002`);
               const pos = lineColToPos(TS, sf, line, column);
               const defs = ls.getDefinitionAtPosition(absPath, pos);
               if (!defs || defs.length === 0) {
@@ -7748,7 +8283,7 @@ ${sections.join("\n\n")}`;
               return `[Goto Definition: ${displayPath}:${line}:${column}]
 ${out.join("\n")}`;
             } catch (e) {
-              return `\u274C \u8DF3\u8F6C\u5B9A\u4E49\u5931\u8D25 [${displayPath}:${line}:${column}]: ${e?.message ?? e}`;
+              return toolFailure(`\u8DF3\u8F6C\u5B9A\u4E49\u5931\u8D25 [${displayPath}:${line}:${column}]: ${e?.message ?? e}`);
             }
           }
         }
@@ -7757,7 +8292,7 @@ ${out.join("\n")}`;
         type: "function",
         function: {
           name: "find_references",
-          description: "\u67E5\u627E TS/JS \u6587\u4EF6\u67D0\u884C\u67D0\u5217\u7B26\u53F7\u7684\u5168\u9879\u76EE\u5F15\u7528\uFF08\u8C03\u7528/\u5BFC\u5165/\u8BFB\u5199\uFF09\uFF0C\u8F93\u51FA rel/path:line:col + \u8BFB\u5199\u6807\u6CE8 + \u884C\u6458\u5F55\u3002\u7C7B\u578B\u611F\u77E5\uFF1A\u53EA\u8FD4\u56DE\u771F\u5B9E\u7ED1\u5B9A\uFF0C\u4E0D\u542B\u6CE8\u91CA/\u5B57\u7B26\u4E32\u91CC\u7684\u540C\u540D\u8BCD\uFF08grep \u6838\u5FC3\u8BEF\u62A5\u6E90\uFF09\u3002\u7528\u4E8E\u6539\u7B7E\u540D/\u91CD\u547D\u540D\u524D\u7684\u5F71\u54CD\u9762\u6392\u67E5\u3001\u8FFD\u8E2A\u8C03\u7528\u65B9\uFF1B\u4E0E goto_definition \u4E92\u4E3A\u53CD\u5411\u3002\u8986\u76D6\u4EE5 program \u5185\u6587\u4EF6\u4E3A\u754C\uFF08tsconfig include + import \u94FE\uFF09\uFF1B\u5355\u7B26\u53F7\u8D85 200 \u5904\u5F15\u7528\u622A\u65AD\u3002\u884C\u5217 1-based\u3002\u652F\u6301 .ts/.tsx/.js/.jsx/.mjs/.cjs\uFF1B.vue SFC \u4E0E\u5176\u4ED6\u8BED\u8A00\u6269\u5C55\u540D\u76F4\u63A5\u62D2\u7EDD\u3001\u52FF\u4F20\u5165\u3002",
+          description: "\u67E5\u627E TS/JS \u6587\u4EF6\u67D0\u884C\u67D0\u5217\u7B26\u53F7\u7684\u5168\u9879\u76EE\u5F15\u7528\uFF08\u8C03\u7528/\u5BFC\u5165/\u8BFB\u5199\uFF09\uFF0C\u8F93\u51FA rel/path:line:col + \u8BFB\u5199\u6807\u6CE8 + \u884C\u6458\u5F55\u3002\u7C7B\u578B\u611F\u77E5\uFF1A\u53EA\u8FD4\u56DE\u771F\u5B9E\u7ED1\u5B9A\uFF0C\u4E0D\u542B\u6CE8\u91CA/\u5B57\u7B26\u4E32\u91CC\u7684\u540C\u540D\u8BCD\uFF08grep \u6838\u5FC3\u8BEF\u62A5\u6E90\uFF09\u3002\u7528\u4E8E\u6539\u7B7E\u540D/\u91CD\u547D\u540D\u524D\u7684\u5F71\u54CD\u9762\u6392\u67E5\u3001\u8FFD\u8E2A\u8C03\u7528\u65B9\uFF1B\u4E0E goto_definition \u4E92\u4E3A\u53CD\u5411\u3002\u8986\u76D6\u4EE5 program \u5185\u6587\u4EF6\u4E3A\u754C\uFF08tsconfig include + import \u94FE\uFF09\uFF1B\u5355\u7B26\u53F7\u8D85 200 \u5904\u5F15\u7528\u622A\u65AD\u3002\u884C\u5217 1-based\u3002\u652F\u6301 .ts/.tsx/.js/.jsx/.mjs/.cjs\uFF1B.vue SFC \u4E0E\u5176\u4ED6\u8BED\u8A00\u6269\u5C55\u540D\u76F4\u63A5\u62D2\u7EDD\u3001\u52FF\u4F20\u5165\u3002\u2605 \u53EA\u8BFB\u5B89\u5168\uFF0C\u53EF\u4E0E\u5176\u5B83\u53EA\u8BFB\u5DE5\u5177\u5728\u540C\u4E00\u6761\u6D88\u606F\u91CC\u5E76\u884C\u8C03\u7528\u3002",
           parameters: {
             type: "object",
             properties: {
@@ -7783,9 +8318,9 @@ ${out.join("\n")}`;
               if (block) return block;
               const { ls } = await getLanguageService(TS, absPath);
               const program = ls.getProgram();
-              if (!program) return `\u274C \u65E0\u6CD5\u53D6\u5F97 TS program\uFF08\u5185\u90E8\u9519\u8BEF\uFF09\u3002`;
+              if (!program) return toolFailure(`\u65E0\u6CD5\u53D6\u5F97 TS program\uFF08\u5185\u90E8\u9519\u8BEF\uFF09\u3002`);
               const sf = program.getSourceFile(absPath);
-              if (!sf) return `\u274C \u6587\u4EF6\u672A\u7EB3\u5165 program\uFF1A${displayPath}\uFF08\u53EF\u80FD\u65E0\u5BF9\u5E94 tsconfig \u6216\u89E3\u6790\u5931\u8D25\uFF09\u3002`;
+              if (!sf) return toolFailure(`\u6587\u4EF6\u672A\u7EB3\u5165 program\uFF1A${displayPath}\uFF08\u53EF\u80FD\u65E0\u5BF9\u5E94 tsconfig \u6216\u89E3\u6790\u5931\u8D25\uFF09\u3002`);
               const pos = lineColToPos(TS, sf, line, column);
               const groups = ls.findReferences(absPath, pos);
               if (!groups || groups.length === 0) {
@@ -7839,7 +8374,7 @@ ${out.join("\n")}`;
               return `[References: ${displayPath}:${line}:${column}]
 ${sections.join("\n")}${tail}`;
             } catch (e) {
-              return `\u274C \u67E5\u627E\u5F15\u7528\u5931\u8D25 [${displayPath}:${line}:${column}]: ${e?.message ?? e}`;
+              return toolFailure(`\u67E5\u627E\u5F15\u7528\u5931\u8D25 [${displayPath}:${line}:${column}]: ${e?.message ?? e}`);
             }
           }
         }
@@ -7887,11 +8422,11 @@ var init_todo = __esm({
           isSync: true,
           async execute(args, ctx) {
             if (!ctx?.sessionId) {
-              return `\u274C [todo_write \u5931\u8D25]\uFF1A\u7F3A\u5C11\u4F1A\u8BDD\u4E0A\u4E0B\u6587\uFF08sessionId\uFF09\uFF0C\u65E0\u6CD5\u6301\u4E45\u5316\u4EFB\u52A1\u6E05\u5355\u3002`;
+              return toolFailure(`[todo_write \u5931\u8D25]\uFF1A\u7F3A\u5C11\u4F1A\u8BDD\u4E0A\u4E0B\u6587\uFF08sessionId\uFF09\uFF0C\u65E0\u6CD5\u6301\u4E45\u5316\u4EFB\u52A1\u6E05\u5355\u3002`);
             }
             const todos = Array.isArray(args.todos) ? args.todos : [];
             if (todos.length > MAX_TODOS) {
-              return `\u274C [todo_write \u5931\u8D25]\uFF1A\u4EFB\u52A1\u6761\u6570 ${todos.length} \u8D85\u8FC7\u4E0A\u9650 ${MAX_TODOS}\uFF0C\u8BF7\u5408\u7406\u62C6\u5206\u3002`;
+              return toolFailure(`[todo_write \u5931\u8D25]\uFF1A\u4EFB\u52A1\u6761\u6570 ${todos.length} \u8D85\u8FC7\u4E0A\u9650 ${MAX_TODOS}\uFF0C\u8BF7\u5408\u7406\u62C6\u5206\u3002`);
             }
             const cleaned = todos.map((t) => {
               const item = {
@@ -7904,7 +8439,7 @@ var init_todo = __esm({
             });
             const emptyContent = cleaned.filter((t) => !t.content);
             if (emptyContent.length) {
-              return `\u274C [todo_write \u5931\u8D25]\uFF1A\u6709 ${emptyContent.length} \u6761\u4EFB\u52A1\u7F3A\u5C11 content\uFF0C\u8BF7\u8865\u5168\u540E\u518D\u63D0\u4EA4\u3002`;
+              return toolFailure(`[todo_write \u5931\u8D25]\uFF1A\u6709 ${emptyContent.length} \u6761\u4EFB\u52A1\u7F3A\u5C11 content\uFF0C\u8BF7\u8865\u5168\u540E\u518D\u63D0\u4EA4\u3002`);
             }
             const inProgressCount = cleaned.filter((t) => t.status === "in_progress").length;
             const completedCount = cleaned.filter((t) => t.status === "completed").length;
@@ -8343,11 +8878,8 @@ var init_cleanup = __esm({
 import fs22 from "fs/promises";
 import path26 from "path";
 import crypto from "crypto";
-async function beforeMutationBackup(toolName, args, toolCallId, sessionId) {
+async function beforeMutationBackup(strategy, toolName, args, toolCallId, sessionId) {
   if (appConfig.undoEnabled === false) return null;
-  if (!MUTATION_TOOLS.has(toolName)) {
-    throw new Error(`[undo] \u4E0D\u5728\u53D8\u66F4\u5DE5\u5177\u540D\u5355: ${toolName}`);
-  }
   const relativePath = String(args?.path ?? "").replace(/\\/g, "/");
   if (relativePath && isSensitivePath(relativePath)) {
     const policy = appConfig.undoBackupSensitive ?? "skip";
@@ -8368,20 +8900,18 @@ async function beforeMutationBackup(toolName, args, toolCallId, sessionId) {
     bornDate: getTodayDateString()
   };
   let record;
-  switch (toolName) {
-    case "edit_file":
-    case "write_file":
-    case "notebook_edit":
+  switch (strategy) {
+    case "overwrite":
       record = await backupFileOverwrite(common, undoDir, args);
       break;
-    case "create_file":
+    case "create":
       record = await backupFileCreate(common);
       break;
-    case "delete_path":
+    case "delete":
       record = await backupDelete(common, undoDir, relativePath);
       break;
     default:
-      throw new Error(`[undo] \u672A\u77E5\u5DE5\u5177: ${toolName}`);
+      throw new Error(`[undo] \u672A\u77E5\u5907\u4EFD\u7B56\u7565: ${strategy}`);
   }
   await appendUndoRecord(record, sessionId);
   void maybeCleanupAfterUndoAppend(sessionId);
@@ -8415,8 +8945,9 @@ async function backupFileOverwrite(common, undoDir, args) {
     contentHashBefore: sha1Buf(content),
     fileSizeBefore: content.byteLength,
     argsSnapshot: {
-      old_str: common.operationType === "edit_file" ? truncate2(args?.old_str) : void 0,
-      new_str: common.operationType === "edit_file" ? truncate2(args?.new_str) : void 0,
+      // ★ #8a：原按 operationType==='edit_file' 特判，改按参数存在性判定——行为不变，泛化到任何声明式 overwrite 写工具
+      old_str: typeof args?.old_str === "string" ? truncate2(args.old_str) : void 0,
+      new_str: typeof args?.new_str === "string" ? truncate2(args.new_str) : void 0,
       contentLength: typeof args?.content === "string" ? args.content.length : void 0
     }
   };
@@ -8478,7 +9009,7 @@ async function backupDelete(common, undoDir, relativePath) {
     fileSizeBefore: content.byteLength
   };
 }
-var MUTATION_TOOLS, isUndoTrigger, sha1Buf, truncate2, isSensitivePath, hashTreeManifest, getDirTreeBytes, collectSensitiveInDir;
+var sha1Buf, truncate2, isSensitivePath, hashTreeManifest, getDirTreeBytes, collectSensitiveInDir;
 var init_backup = __esm({
   "../core/src/tool/undo/backup.ts"() {
     "use strict";
@@ -8489,8 +9020,6 @@ var init_backup = __esm({
     init_undo();
     init_cleanup();
     init_traceCalculate();
-    MUTATION_TOOLS = /* @__PURE__ */ new Set(["edit_file", "write_file", "create_file", "delete_path", "notebook_edit"]);
-    isUndoTrigger = (toolName) => MUTATION_TOOLS.has(toolName);
     sha1Buf = (buf) => crypto.createHash("sha1").update(buf).digest("hex");
     truncate2 = (s, n = 200) => s === void 0 ? void 0 : s.length > n ? s.slice(0, n) + "\u2026" : s;
     isSensitivePath = (rel) => {
@@ -8760,7 +9289,7 @@ var init_undo2 = __esm({
           safetyLevel: "safe" /* SAFE */,
           isSync: true,
           async execute(_args, ctx) {
-            if (!ctx?.sessionId) return `\u274C [undo_list \u5931\u8D25]\uFF1A\u7F3A\u5C11\u4F1A\u8BDD\u4E0A\u4E0B\u6587\u3002`;
+            if (!ctx?.sessionId) return toolFailure(`[undo_list \u5931\u8D25]\uFF1A\u7F3A\u5C11\u4F1A\u8BDD\u4E0A\u4E0B\u6587\u3002`);
             const list = await listUndoable(ctx.sessionId);
             if (!list.length) return `\uFF08\u5F53\u524D\u4F1A\u8BDD\u6CA1\u6709\u53EF\u56DE\u9000\u7684\u53D8\u66F4\u3002\uFF09`;
             const lines = list.map(
@@ -8789,15 +9318,15 @@ ${lines.join("\n")}
           isSync: true,
           requireApproval: (args) => args?.restore_last ? `\u7533\u8BF7\u56DE\u9000\u6700\u8FD1\u4E00\u6B21\u6587\u4EF6\u53D8\u66F4\uFF08restore_last\uFF09\u3002\u8BE5\u64CD\u4F5C\u4F1A\u6539\u5199\u78C1\u76D8\u6587\u4EF6\u3002` : `\u7533\u8BF7\u56DE\u9000\u6587\u4EF6\u53D8\u66F4\uFF08undoId=${String(args?.undoId ?? "").slice(0, 8)}\uFF09\u3002\u8BE5\u64CD\u4F5C\u4F1A\u6539\u5199\u78C1\u76D8\u6587\u4EF6\u3002`,
           async execute(args, ctx) {
-            if (!ctx?.sessionId) return `\u274C [undo_restore \u5931\u8D25]\uFF1A\u7F3A\u5C11\u4F1A\u8BDD\u4E0A\u4E0B\u6587\u3002`;
+            if (!ctx?.sessionId) return toolFailure(`[undo_restore \u5931\u8D25]\uFF1A\u7F3A\u5C11\u4F1A\u8BDD\u4E0A\u4E0B\u6587\u3002`);
             try {
               if (args?.restore_last) return await restoreLast(ctx.sessionId);
-              if (!args?.undoId) return `\u274C [undo_restore \u5931\u8D25]\uFF1A\u9700\u63D0\u4F9B undoId\uFF0C\u6216\u8BBE restore_last=true\u3002`;
+              if (!args?.undoId) return toolFailure(`[undo_restore \u5931\u8D25]\uFF1A\u9700\u63D0\u4F9B undoId\uFF0C\u6216\u8BBE restore_last=true\u3002`);
               const target = await findByUndoIdPrefix(ctx.sessionId, String(args.undoId));
-              if (!target) return `\u274C [undo_restore \u5931\u8D25]\uFF1A\u627E\u4E0D\u5230 undoId \u524D\u7F00 "${args.undoId}" \u5BF9\u5E94\u7684\u8BB0\u5F55\uFF0C\u8BF7\u7528 undo_list \u6838\u5BF9\u3002`;
+              if (!target) return toolFailure(`[undo_restore \u5931\u8D25]\uFF1A\u627E\u4E0D\u5230 undoId \u524D\u7F00 "${args.undoId}" \u5BF9\u5E94\u7684\u8BB0\u5F55\uFF0C\u8BF7\u7528 undo_list \u6838\u5BF9\u3002`);
               return await restoreByUndoId(target.undoId, ctx.sessionId);
             } catch (e) {
-              return `\u274C [undo_restore \u5931\u8D25]\uFF1A${e?.message ?? e}`;
+              return toolFailure(`[undo_restore \u5931\u8D25]\uFF1A${e?.message ?? e}`);
             }
           }
         }
@@ -8850,10 +9379,10 @@ var init_ask = __esm({
             const question = (args?.question ?? "").trim();
             const options = Array.isArray(args?.options) ? args.options : [];
             const cleanOptions = options.map((o) => ({ label: String(o?.label ?? "").trim(), description: o?.description ? String(o.description).trim() : void 0 })).filter((o) => o.label);
-            if (!question) return "\u274C [\u63D0\u95EE\u5931\u8D25]\uFF1Aquestion \u4E0D\u80FD\u4E3A\u7A7A\u3002";
-            if (cleanOptions.length < 2 || cleanOptions.length > 4) return "\u274C [\u63D0\u95EE\u5931\u8D25]\uFF1Aoptions \u987B\u4E3A 2-4 \u4E2A\u975E\u7A7A\u9009\u9879\u3002";
+            if (!question) return toolFailure("[\u63D0\u95EE\u5931\u8D25]\uFF1Aquestion \u4E0D\u80FD\u4E3A\u7A7A\u3002");
+            if (cleanOptions.length < 2 || cleanOptions.length > 4) return toolFailure("[\u63D0\u95EE\u5931\u8D25]\uFF1Aoptions \u987B\u4E3A 2-4 \u4E2A\u975E\u7A7A\u9009\u9879\u3002");
             if (!ctx?.requestQuestion) {
-              return "\u26A0\uFE0F [\u63D0\u95EE\u4E0D\u652F\u6301]\uFF1A\u5F53\u524D\u5BBF\u4E3B\u4E0D\u652F\u6301\u7ED3\u6784\u5316\u63D0\u95EE\uFF08\u591A\u4E3A\u975E\u4EA4\u4E92\u73AF\u5883\uFF09\u3002\u8BF7\u6539\u7528\u7EAF\u6587\u672C\u76F4\u63A5\u5411\u7528\u6237\u5217\u51FA\u9009\u9879\u5E76\u63D0\u95EE\u3002";
+              return toolFailure("[\u63D0\u95EE\u4E0D\u652F\u6301]\uFF1A\u5F53\u524D\u5BBF\u4E3B\u4E0D\u652F\u6301\u7ED3\u6784\u5316\u63D0\u95EE\uFF08\u591A\u4E3A\u975E\u4EA4\u4E92\u73AF\u5883\uFF09\u3002\u8BF7\u6539\u7528\u7EAF\u6587\u672C\u76F4\u63A5\u5411\u7528\u6237\u5217\u51FA\u9009\u9879\u5E76\u63D0\u95EE\u3002");
             }
             let answer;
             try {
@@ -8863,7 +9392,7 @@ var init_ask = __esm({
                 multiSelect: !!args?.multiSelect
               });
             } catch (e) {
-              return `\u274C [\u63D0\u95EE\u5F02\u5E38]\uFF1A${e?.message ?? e}\u3002\u8BF7\u6539\u7528\u7EAF\u6587\u672C\u5411\u7528\u6237\u63D0\u95EE\u3002`;
+              return toolFailure(`[\u63D0\u95EE\u5F02\u5E38]\uFF1A${e?.message ?? e}\u3002\u8BF7\u6539\u7528\u7EAF\u6587\u672C\u5411\u7528\u6237\u63D0\u95EE\u3002`);
             }
             if (!answer.selected || answer.selected.length === 0) {
               return "\uFF08\u7528\u6237\u53D6\u6D88\u4E86\u672C\u6B21\u63D0\u95EE\uFF0C\u672A\u4F5C\u9009\u62E9\u3002\u53EF\u6309\u9ED8\u8BA4\u7EE7\u7EED\uFF0C\u6216\u91CD\u65B0\u7EC4\u7EC7\u95EE\u9898\u518D\u6B21\u8BE2\u95EE\u3002\uFF09";
@@ -8904,7 +9433,7 @@ var init_worktree = __esm({
 \uFF08\u5C06\u521B\u5EFA\u4E34\u65F6\u5206\u652F\u7684 git worktree \u5E76\u628A\u4F1A\u8BDD\u5DE5\u4F5C\u533A\u5207\u6362\u8FC7\u53BB\uFF1B\u6539\u52A8\u9694\u79BB\uFF0C\u9700 commit/merge \u624D\u80FD\u5E76\u56DE\u4E3B\u4ED3\uFF09`,
           async execute(args, ctx) {
             const sessionId = ctx?.sessionId;
-            if (!sessionId) return "\u274C [enter_worktree] \u7F3A\u5C11\u4F1A\u8BDD\u4E0A\u4E0B\u6587\uFF08sessionId\uFF09\u3002";
+            if (!sessionId) return toolFailure("[enter_worktree] \u7F3A\u5C11\u4F1A\u8BDD\u4E0A\u4E0B\u6587\uFF08sessionId\uFF09\u3002");
             if (getSessionWorktree(sessionId)) {
               return `\u26A0\uFE0F \u5F53\u524D\u4F1A\u8BDD\u5DF2\u5728 worktree \u5185\uFF08${getSessionWorktree(sessionId)?.path}\uFF09\u3002\u8BF7\u5148 exit_worktree \u518D\u91CD\u65B0\u8FDB\u5165\uFF0C\u907F\u514D\u6CC4\u6F0F\u3002`;
             }
@@ -8912,8 +9441,8 @@ var init_worktree = __esm({
             try {
               wt = await createWorktree(sessionId, "session");
             } catch (e) {
-              if (isNotARepoError(e)) return "\u274C [enter_worktree] \u4E3B\u5DE5\u4F5C\u533A\u4E0D\u662F git \u4ED3\u5E93\uFF0C\u65E0\u6CD5\u521B\u5EFA worktree\u3002";
-              return `\u274C [enter_worktree] \u521B\u5EFA worktree \u5931\u8D25\uFF1A${e?.message ?? e}`;
+              if (isNotARepoError(e)) return toolFailure("[enter_worktree] \u4E3B\u5DE5\u4F5C\u533A\u4E0D\u662F git \u4ED3\u5E93\uFF0C\u65E0\u6CD5\u521B\u5EFA worktree\u3002");
+              return toolFailure(`[enter_worktree] \u521B\u5EFA worktree \u5931\u8D25\uFF1A${e?.message ?? e}`);
             }
             setSessionWorktree(sessionId, wt);
             return [
@@ -8942,7 +9471,7 @@ var init_worktree = __esm({
 \uFF08\u5C06\u5220\u9664\u5F53\u524D worktree \u53CA\u5176\u4E34\u65F6\u5206\u652F\uFF1B\u672A\u63D0\u4EA4\u6539\u52A8\u4F1A\u4E22\u5931\u3002\u5982\u9700\u4FDD\u7559\u8BF7\u5148 commit\u3002\uFF09`,
           async execute(_args, ctx) {
             const sessionId = ctx?.sessionId;
-            if (!sessionId) return "\u274C [exit_worktree] \u7F3A\u5C11\u4F1A\u8BDD\u4E0A\u4E0B\u6587\uFF08sessionId\uFF09\u3002";
+            if (!sessionId) return toolFailure("[exit_worktree] \u7F3A\u5C11\u4F1A\u8BDD\u4E0A\u4E0B\u6587\uFF08sessionId\uFF09\u3002");
             const wt = clearSessionWorktree(sessionId);
             if (!wt) return "\u2139\uFE0F \u5F53\u524D\u4F1A\u8BDD\u4E0D\u5728\u4EFB\u4F55 worktree \u5185\uFF08\u65E0\u9700\u9000\u51FA\uFF09\u3002";
             const diff = await harvestDiff(wt).catch(() => "");
@@ -9049,6 +9578,9 @@ var init_notebook = __esm({
         type: "function",
         function: {
           name: "notebook_edit",
+          // ★ #8a：undo 备份同 edit_file（快照原内容）；刻意不声明 autoApproval——维持「分类器不覆盖、恒人工审批」现状
+          triggersUndo: "overwrite",
+          primaryArg: "path",
           description: "\u7F16\u8F91 Jupyter notebook\uFF08.ipynb\uFF09\u7684\u5355\u5143\u683C\u3002\u652F\u6301\u4E09\u79CD\u6A21\u5F0F\uFF1Areplace\uFF08\u66FF\u6362\u67D0 cell \u5185\u5BB9/\u7C7B\u578B\uFF09\u3001insert\uFF08\u63D2\u5165\u65B0 cell\uFF09\u3001delete\uFF08\u5220\u9664 cell\uFF09\u3002\u7528 cell_id \u6216 cell_index \u5B9A\u4F4D\u3002\u4EC5\u652F\u6301 .ipynb \u6587\u4EF6\u3002",
           parameters: {
             type: "object",
@@ -9071,28 +9603,28 @@ var init_notebook = __esm({
 ${String(args.new_source).slice(0, 500)}` : ""}`,
           async execute(args) {
             const relPath = args?.path;
-            if (typeof relPath !== "string" || !relPath.trim()) return "\u274C [notebook_edit] \u7F3A\u5C11\u53C2\u6570 path\u3002";
-            if (!relPath.toLowerCase().endsWith(".ipynb")) return `\u274C [notebook_edit] \u4EC5\u652F\u6301 .ipynb \u6587\u4EF6\uFF1A${relPath}`;
+            if (typeof relPath !== "string" || !relPath.trim()) return toolFailure("[notebook_edit] \u7F3A\u5C11\u53C2\u6570 path\u3002");
+            if (!relPath.toLowerCase().endsWith(".ipynb")) return toolFailure(`[notebook_edit] \u4EC5\u652F\u6301 .ipynb \u6587\u4EF6\uFF1A${relPath}`);
             const edit_mode = args?.edit_mode === "insert" || args?.edit_mode === "delete" ? args.edit_mode : "replace";
             let absPath;
             try {
               absPath = resolveSafePath(relPath);
             } catch (e) {
-              return `\u274C [notebook_edit] \u8DEF\u5F84\u89E3\u6790\u5931\u8D25\uFF1A${e?.message ?? e}`;
+              return toolFailure(`[notebook_edit] \u8DEF\u5F84\u89E3\u6790\u5931\u8D25\uFF1A${e?.message ?? e}`);
             }
             let raw;
             try {
               raw = await fs24.readFile(absPath, "utf-8");
             } catch (e) {
-              return `\u274C [notebook_edit] \u8BFB\u53D6\u5931\u8D25\uFF1A${e?.message ?? e}`;
+              return toolFailure(`[notebook_edit] \u8BFB\u53D6\u5931\u8D25\uFF1A${e?.message ?? e}`);
             }
             let nb;
             try {
               nb = JSON.parse(raw);
             } catch (e) {
-              return `\u274C [notebook_edit] JSON \u89E3\u6790\u5931\u8D25\uFF08\u975E\u5408\u6CD5 .ipynb\uFF09\uFF1A${e?.message ?? e}`;
+              return toolFailure(`[notebook_edit] JSON \u89E3\u6790\u5931\u8D25\uFF08\u975E\u5408\u6CD5 .ipynb\uFF09\uFF1A${e?.message ?? e}`);
             }
-            if (!nb || !Array.isArray(nb.cells)) return "\u274C [notebook_edit] \u975E\u5408\u6CD5 notebook\uFF08\u7F3A cells \u6570\u7EC4\uFF09\u3002";
+            if (!nb || !Array.isArray(nb.cells)) return toolFailure("[notebook_edit] \u975E\u5408\u6CD5 notebook\uFF08\u7F3A cells \u6570\u7EC4\uFF09\u3002");
             let summary;
             try {
               summary = applyNotebookEdit(nb, {
@@ -9103,12 +9635,12 @@ ${String(args.new_source).slice(0, 500)}` : ""}`,
                 edit_mode
               });
             } catch (e) {
-              return `\u274C [notebook_edit] ${e?.message ?? e}`;
+              return toolFailure(`[notebook_edit] ${e?.message ?? e}`);
             }
             try {
               assertWithinWorkspace(absPath);
             } catch (e) {
-              return `\u274C [notebook_edit] \u4E8C\u6B21\u56F4\u680F\u590D\u68C0\u5931\u8D25\uFF1A${e?.message ?? e}`;
+              return toolFailure(`[notebook_edit] \u4E8C\u6B21\u56F4\u680F\u590D\u68C0\u5931\u8D25\uFF1A${e?.message ?? e}`);
             }
             const tmpPath = makeTmpPath(absPath);
             try {
@@ -9117,7 +9649,7 @@ ${String(args.new_source).slice(0, 500)}` : ""}`,
             } catch (e) {
               await fs24.unlink(tmpPath).catch(() => {
               });
-              return `\u274C [notebook_edit] \u5199\u5165\u5931\u8D25\uFF1A${e?.message ?? e}`;
+              return toolFailure(`[notebook_edit] \u5199\u5165\u5931\u8D25\uFF1A${e?.message ?? e}`);
             }
             return `\u2705 [notebook_edit] ${summary}\uFF08${relPath}\uFF09`;
           }
@@ -9225,10 +9757,41 @@ var init_loader3 = __esm({
   }
 });
 
-// ../core/src/tool/registry/memory.ts
+// ../core/src/memory/usage.ts
 import fs26 from "fs/promises";
 import path29 from "path";
-var MAX_BODY_BYTES, NAME_RE, VALID_TYPES2, memoryFilePath, sanitizeLine, buildMemoryMd, writeAndRegister, memoryTools;
+var USAGE_FILE, readUsage, recordMemoryUse;
+var init_usage = __esm({
+  "../core/src/memory/usage.ts"() {
+    "use strict";
+    init_loader3();
+    init_common();
+    USAGE_FILE = path29.join(GLOBAL_MEMORY_DIR, ".usage.json");
+    readUsage = async () => {
+      const raw = await readJSONFile(USAGE_FILE);
+      return raw && typeof raw === "object" && !Array.isArray(raw) ? raw : {};
+    };
+    recordMemoryUse = async (name, kind) => {
+      try {
+        const map = await readUsage();
+        const prev = map[name];
+        map[name] = {
+          lastUsed: (/* @__PURE__ */ new Date()).toISOString(),
+          reads: (prev?.reads ?? 0) + (kind === "read" ? 1 : 0)
+        };
+        await fs26.mkdir(GLOBAL_MEMORY_DIR, { recursive: true });
+        await fs26.writeFile(USAGE_FILE, JSON.stringify(map, null, 2), "utf-8");
+      } catch (e) {
+        console.warn(`\u26A0\uFE0F [memory] \u4F7F\u7528\u753B\u50CF\u8BB0\u5F55\u5931\u8D25\uFF08\u5DF2\u5FFD\u7565\uFF09: ${e?.message ?? e}`);
+      }
+    };
+  }
+});
+
+// ../core/src/tool/registry/memory.ts
+import fs27 from "fs/promises";
+import path30 from "path";
+var MAX_BODY_BYTES, MAX_DESCRIPTION_CHARS, MEMORY_LIMITS, NAME_RE, VALID_TYPES2, memoryFilePath, sanitizeLine, buildMemoryMd, writeAndRegister, indexLineBytes, memoryTools;
 var init_memory = __esm({
   "../core/src/tool/registry/memory.ts"() {
     "use strict";
@@ -9236,10 +9799,13 @@ var init_memory = __esm({
     init_fs();
     init_loader3();
     init_registry6();
+    init_usage();
     MAX_BODY_BYTES = 64 * 1024;
+    MAX_DESCRIPTION_CHARS = 200;
+    MEMORY_LIMITS = { maxCount: 200, maxIndexBytes: 16 * 1024 };
     NAME_RE = /^[a-z0-9-]+$/;
     VALID_TYPES2 = ["user", "feedback", "project", "reference"];
-    memoryFilePath = (name, project) => project ? path29.join(process.cwd(), ".deepseeker-code", "memory", `${name}.md`) : path29.join(GLOBAL_MEMORY_DIR, `${name}.md`);
+    memoryFilePath = (name, project) => project ? path30.join(process.cwd(), ".deepseeker-code", "memory", `${name}.md`) : path30.join(GLOBAL_MEMORY_DIR, `${name}.md`);
     sanitizeLine = (s) => String(s ?? "").replace(/[\r\n]+/g, " ").trim();
     buildMemoryMd = (name, description, type, body) => `---
 name: ${name}
@@ -9251,13 +9817,14 @@ ${body.trim()}
 `;
     writeAndRegister = async (name, description, type, body, project) => {
       const file = memoryFilePath(name, project);
-      await fs26.mkdir(path29.dirname(file), { recursive: true });
+      await fs27.mkdir(path30.dirname(file), { recursive: true });
       const tmp = makeTmpPath(file);
-      await fs26.writeFile(tmp, buildMemoryMd(name, description, type, body), "utf-8");
-      await fs26.rename(tmp, file);
+      await fs27.writeFile(tmp, buildMemoryMd(name, description, type, body), "utf-8");
+      await fs27.rename(tmp, file);
       registerMemory({ name, description, type, body: body.trim(), source: project ? "project" : "global", file });
       return file;
     };
+    indexLineBytes = (m) => Buffer.byteLength(memoryIndexLine(m), "utf-8");
     memoryTools = [
       {
         type: "function",
@@ -9273,7 +9840,7 @@ ${body.trim()}
               },
               description: {
                 type: "string",
-                description: "\u4E00\u53E5\u8BDD\u6982\u62EC\uFF08\u6CE8\u5165\u7D22\u5F15\u4F9B\u65E5\u540E\u5224\u65AD\u662F\u5426\u53EC\u56DE\uFF09\u3002\u52FF\u6362\u884C"
+                description: "\u4E00\u53E5\u8BDD\u6982\u62EC\uFF08\u6CE8\u5165\u7D22\u5F15\u4F9B\u65E5\u540E\u5224\u65AD\u662F\u5426\u53EC\u56DE\uFF09\u3002\u52FF\u6362\u884C\uFF0C\u4E0A\u9650 200 \u5B57\u7B26"
               },
               body: {
                 type: "string",
@@ -9299,13 +9866,25 @@ ${body.trim()}
             const body = typeof args?.body === "string" ? args.body : "";
             const type = sanitizeLine(args?.type) || "reference";
             const project = args?.project === true;
-            if (!NAME_RE.test(name)) return `\u274C [memory_save] name \u975E\u6CD5\uFF1A\u4EC5\u5141\u8BB8\u5C0F\u5199\u5B57\u6BCD/\u6570\u5B57/\u8FDE\u5B57\u7B26\uFF0C\u6536\u5230 "${name}"\u3002`;
-            if (!description) return "\u274C [memory_save] description \u4E0D\u80FD\u4E3A\u7A7A\u3002";
-            if (!body.trim()) return "\u274C [memory_save] body \u4E0D\u80FD\u4E3A\u7A7A\u3002";
-            if (!VALID_TYPES2.includes(type)) return `\u274C [memory_save] type \u975E\u6CD5\uFF1A\u987B user/feedback/project/reference\uFF0C\u6536\u5230 "${type}"\u3002`;
+            if (!NAME_RE.test(name)) return toolFailure(`[memory_save] name \u975E\u6CD5\uFF1A\u4EC5\u5141\u8BB8\u5C0F\u5199\u5B57\u6BCD/\u6570\u5B57/\u8FDE\u5B57\u7B26\uFF0C\u6536\u5230 "${name}"\u3002`);
+            if (!description) return toolFailure("[memory_save] description \u4E0D\u80FD\u4E3A\u7A7A\u3002");
+            if (description.length > MAX_DESCRIPTION_CHARS) return toolFailure(`[memory_save] description \u8D85\u8FC7 ${MAX_DESCRIPTION_CHARS} \u5B57\u7B26\u4E0A\u9650\uFF08\u5F53\u524D ${description.length}\uFF09\u3002\u8BF7\u538B\u7F29\u4E3A\u4E00\u53E5\u8BDD\u3002`);
+            if (!body.trim()) return toolFailure("[memory_save] body \u4E0D\u80FD\u4E3A\u7A7A\u3002");
+            if (!VALID_TYPES2.includes(type)) return toolFailure(`[memory_save] type \u975E\u6CD5\uFF1A\u987B user/feedback/project/reference\uFF0C\u6536\u5230 "${type}"\u3002`);
             const bodyBytes = Buffer.byteLength(body, "utf-8");
-            if (bodyBytes > MAX_BODY_BYTES) return `\u274C [memory_save] body \u8D85\u8FC7 ${MAX_BODY_BYTES} \u5B57\u8282\u4E0A\u9650\uFF08\u5F53\u524D ${bodyBytes}\uFF09\u3002\u8BF7\u7CBE\u7B80\u6216\u62C6\u5206\u3002`;
+            if (bodyBytes > MAX_BODY_BYTES) return toolFailure(`[memory_save] body \u8D85\u8FC7 ${MAX_BODY_BYTES} \u5B57\u8282\u4E0A\u9650\uFF08\u5F53\u524D ${bodyBytes}\uFF09\u3002\u8BF7\u7CBE\u7B80\u6216\u62C6\u5206\u3002`);
+            const all = listMemories();
+            const existing = getMemory(name);
+            if (!existing && all.length >= MEMORY_LIMITS.maxCount) {
+              return toolFailure(`[memory_save] \u8BB0\u5FC6\u6761\u6570\u5DF2\u8FBE\u4E0A\u9650 ${MEMORY_LIMITS.maxCount}\uFF08\u73B0\u6709 ${all.length} \u6761\uFF09\u3002\u7D22\u5F15\u6BCF\u8F6E\u6CE8\u5165\u7CFB\u7EDF\u63D0\u793A\u8BCD\uFF0C\u53EA\u589E\u4E0D\u51CF\u4F1A\u6301\u7EED\u4FB5\u8680\u4E0A\u4E0B\u6587\u2014\u2014\u8BF7\u5148 memory_list \u68C0\u67E5\uFF0C\u7528 memory_delete \u6E05\u7406\u5931\u6548\u6761\u76EE\u6216\u5408\u5E76\u76F8\u8FD1\u8BB0\u5FC6\u540E\u518D\u4FDD\u5B58\u3002`);
+            }
+            const curBytes = all.length === 0 ? 0 : Buffer.byteLength(all.map(memoryIndexLine).join("\n"), "utf-8");
+            const delta = indexLineBytes({ name, type, description }) - (existing ? indexLineBytes(existing) : 0);
+            if (delta > 0 && curBytes + delta > MEMORY_LIMITS.maxIndexBytes) {
+              return toolFailure(`[memory_save] \u8BB0\u5FC6\u7D22\u5F15\u5C06\u8D85\u5B57\u8282\u4E0A\u9650\uFF08\u5F53\u524D ${curBytes}/${MEMORY_LIMITS.maxIndexBytes} \u5B57\u8282\uFF0C\u672C\u6761\u51C0\u589E ${delta} \u5B57\u8282\uFF09\u3002\u7D22\u5F15\u6BCF\u8F6E\u6CE8\u5165\u7CFB\u7EDF\u63D0\u793A\u8BCD\u2014\u2014\u8BF7\u7CBE\u7B80 description\uFF0C\u6216\u7528 memory_delete \u6E05\u7406/\u5408\u5E76\u65E7\u8BB0\u5FC6\u540E\u518D\u4FDD\u5B58\u3002`);
+            }
             const file = await writeAndRegister(name, description, type, body, project);
+            await recordMemoryUse(name, "save");
             return `\u2705 \u5DF2\u4FDD\u5B58\u8BB0\u5FC6 **${name}**\uFF08${type}${project ? "\uFF0C\u9879\u76EE\u6E90" : "\uFF0C\u5168\u5C40\u6E90"}\uFF09\u2192 ${file}`;
           }
         }
@@ -9327,7 +9906,8 @@ ${body.trim()}
           async execute(args) {
             const name = sanitizeLine(args?.name);
             const m = getMemory(name);
-            if (!m) return `\u274C \u672A\u627E\u5230\u8BB0\u5FC6\uFF1A${name}\u3002\u53EF\u8C03\u7528 memory_list \u67E5\u770B\u5168\u90E8\u8BB0\u5FC6\u540D\u3002`;
+            if (!m) return toolFailure(`\u672A\u627E\u5230\u8BB0\u5FC6\uFF1A${name}\u3002\u53EF\u8C03\u7528 memory_list \u67E5\u770B\u5168\u90E8\u8BB0\u5FC6\u540D\u3002`);
+            await recordMemoryUse(name, "read");
             return `## ${m.name}\uFF08${m.type}\uFF09
 
 ${m.body}`;
@@ -9345,7 +9925,7 @@ ${m.body}`;
           async execute() {
             const all = listMemories();
             if (all.length === 0) return "\uFF08\u6682\u65E0\u8BB0\u5FC6\uFF09";
-            const lines = all.slice().sort((a, b) => a.name.localeCompare(b.name)).map((m) => `- **${m.name}** (${m.type}) \u2014 ${m.description}`);
+            const lines = all.slice().sort((a, b) => a.name.localeCompare(b.name)).map(memoryIndexLine);
             return `\u5171 ${all.length} \u6761\u8BB0\u5FC6\uFF1A
 ${lines.join("\n")}`;
           }
@@ -9355,7 +9935,7 @@ ${lines.join("\n")}`;
         type: "function",
         function: {
           name: "memory_delete",
-          description: "\u5220\u9664\u6307\u5B9A\u8BB0\u5FC6\uFF08\u5220\u9664\u78C1\u76D8\u6587\u4EF6\u5E76\u4ECE\u8FD0\u884C\u65F6\u6CE8\u518C\u8868\u6CE8\u9500\uFF09\u3002\u4EC5\u5F53\u4F60\u786E\u8BA4\u67D0\u6761\u8BB0\u5FC6\u5DF2\u5931\u6548/\u6709\u8BEF\u65F6\u4F7F\u7528\u3002",
+          description: "\u5220\u9664\u6307\u5B9A\u8BB0\u5FC6\uFF08\u5220\u9664\u78C1\u76D8\u6587\u4EF6\u5E76\u4ECE\u8FD0\u884C\u65F6\u6CE8\u518C\u8868\u6CE8\u9500\uFF0C\u9700\u7528\u6237\u5BA1\u6279\uFF09\u3002\u4EC5\u5F53\u4F60\u786E\u8BA4\u67D0\u6761\u8BB0\u5FC6\u5DF2\u5931\u6548/\u6709\u8BEF\u65F6\u4F7F\u7528\u3002",
           parameters: {
             type: "object",
             properties: {
@@ -9363,14 +9943,19 @@ ${lines.join("\n")}`;
             },
             required: ["name"]
           },
-          safetyLevel: "safe" /* SAFE */,
+          // ★ #9①（2026-09-16）：SAFE → MUTATION。记忆目录在工作区沙箱外，被注入的工具结果可诱导
+          //   删除跨会话记忆；删除又不可 undo（不在工作区备份范围）——必须人工过目。未声明
+          //   autoApproval → 分类器恒 'ask' → 转人工；allow-always 经 primaryArg 落精确名作用域规则。
+          safetyLevel: "mutation" /* MUTATION */,
           isSync: true,
+          primaryArg: "name",
+          requireApproval: (args) => `\u5220\u9664\u6301\u4E45\u8BB0\u5FC6 **${sanitizeLine(args?.name)}**\uFF08\u8DE8\u4F1A\u8BDD\u751F\u6548\uFF0C\u5220\u9664\u540E\u4E0D\u53EF\u6062\u590D\uFF09`,
           async execute(args) {
             const name = sanitizeLine(args?.name);
             const m = getMemory(name);
-            if (!m) return `\u274C \u672A\u627E\u5230\u8BB0\u5FC6\uFF1A${name}\uFF08\u53EF\u80FD\u5DF2\u88AB\u5220\u9664\uFF09\u3002`;
+            if (!m) return toolFailure(`\u672A\u627E\u5230\u8BB0\u5FC6\uFF1A${name}\uFF08\u53EF\u80FD\u5DF2\u88AB\u5220\u9664\uFF09\u3002`);
             try {
-              await fs26.unlink(m.file);
+              await fs27.unlink(m.file);
             } catch {
             }
             unregisterMemory(name);
@@ -9382,9 +9967,74 @@ ${lines.join("\n")}`;
   }
 });
 
+// ../core/src/session/sidecar.ts
+import fs28 from "fs/promises";
+import path31 from "path";
+var SIDECAR_ARCHIVED_MARK, sidecarArchivedNote, safeSidecarId, getToolOutputSidecarPath, getToolOutputSidecarDir, ensuredSidecarDirs, SIDECAR_SESSION_CAP_BYTES, listSidecarFiles, writeSidecarArchive;
+var init_sidecar = __esm({
+  "../core/src/session/sidecar.ts"() {
+    "use strict";
+    init_store();
+    SIDECAR_ARCHIVED_MARK = "\u5B8C\u6574\u539F\u6587\u5DF2\u5B58\u6863";
+    sidecarArchivedNote = (toolCallId) => `${SIDECAR_ARCHIVED_MARK}\uFF0Crecall \u5DE5\u5177\u4F20 with_full="${toolCallId}" \u53EF\u53D6\u56DE`;
+    safeSidecarId = (id) => String(id).replace(/[^A-Za-z0-9_-]/g, "");
+    getToolOutputSidecarPath = (sessionId, toolCallId) => path31.join(getSessionsDirPath(sessionId), "tool-outputs", `${safeSidecarId(toolCallId)}.txt`);
+    getToolOutputSidecarDir = (sessionId) => path31.join(getSessionsDirPath(sessionId), "tool-outputs");
+    ensuredSidecarDirs = /* @__PURE__ */ new Set();
+    SIDECAR_SESSION_CAP_BYTES = 64 * 1024 * 1024;
+    listSidecarFiles = async (dir) => {
+      let names;
+      try {
+        names = await fs28.readdir(dir);
+      } catch {
+        return [];
+      }
+      const out = [];
+      for (const name of names) {
+        try {
+          const st = await fs28.stat(path31.join(dir, name));
+          if (st.isFile()) out.push({ name, size: st.size, mtimeMs: st.mtimeMs });
+        } catch {
+        }
+      }
+      return out;
+    };
+    writeSidecarArchive = async (sessionId, toolCallId, content, opts) => {
+      try {
+        const dir = getToolOutputSidecarDir(sessionId);
+        if (!ensuredSidecarDirs.has(dir)) {
+          await fs28.mkdir(dir, { recursive: true });
+          ensuredSidecarDirs.add(dir);
+        }
+        const cap = opts?.capBytes ?? SIDECAR_SESSION_CAP_BYTES;
+        const incoming = Buffer.byteLength(content, "utf-8");
+        const files = await listSidecarFiles(dir);
+        const total = files.reduce((s, f) => s + f.size, 0);
+        if (total + incoming > cap) {
+          const byOldest = [...files].sort((a, b) => a.mtimeMs - b.mtimeMs);
+          let freed = 0;
+          for (const f of byOldest) {
+            if (total - freed + incoming <= cap) break;
+            try {
+              await fs28.unlink(path31.join(dir, f.name));
+              freed += f.size;
+            } catch {
+            }
+          }
+        }
+        await fs28.writeFile(getToolOutputSidecarPath(sessionId, toolCallId), content, "utf-8");
+        return sidecarArchivedNote(toolCallId);
+      } catch (e) {
+        console.warn("\u26A0\uFE0F [sidecar] \u5DE5\u5177\u539F\u6587\u5B58\u6863\u5931\u8D25\uFF08\u5DF2\u964D\u7EA7\u4E3A\u666E\u901A\u622A\u65AD\u63D0\u793A\uFF09:", e instanceof Error ? e.message : e);
+        return void 0;
+      }
+    };
+  }
+});
+
 // ../core/src/tool/registry/recall.ts
-import fs27 from "fs/promises";
-import path30 from "path";
+import fs29 from "fs/promises";
+import path32 from "path";
 var escapeRegExp2, lineText, primaryPathArg, annotateStaleness, snippetAround, recallTools;
 var init_recall = __esm({
   "../core/src/tool/registry/recall.ts"() {
@@ -9392,7 +10042,7 @@ var init_recall = __esm({
     init_type();
     init_guard();
     init_transcript();
-    init_store();
+    init_sidecar();
     escapeRegExp2 = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
     lineText = (l) => {
       let t = "";
@@ -9415,9 +10065,9 @@ var init_recall = __esm({
     annotateStaleness = async (args, observedAt) => {
       const p = primaryPathArg(args);
       if (!p) return "\u5FEB\u7167\uFF08\u65E0\u8DEF\u5F84\u5B9E\u4F53\uFF0C\u672A\u7ECF\u91CD\u9A8C\u2014\u2014\u636E\u4EE5\u884C\u52A8\u524D\u8BF7\u91CD\u8DD1\u9A8C\u8BC1\uFF09";
-      const abs = path30.isAbsolute(p) ? p : path30.resolve(getActiveWorkspaceRoot(), p);
+      const abs = path32.isAbsolute(p) ? p : path32.resolve(getActiveWorkspaceRoot(), p);
       try {
-        const st = await fs27.stat(abs);
+        const st = await fs29.stat(abs);
         if (observedAt && st.mtime.toISOString() > observedAt) {
           return `\u26A0\uFE0F \u89C2\u5BDF\u540E\u8BE5\u6587\u4EF6\u5DF2\u88AB\u4FEE\u6539\uFF08${p}\uFF09\u2014\u2014\u5FC5\u987B\u91CD\u65B0 read_file \u540E\u624D\u80FD\u636E\u4EE5\u4FEE\u6539`;
         }
@@ -9457,17 +10107,17 @@ var init_recall = __esm({
           // ★ 检索结果预算与 web 等工具对齐 16000 口径；命中数 × 单片段双重限流防 context thrashing
           maxOutputCharacters: 16e3,
           async execute(args, ctx) {
-            if (!ctx?.sessionId) return "\u274C [recall] \u7F3A\u5C11\u4F1A\u8BDD\u4E0A\u4E0B\u6587\uFF08sessionId\uFF09\uFF0C\u65E0\u6CD5\u68C0\u7D22\u3002";
+            if (!ctx?.sessionId) return toolFailure("[recall] \u7F3A\u5C11\u4F1A\u8BDD\u4E0A\u4E0B\u6587\uFF08sessionId\uFF09\uFF0C\u65E0\u6CD5\u68C0\u7D22\u3002");
             try {
               if (args.with_full) {
-                const safeId = String(args.with_full).replace(/[^A-Za-z0-9_-]/g, "");
-                if (!safeId) return "\u274C [recall] with_full \u542B\u975E\u6CD5\u5B57\u7B26\u3002";
-                const sidecar = path30.join(getSessionsDirPath(ctx.sessionId), "tool-outputs", `${safeId}.txt`);
+                const safeId = safeSidecarId(args.with_full);
+                if (!safeId) return toolFailure("[recall] with_full \u542B\u975E\u6CD5\u5B57\u7B26\u3002");
+                const sidecar = getToolOutputSidecarPath(ctx.sessionId, args.with_full);
                 let full = "";
                 try {
-                  full = await fs27.readFile(sidecar, "utf-8");
+                  full = await fs29.readFile(sidecar, "utf-8");
                 } catch {
-                  return `\u274C [recall] \u672A\u627E\u5230\u8BE5 id \u7684\u5B58\u6863\u539F\u6587\uFF08\u53EF\u80FD\u672A\u66FE\u89E6\u53D1\u622A\u65AD\u5B58\u6863\u3001\u6216\u4F1A\u8BDD\u5DF2\u6E05\u7406\uFF09\uFF1A${args.with_full}`;
+                  return toolFailure(`[recall] \u672A\u627E\u5230\u8BE5 id \u7684\u5B58\u6863\u539F\u6587\uFF08\u53EF\u80FD\u672A\u66FE\u89E6\u53D1\u622A\u65AD\u5B58\u6863\u3001\u6216\u4F1A\u8BDD\u5DF2\u6E05\u7406\uFF09\uFF1A${args.with_full}`);
                 }
                 const CHUNK = 14e3;
                 const off = Math.max(0, Math.floor(args.full_offset ?? 0));
@@ -9480,7 +10130,7 @@ var init_recall = __esm({
 ${slice}${more}`;
               }
               const cleanQuery = (args.query || "").trim();
-              if (!cleanQuery) return "\u274C [recall] \u68C0\u7D22\u5173\u952E\u8BCD\u4E0D\u80FD\u4E3A\u7A7A\uFF08\u6216\u6539\u7528 with_full \u53D6\u5B58\u6863\u5168\u6587\uFF09\u3002";
+              if (!cleanQuery) return toolFailure("[recall] \u68C0\u7D22\u5173\u952E\u8BCD\u4E0D\u80FD\u4E3A\u7A7A\uFF08\u6216\u6539\u7528 with_full \u53D6\u5B58\u6863\u5168\u6587\uFF09\u3002");
               const re = new RegExp(args.is_regex ? cleanQuery : escapeRegExp2(cleanQuery), "i");
               const lines = await readTranscriptLines(ctx.sessionId);
               const toolCallInfo = /* @__PURE__ */ new Map();
@@ -9497,6 +10147,7 @@ ${slice}${more}`;
               }
               const limit = Math.min(Math.max(Math.floor(args.limit ?? 6), 1), 12);
               const runFilter = args.run_id?.trim();
+              const hasRunEvents = lines.some((l) => isEventLine(l) && l.dscEvent === "run.start");
               const blocks = [];
               let runN = 0;
               let runId = "";
@@ -9510,7 +10161,7 @@ ${slice}${more}`;
                 }
                 const role = l.role;
                 if (role === "system") continue;
-                if (runFilter && !(runId && runId.startsWith(runFilter))) continue;
+                if (runFilter && hasRunEvents && !(runId && runId.startsWith(runFilter))) continue;
                 let info;
                 if (role === "tool") {
                   info = toolCallInfo.get(l.tool_call_id);
@@ -9524,7 +10175,7 @@ ${slice}${more}`;
                 if (role === "tool") {
                   header += `
 \u6821\u9A8C\uFF1A${await annotateStaleness(info?.args, ts)}`;
-                  if (typeof l.content === "string" && l.content.includes("\u5B8C\u6574\u539F\u6587\u5DF2\u5B58\u6863")) {
+                  if (typeof l.content === "string" && l.content.includes(SIDECAR_ARCHIVED_MARK)) {
                     header += `
 \u2702\uFE0F \u8BE5\u7ED3\u679C\u66FE\u88AB\u622A\u65AD\uFF0C\u4F20 with_full="${l.tool_call_id}" \u53EF\u53D6\u5B58\u6863\u5168\u6587`;
                   }
@@ -9549,7 +10200,7 @@ ${snippetAround(text, re, 700)}`);
                 "\u63D0\u793A\uFF1A\u26A0\uFE0F \u6807\u6CE8\u7684\u6587\u4EF6\u5FC5\u987B\u91CD\u65B0 read_file \u9A8C\u8BC1\u540E\u624D\u80FD\u636E\u4EE5\u4FEE\u6539\uFF1B\u672C\u5DE5\u5177\u7ED3\u679C\u4EC5\u4F5C\u5386\u53F2\u7EBF\u7D22\uFF0C\u4E0D\u66FF\u4EE3\u5F53\u524D\u6587\u4EF6\u72B6\u6001\u3002"
               ].join("\n");
             } catch (e) {
-              return `\u274C [recall] \u68C0\u7D22\u5931\u8D25: ${e instanceof Error ? e.message : String(e)}`;
+              return toolFailure(`[recall] \u68C0\u7D22\u5931\u8D25: ${e instanceof Error ? e.message : String(e)}`);
             }
           }
         }
@@ -9620,7 +10271,7 @@ var init_spreadsheet = __esm({
               const readBlock = await assertReadable(absPath, args.path);
               if (readBlock) return readBlock;
               if (!absPath.toLowerCase().endsWith(".xlsx")) {
-                return `\u274C [\u683C\u5F0F\u4E0D\u652F\u6301]\uFF1A[${args.path}] \u4E0D\u662F .xlsx\u3002read_xlsx \u4EC5\u89E3\u6790 Excel \u5DE5\u4F5C\u7C3F\uFF08.xls \u8BF7\u5148\u53E6\u5B58\u4E3A .xlsx\uFF09\uFF1B\u5176\u5B83\u6587\u4EF6\u8BF7\u7528 read_file\u3002`;
+                return toolFailure(`[\u683C\u5F0F\u4E0D\u652F\u6301]\uFF1A[${args.path}] \u4E0D\u662F .xlsx\u3002read_xlsx \u4EC5\u89E3\u6790 Excel \u5DE5\u4F5C\u7C3F\uFF08.xls \u8BF7\u5148\u53E6\u5B58\u4E3A .xlsx\uFF09\uFF1B\u5176\u5B83\u6587\u4EF6\u8BF7\u7528 read_file\u3002`);
               }
               const startRow = args.start_row ? Math.max(1, Math.floor(args.start_row)) : 1;
               const maxRows = Math.min(args.max_rows ? Math.max(1, Math.floor(args.max_rows)) : 200, 1e3);
@@ -9664,7 +10315,7 @@ var init_spreadsheet = __esm({
 [... \u540E\u9762\u8FD8\u6709 ${rowCount - endRow} \u884C\uFF0C\u53EF\u628A start_row \u8BBE\u4E3A ${endRow + 1} \u7EE7\u7EED\u7FFB\u9875\u3002]`);
               return lines.join("\n");
             } catch (error) {
-              return `\u8BFB\u53D6 Excel \u5931\u8D25 [${args.path}]: ${error.message}`;
+              return toolFailure(`\u8BFB\u53D6 Excel \u5931\u8D25 [${args.path}]: ${error.message}`);
             }
           }
         }
@@ -9674,7 +10325,7 @@ var init_spreadsheet = __esm({
 });
 
 // ../core/src/tool/registry/document.ts
-import fs28 from "fs/promises";
+import fs30 from "fs/promises";
 var getMammoth, getUnpdf, documentTools;
 var init_document = __esm({
   "../core/src/tool/registry/document.ts"() {
@@ -9713,7 +10364,7 @@ var init_document = __esm({
               const readBlock = await assertReadable(absPath, args.path);
               if (readBlock) return readBlock;
               if (!absPath.toLowerCase().endsWith(".docx")) {
-                return `\u274C [\u683C\u5F0F\u4E0D\u652F\u6301]\uFF1A[${args.path}] \u4E0D\u662F .docx\u3002read_docx \u4EC5\u89E3\u6790 Word \u6587\u6863\uFF08.doc \u8001\u683C\u5F0F\u8BF7\u5148\u53E6\u5B58\u4E3A .docx\uFF09\uFF1B\u5176\u5B83\u6587\u4EF6\u7528 read_file\u3002`;
+                return toolFailure(`[\u683C\u5F0F\u4E0D\u652F\u6301]\uFF1A[${args.path}] \u4E0D\u662F .docx\u3002read_docx \u4EC5\u89E3\u6790 Word \u6587\u6863\uFF08.doc \u8001\u683C\u5F0F\u8BF7\u5148\u53E6\u5B58\u4E3A .docx\uFF09\uFF1B\u5176\u5B83\u6587\u4EF6\u7528 read_file\u3002`);
               }
               const start = args.start_char ? Math.max(0, Math.floor(args.start_char)) : 0;
               const maxChars = Math.min(args.max_chars ? Math.max(1, Math.floor(args.max_chars)) : 3e4, 5e4);
@@ -9731,7 +10382,7 @@ var init_document = __esm({
 [... \u540E\u9762\u8FD8\u6709 ${total - (start + slice.length)} \u5B57\u7B26\uFF0C\u53EF\u628A start_char \u8BBE\u4E3A ${start + slice.length} \u7EE7\u7EED\u7FFB\u9875\u3002]`);
               return lines.join("\n");
             } catch (error) {
-              return `\u8BFB\u53D6 Word \u6587\u6863\u5931\u8D25 [${args.path}]: ${error.message}`;
+              return toolFailure(`\u8BFB\u53D6 Word \u6587\u6863\u5931\u8D25 [${args.path}]: ${error.message}`);
             }
           }
         }
@@ -9760,11 +10411,11 @@ var init_document = __esm({
               const readBlock = await assertReadable(absPath, args.path);
               if (readBlock) return readBlock;
               if (!absPath.toLowerCase().endsWith(".pdf")) {
-                return `\u274C [\u683C\u5F0F\u4E0D\u652F\u6301]\uFF1A[${args.path}] \u4E0D\u662F .pdf\u3002read_pdf \u4EC5\u89E3\u6790 PDF \u6587\u6863\uFF1B\u5176\u5B83\u6587\u4EF6\u7528 read_file\u3002`;
+                return toolFailure(`[\u683C\u5F0F\u4E0D\u652F\u6301]\uFF1A[${args.path}] \u4E0D\u662F .pdf\u3002read_pdf \u4EC5\u89E3\u6790 PDF \u6587\u6863\uFF1B\u5176\u5B83\u6587\u4EF6\u7528 read_file\u3002`);
               }
               const start = args.start_char ? Math.max(0, Math.floor(args.start_char)) : 0;
               const maxChars = Math.min(args.max_chars ? Math.max(1, Math.floor(args.max_chars)) : 3e4, 5e4);
-              const buf = await fs28.readFile(absPath);
+              const buf = await fs30.readFile(absPath);
               const unpdf = await getUnpdf();
               const pdf = await unpdf.getDocumentProxy(new Uint8Array(buf));
               const { text, totalPages } = await unpdf.extractText(pdf, { mergePages: true });
@@ -9780,7 +10431,7 @@ var init_document = __esm({
 [... \u540E\u9762\u8FD8\u6709 ${total - (start + slice.length)} \u5B57\u7B26\uFF0C\u53EF\u628A start_char \u8BBE\u4E3A ${start + slice.length} \u7EE7\u7EED\u7FFB\u9875\u3002]`);
               return lines.join("\n");
             } catch (error) {
-              return `\u8BFB\u53D6 PDF \u5931\u8D25 [${args.path}]: ${error.message}`;
+              return toolFailure(`\u8BFB\u53D6 PDF \u5931\u8D25 [${args.path}]: ${error.message}`);
             }
           }
         }
@@ -9795,7 +10446,9 @@ __export(tool_exports, {
   MAX_AGENT_DEPTH: () => MAX_AGENT_DEPTH,
   ToolExecutionResultStatus: () => ToolExecutionResultStatus,
   ToolSafetyLevel: () => ToolSafetyLevel,
-  agentTools: () => agentTools
+  agentTools: () => agentTools,
+  asToolFailure: () => asToolFailure,
+  toolFailure: () => toolFailure
 });
 var agentTools, agentSubTools, workflowTools;
 var init_tool = __esm({
@@ -9887,9 +10540,9 @@ var init_lockManager = __esm({
 
 // ../core/src/agent/backgroundTool.ts
 function normalizeYield(v) {
-  if (typeof v === "string") return v;
-  if (v && typeof v === "object" && "content" in v) return String(v.content ?? "");
-  return String(v ?? "");
+  if (typeof v === "string") return { content: v, status: "success" };
+  if (v && typeof v === "object" && typeof v.content === "string" && (v.status === "success" || v.status === "failed")) return v;
+  return { content: String(v ?? ""), status: "success" };
 }
 async function runBackgroundTool(gen, lockKey, toolName, signal) {
   let aborted = false;
@@ -9922,11 +10575,11 @@ async function runBackgroundTool(gen, lockKey, toolName, signal) {
     } catch (e) {
       console.warn("\u26A0\uFE0F \u5173\u95ED\u672A\u6D88\u8D39\u7684\u540E\u53F0 generator \u5931\u8D25:", e instanceof Error ? e.message : e);
     }
-    return `\u{1F512} [\u4E92\u65A5\u9501\u963B\u585E]\uFF1A\u9501 [${lockKey}] \u5DF2\u88AB\u5360\u7528\uFF0C[${toolName}] \u672A\u542F\u52A8\u3002`;
+    return { content: `\u{1F512} [\u4E92\u65A5\u9501\u963B\u585E]\uFF1A\u9501 [${lockKey}] \u5DF2\u88AB\u5360\u7528\uFF0C[${toolName}] \u672A\u542F\u52A8\u3002`, status: "failed", errorCategory: "runtime" };
   }
   if (signal?.aborted) {
     await finalize();
-    return `\u274C [\u5DF2\u4E2D\u6B62]\uFF1A[${toolName}] \u540E\u53F0\u4EFB\u52A1\u672A\u542F\u52A8\uFF08\u7528\u6237\u5DF2\u4E2D\u65AD\uFF09\u3002`;
+    return toolFailure(`[\u5DF2\u4E2D\u6B62]\uFF1A[${toolName}] \u540E\u53F0\u4EFB\u52A1\u672A\u542F\u52A8\uFF08\u7528\u6237\u5DF2\u4E2D\u65AD\uFF09\u3002`);
   }
   if (signal) signal.addEventListener("abort", onAbort, { once: true });
   let first;
@@ -9934,9 +10587,9 @@ async function runBackgroundTool(gen, lockKey, toolName, signal) {
     first = await gen.next();
   } catch (e) {
     await finalize();
-    return `\u274C [\u540E\u53F0\u542F\u52A8\u5931\u8D25]\uFF1A${e?.message ?? e}`;
+    return toolFailure(`[\u540E\u53F0\u542F\u52A8\u5931\u8D25]\uFF1A${e?.message ?? e}`);
   }
-  const immediate = first.done ? "(\u540E\u53F0\u4EFB\u52A1\u672A\u4EA7\u51FA\u5373\u65F6\u7ED3\u679C\uFF0C\u5DF2\u76F4\u63A5\u7ED3\u675F)" : normalizeYield(first.value);
+  const immediate = first.done ? { content: "(\u540E\u53F0\u4EFB\u52A1\u672A\u4EA7\u51FA\u5373\u65F6\u7ED3\u679C\uFF0C\u5DF2\u76F4\u63A5\u7ED3\u675F)", status: "success" } : normalizeYield(first.value);
   if (first.done) {
     await finalize();
     return immediate;
@@ -9966,19 +10619,17 @@ var init_backgroundTool = __esm({
     "use strict";
     init_lockManager();
     init_config();
+    init_type();
   }
 });
 
 // ../core/src/tool/autoPermission.ts
-import path31 from "path";
-var AUTO_SCOPE, AUTO_DEFAULT_EXTRA, AUTO_AGGRESSIVE_EXTRA, isMcpTool, BUILTIN_AUTO_DENY, matchBuiltinDeny, COMMAND_DENY, matchCommandDeny, hasShellMetachars, READONLY_HEADS, PKG_MGR, SCRIPT_RUNNER_HEADS, SCRIPT_RUNNER_READONLY, isScriptRunnerCommand, hasWriteModifier, SENSITIVE_FILE_ARG_RE, hasSensitiveFileArg, isReadOnlyCommand, isWithinWorkspace, runAutoCheck;
+import path33 from "path";
+var isMcpTool, BUILTIN_AUTO_DENY, matchBuiltinDeny, COMMAND_DENY, matchCommandDeny, hasShellMetachars, READONLY_HEADS, PKG_MGR, SCRIPT_RUNNER_HEADS, SCRIPT_RUNNER_READONLY, isScriptRunnerCommand, hasWriteModifier, SENSITIVE_FILE_ARG_RE, hasSensitiveFileArg, isReadOnlyCommand, isWithinWorkspace, runAutoCheck;
 var init_autoPermission = __esm({
   "../core/src/tool/autoPermission.ts"() {
     "use strict";
     init_model();
-    AUTO_SCOPE = /* @__PURE__ */ new Set(["edit_file", "write_file", "create_file", "delete_path", "move_file"]);
-    AUTO_DEFAULT_EXTRA = /* @__PURE__ */ new Set(["run_command", "run_in_background"]);
-    AUTO_AGGRESSIVE_EXTRA = /* @__PURE__ */ new Set(["web_fetch", "web_search", "git_commit"]);
     isMcpTool = (name) => name.startsWith("mcp__");
     BUILTIN_AUTO_DENY = [
       /(^|[\\/])\.env(\.|$)/i,
@@ -10118,27 +10769,28 @@ var init_autoPermission = __esm({
     isWithinWorkspace = (p, cwd) => {
       if (!p || !cwd) return false;
       try {
-        const abs = path31.isAbsolute(p) ? p : path31.resolve(cwd, p);
-        const rel = path31.relative(cwd, abs);
-        return rel === "" || !rel.startsWith("..") && !path31.isAbsolute(rel);
+        const abs = path33.isAbsolute(p) ? p : path33.resolve(cwd, p);
+        const rel = path33.relative(cwd, abs);
+        return rel === "" || !rel.startsWith("..") && !path33.isAbsolute(rel);
       } catch {
         return false;
       }
     };
-    runAutoCheck = async (name, args, ctx, aggressive = false) => {
-      const isFileTool = AUTO_SCOPE.has(name);
-      const inScope = isFileTool || AUTO_DEFAULT_EXTRA.has(name) || aggressive && (AUTO_AGGRESSIVE_EXTRA.has(name) || isMcpTool(name));
+    runAutoCheck = async (name, args, ctx, aggressive = false, decl) => {
+      const isFileTool = decl?.autoApproval === "file";
+      const inScope = isFileTool || decl?.autoApproval === "command" || aggressive && (decl?.autoApproval === "aggressive" || isMcpTool(name));
       if (!inScope) return "ask";
       if (isFileTool) {
-        const paths = name === "move_file" ? [args?.source, args?.destination] : [args?.path];
+        const paths = (decl.pathArgs ?? ["path"]).map((k) => args?.[k]);
         for (const p of paths) {
           const s = typeof p === "string" ? p : "";
           if (!isWithinWorkspace(s, ctx.cwd)) return "ask";
           if (matchBuiltinDeny(s)) return "deny";
         }
       }
-      if (name === "run_command" || name === "run_in_background") {
-        const cmd = typeof args?.command === "string" ? args.command : "";
+      if (decl?.autoApproval === "command") {
+        const argKey = decl.primaryArg ?? "command";
+        const cmd = typeof args?.[argKey] === "string" ? args[argKey] : "";
         if (matchCommandDeny(cmd)) return "deny";
       }
       const v = await classifyToolRisk(name, args, "", ctx.abortSignal);
@@ -10148,14 +10800,15 @@ var init_autoPermission = __esm({
 });
 
 // ../core/src/agent/toolExecution.ts
-import fs29 from "fs/promises";
-import path32 from "path";
+import path34 from "path";
 var applyPrivacyMasking, processToolCall;
 var init_toolExecution = __esm({
   "../core/src/agent/toolExecution.ts"() {
     "use strict";
     init_truncate();
+    init_toolResultCollect();
     init_tool();
+    init_argsValidator();
     init_guard();
     init_permissions();
     init_hooks();
@@ -10165,8 +10818,7 @@ var init_toolExecution = __esm({
     init_autoPermission();
     init_loader();
     init_config();
-    init_store();
-    init_planMode();
+    init_sidecar();
     applyPrivacyMasking = (rules3, args, output) => {
       if (!rules3) return output;
       try {
@@ -10231,18 +10883,25 @@ var init_toolExecution = __esm({
         const placeholder = "\uFF08\u5DF2\u4E2D\u6B62\uFF0C\u672A\u6267\u884C\uFF09";
         return { toolCallId: toolCall.id, calledName, calledArgs, resultForModel: placeholder, resultForUser: placeholder, ok: false, aborted: true };
       }
-      if (!parseFailed && planMode && appConfig.planEnforcement === "runtime" && calledName !== "enter_plan_mode" && calledName !== "exit_plan_mode" && !PLAN_ALLOWED_TOOLS.has(calledName)) {
+      const matchedTool = rawTools.find((t) => t.function.name === calledName);
+      if (!parseFailed && planMode && appConfig.planEnforcement === "runtime" && calledName !== "enter_plan_mode" && calledName !== "exit_plan_mode" && matchedTool?.function?.planAllowed !== true) {
         const note = `\u274C [\u8BA1\u5212\u6A21\u5F0F] \u5F53\u524D\u4E3A\u53EA\u8BFB\u8C03\u7814\u9636\u6BB5\uFF0C\u7981\u6B62 ${calledName}\u3002\u5B8C\u6210\u65B9\u6848\u8BF7\u8C03 exit_plan_mode \u63D0\u4EA4\uFF0C\u7ECF\u7528\u6237\u5BA1\u6279\u540E\u8FDB\u5165\u5B9E\u73B0\u9636\u6BB5\u3002`;
         events({ sessionId, eventType: "tool.validation.failed", metadata: { depth, decisionSource: llmDecisionSource, durationMs: performance.now() - startTime, round, tools_id: toolCall.id, toolName: calledName, toolSource: "builtin", ok: false, attempt: round }, payload: { output: note } });
         return { toolCallId: toolCall.id, calledName, calledArgs, resultForModel: note, resultForUser: note, ok: false };
       }
-      const matchedTool = rawTools.find((t) => t.function.name === calledName);
       const toolCtx = { sessionId, cwd: getActiveWorkspaceRoot(), abortSignal: signal, depth, keepRecentUnits, compactRatio, modelWindow, parentSystemPrompt, events, onUIEvent, requestApproval: hostRequestApproval, requestQuestion: hostRequestQuestion, emitProgress: (m) => onUIEvent?.({ type: "tool.progress", toolsId: toolCall.id, toolName: calledName, message: m }), permissionMode };
       let result = "";
-      let explicitOk = null;
+      let resultStatus = "success";
+      let errorCategory;
+      const failResult = (text, cat = "runtime") => {
+        result = text;
+        resultStatus = "failed";
+        errorCategory = cat;
+      };
       let postHookOverride;
+      let imageAttachments;
       if (parseFailed) {
-        result = `\u53C2\u6570\u89E3\u6790\u5931\u8D25\uFF1A\u6A21\u578B\u8FD4\u56DE\u7684 arguments \u4E0D\u662F\u5408\u6CD5 JSON${JSON.stringify(toolCall).slice(0, 300)}`;
+        failResult(`\u53C2\u6570\u89E3\u6790\u5931\u8D25\uFF1A\u6A21\u578B\u8FD4\u56DE\u7684 arguments \u4E0D\u662F\u5408\u6CD5 JSON${JSON.stringify(toolCall).slice(0, 300)}`, "syntax");
         events({ sessionId, eventType: "tool.validation.failed", metadata: { depth, decisionSource: llmDecisionSource, durationMs: performance.now() - startTime, round, tools_id: toolCall.id, toolName: calledName, toolSource: "builtin", ok: false, attempt: round }, payload: { output: result } });
       } else if (matchedTool && typeof matchedTool.function.execute === "function") {
         const level = matchedTool.function.safetyLevel;
@@ -10259,24 +10918,36 @@ var init_toolExecution = __esm({
           }
           if (veto.deny) {
             denied = true;
-            result = veto.reason || `\u274C [Hook \u62E6\u622A]\uFF1Apre-hook \u62D2\u7EDD\u4E86 [${calledName}] \u7684\u6267\u884C\u3002`;
+            failResult(veto.reason || `\u274C [Hook \u62E6\u622A]\uFF1Apre-hook \u62D2\u7EDD\u4E86 [${calledName}] \u7684\u6267\u884C\u3002`, "permission");
           } else if (veto.argsOverride !== void 0 && veto.argsOverride !== null && typeof veto.argsOverride === "object" && !Array.isArray(veto.argsOverride)) {
             console.log(`\u270F\uFE0F [Pre-hook] [${calledName}] args \u5DF2\u88AB hook \u6539\u5199`);
             calledArgs = veto.argsOverride;
           }
         }
-        const protectedPaths = calledName === "move_file" ? [calledArgs?.source, calledArgs?.destination] : isUndoTrigger(calledName) ? [calledArgs?.path] : [];
+        {
+          const paramsSchema = matchedTool.function.parameters;
+          if (paramsSchema && typeof paramsSchema === "object" && !Array.isArray(paramsSchema)) {
+            const verdict = validateToolArgs(paramsSchema, calledArgs);
+            if (!verdict.ok) {
+              denied = true;
+              failResult(`\u274C \u53C2\u6570\u6821\u9A8C\u5931\u8D25\uFF1A${verdict.message}\uFF1B\u8BF7\u4FEE\u6B63\u53C2\u6570\u540E\u91CD\u8BD5\uFF08schema \u8981\u6C42\u89C1\u5DE5\u5177 parameters\uFF09\u3002`, "syntax");
+              events({ sessionId, eventType: "tool.validation.failed", metadata: { depth, decisionSource: llmDecisionSource, durationMs: performance.now() - startTime, round, tools_id: toolCall.id, toolName: calledName, toolSource: "builtin", ok: false, attempt: round }, payload: { output: result } });
+            }
+          }
+        }
+        const pathArgs = matchedTool.function.pathArgs ?? (matchedTool.function.triggersUndo ? ["path"] : []);
+        const protectedPaths = pathArgs.map((k) => calledArgs?.[k]);
         const hitProtected = protectedPaths.find((p) => typeof p === "string" && isProtectedWrite(p, toolCtx.cwd));
         if (hitProtected) {
           denied = true;
-          result = `\u274C [\u4FDD\u62A4\u8DEF\u5F84] \u7981\u6B62\u4FEE\u6539\u53D7\u4FDD\u62A4\u76EE\u5F55\uFF08.git/.ssh/.aws/.deepseeker-code \u7B49 VCS/\u51ED\u8BC1/\u914D\u7F6E\uFF09\uFF1A${hitProtected}\u3002`;
+          failResult(`\u274C [\u4FDD\u62A4\u8DEF\u5F84] \u7981\u6B62\u4FEE\u6539\u53D7\u4FDD\u62A4\u76EE\u5F55\uFF08.git/.ssh/.aws/.deepseeker-code \u7B49 VCS/\u51ED\u8BC1/\u914D\u7F6E\uFF09\uFF1A${hitProtected}\u3002`, "permission");
         }
         let perm = null;
         try {
-          perm = checkPermission(resolveMcpPermissionName(calledName, calledArgs), calledArgs);
+          perm = checkPermission(resolveMcpPermissionName(calledName, calledArgs), calledArgs, matchedTool.function.primaryArg);
           if (perm === "deny") {
             denied = true;
-            result = `\u274C [\u6743\u9650\u89C4\u5219]\uFF1A[${calledName}] \u88AB\u6743\u9650\u89C4\u5219 deny \u62D2\u7EDD\u3002`;
+            failResult(`\u274C [\u6743\u9650\u89C4\u5219]\uFF1A[${calledName}] \u88AB\u6743\u9650\u89C4\u5219 deny \u62D2\u7EDD\u3002`, "permission");
           } else if (perm === "allow") {
             needApproval = false;
           } else if (perm === "ask") {
@@ -10289,7 +10960,7 @@ var init_toolExecution = __esm({
         const argCwd = typeof calledArgs?.cwd === "string" ? calledArgs.cwd.trim() : "";
         const samePath = (a, b) => {
           try {
-            const ra = path32.resolve(a), rb = path32.resolve(b);
+            const ra = path34.resolve(a), rb = path34.resolve(b);
             return process.platform === "win32" ? ra.toLowerCase() === rb.toLowerCase() : ra === rb;
           } catch {
             return false;
@@ -10303,21 +10974,27 @@ var init_toolExecution = __esm({
         }
         if ((calledName === "run_command" || calledName === "run_in_background") && matchCommandDeny(typeof calledArgs?.command === "string" ? calledArgs.command : "")) {
           denied = true;
-          result = `\u274C [\u5B89\u5168] \u707E\u96BE\u547D\u4EE4\u6E05\u5355\u62E6\u622A\uFF08\u4E0D\u53EF\u88AB allow \u89C4\u5219\u7ED5\u8FC7\uFF09\uFF1A[${calledName}] ${String(calledArgs?.command ?? "").slice(0, 100)}`;
+          failResult(`\u274C [\u5B89\u5168] \u707E\u96BE\u547D\u4EE4\u6E05\u5355\u62E6\u622A\uFF08\u4E0D\u53EF\u88AB allow \u89C4\u5219\u7ED5\u8FC7\uFF09\uFF1A[${calledName}] ${String(calledArgs?.command ?? "").slice(0, 100)}`, "permission");
         }
         const isBgTool = matchedTool.function.isSync === false;
         const lockKey = isBgTool ? computeLockKey(matchedTool.function.exclusiveLock, calledArgs, toolCtx) : null;
         if (lockKey && isLockHeld(lockKey)) {
           denied = true;
-          result = `\u{1F512} [\u4E92\u65A5\u9501\u963B\u585E]\uFF1A\u5DF2\u6709\u540E\u53F0\u4EFB\u52A1\u6301\u6709\u9501 [${lockKey}]\uFF0C[${calledName}] \u8C03\u7528\u88AB\u8DF3\u8FC7\u3002`;
+          failResult(`\u{1F512} [\u4E92\u65A5\u9501\u963B\u585E]\uFF1A\u5DF2\u6709\u540E\u53F0\u4EFB\u52A1\u6301\u6709\u9501 [${lockKey}]\uFF0C[${calledName}] \u8C03\u7528\u88AB\u8DF3\u8FC7\u3002`);
         }
         if (needApproval && !denied && !scriptRunnerBlocked) {
-          const auto = await runAutoCheck(resolveMcpPermissionName(calledName, calledArgs), calledArgs, toolCtx, permissionMode === "auto");
+          const auto = await runAutoCheck(
+            resolveMcpPermissionName(calledName, calledArgs),
+            calledArgs,
+            toolCtx,
+            permissionMode === "auto",
+            { autoApproval: matchedTool.function.autoApproval, pathArgs: matchedTool.function.pathArgs, primaryArg: matchedTool.function.primaryArg }
+          );
           if (auto === "allow") {
             needApproval = false;
           } else if (auto === "deny") {
             denied = true;
-            result = `\u274C [auto] \u5185\u7F6E\u9AD8\u5371\u6E05\u5355\u62E6\u622A\uFF1A[${calledName}] ${calledArgs?.path ?? ""}\u3002`;
+            failResult(`\u274C [auto] \u5185\u7F6E\u9AD8\u5371\u6E05\u5355\u62E6\u622A\uFF1A[${calledName}] ${calledArgs?.path ?? ""}\u3002`, "permission");
           }
         }
         if (needApproval && !denied) {
@@ -10327,19 +11004,19 @@ var init_toolExecution = __esm({
             if (ra) detail = typeof ra === "function" ? await ra(calledArgs, toolCtx) : ra;
           } catch (e) {
             denied = true;
-            result = `\u274C [\u5BA1\u6279\u63CF\u8FF0\u751F\u6210\u5F02\u5E38]\uFF1A${e?.message ?? e}\u3002\u51FA\u4E8E\u5B89\u5168\u9ED8\u8BA4\u62D2\u7EDD [${calledName}] \u7684\u6267\u884C\u3002`;
+            failResult(`\u274C [\u5BA1\u6279\u63CF\u8FF0\u751F\u6210\u5F02\u5E38]\uFF1A${e?.message ?? e}\u3002\u51FA\u4E8E\u5B89\u5168\u9ED8\u8BA4\u62D2\u7EDD [${calledName}] \u7684\u6267\u884C\u3002`, "permission");
           }
           if (!denied) {
-            let approved = false;
+            let approved2 = false;
             try {
-              approved = await requestApproval(calledName, toolCall.id, detail, toolCtx, level, calledArgs);
+              approved2 = await requestApproval(calledName, toolCall.id, detail, toolCtx, level, calledArgs, matchedTool.function.primaryArg);
             } catch (e) {
               denied = true;
-              result = `\u274C [\u5BA1\u6279\u6D41\u7A0B\u5F02\u5E38]\uFF1A${e?.message ?? e}\u3002\u51FA\u4E8E\u5B89\u5168\u9ED8\u8BA4\u62D2\u7EDD [${calledName}] \u7684\u6267\u884C\u3002`;
+              failResult(`\u274C [\u5BA1\u6279\u6D41\u7A0B\u5F02\u5E38]\uFF1A${e?.message ?? e}\u3002\u51FA\u4E8E\u5B89\u5168\u9ED8\u8BA4\u62D2\u7EDD [${calledName}] \u7684\u6267\u884C\u3002`, "permission");
             }
-            if (!approved && !denied) {
+            if (!approved2 && !denied) {
               denied = true;
-              result = `\u274C [\u5B89\u5168\u7194\u65AD]\uFF1A\u7528\u6237\u62D2\u7EDD\u4E86 [${calledName}] \u7684\u6267\u884C\u7533\u8BF7\u3002`;
+              failResult(`\u274C [\u5B89\u5168\u7194\u65AD]\uFF1A\u7528\u6237\u62D2\u7EDD\u4E86 [${calledName}] \u7684\u6267\u884C\u7533\u8BF7\u3002`, "permission");
             }
           }
         }
@@ -10352,26 +11029,26 @@ var init_toolExecution = __esm({
           }
           if (veto.deny) {
             denied = true;
-            result = veto.reason || `\u274C [Hook \u62E6\u622A]\uFF1Apre-hook \u62D2\u7EDD\u4E86 [${calledName}] \u7684\u6267\u884C\u3002`;
+            failResult(veto.reason || `\u274C [Hook \u62E6\u622A]\uFF1Apre-hook \u62D2\u7EDD\u4E86 [${calledName}] \u7684\u6267\u884C\u3002`, "permission");
           }
         }
-        if (!denied && isUndoTrigger(calledName)) {
+        if (!denied && matchedTool.function.triggersUndo) {
           try {
-            await beforeMutationBackup(calledName, calledArgs, toolCall.id, sessionId);
+            await beforeMutationBackup(matchedTool.function.triggersUndo, calledName, calledArgs, toolCall.id, sessionId);
           } catch (e) {
             denied = true;
-            result = `\u274C [Undo \u5907\u4EFD\u5931\u8D25\xB7\u5B89\u5168\u7194\u65AD]\uFF1A${e?.message ?? e}\u3002\u5199\u5165\u5DF2\u963B\u6B62\uFF08\u51E1\u6539\u5FC5\u53EF\u56DE\u9000\u539F\u5219\uFF09\u3002`;
+            failResult(`\u274C [Undo \u5907\u4EFD\u5931\u8D25\xB7\u5B89\u5168\u7194\u65AD]\uFF1A${e?.message ?? e}\u3002\u5199\u5165\u5DF2\u963B\u6B62\uFF08\u51E1\u6539\u5FC5\u53EF\u56DE\u9000\u539F\u5219\uFF09\u3002`);
           }
         }
         if (!denied) {
           try {
             events({ sessionId, eventType: "tool.execute.start", metadata: { depth, decisionSource: llmDecisionSource, durationMs: performance.now() - startTime, round, tools_id: toolCall.id, toolName: calledName, toolSource: "builtin" }, payload: { output: JSON.stringify(calledArgs) } });
             const execRet = matchedTool.function.execute(calledArgs, toolCtx);
-            if (isBgTool) {
-              result = await runBackgroundTool(execRet, lockKey, calledName, signal);
-            } else {
-              result = await collectToolResult(execRet, (chunk) => toolCtx.emitProgress?.(chunk), signal);
-            }
+            const collected = isBgTool ? await runBackgroundTool(execRet, lockKey, calledName, signal) : await collectToolResult(execRet, (chunk) => toolCtx.emitProgress?.(chunk), signal);
+            result = collected.content;
+            resultStatus = collected.status;
+            imageAttachments = collected.images;
+            if (collected.status === "failed") errorCategory = collected.errorCategory ?? "runtime";
             if (matchedTool.function.verifyResult) {
               const verdict = matchedTool.function.verifyResult(result, toolCtx);
               if (verdict.status === "failed" /* FAILED */) {
@@ -10379,13 +11056,19 @@ var init_toolExecution = __esm({
 \u8BF7\u6B63\u89C6\u4E0B\u65B9\u8F93\u51FA\uFF0C\u4E0D\u8981\u4E50\u89C2\u5047\u8BBE\u6210\u529F\u3002
 
 ${result}`;
+                resultStatus = "failed";
+                errorCategory = verdict.errorCategory ?? "unknown";
               }
             }
-            events({ sessionId, eventType: "tool.execute.end", metadata: { depth, decisionSource: llmDecisionSource, durationMs: performance.now() - startTime, round, tools_id: toolCall.id, toolName: calledName, toolSource: "builtin", ok: true }, payload: { output: result } });
+            if (resultStatus === "success") {
+              events({ sessionId, eventType: "tool.execute.end", metadata: { depth, decisionSource: llmDecisionSource, durationMs: performance.now() - startTime, round, tools_id: toolCall.id, toolName: calledName, toolSource: "builtin", ok: true }, payload: { output: result } });
+            } else {
+              events({ sessionId, eventType: "tool.failed", metadata: { depth, decisionSource: llmDecisionSource, durationMs: performance.now() - startTime, round, tools_id: toolCall.id, toolName: calledName, toolSource: "builtin", ok: false, attempt: round, errorCategory: errorCategory ?? "unknown" }, payload: { output: result } });
+            }
           } catch (err) {
             console.error(`\u274C \u6267\u884C\u5DE5\u5177 ${calledName} \u65F6\u53D1\u751F\u9519\u8BEF:`, err);
-            result = `\u5DE5\u5177\u6267\u884C\u5931\u8D25: ${err instanceof Error ? err.message : String(err)}`;
-            events({ sessionId, eventType: "tool.failed", metadata: { depth, decisionSource: llmDecisionSource, durationMs: performance.now() - startTime, round, tools_id: toolCall.id, toolName: calledName, toolSource: "builtin", ok: false, attempt: round }, payload: { output: result } });
+            failResult(`\u5DE5\u5177\u6267\u884C\u5931\u8D25: ${err instanceof Error ? err.message : String(err)}`);
+            events({ sessionId, eventType: "tool.failed", metadata: { depth, decisionSource: llmDecisionSource, durationMs: performance.now() - startTime, round, tools_id: toolCall.id, toolName: calledName, toolSource: "builtin", ok: false, attempt: round, errorCategory: errorCategory ?? "runtime" }, payload: { output: result } });
           }
           try {
             const post = await runPostHooks(resolveMcpPermissionName(calledName, calledArgs), calledArgs, result, toolCtx);
@@ -10395,27 +11078,14 @@ ${result}`;
           }
         }
       } else {
-        result = `\u9519\u8BEF\uFF1A\u672A\u77E5\u5DE5\u5177 "${calledName}" \u6216\u8BE5\u5DE5\u5177\u65E0\u53EF\u6267\u884C\u51FD\u6570`;
-        explicitOk = false;
+        failResult(`\u9519\u8BEF\uFF1A\u672A\u77E5\u5DE5\u5177 "${calledName}" \u6216\u8BE5\u5DE5\u5177\u65E0\u53EF\u6267\u884C\u51FD\u6570`, "syntax");
         events({ sessionId, eventType: "tool.validation.failed", metadata: { depth, decisionSource: llmDecisionSource, durationMs: performance.now() - startTime, round, tools_id: toolCall.id, toolName: calledName, toolSource: "builtin", ok: false, attempt: round }, payload: { output: result } });
       }
       result = applyPrivacyMasking(matchedTool?.function?.privacyMaskingRules, calledArgs, result);
-      let sidecarNote;
       const truncBudget = matchedTool?.function?.maxOutputCharacters ?? appConfig.MAX_TOOL_RESULT_CHARS;
-      if (result.length > truncBudget) {
-        try {
-          const sidecarDir = path32.join(getSessionsDirPath(sessionId), "tool-outputs");
-          await fs29.mkdir(sidecarDir, { recursive: true });
-          const safeId = String(toolCall.id).replace(/[^A-Za-z0-9_-]/g, "");
-          await fs29.writeFile(path32.join(sidecarDir, `${safeId}.txt`), result, "utf-8");
-          sidecarNote = `\u5B8C\u6574\u539F\u6587\u5DF2\u5B58\u6863\uFF0Crecall \u5DE5\u5177\u4F20 with_full="${toolCall.id}" \u53EF\u53D6\u56DE`;
-        } catch (e) {
-          console.warn(`\u26A0\uFE0F [sidecar] \u5DE5\u5177\u539F\u6587\u5B58\u6863\u5931\u8D25\uFF08\u5DF2\u964D\u7EA7\u4E3A\u666E\u901A\u622A\u65AD\u63D0\u793A\uFF09:`, e instanceof Error ? e.message : e);
-        }
-      }
-      result = truncateToolResult(result, matchedTool?.function?.maxOutputCharacters, sidecarNote);
-      const FAILED_PREFIXES = ["\u5DE5\u5177\u6267\u884C\u5931\u8D25", "\u53C2\u6570\u89E3\u6790\u5931\u8D25", "\u274C", "\u3010\u7CFB\u7EDF\u5224\u5B9A", "\u{1F512}", "\u8BFB\u53D6\u6587\u4EF6\u5931\u8D25", "\u9879\u76EE\u6811\u626B\u63CF\u5931\u8D25", "\u7B26\u53F7\u5927\u7EB2\u5206\u6790\u5931\u8D25", "\u64CD\u4F5C\u5931\u8D25:"];
-      const ok = explicitOk ?? !FAILED_PREFIXES.some((p) => result.startsWith(p));
+      const sidecarNote = result.length > truncBudget ? await writeSidecarArchive(sessionId, String(toolCall.id), result) : void 0;
+      result = truncateToolResult(result, matchedTool?.function.maxOutputCharacters, sidecarNote);
+      const ok = resultStatus === "success";
       let resultForModel = result;
       let resultForUser = result;
       if (matchedTool?.function?.outputFilter) {
@@ -10428,9 +11098,11 @@ ${result}`;
       }
       if (postHookOverride !== void 0) {
         console.log(`\u270F\uFE0F [Post-hook] [${calledName}] \u6A21\u578B\u89C6\u56FE\u7ED3\u679C\u5DF2\u88AB hook \u6539\u5199`);
-        resultForModel = truncateToolResult(postHookOverride, matchedTool?.function?.maxOutputCharacters);
+        const overrideBudget = matchedTool?.function?.maxOutputCharacters ?? appConfig.MAX_TOOL_RESULT_CHARS;
+        const overrideNote = postHookOverride.length > overrideBudget ? await writeSidecarArchive(sessionId, String(toolCall.id), postHookOverride) : void 0;
+        resultForModel = truncateToolResult(postHookOverride, matchedTool?.function?.maxOutputCharacters, overrideNote);
       }
-      return { toolCallId: toolCall.id, calledName, calledArgs, resultForModel, resultForUser, ok };
+      return { toolCallId: toolCall.id, calledName, calledArgs, resultForModel, resultForUser, ok, imageAttachments };
     };
   }
 });
@@ -10442,13 +11114,14 @@ var init_toolScheduling = __esm({
     "use strict";
     init_toolExecution();
     init_transcript();
+    init_contentParts();
     init_config();
     init_tool();
     init_permissions();
-    init_backup();
     scheduleToolCalls = async function* (assistantMessage, message, ctx) {
       const { sessionId, signal, rawTools } = ctx;
       let abortedDuringTools = false;
+      const pendingImages = [];
       const fillRestPlaceholders = async (fromIdx) => {
         const tcs2 = assistantMessage.tool_calls;
         for (let j = fromIdx + 1; j < tcs2.length; j++) {
@@ -10472,13 +11145,13 @@ var init_toolScheduling = __esm({
       const canParallelize = (name, args, parseFailed) => {
         if (!parallelSafeToolsEnabled || parseFailed || signal?.aborted) return false;
         if (name === "exit_plan_mode" || name === "enter_plan_mode" || name === "ask_question") return false;
-        if (isUndoTrigger(name)) return false;
         const matched = rawTools.find((t) => t.function.name === name);
         if (!matched) return false;
+        if (matched.function.triggersUndo) return false;
         if (matched.function.safetyLevel !== "safe" /* SAFE */) return false;
         if (matched.function.isSync === false) return false;
         try {
-          const perm = checkPermission(name, args);
+          const perm = checkPermission(name, args, matched.function.primaryArg);
           if (perm === "ask" || perm === "deny") return false;
         } catch {
           return false;
@@ -10516,6 +11189,7 @@ var init_toolScheduling = __esm({
             yield { type: "tool.end", toolCallId: oc.toolCallId, toolName: oc.calledName, result: oc.resultForUser, ok: oc.ok };
             message.push({ role: "tool", tool_call_id: oc.toolCallId, content: oc.resultForModel });
             await appendMessage({ sessionId, role: "tool", tool_call_id: oc.toolCallId, content: oc.resultForModel });
+            if (oc.imageAttachments?.length) pendingImages.push(...oc.imageAttachments);
             if (oc.aborted) abortedDuringTools = true;
           }
         } else {
@@ -10537,10 +11211,16 @@ var init_toolScheduling = __esm({
           yield { type: "tool.end", toolCallId: oc.toolCallId, toolName: oc.calledName, result: oc.resultForUser, ok: oc.ok };
           message.push({ role: "tool", tool_call_id: oc.toolCallId, content: oc.resultForModel });
           await appendMessage({ sessionId, role: "tool", tool_call_id: oc.toolCallId, content: oc.resultForModel });
+          if (oc.imageAttachments?.length) pendingImages.push(...oc.imageAttachments);
           if (oc.aborted) abortedDuringTools = true;
           idx++;
         }
       }
+      if (!abortedDuringTools && pendingImages.length > 0) {
+        const parts = buildImageFollowUpParts(pendingImages);
+        message.push({ role: "user", content: parts });
+        await appendMessage({ sessionId, role: "user", content: parts });
+      }
       if (abortedDuringTools) return { kind: "aborted" };
       return { kind: "completed" };
     };
@@ -10549,7 +11229,7 @@ var init_toolScheduling = __esm({
 
 // ../core/src/agent/streamInference.ts
 import { createHash as createHash2 } from "node:crypto";
-var sha1short, RETRY_BACKOFF_CAP_MS, extractRetryAfterMs, withNudgeTail, streamInference;
+var sha1short, toolsFingerprintCache, RETRY_BACKOFF_CAP_MS, extractRetryAfterMs, withNudgeTail, streamInference;
 var init_streamInference = __esm({
   "../core/src/agent/streamInference.ts"() {
     "use strict";
@@ -10561,6 +11241,7 @@ var init_streamInference = __esm({
     init_visionCapability();
     init_createModel();
     sha1short = (s) => createHash2("sha1").update(s).digest("hex").slice(0, 10);
+    toolsFingerprintCache = /* @__PURE__ */ new WeakMap();
     RETRY_BACKOFF_CAP_MS = 3e4;
     extractRetryAfterMs = (e) => {
       try {
@@ -10610,7 +11291,14 @@ var init_streamInference = __esm({
       let assistantMessage = { role: "assistant", content: null };
       try {
         const prefixFingerprint = {
-          toolsHash: sha1short(JSON.stringify(cleanedToolSchemas)),
+          toolsHash: (() => {
+            let h = toolsFingerprintCache.get(cleanedToolSchemas);
+            if (h === void 0) {
+              h = sha1short(JSON.stringify(cleanedToolSchemas));
+              toolsFingerprintCache.set(cleanedToolSchemas, h);
+            }
+            return h;
+          })(),
           sysHash: sha1short(String(message[0]?.content ?? "")),
           sumHash: sha1short(String(message[1]?.content ?? "")),
           msgCount: message.length
@@ -10701,11 +11389,15 @@ var init_streamInference = __esm({
               const raHint = retryAfterMs != null ? `\uFF0C\u9075 Retry-After=${retryAfterMs}ms` : "";
               console.warn(`\u26A0\uFE0F API \u77AC\u65F6\u9519\u8BEF\uFF08${statusHint}${streamErr instanceof Error ? streamErr.message : String(streamErr)}\uFF09\uFF0C${backoffMs}ms \u540E\u7B2C ${apiRetries}/${MAX_API_RETRIES} \u6B21\u91CD\u8BD5${raHint}...`);
               await new Promise((resolve, reject) => {
-                const t = setTimeout(resolve, backoffMs);
-                signal?.addEventListener("abort", () => {
+                const onAbort = () => {
                   clearTimeout(t);
                   reject(new Error("aborted"));
-                }, { once: true });
+                };
+                const t = setTimeout(() => {
+                  signal?.removeEventListener("abort", onAbort);
+                  resolve();
+                }, backoffMs);
+                signal?.addEventListener("abort", onAbort, { once: true });
               });
               contentBuf = "";
               reasoningBuf = "";
@@ -10806,7 +11498,7 @@ var init_streamInference = __esm({
 });
 
 // ../core/src/agent/agentNudges.ts
-var NUDGE_EVERY, NUDGE_FENCE, PHANTOM_FENCE, PHANTOM_RETRY_MAX, EARLY_FINAL_FENCE, EARLY_FINAL_TURN_THRESHOLD, EARLY_FINAL_MAX, TOOL_DIGEST_FENCE, TOOL_DIGEST_MAX, TOOL_DIGEST_WINDOW, TOOL_DIGEST_TEXT_MAX_LEN, PLAN_FIRST_FENCE, REPEAT_FENCE, READ_REPEAT_THRESHOLD, GREP_REPEAT_THRESHOLD, REPEAT_NUDGE_MAX, PHANTOM_TEXT, EARLY_FINAL_TEXT, TOOL_DIGEST_TEXT, NUDGE_TEXT, COMPLEX_VERBS, COMPLEX_OBJECTS, COMPLEX_MARKERS, QUERY_LEAD, looksComplex, PLAN_FIRST_TEXT, looksComplete, parseToolCall, normPath, normQuery, REPEAT_READ_TEXT, REPEAT_GREP_TEXT, createNudgeScheduler;
+var NUDGE_EVERY, NUDGE_FENCE, PHANTOM_FENCE, PHANTOM_RETRY_MAX, EARLY_FINAL_FENCE, EARLY_FINAL_TURN_THRESHOLD, EARLY_FINAL_MAX, TOOL_DIGEST_FENCE, TOOL_DIGEST_MAX, TOOL_DIGEST_WINDOW, TOOL_DIGEST_TEXT_MAX_LEN, PLAN_FIRST_FENCE, REPEAT_FENCE, READ_REPEAT_THRESHOLD, GREP_REPEAT_THRESHOLD, REPEAT_NUDGE_MAX, TODO_INCOMPLETE_FENCE, TODO_INCOMPLETE_MAX, PHANTOM_TEXT, EARLY_FINAL_TEXT, TOOL_DIGEST_TEXT, NUDGE_TEXT, COMPLEX_VERBS, COMPLEX_OBJECTS, COMPLEX_MARKERS, QUERY_LEAD, looksComplex, PLAN_FIRST_TEXT, looksComplete, parseToolCall, normPath, normQuery, REPEAT_READ_TEXT, REPEAT_GREP_TEXT, TODO_INCOMPLETE_TEXT, createNudgeScheduler;
 var init_agentNudges = __esm({
   "../core/src/agent/agentNudges.ts"() {
     "use strict";
@@ -10826,6 +11518,8 @@ var init_agentNudges = __esm({
     READ_REPEAT_THRESHOLD = 3;
     GREP_REPEAT_THRESHOLD = 2;
     REPEAT_NUDGE_MAX = 3;
+    TODO_INCOMPLETE_FENCE = "\u27E6DSC:TODO_INCOMPLETE\u27E7";
+    TODO_INCOMPLETE_MAX = 1;
     PHANTOM_TEXT = "\u4F60\u7684\u4E0A\u4E00\u6761\u56DE\u590D\u6CA1\u6709\u4EFB\u4F55\u5185\u5BB9\u3001\u4E5F\u6CA1\u6709\u8C03\u7528\u4EFB\u4F55\u5DE5\u5177\uFF0C\u4F46\u4EFB\u52A1\u5C1A\u672A\u5B8C\u6210\u3002\u8BF7\u7EE7\u7EED\u63A8\u8FDB\uFF08\u8C03\u7528\u5DE5\u5177\u6216\u7ED9\u51FA\u5B9E\u8D28\u56DE\u7B54\uFF09\uFF1B\u82E5\u786E\u5B9E\u53D7\u963B\u3001\u9700\u8981\u7528\u6237\u51B3\u7B56\uFF0C\u7528 ask_question \u8BF4\u660E\u5177\u4F53\u963B\u585E\u70B9\u3002\u4E0D\u8981\u8FD4\u56DE\u7A7A\u56DE\u590D\u3002";
     EARLY_FINAL_TEXT = (round) => `\u4F60\u4EC5 ${round} \u8F6E\u5C31\u51C6\u5907\u6536\u5C3E\uFF0C\u4E14\u56DE\u7B54\u4E2D\u6CA1\u6709\u660E\u786E\u7684\u5B8C\u6210\u58F0\u660E\u3002\u8BF7\u81EA\u68C0\uFF1A\u82E5\u7528\u6237\u8F93\u5165\u672C\u5C31\u65E0\u9700\u5DE5\u5177\uFF08\u5BD2\u6684/\u95F2\u804A/\u7EAF\u95EE\u7B54\uFF09\u3001\u6216\u4F60\u5728\u7B49\u7528\u6237\u6F84\u6E05\u51B3\u7B56\uFF0C\u76F4\u63A5\u6B63\u5E38\u56DE\u5E94\u5373\u53EF\uFF0C\u5FFD\u7565\u672C\u81EA\u68C0\u3001\u4E0D\u8981\u8F93\u51FA\u4EFB\u4F55\u81EA\u68C0\u8BF4\u660E\uFF1B\u82E5\u786E\u6709\u4EFB\u52A1\u672A\u843D\u5730\uFF08\u6240\u9700\u4FE1\u606F\u672A\u83B7\u53D6\u9F50 / \u8BE5\u6539\u7684\u6587\u4EF6\u672A\u6539\u5B8C / \u672A\u9A8C\u8BC1\uFF09\uFF0C\u7ACB\u5373\u7EE7\u7EED\u8C03\u7528\u5DE5\u5177\u63A8\u8FDB\uFF0C\u4E0D\u8981\u8349\u7387\u603B\u7ED3\u6536\u5C3E\uFF1B\u82E5\u786E\u5DF2\u5168\u90E8\u5B8C\u6210\uFF0C\u8BF7\u660E\u786E\u56DE\u590D\u300C\u5DF2\u5B8C\u6210\u300D\u5E76\u7B80\u8FF0\u6210\u679C\u3002`;
     TOOL_DIGEST_TEXT = "\u4F60\u521A\u6267\u884C\u5B8C\u5DE5\u5177\u62FF\u5230\u7ED3\u679C\uFF0C\u5374\u672A\u57FA\u4E8E\u8BE5\u7ED3\u679C\u7ED9\u51FA\u5B9E\u8D28\u56DE\u5E94\u5C31\u51C6\u5907\u6536\u5C3E\u3002\u8BF7\u7ED3\u5408\u5DE5\u5177\u8FD4\u56DE\u7ED3\u679C\u7EE7\u7EED\u63A8\u8FDB\uFF1B\u82E5\u7ED3\u679C\u8868\u660E\u4EFB\u52A1\u5C1A\u672A\u5B8C\u6210\uFF08\u5982\u4ECD\u5728\u7F16\u8BD1/\u8FD0\u884C\u3001\u9700\u7EE7\u7EED\u8F6E\u8BE2\uFF09\uFF0C\u7ACB\u5373\u91C7\u53D6\u4E0B\u4E00\u6B65\u884C\u52A8\uFF0C\u4E0D\u8981\u7A7A\u624B\u6536\u5C3E\u3002\u82E5\u786E\u5DF2\u5168\u90E8\u5B8C\u6210\uFF0C\u8BF7\u660E\u786E\u56DE\u590D\u300C\u5DF2\u5B8C\u6210\u300D\u5E76\u7B80\u8FF0\u6210\u679C\u3002";
@@ -10862,6 +11556,7 @@ var init_agentNudges = __esm({
     normQuery = (q) => String(q ?? "").trim().toLowerCase().replace(/\s+/g, " ");
     REPEAT_READ_TEXT = (p, n) => `\u4F60\u5DF2\u7B2C ${n} \u6B21\u8BFB\u53D6\u300C${p}\u300D\u2014\u2014\u8BE5\u6587\u4EF6\u5185\u5BB9\u4F60\u65E9\u5DF2\u62E5\u6709\uFF0C\u65E0\u9700\u6574\u6587\u4EF6\u91CD\u8BFB\u3002\u5982\u9700\u67D0\u5904\u7EC6\u8282\u8BF7\u56DE\u770B\u4E4B\u524D\u7684\u5DE5\u5177\u7ED3\u679C\uFF08\u65E9\u524D\u8BFB\u53D6\u53EF\u80FD\u5DF2\u88AB\u5F52\u6863\uFF0C\u53EF\u7528 recall \u5DE5\u5177\u68C0\u7D22\u53D6\u56DE\u539F\u6587\uFF09\uFF1B\u82E5\u8BE5\u6587\u4EF6\u521A\u88AB\u6539\u52A8\u3001\u786E\u9700\u786E\u8BA4\uFF0C\u53EA\u8BFB\u6539\u52A8\u9644\u8FD1\u51E0\u884C\u5373\u53EF\uFF0C\u4E0D\u8981\u6574\u6587\u4EF6\u91CD\u8BFB\u3002`;
     REPEAT_GREP_TEXT = (q, n) => `\u4F60\u5DF2\u7B2C ${n} \u6B21\u68C0\u7D22\u300C${q}\u300D\u2014\u2014\u4E4B\u524D\u7684\u7ED3\u679C\u4F60\u5DF2\u62E5\u6709\u3002\u8BF7\u6539\u7528 read_file \u8BFB\u5B8C\u6574\u76EE\u6807\u6587\u4EF6\u7406\u89E3\u4E0A\u4E0B\u6587\uFF0C\u6216\u7F29\u5C0F/\u8C03\u6574\u68C0\u7D22\u8303\u56F4\uFF0C\u4E0D\u8981\u91CD\u590D\u540C\u4E00\u68C0\u7D22\u3002`;
+    TODO_INCOMPLETE_TEXT = (openItems) => `\u4F60\u7684\u4EFB\u52A1\u6E05\u5355\u4ECD\u6709 ${openItems.length} \u9879\u672A\u5B8C\u6210${openItems.length ? `\uFF08\u5982\uFF1A${openItems.slice(0, 3).join("\uFF1B")}\uFF09` : ""}\u3002\u8BF7\u6838\u5BF9\uFF1A\u82E5\u8FD9\u4E9B\u5B50\u76EE\u6807\u786E\u5DF2\u843D\u5730\uFF0C\u5148\u8C03 todo_write \u628A\u5BF9\u5E94\u9879\u7F6E completed \u518D\u6536\u5C3E\uFF1B\u82E5\u786E\u672A\u5B8C\u6210\uFF0C\u7EE7\u7EED\u63A8\u8FDB\uFF0C\u4E0D\u8981\u62FF\u7740\u672A\u52FE\u5B8C\u7684\u6E05\u5355\u8349\u7387\u603B\u7ED3\uFF1B\u82E5\u4EFB\u52A1\u5DF2\u88AB\u7528\u6237\u53D6\u6D88\u6216\u53D8\u66F4\uFF0C\u4E5F\u7528 todo_write \u66F4\u65B0\u6E05\u5355\u4EE5\u53CD\u6620\u6700\u65B0\u8BA1\u5212\u3002`;
     createNudgeScheduler = (opts = {}) => {
       const firstPrompt = opts.firstPrompt ?? "";
       const planMode = !!opts.planMode;
@@ -10881,6 +11576,10 @@ var init_agentNudges = __esm({
       const nudgedGreps = /* @__PURE__ */ new Set();
       let repeatNudges = 0;
       let repeatRetrievalPending = null;
+      let todosTouchedThisRun = false;
+      let lastTodos = [];
+      let todoNudges = 0;
+      let todoPending = null;
       return {
         pickNudge(round) {
           if (!planFirstSent && round === 1 && !planMode && looksComplex(firstPrompt)) {
@@ -10903,6 +11602,11 @@ ${PLAN_FIRST_TEXT}` };
             earlyFinalPending = null;
             return m;
           }
+          if (todoPending) {
+            const m = todoPending;
+            todoPending = null;
+            return m;
+          }
           if (repeatRetrievalPending) {
             const m = repeatRetrievalPending;
             repeatRetrievalPending = null;
@@ -10934,6 +11638,15 @@ ${PHANTOM_TEXT}` };
 ${EARLY_FINAL_TEXT(round)}` };
             return true;
           }
+          if (todosTouchedThisRun && todoNudges < TODO_INCOMPLETE_MAX) {
+            const open = lastTodos.filter((t) => t && t.status !== "completed" && t.content).map((t) => t.content);
+            if (open.length > 0) {
+              todoNudges++;
+              todoPending = { role: "system", content: `${TODO_INCOMPLETE_FENCE}
+${TODO_INCOMPLETE_TEXT(open)}` };
+              return true;
+            }
+          }
           return false;
         },
         noteToolCall(round, toolCalls) {
@@ -10943,6 +11656,11 @@ ${EARLY_FINAL_TEXT(round)}` };
           if (!Array.isArray(toolCalls)) return;
           for (const tc of toolCalls) {
             const { name, args } = parseToolCall(tc);
+            if (name === "todo_write") {
+              todosTouchedThisRun = true;
+              lastTodos = Array.isArray(args?.todos) ? args.todos : [];
+              continue;
+            }
             if (name === "edit_file" || name === "write_file" || name === "create_file") {
               const p = normPath(args?.path);
               if (p) {
@@ -10985,6 +11703,113 @@ ${REPEAT_GREP_TEXT(q, n)}` };
   }
 });
 
+// ../core/src/observability/usageLog.ts
+import fs31 from "fs/promises";
+import path35 from "path";
+var USAGE_DISABLED, usageDir, ensuredDir, getUsageLogPath, recordUsageRun, USAGE_FILE_RE, SYNTHETIC_SESSION_RE, readUsageRecords, summarizeUsage, topTools;
+var init_usageLog = __esm({
+  "../core/src/observability/usageLog.ts"() {
+    "use strict";
+    init_config();
+    USAGE_DISABLED = process.env.DEEPSEEKER_CODE_USAGE_LOG === "0";
+    usageDir = () => path35.join(appConfig.dataDir, "usage");
+    ensuredDir = null;
+    getUsageLogPath = (month) => path35.join(usageDir(), `usage-${month}.jsonl`);
+    recordUsageRun = async (rec) => {
+      if (USAGE_DISABLED) return;
+      try {
+        const full = { workspace: appConfig.userWorkspaceDir, ...rec };
+        const month = (full.ts || (/* @__PURE__ */ new Date()).toISOString()).slice(0, 7);
+        const dir = usageDir();
+        if (ensuredDir !== dir) {
+          await fs31.mkdir(dir, { recursive: true });
+          ensuredDir = dir;
+        }
+        await fs31.appendFile(getUsageLogPath(month), JSON.stringify(full) + "\n", "utf-8");
+      } catch (e) {
+        console.warn("\u26A0\uFE0F [usageLog] \u4F7F\u7528\u65E5\u5FD7\u843D\u76D8\u5931\u8D25\uFF08\u4E0D\u5F71\u54CD\u4E3B\u4E1A\u52A1\uFF09:", e instanceof Error ? e.message : e);
+      }
+    };
+    USAGE_FILE_RE = /^usage-\d{4}-\d{2}\.jsonl$/;
+    SYNTHETIC_SESSION_RE = /^(selftest-|eval-)/;
+    readUsageRecords = async (days) => {
+      let files;
+      try {
+        files = (await fs31.readdir(usageDir())).filter((f) => USAGE_FILE_RE.test(f)).sort();
+      } catch {
+        return [];
+      }
+      let cutoff = null;
+      if (days && days > 0) {
+        cutoff = /* @__PURE__ */ new Date();
+        cutoff.setHours(0, 0, 0, 0);
+        cutoff.setDate(cutoff.getDate() - (days - 1));
+      }
+      const out = [];
+      for (const f of files) {
+        let text;
+        try {
+          text = await fs31.readFile(path35.join(usageDir(), f), "utf-8");
+        } catch {
+          continue;
+        }
+        for (const line of text.split("\n")) {
+          if (!line.trim()) continue;
+          let rec;
+          try {
+            rec = JSON.parse(line);
+          } catch {
+            continue;
+          }
+          if (!rec || typeof rec !== "object" || !rec.sessionId || !rec.ts) continue;
+          if (SYNTHETIC_SESSION_RE.test(rec.sessionId)) continue;
+          if (cutoff && new Date(rec.ts) < cutoff) continue;
+          out.push(rec);
+        }
+      }
+      return out.sort((a, b) => String(a.ts).localeCompare(String(b.ts)));
+    };
+    summarizeUsage = (records) => {
+      const s = {
+        runs: 0,
+        mainRuns: 0,
+        subRuns: 0,
+        stopReasons: { normal: 0, aborted: 0, error: 0, repeat: 0, limit: 0 },
+        rounds: 0,
+        mainRounds: 0,
+        durationMs: 0,
+        promptTokens: 0,
+        completionTokens: 0,
+        totalTokens: 0,
+        cachedTokens: 0,
+        toolCalls: 0,
+        tools: {}
+      };
+      for (const r of records) {
+        s.runs++;
+        if (r.depth > 0) s.subRuns++;
+        else s.mainRuns++;
+        if (r.stopReason in s.stopReasons) s.stopReasons[r.stopReason]++;
+        s.rounds += r.rounds || 0;
+        if (r.depth === 0) s.mainRounds += r.rounds || 0;
+        s.durationMs += r.durationMs || 0;
+        s.promptTokens += r.promptTokens ?? 0;
+        s.completionTokens += r.completionTokens ?? 0;
+        s.totalTokens += r.totalTokens ?? 0;
+        s.cachedTokens += r.cachedTokens ?? 0;
+        for (const [name, n] of Object.entries(r.tools ?? {})) {
+          s.tools[name] = (s.tools[name] ?? 0) + (n || 0);
+          s.toolCalls += n || 0;
+        }
+        if (!s.firstTs || r.ts < s.firstTs) s.firstTs = r.ts;
+        if (!s.lastTs || r.ts > s.lastTs) s.lastTs = r.ts;
+      }
+      return s;
+    };
+    topTools = (tools, n) => Object.entries(tools).sort((a, b) => b[1] - a[1] || a[0].localeCompare(b[0])).slice(0, n);
+  }
+});
+
 // ../core/src/agent/runAgent.ts
 async function* runAgent(message, options) {
   const sessionId = options.sessionId;
@@ -11033,6 +11858,7 @@ async function* runAgent(message, options) {
       cached_tokens: (usageSum?.cached_tokens ?? 0) + (u.cached_tokens ?? 0)
     };
   };
+  const toolCounts = {};
   await appendEvent(sessionId, { dscEvent: "run.start", runId, depth });
   try {
     while (true) {
@@ -11153,6 +11979,10 @@ async function* runAgent(message, options) {
         return;
       }
       nudges.noteToolCall(round, assistantMessage.tool_calls);
+      for (const tc of assistantMessage.tool_calls) {
+        const name = tc?.function?.name || "unknown";
+        toolCounts[name] = (toolCounts[name] ?? 0) + 1;
+      }
       const repeatVerdict = breaker.check(assistantMessage.tool_calls, round, lastContent);
       if (repeatVerdict.tripped) {
         stopReason = "repeat";
@@ -11216,6 +12046,25 @@ async function* runAgent(message, options) {
       await appendEvent(sessionId, { dscEvent: "run.end", runId, stopReason: signal?.aborted ? "aborted" : stopReason, rounds: round, usage: usageSum });
     } catch {
     }
+    try {
+      void recordUsageRun({
+        v: 1,
+        ts: (/* @__PURE__ */ new Date()).toISOString(),
+        sessionId,
+        runId,
+        depth,
+        model: options.model?.trim() || MODEL_NAME,
+        stopReason: signal?.aborted ? "aborted" : stopReason,
+        rounds: round,
+        durationMs: Math.round(performance.now() - startTime),
+        promptTokens: usageSum?.prompt_tokens,
+        completionTokens: usageSum?.completion_tokens,
+        totalTokens: usageSum?.total_tokens,
+        cachedTokens: usageSum?.cached_tokens,
+        tools: toolCounts
+      });
+    } catch {
+    }
     try {
       const reason = signal?.aborted ? "aborted" : stopReason;
       await dispatch("Stop", { sessionId, cwd, lastText: lastContent || "", reason });
@@ -11245,163 +12094,13 @@ var init_runAgent = __esm({
     init_toolScheduling();
     init_streamInference();
     init_agentNudges();
-  }
-});
-
-// ../core/src/session/recovery.ts
-var detectInterruption, repairOrphanToolCalls, reconcileCompaction, recoverSession;
-var init_recovery = __esm({
-  "../core/src/session/recovery.ts"() {
-    "use strict";
-    init_transcript();
-    init_store();
-    detectInterruption = (lines) => {
-      let sawEvents = false;
-      let lastStart;
-      const closed = /* @__PURE__ */ new Set();
-      for (const l of lines) {
-        if (!isEventLine(l)) continue;
-        sawEvents = true;
-        if (l.dscEvent === "run.start") lastStart = l;
-        else if (l.dscEvent === "run.end" || l.dscEvent === "run.abandoned") closed.add(l.runId);
-      }
-      if (!sawEvents || !lastStart) return { kind: "legacy" };
-      return closed.has(lastStart.runId) ? { kind: "clean" } : { kind: "crashed", runId: lastStart.runId };
-    };
-    repairOrphanToolCalls = (msgs, confirmedCrash) => {
-      const placeholder = confirmedCrash ? "\uFF08\u4E0A\u6B21\u4F1A\u8BDD\u5728\u5DE5\u5177\u6267\u884C\u4E2D\u5D29\u6E83\uFF08run \u672A\u95ED\u5408\uFF09\uFF0C\u8BE5\u8C03\u7528\u672A\u6267\u884C\uFF0C\u5DF2\u8DF3\u8FC7\u3002\uFF09" : "\uFF08\u8BE5\u5DE5\u5177\u8C03\u7528\u56E0\u4E0A\u6B21\u4F1A\u8BDD\u5F02\u5E38\u4E2D\u65AD\u672A\u7559\u4E0B\u7ED3\u679C\uFF0C\u5DF2\u8DF3\u8FC7\u3002\uFF09";
-      const out = [];
-      const repairedToolCallIds = [];
-      for (let i = 0; i < msgs.length; i++) {
-        const m = msgs[i];
-        out.push(m);
-        if (m.role === "assistant" && Array.isArray(m.tool_calls) && m.tool_calls.length > 0) {
-          const answered = /* @__PURE__ */ new Set();
-          let j = i + 1;
-          while (j < msgs.length && msgs[j].role === "tool") {
-            answered.add(msgs[j].tool_call_id);
-            j++;
-          }
-          for (const tc of m.tool_calls) {
-            if (tc.id && !answered.has(tc.id)) {
-              out.push({ role: "tool", tool_call_id: tc.id, content: placeholder });
-              repairedToolCallIds.push(tc.id);
-            }
-          }
-        }
-      }
-      return { msgs: out, repairedToolCallIds, confirmedCrash };
-    };
-    reconcileCompaction = (state, lines) => {
-      let last;
-      for (const l of lines) {
-        if (isEventLine(l) && l.dscEvent === "compaction") last = l;
-      }
-      if (!last) return { archivedMessageCount: state.archivedMessageCount, rollingSummary: state.rollingSummary, desync: "legacy" };
-      let desync = "none";
-      if (last.archivedMessageCount !== state.archivedMessageCount) {
-        desync = state.archivedMessageCount > last.archivedMessageCount ? "state-ahead" : "event-ahead";
-        console.warn(
-          `\u26A0\uFE0F [recovery] \u538B\u7F29\u72B6\u6001 desync\uFF08${desync}\uFF09\uFF1Astate.json archivedMessageCount=${state.archivedMessageCount} vs \u672B\u4E2A compaction \u4E8B\u4EF6=${last.archivedMessageCount}\u3002\u4EE5 state \u4E3A\u51C6\uFF08slice \u6267\u884C\u95F8\u95E8\uFF09\uFF0C\u4E8B\u4EF6\u4FA7\u4EC5\u955C\u50CF\u3002`
-        );
-      }
-      return { archivedMessageCount: state.archivedMessageCount, rollingSummary: state.rollingSummary, desync };
-    };
-    recoverSession = async (sessionId) => {
-      const lines = await readTranscriptLines(sessionId);
-      const interruption = detectInterruption(lines);
-      if (interruption.kind === "crashed") {
-        await appendEvent(sessionId, {
-          dscEvent: "run.abandoned",
-          runId: interruption.runId,
-          reason: "run.end missing: interrupted by process exit/kill"
-        });
-        console.warn(`\u27E6recovery\u27E7 \u68C0\u6D4B\u5230\u672A\u95ED\u5408 run\uFF08${interruption.runId.slice(0, 8)}\u2026\uFF09\u2192 \u5DF2\u8865 run.abandoned \u95ED\u5893\u6807\u8BB0\uFF1B\u5B64\u513F\u4FEE\u590D\u6309\u300C\u5D29\u6E83\u786E\u8BA4\u300D\u6863\u6267\u884C\u3002`);
-      }
-      const state = await getRollingState(sessionId);
-      const compaction = reconcileCompaction(
-        { archivedMessageCount: state.archivedMessageCount, rollingSummary: state.rollingSummary },
-        lines
-      );
-      return { interruption, compaction };
-    };
-  }
-});
-
-// ../core/src/session/content.ts
-var decayOldToolResults, enforceVisionGate, buildContextMessages;
-var init_content = __esm({
-  "../core/src/session/content.ts"() {
-    "use strict";
-    init_contextCore();
-    init_contentParts();
-    init_transcript();
-    init_store();
-    init_config();
-    init_visionCapability();
-    init_recovery();
-    decayOldToolResults = (msgs) => {
-      const units = groupUnits(msgs);
-      const cutoffUnitIdx = Math.max(0, units.length - appConfig.KEEP_RECENT_UNITS);
-      if (cutoffUnitIdx === 0) return msgs;
-      const decayIds = /* @__PURE__ */ new Set();
-      let hasOldImage = false;
-      for (let u = 0; u < cutoffUnitIdx; u++) {
-        for (const m of units[u]) {
-          const mm = m;
-          if (mm.role === "tool" && typeof mm.tool_call_id === "string") decayIds.add(mm.tool_call_id);
-          if (hasImagePart(m.content)) hasOldImage = true;
-        }
-      }
-      if (decayIds.size === 0 && !hasOldImage) return msgs;
-      const keep = appConfig.BOUNDARY_TOOL_KEEP_CHARS;
-      const oldRefs = /* @__PURE__ */ new Set();
-      for (let u = 0; u < cutoffUnitIdx; u++) for (const m of units[u]) oldRefs.add(m);
-      return msgs.map((m) => {
-        if (!oldRefs.has(m)) return m;
-        const mm = m;
-        if (mm.role === "tool" && decayIds.has(mm.tool_call_id) && typeof mm.content === "string" && mm.content.length > keep) {
-          const head = mm.content.slice(0, keep);
-          return { ...mm, content: `${head}
-
-[\u2026 \u8BE5\u5386\u53F2\u5DE5\u5177\u8F93\u51FA\u5DF2\u6298\u53E0\uFF08\u5171 ${mm.content.length} \u5B57\u7B26\uFF09\uFF0C\u5982\u9700\u7EC6\u8282\u8BF7\u91CD\u65B0\u8C03\u7528\u5DE5\u5177 \u2026]` };
-        }
-        return replaceImageParts(mm, "[\u5386\u53F2\u56FE\u7247\u5DF2\u6298\u53E0\uFF1A\u539F\u56FE\u4ECD\u5728\u4F1A\u8BDD\u5F52\u6863\u4E2D\uFF0C\u5982\u9700\u518D\u6B21\u67E5\u770B\u8BF7\u91CD\u65B0\u63D0\u4F9B\u8BE5\u56FE\u7247]");
-      });
-    };
-    enforceVisionGate = (msgs, modelId) => isVisionEnabled(modelId) ? msgs : msgs.map((m) => collapseToText(m, VISION_DEGRADE_NOTE));
-    buildContextMessages = async (sessionId, currentUserMsg, systemPrompt, modelId) => {
-      await ensureVisionCacheLoaded();
-      const lines = await readTranscriptLines(sessionId);
-      const store = await getRollingState(sessionId);
-      const eventAware = appConfig.transcriptEvents || lines.some(isEventLine);
-      const recovery = eventAware ? await recoverSession(sessionId) : {
-        interruption: { kind: "legacy" },
-        compaction: { archivedMessageCount: store.archivedMessageCount, rollingSummary: store.rollingSummary, desync: "legacy" }
-      };
-      const all = lines.filter((l) => !isEventLine(l)).map(cleanMsg);
-      const result = [
-        { role: "system", content: systemPrompt },
-        // 存储系统提示词
-        { role: "system", content: recovery.compaction.rollingSummary }
-        // 后续存储摘要使用
-      ];
-      const archivedMessageCount = recovery.compaction.archivedMessageCount;
-      const messageAll = all.slice(archivedMessageCount);
-      if (messageAll.length === 0) {
-        result.push(currentUserMsg);
-        return enforceVisionGate(result, modelId);
-      }
-      const repair = repairOrphanToolCalls(messageAll, recovery.interruption.kind === "crashed");
-      result.push(...decayOldToolResults(repair.msgs));
-      result.push(currentUserMsg);
-      return enforceVisionGate(result, modelId);
-    };
+    init_usageLog();
+    init_createModel();
   }
 });
 
 // ../core/src/session/lineage.ts
-import fs30 from "node:fs";
+import fs32 from "node:fs";
 var parentOfSubsession, stringAncestorsOf, readForkedFromSync, lineageClosureOf, ownerCanApprove;
 var init_lineage = __esm({
   "../core/src/session/lineage.ts"() {
@@ -11424,7 +12123,7 @@ var init_lineage = __esm({
     };
     readForkedFromSync = (sessionId) => {
       try {
-        const raw = fs30.readFileSync(getStatePath(sessionId), "utf-8");
+        const raw = fs32.readFileSync(getStatePath(sessionId), "utf-8");
         const v = JSON.parse(raw)?.forkedFrom;
         return typeof v === "string" && v.length > 0 ? v : void 0;
       } catch {
@@ -11454,7 +12153,7 @@ var init_lineage = __esm({
 });
 
 // ../core/src/agent/subagent.ts
-var SUBAGENT_DENYLIST, activeSubagents, RESUME_NOTE, runSubagent;
+var SUBAGENT_DENYLIST, activeSubagents, failText, RESUME_NOTE, runSubagent;
 var init_subagent = __esm({
   "../core/src/agent/subagent.ts"() {
     "use strict";
@@ -11468,6 +12167,7 @@ var init_subagent = __esm({
     init_lineage();
     SUBAGENT_DENYLIST = /* @__PURE__ */ new Set(["run_command", "delete_path"]);
     activeSubagents = /* @__PURE__ */ new Set();
+    failText = (msg) => toolFailure(msg).content;
     RESUME_NOTE = [
       `
 # \u3010\u7EED\u8DD1\u8BF4\u660E\u3011`,
@@ -11480,7 +12180,7 @@ var init_subagent = __esm({
       if (ctx.depth >= MAX_AGENT_DEPTH) {
         return {
           ok: false,
-          output: `\u274C [\u5B89\u5168\u7194\u65AD]\uFF1A\u5DF2\u8FBE\u5230\u6700\u5927 Agent \u5D4C\u5957\u6DF1\u5EA6\uFF08${MAX_AGENT_DEPTH}\u5C42\uFF09\u3002\u7981\u6B62\u7EE7\u7EED\u65E0\u9650\u5411\u4E0B\u5D4C\u5957\uFF0C\u8BF7\u7236\u5C42\u7EA7 Agent \u81EA\u884C\u6D88\u5316\u5F53\u524D\u4EFB\u52A1\u3002`,
+          output: failText(`[\u5B89\u5168\u7194\u65AD]\uFF1A\u5DF2\u8FBE\u5230\u6700\u5927 Agent \u5D4C\u5957\u6DF1\u5EA6\uFF08${MAX_AGENT_DEPTH}\u5C42\uFF09\u3002\u7981\u6B62\u7EE7\u7EED\u65E0\u9650\u5411\u4E0B\u5D4C\u5957\uFF0C\u8BF7\u7236\u5C42\u7EA7 Agent \u81EA\u884C\u6D88\u5316\u5F53\u524D\u4EFB\u52A1\u3002`),
           sessionId: ""
         };
       }
@@ -11489,21 +12189,21 @@ var init_subagent = __esm({
         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`,
+            output: failText(`[\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`,
+            output: failText(`[\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`,
+            output: failText(`[\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: ""
           };
         }
@@ -11511,7 +12211,7 @@ var init_subagent = __esm({
         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`,
+            output: failText(`[\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: ""
           };
         }
@@ -11522,7 +12222,7 @@ var init_subagent = __esm({
       if (name && !manifest) {
         return {
           ok: false,
-          output: `\u274C [\u6D3E\u751F\u5931\u8D25]\uFF1A\u672A\u627E\u5230\u58F0\u660E\u5F0F\u5B50 Agent "${name}"\u3002\u8BF7\u6838\u5BF9\u7CFB\u7EDF\u63D0\u793A\u8BCD\u4E2D\u3010\u53EF\u7528\u5B50 Agent \u76EE\u5F55\u3011\u7684\u540D\u79F0\u62FC\u5199\u3002`,
+          output: failText(`[\u6D3E\u751F\u5931\u8D25]\uFF1A\u672A\u627E\u5230\u58F0\u660E\u5F0F\u5B50 Agent "${name}"\u3002\u8BF7\u6838\u5BF9\u7CFB\u7EDF\u63D0\u793A\u8BCD\u4E2D\u3010\u53EF\u7528\u5B50 Agent \u76EE\u5F55\u3011\u7684\u540D\u79F0\u62FC\u5199\u3002`),
           sessionId: ""
         };
       }
@@ -11589,7 +12289,7 @@ var init_subagent = __esm({
         try {
           for await (const e of runAgent(subMessages, subOptions)) {
             if (ctx.abortSignal?.aborted) {
-              result = { ok: false, output: `\u274C [\u5B50Agent\u4E2D\u65AD]\uFF1A\u6267\u884C\u5DF2\u88AB\u7528\u6237\u4E3B\u52A8\u53D1\u8D77\u7684 AbortSignal \u5F3A\u884C\u7194\u65AD\u3002`, sessionId: subSessionId, manifestName: manifest?.name };
+              result = { ok: false, output: failText(`[\u5B50Agent\u4E2D\u65AD]\uFF1A\u6267\u884C\u5DF2\u88AB\u7528\u6237\u4E3B\u52A8\u53D1\u8D77\u7684 AbortSignal \u5F3A\u884C\u7194\u65AD\u3002`), sessionId: subSessionId, manifestName: manifest?.name };
               break;
             }
             if (e.type === "final") {
@@ -11604,15 +12304,15 @@ var init_subagent = __esm({
             result = { ok: true, output: subResult, sessionId: subSessionId, manifestName: manifest?.name };
           }
         } catch (streamError) {
-          result = { ok: false, output: `\u274C [\u5B50Agent\u5D29\u6E83]\uFF1A\u5B50 Agent \u5728\u8FED\u4EE3\u63A8\u7406\u4E3B\u5FAA\u73AF\u65F6\u906D\u9047\u5E95\u5C42\u5F02\u5E38: ${streamError.message}`, sessionId: subSessionId, manifestName: manifest?.name };
+          result = { ok: false, output: failText(`[\u5B50Agent\u5D29\u6E83]\uFF1A\u5B50 Agent \u5728\u8FED\u4EE3\u63A8\u7406\u4E3B\u5FAA\u73AF\u65F6\u906D\u9047\u5E95\u5C42\u5F02\u5E38: ${streamError.message}`), sessionId: subSessionId, manifestName: manifest?.name };
         } finally {
           if (result) {
             await dispatch("SubagentStop", { ...startCtx, ok: result.ok, output: result.output.slice(0, 2e3) }).catch((e) => console.warn(`\u26A0\uFE0F SubagentStop hook \u5F02\u5E38\uFF08\u5DF2\u5FFD\u7565\uFF09: ${e?.message ?? e}`));
           }
         }
-        return result ?? { ok: false, output: `\u274C [\u6D3E\u751F\u6267\u884C\u5931\u8D25]: \u672A\u77E5\u9519\u8BEF`, sessionId: subSessionId, manifestName: manifest?.name };
+        return result ?? { ok: false, output: failText(`[\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 };
+        return { ok: false, output: failText(`[\u6D3E\u751F\u6267\u884C\u5931\u8D25]: ${error.message}`), sessionId: subSessionId, manifestName: manifest?.name };
       } finally {
         activeSubagents.delete(subSessionId);
       }
@@ -11620,10 +12320,48 @@ var init_subagent = __esm({
   }
 });
 
+// ../core/src/hooks/trust.ts
+import path36 from "path";
+import fs33 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 = path36.join(appConfig.dataDir, "trusted_hooks.json");
+    approved = /* @__PURE__ */ new Set();
+    loaded = false;
+    ensureLoaded = async () => {
+      if (loaded) return;
+      const list = await readJSONFile(TRUSTED_HOOKS_FILE);
+      if (Array.isArray(list)) {
+        for (const x of list) if (typeof x === "string") approved.add(x);
+      }
+      loaded = true;
+    };
+    isHookCommandApproved = async (ident) => {
+      await ensureLoaded();
+      return approved.has(ident);
+    };
+    approveHookCommand = async (ident) => {
+      await ensureLoaded();
+      if (approved.has(ident)) return;
+      approved.add(ident);
+      try {
+        await fs33.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}`);
+      }
+    };
+  }
+});
+
 // ../core/src/hooks/loader.ts
-import fs31 from "fs/promises";
-import path33 from "path";
-var readHooksConfig, appendValidated, validateRule, parseStdoutDecision, parseAgentDecision, compileRule2, loadHooks, initHooks;
+import fs34 from "fs/promises";
+import path37 from "path";
+var slimHookContext, readHooksConfig, appendValidated, validateRule, parseStdoutDecision, parseAgentDecision, gateSeq, firstRunGate, compileRule2, loadHooks, initHooks;
 var init_loader4 = __esm({
   "../core/src/hooks/loader.ts"() {
     "use strict";
@@ -11634,18 +12372,32 @@ var init_loader4 = __esm({
     init_subagent();
     init_tool();
     init_types();
+    init_trust2();
+    slimHookContext = (ctx) => {
+      if (!ctx || typeof ctx !== "object" || !ctx.toolContext) return ctx;
+      const { toolContext, ...rest } = ctx;
+      return {
+        ...rest,
+        toolContext: {
+          sessionId: toolContext.sessionId,
+          cwd: toolContext.cwd,
+          depth: toolContext.depth,
+          permissionMode: toolContext.permissionMode
+        }
+      };
+    };
     readHooksConfig = async (includeProject) => {
       const merged = {};
       const paths = [
-        path33.join(appConfig.dataDir, "settings.json"),
+        path37.join(appConfig.dataDir, "settings.json"),
         // 全局用户级
-        ...includeProject ? [path33.join(process.cwd(), ".deepseeker-code", "settings.json")] : []
+        ...includeProject ? [path37.join(process.cwd(), ".deepseeker-code", "settings.json")] : []
         // 项目级（叠加）；未信任时省略
       ];
       for (const configPath of paths) {
         let raw;
         try {
-          raw = await fs31.readFile(configPath, "utf-8");
+          raw = await fs34.readFile(configPath, "utf-8");
         } catch {
           continue;
         }
@@ -11658,14 +12410,14 @@ var init_loader4 = __esm({
         }
         const hooksBlock = parsed?.hooks;
         if (!hooksBlock || typeof hooksBlock !== "object") continue;
-        appendValidated(merged, hooksBlock, configPath);
+        appendValidated(merged, hooksBlock, configPath, configPath === paths[1]);
         if (configPath === paths[1] && Object.keys(hooksBlock).length > 0) {
           console.warn(`\u26A0\uFE0F\u3010\u5B89\u5168\u63D0\u793A\u3011\u5DF2\u52A0\u8F7D\u9879\u76EE\u7EA7 hook \u914D\u7F6E [${configPath}]\uFF0C\u5176 command \u5C06\u4EE5 shell \u6267\u884C\u3002\u4EC5\u5728\u4FE1\u4EFB\u8BE5\u9879\u76EE\u65F6\u542F\u7528\uFF1B\u514B\u9686\u672A\u77E5\u4ED3\u5E93\u524D\u8BF7\u6838\u67E5\u8BE5\u6587\u4EF6\u4EE5\u9632\u4EFB\u610F\u547D\u4EE4\u6267\u884C\u3002`);
         }
       }
       return merged;
     };
-    appendValidated = (merged, hooksBlock, src) => {
+    appendValidated = (merged, hooksBlock, src, isProject) => {
       for (const [key, val] of Object.entries(hooksBlock)) {
         if (!ALL_EVENTS.includes(key)) {
           console.warn(`\u26A0\uFE0F [hooks] \u672A\u77E5\u4E8B\u4EF6\u7C7B\u578B "${key}"\uFF08${src}\uFF09\uFF0C\u5DF2\u8DF3\u8FC7`);
@@ -11679,7 +12431,7 @@ var init_loader4 = __esm({
         const list = merged[event] ??= [];
         val.forEach((item, i) => {
           const rule = validateRule(item, event, src, i);
-          if (rule) list.push(rule);
+          if (rule) list.push(isProject ? { ...rule, projectSource: true } : rule);
         });
       }
     };
@@ -11802,10 +12554,52 @@ var init_loader4 = __esm({
       }
       return { deny: false, explicit: false };
     };
+    gateSeq = 0;
+    firstRunGate = (raw, ident, run) => {
+      const gated = raw.requireApproval === true || raw.projectSource === true;
+      if (!gated) return run;
+      return async (ctx) => {
+        if (await isHookCommandApproved(ident)) return run(ctx);
+        const req = ctx?.toolContext?.requestApproval;
+        if (typeof req !== "function") {
+          console.warn(`\u23ED\uFE0F [hooks] ${raw.type ?? "command"} hook \u9996\u8DD1\u5F85\u5BA1\u6279\u4E14\u5F53\u524D\u4E8B\u4EF6\u65E0\u5BA1\u6279\u901A\u9053\uFF0C\u5DF2\u8DF3\u8FC7\uFF1A${ident.slice(0, 120)}\uFF08\u53EF\u5728 CLI \u5DE5\u5177\u4E8B\u4EF6\u89E6\u53D1\u65F6\u6279\u51C6\u300C\u59CB\u7EC8\u5141\u8BB8\u300D\uFF0C\u6216\u624B\u52A8\u52A0\u5165 ~/.deepseeker-code/trusted_hooks.json\uFF09`);
+          return { deny: false };
+        }
+        const kindLabel = raw.projectSource ? "\u9879\u76EE\u7EA7" : "\u5168\u5C40";
+        const detail = raw.type === "http" ? `${kindLabel} hook \u9996\u6B21\u8FD0\u884C\uFF1A\u8BF7\u6C42\u5C06\u4E0A\u4E0B\u6587 POST \u5230\u5916\u90E8 URL
+${ident}` : raw.type === "agent" ? `${kindLabel} hook \u9996\u6B21\u8FD0\u884C\uFF1A\u6D3E\u5B50 agent \u8BC4\u5224\u5DE5\u5177\u8C03\u7528
+\u4EFB\u52A1\uFF1A${ident}` : `${kindLabel} hook \u9996\u6B21\u8FD0\u884C\uFF1A\u6267\u884C shell \u547D\u4EE4
+${ident}`;
+        let decision;
+        try {
+          decision = await req(detail, {
+            toolName: `hook:${raw.type ?? "command"}`,
+            toolCallId: `hook-${++gateSeq}`,
+            sessionId: ctx?.toolContext?.sessionId ?? ""
+          });
+        } catch (e) {
+          console.warn(`\u23ED\uFE0F [hooks] \u9996\u8DD1\u5BA1\u6279\u901A\u9053\u5F02\u5E38\uFF0C\u5DF2\u8DF3\u8FC7\u8BE5 hook: ${e?.message ?? e}`);
+          return { deny: false };
+        }
+        if (decision === "deny") {
+          console.warn(`\u23ED\uFE0F [hooks] \u9996\u8DD1\u5BA1\u6279\u88AB\u62D2\u7EDD\uFF0C\u672C\u6B21\u8DF3\u8FC7\u8BE5 hook\uFF1A${ident.slice(0, 120)}`);
+          return { deny: false };
+        }
+        if (decision === "allow-always") await approveHookCommand(ident);
+        return run(ctx);
+      };
+    };
     compileRule2 = (event, raw) => {
       const denyOnNonZero = raw.denyOnNonZero ?? event === "PreToolUse";
       const timeoutMs2 = raw.timeoutMs ?? DEFAULT_TIMEOUT_BY_EVENT[event];
-      const base = { event, matcher: raw.matcher, source: "config", onError: raw.onError };
+      const base = {
+        event,
+        matcher: raw.matcher,
+        source: "config",
+        onError: raw.onError,
+        // #9 可观测：首跑审批门是否启用（/hooks 展示）
+        firstRunApproval: raw.requireApproval === true || raw.projectSource === true
+      };
       if (raw.type === "prompt") {
         const text = raw.text;
         return { ...base, run: async () => ({ contextAdditions: [text] }) };
@@ -11814,7 +12608,7 @@ var init_loader4 = __esm({
         const task = raw.task;
         return {
           ...base,
-          run: async (ctx) => {
+          run: firstRunGate(raw, task, async (ctx) => {
             const tc = ctx?.toolContext;
             if (!tc || typeof tc.depth === "number" && tc.depth > 0) return { deny: false };
             const fullTask = [
@@ -11835,20 +12629,20 @@ var init_loader4 = __esm({
               return decision.deny ? { deny: true, reason: decision.reason ?? "hook agent \u62D2\u7EDD\uFF08\u672A\u7ED9\u7406\u7531\uFF09" } : { deny: false };
             }
             return denyOnNonZero ? { deny: true, reason: "hook agent \u672A\u8F93\u51FA\u660E\u786E\u51B3\u7B56\uFF08DENY/ALLOW\uFF09\uFF0C\u6309 fail-closed \u62D2\u7EDD" } : { deny: false };
-          }
+          })
         };
       }
       if (raw.type === "http") {
         const url = raw.url;
         return {
           ...base,
-          run: async (ctx) => {
+          run: firstRunGate(raw, url, async (ctx) => {
             const res = await executeHttpHook({
               url,
               method: raw.method,
               headers: raw.headers,
-              body: ctx,
-              // 整个 hook 上下文 JSON 化发出（含 sessionId/toolName/args/prompt 等）
+              body: slimHookContext(ctx),
+              // hook 上下文 JSON 化发出（含 sessionId/toolName/args/prompt 等；toolContext 走瘦投影）
               timeoutMs: timeoutMs2
             });
             if (!res.ok) {
@@ -11872,19 +12666,19 @@ var init_loader4 = __esm({
               return { deny: true, reason: `hook http \u72B6\u6001\u7801 ${res.status}` };
             }
             return { deny: false };
-          }
+          })
         };
       }
       const command = raw.command;
       return {
         ...base,
-        run: async (ctx) => {
+        run: firstRunGate(raw, command, async (ctx) => {
           const res = await executeHookCommand({
             command,
             cwd: ctx?.cwd,
             env: ctx?.env,
             timeoutMs: timeoutMs2,
-            stdinPayload: ctx
+            stdinPayload: slimHookContext(ctx)
           });
           if (res.timedOut) {
             return denyOnNonZero ? { deny: true, reason: `hook \u6267\u884C\u8D85\u65F6\uFF08>${timeoutMs2}ms\uFF09` } : { deny: false };
@@ -11898,19 +12692,19 @@ var init_loader4 = __esm({
             if (out) return out;
           }
           return { deny: false };
-        }
+        })
       };
     };
     loadHooks = async (includeProject) => {
       const cfg = await readHooksConfig(includeProject);
-      const compiled = [];
+      const compiled2 = [];
       for (const event of ALL_EVENTS) {
         const list = cfg[event];
         if (!list || list.length === 0) continue;
-        for (const raw of list) compiled.push(compileRule2(event, raw));
+        for (const raw of list) compiled2.push(compileRule2(event, raw));
       }
-      replaceDeclarativeHooks(compiled);
-      return compiled.length;
+      replaceDeclarativeHooks(compiled2);
+      return compiled2.length;
     };
     initHooks = async (includeProject) => {
       try {
@@ -11961,11 +12755,11 @@ ${m.context}`;
           async execute(args) {
             const name = args?.name;
             if (typeof name !== "string" || !name.trim()) {
-              return "\u274C [load_skill] \u7F3A\u5C11\u53C2\u6570 name\u3002\u8BF7\u5148\u67E5\u770B\u3010\u53EF\u7528\u6280\u80FD\u76EE\u5F55\u3011\u4E2D\u7684\u6280\u80FD\u540D\u3002";
+              return toolFailure("[load_skill] \u7F3A\u5C11\u53C2\u6570 name\u3002\u8BF7\u5148\u67E5\u770B\u3010\u53EF\u7528\u6280\u80FD\u76EE\u5F55\u3011\u4E2D\u7684\u6280\u80FD\u540D\u3002");
             }
             const manifest = getSkillManifest(name.trim());
             if (!manifest) {
-              return `\u274C \u672A\u627E\u5230\u6280\u80FD\uFF1A${name}\u3002\u8BF7\u6838\u5BF9\u3010\u53EF\u7528\u6280\u80FD\u76EE\u5F55\u3011\u4E2D\u7684\u540D\u79F0\u62FC\u5199\u3002`;
+              return toolFailure(`\u672A\u627E\u5230\u6280\u80FD\uFF1A${name}\u3002\u8BF7\u6838\u5BF9\u3010\u53EF\u7528\u6280\u80FD\u76EE\u5F55\u3011\u4E2D\u7684\u540D\u79F0\u62FC\u5199\u3002`);
             }
             return assembleSkillContent(manifest);
           }
@@ -11976,8 +12770,8 @@ ${m.context}`;
 });
 
 // ../core/src/skills/loader.ts
-import fs32 from "fs/promises";
-import path34 from "path";
+import fs35 from "fs/promises";
+import path38 from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 var BUILTIN_DIR, SOURCES2, MAX_SKILL_BODY_BYTES, splitList, parseSkillAt, loadSkills, initSkills;
 var init_loader5 = __esm({
@@ -11988,18 +12782,18 @@ var init_loader5 = __esm({
     init_registry3();
     init_skill();
     init_registry2();
-    BUILTIN_DIR = path34.join(path34.dirname(fileURLToPath2(import.meta.url)), "builtin");
+    BUILTIN_DIR = path38.join(path38.dirname(fileURLToPath2(import.meta.url)), "builtin");
     SOURCES2 = [
       { dir: BUILTIN_DIR, source: "builtin" },
-      { dir: path34.join(appConfig.dataDir, "skills"), source: "global" },
-      { dir: path34.join(process.cwd(), ".deepseeker-code", "skills"), source: "project" }
+      { dir: path38.join(appConfig.dataDir, "skills"), source: "global" },
+      { dir: path38.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 fs32.readFile(skillFile, "utf-8");
+        raw = await fs35.readFile(skillFile, "utf-8");
       } catch {
         return null;
       }
@@ -12038,7 +12832,7 @@ var init_loader5 = __esm({
     loadSkills = async (includeProject) => {
       const picked = await scanSources(
         filterSources(SOURCES2, includeProject),
-        (e, dir) => e.isDirectory() ? path34.join(dir, e.name, "SKILL.md") : void 0,
+        (e, dir) => e.isDirectory() ? path38.join(dir, e.name, "SKILL.md") : void 0,
         parseSkillAt
       );
       for (const { item } of picked) registerSkill(item);
@@ -12069,8 +12863,8 @@ var init_loader5 = __esm({
 });
 
 // ../core/src/agents/loader.ts
-import fs33 from "fs/promises";
-import path35 from "path";
+import fs36 from "fs/promises";
+import path39 from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 var BUILTIN_DIR2, SOURCES3, parseAgentAt, initAgents;
 var init_loader6 = __esm({
@@ -12080,16 +12874,16 @@ var init_loader6 = __esm({
     init_frontmatter();
     init_registry4();
     init_registry2();
-    BUILTIN_DIR2 = path35.join(path35.dirname(fileURLToPath3(import.meta.url)), "builtin");
+    BUILTIN_DIR2 = path39.join(path39.dirname(fileURLToPath3(import.meta.url)), "builtin");
     SOURCES3 = [
       { dir: BUILTIN_DIR2, source: "builtin" },
-      { dir: path35.join(appConfig.dataDir, "agents"), source: "global" },
-      { dir: path35.join(process.cwd(), ".deepseeker-code", "agents"), source: "project" }
+      { dir: path39.join(appConfig.dataDir, "agents"), source: "global" },
+      { dir: path39.join(process.cwd(), ".deepseeker-code", "agents"), source: "project" }
     ];
     parseAgentAt = async (file, dir, source) => {
       let raw;
       try {
-        raw = await fs33.readFile(file, "utf-8");
+        raw = await fs36.readFile(file, "utf-8");
       } catch {
         return null;
       }
@@ -12124,7 +12918,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") ? path35.join(dir, e.name) : void 0,
+          (e, dir) => e.isFile() && e.name.endsWith(".agent.md") ? path39.join(dir, e.name) : void 0,
           parseAgentAt
         );
         for (const { item: m, file, source } of picked) {
@@ -12161,8 +12955,8 @@ var init_registry7 = __esm({
 });
 
 // ../core/src/commands/loader.ts
-import fs34 from "fs/promises";
-import path36 from "path";
+import fs37 from "fs/promises";
+import path40 from "path";
 import { fileURLToPath as fileURLToPath4 } from "url";
 var BUILTIN_DIR3, SOURCES4, MAX_COMMAND_BODY_BYTES, parseCommandAt, loadCommands, initCommands;
 var init_loader7 = __esm({
@@ -12172,17 +12966,17 @@ var init_loader7 = __esm({
     init_frontmatter();
     init_registry7();
     init_registry2();
-    BUILTIN_DIR3 = path36.join(path36.dirname(fileURLToPath4(import.meta.url)), "builtin");
+    BUILTIN_DIR3 = path40.join(path40.dirname(fileURLToPath4(import.meta.url)), "builtin");
     SOURCES4 = [
       { dir: BUILTIN_DIR3, source: "builtin" },
-      { dir: path36.join(appConfig.dataDir, "commands"), source: "global" },
-      { dir: path36.join(process.cwd(), ".deepseeker-code", "commands"), source: "project" }
+      { dir: path40.join(appConfig.dataDir, "commands"), source: "global" },
+      { dir: path40.join(process.cwd(), ".deepseeker-code", "commands"), source: "project" }
     ];
     MAX_COMMAND_BODY_BYTES = 64 * 1024;
     parseCommandAt = async (file, _dir, source) => {
       let raw;
       try {
-        raw = await fs34.readFile(file, "utf-8");
+        raw = await fs37.readFile(file, "utf-8");
       } catch {
         return null;
       }
@@ -12193,7 +12987,7 @@ var init_loader7 = __esm({
       }
       const name = parsed.frontmatter.name;
       const description = parsed.frontmatter.description;
-      const fallbackName = path36.basename(file, ".md");
+      const fallbackName = path40.basename(file, ".md");
       const finalName = name || fallbackName;
       if (!description) {
         console.warn(`\u26A0\uFE0F [commands] \u7F3A\u5C11 description\uFF08${file}\uFF09\uFF0C\u5DF2\u8DF3\u8FC7`);
@@ -12219,7 +13013,7 @@ var init_loader7 = __esm({
     loadCommands = async (includeProject) => {
       const picked = await scanSources(
         filterSources(SOURCES4, includeProject),
-        (e, dir) => e.isFile() && e.name.endsWith(".md") ? path36.join(dir, e.name) : void 0,
+        (e, dir) => e.isFile() && e.name.endsWith(".md") ? path40.join(dir, e.name) : void 0,
         parseCommandAt
       );
       for (const { item } of picked) registerCommand(item);
@@ -12237,8 +13031,8 @@ var init_loader7 = __esm({
 });
 
 // ../core/src/outputStyles/loader.ts
-import fs35 from "fs/promises";
-import path37 from "path";
+import fs38 from "fs/promises";
+import path41 from "path";
 import { fileURLToPath as fileURLToPath5 } from "url";
 var BUILTIN_DIR4, MAX_STYLE_BODY_BYTES, SOURCES5, parseStyleAt, loadOutputStyles, initOutputStyles;
 var init_loader8 = __esm({
@@ -12248,17 +13042,17 @@ var init_loader8 = __esm({
     init_frontmatter();
     init_registry5();
     init_registry2();
-    BUILTIN_DIR4 = path37.join(path37.dirname(fileURLToPath5(import.meta.url)), "builtin");
+    BUILTIN_DIR4 = path41.join(path41.dirname(fileURLToPath5(import.meta.url)), "builtin");
     MAX_STYLE_BODY_BYTES = 64 * 1024;
     SOURCES5 = [
       { dir: BUILTIN_DIR4, source: "builtin" },
-      { dir: path37.join(appConfig.dataDir, "output-styles"), source: "global" },
-      { dir: path37.join(process.cwd(), ".deepseeker-code", "output-styles"), source: "project" }
+      { dir: path41.join(appConfig.dataDir, "output-styles"), source: "global" },
+      { dir: path41.join(process.cwd(), ".deepseeker-code", "output-styles"), source: "project" }
     ];
     parseStyleAt = async (file, _dir, source) => {
       let raw;
       try {
-        raw = await fs35.readFile(file, "utf-8");
+        raw = await fs38.readFile(file, "utf-8");
       } catch {
         return null;
       }
@@ -12290,7 +13084,7 @@ var init_loader8 = __esm({
     loadOutputStyles = async (includeProject) => {
       const picked = await scanSources(
         filterSources(SOURCES5, includeProject),
-        (e, dir) => e.isFile() && e.name.endsWith(".md") ? path37.join(dir, e.name) : void 0,
+        (e, dir) => e.isFile() && e.name.endsWith(".md") ? path41.join(dir, e.name) : void 0,
         parseStyleAt
       );
       for (const { item } of picked) registerOutputStyle(item);
@@ -12371,8 +13165,8 @@ var init_bootstrap = __esm({
 });
 
 // ../core/src/statusLine/config.ts
-import fs36 from "fs/promises";
-import path38 from "path";
+import fs39 from "fs/promises";
+import path42 from "path";
 var parseBlock, readStatusLineConfig;
 var init_config2 = __esm({
   "../core/src/statusLine/config.ts"() {
@@ -12388,16 +13182,16 @@ var init_config2 = __esm({
     };
     readStatusLineConfig = async (includeProject) => {
       const paths = [
-        path38.join(appConfig.dataDir, "settings.json"),
+        path42.join(appConfig.dataDir, "settings.json"),
         // 全局用户级
-        ...includeProject ? [path38.join(process.cwd(), ".deepseeker-code", "settings.json")] : []
+        ...includeProject ? [path42.join(process.cwd(), ".deepseeker-code", "settings.json")] : []
         // 项目级（覆盖）；未信任时省略
       ];
       let result = null;
       for (const configPath of paths) {
         let raw;
         try {
-          raw = await fs36.readFile(configPath, "utf-8");
+          raw = await fs39.readFile(configPath, "utf-8");
         } catch {
           continue;
         }
@@ -12417,8 +13211,8 @@ var init_config2 = __esm({
 
 // ../core/src/statusLine/runner.ts
 import { spawn as spawn5 } from "child_process";
-import fs37 from "fs";
-import path39 from "path";
+import fs40 from "fs";
+import path43 from "path";
 import { fileURLToPath as fileURLToPath6 } from "url";
 var STATUSLINE_TIMEOUT_MS, cachedVersion, runStatusLine;
 var init_runner = __esm({
@@ -12427,16 +13221,16 @@ var init_runner = __esm({
     init_guard();
     STATUSLINE_TIMEOUT_MS = 3e3;
     try {
-      const here = path39.dirname(fileURLToPath6(import.meta.url));
+      const here = path43.dirname(fileURLToPath6(import.meta.url));
       const candidates = [
-        path39.join(here, "../../../package.json"),
+        path43.join(here, "../../../package.json"),
         // src/core/package.json
-        path39.join(here, "../../../../package.json")
+        path43.join(here, "../../../../package.json")
         // 仓库根 package.json
       ];
       for (const p of candidates) {
         try {
-          const pkg = JSON.parse(fs37.readFileSync(p, "utf-8"));
+          const pkg = JSON.parse(fs40.readFileSync(p, "utf-8"));
           if (typeof pkg.version === "string" && pkg.version) {
             cachedVersion = pkg.version;
             break;
@@ -12487,8 +13281,8 @@ var init_runner = __esm({
 });
 
 // ../core/src/observability/store.ts
-import path40 from "path";
-import fs38 from "fs/promises";
+import path44 from "path";
+import fs41 from "fs/promises";
 var getTraceDirPath, getTracePath, tracePathCache, ensuredTraceDirs, ensureTraceDir, getGlobalClockPath, getTraceStorePath;
 var init_store3 = __esm({
   "../core/src/observability/store.ts"() {
@@ -12498,21 +13292,21 @@ var init_store3 = __esm({
     init_common();
     getTraceDirPath = (mainTraceId) => {
       assertSafeSessionId(mainTraceId, "traceId");
-      return path40.join(appConfig.dataDir, "trace", appConfig.userWorkspaceDir, getFileName(mainTraceId));
+      return path44.join(appConfig.dataDir, "trace", appConfig.userWorkspaceDir, getFileName(mainTraceId));
     };
     getTracePath = () => {
-      return path40.join(appConfig.dataDir, "trace");
+      return path44.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 fs38.mkdir(dir, { recursive: true });
+      await fs41.mkdir(dir, { recursive: true });
       ensuredTraceDirs.add(dir);
     };
     getGlobalClockPath = () => {
-      return path40.join(getTracePath(), "trace-cleanup-clock.json");
+      return path44.join(getTracePath(), "trace-cleanup-clock.json");
     };
     getTraceStorePath = async (mainTraceId) => {
       assertSafeSessionId(mainTraceId, "traceId");
@@ -12521,7 +13315,7 @@ var init_store3 = __esm({
       if (cached2) return cached2;
       await ensureTraceDir(rootId);
       const dir = getTraceDirPath(rootId);
-      const files = await fs38.readdir(dir);
+      const files = await fs41.readdir(dir);
       const existedFile = files.find((f) => f.endsWith(`__${rootId}.jsonl`));
       let fileName = "";
       if (existedFile) {
@@ -12530,7 +13324,7 @@ var init_store3 = __esm({
         const todayStr = getTodayDateString();
         fileName = `trace-${todayStr}__${rootId}.jsonl`;
       }
-      const resolved = path40.join(dir, fileName);
+      const resolved = path44.join(dir, fileName);
       tracePathCache.set(rootId, resolved);
       return resolved;
     };
@@ -12538,8 +13332,8 @@ var init_store3 = __esm({
 });
 
 // ../core/src/observability/trace.ts
-import fs39 from "fs/promises";
-import path41 from "path";
+import fs42 from "fs/promises";
+import path45 from "path";
 async function emitTrace(base) {
   const event = {
     sessionId: base.sessionId,
@@ -12561,7 +13355,7 @@ async function emitTrace(base) {
 async function appendTraceEvent(event) {
   const p = await getTraceStorePath(event.sessionId);
   const line = JSON.stringify(event) + "\n";
-  await fs39.appendFile(p, line, "utf-8");
+  await fs42.appendFile(p, line, "utf-8");
   if (workspaceTraceBytes < 0) {
     workspaceTraceBytes = await getDirBytes(getTracePath());
   }
@@ -12593,8 +13387,8 @@ async function maybeCleanupAfterAppend(sessionId) {
     lastSizeCleanupAt2 = now;
     diskLastCleanupAt2 = now;
     const clockPath = getGlobalClockPath();
-    await fs39.mkdir(path41.dirname(clockPath), { recursive: true });
-    await fs39.writeFile(clockPath, JSON.stringify({ lastCleanupAt: now, updatedAt: (/* @__PURE__ */ new Date()).toISOString() }, null, 2), "utf-8");
+    await fs42.mkdir(path45.dirname(clockPath), { recursive: true });
+    await fs42.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`);
     }
@@ -12614,22 +13408,22 @@ async function cleanupOldTraceFiles() {
   let deleted = 0;
   let relativePaths;
   try {
-    relativePaths = await fs39.readdir(dir, { recursive: true });
+    relativePaths = await fs42.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 = path41.basename(relativePath);
+    const fileName = path45.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 = path41.join(dir, relativePath);
+    const fullPath = path45.join(dir, relativePath);
     try {
-      const st = await fs39.stat(fullPath);
+      const st = await fs42.stat(fullPath);
       if (now - st.mtimeMs < ACTIVE_GRACE_MS2) continue;
-      await fs39.unlink(fullPath);
+      await fs42.unlink(fullPath);
       deleted += 1;
     } catch {
     }
@@ -12640,18 +13434,18 @@ async function evictOldestForSize2(targetBytes) {
   const dir = getTracePath();
   let relativePaths;
   try {
-    relativePaths = await fs39.readdir(dir, { recursive: true });
+    relativePaths = await fs42.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 = path41.basename(relativePath);
+    const fileName = path45.basename(relativePath);
     if (!re.test(fileName)) continue;
     try {
-      const st = await fs39.stat(path41.join(dir, relativePath));
-      candidates.push({ mtime: st.mtimeMs, fullPath: path41.join(dir, relativePath), size: st.size });
+      const st = await fs42.stat(path45.join(dir, relativePath));
+      candidates.push({ mtime: st.mtimeMs, fullPath: path45.join(dir, relativePath), size: st.size });
     } catch {
     }
   }
@@ -12661,7 +13455,7 @@ async function evictOldestForSize2(targetBytes) {
   for (const c of candidates) {
     if (totalBytes <= targetBytes) break;
     try {
-      await fs39.unlink(c.fullPath);
+      await fs42.unlink(c.fullPath);
       totalBytes -= c.size;
       deleted += 1;
     } catch {
@@ -12693,7 +13487,7 @@ var init_trace = __esm({
       if (clockLoaded2) return;
       clockLoaded2 = true;
       try {
-        const rawClock = await fs39.readFile(getGlobalClockPath(), "utf-8");
+        const rawClock = await fs42.readFile(getGlobalClockPath(), "utf-8");
         diskLastCleanupAt2 = JSON.parse(rawClock).lastCleanupAt || 0;
       } catch {
         diskLastCleanupAt2 = 0;
@@ -12819,7 +13613,7 @@ var init_systemPrompt = __esm({
 - **\u6539\u5B8C\u52FF\u7ACB\u523B\u91CD\u8BFB\uFF08\u53CD\u788E\u6B65\xB7\u91CD\u8981\uFF09**\uFF1Aedit_file / write_file \u6210\u529F\u8FD4\u56DE\u540E\uFF0C\u5DE5\u5177\u7ED3\u679C\u5DF2\u8BF4\u660E\u6539\u4E86\u4EC0\u4E48\uFF0C\u4E0D\u8981\u9A6C\u4E0A read_file \u628A\u6574\u4E2A\u6587\u4EF6\u91CD\u8BFB\u4E00\u904D\u6765"\u786E\u8BA4"\u3002\u786E\u9700\u6838\u9A8C\u65F6\uFF0C\u53EA\u8BFB\u6539\u52A8\u9644\u8FD1\u51E0\u884C\u6216\u8DD1\u7C7B\u578B\u68C0\u67E5/\u6D4B\u8BD5\uFF0C\u800C\u975E\u6574\u6587\u4EF6\u91CD\u8BFB\u3002
 - \u4E0D\u91CD\u590D\u6293\u53D6\u5DF2\u6293\u53D6\u8FC7\u7684 URL\uFF1B\u4E0D\u7528\u8FD1\u4E49\u5173\u952E\u8BCD\u53CD\u590D\u641C\u7D22\u540C\u4E00\u4E2A\u610F\u56FE\u3002
 - \u8054\u7F51/\u641C\u7D22\u7C7B\u8C03\u7814\u4EFB\u52A1\uFF0C\u901A\u5E38 1~3 \u4E2A\u6765\u6E90\u5DF2\u8DB3\u591F\u652F\u6491\u56DE\u7B54\u2014\u2014\u62FF\u5230\u5373\u7EFC\u5408\u4F5C\u7B54\uFF0C\u4E0D\u8981\u4E3A\u8FFD\u6C42"\u66F4\u5168\u9762"\u800C\u65E0\u9650\u8FFD\u52A0\u68C0\u7D22\u8F6E\u6B21\u3002
-- \u4E00\u6B21\u53EA\u63A8\u8FDB\u4E00\u4E2A\u660E\u786E\u7684\u5B50\u76EE\u6807\uFF0C\u907F\u514D\u5728\u540C\u4E00\u8F6E\u91CC\u5806\u780C\u5927\u91CF\u5DE5\u5177\u8C03\u7528\u3002
+- **\u72EC\u7ACB\u8BFB\u64CD\u4F5C\u5E76\u884C\u6253\u5305\uFF08\u91CD\u8981\uFF09**\uFF1A\u591A\u4E2A\u4E92\u4E0D\u4F9D\u8D56\u7684\u53EA\u8BFB\u8C03\u7528\uFF08\u8BFB\u591A\u4E2A\u6587\u4EF6\u3001\u591A\u4E2A\u68C0\u7D22\u3001\u591A\u4E2A\u5B9A\u4E49\u67E5\u8BE2\uFF09\u5E94\u5728\u540C\u4E00\u6761\u6D88\u606F\u91CC\u4E00\u6B21\u6027\u5168\u90E8\u53D1\u51FA\uFF0C\u6267\u884C\u5C42\u4F1A\u81EA\u52A8\u5E76\u53D1\u6267\u884C\uFF0C\u4E00\u8F6E\u9876\u591A\u8F6E\uFF1B\u6709\u4F9D\u8D56\uFF08\u540E\u4E00\u6B65\u8981\u7528\u524D\u4E00\u6B65\u7ED3\u679C\uFF09\u6216\u4F1A\u6539\u72B6\u6001\u7684\u64CD\u4F5C\uFF0C\u5FC5\u987B\u7B49\u524D\u5E8F\u7ED3\u679C\u8FD4\u56DE\u518D\u53D1\u3002
 - \u591A\u6B65\u9AA4\u7684\u590D\u6742\u4EFB\u52A1\uFF08\u22653 \u6B65\u3001\u8DE8\u591A\u6587\u4EF6\u6216\u591A\u9636\u6BB5\uFF09\u5148\u8C03\u7528 todo_write \u628A\u8BA1\u5212\u62C6\u6210\u53EF\u52FE\u9009\u7684\u4EFB\u52A1\u6E05\u5355\uFF0C\u518D\u9010\u6B65\u63A8\u8FDB\u5E76\u5373\u65F6\u66F4\u65B0\u72B6\u6001\u2014\u2014\u8BA9\u4F60\u548C\u7528\u6237\u90FD\u770B\u6E05\u8FDB\u5EA6\u3001\u4E0D\u9057\u6F0F\u6B65\u9AA4\uFF1B\u7B80\u5355 1-2 \u6B65\u7684\u4EFB\u52A1\u65E0\u9700\u5EFA\u6E05\u5355\u3002
 
 \u3010\u64CD\u4F5C\u786E\u8BA4\u7EA6\u5B9A\u3011
@@ -12840,8 +13634,8 @@ ${PLAN_MODE_AUTO_ENTER_HINT}
 });
 
 // ../core/src/serve/chatProcessing.ts
-import path42 from "path";
-import fs40 from "fs";
+import path46 from "path";
+import fs43 from "fs";
 var handleUnifiedChat;
 var init_chatProcessing = __esm({
   "../core/src/serve/chatProcessing.ts"() {
@@ -12897,17 +13691,17 @@ ${inject}`;
       if (roots.length > 1) {
         let activeReal = getActiveWorkspaceRoot();
         try {
-          activeReal = fs40.realpathSync(activeReal);
+          activeReal = fs43.realpathSync(activeReal);
         } catch {
         }
-        const lines = roots.map((r) => `- ${path42.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"}`);
+        const lines = roots.map((r) => `- ${path46.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"}`);
         sysPrompt = sysPrompt + `
 
 \u3010\u5DE5\u4F5C\u533A\uFF08\u591A\u9879\u76EE\uFF09\u3011
 \u65E0\u9700\u5207\u6362\u9879\u76EE\uFF0C\u4EE5\u4E0B\u6240\u6709\u6839\u90FD\u53EF\u76F4\u63A5\u7528\u7EDD\u5BF9\u8DEF\u5F84\u8BBF\u95EE\uFF1B\u8DE8\u9879\u76EE\u7528\u7EDD\u5BF9\u8DEF\u5F84\u6216\u76F8\u5BF9\u9ED8\u8BA4\u6839\u7684 ../<\u5144\u5F1F\u76EE\u5F55>:
 ${lines.join("\n")}
-\u2605 \u8DEF\u5F84\u951A\u5B9A\u94C1\u5F8B\uFF1A\u5DE5\u5177\u7F3A\u7701\u53EA\u4F5C\u7528\u4E8E\u9ED8\u8BA4\u6839\uFF08${path42.basename(activeReal) || activeReal} = IDE \u5934\u90E8\u6240\u793A\u6839\uFF09\u3002\u5F53\u7528\u6237\u5728\u5BF9\u8BDD\u4E2D\u6307\u660E\u4E86\u67D0\u4E2A\u9879\u76EE\uFF08\u5982\u300C\u5728 A \u9879\u76EE\u300D\u300C\u6539\u524D\u7AEF\u7684 xxx\u300D\u300C\u641C\u540E\u7AEF\u300D\uFF09\uFF0C\u8BE5\u8F6E\u6240\u6709\u5E26 path \u53C2\u6570\u7684\u5DE5\u5177\u8C03\u7528\uFF08read_file / edit_file / search_grep / glob / list_dir / read_xlsx / read_docx \u7B49\uFF09\u5FC5\u987B\u628A\u5BF9\u5E94\u9879\u76EE\u6839\u4F5C\u4E3A path \u4F20\u5165\uFF08\u7EDD\u5BF9\u8DEF\u5F84\u3001../<\u5144\u5F1F\u76EE\u5F55>\u3001\u6216\u9879\u76EE\u76EE\u5F55\u540D\uFF09\uFF0C\u5426\u5219\u53EA\u4F1A\u8BFB\u5199/\u641C\u7D22\u9ED8\u8BA4\u6839\uFF0C\u4E0E\u7528\u6237\u610F\u56FE\u4E0D\u7B26\u3002
-\u6CE8\u610F\uFF1A\u9879\u76EE\u7EA7\u914D\u7F6E\uFF08.deepseeker-code/\uFF09\u4EC5\u5728\u9ED8\u8BA4\u6839 ${path42.basename(activeReal) || activeReal} \u751F\u6548\u3002`;
+\u2605 \u8DEF\u5F84\u951A\u5B9A\u94C1\u5F8B\uFF1A\u5DE5\u5177\u7F3A\u7701\u53EA\u4F5C\u7528\u4E8E\u9ED8\u8BA4\u6839\uFF08${path46.basename(activeReal) || activeReal} = IDE \u5934\u90E8\u6240\u793A\u6839\uFF09\u3002\u5F53\u7528\u6237\u5728\u5BF9\u8BDD\u4E2D\u6307\u660E\u4E86\u67D0\u4E2A\u9879\u76EE\uFF08\u5982\u300C\u5728 A \u9879\u76EE\u300D\u300C\u6539\u524D\u7AEF\u7684 xxx\u300D\u300C\u641C\u540E\u7AEF\u300D\uFF09\uFF0C\u8BE5\u8F6E\u6240\u6709\u5E26 path \u53C2\u6570\u7684\u5DE5\u5177\u8C03\u7528\uFF08read_file / edit_file / search_grep / glob / list_dir / read_xlsx / read_docx \u7B49\uFF09\u5FC5\u987B\u628A\u5BF9\u5E94\u9879\u76EE\u6839\u4F5C\u4E3A path \u4F20\u5165\uFF08\u7EDD\u5BF9\u8DEF\u5F84\u3001../<\u5144\u5F1F\u76EE\u5F55>\u3001\u6216\u9879\u76EE\u76EE\u5F55\u540D\uFF09\uFF0C\u5426\u5219\u53EA\u4F1A\u8BFB\u5199/\u641C\u7D22\u9ED8\u8BA4\u6839\uFF0C\u4E0E\u7528\u6237\u610F\u56FE\u4E0D\u7B26\u3002
+\u6CE8\u610F\uFF1A\u9879\u76EE\u7EA7\u914D\u7F6E\uFF08.deepseeker-code/\uFF09\u4EC5\u5728\u9ED8\u8BA4\u6839 ${path46.basename(activeReal) || activeReal} \u751F\u6548\u3002`;
       }
       const osName = process.platform === "win32" ? "Windows" : process.platform === "darwin" ? "macOS" : "Linux";
       const now = /* @__PURE__ */ new Date();
@@ -13012,7 +13806,7 @@ ${envLines.join("\n")}`;
 });
 
 // ../core/src/session/fork.ts
-import fs41 from "fs/promises";
+import fs44 from "fs/promises";
 var listForkAnchors, derivePrefix, forkSession;
 var init_fork = __esm({
   "../core/src/session/fork.ts"() {
@@ -13085,7 +13879,7 @@ var init_fork = __esm({
       const prefix = derivePrefix(lines, upToLineId);
       const newId = createUUID();
       await ensureSessionsDir(newId);
-      const rawText = await fs41.readFile(getTranscriptPath(sourceId), "utf-8");
+      const rawText = await fs44.readFile(getTranscriptPath(sourceId), "utf-8");
       const kept = [];
       let good = 0;
       for (const s of rawText.split("\n")) {
@@ -13101,7 +13895,7 @@ var init_fork = __esm({
       }
       let payload = kept.join("\n");
       if (payload.length > 0 && !payload.endsWith("\n")) payload += "\n";
-      await fs41.writeFile(getTranscriptPath(newId), payload, "utf-8");
+      await fs44.writeFile(getTranscriptPath(newId), payload, "utf-8");
       const srcState = await readStore(sourceId);
       const srcRolling = await getRollingState(sourceId);
       const legacy = !lines.some(isEventLine);
@@ -13864,6 +14658,11 @@ ${r.output.trim() || "(\u65E0\u8F93\u51FA)"}`);
         const picked = await new Promise((resolve) => setPendingSessions({ sessions: sessions2, resolve }));
         if (picked) await loadSession(picked);
       }, [pushInfo, loadSession]);
+      const newSession = useCallback(async () => {
+        sessionIdRef.current = await getOrCreateSessionId(void 0);
+        clearRows();
+        pushInfo(S.sessionNew(truncateMiddle(sessionIdRef.current, 12)));
+      }, [clearRows, pushInfo]);
       const resolveFork = useCallback((anchor) => {
         setPendingFork((prev) => {
           prev?.resolve(anchor);
@@ -13971,6 +14770,7 @@ ${r.output.trim() || "(\u65E0\u8F93\u51FA)"}`);
         loadSession,
         openForkPicker,
         resolveFork,
+        newSession,
         openModelPicker,
         resolveModel
       };
@@ -15034,8 +15834,8 @@ var init_TopPanel = __esm({
 });
 
 // ../core/src/observability/inspect.ts
-import fs42 from "fs";
-var CWD, fmt, readTrace, inspectUsage, inspectContext, inspectPermissions, inspectMcp, inspectHooks, inspectDebug;
+import fs45 from "fs";
+var CWD, fmt, readTrace, STOP_LABEL, fmtK, inspectUsage, inspectContext, inspectPermissions, inspectMcp, inspectHooks, inspectDebug;
 var init_inspect = __esm({
   "../core/src/observability/inspect.ts"() {
     "use strict";
@@ -15044,6 +15844,7 @@ var init_inspect = __esm({
     init_registry();
     init_loader();
     init_store3();
+    init_usageLog();
     init_store();
     init_createModel();
     CWD = process.cwd();
@@ -15052,7 +15853,7 @@ var init_inspect = __esm({
       if (!sessionId) return [];
       try {
         const p = await getTraceStorePath(sessionId);
-        const text = await fs42.promises.readFile(p, "utf8");
+        const text = await fs45.promises.readFile(p, "utf8");
         const out = [];
         for (const line of text.split("\n")) {
           if (!line.trim()) continue;
@@ -15066,10 +15867,13 @@ var init_inspect = __esm({
         return [];
       }
     };
+    STOP_LABEL = { normal: "\u5B8C\u6210", aborted: "\u4E2D\u6B62", error: "\u9519\u8BEF", repeat: "\u7194\u65AD", limit: "\u8D85\u9650" };
+    fmtK = (n) => n >= 1e4 ? `${(n / 1e3).toFixed(1)}k` : fmt(n);
     inspectUsage = async (sessionId) => {
       const trace = await readTrace(sessionId);
       const responses = trace.filter((t) => t?.eventType === "llm.response" && t?.usage);
-      if (responses.length === 0) return `\u{1F4CA} Token \u7528\u91CF\uFF1A\u6682\u65E0\u6570\u636E\uFF08\u672C\u4F1A\u8BDD\u5C1A\u65E0 LLM \u54CD\u5E94\u843D\u76D8\uFF09\u3002`;
+      const sessionRuns = (await readUsageRecords()).filter((r) => r.sessionId === sessionId);
+      if (responses.length === 0 && sessionRuns.length === 0) return `\u{1F4CA} Token \u7528\u91CF\uFF1A\u6682\u65E0\u6570\u636E\uFF08\u672C\u4F1A\u8BDD\u5C1A\u65E0 LLM \u54CD\u5E94\u843D\u76D8\uFF09\u3002`;
       let prompt = 0, completion = 0, total = 0, cacheHit = 0, cacheMiss = 0;
       let mainTotal = 0, subTotal = 0;
       for (const r of responses) {
@@ -15085,13 +15889,35 @@ var init_inspect = __esm({
       }
       const cacheRate = prompt > 0 ? (cacheHit / prompt * 100).toFixed(1) : "0.0";
       const rounds = responses.length;
-      return [
+      const lines = [
         `\u{1F4CA} Token \u7528\u91CF\uFF08\u672C\u4F1A\u8BDD\uFF0C${rounds} \u6B21 LLM \u54CD\u5E94\uFF09`,
         `  \u8F93\u5165(prompt): ${fmt(prompt)}  | \u8F93\u51FA(completion): ${fmt(completion)}  | \u5408\u8BA1: ${fmt(total)}`,
         `  \u7F13\u5B58\u547D\u4E2D: ${fmt(cacheHit)}\uFF08${cacheRate}%\uFF09  | \u7F13\u5B58\u672A\u547D\u4E2D: ${fmt(cacheMiss)}`,
-        `  \u4E3B agent: ${fmt(mainTotal)}  | \u5B50 agent(spawn/workflow): ${fmt(subTotal)}`,
-        `  \u63D0\u793A\uFF1A\u5E76\u884C workflow \u4F1A\u653E\u5927\u5B50 agent \u7528\u91CF\uFF1B\u7F13\u5B58\u547D\u4E2D\u7387\u8D8A\u9AD8\uFF0C\u8F93\u5165\u6210\u672C\u8D8A\u4F4E\u3002`
-      ].join("\n");
+        `  \u4E3B agent: ${fmt(mainTotal)}  | \u5B50 agent(spawn/workflow): ${fmt(subTotal)}`
+      ];
+      if (sessionRuns.length > 0) {
+        const ss = summarizeUsage(sessionRuns);
+        const abortedPct = ss.mainRuns > 0 ? Math.round(ss.stopReasons.aborted / ss.mainRuns * 100) : 0;
+        const avgRounds = ss.mainRuns > 0 ? (ss.mainRounds / ss.mainRuns).toFixed(1) : "0";
+        lines.push(`  \u258E\u672C\u4F1A\u8BDD ${ss.mainRuns} \u4E2A run\uFF1A${ss.mainRounds} \u8F6E\uFF08\u5747 ${avgRounds} \u8F6E/run\uFF09\xB7 \u4E2D\u6B62 ${ss.stopReasons.aborted}/${ss.mainRuns}\uFF08${abortedPct}%\uFF09`);
+        for (const r of sessionRuns.filter((x) => x.depth === 0).slice(-6)) {
+          const tools = topTools(r.tools, 3).map(([n, c]) => `${n}\xD7${c}`).join(" ") || "\uFF08\u65E0\u5DE5\u5177\u8C03\u7528\uFF09";
+          lines.push(`    ${String(r.ts).slice(5, 16).replace("T", " ")}  ${r.rounds}\u8F6E  ${fmtK(r.totalTokens ?? 0)} tok  ${STOP_LABEL[r.stopReason] ?? r.stopReason}  ${tools}`);
+        }
+      }
+      const week = summarizeUsage(await readUsageRecords(7));
+      if (week.runs > 0) {
+        const weekHit = week.promptTokens > 0 ? (week.cachedTokens / week.promptTokens * 100).toFixed(1) : "0.0";
+        const weekAbort = week.mainRuns > 0 ? Math.round(week.stopReasons.aborted / week.mainRuns * 100) : 0;
+        const weekAvg = week.mainRuns > 0 ? (week.mainRounds / week.mainRuns).toFixed(1) : "0";
+        const tools = topTools(week.tools, 4).map(([n, c]) => `${n}\xD7${c}`).join("\u3001");
+        lines.push(
+          `  \u258E\u8FD1 7 \u5929\uFF08\u4F7F\u7528\u65E5\u5FD7 \xB7 \u5168\u9879\u76EE\uFF09\uFF1A${week.mainRuns} runs \xB7 ${week.mainRounds} \u8F6E\uFF08\u5747 ${weekAvg} \u8F6E/run\uFF09\xB7 \u4E2D\u6B62 ${weekAbort}% \xB7 ${fmtK(week.totalTokens)} tok\uFF08\u7F13\u5B58\u547D\u4E2D ${weekHit}%\uFF09`,
+          `    \u5E38\u7528\u5DE5\u5177: ${tools || "\uFF08\u65E0\uFF09"}`
+        );
+      }
+      lines.push(`  \u63D0\u793A\uFF1A\u5E76\u884C workflow \u4F1A\u653E\u5927\u5B50 agent \u7528\u91CF\uFF1B\u7F13\u5B58\u547D\u4E2D\u7387\u8D8A\u9AD8\uFF0C\u8F93\u5165\u6210\u672C\u8D8A\u4F4E\u3002`);
+      return lines.join("\n");
     };
     inspectContext = async (sessionId) => {
       const trace = await readTrace(sessionId);
@@ -15339,6 +16165,8 @@ var init_App = __esm({
               return S.cmdLang;
             case "output-style":
               return S.cmdOutputStyle;
+            case "new":
+              return S.cmdNew;
             case "sessions":
               return S.cmdSessions;
             case "fork":
@@ -15421,6 +16249,13 @@ var init_App = __esm({
           case "/clear":
             state.clearRows();
             return true;
+          case "/new":
+            if (state.busy) {
+              state.pushInfo(S.sessionNewBusy);
+              return true;
+            }
+            void state.newSession();
+            return true;
           case "/sessions":
             void state.openSessionPicker();
             return true;
@@ -15863,7 +16698,7 @@ init_updateCheck();
 init_trust();
 import { render } from "ink";
 import os5 from "os";
-import path43 from "path";
+import path47 from "path";
 import { emitKeypressEvents } from "node:readline";
 import { jsx as jsx19 } from "react/jsx-runtime";
 var parseArgs = (argv) => {
@@ -15996,7 +16831,7 @@ var main = async () => {
   process.stdout.write("\x1B[2J\x1B[3J\x1B[1;1H");
   const cwdIsHome = () => {
     try {
-      return path43.resolve(cwd).toLowerCase() === path43.resolve(os5.homedir()).toLowerCase();
+      return path47.resolve(cwd).toLowerCase() === path47.resolve(os5.homedir()).toLowerCase();
     } catch {
       return false;
     }