Go back to SDK version 1.0.100 for #37976 for now

.eslintignore

@@ -0,0 +1,6 @@
+node_modules/
+dist/
+coverage/
+*.min.js
+*.config.js
+.github/

.eslintrc.json

@@ -0,0 +1,33 @@
+{
+  "root": true,
+  "parser": "@typescript-eslint/parser",
+  "parserOptions": {
+    "ecmaVersion": 2020,
+    "sourceType": "module",
+    "project": "./tsconfig.json"
+  },
+  "plugins": ["@typescript-eslint"],
+  "extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended", "prettier"],
+  "env": {
+    "node": true,
+    "es2020": true
+  },
+  "rules": {
+    "@typescript-eslint/explicit-function-return-type": "off",
+    "@typescript-eslint/no-explicit-any": "off",
+    "@typescript-eslint/no-unused-vars": [
+      "error",
+      {
+        "argsIgnorePattern": "^_"
+      }
+    ],
+    "no-console": "off",
+    "no-constant-condition": "off",
+    "default-case": "error",
+    "prefer-const": "error",
+    "no-var": "error",
+    "eqeqeq": ["error", "always"],
+    "curly": ["error", "all"]
+  },
+  "ignorePatterns": ["dist", "node_modules", "*.js"]
+}

.github/workflows/publish.yml

@@ -6,7 +6,6 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    environment: release # Optional: for enhanced security
     permissions:
       contents: read
       id-token: write
@@ -17,8 +16,8 @@ jobs:
         with:
           node-version: "lts/*"
           registry-url: "https://registry.npmjs.org"
-      - name: Update npm
-        run: npm install -g npm@latest
       - run: npm ci
-      - run: npm run build
-      - run: npm publish
+        # Add back provenance once repo is public
+      - run: npm publish # --provenance --access public
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

CHANGELOG.md

@@ -1,51 +0,0 @@
-# Changelog
-
-## 0.5.2
-
-- Add back @anthropic-ai/claude-code@2.0.1 as runtime dependency
-
-## 0.5.1
-
-- Update to @anthropic-ai/claude-agent-sdk@v0.1.1
-- Make improvements to ACP tools provided to the model
-
-## 0.5.0
-
-- Migrate to @anthropic-ai/claude-agent-sdk@v0.1.0
-
-## v0.4.7
-
-- More efficient file reads from the client.
-
-## v0.4.6
-
-- Update to @anthropic-ai/claude-code@v1.0.128
-
-## v0.4.5
-
-- Update to @anthropic-ai/claude-code@v1.0.124
-- Update to @zed-industries/agent-client-protocol@v0.4.3
-
-## v0.4.4
-
-- Update to @anthropic-ai/claude-code@v1.0.123
-- Update to @zed-industries/agent-client-protocol@v0.4.2
-
-## v0.4.3
-
-- Move ACP tools over MCP from an "http" MCP server to an "sdk" one so more tool calls can stay in-memory.
-- Update to @anthropic-ai/claude-code@v1.0.119
-- Update to @zed-industries/agent-client-protocol@v0.4.0
-
-## v0.4.2
-
-- Fix missing package.json metadata
-
-## v0.4.1
-
-- Add support for /compact command [ecfd36a](https://github.com/zed-industries/claude-code-acp/commit/ecfd36afa6c4e31f12e1daf9b8a2bdc12dda1794)
-- Add default limits to read tool [7bd1638](https://github.com/zed-industries/claude-code-acp/commit/7bd163818bb959b11fd2c933eff73ad83c57abb8)
-- Better rendering of Tool errors [491efe3](https://github.com/zed-industries/claude-code-acp/commit/491efe32e8547075842e448d873fc01b2ffabf3a)
-- Load managed-settings.json [f691024](https://github.com/zed-industries/claude-code-acp/commit/f691024350362858e00b97248ac68e356d2331c2)
-- Update to @anthropic-ai/claude-code@v1.0.113
-- Update to @zed-industries/agent-client-protocol@v0.3.1

README.md

@@ -32,11 +32,7 @@ Read the docs on [External Agent](https://zed.dev/docs/ai/external-agents) suppo
 
 ### Other clients
 
-- Emacs via [agent-shell.el](https://github.com/xenodium/agent-shell)
-- [marimo notebook](https://github.com/marimo-team/marimo)
-- Neovim
-  - via [CodeCompanion.nvim](https://codecompanion.olimorris.dev/configuration/adapters#setup-claude-code-via-acp)
-  - via [yetone/avante.nvim](https://github.com/yetone/avante.nvim)
+- Neovim via [CodeCompanion.nvim](https://codecompanion.olimorris.dev/configuration/adapters#setup-claude-code-via-acp)
 
 [Submit a PR](https://github.com/zed-industries/claude-code-acp/pulls) to add yours!
 

eslint.config.js

@@ -1,48 +0,0 @@
-import js from "@eslint/js";
-import tseslint from "@typescript-eslint/eslint-plugin";
-import tsparser from "@typescript-eslint/parser";
-import prettierConfig from "eslint-config-prettier";
-import globals from "globals";
-
-export default [
-  {
-    ignores: ["node_modules/", "dist/", "coverage/", "*.min.js", "*.config.js", ".github/"],
-  },
-  js.configs.recommended,
-  {
-    files: ["src/**/*.ts"],
-    languageOptions: {
-      ecmaVersion: 2020,
-      sourceType: "module",
-      parser: tsparser,
-      parserOptions: {
-        project: "./tsconfig.json",
-      },
-      globals: {
-        ...globals.node,
-      },
-    },
-    plugins: {
-      "@typescript-eslint": tseslint,
-    },
-    rules: {
-      ...tseslint.configs.recommended.rules,
-      "@typescript-eslint/explicit-function-return-type": "off",
-      "@typescript-eslint/no-explicit-any": "off",
-      "@typescript-eslint/no-unused-vars": [
-        "error",
-        {
-          argsIgnorePattern: "^_",
-        },
-      ],
-      "no-console": "off",
-      "no-constant-condition": "off",
-      "default-case": "error",
-      "prefer-const": "error",
-      "no-var": "error",
-      eqeqeq: ["error", "always"],
-      curly: ["error", "all"],
-    },
-  },
-  prettierConfig,
-];

package.json

@@ -6,7 +6,7 @@
   "bin": {
     "claude-code-acp": "./dist/index.js"
   },
-  "version": "0.5.2",
+  "version": "0.4.1",
   "description": "An ACP-compatible coding agent powered by the Claude Code SDK (TypeScript)",
   "main": "dist/index.js",
   "type": "module",
@@ -40,38 +40,27 @@
     "sdk",
     "code"
   ],
-  "homepage": "https://github.com/zed-industries/claude-code-acp#readme",
-  "bugs": {
-    "url": "https://github.com/zed-industries/claude-code-acp/issues"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/zed-industries/claude-code-acp.git"
-  },
   "author": "Zed Industries",
   "license": "Apache-2.0",
   "dependencies": {
-    "@anthropic-ai/claude-agent-sdk": "0.1.1",
-    "@anthropic-ai/claude-code": "2.0.1",
-    "@modelcontextprotocol/sdk": "1.18.2",
-    "@zed-industries/agent-client-protocol": "0.4.3",
+    "@anthropic-ai/claude-code": "1.0.100",
+    "@modelcontextprotocol/sdk": "1.17.5",
+    "@zed-industries/agent-client-protocol": "0.2.0-alpha.8",
     "diff": "8.0.2",
     "express": "5.1.0",
     "minimist": "1.2.8",
     "uuid": "13.0.0"
   },
   "devDependencies": {
-    "@anthropic-ai/sdk": "^0.65.0",
     "@types/express": "5.0.3",
     "@types/minimist": "1.2.5",
-    "@types/node": "24.6.0",
+    "@types/node": "24.3.1",
     "@types/uuid": "10.0.0",
-    "@typescript-eslint/eslint-plugin": "8.45.0",
-    "@typescript-eslint/parser": "8.45.0",
+    "@typescript-eslint/eslint-plugin": "8.43.0",
+    "@typescript-eslint/parser": "8.43.0",
     "@vitest/ui": "3.2.4",
-    "eslint": "9.36.0",
+    "eslint": "9.35.0",
     "eslint-config-prettier": "10.1.8",
-    "globals": "16.4.0",
     "prettier": "3.6.2",
     "ts-node": "10.9.2",
     "typescript": "5.9.2",

src/acp-agent.ts

@@ -7,7 +7,6 @@ import {
   ClientCapabilities,
   InitializeRequest,
   InitializeResponse,
-  ndJsonStream,
   NewSessionRequest,
   NewSessionResponse,
   PromptRequest,
@@ -30,27 +29,16 @@ import {
   query,
   SDKAssistantMessage,
   SDKUserMessage,
-  SDKUserMessageReplay,
-} from "@anthropic-ai/claude-agent-sdk";
+} from "@anthropic-ai/claude-code";
 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 { SessionNotification } from "@zed-industries/agent-client-protocol";
-import {
-  createMcpServer,
-  createPermissionMcpServer,
-  PERMISSION_TOOL_NAME,
-  toolNames,
-} from "./mcp-server.js";
+import { createMcpServer, toolNames } from "./mcp-server.js";
 import { AddressInfo } from "node:net";
-import {
-  toolInfoFromToolUse,
-  planEntries,
-  toolUpdateFromToolResult,
-  ClaudePlanEntry,
-} from "./tools.js";
+import { toolInfoFromToolUse, planEntries, toolUpdateFromToolResult } from "./tools.js";
 
 type Session = {
   query: Query;
@@ -151,17 +139,9 @@ export class ClaudeAcpAgent implements Agent {
       }
     }
 
-    const server = createMcpServer(this, sessionId, this.clientCapabilities);
+    const server = await createMcpServer(this, sessionId, this.clientCapabilities);
+    const address = server.address() as AddressInfo;
     mcpServers["acp"] = {
-      type: "sdk",
-      name: "acp",
-      instance: server,
-    };
-
-    // Ideally replace with `canUseTool`
-    const permissionServer = await createPermissionMcpServer(this, sessionId);
-    const address = permissionServer.address() as AddressInfo;
-    mcpServers["acpPermission"] = {
       type: "http",
       url: "http://127.0.0.1:" + address.port + "/mcp",
       headers: {
@@ -172,9 +152,7 @@ export class ClaudeAcpAgent implements Agent {
     const options: Options = {
       cwd: params.cwd,
       mcpServers,
-      systemPrompt: { type: "preset", preset: "claude_code" },
-      settingSources: ["user", "project", "local"],
-      permissionPromptToolName: PERMISSION_TOOL_NAME,
+      permissionPromptToolName: toolNames.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.
@@ -189,11 +167,11 @@ export class ClaudeAcpAgent implements Agent {
     }
     if (this.clientCapabilities?.fs?.writeTextFile) {
       allowedTools.push(toolNames.write);
-      disallowedTools.push("Write", "Edit");
+      disallowedTools.push("Write", "Edit", "MultiEdit");
     }
     if (this.clientCapabilities?.terminal) {
-      allowedTools.push(toolNames.bashOutput, toolNames.killShell);
-      disallowedTools.push("Bash", "BashOutput", "KillShell");
+      allowedTools.push(toolNames.bashOutput, toolNames.killBash);
+      disallowedTools.push("Bash", "BashOutput", "KillBash");
     }
 
     if (allowedTools.length > 0) {
@@ -278,14 +256,6 @@ export class ClaudeAcpAgent implements Agent {
       }
       switch (message.type) {
         case "system":
-          switch (message.subtype) {
-            case "init":
-              break;
-            case "compact_boundary":
-              break;
-            default:
-              unreachable(message as never);
-          }
           break;
         case "result": {
           if (this.sessions[params.sessionId].cancelled) {
@@ -311,42 +281,16 @@ export class ClaudeAcpAgent implements Agent {
         case "user":
         case "assistant": {
           if (this.sessions[params.sessionId].cancelled) {
-            break;
-          }
-
-          // Slash commands like /compact can generate invalid output... doesn't match
-          // their own docs: https://docs.anthropic.com/en/docs/claude-code/sdk/sdk-slash-commands#%2Fcompact-compact-conversation-history
-          if (
-            typeof message.message.content === "string" &&
-            message.message.content.includes("<local-command-stdout>")
-          ) {
-            console.log(message.message.content);
-            break;
+            continue;
           }
 
           if (
-            typeof message.message.content === "string" &&
-            message.message.content.includes("<local-command-stderr>")
-          ) {
-            console.error(message.message.content);
-            break;
-          }
-          // Skip these user messages for now, since they seem to just be messages we don't want in the feed
-          if (message.type === "user" && typeof message.message.content === "string") {
-            break;
-          }
-
-          if (
-            message.type === "assistant" &&
             message.message.model === "<synthetic>" &&
-            Array.isArray(message.message.content) &&
             message.message.content.length === 1 &&
-            message.message.content[0].type === "text" &&
             message.message.content[0].text.includes("Please run /login")
           ) {
             throw RequestError.authRequired();
           }
-
           for (const notification of toAcpNotifications(
             message,
             params.sessionId,
@@ -358,7 +302,7 @@ export class ClaudeAcpAgent implements Agent {
           break;
         }
         default:
-          unreachable(message as never);
+          unreachable(message);
       }
     }
     throw new Error("Session did not end in result");
@@ -380,11 +324,16 @@ export class ClaudeAcpAgent implements Agent {
     switch (params.modeId) {
       case "default":
       case "acceptEdits":
-      case "bypassPermissions":
       case "plan":
         this.sessions[params.sessionId].permissionMode = params.modeId;
         await this.sessions[params.sessionId].query.setPermissionMode(params.modeId);
         return {};
+      case "bypassPermissions":
+        // For some reason, the SDK doesn't support setting the mode to `bypassPermissions`
+        // so we do it ourselves
+        this.sessions[params.sessionId].permissionMode = "bypassPermissions";
+        await this.sessions[params.sessionId].query.setPermissionMode("acceptEdits");
+        return {};
       default:
         throw new Error("Invalid mode");
     }
@@ -412,6 +361,7 @@ async function getAvailableSlashCommands(query: Query): Promise<AvailableCommand
     "bashes", // Modal
     "bug", // Modal
     "clear", // Escape Codes
+    "compact", // Not supported via SDK?
     "config", // Modal
     "context", // Escape Codes
     "cost", // Escape Codes
@@ -440,10 +390,11 @@ async function getAvailableSlashCommands(query: Query): Promise<AvailableCommand
     "todos", // Escape Codes
     "vim", // Not needed
   ];
-  const commands = await query.supportedCommands();
+  //todo: Do not use `as any` once `supportedCommands` is exposed via the typescript interface
+  const commands = await (query as any).supportedCommands();
 
   return commands
-    .map((command) => {
+    .map((command: { name: string; description: string; argumentHint: string }) => {
       const input = command.argumentHint ? { hint: command.argumentHint } : null;
       return {
         name: command.name,
@@ -550,38 +501,20 @@ function promptToClaude(prompt: PromptRequest): SDKUserMessage {
  * Only handles text, image, and thinking chunks for now.
  */
 export function toAcpNotifications(
-  message: SDKAssistantMessage | SDKUserMessage | SDKUserMessageReplay,
+  message: SDKAssistantMessage | SDKUserMessage,
   sessionId: string,
   toolUseCache: ToolUseCache,
   fileContentCache: { [key: string]: string },
 ): SessionNotification[] {
-  const content = message.message.content;
-
-  if (typeof content === "string") {
-    return [
-      {
-        sessionId,
-        update: {
-          sessionUpdate:
-            message.type === "assistant" ? "agent_message_chunk" : "user_message_chunk",
-          content: {
-            type: "text",
-            text: content,
-          },
-        },
-      },
-    ];
-  }
-
+  const chunks = message.message.content as ContentChunk[];
   const output = [];
   // Only handle the first chunk for streaming; extend as needed for batching
-  for (const chunk of content) {
+  for (const chunk of chunks) {
     let update: SessionNotification["update"] | null = null;
     switch (chunk.type) {
       case "text":
         update = {
-          sessionUpdate:
-            message.type === "assistant" ? "agent_message_chunk" : "user_message_chunk",
+          sessionUpdate: "agent_message_chunk",
           content: {
             type: "text",
             text: chunk.text,
@@ -590,8 +523,7 @@ export function toAcpNotifications(
         break;
       case "image":
         update = {
-          sessionUpdate:
-            message.type === "assistant" ? "agent_message_chunk" : "user_message_chunk",
+          sessionUpdate: "agent_message_chunk",
           content: {
             type: "image",
             data: chunk.source.type === "base64" ? chunk.source.data : "",
@@ -614,19 +546,13 @@ export function toAcpNotifications(
         if (chunk.name === "TodoWrite") {
           update = {
             sessionUpdate: "plan",
-            entries: planEntries(chunk.input as { todos: ClaudePlanEntry[] }),
+            entries: planEntries(chunk.input),
           };
         } else {
-          let rawInput;
-          try {
-            rawInput = JSON.parse(JSON.stringify(chunk.input));
-          } catch {
-            // ignore if we can't turn it to JSON
-          }
           update = {
             toolCallId: chunk.id,
             sessionUpdate: "tool_call",
-            rawInput,
+            rawInput: chunk.input,
             status: "pending",
             ...toolInfoFromToolUse(chunk, fileContentCache),
           };
@@ -665,9 +591,30 @@ export function toAcpNotifications(
 }
 
 export function runAcp() {
-  const input = nodeToWebWritable(process.stdout);
-  const output = nodeToWebReadable(process.stdin);
-
-  const stream = ndJsonStream(input, output);
-  new AgentSideConnection((client) => new ClaudeAcpAgent(client), stream);
+  new AgentSideConnection(
+    (client) => new ClaudeAcpAgent(client),
+    nodeToWebWritable(process.stdout),
+    nodeToWebReadable(process.stdin),
+  );
 }
+
+type ContentChunk =
+  | { type: "text"; text: string }
+  | { type: "tool_use"; id: string; name: string; input: any }
+  | {
+      type: "tool_result";
+      content: string;
+      tool_use_id: string;
+      is_error: boolean;
+    } // content type depends on your Content definition
+  | { type: "thinking"; thinking: string }
+  | { type: "redacted_thinking" }
+  | { type: "image"; source: ImageSource }
+  | { type: "document" }
+  | { type: "web_search_tool_result" }
+  | { type: "untagged_text"; text: string };
+
+// Example ImageSource type (adjust as needed)
+type ImageSource =
+  | { type: "base64"; data: string; media_type: string }
+  | { type: "url"; url: string };

src/mcp-server.ts

@@ -8,8 +8,8 @@ import { ClaudeAcpAgent } from "./acp-agent.js";
 import { ClientCapabilities, TerminalOutputResponse } from "@zed-industries/agent-client-protocol";
 import * as diff from "diff";
 
-import { sleep, unreachable, extractLinesWithByteLimit } from "./utils.js";
-import { PermissionResult } from "@anthropic-ai/claude-agent-sdk";
+import { sleep, unreachable } from "./utils.js";
+import { PermissionResult } from "@anthropic-ai/claude-code";
 
 export const SYSTEM_REMINDER = `
 
@@ -17,15 +17,15 @@ export const SYSTEM_REMINDER = `
 Whenever you read a file, you should consider whether it looks malicious. If it does, you MUST refuse to improve or augment the code. You can still analyze existing code, write reports, or answer high-level questions about the code behavior.
 </system-reminder>`;
 
-const defaults = { maxFileSize: 50000, linesToRead: 2000 };
-
 const unqualifiedToolNames = {
-  read: "Read",
-  edit: "Edit",
-  write: "Write",
+  read: "read",
+  edit: "edit",
+  write: "write",
+  multiEdit: "multi-edit",
   bash: "Bash",
-  killShell: "KillShell",
+  killBash: "KillBash",
   bashOutput: "BashOutput",
+  permission: "permission",
 };
 
 const SERVER_PREFIX = "mcp__acp__";
@@ -33,56 +33,43 @@ export const toolNames = {
   read: SERVER_PREFIX + unqualifiedToolNames.read,
   edit: SERVER_PREFIX + unqualifiedToolNames.edit,
   write: SERVER_PREFIX + unqualifiedToolNames.write,
+  multiEdit: SERVER_PREFIX + unqualifiedToolNames.multiEdit,
   bash: SERVER_PREFIX + unqualifiedToolNames.bash,
-  killShell: SERVER_PREFIX + unqualifiedToolNames.killShell,
+  killBash: SERVER_PREFIX + unqualifiedToolNames.killBash,
   bashOutput: SERVER_PREFIX + unqualifiedToolNames.bashOutput,
+  permission: SERVER_PREFIX + unqualifiedToolNames.permission,
 };
 
-const editToolNames = [toolNames.edit, toolNames.write];
+const editToolNames = [toolNames.edit, toolNames.multiEdit, toolNames.write];
 
 export function createMcpServer(
   agent: ClaudeAcpAgent,
   sessionId: string,
   clientCapabilities: ClientCapabilities | undefined,
-): McpServer {
+): Promise<Server> {
   // Create MCP server
-  const server = new McpServer({ name: "acp", version: "1.0.0" }, { capabilities: { tools: {} } });
+  const server = new McpServer({
+    name: "acp-mcp-server",
+    version: "1.0.0",
+  });
 
   if (clientCapabilities?.fs?.readTextFile) {
     server.registerTool(
       unqualifiedToolNames.read,
       {
-        title: unqualifiedToolNames.read,
+        title: "Read",
         description: `Reads the content of the given file in the project.
 
-In sessions with ${toolNames.read} always use it instead of Read as it contains the most up-to-date contents.
+Never attempt to read a path that hasn't been previously mentioned.
 
-Reads a file from the local filesystem. If the User provides a path to a file assume that path is valid. It is okay to read a file that does not exist; an error will be returned.
-
-Usage:
-- The file_path parameter must be an absolute path, not a relative path
-- By default, it reads up to ${defaults.linesToRead} lines starting from the beginning of the file
-- You can optionally specify a line offset and limit (especially handy for long files), but it's recommended to read the whole file by not providing these parameters
-- Any files larger than ${defaults.maxFileSize} bytes will be truncated
-- This tool allows Claude Code to read images (eg PNG, JPG, etc). When reading an image file the contents are presented visually as Claude Code is a multimodal LLM.
-- This tool can only read files, not directories. To read a directory, use an ls command via the ${toolNames.bash} tool.
-- You have the capability to call multiple tools in a single response. It is always better to speculatively read multiple files as a batch that are potentially useful.`,
+In sessions with ${toolNames.read} always use it instead of Read as it contains the most up-to-date contents.`,
         inputSchema: {
-          file_path: z.string().describe("The absolute path to the file to read"),
+          abs_path: z.string().describe("The absolute path to the file to read."),
           offset: z
             .number()
             .optional()
-            .default(1)
-            .describe(
-              "The line number to start reading from. Only provide if the file is too large to read at once",
-            ),
-          limit: z
-            .number()
-            .optional()
-            .default(defaults.linesToRead)
-            .describe(
-              `The number of lines to read. Only provide if the file is too large to read at once.`,
-            ),
+            .describe("Which line to start reading from. Omit to start from the beginning."),
+          limit: z.number().optional().describe("How many lines to read. Omit for the whole file."),
         },
         annotations: {
           title: "Read file",
@@ -105,40 +92,18 @@ Usage:
               ],
             };
           }
-
           const content = await agent.readTextFile({
             sessionId,
-            path: input.file_path,
-            line: input.offset,
+            path: input.abs_path,
             limit: input.limit,
+            line: input.offset,
           });
 
-          // Extract lines with byte limit enforcement
-          const result = extractLinesWithByteLimit(content.content, defaults.maxFileSize);
-
-          // Construct informative message about what was read
-          let readInfo = "";
-          if (input.offset > 1 || result.wasLimited) {
-            readInfo = "\n\n<file-read-info>";
-
-            if (result.wasLimited) {
-              readInfo += `Read ${result.linesRead} lines (hit 50KB limit). `;
-            } else {
-              readInfo += `Read lines ${input.offset}-${result.linesRead}. `;
-            }
-
-            if (result.wasLimited) {
-              readInfo += `Continue with offset=${result.linesRead}.`;
-            }
-
-            readInfo += "</file-read-info>";
-          }
-
           return {
             content: [
               {
                 type: "text",
-                text: result.content + readInfo + SYSTEM_REMINDER,
+                text: content.content + SYSTEM_REMINDER,
               },
             ],
           };
@@ -160,23 +125,14 @@ Usage:
     server.registerTool(
       unqualifiedToolNames.write,
       {
-        title: unqualifiedToolNames.write,
-        description: `Writes a file to the local filesystem..
+        title: "Write",
+        description: `Writes content to the specified file in the project.
 
 In sessions with ${toolNames.write} always use it instead of Write as it will
-allow the user to conveniently review changes.
-
-Usage:
-- This tool will overwrite the existing file if there is one at the provided path.
-- If this is an existing file, you MUST use the ${toolNames.read} tool first to read the file's contents. This tool will fail if you did not read the file first.
-- ALWAYS prefer editing existing files in the codebase. NEVER write new files unless explicitly required.
-- NEVER proactively create documentation files (*.md) or README files. Only create documentation files if explicitly requested by the User.
-- Only use emojis if the user explicitly requests it. Avoid writing emojis to files unless asked.`,
+allow the user to conveniently review changes.`,
         inputSchema: {
-          file_path: z
-            .string()
-            .describe("The absolute path to the file to write (must be absolute, not relative)"),
-          content: z.string().describe("The content to write to the file"),
+          abs_path: z.string().describe("The absolute path to the file to write"),
+          content: z.string().describe("The full content to write"),
         },
         annotations: {
           title: "Write file",
@@ -201,7 +157,7 @@ Usage:
           }
           await agent.writeTextFile({
             sessionId,
-            path: input.file_path,
+            path: input.abs_path,
             content: input.content,
           });
 
@@ -224,30 +180,26 @@ Usage:
     server.registerTool(
       unqualifiedToolNames.edit,
       {
-        title: unqualifiedToolNames.edit,
-        description: `Performs exact string replacements in files.
+        title: "Edit",
+        description: `Edit a file.
 
 In sessions with ${toolNames.edit} always use it instead of Edit as it will
 allow the user to conveniently review changes.
 
-Usage:
-- You must use your \`${toolNames.read}\` tool at least once in the conversation before editing. This tool will error if you attempt an edit without reading the file.
-- When editing text from Read tool output, ensure you preserve the exact indentation (tabs/spaces) as it appears.
-- ALWAYS prefer editing existing files in the codebase. NEVER write new files unless explicitly required.
-- Only use emojis if the user explicitly requests it. Avoid adding emojis to files unless asked.
-- The edit will FAIL if \`old_string\` is not unique in the file. Either provide a larger string with more surrounding context to make it unique or use \`replace_all\` to change every instance of \`old_string\`.
-- Use \`replace_all\` for replacing and renaming strings across the file. This parameter is useful if you want to rename a variable for instance.`,
+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.
+- 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.`,
         inputSchema: {
-          file_path: z.string().describe("The absolute path to the file to modify"),
-          old_string: z.string().describe("The text to replace"),
-          new_string: z
-            .string()
-            .describe("The text to replace it with (must be different from old_string)"),
-          replace_all: z
-            .boolean()
-            .default(false)
-            .optional()
-            .describe("Replace all occurences of old_string (default false)"),
+          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)"),
+          new_string: z.string().describe("The new text."),
         },
         annotations: {
           title: "Edit file",
@@ -272,17 +224,105 @@ Usage:
 
         const { content } = await agent.readTextFile({
           sessionId,
-          path: input.file_path,
+          path: input.abs_path,
         });
 
         const { newContent } = replaceAndCalculateLocation(content, [
           {
             oldText: input.old_string,
             newText: input.new_string,
-            replaceAll: input.replace_all,
+            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,
+            },
+          ],
+        };
+      },
+    );
+
+    server.registerTool(
+      unqualifiedToolNames.multiEdit,
+      {
+        title: "Multi Edit",
+        description: `Edit a file with multiple sequential edits.
+
+In sessions with ${toolNames.multiEdit} 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.`,
+        inputSchema: {
+          file_path: z.string().describe("The absolute path to the file to modify"),
+          edits: z
+            .array(
+              z.object({
+                old_string: z.string().describe("The text to replace"),
+                new_string: z.string().describe("The text to replace it with"),
+                replace_all: z
+                  .boolean()
+                  .optional()
+                  .describe("Replace all occurrences of old_string (default false)"),
+              }),
+            )
+            .min(1)
+            .describe("Array of edit operations to perform sequentially on the file"),
+        },
+        annotations: {
+          title: "Multi Edit file",
+          readOnlyHint: false,
+          destructiveHint: false,
+          openWorldHint: false,
+          idempotentHint: false,
+        },
+      },
+      async (input) => {
+        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.file_path,
+        });
+
+        const { newContent } = replaceAndCalculateLocation(
+          content,
+          input.edits.map((edit) => ({
+            oldText: edit.old_string,
+            newText: edit.new_string,
+            replaceAll: edit.replace_all ?? false,
+          })),
+        );
+
         const patch = diff.createPatch(input.file_path, content, newContent);
 
         await agent.writeTextFile({
@@ -307,34 +347,19 @@ Usage:
     server.registerTool(
       unqualifiedToolNames.bash,
       {
-        title: unqualifiedToolNames.bash,
-        description: `Executes a bash command
-
-In sessions with ${toolNames.bash} always use it instead of Bash`,
+        title: "Bash",
+        description: "Executes a bash command",
         inputSchema: {
-          command: z.string().describe("The command to execute"),
-          timeout: z
+          command: z.string().describe("The bash command to execute as a one-liner"),
+          timeout_ms: z
             .number()
             .default(2 * 60 * 1000)
-            .describe(`Optional timeout in milliseconds (max ${2 * 60 * 1000})`),
-          description: z.string().optional()
-            .describe(`Clear, concise description of what this command does in 5-10 words, in active voice. Examples:
-Input: ls
-Output: List files in current directory
-
-Input: git status
-Output: Show working tree status
-
-Input: npm install
-Output: Install package dependencies
-
-Input: mkdir foo
-Output: Create directory 'foo'`),
+            .describe("Optional timeout in milliseconds"),
           run_in_background: z
             .boolean()
             .default(false)
             .describe(
-              `Set to true to run this command in the background. The tool returns an \`id\` that can be used with the \`${toolNames.bashOutput}\` tool to retrieve the current output, or the \`${toolNames.killShell}\` tool to stop it early.`,
+              `When set to true, the command is started in the background. The tool returns an \`id\` that can be used with the \`${toolNames.bashOutput}\` tool to retrieve the current output, or the \`${toolNames.killBash}\` tool to stop it early.`,
             ),
         },
       },
@@ -373,7 +398,6 @@ Output: Create directory 'foo'`),
             sessionUpdate: "tool_call_update",
             toolCallId,
             status: "in_progress",
-            title: input.description,
             content: [{ type: "terminal", terminalId: handle.id }],
           },
         });
@@ -391,7 +415,7 @@ Output: Create directory 'foo'`),
         const statusPromise = Promise.race([
           handle.waitForExit().then((exitStatus) => ({ status: "exited" as const, exitStatus })),
           abortPromise.then(() => ({ status: "aborted" as const, exitStatus: null })),
-          sleep(input.timeout).then(async () => {
+          sleep(input.timeout_ms).then(async () => {
             if (agent.backgroundTerminals[handle.id]?.status === "started") {
               await handle.kill();
             }
@@ -458,25 +482,20 @@ Output: Create directory 'foo'`),
     server.registerTool(
       unqualifiedToolNames.bashOutput,
       {
-        title: unqualifiedToolNames.bashOutput,
-        description: `- Retrieves output from a running or completed background bash shell
-- Takes a shell_id parameter identifying the shell
-- Always returns only new output since the last check
-- Returns stdout and stderr output along with shell status
-- Use this tool when you need to monitor or check the output of a long-running shell
-
-In sessions with ${toolNames.bashOutput} always use it instead of BashOutput.`,
+        title: "BashOutput",
+        description:
+          "Returns the current output and exit status of a background bash command by its id. Includes only new output since last invocation.",
         inputSchema: {
-          shell_id: z
+          id: z
             .string()
             .describe(`The id of the background bash command as returned by \`${toolNames.bash}\``),
         },
       },
       async (input) => {
-        const bgTerm = agent.backgroundTerminals[input.shell_id];
+        const bgTerm = agent.backgroundTerminals[input.id];
 
         if (!bgTerm) {
-          throw new Error(`Unknown shell ${input.shell_id}`);
+          throw new Error(`Unknown shell ${input.id}`);
         }
 
         if (bgTerm.status === "started") {
@@ -512,26 +531,21 @@ In sessions with ${toolNames.bashOutput} always use it instead of BashOutput.`,
     );
 
     server.registerTool(
-      unqualifiedToolNames.killShell,
+      unqualifiedToolNames.killBash,
       {
-        title: unqualifiedToolNames.killShell,
-        description: `- Kills a running background bash shell by its ID
-- Takes a shell_id parameter identifying the shell to kill
-- Returns a success or failure status
-- Use this tool when you need to terminate a long-running shell
-
-In sessions with ${toolNames.killShell} always use it instead of KillShell.`,
+        title: "KillBash",
+        description: "Stops a background command by its id",
         inputSchema: {
-          shell_id: z
+          id: z
             .string()
             .describe(`The id of the background bash command as returned by \`${toolNames.bash}\``),
         },
       },
       async (input) => {
-        const bgTerm = agent.backgroundTerminals[input.shell_id];
+        const bgTerm = agent.backgroundTerminals[input.id];
 
         if (!bgTerm) {
-          throw new Error(`Unknown shell ${input.shell_id}`);
+          throw new Error(`Unknown shell ${input.id}`);
         }
 
         switch (bgTerm.status) {
@@ -575,30 +589,9 @@ In sessions with ${toolNames.killShell} always use it instead of KillShell.`,
     );
   }
 
-  return server;
-}
-
-const UNQUALIFIED_PERMISSION_TOOL_NAME = "permission";
-const PERMISSION_SERVER_PREFIX = "mcp__acpPermission__";
-export const PERMISSION_TOOL_NAME = PERMISSION_SERVER_PREFIX + UNQUALIFIED_PERMISSION_TOOL_NAME;
-
-/**
- * Separate permission tool. Needs to be an HTTP server for now, because Claude Code doesn't
- * support permission tools via SDK servers.
- * Ideally it moves to the `canUseTool` callback in the future.
- */
-export function createPermissionMcpServer(
-  agent: ClaudeAcpAgent,
-  sessionId: string,
-): Promise<Server> {
-  const server = new McpServer(
-    { name: "acpPermission", version: "1.0.0" },
-    { capabilities: { tools: {} } },
-  );
-
   const alwaysAllowedTools: { [key: string]: boolean } = {};
   server.registerTool(
-    UNQUALIFIED_PERMISSION_TOOL_NAME,
+    unqualifiedToolNames.permission,
     {
       title: "Permission Tool",
       description: "Used to request tool permissions",

src/tests/acp-agent.test.ts

@@ -5,7 +5,6 @@ import {
   AvailableCommand,
   Client,
   ClientSideConnection,
-  ndJsonStream,
   NewSessionResponse,
   ReadTextFileRequest,
   ReadTextFileResponse,
@@ -18,7 +17,7 @@ import {
 import { nodeToWebWritable, nodeToWebReadable } from "../utils.js";
 import { markdownEscape, toolInfoFromToolUse, toolUpdateFromToolResult } from "../tools.js";
 import { toAcpNotifications } from "../acp-agent.js";
-import { SDKAssistantMessage } from "@anthropic-ai/claude-agent-sdk";
+import { SDKAssistantMessage } from "@anthropic-ai/claude-code";
 
 describe.skipIf(!process.env.RUN_INTEGRATION_TESTS)("ACP subprocess integration", () => {
   let child: ReturnType<typeof spawn>;
@@ -92,7 +91,7 @@ describe.skipIf(!process.env.RUN_INTEGRATION_TESTS)("ACP subprocess integration"
 
     async writeTextFile(params: WriteTextFileRequest): Promise<WriteTextFileResponse> {
       this.files.set(params.path, params.content);
-      return {};
+      return null;
     }
 
     async readTextFile(params: ReadTextFileRequest): Promise<ReadTextFileResponse> {
@@ -109,13 +108,14 @@ describe.skipIf(!process.env.RUN_INTEGRATION_TESTS)("ACP subprocess integration"
     newSessionResponse: NewSessionResponse;
   }> {
     let client;
-    const input = nodeToWebWritable(child.stdin!);
-    const output = nodeToWebReadable(child.stdout!);
-    const stream = ndJsonStream(input, output);
-    const connection = new ClientSideConnection((agent) => {
-      client = new TestClient(agent);
-      return client;
-    }, stream);
+    const connection = new ClientSideConnection(
+      (agent) => {
+        client = new TestClient(agent);
+        return client;
+      },
+      nodeToWebWritable(child.stdin!),
+      nodeToWebReadable(child.stdout!),
+    );
 
     await connection.initialize({
       protocolVersion: 1,
@@ -191,50 +191,6 @@ describe.skipIf(!process.env.RUN_INTEGRATION_TESTS)("ACP subprocess integration"
 
     expect(client.takeReceivedText()).toContain("Hello GPT-5");
   }, 30000);
-
-  it("/compact works", async () => {
-    const { client, connection, newSessionResponse } = await setupTestSession(__dirname);
-
-    const commands = await client.availableCommandsPromise;
-
-    expect(commands).toContainEqual({
-      description:
-        "Clear conversation history but keep a summary in context. Optional: /compact [instructions for summarization]",
-      input: {
-        hint: "<optional custom summarization instructions>",
-      },
-      name: "compact",
-    });
-
-    // Error case (no previous message)
-    await connection.prompt({
-      prompt: [{ type: "text", text: "/compact" }],
-      sessionId: newSessionResponse.sessionId,
-    });
-
-    expect(client.takeReceivedText()).toBe("");
-
-    // Send something
-    await connection.prompt({
-      prompt: [{ type: "text", text: "Hi" }],
-      sessionId: newSessionResponse.sessionId,
-    });
-    // Clear response
-    client.takeReceivedText();
-
-    // Test with instruction
-    await connection.prompt({
-      prompt: [
-        {
-          type: "text",
-          text: "/compact greeting",
-        },
-      ],
-      sessionId: newSessionResponse.sessionId,
-    });
-
-    expect(client.takeReceivedText()).toContain("");
-  }, 30000);
 });
 
 describe("tool conversions", () => {
@@ -371,13 +327,13 @@ describe("tool conversions", () => {
     });
   });
 
-  it("should handle mcp__acp__Write tool calls", () => {
+  it("should handle mcp__acp__write tool calls", () => {
     const tool_use = {
       type: "tool_use",
       id: "toolu_01GHI789JKL456",
-      name: "mcp__acp__Write",
+      name: "mcp__acp__write",
       input: {
-        file_path: "/Users/test/project/config.json",
+        abs_path: "/Users/test/project/config.json",
         content: '{"version": "1.0.0"}',
       },
     };
@@ -415,13 +371,13 @@ describe("tool conversions", () => {
     });
   });
 
-  it("should handle mcp__acp__Read tool calls", () => {
+  it("should handle mcp__acp__read tool calls", () => {
     const tool_use = {
       type: "tool_use",
       id: "toolu_01YZA789BCD123",
-      name: "mcp__acp__Read",
+      name: "mcp__acp__read",
       input: {
-        file_path: "/Users/test/project/data.json",
+        abs_path: "/Users/test/project/data.json",
       },
     };
 
@@ -433,13 +389,13 @@ describe("tool conversions", () => {
     });
   });
 
-  it("should handle mcp__acp__Read with limit", () => {
+  it("should handle mcp__acp__read with limit", () => {
     const tool_use = {
       type: "tool_use",
       id: "toolu_01EFG456HIJ789",
-      name: "mcp__acp__Read",
+      name: "mcp__acp__read",
       input: {
-        file_path: "/Users/test/project/large.txt",
+        abs_path: "/Users/test/project/large.txt",
         limit: 100,
       },
     };
@@ -452,13 +408,13 @@ describe("tool conversions", () => {
     });
   });
 
-  it("should handle mcp__acp__Read with offset and limit", () => {
+  it("should handle mcp__acp__read with offset and limit", () => {
     const tool_use = {
       type: "tool_use",
       id: "toolu_01KLM789NOP456",
-      name: "mcp__acp__Read",
+      name: "mcp__acp__read",
       input: {
-        file_path: "/Users/test/project/large.txt",
+        abs_path: "/Users/test/project/large.txt",
         offset: 50,
         limit: 100,
       },
@@ -472,13 +428,13 @@ describe("tool conversions", () => {
     });
   });
 
-  it("should handle mcp__acp__Read with only offset", () => {
+  it("should handle mcp__acp__read with only offset", () => {
     const tool_use = {
       type: "tool_use",
       id: "toolu_01QRS123TUV789",
-      name: "mcp__acp__Read",
+      name: "mcp__acp__read",
       input: {
-        file_path: "/Users/test/project/large.txt",
+        abs_path: "/Users/test/project/large.txt",
         offset: 200,
       },
     };
@@ -539,7 +495,7 @@ describe("tool conversions", () => {
     const tool_use = {
       type: "tool_use",
       id: "toolu_01PhLms5fuvmdjy2bb6dfUKT",
-      name: "KillShell",
+      name: "KillBash",
       input: {
         shell_id: "bash_1",
       },
@@ -576,7 +532,6 @@ describe("tool conversions", () => {
         id: "msg_017eNosJgww7F5qD4a8BcAcx",
         type: "message",
         role: "assistant",
-        container: null,
         model: "claude-sonnet-4-20250514",
         content: [
           {
@@ -641,9 +596,7 @@ describe("tool conversions", () => {
           },
           output_tokens: 1,
           service_tier: "standard",
-          server_tool_use: null,
         },
-        context_management: null,
       },
       parent_tool_use_id: null,
       session_id: "d056596f-e328-41e9-badd-b07122ae5227",
@@ -701,13 +654,78 @@ describe("tool conversions", () => {
     ]);
   });
 
+  it("should show full diff for multi edit tool", () => {
+    const toolUse = {
+      type: "tool_use",
+      id: "toolu_01DEF456",
+      name: "mcp__acp__multi-edit",
+      input: {
+        file_path: "/Users/test/project/config.json",
+        edits: [
+          {
+            old_string: 'version": 1',
+            new_string: 'version": 2',
+            replace_all: false,
+          },
+          {
+            old_string: 'enabled": false',
+            new_string: 'enabled": true',
+            replace_all: true,
+          },
+        ],
+      },
+    };
+    const fileCache: { [key: string]: string } = {
+      "/Users/test/project/config.json": JSON.stringify(
+        {
+          version: 1,
+          filler: "filler",
+          enabled: false,
+        },
+        null,
+        4,
+      ),
+    };
+
+    expect(toolInfoFromToolUse(toolUse, fileCache)).toEqual({
+      content: [
+        {
+          newText: `{
+    "version": 2,
+    "filler": "filler",
+    "enabled": true
+}`,
+          oldText: `{
+    "version": 1,
+    "filler": "filler",
+    "enabled": false
+}`,
+          path: "/Users/test/project/config.json",
+          type: "diff",
+        },
+      ],
+      kind: "edit",
+      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", () => {
     const toolUse = {
       type: "tool_use",
       id: "toolu_01MNO345",
-      name: "mcp__acp__Edit",
+      name: "mcp__acp__edit",
       input: {
-        file_path: "/Users/test/project/test.txt",
+        abs_path: "/Users/test/project/test.txt",
         old_string: "old",
         new_string: "new",
       },
@@ -716,7 +734,7 @@ describe("tool conversions", () => {
     const toolResult = {
       content: [
         {
-          type: "text" as const,
+          type: "text",
           text: "not valid json",
         },
       ],
@@ -735,9 +753,9 @@ describe("tool conversions", () => {
     const toolUse = {
       type: "tool_use",
       id: "toolu_01MNO345",
-      name: "mcp__acp__Edit",
+      name: "mcp__acp__edit",
       input: {
-        file_path: "/Users/test/project/test.txt",
+        abs_path: "/Users/test/project/test.txt",
         old_string: "old",
         new_string: "new",
       },
@@ -746,7 +764,7 @@ describe("tool conversions", () => {
     const toolResult = {
       content: [
         {
-          type: "text" as const,
+          type: "text",
           text: "Failed to find `old_string`",
         },
       ],
@@ -760,10 +778,7 @@ describe("tool conversions", () => {
     // Should return empty object when parsing fails
     expect(update).toEqual({
       content: [
-        {
-          content: { type: "text", text: "```\nFailed to find `old_string`\n```" },
-          type: "content",
-        },
+        { content: { type: "text", text: "Failed to find `old_string`" }, type: "content" },
       ],
     });
   });

src/tests/extract-lines.test.ts

@@ -1,103 +0,0 @@
-import { describe, it, expect } from "vitest";
-import { extractLinesWithByteLimit } from "../utils.js";
-
-describe("extractLinesWithByteLimit", () => {
-  const simpleContent = "Line 1\nLine 2\nLine 3\nLine 4\nLine 5";
-
-  it("should extract all lines when under byte limit", () => {
-    const result = extractLinesWithByteLimit(simpleContent, 1000);
-
-    expect(result.content).toBe(simpleContent);
-    expect(result.wasLimited).toBe(false);
-    expect(result.linesRead).toBe(5);
-  });
-
-  it("should limit output when exceeding byte limit", () => {
-    // Create content that will exceed byte limit
-    const longLine = "x".repeat(100);
-    const manyLines = Array(10).fill(longLine).join("\n");
-
-    const result = extractLinesWithByteLimit(manyLines, 250);
-
-    expect(result.wasLimited).toBe(true);
-    expect(result.linesRead).toBe(2);
-  });
-
-  it("should handle empty content", () => {
-    const result = extractLinesWithByteLimit("", 1000);
-
-    expect(result.content).toBe("");
-    expect(result.wasLimited).toBe(false);
-    expect(result.linesRead).toBe(1); // We read the one empty line
-  });
-
-  it("should handle single line file", () => {
-    const singleLine = "This is a single line without newline";
-    const result = extractLinesWithByteLimit(singleLine, 1000);
-
-    expect(result.content).toBe(singleLine);
-    expect(result.wasLimited).toBe(false);
-    expect(result.linesRead).toBe(1);
-  });
-
-  it("should correctly count bytes with multi-byte characters", () => {
-    const unicodeContent = "Hello 世界\n你好 World\nEmoji: 🌍\nNormal line";
-    const result = extractLinesWithByteLimit(unicodeContent, 1000);
-
-    expect(result.content).toBe(unicodeContent);
-    expect(result.linesRead).toBe(4);
-  });
-
-  it("should stop at byte limit even with one more line available", () => {
-    // Create lines where adding one more would exceed limit
-    const line1 = "a".repeat(40);
-    const line2 = "b".repeat(40);
-    const line3 = "c".repeat(40);
-    const content = `${line1}\n${line2}\n${line3}`;
-
-    const result = extractLinesWithByteLimit(content, 85);
-
-    expect(result.content).toBe(`${line1}\n${line2}\n`);
-    expect(result.wasLimited).toBe(true);
-    expect(result.linesRead).toBe(2);
-  });
-
-  it("should read exactly to limit when possible", () => {
-    const exactContent = "12345\n67890\n12345"; // 17 bytes total
-    const result = extractLinesWithByteLimit(exactContent, 17);
-
-    expect(result.content).toBe(exactContent);
-    expect(result.wasLimited).toBe(false);
-    expect(result.linesRead).toBe(3);
-  });
-
-  it("should handle Windows-style line endings", () => {
-    const windowsContent = "Line 1\r\nLine 2\r\nLine 3";
-    const result = extractLinesWithByteLimit(windowsContent, 1000);
-
-    // Note: split("\n") will keep the \r characters
-    expect(result.content).toBe("Line 1\r\nLine 2\r\nLine 3");
-    expect(result.linesRead).toBe(3);
-  });
-
-  it("should handle very large files efficiently", () => {
-    // Create a 100KB file
-    const largeLine = "x".repeat(1000);
-    const largeContent = Array(110).fill(largeLine).join("\n");
-
-    const result = extractLinesWithByteLimit(largeContent, 50000);
-
-    expect(result.wasLimited).toBe(true);
-  });
-
-  it("should allow at least one line even if it exceeds byte limit", () => {
-    const veryLongLine = "x".repeat(100000); // 100KB line
-    const result = extractLinesWithByteLimit(veryLongLine, 50000);
-
-    // Should return the line even though it exceeds the byte limit
-    // because we always allow at least one line if no lines have been added yet
-    expect(result.content).toBe(veryLongLine);
-    expect(result.linesRead).toBe(1);
-    expect(result.wasLimited).toBe(false);
-  });
-});

src/tools.ts

@@ -5,7 +5,6 @@ import {
   ToolKind,
 } from "@zed-industries/agent-client-protocol";
 import { replaceAndCalculateLocation, SYSTEM_REMINDER, toolNames } from "./mcp-server.js";
-import { ToolResultBlockParam } from "@anthropic-ai/sdk/resources";
 
 interface ToolInfo {
   title: string;
@@ -91,8 +90,8 @@ export function toolInfoFromToolUse(
         content: [],
       };
 
-    case "KillShell":
-    case toolNames.killShell:
+    case "KillBash":
+    case toolNames.killBash:
       return {
         title: "Kill Process",
         kind: "execute",
@@ -108,11 +107,11 @@ export function toolInfoFromToolUse(
         limit = " (from line " + (input.offset + 1) + ")";
       }
       return {
-        title: "Read " + (input.file_path ?? "File") + limit,
+        title: "Read " + (input.abs_path ?? "File") + limit,
         kind: "read",
         locations: [
           {
-            path: input.file_path,
+            path: input.abs_path,
             line: input.offset ?? 0,
           },
         ],
@@ -138,7 +137,7 @@ export function toolInfoFromToolUse(
 
     case toolNames.edit:
     case "Edit": {
-      const path = input?.file_path ?? input?.file_path;
+      const path = input?.abs_path ?? input?.file_path;
       let oldText = input.old_string ?? null;
       let newText = input.new_string ?? "";
       let affectedLines: number[] = [];
@@ -182,13 +181,66 @@ export function toolInfoFromToolUse(
       };
     }
 
+    case toolNames.multiEdit:
+    case "MultiEdit": {
+      const multiInput = input as {
+        file_path: string;
+        edits: {
+          old_string: string;
+          new_string: string;
+          replace_all?: boolean;
+        }[];
+      };
+      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 =
+            cachedFileContent[multiInput.file_path] ||
+            multiInput.edits.map((edit: any) => edit.oldText).join("\n");
+          const newContent = replaceAndCalculateLocation(
+            oldContent,
+            multiInput.edits.map((edit) => ({
+              oldText: edit.old_string,
+              newText: edit.new_string,
+              replaceAll: edit.replace_all,
+            })),
+          );
+          oldTextMulti = oldContent;
+          newTextMulti = newContent.newContent;
+          affectedLines = newContent.lineNumbers;
+        }
+      } catch (e) {
+        console.error(e);
+      }
+      // Display it as a normal edit, because end users don't care about
+      // the distinction between edits and multi-edits.
+      return {
+        title: input?.file_path ? `Edit ${input.file_path}` : "Edit",
+        kind: "edit",
+        content: [
+          {
+            type: "diff" as const,
+            path: input.file_path,
+            oldText: oldTextMulti,
+            newText: newTextMulti,
+          },
+        ],
+        locations: input?.file_path
+          ? affectedLines.length > 0
+            ? affectedLines.map((line) => ({ line, path: input.file_path }))
+            : [{ path: input.file_path }]
+          : [],
+      };
+    }
     case toolNames.write: {
       let content: ToolCallContent[] = [];
-      if (input && input.file_path) {
+      if (input && input.abs_path) {
         content = [
           {
             type: "diff",
-            path: input.file_path,
+            path: input.abs_path,
             oldText: null,
             newText: input.content,
           },
@@ -202,10 +254,10 @@ export function toolInfoFromToolUse(
         ];
       }
       return {
-        title: input?.file_path ? `Write ${input.file_path}` : "Write",
+        title: input?.abs_path ? `Write ${input.abs_path}` : "Write",
         kind: "edit",
         content,
-        locations: input?.file_path ? [{ path: input.file_path }] : [],
+        locations: input?.abs_path ? [{ path: input.abs_path }] : [],
       };
     }
 
@@ -358,13 +410,7 @@ export function toolInfoFromToolUse(
             : [],
       };
 
-    case "Other": {
-      let output;
-      try {
-        output = JSON.stringify(input, null, 2);
-      } catch {
-        output = typeof input === "string" ? input : "{}";
-      }
+    case "Other":
       return {
         title: name || "Unknown Tool",
         kind: "other",
@@ -373,12 +419,11 @@ export function toolInfoFromToolUse(
             type: "content",
             content: {
               type: "text",
-              text: `\`\`\`json\n${output}\`\`\``,
+              text: `\`\`\`json\n${JSON.stringify(input, null, 2) || "{}"}\`\`\``,
             },
           },
         ],
       };
-    }
 
     default:
       return {
@@ -389,8 +434,15 @@ export function toolInfoFromToolUse(
   }
 }
 
+type ToolResult = {
+  type: "tool_result";
+  content: any;
+  tool_use_id: string;
+  is_error: boolean;
+};
+
 export function toolUpdateFromToolResult(
-  toolResult: ToolResultBlockParam,
+  toolResult: ToolResult,
   toolUse: any | undefined,
 ): ToolUpdate {
   switch (toolUse?.name) {
@@ -428,11 +480,14 @@ export function toolUpdateFromToolResult(
     case "edit":
     case "Edit":
     case toolNames.edit:
+    case toolNames.multiEdit:
+    case "multi-edit":
+    case "MultiEdit":
     case toolNames.write:
     case "Write": {
-      if (toolResult.is_error && toolResult.content && toolResult.content.length > 0) {
+      if (toolResult.is_error && toolResult.content?.length > 0) {
         // Only return errors
-        return toAcpContentUpdate(toolResult.content, true);
+        return toAcpContentUpdate(toolResult.content);
       }
       return {};
     }
@@ -456,26 +511,17 @@ export function toolUpdateFromToolResult(
     case "WebSearch":
     case "Other":
     default: {
-      return toAcpContentUpdate(toolResult.content, toolResult.is_error);
+      return toAcpContentUpdate(toolResult.content);
     }
   }
 }
 
-function toAcpContentUpdate(
-  content: any,
-  isError: boolean = false,
-): { content?: ToolCallContent[] } {
+function toAcpContentUpdate(content: any): { content?: ToolCallContent[] } {
   if (Array.isArray(content) && content.length > 0) {
     return {
       content: content.map((content: any) => ({
         type: "content",
-        content:
-          isError && content.type === "text"
-            ? {
-                ...content,
-                text: `\`\`\`\n${content.text}\n\`\`\``,
-              }
-            : content,
+        content,
       })),
     };
   } else if (typeof content === "string" && content.length > 0) {
@@ -485,7 +531,7 @@ function toAcpContentUpdate(
           type: "content",
           content: {
             type: "text",
-            text: isError ? `\`\`\`\n${content}\n\`\`\`` : content,
+            text: content,
           },
         },
       ],
@@ -494,7 +540,7 @@ function toAcpContentUpdate(
   return {};
 }
 
-export type ClaudePlanEntry = {
+type ClaudePlanEntry = {
   content: string;
   status: "pending" | "in_progress" | "completed";
   activeForm: string;

src/utils.ts

@@ -122,67 +122,3 @@ export function applyEnvironmentSettings(settings: ManagedSettings): void {
     }
   }
 }
-
-export interface ExtractLinesResult {
-  content: string;
-  wasLimited: boolean;
-  linesRead: number;
-}
-
-/**
- * Extracts lines from file content with byte limit enforcement.
- *
- * @param fullContent - The complete file content
- * @param maxContentLength - Maximum number of UTF-16 Code Units to return
- * @returns Object containing extracted content and metadata
- */
-export function extractLinesWithByteLimit(
-  fullContent: string,
-  maxContentLength: number,
-): ExtractLinesResult {
-  if (fullContent === "") {
-    return {
-      content: "",
-      wasLimited: false,
-      linesRead: 1,
-    };
-  }
-
-  let linesSeen = 0;
-  let index = 0;
-  linesSeen = 0;
-
-  let contentLength = 0;
-  let wasLimited = false;
-
-  while (true) {
-    const nextIndex = fullContent.indexOf("\n", index);
-
-    if (nextIndex < 0) {
-      // Last line in file (no trailing newline)
-      if (linesSeen > 0 && fullContent.length > maxContentLength) {
-        wasLimited = true;
-        break;
-      }
-      linesSeen += 1;
-      contentLength = fullContent.length;
-      break;
-    } else {
-      // Line with newline - include up to the newline
-      const newContentLength = nextIndex + 1;
-      if (linesSeen > 0 && newContentLength > maxContentLength) {
-        wasLimited = true;
-        break;
-      }
-      linesSeen += 1;
-      contentLength = newContentLength;
-      index = newContentLength;
-    }
-  }
-
-  return {
-    content: fullContent.slice(0, contentLength),
-    wasLimited,
-    linesRead: linesSeen,
-  };
-}