@agentclientprotocol/claude-agent-acp 0.85.2-preview.9 → 0.86.1-preview.1

package/dist/async-tasks.d.ts

@@ -69,7 +69,9 @@ export declare class AsyncTaskRuntime {
     /** `notices`: the client can present `notice` updates, so the stop
      *  acknowledgement need not be a transcript line. `routeOf`: the route of
      *  the tasks that a tool call in another session started, for example in
-     *  a native subagent session. */
+     *  a native subagent session. `toolNameOf`: the name of the tool of a tool
+     *  call, or `undefined` when the tool call is unknown. A task that a
+     *  `Monitor` tool call started is ignored. */
     private readonly options;
     /**
      * One registry owns both active tasks and terminal tombstones. Keeping an
@@ -77,14 +79,24 @@ export declare class AsyncTaskRuntime {
      * a command was backgrounded can arrive after its terminal SDK edge.
      */
     private readonly tasks;
+    /**
+     * The task output paths in the text of each tool result, by tool call
+     * id. A task whose id and tool call are known takes its output path from
+     * here. The tool result can come before or after the SDK names the task.
+     * The oldest entries are dropped.
+     */
+    private readonly outputPathsByToolCall;
     constructor(enabled: boolean, sessionId: string, publish: Publish, 
     /** `notices`: the client can present `notice` updates, so the stop
      *  acknowledgement need not be a transcript line. `routeOf`: the route of
      *  the tasks that a tool call in another session started, for example in
-     *  a native subagent session. */
+     *  a native subagent session. `toolNameOf`: the name of the tool of a tool
+     *  call, or `undefined` when the tool call is unknown. A task that a
+     *  `Monitor` tool call started is ignored. */
     options?: {
         notices?: boolean;
         routeOf?: (toolCallId: string) => Route | undefined;
+        toolNameOf?: (toolCallId: string) => string | undefined;
     });
     taskStarted(message: AsyncTaskStarted): Promise<void>;
     taskBackgrounded(message: AsyncTaskStarted): Promise<void>;
@@ -107,6 +119,14 @@ export declare class AsyncTaskRuntime {
     claimStop(taskId: string): boolean;
     releaseStop(taskId: string): void;
     taskStopped(taskId: string): Promise<void>;
+    /** Whether a task of the tool call went to the background, so the client gets it. */
+    isBackgroundedToolCall(toolCallId: string): boolean;
+    /**
+     * Reads the tool results in `content` for the output path of a known task.
+     * Only a path that ends with `tasks/<task id>.output` in the result of
+     * the task's own tool call counts. A tool result never creates a task.
+     */
+    toolResults(content: unknown): Promise<void>;
     /**
      * Sends the spawn of each held task without a tool call id. The prompt
      * result ends the model turn, and the result of the tool call that started a
@@ -114,10 +134,20 @@ export declare class AsyncTaskRuntime {
      */
     releaseHeld(): Promise<void>;
     clear(): void;
+    /**
+     * Marks a task that the client never sees. Only a task that is not announced
+     * can become ignored, so the client never holds a task without its end.
+     */
+    private ignore;
     private task;
     private mergeStarted;
     /** Keeps the first tool call id that a later SDK message brings. */
     private mergeToolCallId;
+    /**
+     * Takes the output path from the result of the task's tool call when no
+     * structured source gave one. A structured path later replaces it.
+     */
+    private mergeToolResultPath;
     /** Sends an update of an announced task. A held task sends it after its spawn. */
     private whenAnnounced;
     private mergePatch;
@@ -131,6 +161,11 @@ export declare class AsyncTaskRuntime {
      * backgrounded command. A held task gets its spawn without the id when it
      * ends first, or when the prompt result ends the model turn
      * ({@link releaseHeld}). No guess by the command text binds a task.
+     *
+     * A task that a `Monitor` tool call started is ignored: Monitor streams its
+     * output to the model only, so the task has nothing for the client. The
+     * tool_use streams before the tool runs, so the tool name is known when the
+     * spawn has the tool call id.
      */
     private announce;
     private finish;
@@ -145,10 +180,24 @@ export declare class AsyncTaskRuntime {
     /** Publishes an update of the task in the session that owns the task. */
     private send;
 }
-/** Recovers background Bash lifecycle data exposed only on its tool result. */
+/**
+ * Recovers a background Bash task from the structured `backgroundTaskId` of
+ * its tool result. The text of a tool result never gives a task id: a
+ * foreground command can print any text.
+ */
 export declare function backgroundBashTaskFromToolResult(content: unknown, toolUseResult: unknown, toolUses: Record<string, {
     name: string;
     input: unknown;
 }>): AsyncTaskStarted | undefined;
+/**
+ * The Bash tool calls in `content` whose command went to the background. Only
+ * structured data counts: the task from the structured tool result, a task
+ * that the runtime knows for the tool call, or a `run_in_background` input of
+ * a call that did not fail.
+ */
+export declare function backgroundedBashToolCallIds(content: unknown, toolUses: Record<string, {
+    name: string;
+    input: unknown;
+}>, runtime: AsyncTaskRuntime, structuredTask?: AsyncTaskStarted): Set<string>;
 export {};
 //# sourceMappingURL=async-tasks.d.ts.map

package/dist/async-tasks.d.ts.map

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

package/dist/async-tasks.js

@@ -1,5 +1,6 @@
 import { AIR_ASYNC_TASKS_CAPABILITY, clientSupportsAirCapability } from "./air-extension.js";
 import { noticeOrTranscriptUpdate } from "./session-notices.js";
+const MAX_TOOL_RESULT_PATHS = 500;
 export function clientSupportsAsyncTasks(capabilities) {
     return clientSupportsAirCapability(capabilities, AIR_ASYNC_TASKS_CAPABILITY);
 }
@@ -15,11 +16,20 @@ export class AsyncTaskRuntime {
      * a command was backgrounded can arrive after its terminal SDK edge.
      */
     tasks = new Map();
+    /**
+     * The task output paths in the text of each tool result, by tool call
+     * id. A task whose id and tool call are known takes its output path from
+     * here. The tool result can come before or after the SDK names the task.
+     * The oldest entries are dropped.
+     */
+    outputPathsByToolCall = new Map();
     constructor(enabled, sessionId, publish, 
     /** `notices`: the client can present `notice` updates, so the stop
      *  acknowledgement need not be a transcript line. `routeOf`: the route of
      *  the tasks that a tool call in another session started, for example in
-     *  a native subagent session. */
+     *  a native subagent session. `toolNameOf`: the name of the tool of a tool
+     *  call, or `undefined` when the tool call is unknown. A task that a
+     *  `Monitor` tool call started is ignored. */
     options = {}) {
         this.enabled = enabled;
         this.sessionId = sessionId;
@@ -33,8 +43,8 @@ export class AsyncTaskRuntime {
         if (!taskId)
             return;
         const task = this.task(taskId);
-        if (isSubagentTask(message)) {
-            task.ignored = true;
+        if (isSubagentTask(message) || isMonitorTask(message)) {
+            this.ignore(task);
             return;
         }
         const previousOutputFilePath = task.outputFilePath;
@@ -57,8 +67,8 @@ export class AsyncTaskRuntime {
         if (!taskId)
             return;
         const task = this.task(taskId);
-        if (isSubagentTask(message)) {
-            task.ignored = true;
+        if (isSubagentTask(message) || isMonitorTask(message)) {
+            this.ignore(task);
             return;
         }
         const previousOutputFilePath = task.outputFilePath;
@@ -205,8 +215,9 @@ export class AsyncTaskRuntime {
             const task = this.task(taskId);
             if (task.ignored || isTerminal(task.state))
                 continue;
-            if (field(item, "taskType", "task_type") === "local_agent") {
-                task.ignored = true;
+            const levelTaskType = field(item, "taskType", "task_type");
+            if (levelTaskType === "local_agent" || levelTaskType === "local_monitor") {
+                this.ignore(task);
                 continue;
             }
             if (!task.startedObserved) {
@@ -289,6 +300,44 @@ export class AsyncTaskRuntime {
         // its tool call), not whether the agent may answer a direct user action.
         await this.send(task, noticeOrTranscriptUpdate({ severity: "info", title: "Task stopped by user", description: `${task.name}.` }, this.options.notices ?? false));
     }
+    /** Whether a task of the tool call went to the background, so the client gets it. */
+    isBackgroundedToolCall(toolCallId) {
+        for (const task of this.tasks.values()) {
+            if (task.toolCallId === toolCallId && !task.ignored && (task.announced || task.held)) {
+                return true;
+            }
+        }
+        return false;
+    }
+    /**
+     * Reads the tool results in `content` for the output path of a known task.
+     * Only a path that ends with `tasks/<task id>.output` in the result of
+     * the task's own tool call counts. A tool result never creates a task.
+     */
+    async toolResults(content) {
+        if (!this.enabled || !Array.isArray(content))
+            return;
+        for (const result of content.flatMap(toolResultBlock)) {
+            const text = textContent(result.content);
+            const paths = text ? taskOutputPaths(text) : [];
+            if (paths.length === 0)
+                continue;
+            this.outputPathsByToolCall.delete(result.toolUseId);
+            this.outputPathsByToolCall.set(result.toolUseId, paths);
+            if (this.outputPathsByToolCall.size > MAX_TOOL_RESULT_PATHS) {
+                const oldest = this.outputPathsByToolCall.keys().next().value;
+                if (oldest !== undefined)
+                    this.outputPathsByToolCall.delete(oldest);
+            }
+            for (const task of this.tasks.values()) {
+                if (task.toolCallId !== result.toolUseId || task.ignored || task.outputFilePath)
+                    continue;
+                this.mergeToolResultPath(task);
+                if (task.outputFilePath && task.announced)
+                    await this.publishMetadata(task);
+            }
+        }
+    }
     /**
      * Sends the spawn of each held task without a tool call id. The prompt
      * result ends the model turn, and the result of the tool call that started a
@@ -304,6 +353,18 @@ export class AsyncTaskRuntime {
     }
     clear() {
         this.tasks.clear();
+        this.outputPathsByToolCall.clear();
+    }
+    /**
+     * Marks a task that the client never sees. Only a task that is not announced
+     * can become ignored, so the client never holds a task without its end.
+     */
+    ignore(task) {
+        if (task.announced)
+            return;
+        task.ignored = true;
+        task.held = false;
+        task.deferred = [];
     }
     task(taskId) {
         let task = this.tasks.get(taskId);
@@ -354,10 +415,23 @@ export class AsyncTaskRuntime {
         const toolCallId = nonBlankString(field(message, "toolCallId", "tool_use_id"));
         if (toolCallId)
             task.toolCallId = toolCallId;
+        this.mergeToolResultPath(task);
     }
     /** Keeps the first tool call id that a later SDK message brings. */
     mergeToolCallId(task, value) {
         task.toolCallId ??= nonBlankString(field(value, "toolCallId", "tool_use_id"));
+        this.mergeToolResultPath(task);
+    }
+    /**
+     * Takes the output path from the result of the task's tool call when no
+     * structured source gave one. A structured path later replaces it.
+     */
+    mergeToolResultPath(task) {
+        if (task.outputFilePath || !task.toolCallId)
+            return;
+        const paths = this.outputPathsByToolCall.get(task.toolCallId);
+        if (paths)
+            task.outputFilePath = outputFilePathOf(paths, task.id);
     }
     /** Sends an update of an announced task. A held task sends it after its spawn. */
     async whenAnnounced(task, send) {
@@ -397,10 +471,20 @@ export class AsyncTaskRuntime {
      * backgrounded command. A held task gets its spawn without the id when it
      * ends first, or when the prompt result ends the model turn
      * ({@link releaseHeld}). No guess by the command text binds a task.
+     *
+     * A task that a `Monitor` tool call started is ignored: Monitor streams its
+     * output to the model only, so the task has nothing for the client. The
+     * tool_use streams before the tool runs, so the tool name is known when the
+     * spawn has the tool call id.
      */
     async announce(task, options = {}) {
         if (task.announced || task.ignored)
             return;
+        const toolName = task.toolCallId ? this.options.toolNameOf?.(task.toolCallId) : undefined;
+        if (toolName !== undefined && HIDDEN_TASK_TOOLS.has(toolName)) {
+            this.ignore(task);
+            return;
+        }
         if (!task.toolCallId && !options.withoutToolCall && !isTerminal(task.state)) {
             task.held = true;
             return;
@@ -538,7 +622,11 @@ function recordPublished(task, fields) {
             task.published.set(key, JSON.stringify(value));
     }
 }
-/** Recovers background Bash lifecycle data exposed only on its tool result. */
+/**
+ * Recovers a background Bash task from the structured `backgroundTaskId` of
+ * its tool result. The text of a tool result never gives a task id: a
+ * foreground command can print any text.
+ */
 export function backgroundBashTaskFromToolResult(content, toolUseResult, toolUses) {
     if (!Array.isArray(content))
         return undefined;
@@ -547,12 +635,7 @@ export function backgroundBashTaskFromToolResult(content, toolUseResult, toolUse
     if (bashResults.length === 0)
         return undefined;
     const backgroundResults = structuredBackgroundResults(toolUseResult, toolUses);
-    const distinctTaskIds = new Set([
-        ...backgroundResults.map((result) => result.taskId),
-        ...bashResults
-            .map((result) => backgroundTaskIdFromText(result.content))
-            .filter((taskId) => taskId !== undefined),
-    ]);
+    const distinctTaskIds = new Set(backgroundResults.map((result) => result.taskId));
     if (distinctTaskIds.size !== 1)
         return undefined;
     const taskId = [...distinctTaskIds][0];
@@ -583,17 +666,31 @@ export function backgroundBashTaskFromToolResult(content, toolUseResult, toolUse
         toolCallId: match.toolUseId,
     };
 }
-function backgroundTaskIdFromText(content) {
-    const text = textContent(content);
-    if (!text)
-        return undefined;
-    const marker = "Command running in background with ID: ";
-    const start = text.indexOf(marker);
-    if (start < 0)
-        return undefined;
-    const valueStart = start + marker.length;
-    const valueEnd = text.indexOf(".", valueStart);
-    return valueEnd < 0 ? undefined : nonBlankString(text.slice(valueStart, valueEnd));
+/**
+ * The Bash tool calls in `content` whose command went to the background. Only
+ * structured data counts: the task from the structured tool result, a task
+ * that the runtime knows for the tool call, or a `run_in_background` input of
+ * a call that did not fail.
+ */
+export function backgroundedBashToolCallIds(content, toolUses, runtime, structuredTask) {
+    const ids = new Set();
+    if (!runtime.enabled || !Array.isArray(content))
+        return ids;
+    const structuredToolCallId = structuredTask
+        ? nonBlankString(field(structuredTask, "toolCallId", "tool_use_id"))
+        : undefined;
+    for (const result of content.flatMap(toolResultBlock)) {
+        const toolUse = toolUses[result.toolUseId];
+        if (toolUse?.name !== "Bash")
+            continue;
+        const input = isRecord(toolUse.input) ? toolUse.input : undefined;
+        if (result.toolUseId === structuredToolCallId ||
+            runtime.isBackgroundedToolCall(result.toolUseId) ||
+            (input?.run_in_background === true && !result.isError)) {
+            ids.add(result.toolUseId);
+        }
+    }
+    return ids;
 }
 function structuredBackgroundResults(value, toolUses, hintedToolUseId, seen = new Set()) {
     if (typeof value !== "object" || value === null || seen.has(value))
@@ -618,26 +715,67 @@ function toolResultBlock(value) {
     if (!isRecord(value) || value.type !== "tool_result")
         return [];
     const toolUseId = nonBlankString(field(value, "toolUseId", "tool_use_id"));
-    return toolUseId ? [{ toolUseId, content: value.content }] : [];
+    return toolUseId
+        ? [
+            {
+                toolUseId,
+                content: value.content,
+                isError: field(value, "isError", "is_error") === true,
+            },
+        ]
+        : [];
 }
 function asyncTaskOutputFilePath(content, taskId) {
     const text = textContent(content);
-    if (!text)
-        return undefined;
-    const marker = "Output is being written to: ";
-    const start = text.indexOf(marker);
-    if (start < 0)
-        return undefined;
-    const valueStart = start + marker.length;
-    const valueEnd = text.indexOf(". You will be notified", valueStart);
-    if (valueEnd < 0)
-        return undefined;
-    const path = text.slice(valueStart, valueEnd).trim();
-    const expectedPosixSuffix = `/tasks/${taskId}.output`;
-    const expectedWindowsSuffix = `\\tasks\\${taskId}.output`;
-    return path.endsWith(expectedPosixSuffix) || path.endsWith(expectedWindowsSuffix)
-        ? path
-        : undefined;
+    return text ? outputFilePathOf(taskOutputPaths(text), taskId) : undefined;
+}
+/**
+ * The end of a task output path: `tasks/<id>.output`, followed by a sentence
+ * period, whitespace or the end of the text. Claude Code writes the output of
+ * a background task there.
+ */
+const TASK_OUTPUT_SUFFIX = /[/\\]tasks[/\\][^\s/\\]+?\.output(?=\.(?!\w)|\s|$)/g;
+/** An absolute POSIX, Windows drive or UNC path. */
+const ABSOLUTE_PATH = /^(?:\/|[A-Za-z]:[\\/]|\\\\)/;
+/**
+ * The task output paths in a tool result text. Each text of Claude Code puts
+ * the path after "Output is being written to: ", so a path starts after the
+ * nearest `": "` before its end. A drive colon has no space after it, so a
+ * path can hold spaces and a drive. The search for the start stops at a line
+ * break and at the end of the previous path end, so a path never crosses a
+ * line or holds another path. Each character is read at most once, so the
+ * parse is linear in the text length. A path that is not absolute does not
+ * count.
+ */
+function taskOutputPaths(text) {
+    const paths = [];
+    let previousEnd = 0;
+    for (const match of text.matchAll(TASK_OUTPUT_SUFFIX)) {
+        const end = match.index + match[0].length;
+        let start = -1;
+        for (let i = match.index - 1; i >= previousEnd; i--) {
+            const char = text[i];
+            if (char === "\n" || char === "\r")
+                break;
+            if (char === ":" && text[i + 1] === " ") {
+                start = i + 2;
+                break;
+            }
+        }
+        previousEnd = end;
+        if (start < 0)
+            continue;
+        const path = text.slice(start, end);
+        if (ABSOLUTE_PATH.test(path))
+            paths.push(path);
+    }
+    return paths;
+}
+/** The output path of the task `taskId` among the paths, if one names it. */
+function outputFilePathOf(paths, taskId) {
+    const posix = `/tasks/${taskId}.output`;
+    const windows = `\\tasks\\${taskId}.output`;
+    return paths.find((path) => path.endsWith(posix) || path.endsWith(windows));
 }
 function textContent(value) {
     if (typeof value === "string")
@@ -671,6 +809,11 @@ function isBackgroundTask(isBackgrounded, taskType) {
         return false;
     return taskType !== "local_bash" && taskType !== "local_agent";
 }
+/** The tools whose async tasks the client never sees. */
+const HIDDEN_TASK_TOOLS = new Set(["Monitor"]);
+function isMonitorTask(message) {
+    return field(message, "taskType", "task_type") === "local_monitor";
+}
 function isSubagentTask(message) {
     return (field(message, "subagentType", "subagent_type") !== undefined ||
         field(message, "taskType", "task_type") === "local_agent");

package/dist/clear-context-coordinator.d.ts

@@ -29,6 +29,7 @@ export type ClearContextSession<Turn extends ClearContextTurn = ClearContextTurn
         currentModelId: string;
     };
     configOptions: SessionConfigOption[];
+    currentAgent: string;
     fastModeEnabled: boolean;
     effortPinnedLevel?: string;
     activeTurn?: Turn | null;

package/dist/clear-context-coordinator.d.ts.map

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

package/dist/clear-context-coordinator.js

@@ -1,4 +1,4 @@
-import { DEFAULT_MODEL_ID } from "./session-config-ids.js";
+import { DEFAULT_AGENT_ID, DEFAULT_MODEL_ID } from "./session-config-ids.js";
 function restartParams(session) {
     const originalParams = session.creationParams ?? { cwd: session.cwd, mcpServers: [] };
     const originalMeta = originalParams._meta;
@@ -18,6 +18,7 @@ function restartParams(session) {
                     ...(session.models.currentModelId !== DEFAULT_MODEL_ID
                         ? { model: session.models.currentModelId }
                         : {}),
+                    ...(session.currentAgent !== DEFAULT_AGENT_ID ? { agent: session.currentAgent } : {}),
                     ...(session.effortPinnedLevel !== undefined
                         ? { effort: session.effortPinnedLevel }
                         : {}),

package/dist/diff.d.ts

@@ -23,6 +23,17 @@ interface PatchHunk {
 }
 /** The kind of file change that a git patch describes. */
 type FileChange = "create" | "update";
+/**
+ * The diff that carries an exact patch: AIR's `diffPatch` extension of a v1
+ * diff, or an ACP v2 diff.
+ */
+export type PatchForm = "air" | "v2";
+/**
+ * How a git patch names its file. `git` is git's own form: the leading slash
+ * dropped and the `a/` and `b/` prefixes added. `absolute` is the form of an
+ * ACP v2 `git_patch`, whose paths must be absolute: the path itself.
+ */
+type GitPatchPaths = "git" | "absolute";
 /**
  * Builds the exact patch shown before Claude runs an Edit or Write tool.
  *
@@ -35,14 +46,14 @@ type FileChange = "create" | "update";
  * normalizes quotes or fails.
  *
  * A Write always gets content that shows the change: the patch, the standard
- * diff of a text that cannot have an exact patch, or a notice that the Write
- * overwrites a file that the adapter cannot show.
+ * diff (in v2, the change alone) of a text that cannot have an exact patch, or
+ * a notice that the Write overwrites a file that the adapter cannot show.
  *
  * The preview uses the tool input as it is. Claude can still remove the
  * trailing whitespace of a line before it writes. The PostToolUse hook then
  * sends the patch of the written file.
  */
-export declare function previewPatchContent(toolName: string, input: Record<string, unknown>, cwd?: string): Promise<ToolCallContent[] | undefined>;
+export declare function previewPatchContent(toolName: string, input: Record<string, unknown>, cwd?: string, form?: PatchForm): Promise<ToolCallContent[] | undefined>;
 /**
  * Builds the git patch for a finished Edit or Write from the file on disk.
  *
@@ -54,7 +65,7 @@ export declare function previewPatchContent(toolName: string, input: Record<stri
  * A written file that contains a CR or a byte order mark is declined, because
  * Claude removed those bytes from `originalFile`.
  */
-export declare function patchUpdateFromDiffToolResponse(toolResponse: unknown): Promise<{
+export declare function patchUpdateFromDiffToolResponse(toolResponse: unknown, form?: PatchForm): Promise<{
     content: ToolCallContent[];
     locations: ToolCallLocation[];
 } | undefined>;
@@ -69,13 +80,39 @@ export declare function toolUpdateFromDiffToolResponse(toolResponse: unknown): {
     content?: ToolCallContent[];
     locations?: ToolCallLocation[];
 };
+/**
+ * The ACP v2 diff of a finished Edit or Write: the exact patch of
+ * {@link patchUpdateFromDiffToolResponse} when it can be built, else the
+ * change with a patch from what the toolResponse holds.
+ *
+ * The fallback patch of an update comes from the `structuredPatch`, which is
+ * display data (see {@link patchUpdateFromDiffToolResponse}). That is enough
+ * for a v2 patch, which is renderable text, not a patch to apply. An update
+ * without hunks, such as one whose previous content was too large to diff,
+ * gets the change alone. An Edit with an empty `old_string` reports the same
+ * response for a created file and a filled empty one, so it gets no diff.
+ */
+export declare function v2UpdateFromDiffToolResponse(toolResponse: unknown): Promise<{
+    content?: ToolCallContent[];
+    locations?: ToolCallLocation[];
+}>;
 /**
  * The text of one git patch for `filePath`.
  *
- * The headers follow `git diff`: the path loses its leading slash, gets the
- * `a/` and `b/` prefixes, and is quoted when git would quote it. A created
- * file gets its mode line and a `/dev/null` side.
+ * The headers follow `git diff`: the path is quoted when git would quote it,
+ * and a created file gets its mode line and a `/dev/null` side. With `git`
+ * paths, the path loses its leading slash and gets the `a/` and `b/` prefixes.
+ */
+export declare function gitPatchText(filePath: string, change: FileChange, hunks: PatchHunk[], paths?: GitPatchPaths): string;
+/**
+ * The ACP v2 diff of a change to the text file `filePath`: the change and,
+ * given hunks, its git patch.
+ *
+ * The agent builds tool call content in v1 types, and v1 cannot express a v2
+ * diff, so the diff travels as v1 content. Nothing in the agent reads inside a
+ * diff, and only a v2 client gets one: the v2 surface sends it as it is
+ * (`src/v2/tool-call.ts`).
  */
-export declare function gitPatchText(filePath: string, change: FileChange, hunks: PatchHunk[]): string;
+export declare function v2DiffContent(filePath: string, change: FileChange, hunks?: PatchHunk[]): ToolCallContent;
 export {};
 //# sourceMappingURL=diff.d.ts.map

package/dist/diff.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"diff.d.ts","sourceRoot":"","sources":["../src/diff.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAQ7E;;;;;;;GAOG;AACH,eAAO,MAAM,oBAAoB,QAAc,CAAC;AAkBhD;;;;;GAKG;AACH,UAAU,SAAS;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB;AA0BD,0DAA0D;AAC1D,KAAK,UAAU,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAEtC;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,GAAG,CAAC,EAAE,MAAM,GACX,OAAO,CAAC,eAAe,EAAE,GAAG,SAAS,CAAC,CAkExC;AA0CD;;;;;;;;;;GAUG;AACH,wBAAsB,+BAA+B,CACnD,YAAY,EAAE,OAAO,GACpB,OAAO,CAAC;IAAE,OAAO,EAAE,eAAe,EAAE,CAAC;IAAC,SAAS,EAAE,gBAAgB,EAAE,CAAA;CAAE,GAAG,SAAS,CAAC,CA0CpF;AAED;;;;;;GAMG;AACH,wBAAgB,8BAA8B,CAAC,YAAY,EAAE,OAAO,GAAG;IACrE,OAAO,CAAC,EAAE,eAAe,EAAE,CAAC;IAC5B,SAAS,CAAC,EAAE,gBAAgB,EAAE,CAAC;CAChC,CAoEA;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,MAAM,CAM7F"}
+{"version":3,"file":"diff.d.ts","sourceRoot":"","sources":["../src/diff.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAS7E;;;;;;;GAOG;AACH,eAAO,MAAM,oBAAoB,QAAc,CAAC;AAkBhD;;;;;GAKG;AACH,UAAU,SAAS;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB;AA0BD,0DAA0D;AAC1D,KAAK,UAAU,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAQtC;;;GAGG;AACH,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,IAAI,CAAC;AAErC;;;;GAIG;AACH,KAAK,aAAa,GAAG,KAAK,GAAG,UAAU,CAAC;AAKxC;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,GAAG,CAAC,EAAE,MAAM,EACZ,IAAI,GAAE,SAAiB,GACtB,OAAO,CAAC,eAAe,EAAE,GAAG,SAAS,CAAC,CAoExC;AA0CD;;;;;;;;;;GAUG;AACH,wBAAsB,+BAA+B,CACnD,YAAY,EAAE,OAAO,EACrB,IAAI,GAAE,SAAiB,GACtB,OAAO,CAAC;IAAE,OAAO,EAAE,eAAe,EAAE,CAAC;IAAC,SAAS,EAAE,gBAAgB,EAAE,CAAA;CAAE,GAAG,SAAS,CAAC,CA0CpF;AAED;;;;;;GAMG;AACH,wBAAgB,8BAA8B,CAAC,YAAY,EAAE,OAAO,GAAG;IACrE,OAAO,CAAC,EAAE,eAAe,EAAE,CAAC;IAC5B,SAAS,CAAC,EAAE,gBAAgB,EAAE,CAAC;CAChC,CAoEA;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,4BAA4B,CAAC,YAAY,EAAE,OAAO,GAAG,OAAO,CAAC;IACjF,OAAO,CAAC,EAAE,eAAe,EAAE,CAAC;IAC5B,SAAS,CAAC,EAAE,gBAAgB,EAAE,CAAC;CAChC,CAAC,CAgCD;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAC1B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,UAAU,EAClB,KAAK,EAAE,SAAS,EAAE,EAClB,KAAK,GAAE,aAAqB,GAC3B,MAAM,CAMR;AA2OD;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,UAAU,EAClB,KAAK,CAAC,EAAE,SAAS,EAAE,GAClB,eAAe,CAajB"}