Fix for invalid plan input in the model

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

Closes #109

.github/workflows/publish.yml

@@ -4,7 +4,7 @@ on:
     tags:
       - "v*.*.*"
 jobs:
-  publish-npm:
+  build:
     runs-on: ubuntu-latest
     environment: release # Optional: for enhanced security
     permissions:
@@ -22,15 +22,3 @@ jobs:
       - run: npm ci
       - run: npm run build
       - run: npm publish
-  release:
-    runs-on: ubuntu-latest
-    needs: [publish-npm]
-    permissions:
-      contents: write
-    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
-      - name: Create Release
-        id: create_release
-        uses: softprops/action-gh-release@6da8fa9354ddfdc4aeace5fc48d7f679b5214090
-        with:
-          draft: true

CHANGELOG.md

@@ -1,28 +1,5 @@
 # Changelog
 
-## 0.7.0
-
-- Allow importing from this package as a library in addition to running it as a CLI. Allows for easier integration into existing node applications.
-- Update to @anthropic-ai/claude-agent-sdk@v0.1.27
-
-## 0.6.10
-
-- Provide `agentInfo` on initialization response.
-- Update to @agentclientprotocol/sdk@0.5.1
-- Fix crash when receiving a hook_response event
-- Fix for invalid locations when read call has no path
-
-## 0.6.9
-
-- Update to @anthropic-ai/claude-agent-sdk@v0.1.26
-- Update to @agentclientprotocol/sdk@0.5.0
-
-## 0.6.8
-
-- Fix for duplicate tokens appearing in thread with streaming enabled
-- Update to @anthropic-ai/claude-agent-sdk@v0.1.23
-- Update to @agentclientprotocol/sdk@0.4.9
-
 ## 0.6.7
 
 - Fix for invalid plan input from the model introduced in latest agent-sdk

package.json

@@ -4,9 +4,9 @@
     "access": "public"
   },
   "bin": {
-    "claude-code-acp": "./dist/cli.js"
+    "claude-code-acp": "./dist/index.js"
   },
-  "version": "0.7.0",
+  "version": "0.6.7",
   "description": "An ACP-compatible coding agent powered by the Claude Code SDK (TypeScript)",
   "main": "dist/index.js",
   "type": "module",
@@ -18,7 +18,7 @@
   ],
   "scripts": {
     "build": "tsc",
-    "start": "node dist/cli.js",
+    "start": "node dist/index.js",
     "dev": "npm run build && npm run start",
     "lint": "eslint src --ext .ts",
     "lint:fix": "eslint src --ext .ts --fix",
@@ -51,30 +51,30 @@
   "author": "Zed Industries",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agentclientprotocol/sdk": "0.5.1",
-    "@anthropic-ai/claude-agent-sdk": "0.1.27",
-    "@anthropic-ai/claude-code": "2.0.27",
-    "@modelcontextprotocol/sdk": "1.20.2",
+    "@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.4",
+    "@anthropic-ai/sdk": "^0.67.0",
+    "@types/express": "5.0.3",
     "@types/minimist": "1.2.5",
-    "@types/node": "24.9.1",
+    "@types/node": "24.8.1",
     "@types/uuid": "10.0.0",
-    "@typescript-eslint/eslint-plugin": "8.46.2",
-    "@typescript-eslint/parser": "8.46.2",
-    "@vitest/ui": "4.0.3",
-    "eslint": "9.38.0",
+    "@typescript-eslint/eslint-plugin": "8.46.1",
+    "@typescript-eslint/parser": "8.46.1",
+    "@vitest/ui": "3.2.4",
+    "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.3",
-    "vitest": "4.0.3"
+    "vitest": "3.2.4"
   }
 }

src/acp-agent.ts

@@ -55,7 +55,6 @@ import {
 } from "./tools.js";
 import { ContentBlockParam } from "@anthropic-ai/sdk/resources";
 import { BetaContentBlock, BetaRawContentBlockDelta } from "@anthropic-ai/sdk/resources/beta.mjs";
-import packageJson from "../package.json" with { type: "json" };
 
 type Session = {
   query: Query;
@@ -111,6 +110,7 @@ export class ClaudeAcpAgent implements Agent {
     this.clientCapabilities = request.clientCapabilities;
     return {
       protocolVersion: 1,
+      // todo!()
       agentCapabilities: {
         promptCapabilities: {
           image: true,
@@ -121,11 +121,6 @@ export class ClaudeAcpAgent implements Agent {
           sse: true,
         },
       },
-      agentInfo: {
-        name: packageJson.name,
-        title: "Claude Code",
-        version: packageJson.version,
-      },
       authMethods: [
         {
           description: "Run `claude /login` in the terminal",
@@ -210,10 +205,9 @@ export class ClaudeAcpAgent implements Agent {
       mcpServers,
       systemPrompt,
       settingSources: ["user", "project", "local"],
-      // If we want bypassPermissions to be an option, we have to allow it here.
-      // But it doesn't work in root mode, so we only activate it if it will work.
-      allowDangerouslySkipPermissions: !IS_ROOT,
-      permissionMode,
+      // 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
@@ -259,6 +253,10 @@ export class ClaudeAcpAgent implements Agent {
 
     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(() => {
@@ -336,11 +334,8 @@ export class ClaudeAcpAgent implements Agent {
               break;
             case "compact_boundary":
               break;
-            case "hook_response":
-              // Todo: process via status api: https://docs.claude.com/en/docs/claude-code/hooks#hook-output
-              break;
             default:
-              unreachable(message);
+              unreachable(message as never);
           }
           break;
         case "result": {
@@ -432,7 +427,7 @@ export class ClaudeAcpAgent implements Agent {
           break;
         }
         default:
-          unreachable(message);
+          unreachable(message as never);
       }
     }
     throw new Error("Session did not end in result");
@@ -799,6 +794,14 @@ export function streamEventToAcpNotifications(
 ): 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],
@@ -815,11 +818,10 @@ export function streamEventToAcpNotifications(
         toolUseCache,
         fileContentCache,
       );
-    // No content
-    case "message_start":
     case "message_delta":
     case "message_stop":
     case "content_block_stop":
+      // do we need stop reason?
       return [];
 
     default:

src/cli.ts

@@ -1,26 +0,0 @@
-#!/usr/bin/env node
-
-// Load managed settings and apply environment variables
-import { loadManagedSettings, applyEnvironmentSettings } from "./utils.js";
-
-const managedSettings = loadManagedSettings();
-if (managedSettings) {
-  applyEnvironmentSettings(managedSettings);
-}
-
-// stdout is used to send messages to the client
-// we redirect everything else to stderr to make sure it doesn't interfere with ACP
-console.log = console.error;
-console.info = console.error;
-console.warn = console.error;
-console.debug = console.error;
-
-process.on("unhandledRejection", (reason, promise) => {
-  console.error("Unhandled Rejection at:", promise, "reason:", reason);
-});
-
-import { runAcp } from "./acp-agent.js";
-runAcp();
-
-// Keep process alive
-process.stdin.resume();

src/index.ts

@@ -1,25 +1,26 @@
-// Export the main agent class and utilities for library usage
-export {
-  ClaudeAcpAgent,
-  runAcp,
-  toAcpNotifications,
-  streamEventToAcpNotifications,
-} from "./acp-agent.js";
-export {
-  loadManagedSettings,
-  applyEnvironmentSettings,
-  nodeToWebReadable,
-  nodeToWebWritable,
-  Pushable,
-  unreachable,
-} from "./utils.js";
-export {
-  createMcpServer,
-  createPermissionMcpServer,
-  PERMISSION_TOOL_NAME,
-  toolNames,
-} from "./mcp-server.js";
-export { toolInfoFromToolUse, planEntries, toolUpdateFromToolResult } from "./tools.js";
+#!/usr/bin/env node
 
-// Export types
-export type { ClaudePlanEntry } from "./tools.js";
+// Load managed settings and apply environment variables
+import { loadManagedSettings, applyEnvironmentSettings } from "./utils.js";
+
+const managedSettings = loadManagedSettings();
+if (managedSettings) {
+  applyEnvironmentSettings(managedSettings);
+}
+
+// stdout is used to send messages to the client
+// we redirect everything else to stderr to make sure it doesn't interfere with ACP
+console.log = console.error;
+console.info = console.error;
+console.warn = console.error;
+console.debug = console.error;
+
+process.on("unhandledRejection", (reason, promise) => {
+  console.error("Unhandled Rejection at:", promise, "reason:", reason);
+});
+
+import { runAcp as runAcp } from "./acp-agent.js";
+runAcp();
+
+// Keep process alive
+process.stdin.resume();

src/tools.ts

@@ -113,14 +113,12 @@ export function toolInfoFromToolUse(
       return {
         title: "Read " + (input.file_path ?? "File") + limit,
         kind: "read",
-        locations: input.file_path
-          ? [
-              {
-                path: input.file_path,
-                line: input.offset ?? 0,
-              },
-            ]
-          : [],
+        locations: [
+          {
+            path: input.file_path,
+            line: input.offset ?? 0,
+          },
+        ],
         content: [],
       };
     }