@agentclientprotocol/claude-agent-acp 0.58.1 → 0.60.0

package/dist/tools.d.ts

@@ -3,7 +3,6 @@ import { HookCallback } from "@anthropic-ai/claude-agent-sdk";
 import { TaskCreateInput, TaskCreateOutput, TaskUpdateInput } from "@anthropic-ai/claude-agent-sdk/sdk-tools.js";
 import { ToolResultBlockParam, WebSearchToolResultBlockParam } from "@anthropic-ai/sdk/resources";
 import { BetaBashCodeExecutionToolResultBlockParam, BetaCodeExecutionToolResultBlockParam, BetaRequestMCPToolResultBlockParam, BetaTextEditorCodeExecutionToolResultBlockParam, BetaToolResultBlockParam, BetaToolSearchToolResultBlockParam, BetaWebFetchToolResultBlockParam, BetaWebSearchToolResultBlockParam } from "@anthropic-ai/sdk/resources/beta.mjs";
-import { Logger } from "./acp-agent.js";
 interface ToolInfo {
     title: string;
     kind: ToolKind;
@@ -35,7 +34,7 @@ interface ToolUpdate {
  */
 export declare function toDisplayPath(filePath: string, cwd?: string): string;
 export declare function toolInfoFromToolUse(toolUse: any, supportsTerminalOutput?: boolean, cwd?: string): ToolInfo;
-export declare function toolUpdateFromToolResult(toolResult: ToolResultBlockParam | BetaToolResultBlockParam | BetaWebSearchToolResultBlockParam | BetaWebFetchToolResultBlockParam | WebSearchToolResultBlockParam | BetaCodeExecutionToolResultBlockParam | BetaBashCodeExecutionToolResultBlockParam | BetaTextEditorCodeExecutionToolResultBlockParam | BetaRequestMCPToolResultBlockParam | BetaToolSearchToolResultBlockParam, toolUse: any | undefined, supportsTerminalOutput?: boolean): ToolUpdate;
+export declare function toolUpdateFromToolResult(toolResult: ToolResultBlockParam | BetaToolResultBlockParam | BetaWebSearchToolResultBlockParam | BetaWebFetchToolResultBlockParam | WebSearchToolResultBlockParam | BetaCodeExecutionToolResultBlockParam | BetaBashCodeExecutionToolResultBlockParam | BetaTextEditorCodeExecutionToolResultBlockParam | BetaRequestMCPToolResultBlockParam | BetaToolSearchToolResultBlockParam, toolUse: any | undefined, supportsTerminalOutput?: boolean, toolUseResult?: unknown): ToolUpdate;
 export type ClaudePlanEntry = {
     content: string;
     status: "pending" | "in_progress" | "completed";
@@ -82,7 +81,7 @@ export declare function toolUpdateFromDiffToolResponse(toolResponse: unknown): {
 export declare const registerHookCallback: (toolUseID: string, { onPostToolUseHook, }: {
     onPostToolUseHook?: (toolUseID: string, toolInput: unknown, toolResponse: unknown) => Promise<void>;
 }) => void;
-export declare const createPostToolUseHook: (logger?: Logger, options?: {
+export declare const createPostToolUseHook: (options?: {
     onEnterPlanMode?: () => Promise<void>;
 }) => HookCallback;
 /**

package/dist/tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../src/tools.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../src/tools.ts"],"names":[],"mappings":"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"}

package/dist/tools.js

@@ -338,7 +338,80 @@ export function toolInfoFromToolUse(toolUse, supportsTerminalOutput = false, cwd
             };
     }
 }
-export function toolUpdateFromToolResult(toolResult, toolUse, supportsTerminalOutput = false) {
+/**
+ * Narrow the untyped message-level `tool_use_result` toward a per-tool Output
+ * shape: rejects everything but a plain non-null object (arrays pass a bare
+ * `typeof === "object"` check, so they're excluded here). The returned value
+ * is only *nominally* typed — it arrives over the wire from arbitrary CLI
+ * versions, so each caller must still guard the specific fields it reads
+ * before trusting them.
+ */
+function structuredResult(toolUseResult) {
+    return toolUseResult !== null &&
+        typeof toolUseResult === "object" &&
+        !Array.isArray(toolUseResult)
+        ? toolUseResult
+        : undefined;
+}
+/**
+ * Strip the model-directed trailer from a raw Agent/Task tool_result text:
+ * a `<usage>…</usage>` totals block and/or an
+ * `agentId: <id> (use SendMessage …)` continuation line at the end of the
+ * text. Both patterns are tail-anchored and independent (older CLIs emit
+ * variants with only one of them), so a format change makes them stop
+ * matching rather than mangle the report.
+ */
+function stripAgentTrailer(text) {
+    return stripAgentIdLine(stripUsageBlock(text));
+}
+const USAGE_OPEN = "<usage>";
+const USAGE_CLOSE = "</usage>";
+/** Remove a trailing `<usage>…</usage>` block, plus trailing whitespace and
+ *  one preceding newline. Matches from the *last* `<usage>` so a report that
+ *  merely mentions the marker earlier isn't truncated at the mention. */
+function stripUsageBlock(text) {
+    const body = text.trimEnd();
+    if (!body.endsWith(USAGE_CLOSE)) {
+        return text;
+    }
+    const open = body.lastIndexOf(USAGE_OPEN, body.length - USAGE_CLOSE.length - USAGE_OPEN.length);
+    if (open === -1) {
+        return text;
+    }
+    return body.slice(0, open > 0 && body[open - 1] === "\n" ? open - 1 : open);
+}
+/** The continuation line, anchored to a whole line so the regex has a single
+ *  start position and no ambiguous repetition (`[\w-]+` can't consume the
+ *  following space, `[^)]*` can't consume the closing paren) — it runs in
+ *  linear time on any input. */
+const AGENT_ID_LINE = /^agentId: [\w-]+ \([^)]*\)$/;
+/** Remove a final `agentId: <id> (…)` line, plus trailing whitespace and the
+ *  newline that preceded the line. */
+function stripAgentIdLine(text) {
+    const body = text.trimEnd();
+    const lineStart = body.lastIndexOf("\n") + 1;
+    if (!AGENT_ID_LINE.test(body.slice(lineStart))) {
+        return text;
+    }
+    return body.slice(0, Math.max(lineStart - 1, 0));
+}
+/** Apply {@link stripAgentTrailer} across a raw tool_result `content` (plain
+ *  string or block array), leaving non-text blocks untouched. */
+function stripAgentTrailerFromContent(content) {
+    if (typeof content === "string") {
+        return stripAgentTrailer(content);
+    }
+    if (Array.isArray(content)) {
+        return content.map((block) => block !== null &&
+            typeof block === "object" &&
+            block.type === "text" &&
+            typeof block.text === "string"
+            ? { ...block, text: stripAgentTrailer(block.text) }
+            : block);
+    }
+    return content;
+}
+export function toolUpdateFromToolResult(toolResult, toolUse, supportsTerminalOutput = false, toolUseResult) {
     if ("is_error" in toolResult &&
         toolResult.is_error &&
         toolResult.content &&
@@ -347,8 +420,57 @@ export function toolUpdateFromToolResult(toolResult, toolUse, supportsTerminalOu
         // Only return errors
         return toAcpContentUpdate(toolResult.content, true);
     }
+    // Shared raw-text fallback: renders the tool_result content the model saw.
+    // The structured cases below fall back to this when `tool_use_result` is
+    // absent or fails its shape guard (older CLIs, replayed sessions).
+    const rawContentUpdate = () => toAcpContentUpdate(toolResult.content, "is_error" in toolResult ? toolResult.is_error : false);
     switch (toolUse?.name) {
-        case "Read":
+        case "Read": {
+            // The raw tool_result text is the model-facing view: line-numbered
+            // content plus any appended <system-reminder> blocks (malicious-code
+            // checks, memory staleness notes, …) that clients shouldn't see. The
+            // structured FileReadOutput carries the clean content — rebuild the
+            // line-numbered view from it. Non-text variants (image/notebook/pdf)
+            // fall back to the raw content blocks, which already render fine.
+            const structuredRead = structuredResult(toolUseResult);
+            if (structuredRead?.type === "text" &&
+                typeof structuredRead.file?.content === "string" &&
+                // An empty file has nothing to line-number; keep the raw view (the
+                // model-facing "file is empty" note) rather than a phantom blank line.
+                structuredRead.file.content.length > 0) {
+                // startLine is typed non-optional but defended anyway; a Read's
+                // `offset` input is the same 1-based starting line, so it beats a
+                // blind 1 when an emitter omits the field.
+                const startLine = structuredRead.file.startLine ??
+                    toolUse.input?.offset ??
+                    1;
+                // A trailing newline is a line terminator, not an extra line — don't
+                // number a phantom empty line after it.
+                let numbered = structuredRead.file.content
+                    .replace(/\n$/, "")
+                    .split("\n")
+                    .map((line, i) => `${startLine + i}\t${line}`)
+                    .join("\n");
+                // The model-facing truncation banner doesn't survive reconstruction
+                // from file.content (the SDK flag exists for exactly this case) —
+                // re-establish it so a partial first page doesn't read as the whole
+                // file.
+                if (structuredRead.file.truncatedByTokenCap) {
+                    const { numLines, totalLines } = structuredRead.file;
+                    const detail = typeof numLines === "number" && typeof totalLines === "number"
+                        ? `: showing ${numLines} of ${totalLines} lines`
+                        : "";
+                    numbered += `\n[File truncated${detail}]`;
+                }
+                return {
+                    content: [
+                        {
+                            type: "content",
+                            content: { type: "text", text: markdownEscape(numbered) },
+                        },
+                    ],
+                };
+            }
             if (Array.isArray(toolResult.content) && toolResult.content.length > 0) {
                 return {
                     content: toolResult.content.map((content) => ({
@@ -376,19 +498,60 @@ export function toolUpdateFromToolResult(toolResult, toolUse, supportsTerminalOu
                 };
             }
             return {};
+        }
         case "Bash": {
             const result = toolResult.content;
             const terminalId = "tool_use_id" in toolResult ? String(toolResult.tool_use_id) : "";
             const isError = "is_error" in toolResult && toolResult.is_error;
             // Extract output and exit code from either format:
-            // 1. BetaBashCodeExecutionResultBlock: { type: "bash_code_execution_result", stdout, stderr, return_code }
-            // 2. Plain string content from a regular tool_result
-            // 3. Array content (e.g. [{ type: "text", text: "..." }] for stdout,
+            // 1. The structured BashOutput (message-level tool_use_result): its
+            //    stdout/stderr exclude the model-directed suffixes the raw text
+            //    carries (stale-read hints, gh rate-limit hints, the
+            //    persisted-output wrapper for too-large outputs — the interruption
+            //    and truncation facts those carried are re-established from the
+            //    structured flags below). Skipped for image output (the raw content
+            //    array carries the actual image blocks) and backgrounded commands
+            //    (the raw text carries the background-task notice; structured
+            //    stdout may be empty).
+            // 2. BetaBashCodeExecutionResultBlock: { type: "bash_code_execution_result", stdout, stderr, return_code }
+            // 3. Plain string content from a regular tool_result
+            // 4. Array content (e.g. [{ type: "text", text: "..." }] for stdout,
             //    or [{ type: "image", source: {...} }] when the local Bash tool
             //    produces an image, e.g. piping a base64 data URI)
             let output = "";
             let exitCode = isError ? 1 : 0;
-            if (result &&
+            const structuredBash = structuredResult(toolUseResult);
+            if (structuredBash &&
+                typeof structuredBash.stdout === "string" &&
+                typeof structuredBash.stderr === "string" &&
+                !structuredBash.isImage &&
+                structuredBash.backgroundTaskId === undefined) {
+                output = [structuredBash.stdout, structuredBash.stderr].filter(Boolean).join("\n");
+                // Two raw-text notices don't survive the structured stdout/stderr —
+                // re-establish them so the client isn't shown a clean-looking result:
+                // the CLI appends its abort marker only to the model-facing text, and
+                // an aborted command isn't a success, so synthesize a failing exit
+                // code when the result wasn't already an error.
+                if (structuredBash.interrupted) {
+                    output = [output, "[Command was aborted before completion]"].filter(Boolean).join("\n");
+                    exitCode = 1;
+                }
+                // Structured stdout is clipped (~30k chars) when the full output was
+                // persisted to disk; without this note the clip is silent and the
+                // path to the full output is lost.
+                if (typeof structuredBash.persistedOutputPath === "string") {
+                    const size = typeof structuredBash.persistedOutputSize === "number"
+                        ? ` (${structuredBash.persistedOutputSize} bytes total)`
+                        : "";
+                    output = [
+                        output,
+                        `[Output truncated${size}: full output saved to ${structuredBash.persistedOutputPath}]`,
+                    ]
+                        .filter(Boolean)
+                        .join("\n");
+                }
+            }
+            else if (result &&
                 typeof result === "object" &&
                 "type" in result &&
                 result.type === "bash_code_execution_result") {
@@ -448,6 +611,36 @@ export function toolUpdateFromToolResult(toolResult, toolUse, supportsTerminalOu
             }
             return {};
         }
+        case "Agent":
+        case "Task": {
+            // The raw tool_result text ends with a model-directed trailer (an
+            // `agentId: … (use SendMessage …)` line plus a `<usage>` totals block)
+            // that ACP clients shouldn't see. The message-level `tool_use_result`
+            // carries the structured AgentOutput whose `content` is the subagent's
+            // report without the trailer — render from it when present (per the SDK
+            // 0.3.207 guidance) and fall back to the raw text otherwise (older CLIs,
+            // replayed sessions).
+            // Narrowed to the full union, not the completed variant — the status
+            // check below is what discriminates it, and pre-narrowing would let
+            // future field reads typecheck against a variant the runtime value may
+            // not be.
+            const structured = structuredResult(toolUseResult);
+            if (structured?.status === "completed" &&
+                Array.isArray(structured.content) &&
+                // A completed subagent can end with zero text blocks; an empty
+                // structured render would beat the raw fallback for no benefit.
+                structured.content.length > 0) {
+                return toAcpContentUpdate(structured.content, "is_error" in toolResult ? toolResult.is_error : false);
+            }
+            // No structured report to render from (replayed sessions —
+            // getSessionMessages doesn't expose the transcript's toolUseResult —
+            // and older CLIs). The SDK advises rendering from tool_use_result
+            // instead of parsing the text, but with no structured value the
+            // tail-anchored strip is the only cleanup available; if the trailer
+            // format changes it simply stops matching and the full raw text
+            // renders, no worse than before.
+            return toAcpContentUpdate(stripAgentTrailerFromContent(toolResult.content), "is_error" in toolResult ? toolResult.is_error : false);
+        }
         case "Edit": // Edit is handled in hooks
         case "Write": {
             return {};
@@ -455,11 +648,47 @@ export function toolUpdateFromToolResult(toolResult, toolUse, supportsTerminalOu
         case "ExitPlanMode": {
             return { title: "Exited Plan Mode" };
         }
+        case "WebSearch": {
+            // The raw tool_result text is a model-directed dump ("Web search
+            // results for query: …\n\nLinks: [{…json…}]"). The structured
+            // WebSearchOutput carries the hits — render them the way server-side
+            // web_search_result blocks render ("Title (url)").
+            const structuredSearch = structuredResult(toolUseResult);
+            if (structuredSearch && Array.isArray(structuredSearch.results)) {
+                const lines = structuredSearch.results.flatMap((entry) => typeof entry === "string"
+                    ? [entry]
+                    : Array.isArray(entry?.content)
+                        ? // tool_use_result arrives untyped across CLI version skew —
+                            // skip off-spec hits rather than rendering
+                            // "undefined (undefined)" lines.
+                            entry.content.flatMap((hit) => typeof hit?.title === "string" && typeof hit?.url === "string"
+                                ? [formatWebSearchHit(hit)]
+                                : [])
+                        : []);
+                if (lines.length > 0) {
+                    return {
+                        content: [
+                            {
+                                type: "content",
+                                content: { type: "text", text: lines.join("\n") },
+                            },
+                        ],
+                    };
+                }
+            }
+            return rawContentUpdate();
+        }
         default: {
-            return toAcpContentUpdate(toolResult.content, "is_error" in toolResult ? toolResult.is_error : false);
+            return rawContentUpdate();
         }
     }
 }
+/** One display format for a web-search hit, shared by the structured
+ *  WebSearchOutput render and the server-side `web_search_result` block so
+ *  the two paths can't drift. */
+function formatWebSearchHit(hit) {
+    return `${hit.title} (${hit.url})`;
+}
 function toAcpContentUpdate(content, isError = false) {
     if (Array.isArray(content) && content.length > 0) {
         return {
@@ -524,7 +753,7 @@ function toAcpContentBlock(content, isError) {
         case "tool_search_tool_result_error":
             return wrapText(`Error: ${content.error_code}${content.error_message ? ` - ${content.error_message}` : ""}`);
         case "web_search_result":
-            return wrapText(`${content.title} (${content.url})`);
+            return wrapText(formatWebSearchHit(content));
         case "web_search_tool_result_error":
             return wrapText(`Error: ${content.error_code}`);
         case "web_fetch_result":
@@ -698,7 +927,7 @@ export const registerHookCallback = (toolUseID, { onPostToolUseHook, }) => {
     };
 };
 /* A callback for Claude Code that is called when receiving a PostToolUse hook */
-export const createPostToolUseHook = (logger = console, options) => async (input, toolUseID) => {
+export const createPostToolUseHook = (options) => async (input, toolUseID) => {
     if (input.hook_event_name === "PostToolUse") {
         // Handle EnterPlanMode tool - notify client of mode change after successful execution
         if (input.tool_name === "EnterPlanMode" && options?.onEnterPlanMode) {
@@ -708,12 +937,8 @@ export const createPostToolUseHook = (logger = console, options) => async (input
             const onPostToolUseHook = toolUseCallbacks[toolUseID]?.onPostToolUseHook;
             if (onPostToolUseHook) {
                 await onPostToolUseHook(toolUseID, input.tool_input, input.tool_response);
-                delete toolUseCallbacks[toolUseID]; // Cleanup after execution
-            }
-            else {
-                logger.error(`No onPostToolUseHook found for tool use ID: ${toolUseID}`);
-                delete toolUseCallbacks[toolUseID];
             }
+            delete toolUseCallbacks[toolUseID]; // Cleanup after execution
         }
     }
     return { continue: true };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.58.1",
+  "version": "0.60.0",
   "description": "An ACP-compatible coding agent powered by the Claude Agent SDK (TypeScript)",
   "main": "dist/lib.js",
   "types": "dist/lib.d.ts",
@@ -64,20 +64,20 @@
   },
   "dependencies": {
     "@agentclientprotocol/sdk": "1.2.1",
-    "@anthropic-ai/claude-agent-sdk": "0.3.205",
+    "@anthropic-ai/claude-agent-sdk": "0.3.215",
     "zod": "^3.25.0 || ^4.0.0"
   },
   "devDependencies": {
-    "@anthropic-ai/sdk": "0.110.0",
+    "@anthropic-ai/sdk": "0.112.3",
     "@eslint/js": "10.0.1",
     "@tsconfig/node22": "22.0.5",
     "@types/node": "26.1.1",
-    "@typescript-eslint/eslint-plugin": "8.63.0",
-    "@typescript-eslint/parser": "8.63.0",
-    "eslint": "10.6.0",
+    "@typescript-eslint/eslint-plugin": "8.64.0",
+    "@typescript-eslint/parser": "8.64.0",
+    "eslint": "10.7.0",
     "eslint-config-prettier": "10.1.8",
     "globals": "17.7.0",
-    "prettier": "3.9.4",
+    "prettier": "3.9.5",
     "ts-node": "10.9.2",
     "typescript": "6.0.3",
     "vitest": "4.1.10"