chatccc 0.2.220 → 0.2.221

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chatccc",
-  "version": "0.2.220",
+  "version": "0.2.221",
   "description": "Feishu bot bridge for Claude Code",
   "license": "Apache-2.0",
   "type": "module",

package/src/__tests__/builtin-file-tools.test.ts

@@ -158,6 +158,37 @@ describe("builtin file tools", () => {
     await expect(readFile(file, "utf8")).resolves.toBe("alpha\nBETA\ngamma\n");
   });
 
+  it("edits a CRLF file with LF oldText by normalizing line endings", async () => {
+    const dir = await makeTempDir();
+    const file = join(dir, "crlf.txt");
+    const crlfContent = "alpha\r\nbeta\r\ngamma\r\n";
+    await writeFile(file, crlfContent, "utf8");
+
+    const result = await editFileForTool(dir, {
+      path: "crlf.txt",
+      expectedSha256: sha256(crlfContent),
+      edits: [{ oldText: "alpha\nbeta", newText: "ALPHA\nBETA" }],
+    });
+
+    expect(result).toEqual(expect.objectContaining({
+      changed: true,
+      editsApplied: 1,
+      beforeSha256: sha256(crlfContent),
+      afterSha256: sha256("ALPHA\r\nBETA\r\ngamma\r\n"),
+    }));
+    await expect(readFile(file, "utf8")).resolves.toBe("ALPHA\r\nBETA\r\ngamma\r\n");
+  });
+
+  it("rejects a multi-line oldText that still does not match after EOL normalization", async () => {
+    const dir = await makeTempDir();
+    await writeFile(join(dir, "crlf.txt"), "alpha\r\nbeta\r\n", "utf8");
+
+    await expect(editFileForTool(dir, {
+      path: "crlf.txt",
+      edits: [{ oldText: "alpha\ngamma", newText: "x" }],
+    })).rejects.toThrow("oldText was not found");
+  });
+
   it("rejects edits when the SHA-256 precondition does not match", async () => {
     const dir = await makeTempDir();
     await writeFile(join(dir, "edit.txt"), "current\n", "utf8");

package/src/__tests__/cards.test.ts

@@ -13,6 +13,7 @@ import {
   buildButtons,
   truncateContent,
   getToolEmoji,
+  normalizeToolName,
 } from "../cards.ts";
 import { ABD_HELP_LINE } from "../shared-prefix.ts";
 
@@ -83,6 +84,25 @@ describe("getToolEmoji", () => {
     expect(getToolEmoji("AskUserQuestion")).toBe("\u{2753}");// ❓
   });
 
+  it("returns correct emoji for CCC builtin tool names (snake_case)", () => {
+    expect(getToolEmoji("read_file")).toBe("\u{1F4D6}");
+    expect(getToolEmoji("list_dir")).toBe("\u{1F4C2}");
+    expect(getToolEmoji("search_code")).toBe("\u{1F50E}");
+    expect(getToolEmoji("run_command")).toBe("\u{1F5A5}\u{FE0F}");
+    expect(getToolEmoji("edit_file")).toBe("\u{270F}\u{FE0F}");
+    expect(getToolEmoji("create_file")).toBe("\u{270D}\u{FE0F}");
+    expect(getToolEmoji("delete_file")).toBe("\u{1F5D1}\u{FE0F}");
+    expect(getToolEmoji("move_file")).toBe("\u{1F4E6}");
+    expect(getToolEmoji("apply_patch")).toBe("\u{1F4CB}");
+  });
+
+  it("normalizeToolName converts snake_case to PascalCase", () => {
+    expect(normalizeToolName("read_file")).toBe("ReadFile");
+    expect(normalizeToolName("run_command")).toBe("RunCommand");
+    expect(normalizeToolName("Read")).toBe("Read");
+    expect(normalizeToolName("")).toBe("");
+  });
+
   it("returns wrench for unknown tool names", () => {
     expect(getToolEmoji("UnknownTool")).toBe("\u{1F527}");
     expect(getToolEmoji("cat")).toBe("\u{1F527}");

package/src/builtin/file-tools.ts

@@ -979,13 +979,19 @@ export async function editFileForTool(cwd: string, input: EditFileInput): Promis
   const before = await readEditableTextFile(filePath);
   assertExpectedSha256(filePath, before.sha, input.expectedSha256);
 
-  let text = before.text;
+  // Normalize line endings before matching so that LF-based oldText/newText
+  // (which is what models typically emit) works against CRLF files checked
+  // out on Windows. The file's dominant EOL style is restored on write.
+  const eol = detectEol(before.text);
+  let text = eol === "\r\n" ? before.text.replace(/\r\n/g, "\n") : before.text;
   let editsApplied = 0;
   for (const [index, edit] of input.edits.entries()) {
     if (!edit.oldText) {
       throw new Error(`edit ${index + 1} oldText must not be empty`);
     }
-    const count = countOccurrences(text, edit.oldText);
+    const oldText = edit.oldText.replace(/\r\n/g, "\n");
+    const newText = edit.newText.replace(/\r\n/g, "\n");
+    const count = countOccurrences(text, oldText);
     if (count === 0) {
       throw new Error(`edit ${index + 1} oldText was not found in ${filePath}`);
     }
@@ -993,10 +999,14 @@ export async function editFileForTool(cwd: string, input: EditFileInput): Promis
       throw new Error(`edit ${index + 1} oldText matched ${count} times in ${filePath}; set replaceAll=true or provide more context`);
     }
     text = edit.replaceAll
-      ? replaceAllLiteral(text, edit.oldText, edit.newText)
-      : text.replace(edit.oldText, edit.newText);
+      ? replaceAllLiteral(text, oldText, newText)
+      : text.replace(oldText, newText);
     editsApplied += edit.replaceAll ? count : 1;
   }
+  if (eol === "\r\n") {
+    // After normalization above the buffer contains only \n, so this is safe.
+    text = text.replace(/\n/g, "\r\n");
+  }
 
   assertTextSize(filePath, text, MAX_EDIT_BYTES);
   const afterSha = sha256(text);

package/src/cards.ts

@@ -70,10 +70,29 @@ const TOOL_EMOJI_MAP: Record<string, string> = {
   Agent: "\u{1F916}",         // 🤖
   NotebookEdit: "\u{1F4D3}",  // 📓
   AskUserQuestion: "\u{2753}",// ❓
+  // CCC 内置 Agent 下划线命名（getToolEmoji 会先把下划线转驼峰再查表，这里保留蛇形条目以便直接命中）
+  read_file: "\u{1F4D6}",          // 📖
+  list_dir: "\u{1F4C2}",          // 📂
+  search_code: "\u{1F50E}",       // 🔎
+  run_command: "\u{1F5A5}\u{FE0F}", // 🖥️
+  edit_file: "\u{270F}\u{FE0F}",  // ✏️
+  create_file: "\u{270D}\u{FE0F}", // ✍️
+  delete_file: "\u{1F5D1}\u{FE0F}", // 🗑️
+  move_file: "\u{1F4E6}",         // 📦
+  apply_patch: "\u{1F4CB}",       // 📋
 };
 
 export function getToolEmoji(name: string): string {
-  return TOOL_EMOJI_MAP[name] ?? "\u{1F527}"; // 🔧
+  return TOOL_EMOJI_MAP[name] ?? TOOL_EMOJI_MAP[normalizeToolName(name)] ?? "\u{1F527}"; // 🔧
+}
+
+/** 把下划线命名转成驼峰（read_file → ReadFile），用于兼容两种命名风格 */
+export function normalizeToolName(name: string): string {
+  return name
+    .split("_")
+    .filter((part) => part.length > 0)
+    .map((part) => part.charAt(0).toUpperCase() + part.slice(1))
+    .join("");
 }
 
 // ---------------------------------------------------------------------------