@noobdemon/noob-cli 1.0.9 → 1.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@noobdemon/noob-cli",
-  "version": "1.0.9",
+  "version": "1.1.0",
   "publishConfig": {
     "access": "public"
   },

package/src/agent.js

@@ -16,15 +16,16 @@ To call a tool, emit EXACTLY ONE fenced code block tagged \`tool\` containing a
 Then STOP and wait — the runtime executes the tool and replies with a TOOL RESULT. Use one tool per step. When the task is complete (or you are only answering a question), reply normally in Markdown with NO tool block.
 
 Available tools:
-- read_file   {"path": str, "offset"?: int, "limit"?: int}   — read a file (1-indexed lines)
+- read_file   {"path": str, "offset"?: int, "limit"?: int}   — read a file. The "N  " line-number prefix in the output is DISPLAY ONLY — it is NOT part of the file; never copy it into edit_file.
 - write_file  {"path": str, "content": str}                   — create/overwrite a file
-- edit_file   {"path": str, "old_string": str, "new_string": str, "replace_all"?: bool} — exact string replace; old_string must be unique unless replace_all
+- edit_file   {"path": str, "old_string": str, "new_string": str, "replace_all"?: bool} — exact string replace. old_string must match the file's RAW text byte-for-byte (indentation/whitespace included, NO line-number prefix) and be unique unless replace_all. If a replace fails, re-read the file and copy the exact text.
 - list_dir    {"path"?: str}                                  — list a directory
 - glob        {"pattern": str}                                — find files by glob (supports ** and *)
 - grep        {"pattern": str, "path"?: str, "glob"?: str}    — regex search file contents
 - run_command {"command": str}                                — run a shell command in the cwd
 
 # Rules
+- GROUND TRUTH = the filesystem, NOT your memory of this chat. A file was created/changed ONLY if a write_file/edit_file TOOL RESULT confirms it (see the FILES CHANGED list). Saying "I created/updated X" in prose does NOT change any file — you must emit the tool call. If the user says a file is missing or asks its state, read_file/list_dir to check reality first; never claim a file "was reverted" or "should be there" from memory.
 - Investigate before editing: read the relevant files first; never invent file contents.
 - Make the smallest change that fully solves the task. Match the surrounding code style.
 - Prefer edit_file over write_file for existing files.
@@ -108,10 +109,31 @@ function compact(history, budget) {
   return [...head, elided, ...out.slice(tailStart)];
 }
 
+// GROUND TRUTH: liệt kê những file ĐÃ THỰC SỰ được ghi/sửa, suy ra từ KẾT QUẢ
+// tool có thật (không phải từ lời model tự kể). Chống lỗi model "tưởng đã tạo
+// file" (chỉ kể trong văn xuôi, quên gọi write_file) rồi khăng khăng "file bị
+// revert". Dựng từ history ĐẦY ĐỦ (kể cả khi đã nén) để luôn đúng thực tế.
+function filesLedger(history) {
+  const touched = new Map(); // path -> "đã ghi" | "đã sửa"
+  for (const m of history) {
+    if (m.role !== "tool" || typeof m.content !== "string" || m.content.startsWith("ERROR")) continue;
+    let mm;
+    if (m.name === "write_file" && (mm = m.content.match(/ to (.+)$/m))) touched.set(mm[1].trim(), "đã ghi");
+    else if (m.name === "edit_file" && (mm = m.content.match(/^Edited (.+?) \(/m))) touched.set(mm[1].trim(), "đã sửa");
+  }
+  if (!touched.size)
+    return "# FILES CHANGED THIS SESSION: none.\nYou have NOT created or modified any file yet. Do not claim otherwise — to change a file you MUST emit write_file/edit_file. Describing a change in prose does nothing.";
+  return (
+    "# FILES ACTUALLY CHANGED THIS SESSION (runtime ground truth — trust THIS over your memory)\n" +
+    [...touched].map(([p, a]) => `- ${p} (${a})`).join("\n") +
+    "\nIf you think you changed a file that is NOT in this list, you did NOT — emit the tool call now. Never say a file 'was reverted'/'should exist' from memory; verify with read_file or list_dir first."
+  );
+}
+
 // The proxy is stateless, so we serialize the whole transcript into one prompt.
 function buildPrompt(history) {
   const msgs = compact(history, MAX_PROMPT_CHARS);
-  const parts = [SYSTEM, "", runtimeContext(), "", "=".repeat(60), "# CONVERSATION", ""];
+  const parts = [SYSTEM, "", runtimeContext(), "", filesLedger(history), "", "=".repeat(60), "# CONVERSATION", ""];
   for (const m of msgs) {
     if (m.role === "user") parts.push(`## USER\n${m.content}`);
     else if (m.role === "assistant") parts.push(`## ASSISTANT\n${m.content}`);

package/src/tools.js

@@ -39,11 +39,45 @@ export const TOOLS = {
     const file = abs(p);
     const data = await fs.readFile(file, "utf8");
     if (old_string === new_string) throw new Error("old_string and new_string are identical");
-    const count = data.split(old_string).length - 1;
-    if (count === 0) throw new Error("old_string not found in file");
+
+    let oldS = old_string;
+    let newS = new_string;
+    let count = data.split(oldS).length - 1;
+
+    // Khoan dung CRLF: file Windows thường dùng \r\n, nhưng model hay gửi \n →
+    // khớp hụt. Điều chỉnh kiểu xuống dòng của old/new cho khớp file RỒI thay
+    // trên data gốc (file giữ nguyên vẹn).
+    if (count === 0) {
+      const useCRLF = data.includes("\r\n");
+      const adapt = (s) => {
+        const lf = s.replace(/\r\n/g, "\n");
+        return useCRLF ? lf.replace(/\n/g, "\r\n") : lf;
+      };
+      const a = adapt(oldS);
+      const c2 = data.split(a).length - 1;
+      if (c2 > 0) {
+        oldS = a;
+        newS = adapt(newS);
+        count = c2;
+      }
+    }
+
+    if (count === 0)
+      throw new Error(
+        `old_string not found in ${rel(file)}. Read the file again with read_file and copy the target text EXACTLY — keep its indentation/whitespace and DROP the line-number prefix that read_file prints.`,
+      );
     if (count > 1 && !replace_all)
-      throw new Error(`old_string is not unique (${count} matches); set replace_all or add context`);
-    const next = replace_all ? data.split(old_string).join(new_string) : data.replace(old_string, new_string);
+      throw new Error(`old_string is not unique (${count} matches) in ${rel(file)}; set replace_all, or add surrounding lines to make it unique`);
+
+    // split/join (không dùng String.replace) để chuỗi thay thế chứa $&, $1… KHÔNG
+    // bị diễn giải đặc biệt — bảo toàn nguyên văn code.
+    let next;
+    if (replace_all) {
+      next = data.split(oldS).join(newS);
+    } else {
+      const i = data.indexOf(oldS);
+      next = data.slice(0, i) + newS + data.slice(i + oldS.length);
+    }
     await fs.writeFile(file, next, "utf8");
     return `Edited ${rel(file)} (${replace_all ? count : 1} replacement(s))`;
   },