@agentclientprotocol/claude-agent-acp 0.85.2-preview.19 → 0.85.2-preview.3

package/dist/air-extension.d.ts

@@ -17,8 +17,6 @@ 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,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"}
+{"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"}

package/dist/air-extension.js

@@ -17,8 +17,6 @@ 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,17 +23,6 @@ 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.
  *
@@ -46,14 +35,14 @@ type GitPatchPaths = "git" | "absolute";
  * normalizes quotes or fails.
  *
  * A Write always gets content that shows the change: the patch, the standard
- * 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.
+ * diff 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, form?: PatchForm): Promise<ToolCallContent[] | undefined>;
+export declare function previewPatchContent(toolName: string, input: Record<string, unknown>, cwd?: string): Promise<ToolCallContent[] | undefined>;
 /**
  * Builds the git patch for a finished Edit or Write from the file on disk.
  *
@@ -65,7 +54,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, form?: PatchForm): Promise<{
+export declare function patchUpdateFromDiffToolResponse(toolResponse: unknown): Promise<{
     content: ToolCallContent[];
     locations: ToolCallLocation[];
 } | undefined>;
@@ -80,39 +69,13 @@ 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 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`).
+ * 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.
  */
-export declare function v2DiffContent(filePath: string, change: FileChange, hunks?: PatchHunk[]): ToolCallContent;
+export declare function gitPatchText(filePath: string, change: FileChange, hunks: PatchHunk[]): string;
 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;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"}
+{"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"}

package/dist/diff.js

@@ -37,14 +37,14 @@ const NO_NEWLINE_MARKER = "\";
  * normalizes quotes or fails.
  *
  * A Write always gets content that shows the change: the patch, the standard
- * 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.
+ * diff 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 async function previewPatchContent(toolName, input, cwd, form = "air") {
+export async function previewPatchContent(toolName, input, cwd) {
     if (toolName === "Edit") {
         const edit = input;
         if (typeof edit.file_path !== "string" ||
@@ -67,7 +67,7 @@ export async function previewPatchContent(toolName, input, cwd, form = "air") {
             if (oldText !== null && (oldText.trim() !== "" || oldText.includes("\uFEFF"))) {
                 return undefined;
             }
-            return exactPatch(filePath, oldText, newString, form);
+            return optionalContent(filePatch(filePath, oldText, newString)?.content);
         }
         if (oldText === null)
             return undefined;
@@ -78,7 +78,7 @@ export async function previewPatchContent(toolName, input, cwd, form = "air") {
             return undefined;
         }
         const newText = replacedText(oldText, oldString, newString, edit.replace_all === true);
-        return exactPatch(filePath, oldText, newText, form);
+        return optionalContent(filePatch(filePath, oldText, newText)?.content);
     }
     if (toolName === "Write") {
         const write = normalizeWriteInput(input);
@@ -104,14 +104,12 @@ export async function previewPatchContent(toolName, input, cwd, form = "air") {
         if (oldText === content)
             return undefined;
         const standard = [
-            form === "v2"
-                ? v2DiffContent(filePath, oldText === null ? "create" : "update")
-                : { type: "diff", path: write.file_path, oldText, newText: content },
+            { type: "diff", path: write.file_path, oldText, newText: content },
         ];
         if (!isPatchableText(content))
             return standard;
         // A dense change can exceed the diff budget. The approval then shows the standard diff.
-        return exactPatch(filePath, oldText, content, form) ?? standard;
+        return optionalContent(filePatch(filePath, oldText, content)?.content) ?? standard;
     }
     return undefined;
 }
@@ -153,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, form = "air") {
+export async function patchUpdateFromDiffToolResponse(toolResponse) {
     if (!toolResponse || typeof toolResponse !== "object")
         return undefined;
     const response = toolResponse;
@@ -187,11 +185,11 @@ export async function patchUpdateFromDiffToolResponse(toolResponse, form = "air"
         return undefined;
     if (response.type === "create" && newText !== response.content)
         return undefined;
-    const patch = filePatch(oldText, newText);
+    const patch = filePatch(response.filePath, oldText, newText);
     if (!patch)
         return undefined;
     return {
-        content: [patchContent(response.filePath, patch, form)],
+        content: [patch.content],
         // A created file keeps the location of its Write tool call.
         locations: oldText === null
             ? [{ path: response.filePath }]
@@ -276,75 +274,26 @@ 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 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.
+ * 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.
  */
-export function gitPatchText(filePath, change, hunks, paths = "git") {
+export function gitPatchText(filePath, change, hunks) {
     return [
-        ...gitPatchHeader(filePath, change, paths),
+        ...gitPatchHeader(filePath, change),
         ...hunks.flatMap((hunk) => [hunkHeader(hunk), ...hunk.lines]),
         "",
     ].join("\n");
 }
-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);
+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);
     // git ends a ---/+++ name that contains a space with a tab, for GNU patch.
     const tab = name.includes(" ") ? "\t" : "";
     return [
@@ -451,15 +400,15 @@ function textLines(text) {
     return text.match(/[^\n]*\n|[^\n]+$/g) ?? [];
 }
 /**
- * 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.
+ * The git patch of a file change and its hunks. Returns undefined when
+ * nothing changed or the diff runs out of its time budget.
  */
-function filePatch(oldText, newText) {
+function filePatch(filePath, oldText, newText) {
     const hunks = diffHunks(oldText, newText);
     if (!hunks || hunks.length === 0)
         return undefined;
-    return { change: oldText === null ? "create" : "update", hunks };
+    const change = oldText === null ? "create" : "update";
+    return { content: patchContent(filePath, gitPatchText(filePath, change, hunks)), hunks };
 }
 /**
  * Reads a file as patch input.
@@ -523,16 +472,8 @@ function isPatchableText(text) {
         !text.includes("\0") &&
         !text.includes("\r"));
 }
-/** The exact patch content of a change, or undefined when it has no patch. */
-function exactPatch(filePath, oldText, newText, form) {
-    const patch = filePatch(oldText, newText);
-    return patch && [patchContent(filePath, patch, form)];
-}
-/** The content that carries a patch, in the given form. */
-function patchContent(filePath, patch, form) {
-    return form === "v2"
-        ? v2DiffContent(filePath, patch.change, patch.hunks)
-        : airPatchContent(filePath, patch);
+function optionalContent(content) {
+    return content ? [content] : undefined;
 }
 /**
  * A diff block in the AIR patch form.
@@ -540,7 +481,7 @@ function patchContent(filePath, patch, form) {
  * `oldText: null` and `newText: ""` only satisfy the ACP schema. The adapter
  * sends this form only to a client that advertised `diffPatch`.
  */
-function airPatchContent(filePath, { change, hunks }) {
+function patchContent(filePath, text) {
     return {
         type: "diff",
         path: filePath,
@@ -549,32 +490,10 @@ function airPatchContent(filePath, { change, hunks }) {
         _meta: withAirMeta(undefined, AIR_DIFF_PATCH_CAPABILITY, {
             version: 1,
             format: "git_patch",
-            text: gitPatchText(filePath, change, hunks),
+            text,
         }),
     };
 }
-/**
- * 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/permissions/presentation.d.ts

@@ -1,24 +1,12 @@
 import type { RequestPermissionRequest, ToolCallContent } from "@agentclientprotocol/sdk";
 import { ClientCapabilities } from "../tool-calls/client-capabilities.js";
-/**
- * A permission request as the agent builds it. For a v2 client it also
- * carries the heading and the explanation of the prompt, which ACP v2 sends as
- * the request's `title` and `description`. v1 has no field for them; AIR gets
- * them in `_meta`.
- */
-export type AcpPermissionRequest = RequestPermissionRequest & {
-    /** The heading of the prompt. It is not the title of the tool call. */
-    title?: string;
-    /** Why the permission is asked. */
-    description?: string;
-};
 export interface ClaudePermissionPresentationInput {
     toolName: string;
     input: Record<string, unknown>;
     toolUseID: string;
     cwd?: string;
     capabilities?: ClientCapabilities;
-    /** The exact patch of the change to approve, for a negotiated `diffPatch` client or a v2 client. */
+    /** The exact patch of the change to approve, for a negotiated `diffPatch` client. */
     previewContent?: ToolCallContent[];
     blockedPath?: string;
     title?: string;
@@ -34,9 +22,6 @@ export interface ClaudePermissionPresentationInput {
  * adapter emits the `tool_call` before the request, so the client already
  * holds the rest. The request adds only what it shows new: the exact preview
  * patch, and the blocked path when the tool call has no such location.
- *
- * The heading and the explanation of the prompt go to AIR in `_meta`, and to a
- * v2 client as `title` and `description`.
  */
-export declare function buildClaudePermissionPresentation(value: ClaudePermissionPresentationInput): Pick<AcpPermissionRequest, "toolCall" | "_meta" | "title" | "description">;
+export declare function buildClaudePermissionPresentation(value: ClaudePermissionPresentationInput): Pick<RequestPermissionRequest, "toolCall" | "_meta">;
 //# sourceMappingURL=presentation.d.ts.map

package/dist/permissions/presentation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"presentation.d.ts","sourceRoot":"","sources":["../../src/permissions/presentation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAE1F,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAG1E;;;;;GAKG;AACH,MAAM,MAAM,oBAAoB,GAAG,wBAAwB,GAAG;IAC5D,uEAAuE;IACvE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,mCAAmC;IACnC,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,WAAW,iCAAiC;IAChD,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,kBAAkB,CAAC;IAClC,oGAAoG;IACpG,cAAc,CAAC,EAAE,eAAe,EAAE,CAAC;IACnC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AA0BD;;;;;;;;;;GAUG;AACH,wBAAgB,iCAAiC,CAC/C,KAAK,EAAE,iCAAiC,GACvC,IAAI,CAAC,oBAAoB,EAAE,UAAU,GAAG,OAAO,GAAG,OAAO,GAAG,aAAa,CAAC,CAiE5E"}
+{"version":3,"file":"presentation.d.ts","sourceRoot":"","sources":["../../src/permissions/presentation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAE1F,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAG1E,MAAM,WAAW,iCAAiC;IAChD,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,kBAAkB,CAAC;IAClC,qFAAqF;IACrF,cAAc,CAAC,EAAE,eAAe,EAAE,CAAC;IACnC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AA0BD;;;;;;;GAOG;AACH,wBAAgB,iCAAiC,CAC/C,KAAK,EAAE,iCAAiC,GACvC,IAAI,CAAC,wBAAwB,EAAE,UAAU,GAAG,OAAO,CAAC,CAgEtD"}

package/dist/permissions/presentation.js

@@ -29,9 +29,6 @@ function compactText(value) {
  * adapter emits the `tool_call` before the request, so the client already
  * holds the rest. The request adds only what it shows new: the exact preview
  * patch, and the blocked path when the tool call has no such location.
- *
- * The heading and the explanation of the prompt go to AIR in `_meta`, and to a
- * v2 client as `title` and `description`.
  */
 export function buildClaudePermissionPresentation(value) {
     const capabilities = value.capabilities ?? new ClientCapabilities();
@@ -92,6 +89,5 @@ export function buildClaudePermissionPresentation(value) {
                 }),
             }
             : {}),
-        ...(capabilities.v2 ? { title, ...(description ? { description } : {}) } : {}),
     };
 }

package/dist/resumed-session.d.ts

@@ -15,25 +15,15 @@ export declare function resumedModelFromTranscript(messages: SessionMessage[]):
 /** Read the resume model from the local transcript without starting a Claude
  * control request. This is intentionally on the load critical path. */
 export declare function readResumedSession(sessionId: string, logger?: ResumeLogger): Promise<ResumedSessionSnapshot>;
-/** What a resume restores from the end of the local transcript. */
-export type ResumedTail = {
-    model?: string;
-    /** The last permission mode of the main thread. See {@link TailScan}. */
-    permissionMode?: string;
-};
 /**
- * Read the resume model and the permission mode of a session from the end
- * of its local transcript.
- *
- * A resume needs only these two values, not the messages. The transcript file
- * is read backwards until both are known, so the cost does not grow with the
- * length of the session. A session without a local transcript file falls back
- * to {@link readResumedSession} for the model.
+ * Read the resume model of a session from the end of its local transcript.
  *
- * A caller that already has the model passes `withModel: false`. The read then
- * looks for the permission mode only and has no fallback.
+ * A resume needs only the model, not the messages. The transcript file is
+ * read backwards until the last real assistant record of the main thread, so
+ * the cost does not grow with the length of the session. A session without a
+ * local transcript file falls back to {@link readResumedSession}.
  */
-export declare function readResumedTail(sessionId: string, logger?: ResumeLogger, withModel?: boolean): Promise<ResumedTail>;
+export declare function readResumedModel(sessionId: string, logger?: ResumeLogger): Promise<string | undefined>;
 /** The local transcript of a session in any project directory, as the SDK looks it up. */
 export declare function findTranscript(sessionId: string): Promise<string | undefined>;
 export {};

package/dist/resumed-session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resumed-session.d.ts","sourceRoot":"","sources":["../src/resumed-session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,KAAK,cAAc,EAAE,MAAM,gCAAgC,CAAC;AASzF,KAAK,YAAY,GAAG;IAClB,GAAG,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;IAClC,KAAK,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,QAAQ,CAAC,EAAE,cAAc,EAAE,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF;;;iDAGiD;AACjD,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,cAAc,EAAE,GAAG,MAAM,GAAG,SAAS,CAgBzF;AASD;uEACuE;AACvE,wBAAsB,kBAAkB,CACtC,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,YAAY,GACpB,OAAO,CAAC,sBAAsB,CAAC,CAejC;AAED,mEAAmE;AACnE,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,yEAAyE;IACzE,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,wBAAsB,eAAe,CACnC,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,YAAY,EACrB,SAAS,UAAO,GACf,OAAO,CAAC,WAAW,CAAC,CAiBtB;AAED,0FAA0F;AAC1F,wBAAsB,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAkBnF"}
+{"version":3,"file":"resumed-session.d.ts","sourceRoot":"","sources":["../src/resumed-session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,KAAK,cAAc,EAAE,MAAM,gCAAgC,CAAC;AASzF,KAAK,YAAY,GAAG;IAClB,GAAG,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;IAClC,KAAK,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,QAAQ,CAAC,EAAE,cAAc,EAAE,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF;;;iDAGiD;AACjD,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,cAAc,EAAE,GAAG,MAAM,GAAG,SAAS,CAgBzF;AASD;uEACuE;AACvE,wBAAsB,kBAAkB,CACtC,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,YAAY,GACpB,OAAO,CAAC,sBAAsB,CAAC,CAejC;AAED;;;;;;;GAOG;AACH,wBAAsB,gBAAgB,CACpC,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,YAAY,GACpB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAc7B;AAED,0FAA0F;AAC1F,wBAAsB,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAkBnF"}

package/dist/resumed-session.js

@@ -52,32 +52,28 @@ export async function readResumedSession(sessionId, logger) {
     }
 }
 /**
- * Read the resume model and the permission mode of a session from the end
- * of its local transcript.
+ * Read the resume model of a session from the end of its local transcript.
  *
- * A resume needs only these two values, not the messages. The transcript file
- * is read backwards until both are known, so the cost does not grow with the
- * length of the session. A session without a local transcript file falls back
- * to {@link readResumedSession} for the model.
- *
- * A caller that already has the model passes `withModel: false`. The read then
- * looks for the permission mode only and has no fallback.
+ * A resume needs only the model, not the messages. The transcript file is
+ * read backwards until the last real assistant record of the main thread, so
+ * the cost does not grow with the length of the session. A session without a
+ * local transcript file falls back to {@link readResumedSession}.
  */
-export async function readResumedTail(sessionId, logger, withModel = true) {
+export async function readResumedModel(sessionId, logger) {
     const timing = new SessionTiming(logger, "models", sessionId);
     try {
         const filePath = await findTranscript(sessionId);
         if (filePath) {
-            const tail = await lastTailRecords(filePath, withModel);
-            timing.phase("read-transcript-tail", ` model=${tail.model ?? "unknown"} permissionMode=${tail.permissionMode ?? "unknown"}`);
-            return tail;
+            const model = await lastAssistantModel(filePath);
+            timing.phase("read-transcript-tail", ` model=${model ?? "unknown"}`);
+            return model;
         }
     }
     catch (error) {
         timing.phase("read-transcript-tail", " outcome=error");
         logger?.error(`Failed to read the transcript tail of resumed session ${sessionId}:`, error);
     }
-    return withModel ? { model: (await readResumedSession(sessionId, logger)).model } : {};
+    return (await readResumedSession(sessionId, logger)).model;
 }
 /** The local transcript of a session in any project directory, as the SDK looks it up. */
 export async function findTranscript(sessionId) {
@@ -101,11 +97,9 @@ export async function findTranscript(sessionId) {
     }
     return undefined;
 }
-/** The model of the last real assistant record and the last permission mode
- * of the main thread in a JSONL transcript. */
-async function lastTailRecords(filePath, withModel) {
+/** The model of the last real assistant record of the main thread in a JSONL transcript. */
+async function lastAssistantModel(filePath) {
     const handle = await open(filePath, "r");
-    const scan = new TailScan(withModel);
     try {
         let end = (await handle.stat()).size;
         // The bytes of the line whose start is not read yet, in file order.
@@ -115,96 +109,36 @@ async function lastTailRecords(filePath, withModel) {
             let chunk = Buffer.alloc(end - start);
             await handle.read(chunk, 0, chunk.length, start);
             for (let at = chunk.lastIndexOf(0x0a); at >= 0; at = chunk.lastIndexOf(0x0a)) {
-                if (scan.visit(Buffer.concat([chunk.subarray(at + 1), ...pending])))
-                    return scan.tail;
+                const model = assistantModelOfLine(Buffer.concat([chunk.subarray(at + 1), ...pending]));
+                if (model)
+                    return model;
                 pending = [];
                 chunk = chunk.subarray(0, at);
             }
             pending.unshift(chunk);
             end = start;
         }
-        scan.visit(Buffer.concat(pending));
-        return scan.tail;
+        return assistantModelOfLine(Buffer.concat(pending));
     }
     finally {
         await handle.close();
     }
 }
-/**
- * Reads the lines of a transcript from the end and keeps what a resume needs.
- *
- * Claude Code records the permission mode on each prompt record of type `user`.
- * The `permission-mode` records of the CLI metadata block are not used: they
- * can disagree with the prompts, and the SDK does not write them.
- * The SDK writes no record when it leaves plan mode through ExitPlanMode.
- * It writes a `plan_mode_exit` attachment only, without the new mode. Thus a
- * `plan` mode before a later plan exit is not the current mode, and the scan
- * gives no mode.
- *
- * The mode search stops at the first mode record or at the last human prompt.
- * Each human prompt of a current Claude Code has the mode, so a prompt without
- * it means that the transcript does not record modes. A compaction does not
- * stop the search: the mode of the prompt before it is still current.
- */
-class TailScan {
-    withModel;
-    tail = {};
-    modeDone = false;
-    planExited = false;
-    constructor(withModel) {
-        this.withModel = withModel;
-    }
-    /** Visit the previous line. Return true when the scan has all it needs. */
-    visit(line) {
-        let parsed;
-        // Most lines have no marker of interest. The check skips their JSON parse.
-        const record = (marker) => {
-            if (line.indexOf(marker) < 0)
-                return undefined;
-            if (parsed === undefined)
-                parsed = parseMainThreadRecord(line);
-            return parsed ?? undefined;
-        };
-        if (this.withModel && this.tail.model === undefined) {
-            const entry = record('"assistant"');
-            if (entry?.type === "assistant")
-                this.tail.model = concreteModel(entry.message?.model);
-        }
-        if (!this.modeDone)
-            this.visitForMode(record);
-        return (!this.withModel || this.tail.model !== undefined) && this.modeDone;
-    }
-    visitForMode(record) {
-        const modeEntry = record('"permissionMode"');
-        if (modeEntry?.type === "user" &&
-            typeof modeEntry.permissionMode === "string" &&
-            modeEntry.permissionMode.trim() !== "") {
-            const mode = modeEntry.permissionMode.trim();
-            this.modeDone = true;
-            if (!(this.planExited && mode === "plan"))
-                this.tail.permissionMode = mode;
-            return;
-        }
-        if (record('"plan_mode_exit"')?.attachment?.type === "plan_mode_exit") {
-            this.planExited = true;
-            return;
-        }
-        const human = record('"human"');
-        if (human?.type === "user" && human.origin?.kind === "human")
-            this.modeDone = true;
-    }
-}
-/** The parsed record of one line, or null for a subagent record or a bad line. */
-function parseMainThreadRecord(line) {
+function assistantModelOfLine(line) {
+    // Most lines are not assistant records. The check skips their JSON parse.
+    if (line.indexOf('"assistant"') < 0)
+        return undefined;
     let entry;
     try {
         entry = JSON.parse(line.toString("utf8"));
     }
     catch {
-        return null;
+        return undefined;
     }
     if (!entry || typeof entry !== "object")
-        return null;
+        return undefined;
     const record = entry;
-    return record.isSidechain === true ? null : record;
+    if (record.type !== "assistant" || record.isSidechain === true)
+        return undefined;
+    return concreteModel(record.message?.model);
 }