@cortexkit/opencode-antigravity-auth 2.2.0 → 3.0.0

package/dist/src/tui/vault-setup.d.ts

@@ -0,0 +1,98 @@
+/**
+ * The Vault section of the `/antigravity` menu: a credential-free view and
+ * action model for setting up the Claustrum vault on OpenCode.
+ *
+ * The server owns everything with an effect (enrollment, switching the
+ * account source, any credential the vault hands out). This module only
+ * turns a non-secret status into the section's lines and decides which
+ * actions are offered, and each action calls an injected server effect. It
+ * imports nothing: no vault client, token, account store or OAuth code, so it
+ * can sit next to the TUI without widening what the TUI can reach.
+ *
+ * The section's shape is the shared command menu's provider extra
+ * (`PluginExtraSection` of `@cortexkit/common-auth/commands`), declared
+ * structurally here so the server can pass it straight to
+ * `createCommandMenu({ extras: [...] })`.
+ */
+/** The enrollment name this host registers with the vault. */
+export declare const OPENCODE_VAULT_ENROLLMENT_NAME: "antigravity-auth-opencode";
+/** Where requests take their Antigravity accounts from. */
+export type VaultSourceMode = 'local' | 'custody';
+/**
+ * - `not-enrolled`: this host has never been enrolled.
+ * - `pending`: an enrollment was started and waits for approval in the vault.
+ * - `enrolled`: the vault knows this host.
+ * - `revoked`: the vault withdrew this host's enrollment.
+ * - `declined`: the vault refused the enrollment request.
+ * - `unavailable`: the vault could not be reached when status was read.
+ */
+export type VaultEnrollmentState = 'not-enrolled' | 'pending' | 'enrolled' | 'revoked' | 'declined' | 'unavailable';
+/** Why vault custody cannot be used even though enrollment may exist. */
+export type VaultIneligibleReason = 'no-vault-configured' | 'host-login-present' | 'unsupported-host';
+/** The non-secret facts the server reports about vault setup. */
+export interface VaultSetupStatus {
+    readonly mode: VaultSourceMode;
+    readonly enrollment: VaultEnrollmentState;
+    /** Present when custody cannot be selected; the reason is shown as-is. */
+    readonly ineligible?: VaultIneligibleReason;
+    /** Accounts the vault currently serves to this host, when enrolled. */
+    readonly accounts?: number;
+    /** When the status was read (ms since epoch). */
+    readonly checkedAt: number;
+}
+/** What a vault action reports; `text` is shown to the user. */
+export interface VaultActionOutcome {
+    readonly ok: boolean;
+    readonly text: string;
+    readonly code?: string;
+}
+/**
+ * The server effects behind the section's actions. Every one is owned by
+ * the server; this model never performs an effect itself.
+ */
+export interface VaultSetupEffects {
+    /** Reads the current, non-secret status. Called for every menu build. */
+    status(): Promise<VaultSetupStatus>;
+    /** Starts enrollment under {@link OPENCODE_VAULT_ENROLLMENT_NAME}. */
+    enroll(): Promise<VaultActionOutcome>;
+    /** Routes requests through vault custody. */
+    useCustody(): Promise<VaultActionOutcome>;
+    /** Routes requests through the local accounts again. */
+    useLocal(): Promise<VaultActionOutcome>;
+    /** Withdraws this host's enrollment. */
+    disconnect(): Promise<VaultActionOutcome>;
+}
+export interface VaultSectionAction {
+    readonly id: string;
+    readonly label: string;
+    readonly description?: string;
+    readonly irreversible?: boolean;
+    readonly confirm?: string;
+    run(input: unknown): Promise<VaultActionOutcome>;
+}
+export interface VaultSectionContent {
+    readonly lines: string[];
+    readonly actions: VaultSectionAction[];
+    readonly facts: Record<string, string | number>;
+}
+export interface VaultExtraSection {
+    readonly id: 'vault';
+    readonly title: string;
+    build(invocation: unknown): Promise<VaultSectionContent>;
+}
+/**
+ * Checks a status from the server field by field. A status with any other
+ * field (a token, an email, a receipt) is refused rather than shown, so a
+ * server change that starts passing secrets cannot reach the menu.
+ */
+export declare function parseVaultSetupStatus(value: unknown): VaultSetupStatus | undefined;
+export interface VaultSetupView {
+    readonly lines: string[];
+    /** Ids of the actions offered for this status, in display order. */
+    readonly actions: Array<'enroll' | 'use-custody' | 'use-local' | 'disconnect'>;
+}
+/** The lines and the offered actions for one status. */
+export declare function vaultSetupView(status: VaultSetupStatus | undefined): VaultSetupView;
+/** The Vault provider extra for the server's `/antigravity` menu. */
+export declare function createVaultSection(effects: VaultSetupEffects): VaultExtraSection;
+//# sourceMappingURL=vault-setup.d.ts.map

package/dist/src/tui/vault-setup.d.ts.map

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

package/dist/src/tui/vault-setup.js

@@ -0,0 +1,198 @@
+/**
+ * The Vault section of the `/antigravity` menu: a credential-free view and
+ * action model for setting up the Claustrum vault on OpenCode.
+ *
+ * The server owns everything with an effect (enrollment, switching the
+ * account source, any credential the vault hands out). This module only
+ * turns a non-secret status into the section's lines and decides which
+ * actions are offered, and each action calls an injected server effect. It
+ * imports nothing: no vault client, token, account store or OAuth code, so it
+ * can sit next to the TUI without widening what the TUI can reach.
+ *
+ * The section's shape is the shared command menu's provider extra
+ * (`PluginExtraSection` of `@cortexkit/common-auth/commands`), declared
+ * structurally here so the server can pass it straight to
+ * `createCommandMenu({ extras: [...] })`.
+ */
+/** The enrollment name this host registers with the vault. */
+export const OPENCODE_VAULT_ENROLLMENT_NAME = 'antigravity-auth-opencode';
+const ENROLLMENT_TEXT = {
+    'not-enrolled': 'Not enrolled',
+    pending: 'Enrollment waiting for approval in the vault',
+    enrolled: 'Enrolled',
+    revoked: 'Enrollment revoked by the vault',
+    declined: 'Enrollment declined by the vault',
+    unavailable: 'Vault unreachable; status unknown',
+};
+const INELIGIBLE_TEXT = {
+    'no-vault-configured': 'No vault is configured for this machine.',
+    'host-login-present': 'An OpenCode login for this provider is present; remove it before using vault custody.',
+    'unsupported-host': 'This OpenCode version cannot use vault custody.',
+};
+const MODES = ['local', 'custody'];
+const STATES = Object.keys(ENROLLMENT_TEXT);
+const REASONS = Object.keys(INELIGIBLE_TEXT);
+const STATUS_KEYS = [
+    'mode',
+    'enrollment',
+    'ineligible',
+    'accounts',
+    'checkedAt',
+];
+/**
+ * Checks a status from the server field by field. A status with any other
+ * field (a token, an email, a receipt) is refused rather than shown, so a
+ * server change that starts passing secrets cannot reach the menu.
+ */
+export function parseVaultSetupStatus(value) {
+    if (typeof value !== 'object' || value === null || Array.isArray(value)) {
+        return undefined;
+    }
+    const record = value;
+    if (Object.keys(record).some((key) => !STATUS_KEYS.includes(key))) {
+        return undefined;
+    }
+    if (!MODES.includes(record.mode))
+        return undefined;
+    if (!STATES.includes(record.enrollment)) {
+        return undefined;
+    }
+    if (record.ineligible !== undefined &&
+        !REASONS.includes(record.ineligible)) {
+        return undefined;
+    }
+    if (record.accounts !== undefined &&
+        !(Number.isSafeInteger(record.accounts) && record.accounts >= 0)) {
+        return undefined;
+    }
+    if (!Number.isFinite(record.checkedAt))
+        return undefined;
+    return {
+        mode: record.mode,
+        enrollment: record.enrollment,
+        ...(record.ineligible === undefined
+            ? {}
+            : { ineligible: record.ineligible }),
+        ...(record.accounts === undefined
+            ? {}
+            : { accounts: record.accounts }),
+        checkedAt: record.checkedAt,
+    };
+}
+/** The lines and the offered actions for one status. */
+export function vaultSetupView(status) {
+    if (!status) {
+        return {
+            lines: ['Vault status could not be read; no vault action is offered.'],
+            actions: [],
+        };
+    }
+    const lines = [
+        `Accounts come from: ${status.mode === 'custody' ? 'vault custody' : 'local accounts'}`,
+        `Host enrollment (${OPENCODE_VAULT_ENROLLMENT_NAME}): ${ENROLLMENT_TEXT[status.enrollment]}`,
+    ];
+    if (status.enrollment === 'enrolled' && status.accounts !== undefined) {
+        lines.push(`Vault accounts for this host: ${status.accounts}`);
+    }
+    if (status.ineligible)
+        lines.push(INELIGIBLE_TEXT[status.ineligible]);
+    const actions = [];
+    if (status.enrollment === 'unavailable') {
+        // Nothing can be decided while the vault cannot be reached; only the
+        // way back to local accounts stays open.
+        if (status.mode === 'custody')
+            actions.push('use-local');
+        return { lines, actions };
+    }
+    if (!status.ineligible &&
+        (status.enrollment === 'not-enrolled' ||
+            status.enrollment === 'revoked' ||
+            status.enrollment === 'declined')) {
+        actions.push('enroll');
+    }
+    if (status.enrollment === 'enrolled' &&
+        status.mode === 'local' &&
+        !status.ineligible) {
+        actions.push('use-custody');
+    }
+    if (status.mode === 'custody')
+        actions.push('use-local');
+    if (status.enrollment === 'enrolled' || status.enrollment === 'pending') {
+        actions.push('disconnect');
+    }
+    return { lines, actions };
+}
+const UNREADABLE = {
+    ok: false,
+    text: 'The vault action did not complete.',
+    code: 'vault-failed',
+};
+async function guarded(run) {
+    try {
+        const outcome = await run();
+        return typeof outcome?.text === 'string' && typeof outcome.ok === 'boolean'
+            ? {
+                ok: outcome.ok,
+                text: outcome.text,
+                ...(outcome.code ? { code: outcome.code } : {}),
+            }
+            : UNREADABLE;
+    }
+    catch {
+        // The effect's own error text may quote a request or a credential, so it
+        // is never shown; the server logs it on its side.
+        return UNREADABLE;
+    }
+}
+/** The Vault provider extra for the server's `/antigravity` menu. */
+export function createVaultSection(effects) {
+    return {
+        id: 'vault',
+        title: 'Vault',
+        async build() {
+            let status;
+            try {
+                status = parseVaultSetupStatus(await effects.status());
+            }
+            catch {
+                status = undefined;
+            }
+            const view = vaultSetupView(status);
+            const definitions = {
+                enroll: {
+                    id: 'enroll',
+                    label: 'Set up vault for this host',
+                    description: `Request enrollment as ${OPENCODE_VAULT_ENROLLMENT_NAME}; approve it in the vault.`,
+                    run: () => guarded(() => effects.enroll()),
+                },
+                'use-custody': {
+                    id: 'use-custody',
+                    label: 'Use vault accounts',
+                    description: 'Send requests with accounts the vault serves to this host.',
+                    confirm: 'Switch this host to vault custody? Local accounts stay on disk but are not used.',
+                    run: () => guarded(() => effects.useCustody()),
+                },
+                'use-local': {
+                    id: 'use-local',
+                    label: 'Use local accounts',
+                    description: 'Send requests with the accounts stored on this machine.',
+                    run: () => guarded(() => effects.useLocal()),
+                },
+                disconnect: {
+                    id: 'disconnect',
+                    label: 'Disconnect vault',
+                    description: 'Withdraw this host from the vault.',
+                    irreversible: true,
+                    confirm: 'Withdraw this host from the vault? Setting it up again needs a new approval.',
+                    run: () => guarded(() => effects.disconnect()),
+                },
+            };
+            return {
+                lines: view.lines,
+                actions: view.actions.map((action) => definitions[action]),
+                facts: {},
+            };
+        },
+    };
+}
+//# sourceMappingURL=vault-setup.js.map

package/dist/src/tui/vault-setup.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"vault-setup.js","sourceRoot":"","sources":["../../../src/tui/vault-setup.ts"],"names":[],"mappings":"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"}

package/dist/src/tui.d.ts

@@ -1,10 +1,9 @@
 /** @jsxImportSource @opentui/solid */
-import type { TuiPluginApi, TuiPluginModule, TuiThemeCurrent } from '@opencode-ai/plugin/tui';
+import type { TuiPluginModule, TuiThemeCurrent } from '@opencode-ai/plugin/tui';
 import { createSlot } from '@opentui/solid';
 import { type JSX } from 'solid-js';
-import type { RpcNotification } from './rpc/protocol';
-import { type SidebarStateV1 } from './sidebar-state';
 import { type TuiLogger } from './tui/file-logger';
+import { type V1Notification } from './tui/host-v1';
 import { type AntigravityAuthTuiPrefs } from './tui-preferences';
 type Theme = TuiThemeCurrent;
 export interface SidebarPanelProps {
@@ -32,12 +31,6 @@ export interface SidebarController {
     toggleCollapsed: () => void;
 }
 export declare function createSidebarController(initialPrefs: AntigravityAuthTuiPrefs): SidebarController;
-export declare function resolveQuotaDialogActiveId(state: SidebarStateV1, sessionId: string | undefined): string | undefined;
-export declare function QuotaDialogContent(props: {
-    api: TuiPluginApi;
-    controller: SidebarController;
-    sessionId: string | undefined;
-}): JSX.Element;
 export declare function SidebarPanel(props: SidebarPanelProps): JSX.Element;
 /**
  * Solid slot registry binding exposed for hosts that want to mount the
@@ -47,9 +40,9 @@ export declare function SidebarPanel(props: SidebarPanelProps): JSX.Element;
  */
 export declare const sidebar_content: typeof createSlot;
 interface RpcNotificationPollOptions {
-    pending: (lastReceivedId: number, sessionId?: string) => Promise<RpcNotification[]>;
+    pending: (lastReceivedId: number, sessionId?: string) => Promise<readonly V1Notification[]>;
     currentSessionId: () => string | undefined;
-    dispatch: (notification: RpcNotification) => void | Promise<void>;
+    dispatch: (notification: V1Notification) => void | Promise<void>;
     schedule: (poll: () => Promise<void>, intervalMs: number) => void;
     /**
      * File logger used to surface poll errors. Must be a file logger — the

package/dist/src/tui.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tui.d.ts","sourceRoot":"","sources":["../../src/tui.tsx"],"names":[],"mappings":"AAAA,sCAAsC;AAwCtC,OAAO,KAAK,EAEV,YAAY,EACZ,eAAe,EACf,eAAe,EAChB,MAAM,yBAAyB,CAAA;AAChC,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAC3C,OAAO,EAIL,KAAK,GAAG,EAIT,MAAM,UAAU,CAAA;AACjB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAGrD,OAAO,EAKL,KAAK,cAAc,EACpB,MAAM,iBAAiB,CAAA;AAExB,OAAO,EAAuB,KAAK,SAAS,EAAE,MAAM,mBAAmB,CAAA;AACvE,OAAO,EACL,KAAK,uBAAuB,EAU7B,MAAM,mBAAmB,CAAA;AA4E1B,KAAK,KAAK,GAAG,eAAe,CAAA;AAyG5B,MAAM,WAAW,iBAAiB;IAChC,4EAA4E;IAC5E,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,yDAAyD;IACzD,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,4EAA4E;IAC5E,MAAM,CAAC,EAAE,SAAS,CAAA;IAClB,uEAAuE;IACvE,GAAG,CAAC,EAAE,MAAM,MAAM,CAAA;IAClB;8EAC0E;IAC1E,UAAU,CAAC,EAAE,iBAAiB,CAAA;IAC9B;;wEAEoE;IACpE,KAAK,CAAC,EAAE,MAAM,KAAK,CAAA;IACnB,2EAA2E;IAC3E,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB;AAED,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,MAAM,uBAAuB,CAAA;IACpC,SAAS,EAAE,MAAM,OAAO,CAAA;IACxB,eAAe,EAAE,MAAM,IAAI,CAAA;CAC5B;AA2DD,wBAAgB,uBAAuB,CACrC,YAAY,EAAE,uBAAuB,GACpC,iBAAiB,CA8CnB;AA4QD,wBAAgB,0BAA0B,CACxC,KAAK,EAAE,cAAc,EACrB,SAAS,EAAE,MAAM,GAAG,SAAS,GAC5B,MAAM,GAAG,SAAS,CAKpB;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE;IACxC,GAAG,EAAE,YAAY,CAAA;IACjB,UAAU,EAAE,iBAAiB,CAAA;IAC7B,SAAS,EAAE,MAAM,GAAG,SAAS,CAAA;CAC9B,GAAG,GAAG,CAAC,OAAO,CA0Cd;AAID,wBAAgB,YAAY,CAAC,KAAK,EAAE,iBAAiB,GAAG,GAAG,CAAC,OAAO,CAoSlE;AAED;;;;;GAKG;AACH,eAAO,MAAM,eAAe,mBAAa,CAAA;AAEzC,UAAU,0BAA0B;IAClC,OAAO,EAAE,CACP,cAAc,EAAE,MAAM,EACtB,SAAS,CAAC,EAAE,MAAM,KACf,OAAO,CAAC,eAAe,EAAE,CAAC,CAAA;IAC/B,gBAAgB,EAAE,MAAM,MAAM,GAAG,SAAS,CAAA;IAC1C,QAAQ,EAAE,CAAC,YAAY,EAAE,eAAe,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACjE,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,MAAM,KAAK,IAAI,CAAA;IACjE;;;;;;OAMG;IACH,MAAM,EAAE,SAAS,CAAA;CAClB;AAED,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,0BAA0B,GAClC,IAAI,CA+CN;AA6ED,QAAA,MAAM,MAAM,EAAE,eAAe,GAAG;IAAE,EAAE,EAAE,MAAM,CAAA;CAG3C,CAAA;AAED,eAAe,MAAM,CAAA"}
+{"version":3,"file":"tui.d.ts","sourceRoot":"","sources":["../../src/tui.tsx"],"names":[],"mappings":"AAAA,sCAAsC;AAwCtC,OAAO,KAAK,EAEV,eAAe,EACf,eAAe,EAChB,MAAM,yBAAyB,CAAA;AAChC,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAC3C,OAAO,EAAqB,KAAK,GAAG,EAA4B,MAAM,UAAU,CAAA;AAUhF,OAAO,EAAuB,KAAK,SAAS,EAAE,MAAM,mBAAmB,CAAA;AACvE,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,eAAe,CAAA;AACtB,OAAO,EACL,KAAK,uBAAuB,EAU7B,MAAM,mBAAmB,CAAA;AA4E1B,KAAK,KAAK,GAAG,eAAe,CAAA;AAyG5B,MAAM,WAAW,iBAAiB;IAChC,4EAA4E;IAC5E,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,yDAAyD;IACzD,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,4EAA4E;IAC5E,MAAM,CAAC,EAAE,SAAS,CAAA;IAClB,uEAAuE;IACvE,GAAG,CAAC,EAAE,MAAM,MAAM,CAAA;IAClB;8EAC0E;IAC1E,UAAU,CAAC,EAAE,iBAAiB,CAAA;IAC9B;;wEAEoE;IACpE,KAAK,CAAC,EAAE,MAAM,KAAK,CAAA;IACnB,2EAA2E;IAC3E,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB;AAED,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,MAAM,uBAAuB,CAAA;IACpC,SAAS,EAAE,MAAM,OAAO,CAAA;IACxB,eAAe,EAAE,MAAM,IAAI,CAAA;CAC5B;AA2DD,wBAAgB,uBAAuB,CACrC,YAAY,EAAE,uBAAuB,GACpC,iBAAiB,CA8CnB;AAyQD,wBAAgB,YAAY,CAAC,KAAK,EAAE,iBAAiB,GAAG,GAAG,CAAC,OAAO,CA6SlE;AAED;;;;;GAKG;AACH,eAAO,MAAM,eAAe,mBAAa,CAAA;AAEzC,UAAU,0BAA0B;IAClC,OAAO,EAAE,CACP,cAAc,EAAE,MAAM,EACtB,SAAS,CAAC,EAAE,MAAM,KACf,OAAO,CAAC,SAAS,cAAc,EAAE,CAAC,CAAA;IACvC,gBAAgB,EAAE,MAAM,MAAM,GAAG,SAAS,CAAA;IAC1C,QAAQ,EAAE,CAAC,YAAY,EAAE,cAAc,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAChE,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,MAAM,KAAK,IAAI,CAAA;IACjE;;;;;;OAMG;IACH,MAAM,EAAE,SAAS,CAAA;CAClB;AAED,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,0BAA0B,GAClC,IAAI,CA+CN;AAsDD,QAAA,MAAM,MAAM,EAAE,eAAe,GAAG;IAAE,EAAE,EAAE,MAAM,CAAA;CAG3C,CAAA;AAED,eAAe,MAAM,CAAA"}

package/dist/src/tui.js

@@ -38,12 +38,12 @@ import { readFileSync } from 'node:fs';
 import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { createSlot } from '@opentui/solid';
-import { createEffect, createSignal, For, onCleanup, onMount, Show, } from 'solid-js';
-import { createRpcClient } from './rpc/rpc-client';
+import { createSignal, For, onCleanup, onMount, Show } from 'solid-js';
+import { formatQuotaReading, quotaReadingParts } from './quota-presentation';
 import { getRpcDir } from './rpc/rpc-dir';
 import { readSidebarState, } from './sidebar-state';
-import { openCommandDialog } from './tui/command-dialogs';
 import { createTuiFileLogger } from './tui/file-logger';
+import { createV1MenuTransport, dispatchV1Notification, } from './tui/host-v1';
 import { computeEffectiveOrder, DEFAULT_PREFS, DEFAULT_SLOT_ORDER, PLUGIN_KEY, queueTuiPreferenceUpdate, readTuiPreferencesFile, resolveAntigravityAuthPrefs, watchTuiPreferences, } from './tui-preferences';
 const ID = 'cortexkit.antigravity-auth';
 const POLL_INTERVAL_MS = 2000;
@@ -180,10 +180,10 @@ function quotaTone(usedPct, appearance) {
         return 'warn';
     return 'err';
 }
-function quotaBarSegments(usedPct, appearance) {
+function quotaBarSegments(remainingPct, appearance) {
     const width = appearance.barWidth;
-    const usedCells = Math.max(0, Math.min(Math.round((usedPct / 100) * width), width));
-    const tone = quotaTone(usedPct, appearance);
+    const usedCells = Math.max(0, Math.min(Math.round((remainingPct / 100) * width), width));
+    const tone = quotaTone(100 - remainingPct, appearance);
     return [
         { text: appearance.barFilledChar.repeat(usedCells), tone },
         { text: appearance.barEmptyChar.repeat(width - usedCells), tone },
@@ -347,17 +347,13 @@ function StatRow(props) {
 function CollapsedRow(props) {
     return (_jsxs("box", { width: '100%', flexDirection: 'row', justifyContent: 'space-between', children: [_jsx("text", { fg: props.theme().textMuted, children: props.label }), props.children] }));
 }
-// Fleet QuotaRow, adapted to Antigravity's `remainingPercent + resetAt`
-// shape. The left group stacks label + bar + pct in fixed columns so
-// bars line up across rows; the right group carries the reset countdown
-// when the plugin has cached a reset time. Tone is read off the
-// remaining percentage via the antigravity threshold rules — the fleet's
-// `usageTone` would invert the polarity (healthy = high remaining vs
-// healthy = low used), so we keep the antigravity-local `quotaTone`.
+// The bar fills with remaining quota. The shared formatter supplies the
+// figure, reset and reading age; the right column aligns reset and age text.
 function QuotaRow(props) {
-    const used = () => props.entry ? 100 - clamp(props.entry.remainingPercent, 0, 100) : null;
-    const reset = () => props.entry ? formatResetIn(props.entry.resetAt, props.now) : '';
-    return (_jsx(Show, { when: used() != null, fallback: _jsxs("box", { width: '100%', flexDirection: 'row', justifyContent: 'space-between', children: [_jsx("text", { fg: props.theme().textMuted, children: props.label.padEnd(5) }), _jsx("text", { fg: props.theme().textMuted, children: '\u2014' })] }), children: _jsxs("box", { width: '100%', flexDirection: 'row', justifyContent: 'space-between', children: [_jsxs("box", { flexDirection: 'row', children: [_jsx("text", { width: 5, flexShrink: 0, fg: props.theme().textMuted, children: props.label }), _jsx("box", { width: props.appearance.barWidth, flexShrink: 0, flexDirection: 'row', children: _jsx(For, { each: quotaBarSegments(used() ?? 0, props.appearance), children: (segment) => (_jsx("text", { fg: toneColor(props.theme(), segment.tone), children: segment.text })) }) }), _jsx("text", { fg: toneColor(props.theme(), quotaTone(used() ?? 0, props.appearance)), children: ` ${String(Math.round(used() ?? 0)).padStart(3)}%` })] }), _jsx(Show, { when: reset(), children: _jsx("text", { fg: props.theme().textMuted, children: reset() }) })] }) }));
+    const parts = () => quotaReadingParts(props.label, props.entry, props.now());
+    const remaining = () => parts().remaining;
+    const reset = () => parts().detail;
+    return (_jsx(Show, { when: remaining() != null, fallback: _jsxs("box", { width: '100%', flexDirection: 'row', justifyContent: 'space-between', children: [_jsx("text", { fg: props.theme().textMuted, children: props.label.padEnd(5) }), _jsx("text", { fg: props.theme().textMuted, children: parts().figure })] }), children: _jsxs("box", { width: '100%', flexDirection: 'row', justifyContent: 'space-between', children: [_jsxs("box", { flexDirection: 'row', children: [_jsx("text", { width: 5, flexShrink: 0, fg: props.theme().textMuted, children: props.label }), _jsx("box", { width: props.appearance.barWidth, flexShrink: 0, flexDirection: 'row', children: _jsx(For, { each: quotaBarSegments(remaining() ?? 0, props.appearance), children: (segment) => (_jsx("text", { fg: toneColor(props.theme(), segment.tone), children: segment.text })) }) }), _jsx("text", { fg: toneColor(props.theme(), quotaTone(100 - (remaining() ?? 0), props.appearance)), children: ` ${parts().figure}` })] }), _jsx(Show, { when: reset(), children: _jsx("text", { fg: props.theme().textMuted, children: reset() }) })] }) }));
 }
 // Fleet AccountBlock, adapted to Antigravity's per-account data. Header
 // row is account label (left) + status word (right). The body renders one
@@ -410,6 +406,7 @@ function AccountBlock(props) {
                     return (_jsx(_Fragment, { children: windows.map((w) => (_jsx(QuotaRow, { theme: props.theme, appearance: props.appearance, label: `${QUOTA_LABELS[key]} ${WINDOW_GUTTER[w.window] ?? w.window}`, entry: {
                                 remainingPercent: w.remainingPercent,
                                 resetAt: w.resetAt,
+                                checkedAt: w.checkedAt,
                             }, now: props.now }))) }));
                 } }), _jsx("box", { width: '100%', flexDirection: 'row', children: _jsx("text", { fg: props.theme().textMuted, children: `   ${healthText()}` }) })] }));
 }
@@ -421,30 +418,6 @@ function formatWait(ms) {
     const remaining = seconds % 60;
     return remaining > 0 ? `${minutes}m ${remaining}s` : `${minutes}m`;
 }
-export function resolveQuotaDialogActiveId(state, sessionId) {
-    return ((sessionId ? state.activeRouting[sessionId]?.accountId : undefined) ??
-        state.accounts.find((account) => account.current)?.id);
-}
-export function QuotaDialogContent(props) {
-    const prefs = props.controller.prefs;
-    const [state, setState] = createSignal(EMPTY_STATE);
-    const refresh = () => {
-        setState(readSidebarState());
-    };
-    createEffect(() => {
-        const timer = setInterval(refresh, prefs().pollMs);
-        onCleanup(() => clearInterval(timer));
-    });
-    setTimeout(refresh, 0);
-    const theme = () => props.api.theme.current;
-    const visibleAccounts = () => {
-        if (prefs().sections.fallbackAccounts)
-            return state().accounts;
-        return state().accounts.filter((account) => account.current);
-    };
-    const activeId = () => resolveQuotaDialogActiveId(state(), props.sessionId);
-    return (_jsx("box", { flexDirection: 'column', padding: 2, width: '100%', alignItems: 'center', children: _jsxs("box", { flexDirection: 'column', width: 58, children: [_jsx("box", { width: '100%', justifyContent: 'center', marginBottom: 1, children: _jsx("text", { fg: theme().text, children: _jsx("b", { children: "Antigravity Quota" }) }) }), _jsx(For, { each: visibleAccounts(), children: (account, index) => (_jsx(AccountBlock, { theme: theme, appearance: prefs().appearance, account: account, active: activeId() === account.id, now: () => Date.now(), marginTop: index() === 0 ? 0 : 1 })) })] }) }));
-}
 // --- SidebarPanel ----------------------------------------------------------
 export function SidebarPanel(props) {
     const logger = resolveLogger(props.logger);
@@ -531,26 +504,19 @@ export function SidebarPanel(props) {
                 }, children: [_jsx("box", { paddingLeft: 1, paddingRight: 1, backgroundColor: theme().accent, children: _jsx("text", { fg: theme().background, children: _jsx("b", { children: headerLabel() }) }) }), _jsx(Show, { when: degraded(), fallback: _jsx(Show, { when: prefs().header.showVersion && PLUGIN_VERSION !== '', children: _jsx("text", { fg: theme().textMuted, children: `v${PLUGIN_VERSION}` }) }), children: _jsx("box", { paddingLeft: 1, paddingRight: 1, backgroundColor: theme().warning, children: _jsx("text", { fg: theme().background, children: _jsx("b", { children: 'LIMITED' }) }) }) })] }), _jsx(Show, { when: collapsed() && hasData(), children: (() => {
                     const account = () => visibleAccounts().find((entry) => entry.current) ??
                         visibleAccounts()[0];
-                    const used = () => {
+                    const remaining = () => {
                         const q = account()?.quota;
-                        // Derive tone from the WORST (most-constrained) pool so a
-                        // critical non-gemini pool doesn't hide behind a healthy
-                        // gemini tone. Worst = highest used-percent across available pools.
-                        const geminiUsed = q?.gemini != null
-                            ? 100 - clamp(q.gemini.remainingPercent, 0, 100)
-                            : null;
-                        const nonGeminiUsed = q?.['non-gemini'] != null
-                            ? 100 - clamp(q['non-gemini'].remainingPercent, 0, 100)
-                            : null;
-                        if (geminiUsed === null && nonGeminiUsed === null)
+                        // The lowest remaining percentage among dated readings determines the warning tone.
+                        const gemini = quotaReadingParts('Gm', q?.gemini, now()).remaining;
+                        const nonGemini = quotaReadingParts('NG', q?.['non-gemini'], now()).remaining;
+                        if (gemini === null && nonGemini === null)
                             return null;
-                        return Math.max(geminiUsed ?? 0, nonGeminiUsed ?? 0);
+                        return Math.min(gemini ?? 100, nonGemini ?? 100);
                     };
                     const poolText = (key) => {
                         const entry = account()?.quota[key];
                         if (!entry)
-                            return `${QUOTA_LABELS[key]}: —`;
-                        const pct = Math.round(100 - clamp(entry.remainingPercent, 0, 100));
+                            return `${QUOTA_LABELS[key]}: ${formatQuotaReading(QUOTA_LABELS[key], undefined, now())}`;
                         // Show binding window when available, else just pool label.
                         const bindingWindow = entry.windows?.reduce((best, w) => best === null || w.remainingPercent < best.remainingPercent
                             ? w
@@ -558,7 +524,8 @@ export function SidebarPanel(props) {
                         const gutter = bindingWindow
                             ? ` ${WINDOW_GUTTER[bindingWindow.window] ?? bindingWindow.window}`
                             : '';
-                        return `${QUOTA_LABELS[key]}${gutter}: ${pct}%`;
+                        const text = formatQuotaReading(`${QUOTA_LABELS[key]}${gutter}`, bindingWindow ?? entry, now());
+                        return bindingWindow ? `${QUOTA_LABELS[key]} ${text}` : text;
                     };
                     const unavailable = () => {
                         const selected = account();
@@ -567,14 +534,16 @@ export function SidebarPanel(props) {
                                 (selected.cooldownUntil != null &&
                                     selected.cooldownUntil > now())));
                     };
-                    return (_jsx(Show, { when: account(), children: (selected) => (_jsx(CollapsedRow, { theme: theme, label: selected().label, children: _jsxs("box", { flexDirection: 'row', children: [_jsx("text", { fg: toneColor(theme(), used() == null
+                    return (_jsx(Show, { when: account(), children: (selected) => (_jsx(CollapsedRow, { theme: theme, label: selected().label, children: _jsxs("box", { flexDirection: 'row', children: [_jsx("text", { fg: toneColor(theme(), remaining() == null
                                             ? 'muted'
-                                            : quotaTone(used() ?? 0, prefs().appearance)), children: _jsx("b", { children: account()?.quota.gemini == null &&
+                                            : quotaTone(100 - (remaining() ?? 100), prefs().appearance)), children: _jsx("b", { children: account()?.quota.gemini == null &&
                                                 account()?.quota['non-gemini'] == null
                                                 ? '—'
                                                 : `${poolText('gemini')} · ${poolText('non-gemini')}` }) }), _jsx("text", { fg: toneColor(theme(), unavailable()
                                             ? 'err'
-                                            : quotaTone(used() ?? 0, prefs().appearance)), children: unavailable() ? ' ⊘' : ' ●' })] }) })) }));
+                                            : remaining() == null
+                                                ? 'muted'
+                                                : quotaTone(100 - (remaining() ?? 100), prefs().appearance)), children: unavailable() ? ' ⊘' : ' ●' })] }) })) }));
                 })() }), _jsx(Show, { when: !collapsed() || !hasData(), children: _jsxs(Show, { when: hasData(), fallback: _jsx("box", { marginTop: 1, width: '100%', children: _jsx("text", { fg: theme().textMuted, children: 'Waiting for quota\u2026' }) }), children: [_jsxs(Show, { when: prefs().sections.quota, children: [_jsx(SectionHeader, { theme: theme, title: 'Quota' }), _jsx(For, { each: visibleAccounts(), children: (account, index) => (_jsx(AccountBlock, { theme: theme, appearance: prefs().appearance, account: account, now: now, marginTop: index() === 0 ? 0 : 1 })) })] }), _jsxs(Show, { when: prefs().sections.routing, children: [_jsx(SectionHeader, { theme: theme, title: 'Routing' }), _jsx(Show, { when: currentRoute(), fallback: _jsx(StatRow, { theme: theme, label: 'Route', value: '\u2014', tone: 'muted' }), children: (route) => (_jsx(StatRow, { theme: theme, label: 'Route', value: `${route().strategy ? `${route().strategy} · ` : ''}${route().family}: ${route().style}`, tone: 'accent' })) })] }), _jsxs(Show, { when: degraded() && prefs().sections.health, children: [_jsx(SectionHeader, { theme: theme, title: 'Health' }), _jsx(Show, { when: backoffActive(), children: _jsx(StatRow, { theme: theme, label: 'Quota API', value: `backoff ${formatResetIn(state().loaded.quotaBackoffUntil, now)}`, tone: 'warn' }) }), _jsx(Show, { when: lastError(), children: _jsx(StatRow, { theme: theme, label: 'Last error', value: lastError() ?? '', tone: 'err' }) })] })] }) })] }));
 }
 /**
@@ -644,34 +613,23 @@ const tui = async (api) => {
     if (!sidebarController) {
         sidebarController = createSidebarController(resolveAntigravityAuthPrefs(prefsRoot));
     }
-    const rpcClient = createRpcClient(getRpcDir(api.state.path.directory ?? ''), process.pid);
+    // The `/antigravity` drawer: the server pushes the menu as a notification
+    // on this process's private RPC; the drawer applies through the same RPC.
+    const transport = createV1MenuTransport(getRpcDir(api.state.path.directory ?? ''), process.pid);
     startRpcNotificationPolling({
-        pending: (lastReceivedId, sessionId) => rpcClient.pendingNotifications(lastReceivedId, sessionId),
+        pending: (lastReceivedId, sessionId) => transport.pending(lastReceivedId, sessionId),
         currentSessionId: () => {
             const current = api.route.current;
             const resolved = typeof current === 'function' ? current() : current;
             return resolved
                 ?.params?.sessionID;
         },
-        dispatch: async (notification) => {
+        dispatch: (notification) => {
             logger.debug('rpc-notification-received', {
-                command: notification.payload.command,
                 id: notification.id,
                 sessionId: notification.sessionId,
             });
-            // Call the imperative dispatcher directly — the prior
-            // two-phase `collectDialogFlow` + `renderDialogFlow` is gone.
-            // The dispatcher awaits `apply`, toasts the result, then clears
-            // (or replaces for multi-step flows). The RPC `apply` accepts the
-            // optional `timeoutMs` knob so account add / refresh can opt into
-            // the 120s RPC timeout without the dialog layer having to know
-            // about it.
-            if (notification.payload.command === 'antigravity-quota') {
-                api.ui.dialog.setSize('xlarge');
-                api.ui.dialog.replace(() => (_jsx(QuotaDialogContent, { api: api, controller: getSidebarController(), sessionId: notification.sessionId })));
-                return;
-            }
-            openCommandDialog(api, notification.payload, (command, args, options) => rpcClient.apply({ command, arguments: args, sessionId: notification.sessionId }, options));
+            dispatchV1Notification(api, transport, notification, logger);
         },
         schedule: (poll, intervalMs) => {
             setInterval(() => void poll(), intervalMs);