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

package/dist/hide-claude-auth.js

@@ -158,8 +158,7 @@ export function warnClaudeSubscriptionGuardDegraded(options) {
  * mid-session. The refusal mirrors the signed-out path exactly (see
  * `failActiveWithSessionFailure` for `auth_required` in `acp-agent.ts`): every
  * client gets the `authRequired` JSON-RPC rejection that starts its own auth
- * flow, and a capable client additionally gets one session-scoped access
- * failure whose `login` action stays the way back in.
+ * flow. The guard sends no separate access message.
  *
  * Fails open when no account can be read at all: session creation already
  * refused every account without a usable credential, and an unavailable probe
@@ -179,8 +178,8 @@ export async function refuseClaudeSubscriptionTurn(options) {
         throw refusal;
     }
 }
-/** Read the account, publish at most one failure row, and return the error the
- *  turn must be rejected with. Never throws: an unreadable account fails open. */
+/** Read the account and return the error for the refused turn.
+ *  Never throws: an unreadable account fails open. */
 async function evaluateGuard(options) {
     const account = await readGuardAccount(options);
     if (!account) {
@@ -195,14 +194,9 @@ async function evaluateGuard(options) {
         options.logger.error(`Session ${options.sessionId}: the guard's onAccount hook threw:`, error instanceof Error ? error.message : String(error));
     }
     if (billsClaudeSubscription(account)) {
-        await publishRefusal(options.sessionFailures(), {
-            details: CLAUDE_SUBSCRIPTION_NOT_SUPPORTED_MESSAGE,
-            reason: CLAUDE_SUBSCRIPTION_NOT_SUPPORTED_REASON,
-        });
         return claudeSubscriptionNotSupportedError();
     }
     if (!holdsNonSubscriptionCredential(account)) {
-        await publishRefusal(options.sessionFailures(), { details: CLAUDE_LOGIN_REQUIRED_MESSAGE });
         return claudeLoginRequiredError();
     }
     return undefined;
@@ -226,15 +220,3 @@ async function readGuardAccount(options) {
         return undefined;
     }
 }
-/** The refusal state does not change between turns: publish once, and skip a
- *  republish while the previous failure with this reason is still active. */
-async function publishRefusal(sessionFailures, failure) {
-    if (sessionFailures.hasActiveSessionError("auth_required", failure.reason)) {
-        return;
-    }
-    await sessionFailures.publish("auth_required", {
-        sessionScoped: true,
-        details: failure.details,
-        ...(failure.reason ? { reason: failure.reason } : {}),
-    });
-}

package/dist/native-subagents.d.ts

@@ -5,6 +5,11 @@ export type NativeSubagent = {
     parentToolUseId?: string;
     name: string;
     task: string;
+    /**
+     * The exact prompt of this generation, sent as `prompt` in
+     * `subagent_spawned`. It is absent when the adapter has no prompt.
+     */
+    prompt?: string;
     announced?: boolean;
     terminalState?: SubagentState;
     /** Connection-local single-flight state; never serialized on the wire. */
@@ -44,6 +49,12 @@ export declare class NativeSubagentRuntime {
     private readonly identityByToolUse;
     private readonly controlByToolUse;
     private readonly childByParentToolUse;
+    /**
+     * The child session of each tool call that went to a child session. A later
+     * update of that tool call can lose `parentToolUseId`, for example a progress
+     * beat after the child finished. It still belongs to the child session.
+     */
+    private readonly childByToolCall;
     private readonly taskFinishPromises;
     private readonly generationByTaskId;
     private readonly pending;
@@ -51,18 +62,65 @@ export declare class NativeSubagentRuntime {
     constructor(enabled: boolean, rootSessionId: string, session: NativeSubagentSession, publish: Publish, logger: Logger);
     route(notification: AcpSessionNotification, deliver: Publish, forcedSessionId?: string): Promise<AcpSessionNotification | null>;
     taskStarted(task: TaskStarted, deliver: Publish): Promise<void>;
+    /**
+     * Opens a new generation of a finished child when the SDK resumes the same
+     * agent id. The SDK can resume a child without a new `task_started`, so a
+     * running `task_updated` patch or a SendMessage `resumedAgentId` is the
+     * signal. A child that did not finish is not changed. The `prompt` is the
+     * SendMessage text that resumed the child, when the adapter knows it.
+     */
+    taskResumed(taskId: string, deliver: Publish, prompt?: string): Promise<void>;
     finishTask(taskId: string, status: unknown, deliver: Publish, toolUseId?: string | null): Promise<void>;
     finishAll(state: SubagentState, deliver: Publish): Promise<void>;
     discardPending(parentToolUseId: string): void;
+    /**
+     * Routes an update to the child session. An update of a finished child is
+     * dropped: it never goes to the root session.
+     */
+    private toChild;
+    /**
+     * The route of the work that a child tool call started, for example an async
+     * task. The route sends each update to the child generation that owned the
+     * tool call when the work started, and drops the update after that child
+     * finished. `undefined` means that the root session owns the tool call.
+     * `eagerSessionId` is the session where a permission request created the
+     * tool call before the stream routed it.
+     */
+    routeOfToolCall(toolCallId: string, eagerSessionId?: string): ((notification: AcpSessionNotification) => AcpSessionNotification | null) | undefined;
+    private rememberToolCallOwner;
+    /** The child generation with the ACP session `sessionId`, if one exists. */
+    private childOfSession;
     clear(): void;
     private takePending;
     private buffer;
     private cleanupControl;
+    /** The parent of a resumed generation: the old parent while it is live, else the root. */
+    private resumedParentSessionId;
     private isLiveSession;
+    /**
+     * Registers a new child session for the task and makes it the owner of its
+     * parent tool call. With `announce`, it publishes `subagent_spawned` and
+     * delivers the updates that waited for the child.
+     */
+    private openGeneration;
     private nextChildSessionId;
 }
 export declare function announceNativeSubagent(child: NativeSubagent, publish: Publish): Promise<void>;
 export declare function finishNativeSubagent(session: NativeSubagentSession, taskId: string, state: SubagentState, publish: Publish): Promise<void>;
+/**
+ * The agent id that a successful SendMessage result resumed. The SDK puts it
+ * in `tool_use_result.resumedAgentId` when a finished agent runs again.
+ */
+export declare function resumedNativeSubagentId(toolUseResult: unknown): string | undefined;
+/**
+ * The SendMessage text that resumed the agent `agentId`. The tool uses of
+ * `resultToolUseIds` come first: they are the SendMessage calls whose result
+ * carried the resume. Otherwise the latest SendMessage call to `agentId` counts.
+ */
+export declare function sendMessageResumePrompt(toolUses: Record<string, {
+    name: string;
+    input: unknown;
+} | undefined>, agentId: string, resultToolUseIds?: readonly string[]): string | undefined;
 export declare function nativeSubagentState(status: unknown): SubagentState | undefined;
 export declare function isNativeSubagentControlUpdate(update: AcpSessionNotification["update"]): update is Extract<AcpSessionNotification["update"], {
     sessionUpdate: "tool_call" | "tool_call_update";

package/dist/native-subagents.d.ts.map

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

package/dist/native-subagents.js

@@ -1,6 +1,9 @@
+import { AIR_SUBAGENT_KEY, airExtensionMeta } from "./air-extension.js";
 const MAX_PENDING_PARENTS = 64;
 const MAX_PENDING_UPDATES = 256;
 const MAX_PENDING_UPDATES_PER_PARENT = 32;
+/** The number of child tool calls whose owning child session the runtime remembers. */
+const MAX_CHILD_TOOL_CALLS = 2048;
 /**
  * Owns the connection-local native subagent registry and all ACP lifecycle
  * ordering. The main agent only supplies SDK facts and delivers routed output.
@@ -17,6 +20,12 @@ export class NativeSubagentRuntime {
     identityByToolUse = new Map();
     controlByToolUse = new Map();
     childByParentToolUse = new Map();
+    /**
+     * The child session of each tool call that went to a child session. A later
+     * update of that tool call can lose `parentToolUseId`, for example a progress
+     * beat after the child finished. It still belongs to the child session.
+     */
+    childByToolCall = new Map();
     taskFinishPromises = new Map();
     generationByTaskId = new Map();
     pending = new Map();
@@ -74,23 +83,29 @@ export class NativeSubagentRuntime {
             }
             return forcedSessionId ? { ...notification, sessionId: forcedSessionId } : null;
         }
+        const toolCallId = update.sessionUpdate === "tool_call" || update.sessionUpdate === "tool_call_update"
+            ? update.toolCallId
+            : undefined;
         // A permission request may have had to create the tool call before native
         // child ownership was known. Keep every later update in that original ACP
         // session; moving a lifecycle after its initial call creates an orphan in
         // both transcripts.
-        if (forcedSessionId)
+        if (forcedSessionId) {
+            const forcedChild = this.childOfSession(forcedSessionId);
+            if (toolCallId && forcedChild)
+                this.rememberToolCallOwner(toolCallId, forcedChild);
             return { ...notification, sessionId: forcedSessionId };
+        }
+        const owner = toolCallId ? this.childByToolCall.get(toolCallId) : undefined;
+        if (owner)
+            return this.toChild(owner, notification, toolCallId);
         if (this.enabled && claudeMeta?.parentToolUseId) {
             const child = this.childByParentToolUse.get(claudeMeta.parentToolUseId);
             if (!child || !child.announced) {
                 this.buffer(claudeMeta.parentToolUseId, notification);
                 return null;
             }
-            if (child.terminalState !== undefined || child.terminalPromise) {
-                this.logger.log(`Session ${this.rootSessionId}: ignoring late update for terminal subagent ${child.sessionId}`);
-                return null;
-            }
-            return { ...notification, sessionId: child.sessionId };
+            return this.toChild(child, notification, toolCallId);
         }
         return notification;
     }
@@ -108,36 +123,45 @@ export class NativeSubagentRuntime {
         if (previous && previous.terminalState === undefined)
             return;
         // A SendMessage resume reuses the finished generation's tool id, whose
-        // control state is already cleaned up. Keep its parent while that session
-        // is still live; a finished parent can no longer host the new generation.
-        const resumedParentSessionId = previous &&
-            (this.isLiveSession(previous.parentSessionId)
-                ? previous.parentSessionId
-                : this.rootSessionId);
+        // control state is already cleaned up.
         const knownParentSessionId = (task.toolUseId ? this.parentByToolUse.get(task.toolUseId) : undefined) ??
-            resumedParentSessionId;
+            (previous && this.resumedParentSessionId(previous));
         const identity = task.toolUseId ? this.identityByToolUse.get(task.toolUseId) : undefined;
-        const child = {
-            sessionId: this.nextChildSessionId(task.taskId, previous),
+        // A nested child must wait for the spawning Agent/Task frame to establish
+        // its immediate parent. Root children without a tool id can be announced.
+        await this.openGeneration(task.taskId, previous, {
             parentSessionId: knownParentSessionId ?? this.rootSessionId,
             parentToolUseId: task.toolUseId ?? undefined,
             name: subagentDisplayName(identity?.name, identity?.description ?? task.description, identity?.subagentType ?? task.subagentType, task.taskId),
             task: subagentDescription(identity?.prompt ?? task.prompt, identity?.description ?? task.description),
-        };
-        this.children.set(task.taskId, child);
-        if (task.toolUseId) {
-            this.taskByToolUse.set(task.toolUseId, task.taskId);
-            this.childByParentToolUse.set(task.toolUseId, child);
-            this.controlByToolUse.delete(task.toolUseId);
-        }
-        // A nested child must wait for the spawning Agent/Task frame to establish
-        // its immediate parent. Root children without a tool id can be announced.
-        if (knownParentSessionId || !task.toolUseId) {
-            await announceNativeSubagent(child, this.publish);
-            for (const pending of task.toolUseId ? this.takePending(task.toolUseId) : []) {
-                await deliver(pending);
-            }
-        }
+            ...promptField(promptText(task.prompt) ?? identity?.prompt),
+        }, !!knownParentSessionId || !task.toolUseId, deliver);
+    }
+    /**
+     * Opens a new generation of a finished child when the SDK resumes the same
+     * agent id. The SDK can resume a child without a new `task_started`, so a
+     * running `task_updated` patch or a SendMessage `resumedAgentId` is the
+     * signal. A child that did not finish is not changed. The `prompt` is the
+     * SendMessage text that resumed the child, when the adapter knows it.
+     */
+    async taskResumed(taskId, deliver, prompt) {
+        if (!this.enabled)
+            return;
+        const previous = this.children.get(taskId);
+        if (!previous)
+            return;
+        const finishing = this.taskFinishPromises.get(taskId) ?? previous.terminalPromise;
+        if (finishing)
+            await finishing.catch(() => { });
+        if (this.children.get(taskId) !== previous || previous.terminalState === undefined)
+            return;
+        await this.openGeneration(taskId, previous, {
+            parentSessionId: this.resumedParentSessionId(previous),
+            parentToolUseId: previous.parentToolUseId,
+            name: previous.name,
+            task: previous.task,
+            ...promptField(promptText(prompt)),
+        }, true, deliver);
     }
     async finishTask(taskId, status, deliver, toolUseId) {
         if (!this.enabled)
@@ -202,8 +226,56 @@ export class NativeSubagentRuntime {
     discardPending(parentToolUseId) {
         this.takePending(parentToolUseId);
     }
+    /**
+     * Routes an update to the child session. An update of a finished child is
+     * dropped: it never goes to the root session.
+     */
+    toChild(child, notification, toolCallId) {
+        if (child.terminalState !== undefined || child.terminalPromise) {
+            this.logger.log(`Session ${this.rootSessionId}: ignoring late update for terminal subagent ${child.sessionId}`);
+            return null;
+        }
+        if (toolCallId)
+            this.rememberToolCallOwner(toolCallId, child);
+        return { ...notification, sessionId: child.sessionId };
+    }
+    /**
+     * The route of the work that a child tool call started, for example an async
+     * task. The route sends each update to the child generation that owned the
+     * tool call when the work started, and drops the update after that child
+     * finished. `undefined` means that the root session owns the tool call.
+     * `eagerSessionId` is the session where a permission request created the
+     * tool call before the stream routed it.
+     */
+    routeOfToolCall(toolCallId, eagerSessionId) {
+        if (!this.enabled)
+            return undefined;
+        const owner = this.childByToolCall.get(toolCallId) ??
+            (eagerSessionId ? this.childOfSession(eagerSessionId) : undefined);
+        return owner && ((notification) => this.toChild(owner, notification, undefined));
+    }
+    rememberToolCallOwner(toolCallId, child) {
+        this.childByToolCall.delete(toolCallId);
+        this.childByToolCall.set(toolCallId, child);
+        if (this.childByToolCall.size > MAX_CHILD_TOOL_CALLS) {
+            const oldest = this.childByToolCall.keys().next().value;
+            if (oldest !== undefined)
+                this.childByToolCall.delete(oldest);
+        }
+    }
+    /** The child generation with the ACP session `sessionId`, if one exists. */
+    childOfSession(sessionId) {
+        if (sessionId === this.rootSessionId)
+            return undefined;
+        for (const child of this.children.values()) {
+            if (child.sessionId === sessionId)
+                return child;
+        }
+        return undefined;
+    }
     clear() {
         this.children.clear();
+        this.childByToolCall.clear();
         this.taskByToolUse.clear();
         this.parentByToolUse.clear();
         this.identityByToolUse.clear();
@@ -241,6 +313,12 @@ export class NativeSubagentRuntime {
         this.controlByToolUse.delete(toolUseId);
         this.parentByToolUse.delete(toolUseId);
     }
+    /** The parent of a resumed generation: the old parent while it is live, else the root. */
+    resumedParentSessionId(previous) {
+        return this.isLiveSession(previous.parentSessionId)
+            ? previous.parentSessionId
+            : this.rootSessionId;
+    }
     isLiveSession(sessionId) {
         if (sessionId === this.rootSessionId)
             return true;
@@ -250,6 +328,29 @@ export class NativeSubagentRuntime {
         }
         return false;
     }
+    /**
+     * Registers a new child session for the task and makes it the owner of its
+     * parent tool call. With `announce`, it publishes `subagent_spawned` and
+     * delivers the updates that waited for the child.
+     */
+    async openGeneration(taskId, previous, fields, announce, deliver) {
+        const child = {
+            sessionId: this.nextChildSessionId(taskId, previous),
+            ...fields,
+        };
+        const toolUseId = child.parentToolUseId;
+        this.children.set(taskId, child);
+        if (toolUseId) {
+            this.taskByToolUse.set(toolUseId, taskId);
+            this.childByParentToolUse.set(toolUseId, child);
+            this.controlByToolUse.delete(toolUseId);
+        }
+        if (!announce)
+            return;
+        await announceNativeSubagent(child, this.publish);
+        for (const pending of toolUseId ? this.takePending(toolUseId) : [])
+            await deliver(pending);
+    }
     nextChildSessionId(taskId, previous) {
         if (!previous) {
             this.generationByTaskId.set(taskId, 1);
@@ -273,6 +374,7 @@ export async function announceNativeSubagent(child, publish) {
                 subagentSessionId: child.sessionId,
                 name: child.name,
                 task: child.task,
+                ...promptField(child.prompt),
                 capabilities: {},
             },
         });
@@ -314,6 +416,41 @@ export async function finishNativeSubagent(session, taskId, state, publish) {
             child.terminalPromise = undefined;
     }
 }
+/**
+ * The agent id that a successful SendMessage result resumed. The SDK puts it
+ * in `tool_use_result.resumedAgentId` when a finished agent runs again.
+ */
+export function resumedNativeSubagentId(toolUseResult) {
+    if (typeof toolUseResult !== "object" || toolUseResult === null)
+        return undefined;
+    const result = toolUseResult;
+    return result.success === true ? nonBlankString(result.resumedAgentId) : undefined;
+}
+/**
+ * The SendMessage text that resumed the agent `agentId`. The tool uses of
+ * `resultToolUseIds` come first: they are the SendMessage calls whose result
+ * carried the resume. Otherwise the latest SendMessage call to `agentId` counts.
+ */
+export function sendMessageResumePrompt(toolUses, agentId, resultToolUseIds = []) {
+    for (const toolUseId of resultToolUseIds) {
+        const toolUse = toolUses[toolUseId];
+        if (toolUse?.name !== "SendMessage")
+            continue;
+        const text = promptText(toolUse.input?.message);
+        if (text)
+            return text;
+    }
+    if (resultToolUseIds.length > 0)
+        return undefined;
+    for (const toolUse of Object.values(toolUses).reverse()) {
+        if (toolUse?.name !== "SendMessage")
+            continue;
+        const input = toolUse.input;
+        if (input?.to === agentId)
+            return promptText(input.message);
+    }
+    return undefined;
+}
 export function nativeSubagentState(status) {
     if (status === "completed")
         return "completed";
@@ -330,7 +467,8 @@ export function isNativeSubagentControlUpdate(update) {
         return false;
     }
     const claudeMeta = update._meta?.claudeCode;
-    return claudeMeta?.subagent === true || isNativeSubagentControlTool(claudeMeta?.toolName);
+    return (airExtensionMeta(update._meta)?.[AIR_SUBAGENT_KEY] === true ||
+        isNativeSubagentControlTool(claudeMeta?.toolName));
 }
 export function isNativeSubagentControlTool(toolName) {
     return toolName === "Agent" || toolName === "Task";
@@ -387,8 +525,14 @@ function failedControlFallback(initial, terminal, sessionId) {
 function ordinaryToolMeta(...values) {
     const merged = Object.assign({}, ...values);
     const claudeCode = Object.assign({}, ...values.map((value) => value?.claudeCode ?? {}));
-    delete claudeCode.subagent;
-    return { ...merged, claudeCode };
+    const result = { ...merged, claudeCode };
+    const air = airExtensionMeta(merged);
+    if (air && AIR_SUBAGENT_KEY in air) {
+        const rest = { ...air };
+        delete rest[AIR_SUBAGENT_KEY];
+        result.jetbrains = { ...merged.jetbrains, air: rest };
+    }
+    return result;
 }
 function subagentDisplayName(explicitName, description, type, taskId) {
     for (const value of [explicitName, description, type]) {
@@ -412,7 +556,7 @@ function subagentIdentity(input) {
     const identity = {
         name: nonBlankString(value.name),
         description: nonBlankString(value.description),
-        prompt: nonBlankString(value.prompt),
+        prompt: promptText(value.prompt),
         subagentType: nonBlankString(value.subagent_type),
     };
     return Object.values(identity).some(Boolean) ? identity : undefined;
@@ -434,6 +578,14 @@ function applySubagentIdentity(child, identity) {
     if (identity.prompt || identity.description) {
         child.task = subagentDescription(identity.prompt, identity.description);
     }
+    child.prompt ??= identity.prompt;
+}
+/** The prompt text unchanged, or `undefined` when it is not a non-blank string. */
+function promptText(value) {
+    return typeof value === "string" && value.trim().length > 0 ? value : undefined;
+}
+function promptField(prompt) {
+    return prompt === undefined ? {} : { prompt };
 }
 function nonBlankString(value) {
     return typeof value === "string" && value.trim().length > 0 ? value.trim() : undefined;

package/dist/paths.d.ts

@@ -0,0 +1,3 @@
+/** The Claude configuration directory: `CLAUDE_CONFIG_DIR`, or `~/.claude`. */
+export declare function claudeConfigDir(): string;
+//# sourceMappingURL=paths.d.ts.map

package/dist/paths.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../src/paths.ts"],"names":[],"mappings":"AAGA,+EAA+E;AAC/E,wBAAgB,eAAe,IAAI,MAAM,CAExC"}

package/dist/paths.js

@@ -0,0 +1,6 @@
+import * as os from "node:os";
+import * as path from "node:path";
+/** The Claude configuration directory: `CLAUDE_CONFIG_DIR`, or `~/.claude`. */
+export function claudeConfigDir() {
+    return process.env.CLAUDE_CONFIG_DIR ?? path.join(os.homedir(), ".claude");
+}

package/dist/permissions/presentation.d.ts

@@ -1,10 +1,13 @@
-import type { RequestPermissionRequest } from "@agentclientprotocol/sdk";
+import type { RequestPermissionRequest, ToolCallContent } from "@agentclientprotocol/sdk";
+import { ClientCapabilities } from "../tool-calls/client-capabilities.js";
 export interface ClaudePermissionPresentationInput {
     toolName: string;
     input: Record<string, unknown>;
     toolUseID: string;
     cwd?: string;
-    supportsTerminalOutput?: boolean;
+    capabilities?: ClientCapabilities;
+    /** The exact patch of the change to approve, for a negotiated `diffPatch` client. */
+    previewContent?: ToolCallContent[];
     blockedPath?: string;
     title?: string;
     displayName?: string;
@@ -12,5 +15,13 @@ export interface ClaudePermissionPresentationInput {
     decisionReason?: string;
     defaultToNo?: boolean;
 }
+/**
+ * The permission request presentation.
+ *
+ * The request `toolCall` carries `toolCallId`, `title`, and `rawInput`. The
+ * 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.
+ */
 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,EAAoB,MAAM,0BAA0B,CAAC;AAG3F,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,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,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;AAqCD,wBAAgB,iCAAiC,CAC/C,KAAK,EAAE,iCAAiC,GACvC,IAAI,CAAC,wBAAwB,EAAE,UAAU,GAAG,OAAO,CAAC,CA+DtD"}
+{"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"}