@cortexkit/opencode-antigravity-auth 2.2.0 → 3.0.0

package/dist/src/rpc/port-file.js

@@ -1,109 +1,7 @@
-import { randomBytes } from 'node:crypto';
-import { chmod, mkdir, readdir, readFile, rename, unlink, writeFile, } from 'node:fs/promises';
-import { join } from 'node:path';
-const PORT_FILE_PATTERN = /^port-(\d+)\.json$/;
-const DIR_MODE = 0o700;
-const FILE_MODE = 0o600;
-export async function writePortFile(dir, entry) {
-    assertPortFileEntry({ ...entry, startedAt: 0 }, entry.pid);
-    // mkdir recursive with the private mode on first creation; on a re-run the
-    // directory already exists with the right mode. We still re-apply chmod so
-    // an operator who widened the directory accidentally gets it repaired
-    // back to 0o700 before we drop a token-bearing file inside.
-    await mkdir(dir, { recursive: true, mode: DIR_MODE });
-    await chmod(dir, DIR_MODE);
-    const full = { ...entry, startedAt: Date.now() };
-    const target = join(dir, `port-${entry.pid}.json`);
-    const temporary = `${target}.${process.pid}.${randomBytes(8).toString('hex')}.tmp`;
-    try {
-        await writeFile(temporary, JSON.stringify(full), {
-            encoding: 'utf8',
-            mode: FILE_MODE,
-        });
-        await chmod(temporary, FILE_MODE);
-        await rename(temporary, target);
-    }
-    catch (error) {
-        try {
-            await unlink(temporary);
-        }
-        catch { }
-        throw error;
-    }
-    return target;
-}
-export async function discoverPortFile(dir, expectedPid) {
-    let names;
-    try {
-        names = await readdir(dir);
-    }
-    catch (error) {
-        if (isNodeError(error, 'ENOENT'))
-            return null;
-        throw error;
-    }
-    const live = [];
-    for (const name of names) {
-        const match = PORT_FILE_PATTERN.exec(name);
-        if (!match)
-            continue;
-        const path = join(dir, name);
-        const filenamePid = Number(match[1]);
-        let parsed;
-        try {
-            const text = await readFile(path, 'utf8');
-            const raw = JSON.parse(text);
-            assertPortFileEntry(raw, filenamePid);
-            parsed = raw;
-        }
-        catch {
-            // Malformed or stale — keep the directory clean so future discovers
-            // don't trip over the same debris.
-            await unlink(path).catch(() => { });
-            continue;
-        }
-        if (!isProcessAlive(parsed.pid)) {
-            await unlink(path).catch(() => { });
-            continue;
-        }
-        live.push(parsed);
-    }
-    if (expectedPid !== undefined) {
-        // antigravity exact-PID safety: a missing expected PID must surface as
-        // null so a stale but live entry can't impersonate the requester.
-        return live.find(({ pid }) => pid === expectedPid) ?? null;
-    }
-    if (live.length === 0)
-        return null;
-    live.sort((left, right) => right.startedAt - left.startedAt);
-    return live[0] ?? null;
-}
-function assertPortFileEntry(value, filenamePid) {
-    if (typeof value !== 'object' ||
-        value === null ||
-        !Number.isSafeInteger(value.pid) ||
-        value.pid <= 0 ||
-        value.pid !== filenamePid ||
-        !Number.isSafeInteger(value.port) ||
-        value.port <= 0 ||
-        value.port > 65_535 ||
-        typeof value.token !== 'string' ||
-        value.token.length === 0) {
-        throw new Error('Invalid RPC port file');
-    }
-}
-function isProcessAlive(pid) {
-    try {
-        process.kill(pid, 0);
-        return true;
-    }
-    catch (error) {
-        return isNodeError(error, 'EPERM');
-    }
-}
-function isNodeError(error, code) {
-    return (error instanceof Error &&
-        'code' in error &&
-        error.code === code);
+import { discoverPortFile as discoverPublicPortFile } from '../common-auth-embedded/rpc/client.js';
+// Discovery reads directory modes without changing them. Only the server writer
+// changes directory permissions; clients discover only the expected PID.
+export function discoverPortFile(dir, expectedPid) {
+    return discoverPublicPortFile(dir, expectedPid, { exactPid: true });
 }
 //# sourceMappingURL=port-file.js.map

package/dist/src/rpc/port-file.js.map

@@ -1 +1 @@
-{"version":3,"file":"port-file.js","sourceRoot":"","sources":["../../../src/rpc/port-file.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"port-file.js","sourceRoot":"","sources":["../../../src/rpc/port-file.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,IAAI,sBAAsB,EAAE,MAAM,uCAAuC,CAAA;AAIlG,gFAAgF;AAChF,yEAAyE;AACzE,MAAM,UAAU,gBAAgB,CAAC,GAAW,EAAE,WAAoB;IAChE,OAAO,sBAAsB,CAAC,GAAG,EAAE,WAAW,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAA;AACrE,CAAC"}

package/dist/src/rpc/protocol.d.ts

@@ -1,22 +1,53 @@
-export type CommandModalName = 'antigravity-quota' | 'antigravity-account' | 'antigravity-routing' | 'antigravity-killswitch' | 'antigravity-dump' | 'antigravity-logging';
-export interface OpenDialogPayload {
-    command: CommandModalName;
-    text: string;
-    knobs: Record<string, unknown>;
+/**
+ * Wire shapes of the OpenCode 1 RPC between this plugin's server and the TUI
+ * running in the same OpenCode process. The RPC is private to that process:
+ * the server listens only on 127.0.0.1 and accepts only requests that carry
+ * the bearer token from the owner-only port file it writes for its own
+ * process ID.
+ *
+ * The RPC carries the shared `/antigravity` command menu of common-auth's
+ * public `./commands` entry: the TUI sends back a `CommandApplyRequest` on
+ * `/rpc/apply` and receives a `CommandApplyResult`; queued notifications carry
+ * either the menu that opens the drawer (`CommandDialogPayload`) or a toast
+ * (`MenuNotifyPayload`).
+ *
+ * Every library type here is a type-only import, so it disappears from the
+ * compiled JavaScript: the TUI may import this module without loading the
+ * commands module or anything it depends on (store, logger, credentials).
+ */
+import type { CommandApplyRequest, CommandApplyResult, CommandDialogPayload, NotifyKind } from '../common-auth-embedded/commands/index.js';
+export type { CommandApplyRequest, CommandApplyResult, CommandDialogPayload, NotifyKind, };
+/**
+ * A message for the user that does not open the drawer. `command` names the
+ * slash command that sent it; the TUI shows `notify` as a toast.
+ */
+export interface MenuNotifyPayload {
+    command: string;
+    notify: {
+        message: string;
+        kind: NotifyKind;
+    };
 }
+/**
+ * The payload of one queued notification: the menu that opens the drawer
+ * (`CommandDialogPayload`) or a message shown as a toast
+ * (`MenuNotifyPayload`).
+ */
+export type RpcNotificationPayload = CommandDialogPayload | MenuNotifyPayload;
+/**
+ * The envelope `{id, payload, sessionId?}` of one queued notification, as
+ * `/rpc/pending-notifications` returns it inside `{ messages: [...] }`.
+ *
+ * `id` comes from one counter shared by every session of this server
+ * process: it starts at 1 and grows by one per notification. The TUI sends
+ * the last `id` it received back as `lastReceivedId` and then receives only
+ * notifications with a larger `id`. A notification with `sessionId` goes
+ * only to that session; one without it is a broadcast that every session
+ * receives.
+ */
 export interface RpcNotification {
     id: number;
-    type: 'open-dialog';
-    payload: OpenDialogPayload;
+    payload: RpcNotificationPayload;
     sessionId?: string;
 }
-export interface ApplyRequest {
-    command: CommandModalName;
-    arguments: string;
-    sessionId?: string;
-}
-export interface ApplyResult {
-    text: string;
-    knobs: Record<string, unknown>;
-}
 //# sourceMappingURL=protocol.d.ts.map

package/dist/src/rpc/protocol.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"protocol.d.ts","sourceRoot":"","sources":["../../../src/rpc/protocol.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,gBAAgB,GACxB,mBAAmB,GACnB,qBAAqB,GACrB,qBAAqB,GACrB,wBAAwB,GACxB,kBAAkB,GAClB,qBAAqB,CAAA;AAEzB,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,gBAAgB,CAAA;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAC/B;AAED,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,aAAa,CAAA;IACnB,OAAO,EAAE,iBAAiB,CAAA;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB;AAED,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,gBAAgB,CAAA;IACzB,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAC/B"}
+{"version":3,"file":"protocol.d.ts","sourceRoot":"","sources":["../../../src/rpc/protocol.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AACH,OAAO,KAAK,EACV,mBAAmB,EACnB,kBAAkB,EAClB,oBAAoB,EACpB,UAAU,EACX,MAAM,2CAA2C,CAAA;AAElD,YAAY,EACV,mBAAmB,EACnB,kBAAkB,EAClB,oBAAoB,EACpB,UAAU,GACX,CAAA;AAED;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE;QACN,OAAO,EAAE,MAAM,CAAA;QACf,IAAI,EAAE,UAAU,CAAA;KACjB,CAAA;CACF;AAED;;;;GAIG;AACH,MAAM,MAAM,sBAAsB,GAAG,oBAAoB,GAAG,iBAAiB,CAAA;AAE7E;;;;;;;;;;GAUG;AACH,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,MAAM,CAAA;IACV,OAAO,EAAE,sBAAsB,CAAA;IAC/B,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB"}

package/dist/src/rpc/rpc-client.d.ts

@@ -1,10 +1,34 @@
-import type { ApplyRequest, ApplyResult, RpcNotification } from './protocol';
 export interface RpcRequestOptions {
     timeoutMs?: number;
 }
+/**
+ * The wire envelope of one queued notification, after this client's check:
+ * exactly `{id, payload, sessionId?}`, with `payload` a JSON object. `payload` is still unchecked JSON; the
+ * renderer must validate it as a menu or notify payload before showing
+ * anything from it.
+ */
+export interface ReceivedNotification {
+    id: number;
+    payload: object;
+    sessionId?: string;
+}
 export interface RpcClient {
-    apply(request: ApplyRequest, options?: RpcRequestOptions): Promise<ApplyResult>;
-    pendingNotifications(lastReceivedId: number, sessionId?: string, options?: RpcRequestOptions): Promise<RpcNotification[]>;
+    /**
+     * Sends one menu action, given as the JSON object the renderer built (a
+     * `CommandApplyRequest`); the server parses it and refuses anything else
+     * with 400. Resolves the server's answer as unchecked JSON, which the
+     * renderer must validate as a `CommandApplyResult` before using it, or
+     * `undefined` when there was no answer object: no server published
+     * for `expectedPid` (the process ID of the OpenCode process hosting the
+     * server), a refusal or other non-2xx status, a timeout, or a body that is
+     * not a JSON object.
+     */
+    apply(request: unknown, options?: RpcRequestOptions): Promise<object | undefined>;
+    /**
+     * Notifications after `lastReceivedId`. Resolves `[]` when the call fails
+     * or when any message in the answer has a malformed envelope.
+     */
+    pendingNotifications(lastReceivedId: number, sessionId?: string, options?: RpcRequestOptions): Promise<ReceivedNotification[]>;
 }
 export declare function createRpcClient(dir: string, expectedPid?: number): RpcClient;
 //# sourceMappingURL=rpc-client.d.ts.map

package/dist/src/rpc/rpc-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rpc-client.d.ts","sourceRoot":"","sources":["../../../src/rpc/rpc-client.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAO5E,MAAM,WAAW,iBAAiB;IAChC,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB;AAED,MAAM,WAAW,SAAS;IACxB,KAAK,CACH,OAAO,EAAE,YAAY,EACrB,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,WAAW,CAAC,CAAA;IACvB,oBAAoB,CAClB,cAAc,EAAE,MAAM,EACtB,SAAS,CAAC,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,eAAe,EAAE,CAAC,CAAA;CAC9B;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CA0B5E"}
+{"version":3,"file":"rpc-client.d.ts","sourceRoot":"","sources":["../../../src/rpc/rpc-client.ts"],"names":[],"mappings":"AAoBA,MAAM,WAAW,iBAAiB;IAChC,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB;AAED;;;;;GAKG;AACH,MAAM,WAAW,oBAAoB;IACnC,EAAE,EAAE,MAAM,CAAA;IACV,OAAO,EAAE,MAAM,CAAA;IACf,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB;AAED,MAAM,WAAW,SAAS;IACxB;;;;;;;;;OASG;IACH,KAAK,CACH,OAAO,EAAE,OAAO,EAChB,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAA;IAC9B;;;OAGG;IACH,oBAAoB,CAClB,cAAc,EAAE,MAAM,EACtB,SAAS,CAAC,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,oBAAoB,EAAE,CAAC,CAAA;CACnC;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAiC5E"}

package/dist/src/rpc/rpc-client.js

@@ -1,58 +1,68 @@
-// Subpath import (not the barrel): this module ships into the TUI's
-// compiled tree, which must not pull the credential-bearing barrel into
-// the host's render path.
-import { fetchWithActiveTimeout } from '@cortexkit/antigravity-auth-core/fetch-timeout';
-import { discoverPortFile } from './port-file';
+// This client-only public entry point keeps server and writer modules out of
+// the TUI's dependency graph. This file imports nothing else, not even types:
+// the TUI build copies every relative module a file imports, type-only ones
+// included, so importing `./protocol` here would bring the commands, store
+// and fs modules into the TUI. The client is a raw JSON transport; the
+// renderer builds and validates the menu shapes, and the server parses every
+// apply request with the commands module before acting on it.
+import { createRpcClient as createPublicRpcClient } from '../common-auth-embedded/rpc/client.js';
 const DEFAULT_TIMEOUT_MS = 2_000;
-const APPLY_FALLBACK = { text: 'apply failed', knobs: {} };
 const PENDING_FALLBACK = [];
 export function createRpcClient(dir, expectedPid) {
+    const client = createPublicRpcClient(dir, expectedPid, undefined, {
+        exactPid: true,
+    });
     return {
         async apply(request, options) {
-            const result = await post(dir, expectedPid, '/rpc/apply', request, options);
-            return result ?? APPLY_FALLBACK;
+            try {
+                const result = await client.apply(request, options?.timeoutMs ?? DEFAULT_TIMEOUT_MS);
+                return isRecord(result) && !isPublicApplyFailure(result)
+                    ? result
+                    : undefined;
+            }
+            catch {
+                return undefined;
+            }
         },
         async pendingNotifications(lastReceivedId, sessionId, options) {
-            const result = await post(dir, expectedPid, '/rpc/pending-notifications', {
-                lastReceivedId,
-                ...(sessionId === undefined ? {} : { sessionId }),
-            }, options);
-            return result?.messages ?? PENDING_FALLBACK;
+            try {
+                const messages = await client.pending(lastReceivedId, sessionId, options?.timeoutMs ?? DEFAULT_TIMEOUT_MS);
+                return Array.isArray(messages) && messages.every(isNotification)
+                    ? messages
+                    : PENDING_FALLBACK;
+            }
+            catch {
+                return PENDING_FALLBACK;
+            }
         },
     };
 }
-async function post(dir, expectedPid, path, body, options) {
-    // Internal nullable — every RPC call site (apply, pending) must absorb a
-    // missing/unreachable server gracefully. The TUI render path never
-    // crashes because the server is dead; the user sees a fallback text and
-    // a fresh poll retries the next tick.
-    const entry = await discoverPortFileSafe(dir, expectedPid);
-    if (!entry)
-        return null;
-    const timeoutMs = options?.timeoutMs ?? DEFAULT_TIMEOUT_MS;
-    try {
-        const response = await fetchWithActiveTimeout(`http://127.0.0.1:${entry.port}${path}`, {
-            method: 'POST',
-            headers: {
-                authorization: `Bearer ${entry.token}`,
-                'content-type': 'application/json',
-            },
-            body: JSON.stringify(body),
-        }, { timeoutMs });
-        if (!response.ok)
-            return null;
-        return (await response.json());
-    }
-    catch {
-        return null;
-    }
+function isRecord(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
 }
-async function discoverPortFileSafe(dir, expectedPid) {
-    try {
-        return await discoverPortFile(dir, expectedPid);
-    }
-    catch {
-        return null;
-    }
+// When an apply gets no answer (no server for the PID, a non-2xx status, a
+// timeout or an unparseable body), the public client resolves the fixed
+// object `{text: 'apply failed', knobs: {}}` instead of a server answer: the
+// failure result of the older per-command dialogs, whose results were
+// `{text, knobs}`. A menu result always carries `command`, `ok` and `menu`,
+// so it cannot match.
+function isPublicApplyFailure(value) {
+    return (Object.keys(value).length === 2 &&
+        value.text === 'apply failed' &&
+        isRecord(value.knobs) &&
+        Object.keys(value.knobs).length === 0);
+}
+const ENVELOPE_KEYS = new Set(['id', 'payload', 'sessionId']);
+// Checks only the envelope: exactly the keys `id`, `payload` and optional
+// `sessionId`. Any other key, such as the `type: 'open-dialog'` field of the
+// older per-command dialog notifications, refuses the message.
+function isNotification(value) {
+    return (isRecord(value) &&
+        Object.keys(value).every((key) => ENVELOPE_KEYS.has(key)) &&
+        typeof value.id === 'number' &&
+        Number.isSafeInteger(value.id) &&
+        value.id >= 1 &&
+        (value.sessionId === undefined || typeof value.sessionId === 'string') &&
+        isRecord(value.payload));
 }
 //# sourceMappingURL=rpc-client.js.map

package/dist/src/rpc/rpc-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"rpc-client.js","sourceRoot":"","sources":["../../../src/rpc/rpc-client.ts"],"names":[],"mappings":"AAAA,oEAAoE;AACpE,wEAAwE;AACxE,0BAA0B;AAC1B,OAAO,EAAE,sBAAsB,EAAE,MAAM,gDAAgD,CAAA;AAEvF,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAG9C,MAAM,kBAAkB,GAAG,KAAK,CAAA;AAEhC,MAAM,cAAc,GAAgB,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,EAAE,EAAE,CAAA;AACvE,MAAM,gBAAgB,GAAsB,EAAE,CAAA;AAkB9C,MAAM,UAAU,eAAe,CAAC,GAAW,EAAE,WAAoB;IAC/D,OAAO;QACL,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO;YAC1B,MAAM,MAAM,GAAG,MAAM,IAAI,CACvB,GAAG,EACH,WAAW,EACX,YAAY,EACZ,OAAO,EACP,OAAO,CACR,CAAA;YACD,OAAO,MAAM,IAAI,cAAc,CAAA;QACjC,CAAC;QACD,KAAK,CAAC,oBAAoB,CAAC,cAAc,EAAE,SAAS,EAAE,OAAO;YAC3D,MAAM,MAAM,GAAG,MAAM,IAAI,CACvB,GAAG,EACH,WAAW,EACX,4BAA4B,EAC5B;gBACE,cAAc;gBACd,GAAG,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC;aAClD,EACD,OAAO,CACR,CAAA;YACD,OAAO,MAAM,EAAE,QAAQ,IAAI,gBAAgB,CAAA;QAC7C,CAAC;KACF,CAAA;AACH,CAAC;AAED,KAAK,UAAU,IAAI,CACjB,GAAW,EACX,WAA+B,EAC/B,IAAY,EACZ,IAAa,EACb,OAAsC;IAEtC,yEAAyE;IACzE,mEAAmE;IACnE,wEAAwE;IACxE,sCAAsC;IACtC,MAAM,KAAK,GAAG,MAAM,oBAAoB,CAAC,GAAG,EAAE,WAAW,CAAC,CAAA;IAC1D,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAA;IAEvB,MAAM,SAAS,GAAG,OAAO,EAAE,SAAS,IAAI,kBAAkB,CAAA;IAC1D,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,sBAAsB,CAC3C,oBAAoB,KAAK,CAAC,IAAI,GAAG,IAAI,EAAE,EACvC;YACE,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,aAAa,EAAE,UAAU,KAAK,CAAC,KAAK,EAAE;gBACtC,cAAc,EAAE,kBAAkB;aACnC;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;SAC3B,EACD,EAAE,SAAS,EAAE,CACd,CAAA;QACD,IAAI,CAAC,QAAQ,CAAC,EAAE;YAAE,OAAO,IAAI,CAAA;QAC7B,OAAO,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAM,CAAA;IACrC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAA;IACb,CAAC;AACH,CAAC;AAED,KAAK,UAAU,oBAAoB,CACjC,GAAW,EACX,WAA+B;IAE/B,IAAI,CAAC;QACH,OAAO,MAAM,gBAAgB,CAAC,GAAG,EAAE,WAAW,CAAC,CAAA;IACjD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAA;IACb,CAAC;AACH,CAAC"}
+{"version":3,"file":"rpc-client.js","sourceRoot":"","sources":["../../../src/rpc/rpc-client.ts"],"names":[],"mappings":"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"}

package/dist/src/rpc/rpc-server.d.ts

@@ -1,7 +1,18 @@
-import type { ApplyRequest, ApplyResult, RpcNotification } from './protocol';
+import type * as Commands from '../common-auth-embedded/commands/index.js';
+import type { CommandApplyRequest, CommandApplyResult, RpcNotification } from './protocol';
 export interface StartRpcServerOptions {
     dir: string;
-    apply(request: ApplyRequest): Promise<ApplyResult> | ApplyResult;
+    /**
+     * Use the `parseApplyRequest` of the same common-auth commands module that
+     * built the menu `apply` runs against. Passing it in means this server
+     * loads no second copy of the commands module and keeps no request schema
+     * of its own. Every `/rpc/apply` body goes through this parser before
+     * `apply` runs; a body the parser refuses is answered 400 and `apply` is
+     * not called.
+     */
+    parseApplyRequest: typeof Commands.parseApplyRequest;
+    /** Runs one parsed menu action and returns the refreshed menu. */
+    apply(request: CommandApplyRequest): Promise<CommandApplyResult> | CommandApplyResult;
     drain(lastReceivedId: number, sessionId?: string): Promise<RpcNotification[]> | RpcNotification[];
 }
 export interface RpcServerHandle {

package/dist/src/rpc/rpc-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rpc-server.d.ts","sourceRoot":"","sources":["../../../src/rpc/rpc-server.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EACV,YAAY,EACZ,WAAW,EAEX,eAAe,EAChB,MAAM,YAAY,CAAA;AAmBnB,MAAM,WAAW,qBAAqB;IACpC,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG,WAAW,CAAA;IAChE,KAAK,CACH,cAAc,EAAE,MAAM,EACtB,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,eAAe,EAAE,CAAC,GAAG,eAAe,EAAE,CAAA;CAClD;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;CACtB;AAWD,wBAAsB,cAAc,CAClC,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC,eAAe,CAAC,CAoE1B"}
+{"version":3,"file":"rpc-server.d.ts","sourceRoot":"","sources":["../../../src/rpc/rpc-server.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,QAAQ,MAAM,2CAA2C,CAAA;AAM1E,OAAO,KAAK,EACV,mBAAmB,EACnB,kBAAkB,EAClB,eAAe,EAChB,MAAM,YAAY,CAAA;AAEnB,MAAM,WAAW,qBAAqB;IACpC,GAAG,EAAE,MAAM,CAAA;IACX;;;;;;;OAOG;IACH,iBAAiB,EAAE,OAAO,QAAQ,CAAC,iBAAiB,CAAA;IACpD,kEAAkE;IAClE,KAAK,CACH,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,kBAAkB,CAAC,GAAG,kBAAkB,CAAA;IACnD,KAAK,CACH,cAAc,EAAE,MAAM,EACtB,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,eAAe,EAAE,CAAC,GAAG,eAAe,EAAE,CAAA;CAClD;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;CACtB;AAUD,wBAAsB,cAAc,CAClC,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC,eAAe,CAAC,CA4C1B"}