@agentclientprotocol/claude-agent-acp 0.89.2-preview.9 → 0.90.0

package/dist/tool-calls/renderer.d.ts

@@ -84,16 +84,32 @@ export declare class AcpToolCallRenderer {
     /** True when the renderer reports the history of a loaded session. */
     replay?: boolean);
     static for(capabilities: AcpClientCapabilities | null | undefined, replay?: boolean): AcpToolCallRenderer;
+    /**
+     * Whether the client keeps a tool call's `_meta` across reports: AIR merges
+     * its keys, and v2 stores it. Such a client gets no `toolResponse` text that
+     * the tool call's content already shows, which it would otherwise keep.
+     */
+    private get keepsMeta();
     /**
      * The status of a tool result. Claude Code reports a run that it aborted in
-     * one of two ways: an error result whose `nonExecution` kind says so (a
-     * cancelled turn), or a command result that says `interrupted` (for example,
-     * a steering message landed just before the command started). Such a run is
-     * `cancelled` for a v2 client, which has that status. Every other client gets
-     * `failed` for the error, with the kind in `_meta.claudeCode.nonExecutionKind`,
-     * and `completed` for the command.
+     * one of three ways:
+     * - an error result whose `nonExecution` kind says so (`interrupted`,
+     *   `cancelled`);
+     * - a command result that says `interrupted` (for example, a steering
+     *   message landed just before the command started);
+     * - any error result of the work that a `session/cancel` stopped
+     *   (`run.cancelled`). The kind does not say so there: CLI 2.1.293 stamps a
+     *   command that the interrupt killed `user-rejected`, as if the user had
+     *   refused it.
+     *
+     * Such a run is `cancelled` for a v2 client, which has that status. Every
+     * other client gets `failed` for the error, with the kind in
+     * `_meta.claudeCode.nonExecutionKind`, and `completed` for the command.
      */
-    resultStatus(isError: boolean, nonExecution: ToolResultMeta | undefined, interrupted?: boolean): ToolCallStatus;
+    resultStatus(isError: boolean, nonExecution: ToolResultMeta | undefined, run?: {
+        interrupted?: boolean;
+        cancelled?: boolean;
+    }): ToolCallStatus;
     /** The facts of a tool use. */
     facts(toolUse: Pick<ToolUse, "name" | "input">, cwd?: string): ToolUseFacts;
     /** The standard fields of a tool use: the title, the kind, the content, and the locations. */
@@ -159,6 +175,7 @@ export declare class AcpToolCallRenderer {
     result(toolUse: ToolUse, result: ResultBlock, options?: {
         structured?: unknown;
         nonExecution?: ToolResultMeta;
+        cancelled?: boolean;
     }): ToolCallUpdate[];
     /**
      * Whether AIR shows [toolUse] as the list of viewed files: a read or a
@@ -169,7 +186,8 @@ export declare class AcpToolCallRenderer {
     /**
      * The report of a PostToolUse hook: the final change of an edit tool, and
      * the `status` and `isAsync` markers of the `tool_response`. The rest of the
-     * `tool_response` repeats output that the content already carries.
+     * `tool_response` repeats output that the content already carries, such as
+     * the whole text of a written file.
      */
     hookResult(toolUse: Pick<ToolUse, "id" | "name">, toolResponse: unknown, cwd?: string): Promise<ToolCallUpdate | undefined>;
     /**
@@ -203,11 +221,14 @@ export declare class AcpToolCallRenderer {
      * reached a complete assistant message, for example because Claude switched
      * to a steering message), a v2 client gets `cancelled` and every other
      * client `failed`, since v1 has no `cancelled`. If Claude Code ran it but
-     * returned no result, it failed.
+     * returned no result, it failed, unless a `session/cancel` ended the turn
+     * (`cancelled`): the cancel stopped the run, so a v2 client gets `cancelled`
+     * for it too.
      */
     unfinished(call: {
         toolCallId: string;
         ran: boolean;
+        cancelled?: boolean;
     }): ToolCallUpdate;
     /**
      * The report of a tool progress beat. The field tracker sends the

package/dist/tool-calls/renderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"renderer.d.ts","sourceRoot":"","sources":["../../src/tool-calls/renderer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"renderer.d.ts","sourceRoot":"","sources":["../../src/tool-calls/renderer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,IAAI,qBAAqB,EAC3C,wBAAwB,EACxB,mBAAmB,EACnB,eAAe,EACf,gBAAgB,EAChB,cAAc,EACf,MAAM,0BAA0B,CAAC;AAQlC,OAAO,EAAuB,KAAK,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAClF,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9D,OAAO,KAAK,EAAE,iBAAiB,EAAE,eAAe,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAM5F,MAAM,MAAM,cAAc,GAAG,mBAAmB,CAAC,QAAQ,CAAC,CAAC;AAa3D,wFAAwF;AACxF,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAExF;AAED,yCAAyC;AACzC,MAAM,MAAM,cAAc,GAAG;IAC3B,UAAU,CAAC,EAAE;QAKX,QAAQ,CAAC,EAAE,MAAM,CAAC;QAKlB,YAAY,CAAC,EAAE,OAAO,CAAC;QAIvB,eAAe,CAAC,EAAE,MAAM,CAAC;QAMzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAG1B,YAAY,CAAC,EAAE,MAAM,CAAC;QAEtB,SAAS,CAAC,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAA;SAAE,CAAC;KAC9C,CAAC;IAEF,SAAS,CAAC,EAAE;QACV,GAAG,CAAC,EAAE;YACJ,OAAO,CAAC,EAAE,MAAM,CAAC;YAGjB,YAAY,CAAC,EAAE,MAAM,CAAC;YAGtB,QAAQ,CAAC,EAAE,IAAI,CAAC;YAGhB,KAAK,CAAC,EAAE;gBAAE,IAAI,EAAE,MAAM,CAAC;gBAAC,IAAI,CAAC,EAAE,MAAM,CAAA;aAAE,CAAC;YACxC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;SACxB,CAAC;KACH,CAAC;IAEF,gBAAgB,CAAC,EAAE,IAAI,CAAC;IAExB,aAAa,CAAC,EAAE;QACd,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;IACF,eAAe,CAAC,EAAE;QAChB,WAAW,EAAE,MAAM,CAAC;QACpB,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,qBAAqB,CAAC,EAAE;QACtB,WAAW,EAAE,MAAM,CAAC;QACpB,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,aAAa,CAAC,EAAE;QACd,WAAW,EAAE,MAAM,CAAC;QACpB;;;WAGG;QACH,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;QACzB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;KACvB,CAAC;CACH,CAAC;AAEF,oFAAoF;AACpF,MAAM,WAAW,cAAc;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,eAAe,EAAE,CAAC;IAC5B,SAAS,CAAC,EAAE,gBAAgB,EAAE,CAAC;IAC/B,wDAAwD;IACxD,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,qFAAqF;IACrF,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,oDAAoD;IACpD,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,KAAK,CAAC,EAAE,IAAI,CACV,cAAc,EACd,eAAe,GAAG,iBAAiB,GAAG,uBAAuB,GAAG,eAAe,CAChF,CAAC;CACH;AAED,4DAA4D;AAC5D,KAAK,WAAW,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC;AAE/C;;;;;;;;GAQG;AACH,qBAAa,mBAAmB;IAE5B,QAAQ,CAAC,YAAY,EAAE,kBAAkB;IACzC,sEAAsE;IACtE,QAAQ,CAAC,MAAM;gBAFN,YAAY,GAAE,kBAA6C;IACpE,sEAAsE;IAC7D,MAAM,UAAQ;IAGzB,MAAM,CAAC,GAAG,CACR,YAAY,EAAE,qBAAqB,GAAG,IAAI,GAAG,SAAS,EACtD,MAAM,UAAQ,GACb,mBAAmB;IAItB;;;;OAIG;IACH,OAAO,KAAK,SAAS,GAEpB;IAED;;;;;;;;;;;;;;;OAeG;IACH,YAAY,CACV,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,cAAc,GAAG,SAAS,EACxC,GAAG,GAAE;QAAE,WAAW,CAAC,EAAE,OAAO,CAAC;QAAC,SAAS,CAAC,EAAE,OAAO,CAAA;KAAO,GACvD,cAAc;IAQjB,+BAA+B;IAC/B,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,YAAY;IAQ3E,8FAA8F;IAC9F,QAAQ,CACN,OAAO,EAAE,OAAO,EAChB,GAAG,CAAC,EAAE,MAAM,GACX;QACD,KAAK,EAAE,MAAM,CAAC;QACd,IAAI,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;QAC3B,OAAO,EAAE,eAAe,EAAE,CAAC;QAC3B,SAAS,CAAC,EAAE,gBAAgB,EAAE,CAAC;KAChC;IAUD;;;OAGG;IACH,QAAQ,CACN,OAAO,EAAE,OAAO,EAChB,OAAO,GAAE;QAAE,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,aAAa,CAAC,EAAE,OAAO,CAAC;QAAC,cAAc,CAAC,EAAE,eAAe,EAAE,CAAA;KAAO,GAC1F,cAAc;IA4BjB,6DAA6D;IAC7D,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,cAAc;IAc1D;;;;;;OAMG;IACH,iBAAiB,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,GAAG,MAAM,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,MAAM;;;;;;;;;IAarF;;;;;OAKG;IACH,kBAAkB,CAChB,OAAO,EAAE,OAAO,EAChB,OAAO,GAAE;QACP,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,cAAc,CAAC,EAAE,eAAe,EAAE,CAAC;QACnC,cAAc,CAAC,EAAE,gBAAgB,EAAE,CAAC;QACpC,IAAI,CAAC,EAAE,cAAc,CAAC;QACtB,4EAA4E;QAC5E,eAAe,CAAC,EAAE,eAAe,EAAE,CAAC;KAChC,GACL,wBAAwB,CAAC,UAAU,CAAC;IAgCvC,kCAAkC;IAClC,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,UAAU,CAAC,EAAE,OAAO,GAAG,eAAe;IAqBzF,+EAA+E;IAC/E,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,UAAU,CAAC,EAAE,OAAO,GAAG,cAAc;IAIzF,OAAO,CAAC,cAAc;IA0DtB;;;;;OAKG;IACH,MAAM,CACJ,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,WAAW,EACnB,OAAO,GAAE;QAAE,UAAU,CAAC,EAAE,OAAO,CAAC;QAAC,YAAY,CAAC,EAAE,cAAc,CAAC;QAAC,SAAS,CAAC,EAAE,OAAO,CAAA;KAAO,GACzF,cAAc,EAAE;IA2EnB;;;;OAIG;IACH,OAAO,CAAC,eAAe;IAWvB;;;;;OAKG;IACG,UAAU,CACd,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,GAAG,MAAM,CAAC,EACrC,YAAY,EAAE,OAAO,EACrB,GAAG,CAAC,EAAE,MAAM,GACX,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IA4BtC;;;OAGG;IACH,YAAY,CAAC,MAAM,EAAE;QACnB,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,QAAQ,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,OAAO,CAAC,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;KAChD,GAAG,cAAc;IAyBlB;;;;OAIG;IACH,gBAAgB,CAAC,MAAM,EAAE;QACvB,UAAU,EAAE,MAAM,CAAC;QACnB,QAAQ,EAAE,MAAM,CAAC;QACjB,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,kBAAkB,CAAC,EAAE,MAAM,CAAC;QAC5B,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,GAAG,cAAc;IA2BlB;;;;;;;;;OASG;IACH,UAAU,CAAC,IAAI,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,OAAO,CAAC;QAAC,SAAS,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,cAAc;IAkB3F;;;OAGG;IACH,QAAQ,CAAC,IAAI,EAAE;QACb,UAAU,EAAE,MAAM,CAAC;QACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,kBAAkB,EAAE,MAAM,CAAC;QAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,aAAa,CAAC,EAAE,OAAO,CAAC;KACzB,GAAG,cAAc;IAsBlB;;;OAGG;IACH,QAAQ,CAAC,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,OAAO,GAAG,OAAO;IAgBzD;;;;OAIG;IACH,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,GAAG,eAAe,EAAE;IAS1E;;;;;OAKG;IACH,WAAW,CAAC,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,cAAc;CAyBtF"}

package/dist/tool-calls/renderer.js

@@ -5,6 +5,7 @@ import { ClientCapabilities } from "./client-capabilities.js";
 import { resultText, textContent, toAcpContentUpdate, toolResponseMarkers } from "./content.js";
 import { reporterFor } from "./reporters/index.js";
 import { resolveSkillPath } from "./reporters/interaction.js";
+import { shellDescription } from "./reporters/bash.js";
 import { grepPath } from "./reporters/search.js";
 /** The id suffix of the call that clears the plan file of an approved plan for AIR. */
 const PLAN_FILE_CLEAR_SUFFIX = ":plan-file-clear";
@@ -40,17 +41,33 @@ export class AcpToolCallRenderer {
     static for(capabilities, replay = false) {
         return new AcpToolCallRenderer(ClientCapabilities.from(capabilities), replay);
     }
+    /**
+     * Whether the client keeps a tool call's `_meta` across reports: AIR merges
+     * its keys, and v2 stores it. Such a client gets no `toolResponse` text that
+     * the tool call's content already shows, which it would otherwise keep.
+     */
+    get keepsMeta() {
+        return this.capabilities.air.client || this.capabilities.v2;
+    }
     /**
      * The status of a tool result. Claude Code reports a run that it aborted in
-     * one of two ways: an error result whose `nonExecution` kind says so (a
-     * cancelled turn), or a command result that says `interrupted` (for example,
-     * a steering message landed just before the command started). Such a run is
-     * `cancelled` for a v2 client, which has that status. Every other client gets
-     * `failed` for the error, with the kind in `_meta.claudeCode.nonExecutionKind`,
-     * and `completed` for the command.
+     * one of three ways:
+     * - an error result whose `nonExecution` kind says so (`interrupted`,
+     *   `cancelled`);
+     * - a command result that says `interrupted` (for example, a steering
+     *   message landed just before the command started);
+     * - any error result of the work that a `session/cancel` stopped
+     *   (`run.cancelled`). The kind does not say so there: CLI 2.1.293 stamps a
+     *   command that the interrupt killed `user-rejected`, as if the user had
+     *   refused it.
+     *
+     * Such a run is `cancelled` for a v2 client, which has that status. Every
+     * other client gets `failed` for the error, with the kind in
+     * `_meta.claudeCode.nonExecutionKind`, and `completed` for the command.
      */
-    resultStatus(isError, nonExecution, interrupted = false) {
-        const aborted = interrupted || (isError && isAbortedToolResult(nonExecution));
+    resultStatus(isError, nonExecution, run = {}) {
+        const aborted = run.interrupted === true ||
+            (isError && (run.cancelled === true || isAbortedToolResult(nonExecution)));
         if (this.capabilities.v2 && aborted)
             return V2_CANCELLED;
         return isError ? "failed" : "completed";
@@ -306,7 +323,10 @@ export class AcpToolCallRenderer {
             },
             toolCallId: toolUse.id,
             sessionUpdate: "tool_call_update",
-            status: this.resultStatus(result.is_error === true, options.nonExecution, facts.command?.interrupted === true),
+            status: this.resultStatus(result.is_error === true, options.nonExecution, {
+                interrupted: facts.command?.interrupted === true,
+                cancelled: options.cancelled,
+            }),
             ...(rawOutput !== undefined ? { rawOutput } : {}),
             ...(planFilePath ? { rawInput: planFileInput(toolUse.input, planFilePath) } : {}),
             ...fields,
@@ -346,14 +366,15 @@ export class AcpToolCallRenderer {
     /**
      * The report of a PostToolUse hook: the final change of an edit tool, and
      * the `status` and `isAsync` markers of the `tool_response`. The rest of the
-     * `tool_response` repeats output that the content already carries.
+     * `tool_response` repeats output that the content already carries, such as
+     * the whole text of a written file.
      */
     async hookResult(toolUse, toolResponse, cwd) {
         const reporter = reporterFor(toolUse.name);
         const change = reporter.hookResult
             ? await reporter.hookResult(toolResponse, { cwd, capabilities: this.capabilities })
             : {};
-        if (!this.capabilities.air.client) {
+        if (!this.keepsMeta) {
             // The upstream shape: the whole tool_response, on every hook.
             return {
                 _meta: { claudeCode: { toolResponse, toolName: toolUse.name } },
@@ -409,9 +430,10 @@ export class AcpToolCallRenderer {
      */
     permissionDenied(denial) {
         const reason = denial.decisionReason ?? denial.message;
-        // AIR gets the SDK message only when it differs from the reason, which
-        // the content shows. Every other client gets the upstream toolResponse.
-        const extraMessage = !this.capabilities.air.client
+        // AIR and v2 get the SDK message only when it differs from the reason,
+        // which the content shows. Every other client gets the upstream
+        // toolResponse.
+        const extraMessage = !this.keepsMeta
             ? { decisionReason: denial.decisionReason, message: denial.message }
             : denial.decisionReason !== undefined &&
                 denial.message !== undefined &&
@@ -438,17 +460,22 @@ export class AcpToolCallRenderer {
      * reached a complete assistant message, for example because Claude switched
      * to a steering message), a v2 client gets `cancelled` and every other
      * client `failed`, since v1 has no `cancelled`. If Claude Code ran it but
-     * returned no result, it failed.
+     * returned no result, it failed, unless a `session/cancel` ended the turn
+     * (`cancelled`): the cancel stopped the run, so a v2 client gets `cancelled`
+     * for it too.
      */
     unfinished(call) {
+        const stopped = !call.ran || call.cancelled === true;
         return {
             sessionUpdate: "tool_call_update",
             toolCallId: call.toolCallId,
-            status: !call.ran && this.capabilities.v2 ? V2_CANCELLED : "failed",
+            status: stopped && this.capabilities.v2 ? V2_CANCELLED : "failed",
             content: [
-                textContent(call.ran
-                    ? "Claude ended the turn without returning a result for this tool."
-                    : "Claude stopped this tool call before it ran."),
+                textContent(!call.ran
+                    ? "Claude stopped this tool call before it ran."
+                    : call.cancelled
+                        ? "The turn was cancelled before this tool call returned a result."
+                        : "Claude ended the turn without returning a result for this tool."),
             ],
         };
     }
@@ -519,9 +546,8 @@ export class AcpToolCallRenderer {
         const input = toolUse.input !== null && typeof toolUse.input === "object"
             ? toolUse.input
             : {};
-        const description = (toolUse.name === "Bash" || toolUse.name === "PowerShell") &&
-            typeof input.description === "string"
-            ? input.description
+        const description = toolUse.name === "Bash" || toolUse.name === "PowerShell"
+            ? shellDescription(input)
             : undefined;
         const skillName = toolUse.name === "Skill" && typeof input.skill === "string" ? input.skill : undefined;
         const subagent = toolUse.name === "Agent" || toolUse.name === "Task";

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

@@ -1,4 +1,11 @@
 import type { ToolReporter, ToolResultContext, ToolResultFacts, ToolUseFacts } from "../facts.js";
+/**
+ * Reads a Bash or PowerShell input's description the way the CLI validates it.
+ * Since CLI 2.1.295 the CLI accepts `command_description` for `description`.
+ * The streamed tool use keeps the original key. The canonical key wins when
+ * both spellings are present.
+ */
+export declare function shellDescription(input: unknown): string | undefined;
 /** Bash and PowerShell: a command whose output goes to the terminal channel. */
 export declare class BashReporter implements ToolReporter {
     toolUse(input: unknown): ToolUseFacts;

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

@@ -1 +1 @@
-{"version":3,"file":"bash.d.ts","sourceRoot":"","sources":["../../../src/tool-calls/reporters/bash.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,iBAAiB,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAElG,gFAAgF;AAChF,qBAAa,YAAa,YAAW,YAAY;IAC/C,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,YAAY;IAUrC,iFAAiF;IACjF,WAAW,CAAC,OAAO,EAAE,iBAAiB,GAAG,eAAe,GAAG,SAAS;IAIpE,UAAU,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,iBAAiB,GAAG,eAAe;CAsFvE"}
+{"version":3,"file":"bash.d.ts","sourceRoot":"","sources":["../../../src/tool-calls/reporters/bash.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,iBAAiB,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAElG;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAKnE;AAED,gFAAgF;AAChF,qBAAa,YAAa,YAAW,YAAY;IAC/C,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,YAAY;IAWrC,iFAAiF;IACjF,WAAW,CAAC,OAAO,EAAE,iBAAiB,GAAG,eAAe,GAAG,SAAS;IAIpE,UAAU,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,iBAAiB,GAAG,eAAe;CAsFvE"}

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

@@ -1,13 +1,28 @@
 import { structuredResult, textContent, toAcpContentUpdate } from "../content.js";
+/**
+ * Reads a Bash or PowerShell input's description the way the CLI validates it.
+ * Since CLI 2.1.295 the CLI accepts `command_description` for `description`.
+ * The streamed tool use keeps the original key. The canonical key wins when
+ * both spellings are present.
+ */
+export function shellDescription(input) {
+    if (!input || typeof input !== "object")
+        return undefined;
+    const raw = input;
+    if (typeof raw.description === "string")
+        return raw.description;
+    return typeof raw.command_description === "string" ? raw.command_description : undefined;
+}
 /** Bash and PowerShell: a command whose output goes to the terminal channel. */
 export class BashReporter {
     toolUse(input) {
         const bash = input;
+        const description = shellDescription(input);
         return {
             title: bash?.command ? bash.command : "Terminal",
             kind: "execute",
             command: true,
-            ...(bash?.description ? { display: [textContent(bash.description)] } : {}),
+            ...(description ? { display: [textContent(description)] } : {}),
         };
     }
     /** A client with a terminal reads a failed command from the terminal channel. */

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

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

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

@@ -29,9 +29,10 @@ export class GrepReporter {
             label += ` -B ${grep["-B"]}`;
         if (grep?.["-C"] !== undefined)
             label += ` -C ${grep["-C"]}`;
-        if (grep?.output_mode === "files_with_matches")
+        const outputMode = grepOutputMode(input);
+        if (outputMode === "files_with_matches")
             label += " -l";
-        else if (grep?.output_mode === "count")
+        else if (outputMode === "count")
             label += " -c";
         if (grep?.head_limit !== undefined)
             label += ` | head -${grep.head_limit}`;
@@ -49,6 +50,23 @@ export class GrepReporter {
         return { title: label, kind: "search" };
     }
 }
+/**
+ * Reads a Grep input's output mode the way the CLI validates it. Since CLI
+ * 2.1.295 the CLI reads a `-l` or `-c` flag (`true` or `"true"`) as
+ * `output_mode: "files_with_matches"` or `"count"` when `output_mode` is unset.
+ */
+function grepOutputMode(input) {
+    if (!input || typeof input !== "object")
+        return undefined;
+    const raw = input;
+    if (typeof raw.output_mode === "string")
+        return raw.output_mode;
+    if (raw["-l"] === true || raw["-l"] === "true")
+        return "files_with_matches";
+    if (raw["-c"] === true || raw["-c"] === "true")
+        return "count";
+    return undefined;
+}
 /**
  * Reads a Grep input's path the way the CLI validates it. Since CLI 2.1.292
  * the CLI accepts `file_path` for `path`. The streamed tool use keeps the

package/dist/v2/agent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../../src/v2/agent.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,MAAM,0CAA0C,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAkB,KAAK,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAmB9E;;;;;;;;GAQG;AACH,wBAAgB,UAAU,CACxB,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,OAAO,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,GACvC,EAAE,CAAC,QAAQ,CA0Eb"}
+{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../../src/v2/agent.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,MAAM,0CAA0C,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAkB,KAAK,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAoB9E;;;;;;;;GAQG;AACH,wBAAgB,UAAU,CACxB,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,OAAO,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,GACvC,EAAE,CAAC,QAAQ,CA2Eb"}

package/dist/v2/agent.js

@@ -3,9 +3,10 @@ import { ClaudeAcpAgent } from "../acp-agent.js";
 import { v1InitializeRequest, v2InitializeResponse } from "./initialize.js";
 import { v1PermissionResponse, v2PermissionRequest } from "./permission.js";
 import { v2Foreground, v2Prompt } from "./prompt.js";
-import { v1ForkSessionRequests, v1NewSessionRequest, v1RestoreSessionRequest, v1SetSessionConfigOptionRequest, v2AvailableCommands, v2ConfigOptions, v2NewSessionResponse, v2ResumeSessionResponse, } from "./session.js";
-import { v2SessionUpdate } from "./session-update.js";
+import { v1ForkSessionRequest, v1NewSessionRequest, v1RestoreSessionRequest, v1SetSessionConfigOptionRequest, v2AvailableCommands, v2ConfigOptions, v2NewSessionResponse, v2ResumeSessionResponse, } from "./session.js";
+import { v2ChildStateUpdate, v2SessionUpdate } from "./session-update.js";
 import { V2Terminals } from "./terminal.js";
+import { V2ToolCallMeta } from "./tool-call-meta.js";
 /**
  * The ACP v2 surface, for one connection.
  *
@@ -55,17 +56,18 @@ export function v2AgentApp(logger, onAgent) {
         };
     })
         .onRequest(v2.methods.agent.session.fork, async ({ params }) => {
-        const requests = v1ForkSessionRequests(params);
-        const { sessionId } = await agent.unstable_forkSession(requests.fork);
+        // The agent starts the forked session, so the client can prompt it.
+        const response = await agent.unstable_forkSession(v1ForkSessionRequest(params));
         return {
-            sessionId,
-            ...v2ResumeSessionResponse(await agent.resumeSession(requests.resume(sessionId))),
-            ...(await setupCommands(agent, sessionId, logger)),
+            sessionId: response.sessionId,
+            ...v2ResumeSessionResponse(response),
+            ...(await setupCommands(agent, response.sessionId, logger)),
         };
     })
         .onRequest(v2.methods.agent.session.close, async ({ params }) => {
         const response = await agent.closeSession(params);
         client.terminals.forget(params.sessionId);
+        client.toolCallMeta.forget(params.sessionId);
         return response;
     })
         .onRequest(v2.methods.agent.session.delete, ({ params }) => agent.deleteSession(params))
@@ -105,11 +107,16 @@ class V2ClientConnection {
     logger;
     /**
      * The sessions whose history replays, each with the messages that the
-     * replay has cleared so far.
+     * replay has cleared so far. A subagent that a replay announces replays
+     * with it.
      */
     replays = new Map();
+    /** The session whose replay announced each replaying subagent. */
+    replayRoots = new Map();
     /** The display terminals of the commands that the agent runs. */
     terminals = new V2Terminals();
+    /** The `_meta` that the client stores for each tool call. */
+    toolCallMeta = new V2ToolCallMeta();
     constructor(ctx, logger) {
         this.ctx = ctx;
         this.logger = logger;
@@ -129,6 +136,12 @@ class V2ClientConnection {
         }
         finally {
             this.replays.delete(sessionId);
+            for (const [child, root] of this.replayRoots) {
+                if (root !== sessionId)
+                    continue;
+                this.replays.delete(child);
+                this.replayRoots.delete(child);
+            }
         }
     }
     /**
@@ -152,17 +165,32 @@ class V2ClientConnection {
         return this.ctx.notify(method, params);
     }
     async sessionUpdate({ update, ...notification }) {
+        // A subagent that a replay announces replays too, so its messages are
+        // cleared before their first replayed chunk, as the parent's are.
+        if (update.sessionUpdate === "subagent_update" &&
+            this.replays.has(notification.sessionId) &&
+            !this.replays.has(update.sessionId)) {
+            this.replays.set(update.sessionId, new Set());
+            this.replayRoots.set(update.sessionId, this.replayRoots.get(notification.sessionId) ?? notification.sessionId);
+        }
         const updates = this.v2Updates(notification.sessionId, update).flatMap((v2Update) => {
             const clear = this.replayClear(notification.sessionId, v2Update);
             return clear ? [clear, v2Update] : [v2Update];
         });
+        // A subagent's work state also goes to the child's own stream, after the
+        // parent's copy.
+        const childState = v2ChildStateUpdate(update);
         // Every update goes to the connection before any is awaited, so an update
         // that another call sends meanwhile cannot come between them.
-        await Promise.all(updates.map((v2Update) => this.ctx.notify(v2.methods.client.session.update, { ...notification, update: v2Update })));
+        await Promise.all([
+            ...updates.map((v2Update) => this.ctx.notify(v2.methods.client.session.update, { ...notification, update: v2Update })),
+            ...(childState ? [this.ctx.notify(v2.methods.client.session.update, childState)] : []),
+        ]);
     }
     /**
      * The v2 updates of a v1 update: for a tool call report, the updates of its
-     * terminal first, then the report itself (see {@link V2Terminals}).
+     * terminal first (see {@link V2Terminals}), then the report itself, with the
+     * `_meta` that the client stores (see {@link V2ToolCallMeta}).
      */
     v2Updates(sessionId, update) {
         if (update.sessionUpdate !== "tool_call" && update.sessionUpdate !== "tool_call_update") {
@@ -170,7 +198,10 @@ class V2ClientConnection {
             return v2Update ? [v2Update] : [];
         }
         const { terminal, report } = this.terminals.split(sessionId, update);
-        const reportUpdate = report && v2SessionUpdate(report);
+        if (!report)
+            return terminal;
+        const starts = report.sessionUpdate === "tool_call";
+        const reportUpdate = v2SessionUpdate(this.toolCallMeta.apply(sessionId, report, starts));
         return [...terminal, ...(reportUpdate ? [reportUpdate] : [])];
     }
     /**
@@ -192,7 +223,9 @@ class V2ClientConnection {
         return emptyMessage(kind, messageId);
     }
     async requestPermission(params, signal) {
-        const response = await this.ctx.request(v2.methods.client.session.requestPermission, v2PermissionRequest(params), { cancellationSignal: signal });
+        // The subject is an update of the tool call, with its stored `_meta`.
+        const toolCall = this.toolCallMeta.subject(params.sessionId, params.toolCall);
+        const response = await this.ctx.request(v2.methods.client.session.requestPermission, v2PermissionRequest({ ...params, toolCall }), { cancellationSignal: signal });
         return v1PermissionResponse(response);
     }
     // Elicitation is the same in v1 and v2.

package/dist/v2/initialize.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"initialize.d.ts","sourceRoot":"","sources":["../../src/v2/initialize.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,EAGL,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACxB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,MAAM,0CAA0C,CAAC;AAE/D,0DAA0D;AAC1D,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,EAAE,CAAC,iBAAiB,GAAG,iBAAiB,CA0BpF;AASD;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,EAAE,CAAC,kBAAkB,CAuBxF"}
+{"version":3,"file":"initialize.d.ts","sourceRoot":"","sources":["../../src/v2/initialize.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,EAGL,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACxB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,MAAM,0CAA0C,CAAC;AAE/D,0DAA0D;AAC1D,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,EAAE,CAAC,iBAAiB,GAAG,iBAAiB,CAmCpF;AASD;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,EAAE,CAAC,kBAAkB,CAuBxF"}

package/dist/v2/initialize.js

@@ -26,6 +26,15 @@ export function v1InitializeRequest(request) {
             // compaction as a compaction entity rather than as a "Compact
             // conversation" tool call, also on replay.
             session: { configOptions: { boolean: {} }, notices: {}, compaction: {} },
+            // Every v2 client takes `plan_update`, with the draft's markdown and file
+            // plans, and `plan_removed`; v1 asks for the `plan` marker. With it, the
+            // agent shows an approved ExitPlanMode plan as a markdown plan.
+            plan: {},
+            // Subagent updates are part of v2's baseline session model (the subagents
+            // RFD), so every v2 client takes them; v1 asks for the `subagents`
+            // capability. With it, the agent reports each Agent or Task subagent as a
+            // child session.
+            subagents: {},
             // v1 marks terminal auth support with a boolean, v2 with an object.
             auth: {
                 terminal: capabilities?.auth?.terminal != null,
@@ -78,7 +87,7 @@ export function v2InitializeResponse(response) {
  * - The session baseline: `session/new`, `list`, `resume` (with replay),
  *   `close`, `prompt`, `cancel`, and `update`.
  * - `session/delete`, `session/fork` (which returns a session the client can
- *   prompt, see `v1ForkSessionRequests`), and `additionalDirectories`.
+ *   prompt at once), and `additionalDirectories`.
  * - The prompt content and MCP transports that the agent's v1 `initialize`
  *   lists: images, embedded context, and HTTP servers. Stdio servers are in the
  *   v1 baseline; v2 has no SSE transport.

package/dist/v2/session-update.d.ts

@@ -18,4 +18,15 @@ export declare const SESSION_PLAN_ID = "plan";
  * an error rather than a silently missing update.
  */
 export declare function v2SessionUpdate(update: AcpSessionNotification["update"]): v2.SessionUpdate | undefined;
+/**
+ * The child's own `state_update` for a v1 `subagent_update` that reports the
+ * child's work state, or `undefined` when it reports none.
+ *
+ * v1 reports a child's work state only on its parent, as the `state` of the
+ * `subagent_update`. v2 reports it on the child's own stream, as for any
+ * session, and mirrors it on the parent (the subagents RFD). The child's copy
+ * goes right after the parent's: never before the announcement, and both
+ * copies of a state before any later state.
+ */
+export declare function v2ChildStateUpdate(update: AcpSessionNotification["update"]): v2.UpdateSessionNotification | undefined;
 //# sourceMappingURL=session-update.d.ts.map

package/dist/v2/session-update.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-update.d.ts","sourceRoot":"","sources":["../../src/v2/session-update.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,EAAE,MAAM,0CAA0C,CAAC;AAC/D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAIlE;;;;GAIG;AACH,eAAO,MAAM,eAAe,SAAS,CAAC;AAEtC;;;;;;GAMG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,sBAAsB,CAAC,QAAQ,CAAC,GACvC,EAAE,CAAC,aAAa,GAAG,SAAS,CA0C9B"}
+{"version":3,"file":"session-update.d.ts","sourceRoot":"","sources":["../../src/v2/session-update.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,EAAE,MAAM,0CAA0C,CAAC;AAC/D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAIlE;;;;GAIG;AACH,eAAO,MAAM,eAAe,SAAS,CAAC;AAEtC;;;;;;GAMG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,sBAAsB,CAAC,QAAQ,CAAC,GACvC,EAAE,CAAC,aAAa,GAAG,SAAS,CAyD9B;AAED;;;;;;;;;GASG;AACH,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,sBAAsB,CAAC,QAAQ,CAAC,GACvC,EAAE,CAAC,yBAAyB,GAAG,SAAS,CAM1C"}

package/dist/v2/session-update.js

@@ -45,6 +45,21 @@ export function v2SessionUpdate(update) {
                 plan: { type: "items", planId: SESSION_PLAN_ID, entries: update.entries },
                 ...(update._meta != null ? { _meta: update._meta } : {}),
             };
+        case "plan_update":
+        case "plan_removed":
+            // v1's draft plan operations have v2's shape.
+            return update;
+        case "subagent_update": {
+            // The subagents RFD gives it the same shape in v1 and v2. One that
+            // reports a state also has a copy on the child's stream (see
+            // `v2ChildStateUpdate`).
+            const { state, ...association } = update;
+            return { ...association, ...(state != null ? { state: v2SubagentState(state) } : {}) };
+        }
+        case "session_message":
+        case "session_message_chunk":
+            // The subagents RFD gives these the same shape in v1 and v2.
+            return update;
         case "current_mode_update":
             // v2 has no modes: the mode is the `mode` config option. Every mode
             // change also reaches the client as a `config_option_update` or in the
@@ -54,3 +69,55 @@ export function v2SessionUpdate(update) {
             throw new Error(`The ACP v2 surface does not translate ${update.sessionUpdate} session updates yet`);
     }
 }
+/**
+ * The child's own `state_update` for a v1 `subagent_update` that reports the
+ * child's work state, or `undefined` when it reports none.
+ *
+ * v1 reports a child's work state only on its parent, as the `state` of the
+ * `subagent_update`. v2 reports it on the child's own stream, as for any
+ * session, and mirrors it on the parent (the subagents RFD). The child's copy
+ * goes right after the parent's: never before the announcement, and both
+ * copies of a state before any later state.
+ */
+export function v2ChildStateUpdate(update) {
+    if (update.sessionUpdate !== "subagent_update" || update.state == null)
+        return undefined;
+    return {
+        sessionId: update.sessionId,
+        update: { sessionUpdate: "state_update", ...v2SubagentState(update.state) },
+    };
+}
+/** The work states of the subagents RFD, and the stop reasons of its `idle`. */
+const SUBAGENT_STATES = new Set([
+    "running",
+    "requires_action",
+    "unknown",
+    "idle",
+]);
+const IDLE_STOP_REASONS = new Set([
+    undefined,
+    null,
+    "end_turn",
+    "max_tokens",
+    "max_turn_requests",
+    "refusal",
+    "cancelled",
+    "error",
+]);
+/**
+ * The v2 form of a subagent's v1 work state.
+ *
+ * The RFD's states have the same shape in v1 and v2. Each version also types
+ * an open member for states and stop reasons it does not know, and those two
+ * members are typed apart. So the state is checked to be one of the RFD's, and
+ * any other throws, as an update kind that this surface does not translate
+ * does.
+ */
+function v2SubagentState(state) {
+    const stopReason = state.stopReason;
+    if (!SUBAGENT_STATES.has(state.state) ||
+        (state.state === "idle" && !IDLE_STOP_REASONS.has(stopReason))) {
+        throw new Error(`The ACP v2 surface does not translate the subagent state ${state.state}${state.state === "idle" ? ` with the stop reason ${String(stopReason)}` : ""}`);
+    }
+    return state;
+}

package/dist/v2/session.d.ts

@@ -23,19 +23,10 @@ export declare function v1RestoreSessionRequest(params: v2.ResumeSessionRequest)
     request: LoadSessionRequest;
 };
 /**
- * The v1 requests that a v2 `session/fork` means.
- *
- * The agent's v1 fork copies the transcript into a new session and returns
- * only its id; a v1 client then resumes or loads it. A v2 fork returns the new
- * session with its config options, like `session/new`, so the client can
- * prompt it. The v2 surface therefore forks, then resumes the fork without
- * replay, with the request's `cwd`, `additionalDirectories`, and
- * `mcpServers`. The request's `_meta` goes to the fork alone.
+ * The v1 request of a v2 `session/fork`. In both versions the agent's fork
+ * returns a session that the client can prompt, with its config options.
  */
-export declare function v1ForkSessionRequests(params: v2.ForkSessionRequest): {
-    fork: ForkSessionRequest;
-    resume: (sessionId: string) => ResumeSessionRequest;
-};
+export declare function v1ForkSessionRequest(params: v2.ForkSessionRequest): ForkSessionRequest;
 /** v2 drops `modes`: the session mode is the `mode` config option, which the agent always lists. */
 export declare function v2NewSessionResponse(response: NewSessionResponse): v2.NewSessionResponse;
 export declare function v2ResumeSessionResponse(response: ResumeSessionResponse): v2.ResumeSessionResponse;

package/dist/v2/session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/v2/session.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAEL,KAAK,gBAAgB,EACrB,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EAEvB,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACvB,KAAK,oBAAoB,EACzB,KAAK,qBAAqB,EAC1B,KAAK,mBAAmB,EAGxB,KAAK,6BAA6B,EACnC,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,MAAM,0CAA0C,CAAC;AAE/D,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,EAAE,CAAC,iBAAiB,GAAG,iBAAiB,CAInF;AAED;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,EAAE,CAAC,oBAAoB,GAE7B;IAAE,MAAM,EAAE,QAAQ,CAAC;IAAC,OAAO,EAAE,oBAAoB,CAAA;CAAE,GACnD;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,kBAAkB,CAAA;CAAE,CAkBlD;AAED;;;;;;;;;GASG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,EAAE,CAAC,kBAAkB,GAAG;IACpE,IAAI,EAAE,kBAAkB,CAAC;IACzB,MAAM,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,oBAAoB,CAAC;CACrD,CAUA;AAED,oGAAoG;AACpG,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,EAAE,CAAC,kBAAkB,CAExF;AAED,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,qBAAqB,GAAG,EAAE,CAAC,qBAAqB,CAKjG;AAED,uEAAuE;AACvE,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,EAAE,CAAC,6BAA6B,GACvC,6BAA6B,CAgB/B;AAED,sFAAsF;AACtF,wBAAgB,eAAe,CAAC,OAAO,EAAE,mBAAmB,EAAE,GAAG,EAAE,CAAC,mBAAmB,EAAE,CAQxF;AAWD,oEAAoE;AACpE,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,gBAAgB,EAAE,GAAG,EAAE,CAAC,gBAAgB,EAAE,CAKvF"}
+{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/v2/session.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAEL,KAAK,gBAAgB,EACrB,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EAEvB,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACvB,KAAK,oBAAoB,EACzB,KAAK,qBAAqB,EAC1B,KAAK,mBAAmB,EAGxB,KAAK,6BAA6B,EACnC,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,MAAM,0CAA0C,CAAC;AAE/D,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,EAAE,CAAC,iBAAiB,GAAG,iBAAiB,CAInF;AAED;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,EAAE,CAAC,oBAAoB,GAE7B;IAAE,MAAM,EAAE,QAAQ,CAAC;IAAC,OAAO,EAAE,oBAAoB,CAAA;CAAE,GACnD;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,kBAAkB,CAAA;CAAE,CAkBlD;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,EAAE,CAAC,kBAAkB,GAAG,kBAAkB,CAGtF;AAED,oGAAoG;AACpG,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,EAAE,CAAC,kBAAkB,CAExF;AAED,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,qBAAqB,GAAG,EAAE,CAAC,qBAAqB,CAKjG;AAED,uEAAuE;AACvE,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,EAAE,CAAC,6BAA6B,GACvC,6BAA6B,CAgB/B;AAED,sFAAsF;AACtF,wBAAgB,eAAe,CAAC,OAAO,EAAE,mBAAmB,EAAE,GAAG,EAAE,CAAC,mBAAmB,EAAE,CAQxF;AAWD,oEAAoE;AACpE,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,gBAAgB,EAAE,GAAG,EAAE,CAAC,gBAAgB,EAAE,CAKvF"}