dskcode 0.1.31 → 0.1.33

package/dist/index.js

@@ -1175,7 +1175,7 @@ function formatArgsSummary(args) {
     return `     ${truncated}`;
   }
 }
-function ToolCallBlock({ call, showPendingHint = true }) {
+function ToolCallBlock({ call }) {
   const argsDisplay = formatArgsSummary(call.arguments);
   return /* @__PURE__ */ jsxs3(Box3, { flexDirection: "column", marginLeft: 3, marginTop: 1, children: [
     /* @__PURE__ */ jsxs3(Box3, { children: [
@@ -1188,8 +1188,7 @@ function ToolCallBlock({ call, showPendingHint = true }) {
         "\u2500".repeat(Math.max(1, 30 - call.name.length))
       ] })
     ] }),
-    /* @__PURE__ */ jsx3(Box3, { flexDirection: "column", children: /* @__PURE__ */ jsx3(Text4, { dimColor: true, children: argsDisplay }) }),
-    showPendingHint && /* @__PURE__ */ jsx3(Box3, { children: /* @__PURE__ */ jsx3(Text4, { dimColor: true, children: "\u23F3 \u7B49\u5F85\u6267\u884C" }) })
+    /* @__PURE__ */ jsx3(Box3, { flexDirection: "column", children: /* @__PURE__ */ jsx3(Text4, { dimColor: true, children: argsDisplay }) })
   ] });
 }
 
@@ -2658,7 +2657,7 @@ var Reflector = class {
     const reflections = [];
     for (const item of items) {
       if (item.result.success) continue;
-      const r = this.#ruleRepeatedFailure(item) ?? this.#ruleFileNotFound(item) ?? this.#rulePermissionDenied(item) ?? this.#ruleOutOfWriteRoot(item, ctx.writeRoots);
+      const r = this.#ruleRepeatedFailure(item) ?? this.#ruleFileNotFound(item) ?? this.#ruleTextNotFound(item) ?? this.#rulePermissionDenied(item) ?? this.#ruleOutOfWriteRoot(item, ctx.writeRoots);
       if (r) reflections.push(r);
       if (reflections.length >= this.#maxReflections) break;
     }
@@ -2734,6 +2733,26 @@ var Reflector = class {
       hint: `\`${item.name}\` \u5931\u8D25\uFF1A\u6587\u4EF6\u4E0D\u5B58\u5728\u3002\u8BF7\u5148\u7528 \`ls\` / \`glob\` \u770B\u4E00\u4E0B\u76EE\u5F55\u7ED3\u6784\uFF0C\u6216\u786E\u8BA4\u8DEF\u5F84\u62FC\u5199\uFF08\u5F53\u524D\u5DE5\u4F5C\u76EE\u5F55\u89C1 system prompt\uFF09\u3002`
     };
   }
+  /**
+   * R2.5 文本未找到：edit_file / multi_edit 报 TEXT_NOT_FOUND 或 TEXT_MULTIPLE_MATCHES。
+   *
+   * 这是编辑工具最高频的失败。工具内部已对 CRLF 做归一化，仍报此错通常是
+   * old_text 与当前文件内容不一致（缩进 / 已被改过 / 多次出现）。给一条明确
+   * 的「重新读文件、逐字复制」指引，避免模型用同一份旧 old_text 反复重试。
+   *
+   * @pure 仅读入参
+   */
+  #ruleTextNotFound(item) {
+    const isTextErr = item.result.error === "TEXT_NOT_FOUND" || item.result.error === "TEXT_MULTIPLE_MATCHES";
+    if (!isTextErr) return null;
+    const multiple = item.result.error === "TEXT_MULTIPLE_MATCHES";
+    const hint = multiple ? `\`${item.name}\`\uFF1Aold_text \u5728\u6587\u4EF6\u4E2D\u51FA\u73B0\u591A\u6B21\u3002\u8BF7\u8865\u5145\u4E0A\u4E0B\u6587\u8BA9 old_text \u552F\u4E00\uFF0C\u6216\u6539\u7528 multi_edit \u7684 replaceAll\u3002` : `\`${item.name}\`\uFF1A\u672A\u627E\u5230 old_text\u3002\u8BF7\u91CD\u65B0 \`read_file\` \u770B\u5F53\u524D\u5185\u5BB9\uFF0C\u9010\u5B57\u590D\u5236\u8981\u66FF\u6362\u7684\u7247\u6BB5\uFF08\u6CE8\u610F\u7F29\u8FDB\u4E0E\u7A7A\u683C\uFF09\uFF1B\u884C\u5C3E\u5DF2\u505A CRLF \u5F52\u4E00\u5316\uFF0C\u65E0\u9700\u624B\u5199 \\r\\n\u3002`;
+    return {
+      category: "text_not_found",
+      toolName: item.name,
+      hint
+    };
+  }
   /**
    * R3 权限拒绝：GATE_DENIED 错误码 或 data 含 EACCES / permission / denied（不区分大小写）。
    *
@@ -2751,13 +2770,19 @@ var Reflector = class {
     };
   }
   /**
-   * R4 写根外：kind ∈ Edit/Delete/Move 且失败。
+   * R4 写根外：kind ∈ Edit/Delete/Move 且错误码为 OUTSIDE_WRITE_ROOTS。
+   *
+   * 仅在工具本身明确报「路径超出写根」时才命中。旧实现只要写类工具失败就
+   * 触发，会把 TEXT_NOT_FOUND / EXECUTION_ERROR 等误报为「写根外」，注入
+   * 误导性提示（见会话日志 e65f0205 round 13：edit_file 因 CRLF 失配返回
+   * TEXT_NOT_FOUND，却被反射为 out_of_write_root）。
    *
    * @pure 仅读入参
    */
   #ruleOutOfWriteRoot(item, writeRoots) {
     const isWriteKind = item.kind === "edit" /* Edit */ || item.kind === "delete" /* Delete */ || item.kind === "move" /* Move */;
     if (!isWriteKind) return null;
+    if (item.result.error !== "OUTSIDE_WRITE_ROOTS") return null;
     const primary = writeRoots[0] ?? "<\u672A\u914D\u7F6E>";
     return {
       category: "out_of_write_root",
@@ -4335,8 +4360,13 @@ var DEFAULT_TIMEOUT_MS = 3e4;
 var DEFAULT_MAX_OUTPUT_LENGTH = 5e4;
 var DEFAULT_MAX_FILE_SIZE = 10 * 1024 * 1024;
 var isWindows = process2.platform === "win32";
+function stripMentionPrefix(inputPath) {
+  if (inputPath.startsWith("@")) return inputPath.slice(1);
+  return inputPath;
+}
 function resolvePath(inputPath, cwd) {
-  const resolved = isAbsolute(inputPath) ? inputPath : resolve(cwd, inputPath);
+  const stripped = stripMentionPrefix(inputPath);
+  const resolved = isAbsolute(stripped) ? stripped : resolve(cwd, stripped);
   return resolve(resolved);
 }
 async function realPath(target) {
@@ -4732,6 +4762,10 @@ function detectEol(text) {
 function hasTrailingNewline(text) {
   return text.endsWith("\n") || text.endsWith("\r\n");
 }
+function toLf(text) {
+  if (!text.includes("\r")) return text;
+  return text.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+}
 function normalizeEol(originalContent, newContent) {
   const targetEol = detectEol(originalContent);
   const lines = newContent.replace(/\r\n/g, "\n").split("\n");
@@ -4823,7 +4857,7 @@ var readFileTool = {
         }
       }
       const content = await readFile5(filePath, "utf-8");
-      const lines = content.split("\n");
+      const lines = toLf(content).split("\n");
       if (lines.length > 0 && lines[lines.length - 1] === "" && content.endsWith("\n")) {
         lines.pop();
       }
@@ -4931,6 +4965,7 @@ var writeFileTool = {
 
 // src/tool/builtins/edit-file.ts
 import { readFile as readFile7 } from "fs/promises";
+import { writeFile as writeFile5 } from "fs/promises";
 import { basename as basename3 } from "path";
 var editFileTool = {
   name: "edit_file",
@@ -4974,7 +5009,9 @@ var editFileTool = {
     }
     try {
       const content = await readFile7(filePath, "utf-8");
-      const firstIndex = content.indexOf(args.old_text);
+      const contentN = toLf(content);
+      const oldTextN = toLf(args.old_text);
+      const firstIndex = contentN.indexOf(oldTextN);
       if (firstIndex === -1) {
         return {
           success: false,
@@ -4982,7 +5019,7 @@ var editFileTool = {
           error: "TEXT_NOT_FOUND"
         };
       }
-      const secondIndex = content.indexOf(args.old_text, firstIndex + 1);
+      const secondIndex = contentN.indexOf(oldTextN, firstIndex + 1);
       if (secondIndex !== -1) {
         return {
           success: false,
@@ -4990,14 +5027,15 @@ var editFileTool = {
           error: "TEXT_MULTIPLE_MATCHES"
         };
       }
-      const newContent = content.replace(args.old_text, args.new_text);
-      await writeFileWithEol(filePath, content, newContent);
-      const diff = computeFileDiff(content, newContent, filePath);
+      const newContentN = contentN.slice(0, firstIndex) + toLf(args.new_text) + contentN.slice(firstIndex + oldTextN.length);
+      const writtenContent = normalizeEol(content, newContentN);
+      await writeFile5(filePath, writtenContent, "utf-8");
+      const diff = computeFileDiff(content, writtenContent, filePath);
       diff.existedBefore = true;
-      const beforeText = content.slice(0, firstIndex);
+      const beforeText = contentN.slice(0, firstIndex);
       const startLine = beforeText.split("\n").length;
-      const oldLines = args.old_text.split("\n").length;
-      const newLines = args.new_text.split("\n").length;
+      const oldLines = oldTextN.split("\n").length;
+      const newLines = toLf(args.new_text).split("\n").length;
       const diffSummary = `+${diff.additions} -${diff.deletions}`;
       const summary = `\u{1F4DD} \u4FEE\u6539: ${basename3(filePath)} (+${diff.additions} -${diff.deletions})`;
       return {
@@ -5022,6 +5060,7 @@ ${oldLines} \u884C \u2192 ${newLines} \u884C
 
 // src/tool/builtins/multi-edit.ts
 import { readFile as readFile8 } from "fs/promises";
+import { writeFile as writeFile6 } from "fs/promises";
 import { basename as basename4 } from "path";
 var multiEditTool = {
   name: "multi_edit",
@@ -5068,7 +5107,7 @@ var multiEditTool = {
     }
     try {
       const originalContent = await readFile8(filePath, "utf-8");
-      let currentContent = originalContent;
+      let currentContent = toLf(originalContent);
       for (let idx = 0; idx < args.edits.length; idx++) {
         const step = args.edits[idx];
         if (typeof step.oldText !== "string") {
@@ -5078,10 +5117,19 @@ var multiEditTool = {
             error: "INVALID_STEP_ARGS"
           };
         }
+        if (typeof step.newText !== "string") {
+          return {
+            success: false,
+            data: `\u7B2C ${idx + 1} \u6B65\uFF1A\u7F3A\u5C11\u6709\u6548\u7684 newText`,
+            error: "INVALID_STEP_ARGS"
+          };
+        }
+        const oldTextN = toLf(step.oldText);
+        const newTextN = toLf(step.newText);
         if (step.replaceAll) {
           let count = 0;
           let pos = -1;
-          while ((pos = currentContent.indexOf(step.oldText, pos + 1)) !== -1) {
+          while ((pos = currentContent.indexOf(oldTextN, pos + 1)) !== -1) {
             count++;
           }
           if (count === 0) {
@@ -5091,9 +5139,9 @@ var multiEditTool = {
               error: "TEXT_NOT_FOUND"
             };
           }
-          currentContent = currentContent.split(step.oldText).join(step.newText);
+          currentContent = currentContent.split(oldTextN).join(newTextN);
         } else {
-          const firstIdx = currentContent.indexOf(step.oldText);
+          const firstIdx = currentContent.indexOf(oldTextN);
           if (firstIdx === -1) {
             return {
               success: false,
@@ -5101,7 +5149,7 @@ var multiEditTool = {
               error: "TEXT_NOT_FOUND"
             };
           }
-          const secondIdx = currentContent.indexOf(step.oldText, firstIdx + 1);
+          const secondIdx = currentContent.indexOf(oldTextN, firstIdx + 1);
           if (secondIdx !== -1) {
             return {
               success: false,
@@ -5109,11 +5157,12 @@ var multiEditTool = {
               error: "TEXT_MULTIPLE_MATCHES"
             };
           }
-          currentContent = currentContent.replace(step.oldText, step.newText);
+          currentContent = currentContent.slice(0, firstIdx) + newTextN + currentContent.slice(firstIdx + oldTextN.length);
         }
       }
-      await writeFileWithEol(filePath, originalContent, currentContent);
-      const diff = computeFileDiff(originalContent, currentContent, filePath);
+      const writtenContent = normalizeEol(originalContent, currentContent);
+      await writeFile6(filePath, writtenContent, "utf-8");
+      const diff = computeFileDiff(originalContent, writtenContent, filePath);
       diff.existedBefore = true;
       return {
         success: true,
@@ -5136,11 +5185,13 @@ var multiEditTool = {
 
 // src/tool/builtins/delete-range.ts
 import { readFile as readFile9 } from "fs/promises";
+import { writeFile as writeFile7 } from "fs/promises";
 import { basename as basename5 } from "path";
 function findUniqueLine(lines, anchor, label) {
+  const anchorN = toLf(anchor);
   const matches = [];
   for (let i = 0; i < lines.length; i++) {
-    if (lines[i] === anchor) {
+    if (toLf(lines[i]) === anchorN) {
       matches.push(i);
     }
   }
@@ -5199,7 +5250,7 @@ var deleteRangeTool = {
     }
     try {
       const content = await readFile9(filePath, "utf-8");
-      const lines = content.split("\n");
+      const lines = toLf(content).split("\n");
       const startResult = findUniqueLine(lines, args.startAnchor, "start_anchor");
       if ("error" in startResult) {
         return { success: false, data: startResult.error, error: "ANCHOR_NOT_FOUND" };
@@ -5227,9 +5278,10 @@ var deleteRangeTool = {
         };
       }
       const newLines = [...lines.slice(0, rangeStart), ...lines.slice(rangeEnd + 1)];
-      const newContent = newLines.join("\n");
-      await writeFileWithEol(filePath, content, newContent);
-      const diff = computeFileDiff(content, newContent, filePath);
+      const newContentN = newLines.join("\n");
+      const writtenContent = normalizeEol(content, newContentN);
+      await writeFile7(filePath, writtenContent, "utf-8");
+      const diff = computeFileDiff(content, writtenContent, filePath);
       diff.existedBefore = true;
       const deletedLines = rangeEnd - rangeStart + 1;
       const summary = `\u{1F4DD} \u4FEE\u6539: ${basename5(filePath)} (\u5220 ${deletedLines} \u884C, +${diff.additions} -${diff.deletions})`;
@@ -5425,7 +5477,8 @@ var globTool = {
     if (!args?.pattern || typeof args.pattern !== "string") {
       return { success: false, data: "\u7F3A\u5C11\u5FC5\u8981\u53C2\u6570 pattern", error: "INVALID_ARGS" };
     }
-    const searchDir = args.directory ? isAbsolute2(args.directory) ? args.directory : join7(ctx.cwd, args.directory) : ctx.cwd;
+    const dir = args.directory ? stripMentionPrefix(args.directory) : void 0;
+    const searchDir = dir ? isAbsolute2(dir) ? dir : join7(ctx.cwd, dir) : ctx.cwd;
     const regex = globToRegex(args.pattern);
     try {
       const dirStat = await stat2(searchDir);
@@ -5526,7 +5579,8 @@ var grepTool = {
     if (!args?.pattern || typeof args.pattern !== "string") {
       return { success: false, data: "\u7F3A\u5C11\u5FC5\u8981\u53C2\u6570 pattern", error: "INVALID_ARGS" };
     }
-    const searchDir = args.directory ? isAbsolute3(args.directory) ? args.directory : join8(ctx.cwd, args.directory) : ctx.cwd;
+    const dir = args.directory ? stripMentionPrefix(args.directory) : void 0;
+    const searchDir = dir ? isAbsolute3(dir) ? dir : join8(ctx.cwd, dir) : ctx.cwd;
     const maxFiles = args.max_files ?? 200;
     try {
       const flags = args.case_sensitive ? "g" : "gi";
@@ -5836,6 +5890,11 @@ var PHASE_CONFIG = {
 function isFileMutatingTool(name) {
   return name === "edit_file" || name === "write_file" || name === "multi_edit" || name === "delete_range";
 }
+function filterTodoToolCalls(calls) {
+  if (!calls) return void 0;
+  const filtered = calls.filter((tc) => !tc.name.startsWith("todo_"));
+  return filtered.length > 0 ? filtered : void 0;
+}
 var commandRegistry = /* @__PURE__ */ new Map();
 function registerCommand(name, cmd) {
   commandRegistry.set(name, cmd);
@@ -5957,6 +6016,8 @@ function ChatSession({
   const [_streamingModel, setStreamingModel] = useState4(void 0);
   const [streamError, setStreamError] = useState4(void 0);
   const [todoSnapshot, setTodoSnapshot] = useState4([]);
+  const [todoPanelVisible, setTodoPanelVisible] = useState4(true);
+  const todoHideTimerRef = useRef3(null);
   const [sessionMode, setSessionMode] = useState4("code");
   const [thinkingEnabled, setThinkingEnabled] = useState4(true);
   const [thinkingEffort, setThinkingEffort] = useState4("high");
@@ -6014,6 +6075,20 @@ function ChatSession({
       }
     };
   }, []);
+  useEffect4(() => {
+    if (todoHideTimerRef.current) {
+      clearTimeout(todoHideTimerRef.current);
+      todoHideTimerRef.current = null;
+    }
+    if (todoSnapshot.length === 0) {
+      setTodoPanelVisible(false);
+      return;
+    }
+    const hasUnfinished = todoSnapshot.some(
+      (it) => it.status === "pending" || it.status === "running" || it.status === "failed"
+    );
+    setTodoPanelVisible(hasUnfinished);
+  }, [todoSnapshot]);
   const getFilteredSkills = useCallback2(
     (value) => {
       const match = value.match(/(?:^|\s)\/([^/]*)$/);
@@ -6055,7 +6130,7 @@ function ChatSession({
           content: m.content,
           assistantDetail: {
             content: m.content,
-            toolCalls: m.toolCalls
+            toolCalls: filterTodoToolCalls(m.toolCalls)
           }
         });
       } else if (m.role === "tool") {
@@ -6721,7 +6796,14 @@ function ChatSession({
               currentToolCallsRef.current = [];
               const r = event.result;
               if (event.name.startsWith("todo_") && event.todoSnapshot) {
-                setTodoSnapshot(event.todoSnapshot);
+                const allTerminated = event.todoSnapshot.length > 0 && event.todoSnapshot.every(
+                  (it) => it.status === "done" || it.status === "failed" || it.status === "skipped"
+                );
+                if (allTerminated) {
+                  setTodoSnapshot([]);
+                } else {
+                  setTodoSnapshot(event.todoSnapshot);
+                }
               } else {
                 const line = r.success ? r.summary ?? `\u2705 ${event.name}: ${r.data.slice(0, 500)}${r.data.length > 500 ? "..." : ""}` : `\u274C ${event.name}: ${r.error ?? "\u6267\u884C\u5931\u8D25"}`;
                 setDisplayMessages((prev) => [
@@ -6769,7 +6851,7 @@ function ChatSession({
         abortRef.current = null;
         const finContent = currentContentRef.current;
         const finReasoning = currentReasoningRef.current.map((s) => s.trim()).filter((s) => s.length > 0);
-        const finToolCalls = currentToolCallsRef.current.length > 0 ? currentToolCallsRef.current : void 0;
+        const finToolCalls = filterTodoToolCalls(currentToolCallsRef.current);
         const finStreamError = streamErrorRef.current;
         if (finContent || finToolCalls || finStreamError) {
           const completed = {
@@ -6944,7 +7026,7 @@ function ChatSession({
         streamError
       ] }) })
     ] }),
-    todoSnapshot.length > 0 && /* @__PURE__ */ jsx10(TodoListPanel, { items: todoSnapshot }),
+    todoPanelVisible && todoSnapshot.length > 0 && /* @__PURE__ */ jsx10(TodoListPanel, { items: todoSnapshot }),
     selectingModel ? /* @__PURE__ */ jsxs10(Box10, { marginTop: 1, flexDirection: "column", children: [
       /* @__PURE__ */ jsx10(Text11, { color: "#00ffff", dimColor: true, children: "\u2500".repeat(dividerWidth) }),
       /* @__PURE__ */ jsxs10(Box10, { flexDirection: "column", marginTop: 1, children: [