0.1.11

README.md

@@ -1,14 +1,12 @@
 # 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 (with permission requests)
+- Tool calls
 - Following
 - Edit review
 - TODO lists
@@ -28,12 +26,10 @@ To use Claude Code, open the Agent Panel and click "New Claude Code Thread" from
 
 https://github.com/user-attachments/assets/ddce66c7-79ac-47a3-ad59-4a6a3ca74903
 
-Read the docs on [External Agent](https://zed.dev/docs/ai/external-agents) support.
+[Read the docs](https://zed.dev/docs/ai/external-agents) on External Agent support.
 
 ### Other clients
 
-- Neovim via [CodeCompanion.nvim](https://codecompanion.olimorris.dev/configuration/adapters#setup-claude-code-via-acp)
-
 Setup instructions for other clients are coming soon. Feel free to [submit a PR](https://github.com/zed-industries/claude-code-acp/pulls) to add yours!
 
 #### Installation
@@ -41,13 +37,13 @@ Setup instructions for other clients are coming soon. Feel free to [submit a PR]
 Install the adapter from `npm`:
 
 ```bash
-npm install @zed-industries/claude-code-acp
+$ npm install @zed-industries/claude-code-acp
 ```
 
 You can then use `claude-code-acp` as a regular ACP agent:
 
 ```
-ANTHROPIC_API_KEY=sk-... claude-code-acp
+$ ANTHROPIC_API_KEY=sk-... claude-code-acp
 ```
 
 ## License

package-lock.json

@@ -1,18 +1,18 @@
 {
   "name": "@zed-industries/claude-code-acp",
-  "version": "0.3.0",
+  "version": "0.1.11",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@zed-industries/claude-code-acp",
-      "version": "0.3.0",
+      "version": "0.1.11",
       "license": "Apache-2.0",
       "dependencies": {
         "@anthropic-ai/claude-code": "^1.0.100",
         "@modelcontextprotocol/sdk": "^1.17.4",
-        "@zed-industries/agent-client-protocol": "0.2.0-alpha.7",
-        "diff": "^8.0.2",
+        "@types/express": "^5.0.3",
+        "@zed-industries/agent-client-protocol": "0.2.0-alpha.4",
         "express": "^5.1.0",
         "minimist": "^1.2.8",
         "uuid": "11.1.0"
@@ -21,7 +21,6 @@
         "claude-code-acp": "dist/index.js"
       },
       "devDependencies": {
-        "@types/express": "^5.0.3",
         "@types/minimist": "^1.2.5",
         "@types/node": "^24.3.0",
         "@types/uuid": "^10.0.0",
@@ -1277,7 +1276,6 @@
       "version": "1.19.6",
       "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.6.tgz",
       "integrity": "sha512-HLFeCYgz89uk22N5Qg3dvGvsv46B8GLvKKo1zKG4NybA8U2DiEO3w9lqGg29t/tfLRJpJ6iQxnVw4OnB7MoM9g==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/connect": "*",
@@ -1298,7 +1296,6 @@
       "version": "3.4.38",
       "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz",
       "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/node": "*"
@@ -1322,7 +1319,6 @@
       "version": "5.0.3",
       "resolved": "https://registry.npmjs.org/@types/express/-/express-5.0.3.tgz",
       "integrity": "sha512-wGA0NX93b19/dZC1J18tKWVIYWyyF2ZjT9vin/NRu0qzzvfVzWjs04iq2rQ3H65vCTQYlRqs3YHfY7zjdV+9Kw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/body-parser": "*",
@@ -1334,7 +1330,6 @@
       "version": "5.0.7",
       "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.0.7.tgz",
       "integrity": "sha512-R+33OsgWw7rOhD1emjU7dzCDHucJrgJXMA5PYCzJxVil0dsyx5iBEPHqpPfiKNJQb7lZ1vxwoLR4Z87bBUpeGQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/node": "*",
@@ -1347,14 +1342,12 @@
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.5.tgz",
       "integrity": "sha512-r8Tayk8HJnX0FztbZN7oVqGccWgw98T/0neJphO91KkmOzug1KkofZURD4UaD5uH8AqcFLfdPErnBod0u71/qg==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/mime": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz",
       "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/minimist": {
@@ -1368,7 +1361,6 @@
       "version": "24.3.0",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-24.3.0.tgz",
       "integrity": "sha512-aPTXCrfwnDLj4VvXrm+UUCQjNEvJgNA8s5F1cvwQU+3KNltTOkBm1j30uNLyqqPNe7gE3KFzImYoZEfLhp4Yow==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "undici-types": "~7.10.0"
@@ -1378,21 +1370,18 @@
       "version": "6.14.0",
       "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.14.0.tgz",
       "integrity": "sha512-eOunJqu0K1923aExK6y8p6fsihYEn/BYuQ4g0CxAAgFc4b/ZLN4CrsRZ55srTdqoiLzU2B2evC+apEIxprEzkQ==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/range-parser": {
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz",
       "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/send": {
       "version": "0.17.5",
       "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.5.tgz",
       "integrity": "sha512-z6F2D3cOStZvuk2SaP6YrwkNO65iTZcwA2ZkSABegdkAh/lf+Aa/YQndZVfmEXT5vgAp6zv06VQ3ejSVjAny4w==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/mime": "^1",
@@ -1403,7 +1392,6 @@
       "version": "1.15.8",
       "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.8.tgz",
       "integrity": "sha512-roei0UY3LhpOJvjbIP6ZZFngyLKl5dskOtDhxY5THRSpO+ZI+nzJ+m5yUMzGrp89YRa7lvknKkMYjqQFGwA7Sg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/http-errors": "*",
@@ -1808,9 +1796,9 @@
       }
     },
     "node_modules/@zed-industries/agent-client-protocol": {
-      "version": "0.2.0-alpha.7",
-      "resolved": "https://registry.npmjs.org/@zed-industries/agent-client-protocol/-/agent-client-protocol-0.2.0-alpha.7.tgz",
-      "integrity": "sha512-LusOBTbhX1veoL2IwUigWcCUf4r7Wl0nFJPeXoBx3OXTWCGE5WfmUPjpXVpduegxEipqea53Q/ls5lQfyoYd3Q==",
+      "version": "0.2.0-alpha.4",
+      "resolved": "https://registry.npmjs.org/@zed-industries/agent-client-protocol/-/agent-client-protocol-0.2.0-alpha.4.tgz",
+      "integrity": "sha512-l/MdK0MrvEb55/U3wAtAN/MC04YK+N6vNyakNgLsK2JTcmG54n45gXa0OZ08lYUmEvLe0shdu1dDtzlOV/Luxw==",
       "license": "Apache-2.0",
       "dependencies": {
         "zod": "^3.0.0"
@@ -2227,9 +2215,10 @@
       }
     },
     "node_modules/diff": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-8.0.2.tgz",
-      "integrity": "sha512-sSuxWU5j5SR9QQji/o2qMvqRNYRDOcBTgsJ/DeCf4iSN4gW+gNMXM7wFIP+fdXZxoNiAnHUTGjCr+TSWXdRDKg==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
+      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
+      "dev": true,
       "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.3.1"
@@ -4373,16 +4362,6 @@
         }
       }
     },
-    "node_modules/ts-node/node_modules/diff": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
-      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">=0.3.1"
-      }
-    },
     "node_modules/type-check": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -4441,7 +4420,6 @@
       "version": "7.10.0",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.10.0.tgz",
       "integrity": "sha512-t5Fy/nfn+14LuOc2KNYg75vZqClpAiqscVvMygNnlsHBFpSXdJaYtXMcdNLpl/Qvc3P2cB3s6lOV51nqsFq4ag==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/unpipe": {

package.json

@@ -6,7 +6,7 @@
   "bin": {
     "claude-code-acp": "./dist/index.js"
   },
-  "version": "0.3.0",
+  "version": "0.1.11",
   "description": "An ACP-compatible coding agent powered by the Claude Code SDK (TypeScript)",
   "main": "dist/index.js",
   "type": "module",
@@ -45,14 +45,13 @@
   "dependencies": {
     "@anthropic-ai/claude-code": "^1.0.100",
     "@modelcontextprotocol/sdk": "^1.17.4",
-    "@zed-industries/agent-client-protocol": "0.2.0-alpha.7",
-    "diff": "^8.0.2",
+    "@types/express": "^5.0.3",
+    "@zed-industries/agent-client-protocol": "0.2.0-alpha.4",
     "express": "^5.1.0",
     "minimist": "^1.2.8",
     "uuid": "11.1.0"
   },
   "devDependencies": {
-    "@types/express": "^5.0.3",
     "@types/minimist": "^1.2.5",
     "@types/node": "^24.3.0",
     "@types/uuid": "^10.0.0",

src/acp-agent.ts

@@ -31,7 +31,7 @@ import * as fs from "node:fs";
 import * as path from "node:path";
 import * as os from "node:os";
 import { v7 as uuidv7 } from "uuid";
-import { nodeToWebReadable, nodeToWebWritable, Pushable, unreachable } from "./utils.js";
+import { nodeToWebReadable, nodeToWebWritable, Pushable, sleep, unreachable } from "./utils.js";
 import { SessionNotification } from "@zed-industries/agent-client-protocol";
 import { createMcpServer } from "./mcp-server.js";
 import { AddressInfo } from "node:net";
@@ -86,52 +86,36 @@ export class ClaudeAcpAgent implements Agent {
           image: true,
           embeddedContext: true,
         },
-        mcpCapabilities: {
-          http: true,
-          sse: true,
-        },
       },
       authMethods: [
         {
           description: "Run `claude /login` in the terminal",
-          name: "Log in with Claude Code",
+          name: "Login with Claude CLI",
           id: "claude-login",
         },
+        {
+          description: "Anthropic API KEY",
+          name: "Use Anthropic API Key",
+          id: "anthropic-api-key",
+        },
       ],
     };
   }
   async newSession(params: NewSessionRequest): Promise<NewSessionResponse> {
-    if (
-      fs.existsSync(path.resolve(os.homedir(), ".claude.json.backup")) &&
-      !fs.existsSync(path.resolve(os.homedir(), ".claude.json"))
-    ) {
-      throw RequestError.authRequired();
-    }
-
     const sessionId = uuidv7();
     const input = new Pushable<SDKUserMessage>();
 
     const mcpServers: Record<string, McpServerConfig> = {};
     if (Array.isArray(params.mcpServers)) {
       for (const server of params.mcpServers) {
-        if ("type" in server) {
-          mcpServers[server.name] = {
-            type: server.type,
-            url: server.url,
-            headers: server.headers
-              ? Object.fromEntries(server.headers.map((e) => [e.name, e.value]))
-              : undefined,
-          };
-        } else {
-          mcpServers[server.name] = {
-            type: "stdio",
-            command: server.command,
-            args: server.args,
-            env: server.env
-              ? Object.fromEntries(server.env.map((e) => [e.name, e.value]))
-              : undefined,
-          };
-        }
+        mcpServers[server.name] = {
+          type: "stdio",
+          command: server.command,
+          args: server.args,
+          env: server.env
+            ? Object.fromEntries(server.env.map((e) => [e.name, e.value]))
+            : undefined,
+        };
       }
     }
 
@@ -150,9 +134,6 @@ 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 = [];
@@ -187,18 +168,10 @@ export class ClaudeAcpAgent implements Agent {
       cancelled: false,
     };
 
-    getAvailableSlashCommands(q).then((availableCommands) => {
-      this.client.sessionUpdate({
-        sessionId,
-        update: {
-          sessionUpdate: "available_commands_update",
-          availableCommands,
-        },
-      });
-    });
-
+    const availableCommands = await availableSlashCommands(q);
     return {
       sessionId,
+      availableCommands,
     };
   }
 
@@ -301,7 +274,7 @@ export class ClaudeAcpAgent implements Agent {
   }
 }
 
-async function getAvailableSlashCommands(query: Query): Promise<AvailableCommand[]> {
+async function availableSlashCommands(query: Query): Promise<AvailableCommand[]> {
   const UNSUPPORTED_COMMANDS = [
     "add-dir",
     "agents", // Modal
@@ -337,8 +310,20 @@ async function getAvailableSlashCommands(query: Query): Promise<AvailableCommand
     "todos", // Escape Codes
     "vim", // Not needed
   ];
-  //todo: Do not use `as any` once `supportedCommands` is exposed via the typescript interface
-  const commands = await (query as any).supportedCommands();
+
+  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(() => {
+      if (
+        fs.existsSync(path.resolve(os.homedir(), ".claude.json.backup")) &&
+        !fs.existsSync(path.resolve(os.homedir(), ".claude.json"))
+      ) {
+        throw RequestError.authRequired();
+      }
+      throw new Error("can't load supported slash commands");
+    }),
+  ]);
 
   return commands
     .map((command: { name: string; description: string; argumentHint: string }) => {

src/index.ts

@@ -7,10 +7,6 @@ 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/mcp-server.ts

@@ -6,7 +6,6 @@ import { z } from "zod";
 import { Server } from "node:http";
 import { ClaudeAcpAgent } from "./acp-agent.js";
 import { ClientCapabilities, TerminalOutputResponse } from "@zed-industries/agent-client-protocol";
-import * as diff from "diff";
 
 import { sleep, unreachable } from "./utils.js";
 
@@ -168,8 +167,7 @@ File editing instructions:
   - For unique lines, include only those lines.
   - For non-unique lines, include enough context to identify them.
 - Do not escape quotes, newlines, or other characters.
-- Only edit the specified file.
-- If the \`old_string\` value isn't found in the file, the edit won't be applied. The tool will fail and must be retried.`,
+- Only edit the specified file.`,
         inputSchema: {
           abs_path: z.string().describe("The absolute path to the file to read."),
           old_string: z.string().describe("The old text to replace (must be unique in the file)"),
@@ -184,47 +182,56 @@ File editing instructions:
         },
       },
       async (input) => {
-        const session = agent.sessions[sessionId];
-        if (!session) {
+        try {
+          const session = agent.sessions[sessionId];
+          if (!session) {
+            return {
+              content: [
+                {
+                  type: "text",
+                  text: "The user has left the building",
+                },
+              ],
+            };
+          }
+
+          const { content } = await agent.readTextFile({
+            sessionId,
+            path: input.abs_path,
+          });
+
+          const { newContent, lineNumbers } = replaceAndCalculateLocation(content, [
+            {
+              oldText: input.old_string,
+              newText: input.new_string,
+              replaceAll: false,
+            },
+          ]);
+
+          await agent.writeTextFile({
+            sessionId,
+            path: input.abs_path,
+            content: newContent,
+          });
+
           return {
             content: [
               {
                 type: "text",
-                text: "The user has left the building",
+                text: JSON.stringify({ lineNumbers }),
+              },
+            ],
+          };
+        } catch (error: any) {
+          return {
+            content: [
+              {
+                type: "text",
+                text: "Editing file failed: " + error.message,
               },
             ],
           };
         }
-
-        const { content } = await agent.readTextFile({
-          sessionId,
-          path: input.abs_path,
-        });
-
-        const { newContent } = replaceAndCalculateLocation(content, [
-          {
-            oldText: input.old_string,
-            newText: input.new_string,
-            replaceAll: false,
-          },
-        ]);
-
-        const patch = diff.createPatch(input.abs_path, content, newContent);
-
-        await agent.writeTextFile({
-          sessionId,
-          path: input.abs_path,
-          content: newContent,
-        });
-
-        return {
-          content: [
-            {
-              type: "text",
-              text: patch,
-            },
-          ],
-        };
       },
     );
 
@@ -232,20 +239,7 @@ File editing instructions:
       "multi-edit",
       {
         title: "Multi Edit",
-        description: `Edit a file with multiple sequential edits.
-
-In sessions with mcp__acp__multi-edit always use it instead of MultiEdit as it will
-allow the user to conveniently review changes.
-
-File editing instructions:
-- The \`old_string\` param must match existing file content, including indentation.
-- The \`old_string\` param must come from the actual file, not an outline.
-- The \`old_string\` section must not be empty.
-- Be minimal with replacements:
-  - For unique lines, include only those lines.
-  - For non-unique lines, include enough context to identify them, unless you're using \`replace_all\`
-- Do not escape quotes, newlines, or other characters.
-- If any of the provided \`old_string\` values aren't found in the file, no edits will be applied. The tool will fail and must be retried.`,
+        description: `Edit a file with multiple sequential edits.`,
         inputSchema: {
           file_path: z.string().describe("The absolute path to the file to modify"),
           edits: z
@@ -288,7 +282,7 @@ File editing instructions:
           path: input.file_path,
         });
 
-        const { newContent } = replaceAndCalculateLocation(
+        const { newContent, lineNumbers } = replaceAndCalculateLocation(
           content,
           input.edits.map((edit) => ({
             oldText: edit.old_string,
@@ -297,8 +291,6 @@ File editing instructions:
           })),
         );
 
-        const patch = diff.createPatch(input.file_path, content, newContent);
-
         await agent.writeTextFile({
           sessionId,
           path: input.file_path,
@@ -309,7 +301,7 @@ File editing instructions:
           content: [
             {
               type: "text",
-              text: patch,
+              text: JSON.stringify({ lineNumbers }),
             },
           ],
         };
@@ -779,7 +771,7 @@ export function replaceAndCalculateLocation(
   for (const edit of edits) {
     // Skip empty oldText
     if (edit.oldText === "") {
-      throw new Error(`The provided \`old_string\` is empty.\n\nNo edits were applied.`);
+      continue;
     }
 
     if (edit.replaceAll) {
@@ -791,11 +783,6 @@ export function replaceAndCalculateLocation(
       while (true) {
         const index = currentContent.indexOf(edit.oldText, searchIndex);
         if (index === -1) {
-          if (searchIndex === 0) {
-            throw new Error(
-              `The provided \`old_string\` does not appear in the file: "${edit.oldText}".\n\nNo edits were applied.`,
-            );
-          }
           break;
         }
 
@@ -817,11 +804,7 @@ export function replaceAndCalculateLocation(
     } else {
       // Replace first occurrence only
       const index = currentContent.indexOf(edit.oldText);
-      if (index === -1) {
-        throw new Error(
-          `The provided \`old_string\` does not appear in the file: "${edit.oldText}".\n\nNo edits were applied.`,
-        );
-      } else {
+      if (index !== -1) {
         const marker = `${markerPrefix}${markerCounter++}__`;
         markers.push(marker);
         currentContent =

src/tests/acp-agent.test.ts

@@ -2,7 +2,6 @@ import { describe, it, expect, beforeAll, afterAll } from "vitest";
 import { spawn, spawnSync } from "child_process";
 import {
   Agent,
-  AvailableCommand,
   Client,
   ClientSideConnection,
   NewSessionResponse,
@@ -48,15 +47,9 @@ describe.skipIf(!process.env.RUN_INTEGRATION_TESTS)("ACP subprocess integration"
     agent: Agent;
     files: Map<string, string> = new Map();
     receivedText: string = "";
-    resolveAvailableCommands: (commands: AvailableCommand[]) => void;
-    availableCommandsPromise: Promise<AvailableCommand[]>;
 
     constructor(agent: Agent) {
       this.agent = agent;
-      this.resolveAvailableCommands = () => {};
-      this.availableCommandsPromise = new Promise((resolve) => {
-        this.resolveAvailableCommands = resolve;
-      });
     }
 
     takeReceivedText() {
@@ -74,18 +67,11 @@ describe.skipIf(!process.env.RUN_INTEGRATION_TESTS)("ACP subprocess integration"
     async sessionUpdate(params: SessionNotification): Promise<void> {
       console.error("RECEIVED", JSON.stringify(params, null, 4));
 
-      switch (params.update.sessionUpdate) {
-        case "agent_message_chunk": {
-          if (params.update.content.type === "text") {
-            this.receivedText += params.update.content.text;
-          }
-          break;
-        }
-        case "available_commands_update":
-          this.resolveAvailableCommands(params.update.availableCommands);
-          break;
-        default:
-          break;
+      if (
+        params.update.sessionUpdate === "agent_message_chunk" &&
+        params.update.content.type === "text"
+      ) {
+        this.receivedText += params.update.content.text;
       }
     }
 
@@ -154,14 +140,12 @@ describe.skipIf(!process.env.RUN_INTEGRATION_TESTS)("ACP subprocess integration"
   it("should include available commands", async () => {
     const { client, connection, newSessionResponse } = await setupTestSession(__dirname);
 
-    const commands = await client.availableCommandsPromise;
-
-    expect(commands).toContainEqual({
+    expect(newSessionResponse.availableCommands).toContainEqual({
       name: "quick-math",
       description: "10 * 3 = 30 (project)",
       input: null,
     });
-    expect(commands).toContainEqual({
+    expect(newSessionResponse.availableCommands).toContainEqual({
       name: "say-hello",
       description: "Say hello (project)",
       input: { hint: "[name]" },
@@ -654,6 +638,36 @@ describe("tool conversions", () => {
     ]);
   });
 
+  it("should extract locations from edit tool results", () => {
+    const toolUse = {
+      type: "tool_use",
+      id: "toolu_01ABC123",
+      name: "edit",
+      input: {
+        abs_path: "/Users/test/project/example.txt",
+        old_string: "old content",
+        new_string: "new content",
+      },
+    };
+
+    const toolResult = {
+      content: [
+        {
+          type: "text",
+          text: JSON.stringify({ lineNumbers: [5, 10, 15] }),
+        },
+      ],
+    };
+
+    const update = toolUpdateFromToolResult(toolResult, toolUse);
+
+    expect(update.locations).toEqual([
+      { path: "/Users/test/project/example.txt", line: 5 },
+      { path: "/Users/test/project/example.txt", line: 10 },
+      { path: "/Users/test/project/example.txt", line: 15 },
+    ]);
+  });
+
   it("should show full diff for multi edit tool", () => {
     const toolUse = {
       type: "tool_use",
@@ -708,22 +722,110 @@ 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",
     });
   });
 
-  it("should return empty update for successful edit result", () => {
+  it("should extract locations from multi-edit tool results", () => {
+    const toolUse = {
+      type: "tool_use",
+      id: "toolu_01DEF456",
+      name: "multi-edit",
+      input: {
+        file_path: "/Users/test/project/config.json",
+        edits: [
+          {
+            old_string: "version: 1.0",
+            new_string: "version: 2.0",
+            replace_all: false,
+          },
+          {
+            old_string: "enabled: false",
+            new_string: "enabled: true",
+            replace_all: true,
+          },
+        ],
+      },
+    };
+
+    const toolResult = {
+      content: [
+        {
+          type: "text",
+          text: JSON.stringify({ lineNumbers: [2, 8, 12, 20] }),
+        },
+      ],
+    };
+
+    const update = toolUpdateFromToolResult(toolResult, toolUse);
+
+    expect(update.locations).toEqual([
+      { path: "/Users/test/project/config.json", line: 2 },
+      { path: "/Users/test/project/config.json", line: 8 },
+      { path: "/Users/test/project/config.json", line: 12 },
+      { path: "/Users/test/project/config.json", line: 20 },
+    ]);
+  });
+
+  it("should handle mcp__acp__edit tool results", () => {
+    const toolUse = {
+      type: "tool_use",
+      id: "toolu_01GHI789",
+      name: "mcp__acp__edit",
+      input: {
+        abs_path: "/Users/test/project/main.py",
+        old_string: "def hello():",
+        new_string: "def hello_world():",
+      },
+    };
+
+    const toolResult = {
+      content: [
+        {
+          type: "text",
+          text: JSON.stringify({ lineNumbers: [42] }),
+        },
+      ],
+    };
+
+    const update = toolUpdateFromToolResult(toolResult, toolUse);
+
+    expect(update.locations).toEqual([{ path: "/Users/test/project/main.py", line: 42 }]);
+  });
+
+  it("should handle empty locations from edit tools", () => {
+    const toolUse = {
+      type: "tool_use",
+      id: "toolu_01JKL012",
+      name: "edit",
+      input: {
+        abs_path: "/Users/test/project/notfound.txt",
+        old_string: "nonexistent",
+        new_string: "replacement",
+      },
+    };
+
+    const toolResult = {
+      content: [
+        {
+          type: "text",
+          text: JSON.stringify({ lineNumbers: [] }),
+        },
+      ],
+    };
+
+    const update = toolUpdateFromToolResult(toolResult, toolUse);
+
+    expect(update.locations).toEqual([]);
+  });
+
+  it("should handle malformed tool results gracefully", () => {
     const toolUse = {
       type: "tool_use",
       id: "toolu_01MNO345",
-      name: "mcp__acp__edit",
+      name: "edit",
       input: {
         abs_path: "/Users/test/project/test.txt",
         old_string: "old",
@@ -738,9 +840,6 @@ describe("tool conversions", () => {
           text: "not valid json",
         },
       ],
-      tool_use_id: "test",
-      is_error: false,
-      type: "tool_result" as const,
     };
 
     const update = toolUpdateFromToolResult(toolResult, toolUse);
@@ -748,40 +847,6 @@ describe("tool conversions", () => {
     // Should return empty object when parsing fails
     expect(update).toEqual({});
   });
-
-  it("should return content update for edit failure", () => {
-    const toolUse = {
-      type: "tool_use",
-      id: "toolu_01MNO345",
-      name: "mcp__acp__edit",
-      input: {
-        abs_path: "/Users/test/project/test.txt",
-        old_string: "old",
-        new_string: "new",
-      },
-    };
-
-    const toolResult = {
-      content: [
-        {
-          type: "text",
-          text: "Failed to find `old_string`",
-        },
-      ],
-      tool_use_id: "test",
-      is_error: true,
-      type: "tool_result" as const,
-    };
-
-    const update = toolUpdateFromToolResult(toolResult, toolUse);
-
-    // Should return empty object when parsing fails
-    expect(update).toEqual({
-      content: [
-        { content: { type: "text", text: "Failed to find `old_string`" }, type: "content" },
-      ],
-    });
-  });
 });
 
 describe("escape markdown", () => {

src/tests/replace-and-calculate-location.test.ts

@@ -22,9 +22,12 @@ describe("replaceAndCalculateLocation", () => {
 
   it("should return empty line numbers array when no match found", () => {
     const content = "line 1\nline 2\nline 3";
-    expect(() => {
-      replaceAndCalculateLocation(content, [{ oldText: "notfound", newText: "replaced" }]);
-    }).toThrow('The provided `old_string` does not appear in the file: "notfound"');
+    const result = replaceAndCalculateLocation(content, [
+      { oldText: "notfound", newText: "replaced" },
+    ]);
+
+    expect(result.newContent).toBe(content);
+    expect(result.lineNumbers).toEqual([]);
   });
 
   it("should handle Windows line endings (CRLF)", () => {
@@ -86,31 +89,35 @@ describe("replaceAndCalculateLocation", () => {
   });
 
   it("should handle empty file content", () => {
-    expect(() => {
-      replaceAndCalculateLocation("", [{ oldText: "text", newText: "replaced" }]);
-    }).toThrowError(
-      'The provided `old_string` does not appear in the file: "text".\n\nNo edits were applied.',
-    );
+    const content = "";
+    const result = replaceAndCalculateLocation(content, [{ oldText: "text", newText: "replaced" }]);
+
+    expect(result.newContent).toBe("");
+    expect(result.lineNumbers).toEqual([]);
   });
 
   it("should handle empty search text", () => {
     // Test with replaceAll false (default)
     const content1 = "line 1\nline 2\nline 3";
-    expect(() => {
-      replaceAndCalculateLocation(content1, [{ oldText: "", newText: "replaced" }]);
-    }).toThrowError("The provided `old_string` is empty.\n\nNo edits were applied.");
+    const result1 = replaceAndCalculateLocation(content1, [{ oldText: "", newText: "replaced" }]);
+    expect(result1.newContent).toBe(content1);
+    expect(result1.lineNumbers).toEqual([]);
 
     // Test with replaceAll true on single line
     const content2 = "abc";
-    expect(() => {
-      replaceAndCalculateLocation(content2, [{ oldText: "", newText: "X", replaceAll: true }]);
-    }).toThrowError("The provided `old_string` is empty.\n\nNo edits were applied.");
+    const result2 = replaceAndCalculateLocation(content2, [
+      { oldText: "", newText: "X", replaceAll: true },
+    ]);
+    expect(result2.newContent).toBe(content2);
+    expect(result2.lineNumbers).toEqual([]);
 
     // Test with replaceAll true on multiline content
     const content3 = "ab\ncd";
-    expect(() => {
-      replaceAndCalculateLocation(content3, [{ oldText: "", newText: "X", replaceAll: true }]);
-    }).toThrowError("The provided `old_string` is empty.\n\nNo edits were applied.");
+    const result3 = replaceAndCalculateLocation(content3, [
+      { oldText: "", newText: "X", replaceAll: true },
+    ]);
+    expect(result3.newContent).toBe(content3);
+    expect(result3.lineNumbers).toEqual([]);
   });
 
   it("should handle single line content", () => {

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 affectedLines: number[] = [];
+      let line = null;
 
-      if (path && oldText) {
+      if (path && input.old_text) {
         try {
           const oldContent = cachedFileContent[path] || "";
           const newContent = replaceAndCalculateLocation(oldContent, [
             {
-              oldText,
-              newText,
+              oldText: input.old_string,
+              newText: input.new_string,
               replaceAll: false,
             },
           ]);
           oldText = oldContent;
           newText = newContent.newContent;
-          affectedLines = newContent.lineNumbers;
+          line = newContent.lineNumbers[0];
         } catch (e) {
           console.error(e);
         }
@@ -173,11 +173,7 @@ export function toolInfoFromToolUse(
                 },
               ]
             : [],
-        locations: path
-          ? affectedLines.length > 0
-            ? affectedLines.map((line) => ({ line, path }))
-            : [{ path }]
-          : [],
+        locations: path ? [{ path, line }] : [],
       };
     }
 
@@ -193,7 +189,6 @@ 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 =
@@ -209,7 +204,6 @@ export function toolInfoFromToolUse(
           );
           oldTextMulti = oldContent;
           newTextMulti = newContent.newContent;
-          affectedLines = newContent.lineNumbers;
         }
       } catch (e) {
         console.error(e);
@@ -227,11 +221,7 @@ export function toolInfoFromToolUse(
             newText: newTextMulti,
           },
         ],
-        locations: input?.file_path
-          ? affectedLines.length > 0
-            ? affectedLines.map((line) => ({ line, path: input.file_path }))
-            : [{ path: input.file_path }]
-          : [],
+        locations: input?.file_path ? [{ path: input.file_path }] : [],
       };
     }
     case "mcp__acp__write": {
@@ -434,18 +424,60 @@ export function toolInfoFromToolUse(
   }
 }
 
-type ToolResult = {
-  type: "tool_result";
-  content: any;
-  tool_use_id: string;
-  is_error: boolean;
-};
-
-export function toolUpdateFromToolResult(
-  toolResult: ToolResult,
-  toolUse: any | undefined,
-): ToolUpdate {
+export function toolUpdateFromToolResult(toolResult: any, toolUse: any | undefined): ToolUpdate {
   switch (toolUse?.name) {
+    case "mcp__acp__edit":
+    case "edit":
+    case "Edit": {
+      // Parse the line numbers from the tool result
+      if (toolResult.content && toolResult.content.length > 0) {
+        try {
+          const firstContent = toolResult.content[0];
+          const data = JSON.parse(firstContent.text || firstContent);
+          if (data.lineNumbers && Array.isArray(data.lineNumbers)) {
+            const locations: ToolCallLocation[] = data.lineNumbers.map((line: number) => ({
+              path: toolUse?.input?.abs_path || toolUse?.input?.file_path,
+              line: line,
+            }));
+            return { locations };
+          }
+        } catch (error) {
+          console.error(`Error parsing edit tool result: ${error}`);
+          // If parsing fails, return empty object
+          return {};
+        }
+      }
+      return {};
+    }
+    case "mcp__acp__multi-edit":
+    case "multi-edit":
+    case "MultiEdit": {
+      // Parse the line numbers from the tool result
+      if (toolResult.content && toolResult.content.length > 0) {
+        try {
+          const firstContent = toolResult.content[0];
+          const data = JSON.parse(firstContent.text || firstContent);
+          if (data.lineNumbers && Array.isArray(data.lineNumbers)) {
+            const locations: ToolCallLocation[] = data.lineNumbers.map((line: number) => ({
+              path: toolUse?.input?.file_path || toolUse?.input?.abs_path,
+              line: line,
+            }));
+            return { locations };
+          }
+        } catch (error) {
+          console.error(`Error parsing edit tool result: ${error}`);
+
+          // If parsing fails, return empty object
+          return {};
+        }
+      }
+      return {};
+    }
+
+    case "mcp__acp__write":
+    case "Write":
+      return {};
+
     case "Read":
     case "mcp__acp__read":
       if (Array.isArray(toolResult.content) && toolResult.content.length > 0) {
@@ -477,20 +509,8 @@ export function toolUpdateFromToolResult(
       return {};
 
     case "mcp__acp__Bash":
-    case "mcp__acp__edit":
-    case "edit":
-    case "Edit":
-    case "mcp__acp__multi-edit":
-    case "multi-edit":
-    case "MultiEdit":
-    case "mcp__acp__write":
-    case "Write": {
-      if (toolResult.is_error && toolResult.content?.length > 0) {
-        // Only return errors
-        return toAcpContentUpdate(toolResult.content);
-      }
+      // The bash tool already embeds a terminal
       return {};
-    }
 
     case "Task":
     case "NotebookEdit":
@@ -507,35 +527,31 @@ export function toolUpdateFromToolResult(
     case "WebSearch":
     case "Other":
     default: {
-      return toAcpContentUpdate(toolResult.content);
+      if (Array.isArray(toolResult.content) && toolResult.content.length > 0) {
+        return {
+          content: toolResult.content.map((content: any) => ({
+            type: "content",
+            content,
+          })),
+        };
+      } else if (typeof toolResult.content === "string" && toolResult.content.length > 0) {
+        return {
+          content: [
+            {
+              type: "content",
+              content: {
+                type: "text",
+                text: toolResult.content,
+              },
+            },
+          ],
+        };
+      }
+      return {};
     }
   }
 }
 
-function toAcpContentUpdate(content: any): { content?: ToolCallContent[] } {
-  if (Array.isArray(content) && content.length > 0) {
-    return {
-      content: content.map((content: any) => ({
-        type: "content",
-        content,
-      })),
-    };
-  } else if (typeof content === "string" && content.length > 0) {
-    return {
-      content: [
-        {
-          type: "content",
-          content: {
-            type: "text",
-            text: content,
-          },
-        },
-      ],
-    };
-  }
-  return {};
-}
-
 type ClaudePlanEntry = {
   content: string;
   status: "pending" | "in_progress" | "completed";