Fix for invalid plan input in the model

Seems to have been introduced in the latest claude agent sdk.

Closes #109

CHANGELOG.md

@@ -1,5 +1,95 @@
 # Changelog
 
+## 0.6.7
+
+- Fix for invalid plan input from the model introduced in latest agent-sdk
+
+## 0.6.6
+
+- Do not enable bypassPermissions mode if in root/sudo mode, because Claude Code will not start
+
+## 0.6.5
+
+- Fix for duplicated text content after streaming
+
+## 0.6.4
+
+- Support streaming partial messages!
+- Update to @anthropic-ai/claude-agent-sdk@v0.1.21
+
+## 0.6.3
+
+- Fix issue where slash commands were loaded before initialization was complete.
+
+## 0.6.2
+
+- Fix bug where mode selection would sometimes fire before initialization was complete.
+- Update to @anthropic-ai/claude-agent-sdk@v0.1.19
+
+## 0.6.1
+
+- Fix to allow bypassPermissions mode to be selected (it wasn't permitted previously)
+
+## 0.6.0
+
+- Provide a model selector. We use the "default" model by default, and the user can change it via the client.
+- Make sure writes require permissions when necessary: https://github.com/zed-industries/claude-code-acp/pull/92
+- Add support for appending or overriding the system prompt: https://github.com/zed-industries/claude-code-acp/pull/91
+- Update to @anthropic-ai/claude-agent-sdk@v0.1.15
+- Update to @agentclientprotocol/sdk@0.4.8
+
+## 0.5.5
+
+- Migrate to @agentclientprotocol/sdk@0.4.5
+- Update to @anthropic-ai/claude-agent-sdk@v0.1.13
+
+## 0.5.4
+
+- Update to @anthropic-ai/claude-agent-sdk@v0.1.11
+- Enable setting CLAUDE_CODE_EXECUTABLE to override the executable used by the SDK https://github.com/zed-industries/claude-code-acp/pull/86
+
+## 0.5.3
+
+- Update to @anthropic-ai/claude-agent-sdk@v0.1.8
+- Update to @zed-industries/agent-client-protocol@v0.4.5
+
+## 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

README.md

@@ -32,8 +32,11 @@ Read the docs on [External Agent](https://zed.dev/docs/ai/external-agents) suppo
 
 ### Other clients
 
-- Neovim via [CodeCompanion.nvim](https://codecompanion.olimorris.dev/configuration/adapters#setup-claude-code-via-acp)
+- 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)
 
 [Submit a PR](https://github.com/zed-industries/claude-code-acp/pulls) to add yours!
 

package.json

@@ -6,7 +6,7 @@
   "bin": {
     "claude-code-acp": "./dist/index.js"
   },
-  "version": "0.4.2",
+  "version": "0.6.7",
   "description": "An ACP-compatible coding agent powered by the Claude Code SDK (TypeScript)",
   "main": "dist/index.js",
   "type": "module",
@@ -51,28 +51,30 @@
   "author": "Zed Industries",
   "license": "Apache-2.0",
   "dependencies": {
-    "@anthropic-ai/claude-code": "1.0.113",
-    "@modelcontextprotocol/sdk": "1.18.0",
-    "@zed-industries/agent-client-protocol": "0.3.1",
+    "@agentclientprotocol/sdk": "0.4.8",
+    "@anthropic-ai/claude-agent-sdk": "0.1.21",
+    "@anthropic-ai/claude-code": "2.0.21",
+    "@modelcontextprotocol/sdk": "1.20.1",
     "diff": "8.0.2",
     "express": "5.1.0",
     "minimist": "1.2.8",
     "uuid": "13.0.0"
   },
   "devDependencies": {
+    "@anthropic-ai/sdk": "^0.67.0",
     "@types/express": "5.0.3",
     "@types/minimist": "1.2.5",
-    "@types/node": "24.4.0",
+    "@types/node": "24.8.1",
     "@types/uuid": "10.0.0",
-    "@typescript-eslint/eslint-plugin": "8.43.0",
-    "@typescript-eslint/parser": "8.43.0",
+    "@typescript-eslint/eslint-plugin": "8.46.1",
+    "@typescript-eslint/parser": "8.46.1",
     "@vitest/ui": "3.2.4",
-    "eslint": "9.35.0",
+    "eslint": "9.37.0",
     "eslint-config-prettier": "10.1.8",
     "globals": "16.4.0",
     "prettier": "3.6.2",
     "ts-node": "10.9.2",
-    "typescript": "5.9.2",
+    "typescript": "5.9.3",
     "vitest": "3.2.4"
   }
 }

src/acp-agent.ts

@@ -7,6 +7,7 @@ import {
   ClientCapabilities,
   InitializeRequest,
   InitializeResponse,
+  ndJsonStream,
   NewSessionRequest,
   NewSessionResponse,
   PromptRequest,
@@ -14,31 +15,46 @@ import {
   ReadTextFileRequest,
   ReadTextFileResponse,
   RequestError,
+  SessionModelState,
+  SetSessionModelRequest,
+  SetSessionModelResponse,
   SetSessionModeRequest,
   SetSessionModeResponse,
   TerminalHandle,
   TerminalOutputResponse,
   WriteTextFileRequest,
   WriteTextFileResponse,
-} from "@zed-industries/agent-client-protocol";
+} from "@agentclientprotocol/sdk";
 import {
   McpServerConfig,
   Options,
   PermissionMode,
   Query,
   query,
-  SDKAssistantMessage,
+  SDKPartialAssistantMessage,
   SDKUserMessage,
-} from "@anthropic-ai/claude-code";
+} from "@anthropic-ai/claude-agent-sdk";
 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, toolNames } from "./mcp-server.js";
+import { SessionNotification } from "@agentclientprotocol/sdk";
+import {
+  createMcpServer,
+  createPermissionMcpServer,
+  PERMISSION_TOOL_NAME,
+  toolNames,
+} from "./mcp-server.js";
 import { AddressInfo } from "node:net";
-import { toolInfoFromToolUse, planEntries, toolUpdateFromToolResult } from "./tools.js";
+import {
+  toolInfoFromToolUse,
+  planEntries,
+  toolUpdateFromToolResult,
+  ClaudePlanEntry,
+} from "./tools.js";
+import { ContentBlockParam } from "@anthropic-ai/sdk/resources";
+import { BetaContentBlock, BetaRawContentBlockDelta } from "@anthropic-ai/sdk/resources/beta.mjs";
 
 type Session = {
   query: Query;
@@ -59,9 +75,19 @@ type BackgroundTerminal =
     };
 
 type ToolUseCache = {
-  [key: string]: { type: "tool_use"; id: string; name: string; input: any };
+  [key: string]: {
+    type: "tool_use" | "server_tool_use" | "mcp_tool_use";
+    id: string;
+    name: string;
+    input: any;
+  };
 };
 
+const DEFAULT_MODEL_ID = "default";
+
+// Bypass Permissions doesn't work if we are a root/sudo user
+const IS_ROOT = (process.geteuid?.() ?? process.getuid?.()) === 0;
+
 // Implement the ACP Agent interface
 export class ClaudeAcpAgent implements Agent {
   sessions: {
@@ -139,9 +165,17 @@ export class ClaudeAcpAgent implements Agent {
       }
     }
 
-    const server = await createMcpServer(this, sessionId, this.clientCapabilities);
-    const address = server.address() as AddressInfo;
+    const server = createMcpServer(this, sessionId, this.clientCapabilities);
     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: {
@@ -149,14 +183,39 @@ export class ClaudeAcpAgent implements Agent {
       },
     };
 
+    let systemPrompt: Options["systemPrompt"] = { type: "preset", preset: "claude_code" };
+    if (params._meta?.systemPrompt) {
+      const customPrompt = params._meta.systemPrompt;
+      if (typeof customPrompt === "string") {
+        systemPrompt = customPrompt;
+      } else if (
+        typeof customPrompt === "object" &&
+        "append" in customPrompt &&
+        typeof customPrompt.append === "string"
+      ) {
+        systemPrompt.append = customPrompt.append;
+      }
+    }
+
+    const permissionMode = "default";
+
     const options: Options = {
       cwd: params.cwd,
+      includePartialMessages: true,
       mcpServers,
-      permissionPromptToolName: toolNames.permission,
+      systemPrompt,
+      settingSources: ["user", "project", "local"],
+      // If we want bypassPermissions to be an option, we have to start the session with it on.
+      // We change it immediately back to default below before returning the session.
+      permissionMode: IS_ROOT ? permissionMode : "bypassPermissions",
+      permissionPromptToolName: PERMISSION_TOOL_NAME,
       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,
+      ...(process.env.CLAUDE_CODE_EXECUTABLE && {
+        pathToClaudeCodeExecutable: process.env.CLAUDE_CODE_EXECUTABLE,
+      }),
     };
 
     const allowedTools = [];
@@ -166,12 +225,11 @@ export class ClaudeAcpAgent implements Agent {
       disallowedTools.push("Read");
     }
     if (this.clientCapabilities?.fs?.writeTextFile) {
-      allowedTools.push(toolNames.write);
-      disallowedTools.push("Write", "Edit", "MultiEdit");
+      disallowedTools.push("Write", "Edit");
     }
     if (this.clientCapabilities?.terminal) {
-      allowedTools.push(toolNames.bashOutput, toolNames.killBash);
-      disallowedTools.push("Bash", "BashOutput", "KillBash");
+      allowedTools.push(toolNames.bashOutput, toolNames.killShell);
+      disallowedTools.push("Bash", "BashOutput", "KillShell");
     }
 
     if (allowedTools.length > 0) {
@@ -185,14 +243,23 @@ export class ClaudeAcpAgent implements Agent {
       prompt: input,
       options,
     });
+
     this.sessions[sessionId] = {
       query: q,
       input: input,
       cancelled: false,
-      permissionMode: "default",
+      permissionMode,
     };
 
-    getAvailableSlashCommands(q).then((availableCommands) => {
+    const availableCommands = await getAvailableSlashCommands(q);
+    const models = await getAvailableModels(q);
+    // Change it back to default
+    if (!IS_ROOT) {
+      await q.setPermissionMode(permissionMode);
+    }
+
+    // Needs to happen after we return the session
+    setTimeout(() => {
       this.client.sessionUpdate({
         sessionId,
         update: {
@@ -200,34 +267,40 @@ export class ClaudeAcpAgent implements Agent {
           availableCommands,
         },
       });
-    });
+    }, 0);
+
+    const availableModes = [
+      {
+        id: "default",
+        name: "Always Ask",
+        description: "Prompts for permission on first use of each tool",
+      },
+      {
+        id: "acceptEdits",
+        name: "Accept Edits",
+        description: "Automatically accepts file edit permissions for the session",
+      },
+      {
+        id: "plan",
+        name: "Plan Mode",
+        description: "Claude can analyze but not modify files or execute commands",
+      },
+    ];
+    // Only works in non-root mode
+    if (!IS_ROOT) {
+      availableModes.push({
+        id: "bypassPermissions",
+        name: "Bypass Permissions",
+        description: "Skips all permission prompts",
+      });
+    }
 
     return {
       sessionId,
+      models,
       modes: {
-        currentModeId: "default",
-        availableModes: [
-          {
-            id: "default",
-            name: "Always Ask",
-            description: "Prompts for permission on first use of each tool",
-          },
-          {
-            id: "acceptEdits",
-            name: "Accept Edits",
-            description: "Automatically accepts file edit permissions for the session",
-          },
-          {
-            id: "bypassPermissions",
-            name: "Bypass Permissions",
-            description: "Skips all permission prompts",
-          },
-          {
-            id: "plan",
-            name: "Plan Mode",
-            description: "Claude can analyze but not modify files or execute commands",
-          },
-        ],
+        currentModeId: permissionMode,
+        availableModes,
       },
     };
   }
@@ -256,6 +329,14 @@ 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) {
@@ -278,10 +359,21 @@ export class ClaudeAcpAgent implements Agent {
               return { stopReason: "refusal" };
           }
         }
+        case "stream_event": {
+          for (const notification of streamEventToAcpNotifications(
+            message,
+            params.sessionId,
+            this.toolUseCache,
+            this.fileContentCache,
+          )) {
+            await this.client.sessionUpdate(notification);
+          }
+          break;
+        }
         case "user":
         case "assistant": {
           if (this.sessions[params.sessionId].cancelled) {
-            continue;
+            break;
           }
 
           // Slash commands like /compact can generate invalid output... doesn't match
@@ -301,16 +393,31 @@ export class ClaudeAcpAgent implements Agent {
             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();
           }
+
+          const content =
+            message.type === "assistant"
+              ? // Handled by stream events above
+                message.message.content.filter((item) => !["text", "thinking"].includes(item.type))
+              : message.message.content;
+
           for (const notification of toAcpNotifications(
-            message,
+            content,
+            message.message.role,
             params.sessionId,
             this.toolUseCache,
             this.fileContentCache,
@@ -334,6 +441,13 @@ export class ClaudeAcpAgent implements Agent {
     await this.sessions[params.sessionId].query.interrupt();
   }
 
+  async setSessionModel(params: SetSessionModelRequest): Promise<SetSessionModelResponse | void> {
+    if (!this.sessions[params.sessionId]) {
+      throw new Error("Session not found");
+    }
+    await this.sessions[params.sessionId].query.setModel(params.modelId);
+  }
+
   async setSessionMode(params: SetSessionModeRequest): Promise<SetSessionModeResponse> {
     if (!this.sessions[params.sessionId]) {
       throw new Error("Session not found");
@@ -342,18 +456,20 @@ 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");
+        try {
+          await this.sessions[params.sessionId].query.setPermissionMode(params.modeId);
+        } catch (error) {
+          const errorMessage =
+            error instanceof Error && error.message ? error.message : "Invalid Mode";
+
+          throw new Error(errorMessage);
+        }
         return {};
       default:
-        throw new Error("Invalid mode");
+        throw new Error("Invalid Mode");
     }
   }
 
@@ -372,6 +488,26 @@ export class ClaudeAcpAgent implements Agent {
   }
 }
 
+async function getAvailableModels(query: Query): Promise<SessionModelState> {
+  const models = await query.supportedModels();
+
+  // Query doesn't give us access to the currently selected model, so we default to "default" if it is there,
+  // otherwise we just choose the first model in the list.
+  const currentModel = models.find((model) => model.value === DEFAULT_MODEL_ID) || models[0];
+  await query.setModel(currentModel.value);
+
+  const availableModels = models.map((model) => ({
+    modelId: model.value,
+    name: model.displayName,
+    description: model.description,
+  }));
+
+  return {
+    availableModels,
+    currentModelId: currentModel.value,
+  };
+}
+
 async function getAvailableSlashCommands(query: Query): Promise<AvailableCommand[]> {
   const UNSUPPORTED_COMMANDS = [
     "add-dir",
@@ -414,7 +550,6 @@ async function getAvailableSlashCommands(query: Query): Promise<AvailableCommand
       const input = command.argumentHint ? { hint: command.argumentHint } : null;
       return {
         name: command.name,
-        // @ts-expect-error type in the ts interface
         description: command.description || "",
         input,
       };
@@ -518,20 +653,36 @@ function promptToClaude(prompt: PromptRequest): SDKUserMessage {
  * Only handles text, image, and thinking chunks for now.
  */
 export function toAcpNotifications(
-  message: SDKAssistantMessage | SDKUserMessage,
+  content: string | ContentBlockParam[] | BetaContentBlock[] | BetaRawContentBlockDelta[],
+  role: "assistant" | "user",
   sessionId: string,
   toolUseCache: ToolUseCache,
   fileContentCache: { [key: string]: string },
 ): SessionNotification[] {
-  const chunks = message.message.content as ContentChunk[];
+  if (typeof content === "string") {
+    return [
+      {
+        sessionId,
+        update: {
+          sessionUpdate: role === "assistant" ? "agent_message_chunk" : "user_message_chunk",
+          content: {
+            type: "text",
+            text: content,
+          },
+        },
+      },
+    ];
+  }
+
   const output = [];
   // Only handle the first chunk for streaming; extend as needed for batching
-  for (const chunk of chunks) {
+  for (const chunk of content) {
     let update: SessionNotification["update"] | null = null;
     switch (chunk.type) {
       case "text":
+      case "text_delta":
         update = {
-          sessionUpdate: "agent_message_chunk",
+          sessionUpdate: role === "assistant" ? "agent_message_chunk" : "user_message_chunk",
           content: {
             type: "text",
             text: chunk.text,
@@ -540,7 +691,7 @@ export function toAcpNotifications(
         break;
       case "image":
         update = {
-          sessionUpdate: "agent_message_chunk",
+          sessionUpdate: role === "assistant" ? "agent_message_chunk" : "user_message_chunk",
           content: {
             type: "image",
             data: chunk.source.type === "base64" ? chunk.source.data : "",
@@ -550,6 +701,7 @@ export function toAcpNotifications(
         };
         break;
       case "thinking":
+      case "thinking_delta":
         update = {
           sessionUpdate: "agent_thought_chunk",
           content: {
@@ -559,24 +711,42 @@ export function toAcpNotifications(
         };
         break;
       case "tool_use":
+      case "server_tool_use":
+      case "mcp_tool_use": {
         toolUseCache[chunk.id] = chunk;
         if (chunk.name === "TodoWrite") {
-          update = {
-            sessionUpdate: "plan",
-            entries: planEntries(chunk.input),
-          };
+          // @ts-expect-error - sometimes input is empty object
+          if (Array.isArray(chunk.input.todos)) {
+            update = {
+              sessionUpdate: "plan",
+              entries: planEntries(chunk.input as { todos: ClaudePlanEntry[] }),
+            };
+          }
         } 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: chunk.input,
+            rawInput,
             status: "pending",
             ...toolInfoFromToolUse(chunk, fileContentCache),
           };
         }
         break;
+      }
 
-      case "tool_result": {
+      case "tool_result":
+      case "web_fetch_tool_result":
+      case "web_search_tool_result":
+      case "code_execution_tool_result":
+      case "bash_code_execution_tool_result":
+      case "text_editor_code_execution_tool_result":
+      case "mcp_tool_result": {
         const toolUse = toolUseCache[chunk.tool_use_id];
         if (!toolUse) {
           console.error(
@@ -589,15 +759,24 @@ export function toAcpNotifications(
           update = {
             toolCallId: chunk.tool_use_id,
             sessionUpdate: "tool_call_update",
-            status: chunk.is_error ? "failed" : "completed",
+            status: "is_error" in chunk && chunk.is_error ? "failed" : "completed",
             ...toolUpdateFromToolResult(chunk, toolUseCache[chunk.tool_use_id]),
           };
         }
         break;
       }
 
+      case "document":
+      case "search_result":
+      case "redacted_thinking":
+      case "input_json_delta":
+      case "citations_delta":
+      case "signature_delta":
+      case "container_upload":
+        break;
+
       default:
-        throw new Error("unhandled chunk type: " + chunk.type);
+        unreachable(chunk);
     }
     if (update) {
       output.push({ sessionId, update });
@@ -607,31 +786,53 @@ export function toAcpNotifications(
   return output;
 }
 
-export function runAcp() {
-  new AgentSideConnection(
-    (client) => new ClaudeAcpAgent(client),
-    nodeToWebWritable(process.stdout),
-    nodeToWebReadable(process.stdin),
-  );
+export function streamEventToAcpNotifications(
+  message: SDKPartialAssistantMessage,
+  sessionId: string,
+  toolUseCache: ToolUseCache,
+  fileContentCache: { [key: string]: string },
+): SessionNotification[] {
+  const event = message.event;
+  switch (event.type) {
+    case "message_start":
+      return toAcpNotifications(
+        event.message.content,
+        event.message.role,
+        sessionId,
+        toolUseCache,
+        fileContentCache,
+      );
+    case "content_block_start":
+      return toAcpNotifications(
+        [event.content_block],
+        "assistant",
+        sessionId,
+        toolUseCache,
+        fileContentCache,
+      );
+    case "content_block_delta":
+      return toAcpNotifications(
+        [event.delta],
+        "assistant",
+        sessionId,
+        toolUseCache,
+        fileContentCache,
+      );
+    case "message_delta":
+    case "message_stop":
+    case "content_block_stop":
+      // do we need stop reason?
+      return [];
+
+    default:
+      unreachable(event);
+  }
 }
 
-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 };
+export function runAcp() {
+  const input = nodeToWebWritable(process.stdout);
+  const output = nodeToWebReadable(process.stdin);
 
-// Example ImageSource type (adjust as needed)
-type ImageSource =
-  | { type: "base64"; data: string; media_type: string }
-  | { type: "url"; url: string };
+  const stream = ndJsonStream(input, output);
+  new AgentSideConnection((client) => new ClaudeAcpAgent(client), stream);
+}

src/mcp-server.ts

@@ -5,11 +5,11 @@ import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/
 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 { ClientCapabilities, TerminalOutputResponse } from "@agentclientprotocol/sdk";
 import * as diff from "diff";
 
 import { sleep, unreachable, extractLinesWithByteLimit } from "./utils.js";
-import { PermissionResult } from "@anthropic-ai/claude-code";
+import { PermissionResult } from "@anthropic-ai/claude-agent-sdk";
 
 export const SYSTEM_REMINDER = `
 
@@ -17,17 +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: 1000 };
+const defaults = { maxFileSize: 50000, linesToRead: 2000 };
 
 const unqualifiedToolNames = {
-  read: "read",
-  edit: "edit",
-  write: "write",
-  multiEdit: "multi-edit",
+  read: "Read",
+  edit: "Edit",
+  write: "Write",
   bash: "Bash",
-  killBash: "KillBash",
+  killShell: "KillShell",
   bashOutput: "BashOutput",
-  permission: "permission",
 };
 
 const SERVER_PREFIX = "mcp__acp__";
@@ -35,51 +33,55 @@ 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,
-  killBash: SERVER_PREFIX + unqualifiedToolNames.killBash,
+  killShell: SERVER_PREFIX + unqualifiedToolNames.killShell,
   bashOutput: SERVER_PREFIX + unqualifiedToolNames.bashOutput,
-  permission: SERVER_PREFIX + unqualifiedToolNames.permission,
 };
 
-const editToolNames = [toolNames.edit, toolNames.multiEdit, toolNames.write];
+const editToolNames = [toolNames.edit, toolNames.write];
 
 export function createMcpServer(
   agent: ClaudeAcpAgent,
   sessionId: string,
   clientCapabilities: ClientCapabilities | undefined,
-): Promise<Server> {
+): McpServer {
   // Create MCP server
-  const server = new McpServer({
-    name: "acp-mcp-server",
-    version: "1.0.0",
-  });
+  const server = new McpServer({ name: "acp", version: "1.0.0" }, { capabilities: { tools: {} } });
 
   if (clientCapabilities?.fs?.readTextFile) {
     server.registerTool(
       unqualifiedToolNames.read,
       {
-        title: "Read",
+        title: unqualifiedToolNames.read,
         description: `Reads the content of the given file in the project.
 
-Never attempt to read a path that hasn't been previously mentioned.
+In sessions with ${toolNames.read} always use it instead of Read as it contains the most up-to-date contents.
 
-In sessions with ${toolNames.read} always use it instead of Read as it contains the most up-to-date contents.`,
+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.`,
         inputSchema: {
-          abs_path: z.string().describe("The absolute path to the file to read."),
+          file_path: z.string().describe("The absolute path to the file to read"),
           offset: z
             .number()
             .optional()
-            .default(0)
+            .default(1)
             .describe(
-              "Which line to start reading from (0-based). Omit to start from the beginning.",
+              "The line number to start reading from. Only provide if the file is too large to read at once",
             ),
-          linesToRead: z
+          limit: z
             .number()
             .optional()
             .default(defaults.linesToRead)
             .describe(
-              `How many lines to read. Omit for ${defaults.linesToRead}. (Reading files that are too large can fill up the context window unnecessarily, so be thoughtful about how much you read at a time.)`,
+              `The number of lines to read. Only provide if the file is too large to read at once.`,
             ),
         },
         annotations: {
@@ -106,30 +108,27 @@ In sessions with ${toolNames.read} always use it instead of Read as it contains
 
           const content = await agent.readTextFile({
             sessionId,
-            path: input.abs_path,
+            path: input.file_path,
+            line: input.offset,
+            limit: input.limit,
           });
 
           // Extract lines with byte limit enforcement
-          const result = extractLinesWithByteLimit(
-            content.content,
-            input.offset ?? 0,
-            input.linesToRead,
-            defaults.maxFileSize,
-          );
+          const result = extractLinesWithByteLimit(content.content, defaults.maxFileSize);
 
           // Construct informative message about what was read
           let readInfo = "";
-          if (input.offset > 0 || result.wasLimited) {
+          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 ?? 0) + 1}-${result.actualEndLine}. `;
+              readInfo += `Read lines ${input.offset}-${result.linesRead}. `;
             }
 
             if (result.wasLimited) {
-              readInfo += `Continue with offset=${result.actualEndLine}.`;
+              readInfo += `Continue with offset=${result.linesRead}.`;
             }
 
             readInfo += "</file-read-info>";
@@ -161,14 +160,23 @@ In sessions with ${toolNames.read} always use it instead of Read as it contains
     server.registerTool(
       unqualifiedToolNames.write,
       {
-        title: "Write",
-        description: `Writes content to the specified file in the project.
+        title: unqualifiedToolNames.write,
+        description: `Writes a file to the local filesystem..
 
 In sessions with ${toolNames.write} always use it instead of Write as it will
-allow the user to conveniently review changes.`,
+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.`,
         inputSchema: {
-          abs_path: z.string().describe("The absolute path to the file to write"),
-          content: z.string().describe("The full content to write"),
+          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"),
         },
         annotations: {
           title: "Write file",
@@ -193,7 +201,7 @@ allow the user to conveniently review changes.`,
           }
           await agent.writeTextFile({
             sessionId,
-            path: input.abs_path,
+            path: input.file_path,
             content: input.content,
           });
 
@@ -216,26 +224,30 @@ allow the user to conveniently review changes.`,
     server.registerTool(
       unqualifiedToolNames.edit,
       {
-        title: "Edit",
-        description: `Edit a file.
+        title: unqualifiedToolNames.edit,
+        description: `Performs exact string replacements in files.
 
 In sessions with ${toolNames.edit} always use it instead of Edit 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.
-- 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.`,
+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.`,
         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)"),
-          new_string: z.string().describe("The new text."),
+          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)"),
         },
         annotations: {
           title: "Edit file",
@@ -260,105 +272,17 @@ File editing instructions:
 
         const { content } = await agent.readTextFile({
           sessionId,
-          path: input.abs_path,
+          path: input.file_path,
         });
 
         const { newContent } = replaceAndCalculateLocation(content, [
           {
             oldText: input.old_string,
             newText: input.new_string,
-            replaceAll: false,
+            replaceAll: input.replace_all,
           },
         ]);
 
-        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({
@@ -383,19 +307,34 @@ File editing instructions:
     server.registerTool(
       unqualifiedToolNames.bash,
       {
-        title: "Bash",
-        description: "Executes a bash command",
+        title: unqualifiedToolNames.bash,
+        description: `Executes a bash command
+
+In sessions with ${toolNames.bash} always use it instead of Bash`,
         inputSchema: {
-          command: z.string().describe("The bash command to execute as a one-liner"),
-          timeout_ms: z
+          command: z.string().describe("The command to execute"),
+          timeout: z
             .number()
             .default(2 * 60 * 1000)
-            .describe("Optional timeout in milliseconds"),
+            .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'`),
           run_in_background: z
             .boolean()
             .default(false)
             .describe(
-              `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.`,
+              `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.`,
             ),
         },
       },
@@ -434,6 +373,7 @@ File editing instructions:
             sessionUpdate: "tool_call_update",
             toolCallId,
             status: "in_progress",
+            title: input.description,
             content: [{ type: "terminal", terminalId: handle.id }],
           },
         });
@@ -451,7 +391,7 @@ File editing instructions:
         const statusPromise = Promise.race([
           handle.waitForExit().then((exitStatus) => ({ status: "exited" as const, exitStatus })),
           abortPromise.then(() => ({ status: "aborted" as const, exitStatus: null })),
-          sleep(input.timeout_ms).then(async () => {
+          sleep(input.timeout).then(async () => {
             if (agent.backgroundTerminals[handle.id]?.status === "started") {
               await handle.kill();
             }
@@ -518,20 +458,25 @@ File editing instructions:
     server.registerTool(
       unqualifiedToolNames.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.",
+        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.`,
         inputSchema: {
-          id: z
+          shell_id: z
             .string()
             .describe(`The id of the background bash command as returned by \`${toolNames.bash}\``),
         },
       },
       async (input) => {
-        const bgTerm = agent.backgroundTerminals[input.id];
+        const bgTerm = agent.backgroundTerminals[input.shell_id];
 
         if (!bgTerm) {
-          throw new Error(`Unknown shell ${input.id}`);
+          throw new Error(`Unknown shell ${input.shell_id}`);
         }
 
         if (bgTerm.status === "started") {
@@ -567,21 +512,26 @@ File editing instructions:
     );
 
     server.registerTool(
-      unqualifiedToolNames.killBash,
+      unqualifiedToolNames.killShell,
       {
-        title: "KillBash",
-        description: "Stops a background command by its id",
+        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.`,
         inputSchema: {
-          id: z
+          shell_id: z
             .string()
             .describe(`The id of the background bash command as returned by \`${toolNames.bash}\``),
         },
       },
       async (input) => {
-        const bgTerm = agent.backgroundTerminals[input.id];
+        const bgTerm = agent.backgroundTerminals[input.shell_id];
 
         if (!bgTerm) {
-          throw new Error(`Unknown shell ${input.id}`);
+          throw new Error(`Unknown shell ${input.shell_id}`);
         }
 
         switch (bgTerm.status) {
@@ -625,9 +575,30 @@ File editing instructions:
     );
   }
 
+  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(
-    unqualifiedToolNames.permission,
+    UNQUALIFIED_PERMISSION_TOOL_NAME,
     {
       title: "Permission Tool",
       description: "Used to request tool permissions",

src/tests/acp-agent.test.ts

@@ -5,6 +5,7 @@ import {
   AvailableCommand,
   Client,
   ClientSideConnection,
+  ndJsonStream,
   NewSessionResponse,
   ReadTextFileRequest,
   ReadTextFileResponse,
@@ -13,11 +14,11 @@ import {
   SessionNotification,
   WriteTextFileRequest,
   WriteTextFileResponse,
-} from "@zed-industries/agent-client-protocol";
+} from "@agentclientprotocol/sdk";
 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-code";
+import { query, SDKAssistantMessage } from "@anthropic-ai/claude-agent-sdk";
 
 describe.skipIf(!process.env.RUN_INTEGRATION_TESTS)("ACP subprocess integration", () => {
   let child: ReturnType<typeof spawn>;
@@ -108,14 +109,13 @@ describe.skipIf(!process.env.RUN_INTEGRATION_TESTS)("ACP subprocess integration"
     newSessionResponse: NewSessionResponse;
   }> {
     let client;
-    const connection = new ClientSideConnection(
-      (agent) => {
-        client = new TestClient(agent);
-        return client;
-      },
-      nodeToWebWritable(child.stdin!),
-      nodeToWebReadable(child.stdout!),
-    );
+    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);
 
     await connection.initialize({
       protocolVersion: 1,
@@ -371,13 +371,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: {
-        abs_path: "/Users/test/project/config.json",
+        file_path: "/Users/test/project/config.json",
         content: '{"version": "1.0.0"}',
       },
     };
@@ -415,13 +415,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: {
-        abs_path: "/Users/test/project/data.json",
+        file_path: "/Users/test/project/data.json",
       },
     };
 
@@ -433,13 +433,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: {
-        abs_path: "/Users/test/project/large.txt",
+        file_path: "/Users/test/project/large.txt",
         limit: 100,
       },
     };
@@ -452,13 +452,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: {
-        abs_path: "/Users/test/project/large.txt",
+        file_path: "/Users/test/project/large.txt",
         offset: 50,
         limit: 100,
       },
@@ -472,13 +472,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: {
-        abs_path: "/Users/test/project/large.txt",
+        file_path: "/Users/test/project/large.txt",
         offset: 200,
       },
     };
@@ -539,7 +539,7 @@ describe("tool conversions", () => {
     const tool_use = {
       type: "tool_use",
       id: "toolu_01PhLms5fuvmdjy2bb6dfUKT",
-      name: "KillBash",
+      name: "KillShell",
       input: {
         shell_id: "bash_1",
       },
@@ -576,6 +576,7 @@ describe("tool conversions", () => {
         id: "msg_017eNosJgww7F5qD4a8BcAcx",
         type: "message",
         role: "assistant",
+        container: null,
         model: "claude-sonnet-4-20250514",
         content: [
           {
@@ -640,13 +641,17 @@ 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",
       uuid: "b7c3330c-de8f-4bba-ac53-68c7f76ffeb5",
     };
-    expect(toAcpNotifications(received, "test", {}, {})).toStrictEqual([
+    expect(
+      toAcpNotifications(received.message.content, received.message.role, "test", {}, {}),
+    ).toStrictEqual([
       {
         sessionId: "test",
         update: {
@@ -698,78 +703,13 @@ 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: {
-        abs_path: "/Users/test/project/test.txt",
+        file_path: "/Users/test/project/test.txt",
         old_string: "old",
         new_string: "new",
       },
@@ -778,7 +718,7 @@ describe("tool conversions", () => {
     const toolResult = {
       content: [
         {
-          type: "text",
+          type: "text" as const,
           text: "not valid json",
         },
       ],
@@ -797,9 +737,9 @@ describe("tool conversions", () => {
     const toolUse = {
       type: "tool_use",
       id: "toolu_01MNO345",
-      name: "mcp__acp__edit",
+      name: "mcp__acp__Edit",
       input: {
-        abs_path: "/Users/test/project/test.txt",
+        file_path: "/Users/test/project/test.txt",
         old_string: "old",
         new_string: "new",
       },
@@ -808,7 +748,7 @@ describe("tool conversions", () => {
     const toolResult = {
       content: [
         {
-          type: "text",
+          type: "text" as const,
           text: "Failed to find `old_string`",
         },
       ],
@@ -842,3 +782,16 @@ describe("escape markdown", () => {
     expect(escaped).toEqual("````\nfor example:\n```markdown\nHello *world*!\n```\n````");
   });
 });
+
+describe("SDK behavior", () => {
+  it.skipIf(!process.env.RUN_INTEGRATION_TESTS)(
+    "query has a 'default' model",
+    async () => {
+      const q = query({ prompt: "hi" });
+      const models = await q.supportedModels();
+      const defaultModel = models.find((m) => m.value === "default");
+      expect(defaultModel).toBeDefined();
+    },
+    10000,
+  );
+});

src/tests/extract-lines.test.ts

@@ -5,66 +5,44 @@ 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, 0, 5, 1000);
+    const result = extractLinesWithByteLimit(simpleContent, 1000);
 
     expect(result.content).toBe(simpleContent);
-    expect(result.actualEndLine).toBe(4);
     expect(result.wasLimited).toBe(false);
     expect(result.linesRead).toBe(5);
   });
 
-  it("should extract partial lines with offset", () => {
-    const result = extractLinesWithByteLimit(simpleContent, 2, 2, 1000);
-
-    expect(result.content).toBe("Line 3\nLine 4");
-    expect(result.actualEndLine).toBe(3);
-    expect(result.wasLimited).toBe(false);
-    expect(result.linesRead).toBe(2);
-  });
-
   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, 0, 10, 250);
+    const result = extractLinesWithByteLimit(manyLines, 250);
 
     expect(result.wasLimited).toBe(true);
-    expect(result.actualEndLine).toBe(1); // Should only get 2 lines
     expect(result.linesRead).toBe(2);
   });
 
-  it("should handle offset beyond file length", () => {
-    const result = extractLinesWithByteLimit(simpleContent, 10, 5, 1000);
-
-    expect(result.content).toBe("");
-    expect(result.actualEndLine).toBe(10);
-    expect(result.wasLimited).toBe(false);
-    expect(result.linesRead).toBe(0);
-  });
-
   it("should handle empty content", () => {
-    const result = extractLinesWithByteLimit("", 0, 10, 1000);
+    const result = extractLinesWithByteLimit("", 1000);
 
     expect(result.content).toBe("");
-    expect(result.actualEndLine).toBe(0); // Empty string splits to [""] and we process that one empty line
     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, 0, 10, 1000);
+    const result = extractLinesWithByteLimit(singleLine, 1000);
 
     expect(result.content).toBe(singleLine);
-    expect(result.actualEndLine).toBe(0);
     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, 0, 10, 1000);
+    const result = extractLinesWithByteLimit(unicodeContent, 1000);
 
     expect(result.content).toBe(unicodeContent);
     expect(result.linesRead).toBe(4);
@@ -77,63 +55,25 @@ describe("extractLinesWithByteLimit", () => {
     const line3 = "c".repeat(40);
     const content = `${line1}\n${line2}\n${line3}`;
 
-    const result = extractLinesWithByteLimit(content, 0, 3, 85);
+    const result = extractLinesWithByteLimit(content, 85);
 
-    expect(result.content).toBe(`${line1}\n${line2}`);
-    expect(result.actualEndLine).toBe(1);
+    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, 0, 3, 17);
+    const result = extractLinesWithByteLimit(exactContent, 17);
 
     expect(result.content).toBe(exactContent);
-    expect(result.actualEndLine).toBe(2);
     expect(result.wasLimited).toBe(false);
     expect(result.linesRead).toBe(3);
   });
 
-  it("should handle reading from middle to end", () => {
-    const result = extractLinesWithByteLimit(simpleContent, 3, 100, 1000);
-
-    expect(result.content).toBe("Line 4\nLine 5");
-    expect(result.actualEndLine).toBe(4);
-    expect(result.wasLimited).toBe(false);
-    expect(result.linesRead).toBe(2);
-  });
-
-  it("should handle large content with typical parameters", () => {
-    const longContent = Array(2000).fill("Line content here").join("\n");
-    const result = extractLinesWithByteLimit(longContent, 0, 1000, 50000);
-
-    expect(result.actualEndLine).toBeLessThanOrEqual(1000); // Should be limited by line count
-  });
-
-  it("should provide correct data for partial read at start", () => {
-    const result = extractLinesWithByteLimit(simpleContent, 0, 2, 1000);
-
-    expect(result.actualEndLine).toBe(1);
-    expect(result.linesRead).toBe(2);
-  });
-
-  it("should provide correct data for partial read with offset", () => {
-    const result = extractLinesWithByteLimit(simpleContent, 1, 2, 1000);
-
-    expect(result.actualEndLine).toBe(2);
-    expect(result.linesRead).toBe(2);
-  });
-
-  it("should not add newline after last line", () => {
-    const result = extractLinesWithByteLimit("Line 1\nLine 2\nLine 3", 2, 1, 1000);
-
-    expect(result.content).toBe("Line 3"); // No trailing newline
-  });
-
   it("should handle Windows-style line endings", () => {
     const windowsContent = "Line 1\r\nLine 2\r\nLine 3";
-    const result = extractLinesWithByteLimit(windowsContent, 0, 3, 1000);
+    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");
@@ -145,29 +85,18 @@ describe("extractLinesWithByteLimit", () => {
     const largeLine = "x".repeat(1000);
     const largeContent = Array(110).fill(largeLine).join("\n");
 
-    const result = extractLinesWithByteLimit(largeContent, 0, 200, 50000);
+    const result = extractLinesWithByteLimit(largeContent, 50000);
 
     expect(result.wasLimited).toBe(true);
-    expect(result.actualEndLine).toBeLessThan(50); // Should stop well before 200 lines
-  });
-
-  it("should handle line limit of 0", () => {
-    const result = extractLinesWithByteLimit(simpleContent, 0, 0, 1000);
-
-    expect(result.content).toBe("");
-    expect(result.actualEndLine).toBe(0);
-    expect(result.linesRead).toBe(0);
-    expect(result.wasLimited).toBe(false);
   });
 
   it("should allow at least one line even if it exceeds byte limit", () => {
     const veryLongLine = "x".repeat(100000); // 100KB line
-    const result = extractLinesWithByteLimit(veryLongLine, 0, 1, 50000);
+    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.actualEndLine).toBe(0);
     expect(result.linesRead).toBe(1);
     expect(result.wasLimited).toBe(false);
   });

src/tools.ts

@@ -1,10 +1,14 @@
-import {
-  PlanEntry,
-  ToolCallContent,
-  ToolCallLocation,
-  ToolKind,
-} from "@zed-industries/agent-client-protocol";
+import { PlanEntry, ToolCallContent, ToolCallLocation, ToolKind } from "@agentclientprotocol/sdk";
 import { replaceAndCalculateLocation, SYSTEM_REMINDER, toolNames } from "./mcp-server.js";
+import { ToolResultBlockParam, WebSearchToolResultBlockParam } from "@anthropic-ai/sdk/resources";
+import {
+  BetaBashCodeExecutionToolResultBlockParam,
+  BetaCodeExecutionToolResultBlockParam,
+  BetaRequestMCPToolResultBlockParam,
+  BetaTextEditorCodeExecutionToolResultBlockParam,
+  BetaWebFetchToolResultBlockParam,
+  BetaWebSearchToolResultBlockParam,
+} from "@anthropic-ai/sdk/resources/beta.mjs";
 
 interface ToolInfo {
   title: string;
@@ -90,8 +94,8 @@ export function toolInfoFromToolUse(
         content: [],
       };
 
-    case "KillBash":
-    case toolNames.killBash:
+    case "KillShell":
+    case toolNames.killShell:
       return {
         title: "Kill Process",
         kind: "execute",
@@ -107,11 +111,11 @@ export function toolInfoFromToolUse(
         limit = " (from line " + (input.offset + 1) + ")";
       }
       return {
-        title: "Read " + (input.abs_path ?? "File") + limit,
+        title: "Read " + (input.file_path ?? "File") + limit,
         kind: "read",
         locations: [
           {
-            path: input.abs_path,
+            path: input.file_path,
             line: input.offset ?? 0,
           },
         ],
@@ -137,7 +141,7 @@ export function toolInfoFromToolUse(
 
     case toolNames.edit:
     case "Edit": {
-      const path = input?.abs_path ?? input?.file_path;
+      const path = input?.file_path ?? input?.file_path;
       let oldText = input.old_string ?? null;
       let newText = input.new_string ?? "";
       let affectedLines: number[] = [];
@@ -181,66 +185,13 @@ 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.abs_path) {
+      if (input && input.file_path) {
         content = [
           {
             type: "diff",
-            path: input.abs_path,
+            path: input.file_path,
             oldText: null,
             newText: input.content,
           },
@@ -254,10 +205,10 @@ export function toolInfoFromToolUse(
         ];
       }
       return {
-        title: input?.abs_path ? `Write ${input.abs_path}` : "Write",
+        title: input?.file_path ? `Write ${input.file_path}` : "Write",
         kind: "edit",
         content,
-        locations: input?.abs_path ? [{ path: input.abs_path }] : [],
+        locations: input?.file_path ? [{ path: input.file_path }] : [],
       };
     }
 
@@ -393,7 +344,7 @@ export function toolInfoFromToolUse(
 
     case "TodoWrite":
       return {
-        title: input?.todos
+        title: Array.isArray(input?.todos)
           ? `Update TODOs: ${input.todos.map((todo: any) => todo.content).join(", ")}`
           : "Update TODOs",
         kind: "think",
@@ -410,7 +361,13 @@ export function toolInfoFromToolUse(
             : [],
       };
 
-    case "Other":
+    case "Other": {
+      let output;
+      try {
+        output = JSON.stringify(input, null, 2);
+      } catch {
+        output = typeof input === "string" ? input : "{}";
+      }
       return {
         title: name || "Unknown Tool",
         kind: "other",
@@ -419,11 +376,12 @@ export function toolInfoFromToolUse(
             type: "content",
             content: {
               type: "text",
-              text: `\`\`\`json\n${JSON.stringify(input, null, 2) || "{}"}\`\`\``,
+              text: `\`\`\`json\n${output}\`\`\``,
             },
           },
         ],
       };
+    }
 
     default:
       return {
@@ -434,15 +392,16 @@ export function toolInfoFromToolUse(
   }
 }
 
-type ToolResult = {
-  type: "tool_result";
-  content: any;
-  tool_use_id: string;
-  is_error: boolean;
-};
-
 export function toolUpdateFromToolResult(
-  toolResult: ToolResult,
+  toolResult:
+    | ToolResultBlockParam
+    | BetaWebSearchToolResultBlockParam
+    | BetaWebFetchToolResultBlockParam
+    | WebSearchToolResultBlockParam
+    | BetaCodeExecutionToolResultBlockParam
+    | BetaBashCodeExecutionToolResultBlockParam
+    | BetaTextEditorCodeExecutionToolResultBlockParam
+    | BetaRequestMCPToolResultBlockParam,
   toolUse: any | undefined,
 ): ToolUpdate {
   switch (toolUse?.name) {
@@ -480,12 +439,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?.length > 0) {
+      if (
+        "is_error" in toolResult &&
+        toolResult.is_error &&
+        toolResult.content &&
+        toolResult.content.length > 0
+      ) {
         // Only return errors
         return toAcpContentUpdate(toolResult.content, true);
       }
@@ -511,7 +472,10 @@ export function toolUpdateFromToolResult(
     case "WebSearch":
     case "Other":
     default: {
-      return toAcpContentUpdate(toolResult.content, toolResult.is_error);
+      return toAcpContentUpdate(
+        toolResult.content,
+        "is_error" in toolResult ? toolResult.is_error : false,
+      );
     }
   }
 }
@@ -549,7 +513,7 @@ function toAcpContentUpdate(
   return {};
 }
 
-type ClaudePlanEntry = {
+export type ClaudePlanEntry = {
   content: string;
   status: "pending" | "in_progress" | "completed";
   activeForm: string;

src/utils.ts

@@ -76,7 +76,13 @@ export function nodeToWebReadable(nodeStream: Readable): ReadableStream<Uint8Arr
 }
 
 export function unreachable(value: never): never {
-  throw new Error(`Unexpected case: ${value}`);
+  let valueAsString;
+  try {
+    valueAsString = JSON.stringify(value);
+  } catch {
+    valueAsString = value;
+  }
+  throw new Error(`Unexpected case: ${valueAsString}`);
 }
 
 export function sleep(time: number): Promise<void> {
@@ -125,7 +131,6 @@ export function applyEnvironmentSettings(settings: ManagedSettings): void {
 
 export interface ExtractLinesResult {
   content: string;
-  actualEndLine: number;
   wasLimited: boolean;
   linesRead: number;
 }
@@ -134,100 +139,55 @@ export interface ExtractLinesResult {
  * Extracts lines from file content with byte limit enforcement.
  *
  * @param fullContent - The complete file content
- * @param linesToSkip - Starting line number (0-based)
- * @param linesToRead - Maximum number of lines to read
  * @param maxContentLength - Maximum number of UTF-16 Code Units to return
  * @returns Object containing extracted content and metadata
  */
 export function extractLinesWithByteLimit(
   fullContent: string,
-  linesToSkip: number,
-  linesToRead: number,
   maxContentLength: number,
 ): ExtractLinesResult {
-  if (fullContent === "" || linesToRead === 0) {
-    if (linesToSkip === 0 && linesToRead > 0) {
-      return {
-        content: "",
-        actualEndLine: 0,
-        wasLimited: false,
-        linesRead: 1,
-      };
-    } else {
-      return {
-        content: "",
-        actualEndLine: linesToSkip,
-        wasLimited: false,
-        linesRead: 0,
-      };
-    }
+  if (fullContent === "") {
+    return {
+      content: "",
+      wasLimited: false,
+      linesRead: 1,
+    };
   }
 
   let linesSeen = 0;
   let index = 0;
-
-  while (linesSeen < linesToSkip) {
-    const nextIndex = fullContent.indexOf("\n", index);
-
-    // There were not enough lines to skip.
-    if (nextIndex < 0) {
-      return {
-        content: "",
-        actualEndLine: linesToSkip,
-        wasLimited: false,
-        linesRead: 0,
-      };
-    }
-
-    linesSeen += 1;
-    index = nextIndex + 1;
-  }
-
-  // We've successfully skipped over all the lines we were supposed to.
-  // Now we can actually start reading!
-  const startIndex = index;
   linesSeen = 0;
 
   let contentLength = 0;
   let wasLimited = false;
 
-  while (linesSeen < linesToRead) {
+  while (true) {
     const nextIndex = fullContent.indexOf("\n", index);
 
     if (nextIndex < 0) {
       // Last line in file (no trailing newline)
-      const newContentLength = fullContent.length - startIndex;
-      if (linesSeen > 0 && newContentLength > maxContentLength) {
+      if (linesSeen > 0 && fullContent.length > maxContentLength) {
         wasLimited = true;
         break;
       }
       linesSeen += 1;
-      contentLength = newContentLength;
+      contentLength = fullContent.length;
       break;
     } else {
       // Line with newline - include up to the newline
-      const newContentLength = nextIndex + 1 - startIndex;
+      const newContentLength = nextIndex + 1;
       if (linesSeen > 0 && newContentLength > maxContentLength) {
         wasLimited = true;
         break;
       }
       linesSeen += 1;
       contentLength = newContentLength;
-      index = nextIndex + 1;
-    }
-  }
-
-  // If we ended with a newline and we stopped due to byte limit or line limit (not end of file), remove the trailing newline
-  if (contentLength > 0 && fullContent[startIndex + contentLength - 1] === "\n") {
-    // Check if there's more content after our current position that we didn't read
-    if (startIndex + contentLength < fullContent.length) {
-      contentLength -= 1;
+      index = newContentLength;
     }
   }
 
   return {
-    content: fullContent.slice(startIndex, startIndex + contentLength),
-    actualEndLine: linesSeen > 0 ? linesToSkip + linesSeen - 1 : linesToSkip,
+    content: fullContent.slice(0, contentLength),
     wasLimited,
     linesRead: linesSeen,
   };