deepseeker-code 1.0.4 → 1.0.41

package/README.md

@@ -9,7 +9,7 @@ cd 你的项目
 deepseeker-code
 ```
 
-DeepSeeker-Code 在你的终端里跑一个自主 agent：流式逐字输出、可折叠思考过程、工具调用卡、审批模态、两阶段计划模式、会话恢复。**in-process 直驱引擎**——不走 HTTP/端口，工具审批走 Ink 原生模态。
+DeepSeeker-Code 在你的终端里跑一个自主 agent：流式逐字输出、可折叠思考过程、工具调用卡（编辑类附红绿 diff 预览）、行内 Markdown 渲染（标题加粗、列表对齐）、审批模态、两阶段计划模式（计划 / 自动模式下输入框带边框与模式徽标）、会话恢复。**in-process 直驱引擎**——不走 HTTP/端口，工具审批走 Ink 原生模态。
 
 > 另有 **VS Code 插件**版本（同名 `deepseeker-code`），与终端版同源共享 core 引擎和 `~/.deepseeker-code/` 数据目录，同一项目下会话可互续。
 

package/dist/cli.mjs

@@ -34,17 +34,19 @@ var init_strings = __esm({
         toolRunning: (name) => `\u23FA ${name} \u8FD0\u884C\u4E2D\u2026`,
         toolDone: (name, ok) => `\u23FA ${name} \xB7 ${ok ? "\u6210\u529F" : "\u5931\u8D25"}`,
         toolDenied: (name) => `\u{1F6AB} ${name} \u5DF2\u88AB\u62D2\u7EDD`,
-        planTitle: "\u2705 \u5B9E\u73B0\u65B9\u6848\uFF08\u8BA1\u5212\u6A21\u5F0F\uFF09",
-        planPrompt: "\u2191\u2193 \u9009\u62E9 \xB7 Enter \u786E\u8BA4\uFF08\u4FEE\u6539\u9879\u8FDB\u5165\u7F16\u8F91\uFF0CEnter \u63D0\u4EA4 / Esc \u53D6\u6D88\uFF09\u3002",
-        planAcceptAuto: "\u63A5\u53D7\u5E76\u81EA\u52A8\u6267\u884C\uFF08\u5B9E\u73B0\u9636\u6BB5\u514D\u5BA1\u6279\uFF09",
-        planAcceptManual: "\u63A5\u53D7\u5E76\u624B\u52A8\u6267\u884C\uFF08\u9010\u6B65\u5BA1\u6279\u6BCF\u4E2A\u5DE5\u5177\uFF09",
-        planEdit: "\u4FEE\u6539\u65B9\u6848",
-        planReject: "\u62D2\u7EDD\uFF0C\u56DE\u5230\u8F93\u5165\u6846",
+        planTitle: "\u51C6\u5907\u5F00\u59CB\u7F16\u7801\uFF1F",
+        planPrompt: "\u2191\u2193 \u9009\u62E9 \xB7 Enter \u786E\u8BA4\uFF08\u7F16\u8F91\u9879\u8FDB\u5165\u7F16\u8F91\u5668\uFF0CEnter \u63D0\u4EA4 / Esc \u53D6\u6D88\uFF09\u3002",
+        planAcceptAuto: "\u662F\uFF0C\u5E76\u81EA\u52A8\u63A5\u53D7\u7F16\u8F91\uFF08\u5B9E\u73B0\u9636\u6BB5\u514D\u5BA1\u6279\uFF09",
+        planAcceptManual: "\u662F\uFF0C\u5E76\u624B\u52A8\u5BA1\u6279\u7F16\u8F91\uFF08\u9010\u6B65\u5BA1\u6279\u6BCF\u4E2A\u5DE5\u5177\uFF09",
+        planEdit: "\u7F16\u8F91\u65B9\u6848",
+        planReject: "\u5426\uFF0C\u7EE7\u7EED\u89C4\u5212",
         planEditTitle: "\u270F\uFE0F \u7F16\u8F91\u65B9\u6848",
         planEditHint: "Enter \u6309\u6B64\u65B9\u6848\u6267\u884C \xB7 Esc \u53D6\u6D88\u56DE\u5230\u9009\u9879",
-        planRejected: "\u270B \u5DF2\u62D2\u7EDD\u65B9\u6848\uFF0C\u672C\u8F6E\u672A\u6267\u884C\u3002",
+        planKeepPlanning: "\u270B \u5DF2\u7559\u5728\u8BA1\u5212\u6A21\u5F0F\uFF1A\u7EE7\u7EED\u8F93\u5165\u8865\u5145\u8981\u6C42\uFF0C\u6A21\u578B\u5C06\u4FEE\u8BA2\u65B9\u6848\u540E\u518D\u6B21\u63D0\u4EA4\uFF08/plan \u53EF\u9000\u51FA\uFF09\u3002",
         planEditEmpty: "\u65B9\u6848\u4E0D\u80FD\u4E3A\u7A7A",
         planAutoExecute: "\u26A1 \u5DF2\u8FDB\u5165\u81EA\u52A8\u6267\u884C\uFF1A\u5B9E\u73B0\u9636\u6BB5\u5DE5\u5177\u5C06\u514D\u5BA1\u6279\u76F4\u63A5\u8FD0\u884C\u3002",
+        inputBadgePlan: "plan mode on\uFF08\u53EA\u8BFB\u8C03\u7814 \u2192 \u65B9\u6848\u5BA1\u6279 \u2192 \u5B9E\u73B0\uFF09",
+        inputBadgeAuto: "auto-accept edits on",
         approvalTitle: "\u{1F510} \u64CD\u4F5C\u5BA1\u6279",
         approvalPrompt: "\u2191\u2193 \u9009\u62E9\u540E Enter\uFF08Esc \u62D2\u7EDD\uFF09\uFF1A\u5141\u8BB8\u672C\u6B21 / \u603B\u662F\u5141\u8BB8\uFF08\u5199\u6301\u4E45\u89C4\u5219\uFF09/ \u62D2\u7EDD\u3002",
         approvalAllow: "\u5141\u8BB8\u672C\u6B21",
@@ -172,17 +174,19 @@ DeepSeeker-Code \u5C06\u5728\u6B64\u76EE\u5F55\u8BFB\u53D6\u3001\u7F16\u8F91\u54
         toolRunning: (name) => `\u23FA ${name} running\u2026`,
         toolDone: (name, ok) => `\u23FA ${name} \xB7 ${ok ? "ok" : "failed"}`,
         toolDenied: (name) => `\u{1F6AB} ${name} denied`,
-        planTitle: "\u2705 Implementation plan (plan mode)",
+        planTitle: "Ready to code?",
         planPrompt: "\u2191\u2193 then Enter (edit opens the editor: Enter to save / Esc to cancel).",
-        planAcceptAuto: "Accept & auto-run (skip impl approvals)",
-        planAcceptManual: "Accept & step-by-step (approve each tool)",
+        planAcceptAuto: "Yes, and auto-accept edits (skip impl approvals)",
+        planAcceptManual: "Yes, and manually approve edits (step-by-step)",
         planEdit: "Edit plan",
-        planReject: "Reject, back to prompt",
+        planReject: "No, keep planning",
         planEditTitle: "\u270F\uFE0F Edit plan",
         planEditHint: "Enter to implement with this plan \xB7 Esc back to options",
-        planRejected: "\u270B Plan rejected, nothing executed this turn.",
+        planKeepPlanning: "\u270B Staying in plan mode: add feedback and the plan will be revised and resubmitted (/plan to exit).",
         planEditEmpty: "Plan cannot be empty",
         planAutoExecute: "\u26A1 Auto-run: implementation tools will execute without approval.",
+        inputBadgePlan: "plan mode on (read-only research \u2192 approve \u2192 implement)",
+        inputBadgeAuto: "auto-accept edits on",
         approvalTitle: "\u{1F510} Action approval",
         approvalPrompt: "\u2191\u2193 then Enter (Esc to deny): allow once / always allow (persist rule) / deny.",
         approvalAllow: "Allow once",
@@ -2397,9 +2401,14 @@ var init_guard = __esm({
     SENSITIVE_ENV_PATTERN = /(KEY|TOKEN|SECRET|PASSWORD|PASSPHRASE|CREDENTIAL|PRIVATE|AUTH)/i;
     scrubCommandEnv = (env = process.env) => {
       const next = {};
+      const GIT_CONFIG_MEMBER = /^GIT_CONFIG_(KEY|VALUE)_\d+$/;
+      const gitConfigFamilyHit = Object.keys(env).some(
+        (k) => GIT_CONFIG_MEMBER.test(k) && (COMMAND_ENV_DENYLIST.includes(k) || SENSITIVE_ENV_PATTERN.test(k))
+      );
       for (const [k, v] of Object.entries(env)) {
         if (COMMAND_ENV_DENYLIST.includes(k)) continue;
         if (SENSITIVE_ENV_PATTERN.test(k)) continue;
+        if (gitConfigFamilyHit && (k === "GIT_CONFIG_COUNT" || GIT_CONFIG_MEMBER.test(k))) continue;
         next[k] = v;
       }
       return next;
@@ -3899,7 +3908,6 @@ var init_planMode = __esm({
   "../core/src/agent/planMode.ts"() {
     "use strict";
     PLAN_ALLOWED_TOOLS = /* @__PURE__ */ new Set([
-      "getTime",
       "read_file",
       "list_dir",
       "view_symbol_outline",
@@ -4293,36 +4301,6 @@ var init_systemInjections = __esm({
   }
 });
 
-// ../core/src/tool/registry/system.ts
-var systemTools;
-var init_system = __esm({
-  "../core/src/tool/registry/system.ts"() {
-    "use strict";
-    init_type();
-    systemTools = [
-      {
-        type: "function",
-        function: {
-          name: "getTime",
-          description: "\u8FD4\u56DE\u5F53\u524D\u670D\u52A1\u5668\u7684\u65E5\u671F\u4E0E\u65F6\u95F4\uFF08\u672C\u5730\u65F6\u533A\uFF09",
-          parameters: {
-            type: "object",
-            properties: {
-              // Q-7：location 改为可选——旧版 required 却完全不消费，迫使模型填无意义城市名。
-              location: { type: "string", description: "\u57CE\u5E02\u540D\u79F0\uFF08\u53EF\u9009\uFF0C\u4EC5\u4F5C\u8BB0\u5F55\uFF1B\u670D\u52A1\u5668\u59CB\u7EC8\u8FD4\u56DE\u5176\u672C\u5730\u65F6\u95F4\uFF09" }
-            }
-          },
-          safetyLevel: "safe" /* SAFE */,
-          isSync: true,
-          async execute() {
-            return (/* @__PURE__ */ new Date()).toLocaleString("zh-CN", { dateStyle: "medium", timeStyle: "medium" });
-          }
-        }
-      }
-    ];
-  }
-});
-
 // ../core/src/tool/registry/agent.ts
 var createAgentTools;
 var init_agent = __esm({
@@ -4917,7 +4895,7 @@ import fs12 from "fs/promises";
 import path15 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, fsTools;
+var 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";
@@ -5005,7 +4983,7 @@ var init_fs = __esm({
       while (lines.length > 1 && lines[lines.length - 1].trim() === "") lines.pop();
       return lines.join("\n");
     };
-    matchLineBlockWith = (content, oldBlock, newBlock, replaceAll, norm) => {
+    matchLineBlockWith = (content, oldBlock, newBlock, replaceAll, norm, anchorAlign) => {
       const contentLines = content.split("\n");
       const oldLines = oldBlock.split("\n");
       if (oldLines.length === 0 || oldLines.length > contentLines.length) {
@@ -5034,7 +5012,11 @@ var init_fs = __esm({
             break;
           }
         }
-        const aligned = baseIndent ? reindentToBase(newBlock, baseIndent) : newBlock;
+        let aligned = baseIndent ? reindentToBase(newBlock, baseIndent) : newBlock;
+        if (anchorAlign) {
+          const anchored = alignIndentsByAnchor(newBlock, oldLines, contentLines, start);
+          if (anchored !== null) aligned = anchored;
+        }
         out.splice(start, oldLines.length, ...aligned.split("\n"));
       }
       return { ok: true, content: out.join("\n"), count: hits.length };
@@ -5069,6 +5051,92 @@ var init_fs = __esm({
         return baseIndent + (l.startsWith(common) ? l.slice(common.length) : l);
       }).join("\n");
     };
+    alignIndentsByAnchor = (newBlock, oldLines, contentLines, start) => {
+      const stripLead = (l) => l.replace(/^[ \t]+/, "");
+      const out = [];
+      let cursor = 0;
+      let lastIndent = null;
+      let anchors = 0;
+      for (const line of newBlock.split("\n")) {
+        if (line.trim() === "") {
+          out.push(line);
+          continue;
+        }
+        const bare = stripLead(line);
+        let idx = -1;
+        for (let i = cursor; i < oldLines.length; i++) {
+          if (oldLines[i].trim() !== "" && stripLead(oldLines[i]) === bare) {
+            idx = i;
+            break;
+          }
+        }
+        if (idx === -1) {
+          out.push(lastIndent === null ? line : lastIndent + bare);
+          continue;
+        }
+        cursor = idx + 1;
+        lastIndent = contentLines[start + idx].match(/^[ \t]*/)?.[0] ?? "";
+        anchors++;
+        out.push(lastIndent + bare);
+      }
+      return anchors > 0 ? out.join("\n") : null;
+    };
+    applyOneEditToContent = (normalizedContent, oldStr, newStr, replaceAll) => {
+      const normalizedNew = newStr.replace(/\r\n/g, "\n");
+      const normalizedOldRaw = oldStr.replace(/\r\n/g, "\n");
+      const lnStripped = stripReadFileLineNumbers(normalizedOldRaw);
+      const candidates = [
+        { old: normalizedOldRaw, note: "" },
+        { old: stripEdgeBlankLines(normalizedOldRaw), note: "\uFF08\u5DF2\u5BB9\u9519\u9996\u5C3E\u7A7A\u884C\uFF09" }
+      ];
+      if (lnStripped !== normalizedOldRaw) candidates.push({ old: lnStripped, note: "\uFF08\u5DF2\u5265\u79BB read_file \u884C\u53F7\u524D\u7F00\uFF09" });
+      let normalizedOld = null;
+      let note = "";
+      for (const c of candidates) {
+        if (c.old.length > 0 && normalizedContent.includes(c.old)) {
+          normalizedOld = c.old;
+          note = c.note;
+          break;
+        }
+      }
+      if (normalizedOld == null) {
+        const base = lnStripped !== normalizedOldRaw ? lnStripped : normalizedOldRaw;
+        const norms = [
+          // 行尾空白归一：old_str 前导缩进与文件一致（可信）→ 只对齐基线（anchor=false）
+          { norm: (l) => l.replace(/[ \t]+$/, ""), tag: "\u9010\u884C\u5C3E\u7A7A\u767D\u5BB9\u9519", anchor: false },
+          // 全空白归一：模型前导缩进已证明不符（不可信）→ 逐行锚定文件真实缩进（anchor=true）
+          { norm: (l) => l.trim(), tag: "\u9010\u884C\u5168\u7A7A\u767D\u5BB9\u9519\uFF08\u524D\u5BFC Tab/\u7A7A\u683C\uFF09", anchor: true }
+        ];
+        for (const { norm, tag, anchor } of norms) {
+          const lm = matchLineBlockWith(normalizedContent, base, normalizedNew, replaceAll, norm, anchor);
+          if (lm.ok) {
+            return {
+              ok: true,
+              content: lm.content,
+              summary: replaceAll ? `\u5DF2\u6279\u91CF\u66FF\u6362\u5168\u90E8 ${lm.count} \u5904\u5339\u914D\uFF08${tag}\uFF09\u3002` : `\u5DF2\u6210\u529F\u5B8C\u6210\u5C40\u90E8\u91CD\u6784\uFF08${tag}\uFF09\u3002`
+            };
+          }
+          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` };
+          }
+        }
+        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` };
+      }
+      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` };
+      }
+      const oldFirstNonBlank = normalizedOld.split("\n").find((l) => l.trim() !== "") ?? "";
+      const baseIndent = oldFirstNonBlank.match(/^[ \t]*/)?.[0] ?? "";
+      const alignedNew = baseIndent ? reindentToBase(normalizedNew, baseIndent) : normalizedNew;
+      const updatedContent = replaceAll ? normalizedContent.split(normalizedOld).join(alignedNew) : normalizedContent.replace(normalizedOld, () => alignedNew);
+      return {
+        ok: true,
+        content: updatedContent,
+        summary: replaceAll ? `\u5DF2\u6279\u91CF\u66FF\u6362\u5168\u90E8 ${matchCount} \u5904\u5339\u914D\u3002${note}` : `\u5DF2\u6210\u529F\u5B8C\u6210\u552F\u4E00\u6027\u5C40\u90E8\u91CD\u6784\u3002${note}`
+      };
+    };
     fsTools = [
       {
         type: "function",
@@ -5200,78 +5268,65 @@ ${treeResult}`;
         type: "function",
         function: {
           name: "edit_file",
-          description: "\u9488\u5BF9\u6307\u5B9A\u7684\u6587\u4EF6\u8FDB\u884C\u5C40\u90E8\u7CBE\u51C6\u4FEE\u6539\u3002old_str \u5FC5\u987B\u4E0E\u6587\u4EF6\u4E2D\u7684\u539F\u59CB\u4EE3\u7801\u9010\u5B57\u7B26\u4E00\u81F4\uFF1A\u8BF7\u53BB\u6389 read_file \u8FD4\u56DE\u7684\u300C<\u884C\u53F7>: \u300D\u524D\u7F00\uFF0C\u5E76\u4FDD\u7559\u539F\u6709\u7F29\u8FDB\uFF08Tab/\u7A7A\u683C\uFF09\u4E0E\u884C\u5C3E\u7A7A\u767D\uFF1B\u9ED8\u8BA4\u8981\u6C42\u5728\u5168\u6587\u4E2D\u552F\u4E00\uFF0C\u82E5\u8BBE replace_all=true \u5219\u66FF\u6362\u5168\u90E8\u5339\u914D\u5904\uFF08\u9002\u5408\u6279\u91CF\u91CD\u547D\u540D/\u7EDF\u4E00\u6539\u5199\uFF09\u3002",
+          description: "\u9488\u5BF9\u6307\u5B9A\u7684\u6587\u4EF6\u8FDB\u884C\u5C40\u90E8\u7CBE\u51C6\u4FEE\u6539\u3002\u2605 \u540C\u4E00\u6587\u4EF6\u6709\u591A\u5904\u8981\u6539\u65F6\uFF0C\u52A1\u5FC5\u4E00\u6B21\u8C03\u7528\u4F20 edits \u6570\u7EC4\u5168\u90E8\u5B8C\u6210\uFF08\u6309\u5E8F\u5E94\u7528\u3001\u6574\u4F53\u539F\u5B50\uFF1A\u4EFB\u4E00\u5904\u5931\u8D25\u5219\u5168\u90E8\u4E0D\u5199\u5165\uFF09\uFF0C\u52FF\u9010\u5904\u591A\u6B21\u8C03\u7528\u3002old_str \u5FC5\u987B\u4E0E\u6587\u4EF6\u4E2D\u7684\u539F\u59CB\u4EE3\u7801\u9010\u5B57\u7B26\u4E00\u81F4\uFF1A\u8BF7\u53BB\u6389 read_file \u8FD4\u56DE\u7684\u300C<\u884C\u53F7>: \u300D\u524D\u7F00\uFF0C\u5E76\u4FDD\u7559\u539F\u6709\u7F29\u8FDB\uFF08Tab/\u7A7A\u683C\uFF09\u4E0E\u884C\u5C3E\u7A7A\u767D\uFF1B\u9ED8\u8BA4\u8981\u6C42\u5728\u5168\u6587\u4E2D\u552F\u4E00\uFF0C\u82E5\u8BBE replace_all=true \u5219\u66FF\u6362\u5168\u90E8\u5339\u914D\u5904\uFF08\u9002\u5408\u6279\u91CF\u91CD\u547D\u540D/\u7EDF\u4E00\u6539\u5199\uFF09\u3002",
           parameters: {
             type: "object",
             properties: {
               path: { type: "string", description: "\u51C6\u5907\u4FEE\u6539\u7684\u6587\u4EF6\u76F8\u5BF9\u8DEF\u5F84" },
-              old_str: { type: "string", description: "\u6587\u4EF6\u4E2D\u73B0\u6709\u7684\u5B8C\u6574\u65E7\u4EE3\u7801\u5757" },
-              new_str: { type: "string", description: "\u51C6\u5907\u66FF\u6362\u8FDB\u53BB\u7684\u65B0\u4EE3\u7801\u5757" },
-              replace_all: { type: "boolean", description: "\u662F\u5426\u66FF\u6362\u5168\u6587\u6240\u6709\u5339\u914D\u5904\uFF08\u9ED8\u8BA4 false \u4EC5\u66FF\u6362\u552F\u4E00\u5339\u914D\uFF1B\u6279\u91CF\u91CD\u547D\u540D/\u7EDF\u4E00\u6539\u5199\u65F6\u8BBE true\uFF09" }
+              old_str: { type: "string", description: "\u6587\u4EF6\u4E2D\u73B0\u6709\u7684\u5B8C\u6574\u65E7\u4EE3\u7801\u5757\uFF08\u5355\u5904\u4FEE\u6539\u7528\uFF1B\u591A\u5904\u4FEE\u6539\u8BF7\u6539\u7528 edits \u6570\u7EC4\u4E00\u6B21\u5B8C\u6210\uFF09" },
+              new_str: { type: "string", description: "\u51C6\u5907\u66FF\u6362\u8FDB\u53BB\u7684\u65B0\u4EE3\u7801\u5757\uFF08\u5355\u5904\u4FEE\u6539\u7528\uFF09" },
+              replace_all: { type: "boolean", description: "\u662F\u5426\u66FF\u6362\u5168\u6587\u6240\u6709\u5339\u914D\u5904\uFF08\u9ED8\u8BA4 false \u4EC5\u66FF\u6362\u552F\u4E00\u5339\u914D\uFF1B\u6279\u91CF\u91CD\u547D\u540D/\u7EDF\u4E00\u6539\u5199\u65F6\u8BBE true\uFF09\u3002\u9876\u5C42\u53C2\u6570\u4EC5\u4F5C\u7528\u4E8E\u5355\u6761 old_str/new_str\uFF1Bedits \u5185\u6BCF\u6761\u53EF\u72EC\u7ACB\u8BBE\u7F6E" },
+              edits: {
+                type: "array",
+                description: "\u2605 \u540C\u4E00\u6587\u4EF6\u591A\u5904\u4FEE\u6539\u65F6\u4F18\u5148\u4F7F\u7528\uFF1A\u4E00\u6B21\u8C03\u7528\u6309\u5E8F\u5B8C\u6210\u5168\u90E8\u66FF\u6362\uFF0C\u7701\u53BB\u9010\u5904\u5F80\u8FD4\u3002\u7B2C N \u6761\u7684 old_str \u987B\u57FA\u4E8E\u524D N-1 \u6761\u5E94\u7528\u540E\u7684\u6587\u4EF6\u5185\u5BB9\u6784\u9020\uFF1B\u4EFB\u4E00\u6761\u672A\u547D\u4E2D\u5219\u6574\u4F53\u4E0D\u5199\u5165\uFF08\u539F\u5B50\uFF09\uFF0C\u4FEE\u6B63\u8BE5\u6761\u540E\u6574\u7EC4\u91CD\u8BD5",
+                items: {
+                  type: "object",
+                  properties: {
+                    old_str: { type: "string", description: "\u6587\u4EF6\u4E2D\u73B0\u6709\u7684\u5B8C\u6574\u65E7\u4EE3\u7801\u5757" },
+                    new_str: { type: "string", description: "\u51C6\u5907\u66FF\u6362\u8FDB\u53BB\u7684\u65B0\u4EE3\u7801\u5757" },
+                    replace_all: { type: "boolean", description: "\u8BE5\u6761\u662F\u5426\u66FF\u6362\u5168\u6587\u6240\u6709\u5339\u914D\u5904\uFF08\u9ED8\u8BA4 false\uFF09" }
+                  },
+                  required: ["old_str", "new_str"]
+                }
+              }
             },
-            required: ["path", "old_str", "new_str"]
+            required: ["path"]
           },
           safetyLevel: "mutation" /* MUTATION */,
           isSync: true,
-          requireApproval: (args) => `\u7533\u8BF7\u4FEE\u6539\u6587\u4EF6 [${args.path}]${args.replace_all ? "\uFF08\u{1F525} \u6279\u91CF\u66FF\u6362\u5168\u90E8\u5339\u914D\u5904\uFF09" : ""}
+          requireApproval: (args) => {
+            const list = args.edits && args.edits.length > 0 ? args.edits : [{ old_str: args.old_str ?? "", new_str: args.new_str ?? "", replace_all: args.replace_all }];
+            const patches = list.map((e, i) => `\u2014\u2014 \u7B2C ${i + 1} \u5904${e.replace_all ? "\uFF08\u{1F525} \u6279\u91CF\u66FF\u6362\u5168\u90E8\u5339\u914D\u5904\uFF09" : ""} \u2014\u2014
 \u3010\u51CF\u5C11\u3011:
-${args.old_str}
+${e.old_str}
 \u3010\u589E\u52A0\u3011:
-${args.new_str}`,
+${e.new_str}`).join("\n\n");
+            return `\u7533\u8BF7\u4FEE\u6539\u6587\u4EF6 [${args.path}]\uFF08\u5171 ${list.length} \u5904\u4FEE\u6539\uFF0C\u4EFB\u4E00\u5904\u5931\u8D25\u5C06\u6574\u4F53\u4E0D\u5199\u5165\uFF09
+${patches}`;
+          },
           async execute(args) {
             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`;
+              }
               const absPath = resolveSafePath(args.path);
               const rawContent = await fs12.readFile(absPath, "utf-8");
               const isCRLF = rawContent.includes("\r\n");
-              const normalizedContent = rawContent.replace(/\r\n/g, "\n");
-              const normalizedNew = args.new_str.replace(/\r\n/g, "\n");
-              const normalizedOldRaw = args.old_str.replace(/\r\n/g, "\n");
-              const lnStripped = stripReadFileLineNumbers(normalizedOldRaw);
-              const candidates = [
-                { old: normalizedOldRaw, note: "" },
-                { old: stripEdgeBlankLines(normalizedOldRaw), note: "\uFF08\u5DF2\u5BB9\u9519\u9996\u5C3E\u7A7A\u884C\uFF09" }
-              ];
-              if (lnStripped !== normalizedOldRaw) candidates.push({ old: lnStripped, note: "\uFF08\u5DF2\u5265\u79BB read_file \u884C\u53F7\u524D\u7F00\uFF09" });
-              let normalizedOld = null;
-              let note = "";
-              for (const c of candidates) {
-                if (c.old.length > 0 && normalizedContent.includes(c.old)) {
-                  normalizedOld = c.old;
-                  note = c.note;
-                  break;
-                }
-              }
-              if (normalizedOld == null) {
-                const base = lnStripped !== normalizedOldRaw ? lnStripped : normalizedOldRaw;
-                const norms = [
-                  { norm: (l) => l.replace(/[ \t]+$/, ""), tag: "\u9010\u884C\u5C3E\u7A7A\u767D\u5BB9\u9519" },
-                  { norm: (l) => l.trim(), tag: "\u9010\u884C\u5168\u7A7A\u767D\u5BB9\u9519\uFF08\u524D\u5BFC Tab/\u7A7A\u683C\uFF09" }
-                ];
-                for (const { norm, tag } of norms) {
-                  const lm = matchLineBlockWith(normalizedContent, base, normalizedNew, !!args.replace_all, norm);
-                  if (lm.ok) {
-                    assertWithinWorkspace(absPath);
-                    await fs12.writeFile(absPath, isCRLF ? lm.content.replace(/\n/g, "\r\n") : lm.content, "utf-8");
-                    return args.replace_all ? `\u2705 [\u4EE3\u7801\u4FEE\u8865\u6210\u529F]\uFF1A\u6587\u4EF6 [${args.path}] \u5DF2\u6279\u91CF\u66FF\u6362\u5168\u90E8 ${lm.count} \u5904\u5339\u914D\uFF08${tag}\uFF09\u3002` : `\u2705 [\u4EE3\u7801\u4FEE\u8865\u6210\u529F]\uFF1A\u6587\u4EF6 [${args.path}] \u5DF2\u6210\u529F\u5B8C\u6210\u5C40\u90E8\u91CD\u6784\uFF08${tag}\uFF09\u3002`;
-                  }
-                  if (lm.reason === "conflict") {
-                    return `\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`;
-                  }
+              let content = rawContent.replace(/\r\n/g, "\n");
+              const summaries = [];
+              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(/^❌ \[代码修补失败\]：/, "")}`;
                 }
-                const diag = diagnoseOldStr(normalizedContent, normalizedOldRaw);
-                return `\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\u5E94\u8D34\u7247\u6BB5\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\u2014\u2014\u8BF7\u7528 read_file \u91CD\u65B0\u8BFB\u53D6\u76EE\u6807\u7247\u6BB5\uFF08\u53BB\u6389\u300C<\u884C\u53F7>: \u300D\u524D\u7F00\u3001\u4FDD\u7559\u539F\u59CB Tab/\u7A7A\u683C\u7F29\u8FDB\uFF09\uFF0C\u518D\u6B21\u8C03\u7528 edit_file \u91CD\u8BD5\u3002`;
+                content = r.content;
+                summaries.push(editList.length === 1 ? r.summary : `  ${i + 1}. ${r.summary}`);
               }
-              const matchCount = normalizedContent.split(normalizedOld).length - 1;
-              if (!args.replace_all && matchCount > 1) {
-                return `\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`;
-              }
-              const oldFirstNonBlank = normalizedOld.split("\n").find((l) => l.trim() !== "") ?? "";
-              const baseIndent = oldFirstNonBlank.match(/^[ \t]*/)?.[0] ?? "";
-              const alignedNew = baseIndent ? reindentToBase(normalizedNew, baseIndent) : normalizedNew;
-              const updatedContent = args.replace_all ? normalizedContent.split(normalizedOld).join(alignedNew) : normalizedContent.replace(normalizedOld, () => alignedNew);
               assertWithinWorkspace(absPath);
-              await fs12.writeFile(absPath, isCRLF ? updatedContent.replace(/\n/g, "\r\n") : updatedContent, "utf-8");
-              return args.replace_all ? `\u2705 [\u4EE3\u7801\u4FEE\u8865\u6210\u529F]\uFF1A\u6587\u4EF6 [${args.path}] \u5DF2\u6279\u91CF\u66FF\u6362\u5168\u90E8 ${matchCount} \u5904\u5339\u914D\u3002${note}` : `\u2705 [\u4EE3\u7801\u4FEE\u8865\u6210\u529F]\uFF1A\u6587\u4EF6 [${args.path}] \u5DF2\u6210\u529F\u5B8C\u6210\u552F\u4E00\u6027\u5C40\u90E8\u91CD\u6784\u3002${note}`;
+              await fs12.writeFile(absPath, isCRLF ? content.replace(/\n/g, "\r\n") : content, "utf-8");
+              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}`;
             }
@@ -5579,13 +5634,14 @@ var init_search = __esm({
         type: "function",
         function: {
           name: "search_grep",
-          description: "\u5728\u5DE5\u4F5C\u533A\u7684\u6240\u6709\u6587\u4EF6\u4E2D\u68C0\u7D22\u5339\u914D\u7684\u4EE3\u7801\u884C\uFF0C\u6BCF\u4E2A\u547D\u4E2D\u5E26\u524D\u540E\u5404 2 \u884C\u4E0A\u4E0B\u6587\uFF08\u53EF\u76F4\u63A5\u5224\u65AD\u7528\u6CD5\u3001\u514D\u7D27\u8DDF\u4E00\u6B21 read_file\uFF09\uFF1B\u9ED8\u8BA4\u6309\u5B57\u9762\u91CF\u5173\u952E\u8BCD\u5339\u914D\uFF0C\u5982\u9700\u6B63\u5219\u4F20 is_regex=true\u3002\u591A\u6839\u5DE5\u4F5C\u533A\u4E0B\u7528 path \u9650\u5B9A\u641C\u7D22\u76EE\u5F55\uFF1A\u53EF\u4F20\u9879\u76EE\u76EE\u5F55\u540D\uFF08\u5982 'frontend'\uFF09\u81EA\u52A8\u5339\u914D\u5DE5\u4F5C\u533A\u6839\uFF0C\u6216\u4F20\u7EDD\u5BF9\u8DEF\u5F84 / \u76F8\u5BF9\u9ED8\u8BA4\u6839\u7684 ../\u5144\u5F1F\u76EE\u5F55\u3002\u2605 \u5F53\u7528\u6237\u5728\u5BF9\u8BDD\u91CC\u6307\u660E\u4E86\u67D0\u4E2A\u9879\u76EE\u65F6\uFF0C\u52A1\u5FC5\u628A\u8BE5\u9879\u76EE\u4F5C\u4E3A path \u4F20\u5165\u2014\u2014\u5426\u5219\u53EA\u4F1A\u641C\u7D22 IDE \u5934\u90E8\u6240\u793A\u7684\u6D3B\u52A8\u6839\uFF0C\u5E38\u4E0E\u7528\u6237\u610F\u56FE\u4E0D\u7B26\u3002",
+          description: "\u5728\u5DE5\u4F5C\u533A\u7684\u6240\u6709\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\u3001\u514D\u7D27\u8DDF\u4E00\u6B21 read_file\uFF1B\u6784\u9020 edit_file \u7684 old_str \u524D\u53EF\u7528 context \u53C2\u6570\u8C03\u5927\u4E00\u6B21\u62FF\u8DB3\uFF09\uFF1B\u9ED8\u8BA4\u6309\u5B57\u9762\u91CF\u5173\u952E\u8BCD\u5339\u914D\uFF0C\u5982\u9700\u6B63\u5219\u4F20 is_regex=true\u3002\u2605 \u68C0\u7D22\u591A\u4E2A\u5173\u952E\u8BCD\u65F6\uFF0C\u7528 is_regex=true \u4EE5 | \u5408\u5E76\uFF08\u5982 'uploadVisible|uploadTip'\uFF09\u4E00\u6B21\u67E5\u5B8C\uFF0C\u52FF\u9010\u4E2A\u5173\u952E\u8BCD\u591A\u6B21\u8C03\u7528\u3002path \u53EF\u9650\u5B9A\u5230\u76EE\u5F55\u6216\u5177\u4F53\u6587\u4EF6\uFF08\u5728\u5355\u4E2A\u5927\u6587\u4EF6\u5185\u591A\u5904\u5B9A\u4F4D\u65F6\u4F20\u6587\u4EF6\u8DEF\u5F84\u6700\u9AD8\u6548\uFF09\u3002\u591A\u6839\u5DE5\u4F5C\u533A\u4E0B\uFF1A\u53EF\u4F20\u9879\u76EE\u76EE\u5F55\u540D\uFF08\u5982 'frontend'\uFF09\u81EA\u52A8\u5339\u914D\u5DE5\u4F5C\u533A\u6839\uFF0C\u6216\u4F20\u7EDD\u5BF9\u8DEF\u5F84 / \u76F8\u5BF9\u9ED8\u8BA4\u6839\u7684 ../\u5144\u5F1F\u76EE\u5F55\u3002\u2605 \u5F53\u7528\u6237\u5728\u5BF9\u8BDD\u91CC\u6307\u660E\u4E86\u67D0\u4E2A\u9879\u76EE\u65F6\uFF0C\u52A1\u5FC5\u628A\u8BE5\u9879\u76EE\u4F5C\u4E3A path \u4F20\u5165\u2014\u2014\u5426\u5219\u53EA\u4F1A\u641C\u7D22 IDE \u5934\u90E8\u6240\u793A\u7684\u6D3B\u52A8\u6839\uFF0C\u5E38\u4E0E\u7528\u6237\u610F\u56FE\u4E0D\u7B26\u3002",
           parameters: {
             type: "object",
             properties: {
-              query: { type: "string", description: "\u68C0\u7D22\u5185\u5BB9\u3002\u9ED8\u8BA4\u4E3A\u5B57\u9762\u91CF\u5173\u952E\u8BCD\uFF08\u5982 'function runAgent'\uFF09\uFF1Bis_regex=true \u65F6\u6309\u6B63\u5219\u89E3\u6790\uFF08\u5982 'function\\s+runAgent'\uFF09\u3002" },
+              query: { type: "string", description: "\u68C0\u7D22\u5185\u5BB9\u3002\u9ED8\u8BA4\u4E3A\u5B57\u9762\u91CF\u5173\u952E\u8BCD\uFF08\u5982 'function runAgent'\uFF09\uFF1Bis_regex=true \u65F6\u6309\u6B63\u5219\u89E3\u6790\uFF08\u5982 'function\\s+runAgent'\uFF0C\u591A\u5173\u952E\u8BCD\u7528 | \u5408\u5E76\uFF09" },
               is_regex: { type: "boolean", description: "\u662F\u5426\u5C06 query \u4F5C\u4E3A\u6B63\u5219\u8868\u8FBE\u5F0F\u89E3\u6790\uFF0C\u9ED8\u8BA4 false\uFF08\u5B57\u9762\u91CF\u5339\u914D\uFF0C\u81EA\u52A8\u8F6C\u4E49\u7279\u6B8A\u5B57\u7B26\uFF09" },
-              path: { type: "string", description: "\u9650\u5B9A\u641C\u7D22\u7684\u76EE\u5F55\uFF08\u53EF\u9009\uFF09\u3002\u9ED8\u8BA4\u641C\u7D22 IDE \u5934\u90E8\u6240\u793A\u6D3B\u52A8\u6839\u3002\u591A\u6839\u573A\u666F\u4E0B\uFF1A\u4F20\u9879\u76EE\u76EE\u5F55\u540D\uFF08\u5982 'frontend'\uFF09\u81EA\u52A8\u5339\u914D\u5DE5\u4F5C\u533A\u6839\uFF1B\u6216\u4F20\u7EDD\u5BF9\u8DEF\u5F84 / \u76F8\u5BF9\u9ED8\u8BA4\u6839\u7684 ../<\u5144\u5F1F\u76EE\u5F55>\uFF1B\u5747\u7ECF\u6C99\u7BB1\u6821\u9A8C\u3002\u7528\u6237\u63D0\u5230\u5177\u4F53\u9879\u76EE\u65F6\u5FC5\u586B\u3002" }
+              path: { type: "string", description: "\u9650\u5B9A\u641C\u7D22\u7684\u76EE\u5F55\u6216\u5177\u4F53\u6587\u4EF6\uFF08\u53EF\u9009\uFF09\u3002\u4F20\u5177\u4F53\u6587\u4EF6\u8DEF\u5F84\u65F6\u76F8\u5F53\u4E8E\u8BE5\u6587\u4EF6\u5185\u5168\u6587\u68C0\u7D22\uFF08\u5927\u6587\u4EF6\u591A\u5904\u5B9A\u4F4D\u9996\u9009\uFF09\u3002\u9ED8\u8BA4\u641C\u7D22 IDE \u5934\u90E8\u6240\u793A\u6D3B\u52A8\u6839\u3002\u591A\u6839\u573A\u666F\u4E0B\uFF1A\u4F20\u9879\u76EE\u76EE\u5F55\u540D\uFF08\u5982 'frontend'\uFF09\u81EA\u52A8\u5339\u914D\u5DE5\u4F5C\u533A\u6839\uFF1B\u6216\u4F20\u7EDD\u5BF9\u8DEF\u5F84 / \u76F8\u5BF9\u9ED8\u8BA4\u6839\u7684 ../<\u5144\u5F1F\u76EE\u5F55>\uFF1B\u5747\u7ECF\u6C99\u7BB1\u6821\u9A8C\u3002\u7528\u6237\u63D0\u5230\u5177\u4F53\u9879\u76EE\u65F6\u5FC5\u586B\u3002" },
+              context: { type: "number", description: "\u6BCF\u4E2A\u547D\u4E2D\u9644\u5E26\u7684\u524D\u540E\u4E0A\u4E0B\u6587\u884C\u6570\uFF080-10\uFF0C\u9ED8\u8BA4 2\uFF09\u3002\u9700\u8981\u62FF\u8DB3\u4E00\u6BB5\u5B8C\u6574\u4EE3\u7801\u4F5C edit_file \u7684 old_str \u65F6\u53EF\u8C03\u5927\uFF08\u5982 5-8\uFF09\uFF0C\u514D\u5F97\u4E8C\u6B21\u68C0\u7D22" }
             },
             required: ["query"]
           },
@@ -5614,6 +5670,7 @@ var init_search = __esm({
                 return resolveReadablePath(args.path);
               };
               const searchRoot = resolveSearchRoot().replace(/\\/g, "/");
+              const contextLines = Math.min(Math.max(args.context ?? 2, 0), 10);
               const rgArgs = [
                 "--threads",
                 "1",
@@ -5624,8 +5681,8 @@ var init_search = __esm({
                 "--color",
                 "never",
                 "-C",
-                "2",
-                // ★ 每个命中带前后各 2 行上下文：模型一次看懂用法，免去紧跟的 read_file 往返（减调用次数的关键）
+                String(contextLines),
+                // ★ 每个命中带前后上下文：模型一次看懂用法，免去紧跟的 read_file 往返（减调用次数的关键）
                 "--max-count",
                 "10",
                 "--glob",
@@ -5928,48 +5985,90 @@ ${tail}`,
 // ../core/src/tool/registry/glob.ts
 import fs14 from "fs/promises";
 import path17 from "path";
-var globToRegex2, globTools;
+var findMatchingBrace, splitTopLevel, globToRegex2, globTools;
 var init_glob = __esm({
   "../core/src/tool/registry/glob.ts"() {
     "use strict";
     init_type();
     init_guard();
+    findMatchingBrace = (s, start) => {
+      let depth = 0;
+      for (let i = start; i < s.length; i++) {
+        if (s[i] === "{") depth++;
+        else if (s[i] === "}") {
+          depth--;
+          if (depth === 0) return i;
+        }
+      }
+      return -1;
+    };
+    splitTopLevel = (s) => {
+      const parts = [];
+      let depth = 0, cur = "";
+      for (const ch of s) {
+        if (ch === "{") depth++;
+        else if (ch === "}") depth--;
+        if (ch === "," && depth === 0) {
+          parts.push(cur);
+          cur = "";
+          continue;
+        }
+        cur += ch;
+      }
+      parts.push(cur);
+      return parts;
+    };
     globToRegex2 = (pattern) => {
-      let re = "";
-      let i = 0;
-      while (i < pattern.length) {
-        const c = pattern[i];
-        if (c === "*" && pattern[i + 1] === "*") {
-          if (pattern[i + 2] === "/") {
-            re += "(?:.*/)?";
-            i += 3;
+      const walk = (s) => {
+        let re = "";
+        let i = 0;
+        while (i < s.length) {
+          const c = s[i];
+          if (c === "{") {
+            const close = findMatchingBrace(s, i);
+            if (close === -1) {
+              re += "\\{";
+              i++;
+              continue;
+            }
+            const alts = splitTopLevel(s.slice(i + 1, close));
+            re += `(?:${alts.map((a) => walk(a)).join("|")})`;
+            i = close + 1;
+            continue;
+          }
+          if (c === "*" && s[i + 1] === "*") {
+            if (s[i + 2] === "/") {
+              re += "(?:.*/)?";
+              i += 3;
+            } else {
+              re += ".*";
+              i += 2;
+            }
+          } else if (c === "*") {
+            re += "[^/]*";
+            i++;
+          } else if (c === "?") {
+            re += ".";
+            i++;
           } else {
-            re += ".*";
-            i += 2;
+            re += /[.+^$}()|[\]\\]/.test(c) ? "\\" + c : c;
+            i++;
           }
-        } else if (c === "*") {
-          re += "[^/]*";
-          i++;
-        } else if (c === "?") {
-          re += ".";
-          i++;
-        } else {
-          re += /[.+^${}()|[\]\\]/.test(c) ? "\\" + c : c;
-          i++;
         }
-      }
-      return new RegExp(`^${re}$`);
+        return re;
+      };
+      return new RegExp(`^${walk(pattern)}$`);
     };
     globTools = [
       {
         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\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",
+          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",
           parameters: {
             type: "object",
             properties: {
-              pattern: { type: "string", description: "glob \u6A21\u5F0F\uFF0C\u5982 '**/*.ts' \u6216 'src/**/*.test.ts'" },
+              pattern: { type: "string", description: "glob \u6A21\u5F0F\uFF0C\u652F\u6301 * / ** / ? \u4E0E\u82B1\u62EC\u53F7\u591A\u9009 {a,b}\uFF08\u5982 '**/*.{ts,vue}'\u3001'src/{api,components}/**'\uFF09" },
               path: { type: "string", description: "\u9650\u5B9A\u641C\u7D22\u7684\u8D77\u59CB\u76EE\u5F55\uFF08\u76F8\u5BF9\u8DEF\u5F84\uFF0C\u53EF\u9009\uFF0C\u9ED8\u8BA4\u5DE5\u4F5C\u533A\u6839\uFF09" }
             },
             required: ["pattern"]
@@ -6883,7 +6982,7 @@ var init_http = __esm({
 // ../core/src/tool/registry/typescript.ts
 import fs16 from "fs/promises";
 import path19 from "path";
-var MAX_FILE_BYTES, toDisplayPath, precheck, MAX_DIAG_ENTRIES, typescriptTools;
+var MAX_FILE_BYTES, toDisplayPath, precheck, MAX_DIAG_ENTRIES, MAX_DIAG_FILES, diagnoseOneFile, typescriptTools;
 var init_typescript = __esm({
   "../core/src/tool/registry/typescript.ts"() {
     "use strict";
@@ -6907,74 +7006,108 @@ var init_typescript = __esm({
       return null;
     };
     MAX_DIAG_ENTRIES = 300;
+    MAX_DIAG_FILES = 20;
+    diagnoseOneFile = async (TS, displayPath, checkJs) => {
+      try {
+        const absPath = realpathNative(resolveReadablePath(displayPath));
+        const block = await precheck(displayPath, absPath);
+        if (block) return { ok: false, text: block };
+        const { ls } = await getLanguageService(TS, absPath, { checkJs });
+        const syntactic = ls.getSyntacticDiagnostics(absPath);
+        const semantic = ls.getSemanticDiagnostics(absPath);
+        const all = [...syntactic, ...semantic];
+        if (all.length === 0) return { ok: true, errors: 0, warnings: 0, text: `\u2713 No diagnostics (0 errors, 0 warnings) for ${displayPath}` };
+        const entries = [];
+        let errors = 0, warnings = 0;
+        for (const d of all) {
+          const cat = d.category;
+          let label;
+          if (cat === TS.DiagnosticCategory.Error) {
+            label = "error";
+            errors++;
+          } else if (cat === TS.DiagnosticCategory.Warning) {
+            label = "warning";
+            warnings++;
+          } else if (cat === TS.DiagnosticCategory.Suggestion) label = "suggestion";
+          else label = "info";
+          let line = 0, column = 0;
+          if (d.file && typeof d.start === "number") {
+            ({ line, column } = posToLineCol(TS, d.file, d.start));
+          }
+          entries.push({
+            line,
+            column,
+            label,
+            code: typeof d.code === "number" ? `TS${d.code}` : "",
+            msg: TS.flattenDiagnosticMessageText(d.messageText, "\n")
+          });
+        }
+        entries.sort((a, b) => a.line - b.line || a.column - b.column);
+        const overflow = entries.length > MAX_DIAG_ENTRIES ? entries.length - MAX_DIAG_ENTRIES : 0;
+        const shown = overflow ? entries.slice(0, MAX_DIAG_ENTRIES) : entries;
+        const body = shown.map(
+          (e) => `${displayPath}:${e.line}:${e.column}  ${e.label}${e.code ? " " + e.code : ""}  ${e.msg}`
+        ).join("\n");
+        const tail = overflow ? `
+\u2026(\u53E6\u6709 ${overflow} \u6761\u8BCA\u65AD\u672A\u663E\u793A\uFF0C\u8BF7\u7F29\u5C0F\u8303\u56F4\u6216\u7528 run_command \u8DD1 tsc \u770B\u5168\u91CF)\u2026` : "";
+        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}` };
+      }
+    };
     typescriptTools = [
       {
         type: "function",
         function: {
           name: "get_diagnostics",
-          description: "\u5BF9\u5355\u4E2A TS/JS \u6587\u4EF6\u53D6 TypeScript \u8BED\u6CD5 + \u8BED\u4E49\u8BCA\u65AD\uFF08\u7C7B\u578B\u9519\u8BEF\u3001\u672A\u7528\u53D8\u91CF\u3001\u4E0D\u53EF\u8FBE\u4EE3\u7801\u7B49\uFF09\uFF0C\u8F93\u51FA\u5E26\u884C\u53F7/\u5217/\u4E25\u91CD\u5EA6/TS \u9519\u8BEF\u7801\uFF0C\u683C\u5F0F\u5BF9\u9F50 tsc\u3002\u7528\u4E8E\u7CBE\u51C6\u5B9A\u4F4D\u7F16\u8BD1/\u7C7B\u578B\u95EE\u9898\uFF0C\u66FF\u4EE3\u624B\u52A8\u8DD1 tsc \u518D\u89E3\u6790\u8F93\u51FA\u3002\u652F\u6301 .ts/.tsx/.js/.jsx/.mjs/.cjs\uFF1B.vue SFC \u4E0D\u652F\u6301\uFF08\u9700 vue-tsc\uFF09\u3002\u9879\u76EE\u7EA7\u5168\u91CF\u8BCA\u65AD\u8BF7\u7528 run_command \u8DD1 `tsc --noEmit`\u3002\u4F9D\u8D56 typescript \u6A21\u5757\uFF08VSCode \u6269\u5C55\u5185\u53EF\u7528\uFF1B\u7F3A\u5931\u5219\u672C\u5DE5\u5177\u81EA\u52A8\u9690\u85CF\uFF09\u3002",
+          description: "\u5BF9\u4E00\u4E2A\u6216\u591A\u4E2A TS/JS \u6587\u4EF6\u53D6 TypeScript \u8BED\u6CD5 + \u8BED\u4E49\u8BCA\u65AD\uFF08\u7C7B\u578B\u9519\u8BEF\u3001\u672A\u7528\u53D8\u91CF\u3001\u4E0D\u53EF\u8FBE\u4EE3\u7801\u7B49\uFF09\uFF0C\u8F93\u51FA\u5E26\u884C\u53F7/\u5217/\u4E25\u91CD\u5EA6/TS \u9519\u8BEF\u7801\uFF0C\u683C\u5F0F\u5BF9\u9F50 tsc\u3002\u7528\u4E8E\u7CBE\u51C6\u5B9A\u4F4D\u7F16\u8BD1/\u7C7B\u578B\u95EE\u9898\uFF0C\u66FF\u4EE3\u624B\u52A8\u8DD1 tsc \u518D\u89E3\u6790\u8F93\u51FA\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 \u4E0D\u652F\u6301\uFF08\u9700 vue-tsc\uFF09\u3002\u9879\u76EE\u7EA7\u5168\u91CF\u8BCA\u65AD\u8BF7\u7528 run_command \u8DD1 `tsc --noEmit`\u3002\u4F9D\u8D56 typescript \u6A21\u5757\uFF08VSCode \u6269\u5C55\u5185\u53EF\u7528\uFF1B\u7F3A\u5931\u5219\u672C\u5DE5\u5177\u81EA\u52A8\u9690\u85CF\uFF09\u3002",
           parameters: {
             type: "object",
             properties: {
-              path: { type: "string", description: "\u76EE\u6807\u6587\u4EF6\u76F8\u5BF9\u8DEF\u5F84\uFF08\u5982 'src/services/user.ts'\uFF09" },
+              path: { type: "string", description: "\u76EE\u6807\u6587\u4EF6\u76F8\u5BF9\u8DEF\u5F84\uFF08\u5982 'src/services/user.ts'\uFF09\u3002\u5355\u6587\u4EF6\u8BCA\u65AD\u7528\uFF1B\u6279\u91CF\u8BF7\u6539\u7528 paths" },
+              paths: { type: "array", items: { type: "string" }, description: "\u2605 \u6279\u91CF\u8BCA\u65AD\uFF1A\u591A\u4E2A\u6587\u4EF6\u4E00\u6B21\u9A8C\u8BC1\uFF08\u5355\u6B21\u6700\u591A 20 \u4E2A\uFF0C\u8D85\u51FA\u4F1A\u62D2\u7EDD\uFF09\u3002\u4F20\u4E86 paths \u5219\u5FFD\u7565 path" },
               check_js: { type: "boolean", description: "\u5BF9 .js/.jsx \u6587\u4EF6\u5F00\u542F\u8BED\u4E49\u68C0\u67E5\uFF08\u9ED8\u8BA4\u9075 tsconfig \u7684 checkJs\uFF1B\u76EE\u6807\u4E3A JS \u4E14\u60F3\u8981\u7C7B\u578B\u8BCA\u65AD\u65F6\u6309\u9700\u7F6E true\uFF09" }
             },
-            required: ["path"]
+            required: []
           },
           safetyLevel: "safe" /* SAFE */,
           isSync: true,
-          maxOutputCharacters: 24e3,
+          maxOutputCharacters: 48e3,
+          // ★ 批量多文件后上调（原单文件 24K；中心 truncateToolResult 仍是最终兜底）
           privacyMaskingRules: maskSecretsInContent,
           validateEnvironment: async () => !!await getTs(),
           async execute(args, _ctx) {
             try {
               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 absPath = realpathNative(resolveReadablePath(args.path));
-              const block = await precheck(args.path, absPath);
-              if (block) return block;
-              const { ls } = await getLanguageService(TS, absPath, { checkJs: args.check_js });
-              const syntactic = ls.getSyntacticDiagnostics(absPath);
-              const semantic = ls.getSemanticDiagnostics(absPath);
-              const all = [...syntactic, ...semantic];
-              if (all.length === 0) return `\u2713 No diagnostics (0 errors, 0 warnings) for ${args.path}`;
-              const entries = [];
-              let errors = 0, warnings = 0;
-              for (const d of all) {
-                const cat = d.category;
-                let label;
-                if (cat === TS.DiagnosticCategory.Error) {
-                  label = "error";
-                  errors++;
-                } else if (cat === TS.DiagnosticCategory.Warning) {
-                  label = "warning";
-                  warnings++;
-                } else if (cat === TS.DiagnosticCategory.Suggestion) label = "suggestion";
-                else label = "info";
-                let line = 0, column = 0;
-                if (d.file && typeof d.start === "number") {
-                  ({ line, column } = posToLineCol(TS, d.file, d.start));
+              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`;
+              const results = [];
+              for (const p of targets) results.push(await diagnoseOneFile(TS, p, args.check_js));
+              if (results.length === 1) return results[0].text;
+              let totalErr = 0, totalWarn = 0, clean = 0, failed = 0;
+              const sections = [];
+              for (let i = 0; i < results.length; i++) {
+                const r = results[i];
+                if (!r.ok) {
+                  failed++;
+                  sections.push(`\u2014\u2014 ${targets[i]}\uFF08\u8BCA\u65AD\u672A\u4EA7\u51FA\uFF09\u2014\u2014
+${r.text}`);
+                  continue;
                 }
-                entries.push({
-                  line,
-                  column,
-                  label,
-                  code: typeof d.code === "number" ? `TS${d.code}` : "",
-                  msg: TS.flattenDiagnosticMessageText(d.messageText, "\n")
-                });
+                totalErr += r.errors;
+                totalWarn += r.warnings;
+                if (r.errors === 0 && r.warnings === 0) clean++;
+                sections.push(`\u2014\u2014 ${targets[i]} \u2014\u2014
+${r.text}`);
               }
-              entries.sort((a, b) => a.line - b.line || a.column - b.column);
-              const overflow = entries.length > MAX_DIAG_ENTRIES ? entries.length - MAX_DIAG_ENTRIES : 0;
-              const shown = overflow ? entries.slice(0, MAX_DIAG_ENTRIES) : entries;
-              const body = shown.map(
-                (e) => `${args.path}:${e.line}:${e.column}  ${e.label}${e.code ? " " + e.code : ""}  ${e.msg}`
-              ).join("\n");
-              const tail = overflow ? `
-\u2026(\u53E6\u6709 ${overflow} \u6761\u8BCA\u65AD\u672A\u663E\u793A\uFF0C\u8BF7\u7F29\u5C0F\u8303\u56F4\u6216\u7528 run_command \u8DD1 tsc \u770B\u5168\u91CF)\u2026` : "";
-              return `[Diagnostics: ${args.path}] ${errors} error(s), ${warnings} warning(s)
-${body}${tail}`;
+              return `[\u6279\u91CF\u8BCA\u65AD: ${targets.length} \u4E2A\u6587\u4EF6] \u5171 ${totalErr} error(s), ${totalWarn} warning(s)\uFF1B${clean} \u4E2A\u6587\u4EF6\u5E72\u51C0${failed ? `\uFF0C${failed} \u4E2A\u8BCA\u65AD\u5931\u8D25` : ""}
+
+${sections.join("\n\n")}`;
             } catch (e) {
-              return `\u274C \u7C7B\u578B\u8BCA\u65AD\u5931\u8D25 [${args.path}]: ${e?.message ?? e}`;
+              return `\u274C \u7C7B\u578B\u8BCA\u65AD\u5931\u8D25: ${e?.message ?? e}`;
             }
           }
         }
@@ -8818,7 +8951,6 @@ var agentTools, agentSubTools, workflowTools;
 var init_tool = __esm({
   "../core/src/tool/index.ts"() {
     "use strict";
-    init_system();
     init_agent();
     init_workflow();
     init_fs();
@@ -8844,7 +8976,6 @@ var init_tool = __esm({
     agentSubTools = createAgentTools(() => agentTools);
     workflowTools = createWorkflowTools(() => agentTools);
     agentTools.push(
-      ...systemTools,
       ...agentSubTools,
       ...workflowTools,
       ...fsTools,
@@ -12442,14 +12573,17 @@ var init_useChatState = __esm({
           await runOnce(sid, `\uFF08\u7528\u6237\u5DF2\u6279\u51C6\u4EE5\u4E0B\u65B9\u6848\uFF0C\u8BF7\u4E25\u683C\u6309\u65B9\u6848\u5F00\u59CB\u5B9E\u73B0\uFF09\uFF1A
 
 ${finalPlan}`, false, res.autoExecute);
-        } else {
-          pushInfo(S.planRejected);
+          return true;
         }
+        planModeRef.current = true;
+        pushInfo(S.planKeepPlanning);
+        return false;
       }, [runOnce, setPlan, pushInfo]);
       const runPlanStage = useCallback(async (sid, researchPrompt) => {
         await runOnce(sid, researchPrompt, true);
         const plan = takeProposedPlan();
-        if (plan != null) await approveAndImplement(sid, plan);
+        if (plan == null) return false;
+        return await approveAndImplement(sid, plan);
       }, [runOnce, takeProposedPlan, approveAndImplement]);
       const queueInput = useCallback((content) => {
         const text = content.trim();
@@ -12472,7 +12606,8 @@ ${finalPlan}`, false, res.autoExecute);
           const sid = sessionIdRef.current;
           pushUser(text);
           if (planModeRef.current) {
-            await runPlanStage(sid, text);
+            const kept = await runPlanStage(sid, text);
+            if (kept) planModeRef.current = false;
           } else {
             await runOnce(sid, text, false);
             const proposedPlan = takeProposedPlan();
@@ -12483,8 +12618,8 @@ ${finalPlan}`, false, res.autoExecute);
               if (enterReason != null) {
                 pushInfo(`\u{1F4CB} \u6A21\u578B\u8BF7\u6C42\u8FDB\u5165\u8BA1\u5212\u6A21\u5F0F${enterReason ? `\uFF1A${enterReason}` : ""}\uFF0C\u5DF2\u5207\u6362\u2026`);
                 planModeRef.current = true;
-                await runPlanStage(sid, ENTER_PLAN_RESEARCH_PROMPT);
-                planModeRef.current = false;
+                const kept = await runPlanStage(sid, ENTER_PLAN_RESEARCH_PROMPT);
+                if (kept) planModeRef.current = false;
               }
             }
           }
@@ -12748,6 +12883,8 @@ var init_MessageBlock = __esm({
       return { bullet: `${m[2]} `, rest: m[3] };
     };
     AssistantLine = ({ line }) => {
+      const heading = line.match(/^#{1,6}\s+(.*)$/);
+      if (heading) return /* @__PURE__ */ jsx3(Text3, { bold: true, color: "#ffffff", children: heading[1] });
       const list = listPrefix(line);
       if (list) {
         return /* @__PURE__ */ jsxs(Box, { flexDirection: "row", children: [
@@ -12897,6 +13034,149 @@ var init_ThinkingBlock = __esm({
   }
 });
 
+// src/lineDiff.ts
+var splitLines, lineDiff, collapseContext;
+var init_lineDiff = __esm({
+  "src/lineDiff.ts"() {
+    "use strict";
+    splitLines = (s) => {
+      const t = String(s ?? "").replace(/\r\n/g, "\n");
+      return t === "" ? [] : t.split("\n");
+    };
+    lineDiff = (oldStr, newStr) => {
+      const a = splitLines(oldStr);
+      const b = splitLines(newStr);
+      let s = 0;
+      while (s < a.length && s < b.length && a[s] === b[s]) s++;
+      let e = 0;
+      while (e < a.length - s && e < b.length - s && a[a.length - 1 - e] === b[b.length - 1 - e]) e++;
+      const m1 = a.slice(s, a.length - e);
+      const m2 = b.slice(s, b.length - e);
+      const rows = [];
+      for (let i = 0; i < s; i++) rows.push({ t: "ctx", s: a[i] });
+      const n = m1.length, m = m2.length;
+      if (n === 0 && m === 0) {
+      } else if (n * m > 4e6) {
+        for (const l of m1) rows.push({ t: "del", s: l });
+        for (const l of m2) rows.push({ t: "add", s: l });
+      } else {
+        const w = m + 1;
+        const dp = new Uint32Array((n + 1) * w);
+        for (let i2 = n - 1; i2 >= 0; i2--) {
+          for (let j2 = m - 1; j2 >= 0; j2--) {
+            dp[i2 * w + j2] = m1[i2] === m2[j2] ? dp[(i2 + 1) * w + j2 + 1] + 1 : Math.max(dp[(i2 + 1) * w + j2], dp[i2 * w + j2 + 1]);
+          }
+        }
+        let i = 0, j = 0;
+        while (i < n && j < m) {
+          if (m1[i] === m2[j]) {
+            rows.push({ t: "ctx", s: m1[i] });
+            i++;
+            j++;
+          } else if (dp[(i + 1) * w + j] >= dp[i * w + j + 1]) {
+            rows.push({ t: "del", s: m1[i] });
+            i++;
+          } else {
+            rows.push({ t: "add", s: m2[j] });
+            j++;
+          }
+        }
+        while (i < n) {
+          rows.push({ t: "del", s: m1[i] });
+          i++;
+        }
+        while (j < m) {
+          rows.push({ t: "add", s: m2[j] });
+          j++;
+        }
+      }
+      for (let k = 0; k < e; k++) rows.push({ t: "ctx", s: a[a.length - e + k] });
+      return rows;
+    };
+    collapseContext = (rows, keep = 2) => {
+      const out = [];
+      let i = 0;
+      while (i < rows.length) {
+        if (rows[i].t !== "ctx") {
+          out.push(rows[i]);
+          i++;
+          continue;
+        }
+        let j = i;
+        while (j < rows.length && rows[j].t === "ctx") j++;
+        const run = j - i;
+        if (run > keep * 2 + 1) {
+          for (let k = 0; k < keep; k++) out.push(rows[i + k]);
+          out.push({ t: "ellip", n: run - keep * 2 });
+          for (let k = run - keep; k < run; k++) out.push(rows[i + k]);
+        } else {
+          for (let k = 0; k < run; k++) out.push(rows[i + k]);
+        }
+        i = j;
+      }
+      return out;
+    };
+  }
+});
+
+// src/diffView.ts
+var EDIT_TOOL_NAMES, extractEditPairs, pairsToDisplayRows, parseApprovalDiff;
+var init_diffView = __esm({
+  "src/diffView.ts"() {
+    "use strict";
+    init_lineDiff();
+    EDIT_TOOL_NAMES = ["edit_file", "create_file", "write_file"];
+    extractEditPairs = (toolName, args) => {
+      if (args == null || typeof args !== "object") return null;
+      const o = args;
+      if (toolName === "edit_file") {
+        const list = Array.isArray(o.edits) && o.edits.length > 0 ? o.edits : [o];
+        const pairs = list.filter((e) => typeof e.old_str === "string" && e.old_str.length > 0);
+        if (pairs.length === 0) return null;
+        return pairs.map((e, i) => ({
+          label: pairs.length > 1 ? `\u7B2C ${i + 1} \u5904${e.replace_all ? "\uFF08\u6279\u91CF\u66FF\u6362\u5168\u90E8\u5339\u914D\uFF09" : ""}` : "",
+          old: e.old_str,
+          new: typeof e.new_str === "string" ? e.new_str : ""
+        }));
+      }
+      if (toolName === "create_file" || toolName === "write_file") {
+        return typeof o.content === "string" && o.content.length > 0 ? [{ label: "", old: "", new: o.content }] : null;
+      }
+      return null;
+    };
+    pairsToDisplayRows = (pairs, keep = 2) => {
+      const out = [];
+      let changed = false;
+      for (const p of pairs) {
+        const collapsed = collapseContext(lineDiff(p.old, p.new), keep);
+        if (!collapsed.some((r) => r.t !== "ctx" && r.t !== "ellip")) continue;
+        changed = true;
+        if (p.label) {
+          if (out.length > 0) out.push({ t: "ellip", n: 0 });
+          out.push({ t: "ctx", s: `\u2014\u2014 ${p.label} \u2014\u2014` });
+        }
+        out.push(...collapsed);
+      }
+      return changed ? out : null;
+    };
+    parseApprovalDiff = (detail, toolName) => {
+      if (toolName !== "edit_file" || !detail.includes("\u3010\u51CF\u5C11\u3011:")) return null;
+      const parts = detail.split(/\n(?=—— 第 )/);
+      const sections = [];
+      for (const part of parts.slice(1)) {
+        const label = (part.match(/^—— (第 \d+ 处[^\n]*)——/)?.[1] ?? "").trim();
+        const rIdx = part.indexOf("\u3010\u51CF\u5C11\u3011:");
+        const aIdx = part.indexOf("\u3010\u589E\u52A0\u3011:");
+        if (rIdx < 0 || aIdx < 0 || aIdx < rIdx) continue;
+        const old = part.slice(rIdx + "\u3010\u51CF\u5C11\u3011:".length, aIdx).replace(/^\n+|\n+$/g, "");
+        const neu = part.slice(aIdx + "\u3010\u589E\u52A0\u3011:".length).replace(/^\n+|\n+$/g, "");
+        sections.push({ label, old, new: neu });
+      }
+      return sections.length > 0 ? { header: parts[0], sections } : null;
+    };
+  }
+});
+
 // src/components/ToolCard.tsx
 import { Box as Box3, Text as Text5 } from "ink";
 import { jsx as jsx5, jsxs as jsxs3 } from "react/jsx-runtime";
@@ -12906,6 +13186,7 @@ var init_ToolCard = __esm({
     "use strict";
     init_theme();
     init_util();
+    init_diffView();
     ToolCard = ({ toolName, args, result, ok, status, progress, wrapW }) => {
       const tool = findTool(toolName);
       const level = tool?.function?.safetyLevel;
@@ -12922,6 +13203,15 @@ var init_ToolCard = __esm({
         const last = progress.replace(/\r/g, "").split("\n").map((s) => s.trim()).filter(Boolean).pop() ?? "";
         return truncateMiddle(last, Math.max(20, wrapW - 6));
       })();
+      const MAX_DIFF_LINES2 = 14;
+      const diffAll = (() => {
+        if (status !== "done" || !ok) return null;
+        if (!EDIT_TOOL_NAMES.includes(toolName)) return null;
+        const pairs = extractEditPairs(toolName, args);
+        return pairs ? pairsToDisplayRows(pairs) : null;
+      })();
+      const diffRows = diffAll ? diffAll.slice(0, MAX_DIFF_LINES2) : null;
+      const diffHidden = diffAll ? Math.max(0, diffAll.length - MAX_DIFF_LINES2) : 0;
       return /* @__PURE__ */ jsxs3(Box3, { flexDirection: "column", marginTop: 0.3, marginBottom: 0.3, children: [
         /* @__PURE__ */ jsxs3(Box3, { flexDirection: "row", flexShrink: 0, children: [
           /* @__PURE__ */ jsx5(Text5, { color: markerColor, bold: true, children: "\u23FA " }),
@@ -12935,6 +13225,14 @@ var init_ToolCard = __esm({
         ] }, i)) : status === "running" ? /* @__PURE__ */ jsxs3(Box3, { flexDirection: "row", flexShrink: 0, children: [
           /* @__PURE__ */ jsx5(Text5, { color: THEME.grayDim, children: "  \u23BF  " }),
           /* @__PURE__ */ jsx5(Text5, { color: THEME.gray, children: runningLine || "\u8FD0\u884C\u4E2D\u2026" })
+        ] }) : null,
+        diffRows && diffRows.length > 0 ? diffRows.map((r, i) => /* @__PURE__ */ jsxs3(Box3, { flexDirection: "row", flexShrink: 0, children: [
+          /* @__PURE__ */ jsx5(Text5, { color: THEME.grayDim, children: "     " }),
+          r.t === "ellip" ? /* @__PURE__ */ jsx5(Text5, { color: THEME.grayDim, children: r.n > 0 ? `  \u22EF ${r.n} \u884C\u672A\u53D8` : "  \u22EF" }) : /* @__PURE__ */ jsx5(Text5, { color: r.t === "del" ? THEME.danger : r.t === "add" ? THEME.ok : THEME.grayDim, children: `${r.t === "del" ? "- " : r.t === "add" ? "+ " : "  "}${truncateMiddle(r.s, Math.max(20, wrapW - 8))}` })
+        ] }, `diff-${i}`)) : null,
+        diffHidden > 0 ? /* @__PURE__ */ jsxs3(Box3, { flexDirection: "row", flexShrink: 0, children: [
+          /* @__PURE__ */ jsx5(Text5, { color: THEME.grayDim, children: "     " }),
+          /* @__PURE__ */ jsx5(Text5, { color: THEME.grayDim, children: `  \u2026\uFF08\u53E6\u6709 ${diffHidden} \u884C\u6539\u52A8\u672A\u663E\u793A\uFF09` })
         ] }) : null
       ] });
     };
@@ -12978,28 +13276,36 @@ var init_TodosPanel = __esm({
 
 // src/components/ApprovalModal.tsx
 import { Box as Box5, Text as Text7 } from "ink";
-import { jsx as jsx7, jsxs as jsxs5 } from "react/jsx-runtime";
-var OPTIONS, ApprovalModal;
+import { Fragment as Fragment2, jsx as jsx7, jsxs as jsxs5 } from "react/jsx-runtime";
+var OPTIONS, MAX_DIFF_LINES, ApprovalModal;
 var init_ApprovalModal = __esm({
   "src/components/ApprovalModal.tsx"() {
     "use strict";
     init_theme();
     init_strings();
     init_util();
+    init_diffView();
     OPTIONS = [
       { label: S.approvalAllow, value: "allow-once", color: THEME.ok },
       { label: S.approvalAllowAlways, value: "allow-always", color: THEME.warn },
       { label: S.approvalDeny, value: "deny", color: THEME.danger }
     ];
+    MAX_DIFF_LINES = 18;
     ApprovalModal = ({ toolName, detail, selectedIndex, wrapW }) => {
       const contentW = Math.max(16, wrapW);
+      const parsed = parseApprovalDiff(detail, toolName);
+      const diffRows = parsed ? pairsToDisplayRows(parsed.sections) : null;
       return /* @__PURE__ */ jsxs5(Box5, { flexDirection: "column", borderStyle: "round", borderColor: THEME.warn, paddingX: 1, paddingY: 1, marginTop: 1, children: [
         /* @__PURE__ */ jsxs5(Text7, { color: THEME.warn, bold: true, children: [
           S.approvalTitle,
           " \xB7 ",
           toolName
         ] }),
-        /* @__PURE__ */ jsx7(Box5, { flexDirection: "column", marginTop: 0.5, marginBottom: 0.5, children: wrapText(detail || "(\u65E0\u8BF4\u660E)", contentW).map((line, j) => /* @__PURE__ */ jsx7(Text7, { color: THEME.white, children: line }, j)) }),
+        /* @__PURE__ */ jsx7(Box5, { flexDirection: "column", marginTop: 0.5, marginBottom: 0.5, children: parsed && diffRows ? /* @__PURE__ */ jsxs5(Fragment2, { children: [
+          wrapText(parsed.header, contentW).map((line, j) => /* @__PURE__ */ jsx7(Text7, { color: THEME.white, children: line }, `h-${j}`)),
+          diffRows.slice(0, MAX_DIFF_LINES).map((r, i) => /* @__PURE__ */ jsx7(Text7, { color: r.t === "del" ? THEME.danger : r.t === "add" ? THEME.ok : THEME.grayDim, children: r.t === "ellip" ? r.n > 0 ? `  \u22EF ${r.n} \u884C\u672A\u53D8` : "  \u22EF" : `${r.t === "del" ? "- " : r.t === "add" ? "+ " : "  "}${truncateMiddle(r.s, Math.max(20, contentW - 2))}` }, `d-${i}`)),
+          diffRows.length > MAX_DIFF_LINES ? /* @__PURE__ */ jsx7(Text7, { color: THEME.grayDim, children: `  \u2026\uFF08\u53E6\u6709 ${diffRows.length - MAX_DIFF_LINES} \u884C\u672A\u663E\u793A\uFF09` }) : null
+        ] }) : wrapText(detail || "(\u65E0\u8BF4\u660E)", contentW).map((line, j) => /* @__PURE__ */ jsx7(Text7, { color: THEME.white, children: line }, j)) }),
         /* @__PURE__ */ jsx7(Text7, { color: THEME.grayDim, children: S.approvalPrompt }),
         OPTIONS.map((opt, i) => {
           const active = i === selectedIndex;
@@ -13539,7 +13845,7 @@ __export(App_exports, {
 });
 import { useCallback as useCallback2, useEffect as useEffect4, useMemo, useRef as useRef2, useState as useState4 } from "react";
 import { Box as Box15, Static, Text as Text17, useApp, useInput as useInput2, useStdout } from "ink";
-import { jsx as jsx17, jsxs as jsxs15 } from "react/jsx-runtime";
+import { Fragment as Fragment3, jsx as jsx17, jsxs as jsxs15 } from "react/jsx-runtime";
 var KNOWN_MODELS, CWD2, RowView, isDynamicRow, App;
 var init_App = __esm({
   "src/App.tsx"() {
@@ -14068,9 +14374,10 @@ ${listText}`);
             state.pendingFork ? /* @__PURE__ */ jsx17(ForkPicker, { anchors: state.pendingFork.anchors, selectedIndex: selectIdx, wrapW }) : null,
             slashVisible ? /* @__PURE__ */ jsx17(SlashMenu, { entries: filteredCommands, selectedIndex: selectIdx, cols }) : null
           ] }),
-          /* @__PURE__ */ jsxs15(Box15, { flexDirection: "column", paddingX: 1, marginTop: 1, flexShrink: 0, children: [
-            /* @__PURE__ */ jsx17(Text17, { dimColor: true, color: THEME.gray, children: dimRule(cols) }),
-            /* @__PURE__ */ jsx17(
+          /* @__PURE__ */ jsx17(Box15, { flexDirection: "column", paddingX: 1, marginTop: 1, flexShrink: 0, children: (() => {
+            const planOn = state.getPlanMode();
+            const autoOn = !planOn && state.getAutoMode();
+            const inputEl = /* @__PURE__ */ jsx17(
               MultilineInput,
               {
                 value: input,
@@ -14086,8 +14393,18 @@ ${listText}`);
                 suppressSubmit: slashVisible,
                 placeholder: S.placeholder
               }
-            )
-          ] }),
+            );
+            if (planOn || autoOn) {
+              return /* @__PURE__ */ jsxs15(Box15, { flexDirection: "column", borderStyle: "round", borderColor: planOn ? THEME.thinking : THEME.warn, paddingX: 1, children: [
+                /* @__PURE__ */ jsx17(Text17, { color: planOn ? THEME.thinking : THEME.warn, children: planOn ? S.inputBadgePlan : S.inputBadgeAuto }),
+                inputEl
+              ] });
+            }
+            return /* @__PURE__ */ jsxs15(Fragment3, { children: [
+              /* @__PURE__ */ jsx17(Text17, { dimColor: true, color: THEME.gray, children: dimRule(cols) }),
+              inputEl
+            ] });
+          })() }),
           /* @__PURE__ */ jsx17(Box15, { paddingX: 1, marginTop: 1, flexShrink: 0, children: /* @__PURE__ */ jsx17(StatusStrip, { model: modelDisplay, busy: state.busy, aborting: state.aborting, planMode: state.getPlanMode(), autoMode: state.getAutoMode(), sessionShort, cols, customLine: statusLineText }) })
         ] })
       ] });

package/package.json

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