0.2.3

When reporting the edit tool uses, we were accessing a field with a typo
(we should start using Zod, btw), and that caused locations not to be
reported correctly. We also now report all line numbers.

Co-authored-by: Bennet Bo Fenner <bennetbo@gmx.de>

README.md

@@ -1,12 +1,14 @@
 # ACP adapter for Claude Code
 
+[![npm](https://img.shields.io/npm/v/%40zed-industries%2Fclaude-code-acp)](https://www.npmjs.com/package/@zed-industries/claude-code-acp)
+
 Use [Claude Code](https://www.anthropic.com/claude-code) from [ACP-compatible](https://agentclientprotocol.com) clients such as [Zed](https://zed.dev)!
 
 This tool implements an ACP agent by using the official [Claude Code SDK](https://docs.anthropic.com/en/docs/claude-code/sdk/sdk-overview), supporting:
 
 - Context @-mentions
 - Images
-- Tool calls
+- Tool calls (with permission requests)
 - Following
 - Edit review
 - TODO lists

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@zed-industries/claude-code-acp",
-  "version": "0.2.0",
+  "version": "0.2.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@zed-industries/claude-code-acp",
-      "version": "0.2.0",
+      "version": "0.2.3",
       "license": "Apache-2.0",
       "dependencies": {
         "@anthropic-ai/claude-code": "^1.0.100",

package.json

@@ -6,7 +6,7 @@
   "bin": {
     "claude-code-acp": "./dist/index.js"
   },
-  "version": "0.2.0",
+  "version": "0.2.3",
   "description": "An ACP-compatible coding agent powered by the Claude Code SDK (TypeScript)",
   "main": "dist/index.js",
   "type": "module",

src/acp-agent.ts

@@ -134,6 +134,9 @@ export class ClaudeAcpAgent implements Agent {
       mcpServers,
       permissionPromptToolName: "mcp__acp__permission",
       stderr: (err) => console.error(err),
+      // note: although not documented by the types, passing an absolute path
+      // here works to find zed's managed node version.
+      executable: process.execPath as any,
     };
 
     const allowedTools = [];
@@ -314,7 +317,7 @@ async function availableSlashCommands(query: Query): Promise<AvailableCommand[]>
   const commands = await Promise.race([
     //todo: Do not use `as any` once `supportedCommands` is exposed via the typescript interface
     (query as any).supportedCommands(),
-    sleep(5000).then(() => {
+    sleep(10000).then(() => {
       if (
         fs.existsSync(path.resolve(os.homedir(), ".claude.json.backup")) &&
         !fs.existsSync(path.resolve(os.homedir(), ".claude.json"))

src/index.ts

@@ -7,6 +7,10 @@ console.info = console.error;
 console.warn = console.error;
 console.debug = console.error;
 
+process.on("unhandledRejection", (reason, promise) => {
+  console.error("Unhandled Rejection at:", promise, "reason:", reason);
+});
+
 import { runAcp as runAcp } from "./acp-agent.js";
 runAcp();
 

src/tests/acp-agent.test.ts

@@ -692,6 +692,11 @@ describe("tool conversions", () => {
       locations: [
         {
           path: "/Users/test/project/config.json",
+          line: 1,
+        },
+        {
+          path: "/Users/test/project/config.json",
+          line: 3,
         },
       ],
       title: "Edit /Users/test/project/config.json",

src/tools.ts

@@ -140,21 +140,21 @@ export function toolInfoFromToolUse(
       const path = input?.abs_path ?? input?.file_path;
       let oldText = input.old_string ?? null;
       let newText = input.new_string ?? "";
-      let line = null;
+      let affectedLines: number[] = [];
 
-      if (path && input.old_text) {
+      if (path && oldText) {
         try {
           const oldContent = cachedFileContent[path] || "";
           const newContent = replaceAndCalculateLocation(oldContent, [
             {
-              oldText: input.old_string,
-              newText: input.new_string,
+              oldText,
+              newText,
               replaceAll: false,
             },
           ]);
           oldText = oldContent;
           newText = newContent.newContent;
-          line = newContent.lineNumbers[0];
+          affectedLines = newContent.lineNumbers;
         } catch (e) {
           console.error(e);
         }
@@ -173,7 +173,11 @@ export function toolInfoFromToolUse(
                 },
               ]
             : [],
-        locations: path ? [{ path, line }] : [],
+        locations: path
+          ? affectedLines.length > 0
+            ? affectedLines.map((line) => ({ line, path }))
+            : [{ path }]
+          : [],
       };
     }
 
@@ -189,6 +193,7 @@ export function toolInfoFromToolUse(
       };
       let oldTextMulti = multiInput.edits.map((edit: any) => edit.old_string).join("\n");
       let newTextMulti = multiInput.edits.map((edit: any) => edit.new_string).join("\n");
+      let affectedLines: number[] = [];
       try {
         if (multiInput.edits && multiInput.file_path) {
           const oldContent =
@@ -204,6 +209,7 @@ export function toolInfoFromToolUse(
           );
           oldTextMulti = oldContent;
           newTextMulti = newContent.newContent;
+          affectedLines = newContent.lineNumbers;
         }
       } catch (e) {
         console.error(e);
@@ -221,7 +227,11 @@ export function toolInfoFromToolUse(
             newText: newTextMulti,
           },
         ],
-        locations: input?.file_path ? [{ path: input.file_path }] : [],
+        locations: input?.file_path
+          ? affectedLines.length > 0
+            ? affectedLines.map((line) => ({ line, path: input.file_path }))
+            : [{ path: input.file_path }]
+          : [],
       };
     }
     case "mcp__acp__write": {