@agentclientprotocol/claude-agent-acp 0.81.3-preview.1 → 0.81.3-preview.2

package/dist/tool-calls/reporters/interaction.d.ts

@@ -0,0 +1,71 @@
+import type { ToolReporter, ToolResultContext, ToolResultFacts, ToolUseContext, ToolUseFacts } from "../facts.js";
+/**
+ * ExitPlanMode: the plan is input that the user approves.
+ *
+ * Claude writes the plan to a file under `plansDirectory` while it drafts it.
+ * The CLI adds the file text as `plan` and the file path as `planFilePath` to
+ * the complete input. A `planFile` client gets the path and reads the plan
+ * from the file. Without the file, it gets the plan text like other clients.
+ */
+export declare class ExitPlanModeReporter implements ToolReporter {
+    toolUse(input: unknown, { capabilities }: ToolUseContext): ToolUseFacts;
+    /** The approval text repeats the plan, which the input holds. */
+    toolResult(context: ToolResultContext): ToolResultFacts;
+    /**
+     * The rejection reason has no display form. Claude fences it, so unfence it.
+     * A client that is not AIR gets the error text as the result to show.
+     */
+    errorResult(context: ToolResultContext): ToolResultFacts | undefined;
+}
+/** AskUserQuestion: the questions are input that the user reads. */
+export declare class AskUserQuestionReporter implements ToolReporter {
+    /**
+     * AIR gets a fixed title, because the question is input. Every other client
+     * gets the question of a single question as the title, like upstream.
+     */
+    toolUse(input: unknown, { capabilities }: ToolUseContext): ToolUseFacts;
+}
+/** Skill: the skill name is the label. The result is a confirmation. */
+export declare class SkillReporter implements ToolReporter {
+    toolUse(input: unknown): ToolUseFacts;
+    toolResult(): ToolResultFacts;
+}
+/**
+ * TodoWrite and the Task* tools. The stream reports them as a plan. Only a
+ * permission request surfaces them as a tool call.
+ */
+export declare class PlanToolReporter implements ToolReporter {
+    private readonly toolName;
+    constructor(toolName: string);
+    toolUse(input: unknown): ToolUseFacts;
+}
+/** ReportFindings: the findings are input that the user reads. */
+export declare class ReportFindingsReporter implements ToolReporter {
+    toolUse(input: unknown): ToolUseFacts;
+}
+/** Every other tool, MCP tools too: the result text is the result to show. */
+export declare class GenericReporter implements ToolReporter {
+    private readonly toolName;
+    constructor(toolName: string);
+    toolUse(input: unknown): ToolUseFacts;
+}
+/**
+ * An agent control tool (SendMessage, TaskStop, ListAgents, Monitor). AIR
+ * shows the result in its own frame and parses the JSON result of SendMessage
+ * and TaskStop. So AIR gets the error text as plain text, without a fence.
+ * A client that is not AIR gets the fenced error text.
+ */
+export declare class AgentControlReporter extends GenericReporter {
+    errorResult({ result, capabilities }: ToolResultContext): ToolResultFacts | undefined;
+}
+/**
+ * Absolute path of a skill's `SKILL.md`, or `undefined` when none of the known layouts holds one.
+ *
+ * The `Skill` tool reports only the skill's name, so the file has to be located by probing the layouts skills
+ * actually use: project- and user-level `.claude/skills` (plus this repo's `.agents/skills` source of truth), and
+ * for a `<prefix>:<name>` spelling either a plugin (`.claude/plugins/<prefix>/skills/<name>`) or a
+ * directory-scoped skill (`<prefix>/.claude/skills/<name>`), which share that spelling. Only a path that exists
+ * on disk is returned, so a wrong guess costs nothing and clients never render a link to a missing file.
+ */
+export declare function resolveSkillPath(skillName: string, cwd?: string): string | undefined;
+//# sourceMappingURL=interaction.d.ts.map

package/dist/tool-calls/reporters/interaction.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"interaction.d.ts","sourceRoot":"","sources":["../../../src/tool-calls/reporters/interaction.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EACV,YAAY,EACZ,iBAAiB,EACjB,eAAe,EACf,cAAc,EACd,YAAY,EACb,MAAM,aAAa,CAAC;AAErB;;;;;;;GAOG;AACH,qBAAa,oBAAqB,YAAW,YAAY;IACvD,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,YAAY,EAAE,EAAE,cAAc,GAAG,YAAY;IAYvE,iEAAiE;IACjE,UAAU,CAAC,OAAO,EAAE,iBAAiB,GAAG,eAAe;IASvD;;;OAGG;IACH,WAAW,CAAC,OAAO,EAAE,iBAAiB,GAAG,eAAe,GAAG,SAAS;CASrE;AAqBD,oEAAoE;AACpE,qBAAa,uBAAwB,YAAW,YAAY;IAC1D;;;OAGG;IACH,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,YAAY,EAAE,EAAE,cAAc,GAAG,YAAY;CAgBxE;AAED,wEAAwE;AACxE,qBAAa,aAAc,YAAW,YAAY;IAChD,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,YAAY;IAKrC,UAAU,IAAI,eAAe;CAG9B;AAED;;;GAGG;AACH,qBAAa,gBAAiB,YAAW,YAAY;IACvC,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAR,QAAQ,EAAE,MAAM;IAE7C,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,YAAY;CAyBtC;AAED,kEAAkE;AAClE,qBAAa,sBAAuB,YAAW,YAAY;IACzD,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,YAAY;CAmBtC;AAED,8EAA8E;AAC9E,qBAAa,eAAgB,YAAW,YAAY;IACtC,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAR,QAAQ,EAAE,MAAM;IAE7C,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,YAAY;CAgBtC;AAED;;;;;GAKG;AACH,qBAAa,oBAAqB,SAAQ,eAAe;IACvD,WAAW,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,iBAAiB,GAAG,eAAe,GAAG,SAAS;CAGtF;AAKD;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAwBpF"}

package/dist/tool-calls/reporters/interaction.js

@@ -0,0 +1,222 @@
+import { existsSync, statSync } from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import { exitPlanModeRawOutput } from "../../exit-plan.js";
+import { textContent, toAcpContentUpdate } from "../content.js";
+/**
+ * ExitPlanMode: the plan is input that the user approves.
+ *
+ * Claude writes the plan to a file under `plansDirectory` while it drafts it.
+ * The CLI adds the file text as `plan` and the file path as `planFilePath` to
+ * the complete input. A `planFile` client gets the path and reads the plan
+ * from the file. Without the file, it gets the plan text like other clients.
+ */
+export class ExitPlanModeReporter {
+    toolUse(input, { capabilities }) {
+        const plan = input?.plan;
+        const planFilePath = capabilities.air.planFile
+            ? existingPlanFile(input?.planFilePath)
+            : undefined;
+        return {
+            title: "Approve Plan",
+            kind: "switch_mode",
+            ...(planFilePath ? { planFilePath } : plan ? { display: [textContent(plan)] } : {}),
+        };
+    }
+    /** The approval text repeats the plan, which the input holds. */
+    toolResult(context) {
+        const planFilePath = resultPlanFile(context);
+        return {
+            title: "Exited Plan Mode",
+            rawOutput: undefined,
+            ...(planFilePath ? { planFilePath, planFileReleased: true } : {}),
+        };
+    }
+    /**
+     * The rejection reason has no display form. Claude fences it, so unfence it.
+     * A client that is not AIR gets the error text as the result to show.
+     */
+    errorResult(context) {
+        const { toolUse, result, capabilities } = context;
+        if (!capabilities.air.client)
+            return undefined;
+        const planFilePath = resultPlanFile(context);
+        return {
+            rawOutput: exitPlanModeRawOutput(toolUse.name, result.content),
+            ...(planFilePath ? { planFilePath } : {}),
+        };
+    }
+}
+/** The plan file of a result: the path of the input, else the `filePath` of the structured result. */
+function resultPlanFile({ toolUse, structured, capabilities }) {
+    if (!capabilities.air.planFile)
+        return undefined;
+    return (existingPlanFile(toolUse.input?.planFilePath) ??
+        existingPlanFile(structured?.filePath));
+}
+/** The path when it is an absolute path of a regular file, else undefined. */
+function existingPlanFile(value) {
+    if (typeof value !== "string" || !path.isAbsolute(value))
+        return undefined;
+    try {
+        return statSync(value).isFile() ? value : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+/** AskUserQuestion: the questions are input that the user reads. */
+export class AskUserQuestionReporter {
+    /**
+     * AIR gets a fixed title, because the question is input. Every other client
+     * gets the question of a single question as the title, like upstream.
+     */
+    toolUse(input, { capabilities }) {
+        const ask = input;
+        const questions = Array.isArray(ask?.questions) ? ask.questions : [];
+        const display = questions
+            .filter((q) => typeof q?.question === "string")
+            .map((q) => textContent(q.question));
+        const single = !capabilities.air.client && questions.length === 1 && questions[0]?.question
+            ? questions[0].question
+            : undefined;
+        return {
+            title: single ?? "Asking for your input",
+            kind: "other",
+            ...(display.length > 0 ? { display } : {}),
+        };
+    }
+}
+/** Skill: the skill name is the label. The result is a confirmation. */
+export class SkillReporter {
+    toolUse(input) {
+        const skill = input?.skill;
+        return { title: skill ? `Load skill: ${skill}` : "Load skill", kind: "other" };
+    }
+    toolResult() {
+        return {};
+    }
+}
+/**
+ * TodoWrite and the Task* tools. The stream reports them as a plan. Only a
+ * permission request surfaces them as a tool call.
+ */
+export class PlanToolReporter {
+    toolName;
+    constructor(toolName) {
+        this.toolName = toolName;
+    }
+    toolUse(input) {
+        switch (this.toolName) {
+            case "TodoWrite": {
+                const todos = input?.todos;
+                return {
+                    title: Array.isArray(todos)
+                        ? `Update TODOs: ${todos.map((todo) => todo.content).join(", ")}`
+                        : "Update TODOs",
+                    kind: "think",
+                };
+            }
+            case "TaskCreate": {
+                const subject = input?.subject;
+                return { title: subject ? `Create task: ${subject}` : "Create task", kind: "think" };
+            }
+            case "TaskUpdate": {
+                const subject = input?.subject;
+                return { title: subject ? `Update task: ${subject}` : "Update task", kind: "think" };
+            }
+            case "TaskList":
+                return { title: "List tasks", kind: "think" };
+            default:
+                return { title: "Get task", kind: "think" };
+        }
+    }
+}
+/** ReportFindings: the findings are input that the user reads. */
+export class ReportFindingsReporter {
+    toolUse(input) {
+        const findings = input?.findings ?? [];
+        return {
+            title: findings.length === 0
+                ? "Report findings: none found"
+                : `Report ${findings.length} finding${findings.length === 1 ? "" : "s"}`,
+            kind: "think",
+            ...(findings.length > 0
+                ? {
+                    display: findings.map((finding) => textContent(`**${finding.file}${finding.line ? `:${finding.line}` : ""}** — ${finding.summary}`)),
+                }
+                : {}),
+        };
+    }
+}
+/** Every other tool, MCP tools too: the result text is the result to show. */
+export class GenericReporter {
+    toolName;
+    constructor(toolName) {
+        this.toolName = toolName;
+    }
+    toolUse(input) {
+        if (this.toolName !== "Other") {
+            return { title: this.toolName || "Unknown Tool", kind: "other" };
+        }
+        let json;
+        try {
+            json = JSON.stringify(input, null, 2);
+        }
+        catch {
+            json = typeof input === "string" ? input : "{}";
+        }
+        return {
+            title: this.toolName,
+            kind: "other",
+            display: [textContent(`\`\`\`json\n${json}\`\`\``)],
+        };
+    }
+}
+/**
+ * An agent control tool (SendMessage, TaskStop, ListAgents, Monitor). AIR
+ * shows the result in its own frame and parses the JSON result of SendMessage
+ * and TaskStop. So AIR gets the error text as plain text, without a fence.
+ * A client that is not AIR gets the fenced error text.
+ */
+export class AgentControlReporter extends GenericReporter {
+    errorResult({ result, capabilities }) {
+        return capabilities.air.client ? toAcpContentUpdate(result.content, false) : undefined;
+    }
+}
+/** Roots a skill's directory may sit under, relative to the directory the scope resolves to. */
+const SKILL_CONTAINER_DIRS = [".claude/skills", ".agents/skills"];
+/**
+ * Absolute path of a skill's `SKILL.md`, or `undefined` when none of the known layouts holds one.
+ *
+ * The `Skill` tool reports only the skill's name, so the file has to be located by probing the layouts skills
+ * actually use: project- and user-level `.claude/skills` (plus this repo's `.agents/skills` source of truth), and
+ * for a `<prefix>:<name>` spelling either a plugin (`.claude/plugins/<prefix>/skills/<name>`) or a
+ * directory-scoped skill (`<prefix>/.claude/skills/<name>`), which share that spelling. Only a path that exists
+ * on disk is returned, so a wrong guess costs nothing and clients never render a link to a missing file.
+ */
+export function resolveSkillPath(skillName, cwd) {
+    if (!cwd) {
+        return undefined;
+    }
+    const colon = skillName.indexOf(":");
+    const scope = colon < 0 ? undefined : skillName.slice(0, colon);
+    const name = colon < 0 ? skillName : skillName.slice(colon + 1);
+    if (!name) {
+        return undefined;
+    }
+    const candidates = [];
+    const addCandidates = (base) => {
+        for (const container of SKILL_CONTAINER_DIRS) {
+            candidates.push(path.join(base, container, name, "SKILL.md"));
+        }
+    };
+    if (scope) {
+        // A `<prefix>:<name>` skill is either directory-scoped or a plugin's; both spellings look identical.
+        addCandidates(path.join(cwd, scope));
+        candidates.push(path.join(cwd, ".claude/plugins", scope, "skills", name, "SKILL.md"));
+    }
+    addCandidates(cwd);
+    addCandidates(os.homedir());
+    return candidates.find((candidate) => existsSync(candidate));
+}

package/dist/tool-calls/reporters/read.d.ts

@@ -0,0 +1,7 @@
+import type { ToolReporter, ToolResultContext, ToolResultFacts, ToolUseContext, ToolUseFacts } from "../facts.js";
+/** Read: the file text is the result to show. */
+export declare class ReadReporter implements ToolReporter {
+    toolUse(input: unknown, { cwd }: ToolUseContext): ToolUseFacts;
+    toolResult({ toolUse, result, structured }: ToolResultContext): ToolResultFacts;
+}
+//# sourceMappingURL=read.d.ts.map

package/dist/tool-calls/reporters/read.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"read.d.ts","sourceRoot":"","sources":["../../../src/tool-calls/reporters/read.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EACV,YAAY,EACZ,iBAAiB,EACjB,eAAe,EACf,cAAc,EACd,YAAY,EACb,MAAM,aAAa,CAAC;AAErB,iDAAiD;AACjD,qBAAa,YAAa,YAAW,YAAY;IAC/C,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,EAAE,cAAc,GAAG,YAAY;IAgB9D,UAAU,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,iBAAiB,GAAG,eAAe;CAiDhF"}

package/dist/tool-calls/reporters/read.js

@@ -0,0 +1,64 @@
+import { markdownEscape, structuredResult, textContent, toAcpContentBlock, toDisplayPath, } from "../content.js";
+/** Read: the file text is the result to show. */
+export class ReadReporter {
+    toolUse(input, { cwd }) {
+        const read = input;
+        let limit = "";
+        if (read?.limit && read.limit > 0) {
+            limit = " (" + (read.offset ?? 1) + " - " + ((read.offset ?? 1) + read.limit - 1) + ")";
+        }
+        else if (read?.offset) {
+            limit = " (from line " + read.offset + ")";
+        }
+        const displayPath = read?.file_path ? toDisplayPath(read.file_path, cwd) : "File";
+        return {
+            title: "Read " + displayPath + limit,
+            kind: "read",
+            locations: read?.file_path ? [{ path: read.file_path, line: read.offset ?? 1 }] : [],
+        };
+    }
+    toolResult({ toolUse, result, structured }) {
+        // The raw tool_result text is the model-facing view: line-numbered content
+        // plus appended <system-reminder> blocks that clients must not see. The
+        // structured FileReadOutput carries the clean content, so rebuild the
+        // line-numbered view from it. Image, notebook, and PDF variants use the
+        // raw content blocks, which already render.
+        const structuredRead = structuredResult(structured);
+        if (structuredRead?.type === "text" &&
+            typeof structuredRead.file?.content === "string" &&
+            // An empty file has nothing to number: keep the raw "file is empty" note.
+            structuredRead.file.content.length > 0) {
+            const startLine = structuredRead.file.startLine ?? toolUse.input?.offset ?? 1;
+            // A trailing newline ends the last line. It is not an extra line.
+            let numbered = structuredRead.file.content
+                .replace(/\n$/, "")
+                .split("\n")
+                .map((line, i) => `${startLine + i}\t${line}`)
+                .join("\n");
+            // The model-facing truncation banner does not survive the rebuild.
+            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: [textContent(markdownEscape(numbered))] };
+        }
+        const content = result.content;
+        if (Array.isArray(content) && content.length > 0) {
+            return {
+                content: content.map((block) => ({
+                    type: "content",
+                    content: block.type === "text"
+                        ? { type: "text", text: markdownEscape(block.text) }
+                        : toAcpContentBlock(block, false),
+                })),
+            };
+        }
+        if (typeof content === "string" && content.length > 0) {
+            return { content: [textContent(markdownEscape(content))] };
+        }
+        return {};
+    }
+}

package/dist/tool-calls/reporters/search.d.ts

@@ -0,0 +1,10 @@
+import type { ToolReporter, ToolUseFacts } from "../facts.js";
+/** Glob: the file list is the result to show. */
+export declare class GlobReporter implements ToolReporter {
+    toolUse(input: unknown): ToolUseFacts;
+}
+/** Grep: the title is the equivalent grep command line. */
+export declare class GrepReporter implements ToolReporter {
+    toolUse(input: unknown): ToolUseFacts;
+}
+//# sourceMappingURL=search.d.ts.map

package/dist/tool-calls/reporters/search.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../../../src/tool-calls/reporters/search.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE9D,iDAAiD;AACjD,qBAAa,YAAa,YAAW,YAAY;IAC/C,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,YAAY;CAWtC;AAED,2DAA2D;AAC3D,qBAAa,YAAa,YAAW,YAAY;IAC/C,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,YAAY;CAkBtC"}

package/dist/tool-calls/reporters/search.js

@@ -0,0 +1,50 @@
+/** Glob: the file list is the result to show. */
+export class GlobReporter {
+    toolUse(input) {
+        const glob = input;
+        let label = "Find";
+        if (glob?.path)
+            label += ` \`${glob.path}\``;
+        if (glob?.pattern)
+            label += ` \`${glob.pattern}\``;
+        return {
+            title: label,
+            kind: "search",
+            locations: glob?.path ? [{ path: glob.path }] : [],
+        };
+    }
+}
+/** Grep: the title is the equivalent grep command line. */
+export class GrepReporter {
+    toolUse(input) {
+        const grep = input;
+        let label = "grep";
+        if (grep?.["-i"])
+            label += " -i";
+        if (grep?.["-n"])
+            label += " -n";
+        if (grep?.["-A"] !== undefined)
+            label += ` -A ${grep["-A"]}`;
+        if (grep?.["-B"] !== undefined)
+            label += ` -B ${grep["-B"]}`;
+        if (grep?.["-C"] !== undefined)
+            label += ` -C ${grep["-C"]}`;
+        if (grep?.output_mode === "files_with_matches")
+            label += " -l";
+        else if (grep?.output_mode === "count")
+            label += " -c";
+        if (grep?.head_limit !== undefined)
+            label += ` | head -${grep.head_limit}`;
+        if (grep?.glob)
+            label += ` --include="${grep.glob}"`;
+        if (grep?.type)
+            label += ` --type=${grep.type}`;
+        if (grep?.multiline)
+            label += " -P";
+        if (grep?.pattern)
+            label += ` "${grep.pattern}"`;
+        if (grep?.path)
+            label += ` ${grep.path}`;
+        return { title: label, kind: "search" };
+    }
+}

package/dist/tool-calls/reporters/web.d.ts

@@ -0,0 +1,11 @@
+import type { ToolReporter, ToolResultContext, ToolResultFacts, ToolUseFacts } from "../facts.js";
+/** WebFetch: the prompt is input that the user reads. The answer is the result. */
+export declare class WebFetchReporter implements ToolReporter {
+    toolUse(input: unknown): ToolUseFacts;
+}
+/** WebSearch: the hits are the result to show. */
+export declare class WebSearchReporter implements ToolReporter {
+    toolUse(input: unknown): ToolUseFacts;
+    toolResult({ result, structured }: ToolResultContext): ToolResultFacts;
+}
+//# sourceMappingURL=web.d.ts.map

package/dist/tool-calls/reporters/web.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"web.d.ts","sourceRoot":"","sources":["../../../src/tool-calls/reporters/web.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,YAAY,EAAE,iBAAiB,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAElG,mFAAmF;AACnF,qBAAa,gBAAiB,YAAW,YAAY;IACnD,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,YAAY;CAQtC;AAED,kDAAkD;AAClD,qBAAa,iBAAkB,YAAW,YAAY;IACpD,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,YAAY;IAQrC,UAAU,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,iBAAiB,GAAG,eAAe;CAuBvE"}

package/dist/tool-calls/reporters/web.js

@@ -0,0 +1,42 @@
+import { formatWebSearchHit, resultText, structuredResult, textContent } from "../content.js";
+/** WebFetch: the prompt is input that the user reads. The answer is the result. */
+export class WebFetchReporter {
+    toolUse(input) {
+        const fetch = input;
+        return {
+            title: fetch?.url ? `Fetch ${fetch.url}` : "Fetch",
+            kind: "fetch",
+            ...(fetch?.prompt ? { display: [textContent(fetch.prompt)] } : {}),
+        };
+    }
+}
+/** WebSearch: the hits are the result to show. */
+export class WebSearchReporter {
+    toolUse(input) {
+        const search = input;
+        return {
+            title: search?.query ? `Search "${search.query}"` : "Web search",
+            kind: "fetch",
+        };
+    }
+    toolResult({ result, structured }) {
+        // The raw tool_result text is a model-directed dump. The structured
+        // WebSearchOutput carries the hits: render them like server-side
+        // web_search_result blocks ("Title (url)").
+        const structuredSearch = structuredResult(structured);
+        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 versions: skip
+                        // off-spec hits instead of "undefined (undefined)" lines.
+                        entry.content.flatMap((hit) => typeof hit?.title === "string" && typeof hit?.url === "string"
+                            ? [formatWebSearchHit(hit)]
+                            : [])
+                    : []);
+            if (lines.length > 0)
+                return { content: [textContent(lines.join("\n"))] };
+        }
+        return resultText(result);
+    }
+}

package/dist/tools.d.ts

@@ -1,44 +1,26 @@
-import { PlanEntry, ToolCallContent, ToolCallLocation, ToolKind } from "@agentclientprotocol/sdk";
+import type { PlanEntry, ToolCallContent, ToolCallLocation, ToolKind } from "@agentclientprotocol/sdk";
 import { HookCallback } from "@anthropic-ai/claude-agent-sdk";
-import { TaskCreateInput, TaskCreateOutput, TaskListOutput, TaskUpdateInput, TaskUpdateOutput } 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";
-interface ToolInfo {
+import type { TaskCreateInput, TaskCreateOutput, TaskListOutput, TaskUpdateInput, TaskUpdateOutput } from "@anthropic-ai/claude-agent-sdk/sdk-tools.js";
+import type { ToolResultBlock } from "./tool-calls/content.js";
+import { type RenderedResult } from "./tool-calls/renderer.js";
+export { markdownEscape, toDisplayPath } from "./tool-calls/content.js";
+/**
+ * The title, kind, content, and locations of a tool use, for a client with the
+ * given terminal and patch capabilities. The {@link AcpToolCallRenderer} builds
+ * them from the facts of the tool reporter.
+ */
+export declare function toolInfoFromToolUse(toolUse: any, supportsTerminalOutput?: boolean, cwd?: string, supportsDiffPatch?: boolean): {
     title: string;
     kind: ToolKind;
     content: ToolCallContent[];
     locations?: ToolCallLocation[];
-}
-interface ToolUpdate {
-    title?: string;
-    content?: ToolCallContent[];
-    locations?: ToolCallLocation[];
-    _meta?: {
-        terminal_info?: {
-            terminal_id: string;
-        };
-        terminal_output?: {
-            terminal_id: string;
-            data: string;
-        };
-        terminal_output_delta?: {
-            terminal_id: string;
-            data: string;
-        };
-        terminal_exit?: {
-            terminal_id: string;
-            exit_code: number;
-            signal: string | null;
-        };
-    };
-}
+};
 /**
- * Convert an absolute file path to a project-relative path for display.
- * Returns the original path if it's outside the project directory or if no cwd is provided.
+ * The result fields of a tool result, for a client with the given terminal
+ * capabilities. The {@link AcpToolCallRenderer} builds them from the facts of
+ * the tool reporter.
  */
-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, toolUseResult?: unknown, preferTerminalOutputDelta?: boolean): ToolUpdate;
+export declare function toolUpdateFromToolResult(toolResult: ToolResultBlock, toolUse: any | undefined, supportsTerminalOutput?: boolean, toolUseResult?: unknown, preferTerminalOutputDelta?: boolean): RenderedResult;
 export type ClaudePlanEntry = {
     content: string;
     status: "pending" | "in_progress" | "completed";
@@ -68,11 +50,25 @@ export declare function applyTaskCreate(state: TaskState, input: TaskCreateInput
 export declare function applyTaskUpdate(state: TaskState, input: TaskUpdateInput | undefined): void;
 export declare function applyTaskList(state: TaskState, output: TaskListOutput): void;
 export declare function taskStateToPlanEntries(state: TaskState): PlanEntry[];
-export declare function markdownEscape(text: string): string;
-export declare const registerHookCallback: (toolUseID: string, { onPostToolUseHook, }: {
+/**
+ * The plan entries of the task list, or undefined when the client already
+ * holds the same entries. The TaskCreated and TaskCompleted hooks and the
+ * Task* tool results report the same change, so the second report of a
+ * change has nothing new.
+ *
+ * Only an AIR client skips the repeated plan. Every other client gets every
+ * plan, like upstream.
+ */
+export declare function changedTaskPlanEntries(state: TaskState, airClient: boolean): PlanEntry[] | undefined;
+/** Forgets the plan that the client holds, so that the next plan goes out, for example on replay. */
+export declare function forgetPublishedTaskPlan(state: TaskState): void;
+export declare const registerHookCallback: (toolUseID: string, { onPostToolUseHook, onRelease, }: {
     onPostToolUseHook?: (toolUseID: string, toolInput: unknown, toolResponse: unknown) => Promise<void>;
+    onRelease?: () => void;
 }, ownerId?: string) => void;
 export declare function unregisterHookCallback(toolUseID: string): void;
+/** Whether a PostToolUse callback for the tool use is still registered. */
+export declare function hasHookCallback(toolUseID: string): boolean;
 /** PostToolUse normally follows tool_result, so keep the callback for a short
  * grace period while still bounding retention when the hook never arrives. */
 export declare function completeHookCallback(toolUseID: string): void;
@@ -94,5 +90,4 @@ export declare const createTaskHook: (options: {
     taskState: TaskState;
     onChange?: () => Promise<void>;
 }) => HookCallback;
-export {};
 //# sourceMappingURL=tools.d.ts.map

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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"}