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

package/dist/air-extension.d.ts

@@ -17,6 +17,8 @@ export declare const AIR_SKILL_KEY = "skill";
 export declare const AIR_CONTEXT_COMPACTION_KEY = "contextCompaction";
 export declare const AIR_GOAL_KEY = "goal";
 export declare const AIR_KIND_KEY = "kind";
+/** The absolute path of the `SKILL.md` of a skill command in `available_commands_update`. */
+export declare const AIR_SKILL_PATH_KEY = "skillPath";
 export declare const AIR_PERMISSION_KEY = "permission";
 export declare const AIR_CUSTOM_ANSWER_KEY = "customAnswer";
 /**

package/dist/air-extension.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"air-extension.d.ts","sourceRoot":"","sources":["../src/air-extension.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,uCAAuC,2BAA2B,CAAC;AAChF,eAAO,MAAM,0BAA0B,eAAe,CAAC;AACvD,eAAO,MAAM,8BAA8B,mBAAmB,CAAC;AAC/D,eAAO,MAAM,uCAAuC,qBAAqB,CAAC;AAC1E,eAAO,MAAM,yBAAyB,cAAc,CAAC;AACrD,4EAA4E;AAC5E,eAAO,MAAM,kCAAkC,sBAAsB,CAAC;AACtE;;;GAGG;AACH,eAAO,MAAM,wBAAwB,aAAa,CAAC;AAEnD,8EAA8E;AAC9E,eAAO,MAAM,qBAAqB,iBAAiB,CAAC;AACpD,eAAO,MAAM,gBAAgB,aAAa,CAAC;AAC3C,eAAO,MAAM,aAAa,UAAU,CAAC;AACrC,eAAO,MAAM,0BAA0B,sBAAsB,CAAC;AAC9D,eAAO,MAAM,YAAY,SAAS,CAAC;AACnC,eAAO,MAAM,YAAY,SAAS,CAAC;AACnC,eAAO,MAAM,kBAAkB,eAAe,CAAC;AAC/C,eAAO,MAAM,qBAAqB,iBAAiB,CAAC;AACpD;;;;GAIG;AACH,eAAO,MAAM,4BAA4B,iCAAiC,CAAC;AAQ3E,2EAA2E;AAC3E,wBAAgB,iBAAiB,CAAC,GAAG,YAAY,EAAE,MAAM,EAAE,2BAE1D;AAED;;;;;;GAMG;AACH,wBAAgB,WAAW,CACzB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,GAAG,SAAS,EAChD,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,OAAO,GACf,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAczB;AAED;;;;;;;GAOG;AACH,wBAAgB,WAAW,CAAC,YAAY,EAAE,OAAO,GAAG,OAAO,CAE1D;AAED;;;GAGG;AACH,wBAAgB,WAAW,CACzB,SAAS,EAAE,OAAO,EAClB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,GACpC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAErC;AAED,2FAA2F;AAC3F,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAKnF;AAED;;;;;GAKG;AACH,wBAAgB,2BAA2B,CAAC,YAAY,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAY9F"}
+{"version":3,"file":"air-extension.d.ts","sourceRoot":"","sources":["../src/air-extension.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,uCAAuC,2BAA2B,CAAC;AAChF,eAAO,MAAM,0BAA0B,eAAe,CAAC;AACvD,eAAO,MAAM,8BAA8B,mBAAmB,CAAC;AAC/D,eAAO,MAAM,uCAAuC,qBAAqB,CAAC;AAC1E,eAAO,MAAM,yBAAyB,cAAc,CAAC;AACrD,4EAA4E;AAC5E,eAAO,MAAM,kCAAkC,sBAAsB,CAAC;AACtE;;;GAGG;AACH,eAAO,MAAM,wBAAwB,aAAa,CAAC;AAEnD,8EAA8E;AAC9E,eAAO,MAAM,qBAAqB,iBAAiB,CAAC;AACpD,eAAO,MAAM,gBAAgB,aAAa,CAAC;AAC3C,eAAO,MAAM,aAAa,UAAU,CAAC;AACrC,eAAO,MAAM,0BAA0B,sBAAsB,CAAC;AAC9D,eAAO,MAAM,YAAY,SAAS,CAAC;AACnC,eAAO,MAAM,YAAY,SAAS,CAAC;AACnC,6FAA6F;AAC7F,eAAO,MAAM,kBAAkB,cAAc,CAAC;AAC9C,eAAO,MAAM,kBAAkB,eAAe,CAAC;AAC/C,eAAO,MAAM,qBAAqB,iBAAiB,CAAC;AACpD;;;;GAIG;AACH,eAAO,MAAM,4BAA4B,iCAAiC,CAAC;AAQ3E,2EAA2E;AAC3E,wBAAgB,iBAAiB,CAAC,GAAG,YAAY,EAAE,MAAM,EAAE,2BAE1D;AAED;;;;;;GAMG;AACH,wBAAgB,WAAW,CACzB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,GAAG,SAAS,EAChD,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,OAAO,GACf,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAczB;AAED;;;;;;;GAOG;AACH,wBAAgB,WAAW,CAAC,YAAY,EAAE,OAAO,GAAG,OAAO,CAE1D;AAED;;;GAGG;AACH,wBAAgB,WAAW,CACzB,SAAS,EAAE,OAAO,EAClB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,GACpC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAErC;AAED,2FAA2F;AAC3F,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAKnF;AAED;;;;;GAKG;AACH,wBAAgB,2BAA2B,CAAC,YAAY,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAY9F"}

package/dist/air-extension.js

@@ -17,6 +17,8 @@ export const AIR_SKILL_KEY = "skill";
 export const AIR_CONTEXT_COMPACTION_KEY = "contextCompaction";
 export const AIR_GOAL_KEY = "goal";
 export const AIR_KIND_KEY = "kind";
+/** The absolute path of the `SKILL.md` of a skill command in `available_commands_update`. */
+export const AIR_SKILL_PATH_KEY = "skillPath";
 export const AIR_PERMISSION_KEY = "permission";
 export const AIR_CUSTOM_ANSWER_KEY = "customAnswer";
 /**

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.
  *
@@ -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,GACX,OAAO,CAAC,eAAe,EAAE,GAAG,SAAS,CAAC,CAkExC;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,CA8CpF;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;AAmOD;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,UAAU,EAClB,KAAK,CAAC,EAAE,SAAS,EAAE,GAClB,eAAe,CAajB"}

package/dist/diff.js

@@ -67,7 +67,7 @@ export async function previewPatchContent(toolName, input, cwd) {
             if (oldText !== null && (oldText.trim() !== "" || oldText.includes("\uFEFF"))) {
                 return undefined;
             }
-            return optionalContent(filePatch(filePath, oldText, newString)?.content);
+            return airPatch(filePath, oldText, newString);
         }
         if (oldText === null)
             return undefined;
@@ -78,7 +78,7 @@ export async function previewPatchContent(toolName, input, cwd) {
             return undefined;
         }
         const newText = replacedText(oldText, oldString, newString, edit.replace_all === true);
-        return optionalContent(filePatch(filePath, oldText, newText)?.content);
+        return airPatch(filePath, oldText, newText);
     }
     if (toolName === "Write") {
         const write = normalizeWriteInput(input);
@@ -109,7 +109,7 @@ export async function previewPatchContent(toolName, input, cwd) {
         if (!isPatchableText(content))
             return standard;
         // A dense change can exceed the diff budget. The approval then shows the standard diff.
-        return optionalContent(filePatch(filePath, oldText, content)?.content) ?? standard;
+        return airPatch(filePath, oldText, content) ?? standard;
     }
     return undefined;
 }
@@ -151,7 +151,7 @@ function replacedText(fileText, oldString, newString, replaceAll) {
  * A written file that contains a CR or a byte order mark is declined, because
  * Claude removed those bytes from `originalFile`.
  */
-export async function patchUpdateFromDiffToolResponse(toolResponse) {
+export async function patchUpdateFromDiffToolResponse(toolResponse, form = "air") {
     if (!toolResponse || typeof toolResponse !== "object")
         return undefined;
     const response = toolResponse;
@@ -185,11 +185,15 @@ export async function patchUpdateFromDiffToolResponse(toolResponse) {
         return undefined;
     if (response.type === "create" && newText !== response.content)
         return undefined;
-    const patch = filePatch(response.filePath, oldText, newText);
+    const patch = filePatch(oldText, newText);
     if (!patch)
         return undefined;
     return {
-        content: [patch.content],
+        content: [
+            form === "v2"
+                ? v2DiffContent(response.filePath, patch.change, patch.hunks)
+                : airPatchContent(response.filePath, patch),
+        ],
         // A created file keeps the location of its Write tool call.
         locations: oldText === null
             ? [{ path: response.filePath }]
@@ -274,26 +278,75 @@ export function toolUpdateFromDiffToolResponse(toolResponse) {
         result.locations = locations;
     return result;
 }
+/**
+ * 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 async function v2UpdateFromDiffToolResponse(toolResponse) {
+    const exact = await patchUpdateFromDiffToolResponse(toolResponse, "v2");
+    if (exact)
+        return exact;
+    if (!toolResponse || typeof toolResponse !== "object")
+        return {};
+    const response = toolResponse;
+    const filePath = response.filePath;
+    if (typeof filePath !== "string")
+        return {};
+    if (response.type === "create") {
+        const hunk = typeof response.content === "string" && isPatchableText(response.content)
+            ? wholeFileHunk(response.content)
+            : undefined;
+        return {
+            content: [v2DiffContent(filePath, "create", hunk && [hunk])],
+            locations: [{ path: filePath }],
+        };
+    }
+    if (response.type === undefined && response.oldString === "" && response.originalFile === "") {
+        return {};
+    }
+    // A Write whose content is the previous text changed nothing.
+    if (response.type === "update" && response.content === response.originalFile)
+        return {};
+    const hunks = Array.isArray(response.structuredPatch) && response.structuredPatch.length > 0
+        ? response.structuredPatch
+        : undefined;
+    return {
+        content: [v2DiffContent(filePath, "update", hunks)],
+        locations: hunks
+            ? hunks.map(({ newStart }) => ({ path: filePath, line: newStart }))
+            : [{ path: filePath }],
+    };
+}
 /**
  * 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 function gitPatchText(filePath, change, hunks) {
+export function gitPatchText(filePath, change, hunks, paths = "git") {
     return [
-        ...gitPatchHeader(filePath, change),
+        ...gitPatchHeader(filePath, change, paths),
         ...hunks.flatMap((hunk) => [hunkHeader(hunk), ...hunk.lines]),
         "",
     ].join("\n");
 }
-function gitPatchHeader(filePath, change) {
-    // git drops one leading slash of an absolute path; a Windows path gets
-    // forward slashes so the header names the same file on every platform.
-    const name = filePath.replaceAll("\\", "/").replace(/^\/+/u, "");
-    const oldName = quoteGitPath("a/", name);
-    const newName = quoteGitPath("b/", name);
+function gitPatchHeader(filePath, change, paths) {
+    // A Windows path gets forward slashes so the header names the same file on
+    // every platform.
+    const slashed = filePath.replaceAll("\\", "/");
+    // git drops one leading slash of an absolute path.
+    const name = paths === "git" ? slashed.replace(/^\/+/u, "") : slashed;
+    const oldName = quoteGitPath(paths === "git" ? "a/" : "", name);
+    const newName = quoteGitPath(paths === "git" ? "b/" : "", name);
     // git ends a ---/+++ name that contains a space with a tab, for GNU patch.
     const tab = name.includes(" ") ? "\t" : "";
     return [
@@ -400,15 +453,15 @@ function textLines(text) {
     return text.match(/[^\n]*\n|[^\n]+$/g) ?? [];
 }
 /**
- * The git patch of a file change and its hunks. Returns undefined when
- * nothing changed or the diff runs out of its time budget.
+ * The patch of a change from `oldText`, null for a missing file, to
+ * `newText`. Returns undefined when nothing changed or the diff runs out of
+ * its time budget.
  */
-function filePatch(filePath, oldText, newText) {
+function filePatch(oldText, newText) {
     const hunks = diffHunks(oldText, newText);
     if (!hunks || hunks.length === 0)
         return undefined;
-    const change = oldText === null ? "create" : "update";
-    return { content: patchContent(filePath, gitPatchText(filePath, change, hunks)), hunks };
+    return { change: oldText === null ? "create" : "update", hunks };
 }
 /**
  * Reads a file as patch input.
@@ -472,8 +525,10 @@ function isPatchableText(text) {
         !text.includes("\0") &&
         !text.includes("\r"));
 }
-function optionalContent(content) {
-    return content ? [content] : undefined;
+/** The AIR patch content of a change, or undefined when it has no patch. */
+function airPatch(filePath, oldText, newText) {
+    const patch = filePatch(oldText, newText);
+    return patch && [airPatchContent(filePath, patch)];
 }
 /**
  * A diff block in the AIR patch form.
@@ -481,7 +536,7 @@ function optionalContent(content) {
  * `oldText: null` and `newText: ""` only satisfy the ACP schema. The adapter
  * sends this form only to a client that advertised `diffPatch`.
  */
-function patchContent(filePath, text) {
+function airPatchContent(filePath, { change, hunks }) {
     return {
         type: "diff",
         path: filePath,
@@ -490,10 +545,32 @@ function patchContent(filePath, text) {
         _meta: withAirMeta(undefined, AIR_DIFF_PATCH_CAPABILITY, {
             version: 1,
             format: "git_patch",
-            text,
+            text: gitPatchText(filePath, change, hunks),
         }),
     };
 }
+/**
+ * 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 function v2DiffContent(filePath, change, hunks) {
+    const fileChange = change === "create"
+        ? { operation: "add", path: filePath, fileType: "text" }
+        : { operation: "modify", path: filePath, fileType: "text" };
+    const diff = {
+        type: "diff",
+        changes: [fileChange],
+        ...(hunks?.length
+            ? { patch: { format: "git_patch", text: gitPatchText(filePath, change, hunks, "absolute") } }
+            : {}),
+    };
+    return diff;
+}
 function resolveToolPath(filePath, cwd) {
     return path.isAbsolute(filePath) ? filePath : path.resolve(cwd ?? process.cwd(), filePath);
 }

package/dist/mcp-command.d.ts

@@ -0,0 +1,51 @@
+import type { AvailableCommand } from "@agentclientprotocol/sdk";
+import type { McpServerStatus, Query } from "@anthropic-ai/claude-agent-sdk";
+/** The `/mcp` entry of `available_commands_update`. The adapter shows the
+ *  servers as a list, and runs a reconnect, an enable, or a disable through
+ *  the SDK control API. */
+export declare const MCP_AVAILABLE_COMMAND: AvailableCommand;
+/** A `/mcp` prompt that gets a replacement for its Claude Code text. `all` is
+ *  true for `all` and for a reconnect without a server name, as in Claude
+ *  Code. `server` is undefined for an enable or a disable without a name. */
+export type McpCommand = {
+    action: "status";
+} | {
+    action: "reconnect" | "enable" | "disable";
+    all: boolean;
+    server?: string;
+};
+/** Parse a prompt that is exactly `/mcp`, or `/mcp reconnect`, `/mcp enable`,
+ *  or `/mcp disable` with an optional server name or `all`. Any other `/mcp`
+ *  argument gives null, and the prompt gets no replacement. */
+export declare function parseMcpCommand(text: string): McpCommand | null;
+/** Read the MCP server status for the list after a `/mcp` command. Resolves
+ *  to null when the read fails, takes too long, or `signal` aborts. Then the
+ *  turn keeps the text of Claude Code. */
+export declare function readMcpServerStatus(query: Pick<Query, "mcpServerStatus">, signal: AbortSignal, logError: (message: string) => void): Promise<McpServerStatus[] | null>;
+/** Make an MCP error short and readable for one list item. The result has
+ *  no leading wrapper segments, at most two sentences, and at most
+ *  `MAX_ERROR_LENGTH` code points. A wrapper before an error code stays, so
+ *  an error code is never alone. The result is empty for an error with only
+ *  whitespace. */
+export declare function cleanMcpError(error: string): string;
+/** Markdown for `/mcp`: a summary line, one group of servers for each
+ *  status, and the disabled servers on one line. A list reads better than a
+ *  table in a narrow chat. */
+export declare function formatMcpStatus(statuses: McpServerStatus[]): string;
+/** The SDK query methods that `/mcp` uses. */
+export type McpControlQuery = Pick<Query, "mcpServerStatus" | "reconnectMcpServer" | "toggleMcpServer">;
+/** The result of {@link runMcpCommand}. `markdown` is null when the turn
+ *  keeps the text of Claude Code. `reconnected` holds the servers that the
+ *  adapter tried to reconnect. */
+export type McpCommandOutcome = {
+    markdown: string | null;
+    reconnected: string[];
+};
+/** Run a `/mcp` command after Claude Code sent `originalOutput`, its text for
+ *  the command. Claude Code refuses a reconnect, an enable, and a disable in
+ *  SDK mode, so the adapter runs them through the SDK control API. The result
+ *  of each server goes above the server list. An error of one server does
+ *  not stop the others. When the first status read fails or `signal`
+ *  aborts, the turn keeps the text of Claude Code. */
+export declare function runMcpCommand(query: McpControlQuery, command: McpCommand, originalOutput: string, signal: AbortSignal, logError: (message: string) => void): Promise<McpCommandOutcome>;
+//# sourceMappingURL=mcp-command.d.ts.map

package/dist/mcp-command.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp-command.d.ts","sourceRoot":"","sources":["../src/mcp-command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,KAAK,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAC;AAI7E;;2BAE2B;AAC3B,eAAO,MAAM,qBAAqB,EAAE,gBAInC,CAAC;AAQF;;6EAE6E;AAC7E,MAAM,MAAM,UAAU,GAClB;IAAE,MAAM,EAAE,QAAQ,CAAA;CAAE,GACpB;IAAE,MAAM,EAAE,WAAW,GAAG,QAAQ,GAAG,SAAS,CAAC;IAAC,GAAG,EAAE,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAElF;;+DAE+D;AAC/D,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI,CAW/D;AAED;;0CAE0C;AAC1C,wBAAsB,mBAAmB,CACvC,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,iBAAiB,CAAC,EACrC,MAAM,EAAE,WAAW,EACnB,QAAQ,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,GAClC,OAAO,CAAC,eAAe,EAAE,GAAG,IAAI,CAAC,CAkBnC;AAuED;;;;kBAIkB;AAClB,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAiBnD;AA2DD;;8BAE8B;AAC9B,wBAAgB,eAAe,CAAC,QAAQ,EAAE,eAAe,EAAE,GAAG,MAAM,CA6BnE;AAED,8CAA8C;AAC9C,MAAM,MAAM,eAAe,GAAG,IAAI,CAChC,KAAK,EACL,iBAAiB,GAAG,oBAAoB,GAAG,iBAAiB,CAC7D,CAAC;AAEF;;kCAEkC;AAClC,MAAM,MAAM,iBAAiB,GAAG;IAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,WAAW,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AA4DnF;;;;;sDAKsD;AACtD,wBAAsB,aAAa,CACjC,KAAK,EAAE,eAAe,EACtB,OAAO,EAAE,UAAU,EACnB,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,WAAW,EACnB,QAAQ,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,GAClC,OAAO,CAAC,iBAAiB,CAAC,CAoD5B"}