@cortexkit/opencode-antigravity-auth 2.2.1 → 3.0.1

package/src/tui.tsx

@@ -40,22 +40,12 @@ import { dirname, join } from 'node:path'
 import { fileURLToPath } from 'node:url'
 import type {
   TuiPlugin,
-  TuiPluginApi,
   TuiPluginModule,
   TuiThemeCurrent,
 } from '@opencode-ai/plugin/tui'
 import { createSlot } from '@opentui/solid'
-import {
-  createEffect,
-  createSignal,
-  For,
-  type JSX,
-  onCleanup,
-  onMount,
-  Show,
-} from 'solid-js'
-import type { RpcNotification } from './rpc/protocol'
-import { createRpcClient } from './rpc/rpc-client'
+import { createSignal, For, type JSX, onCleanup, onMount, Show } from 'solid-js'
+import { formatQuotaReading, quotaReadingParts } from './quota-presentation'
 import { getRpcDir } from './rpc/rpc-dir'
 import {
   readSidebarState,
@@ -64,8 +54,12 @@ import {
   type SidebarQuotaKey,
   type SidebarStateV1,
 } from './sidebar-state'
-import { openCommandDialog } from './tui/command-dialogs'
 import { createTuiFileLogger, type TuiLogger } from './tui/file-logger'
+import {
+  createV1MenuTransport,
+  dispatchV1Notification,
+  type V1Notification,
+} from './tui/host-v1'
 import {
   type AntigravityAuthTuiPrefs,
   type AppearancePrefs,
@@ -243,15 +237,15 @@ interface BarSegment {
 }
 
 function quotaBarSegments(
-  usedPct: number,
+  remainingPct: number,
   appearance: AppearancePrefs,
 ): BarSegment[] {
   const width = appearance.barWidth
   const usedCells = Math.max(
     0,
-    Math.min(Math.round((usedPct / 100) * width), width),
+    Math.min(Math.round((remainingPct / 100) * width), width),
   )
-  const tone = quotaTone(usedPct, appearance)
+  const tone = quotaTone(100 - remainingPct, appearance)
   return [
     { text: appearance.barFilledChar.repeat(usedCells), tone },
     { text: appearance.barEmptyChar.repeat(width - usedCells), tone },
@@ -492,13 +486,8 @@ function CollapsedRow(props: {
   )
 }
 
-// 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: {
   theme: () => Theme
   appearance: AppearancePrefs
@@ -506,17 +495,16 @@ function QuotaRow(props: {
   entry: SidebarQuotaEntry | undefined
   now: () => number
 }): JSX.Element {
-  const used = () =>
-    props.entry ? 100 - clamp(props.entry.remainingPercent, 0, 100) : null
-  const reset = () =>
-    props.entry ? formatResetIn(props.entry.resetAt, props.now) : ''
+  const parts = () => quotaReadingParts(props.label, props.entry, props.now())
+  const remaining = () => parts().remaining
+  const reset = () => parts().detail
   return (
     <Show
-      when={used() != null}
+      when={remaining() != null}
       fallback={
         <box width='100%' flexDirection='row' justifyContent='space-between'>
           <text fg={props.theme().textMuted}>{props.label.padEnd(5)}</text>
-          <text fg={props.theme().textMuted}>{'\u2014'}</text>
+          <text fg={props.theme().textMuted}>{parts().figure}</text>
         </box>
       }
     >
@@ -530,7 +518,7 @@ function QuotaRow(props: {
             flexShrink={0}
             flexDirection='row'
           >
-            <For each={quotaBarSegments(used() ?? 0, props.appearance)}>
+            <For each={quotaBarSegments(remaining() ?? 0, props.appearance)}>
               {(segment) => (
                 <text fg={toneColor(props.theme(), segment.tone)}>
                   {segment.text}
@@ -541,10 +529,10 @@ function QuotaRow(props: {
           <text
             fg={toneColor(
               props.theme(),
-              quotaTone(used() ?? 0, props.appearance),
+              quotaTone(100 - (remaining() ?? 0), props.appearance),
             )}
           >
-            {` ${String(Math.round(used() ?? 0)).padStart(3)}%`}
+            {` ${parts().figure}`}
           </text>
         </box>
         <Show when={reset()}>
@@ -634,6 +622,7 @@ function AccountBlock(props: {
                   entry={{
                     remainingPercent: w.remainingPercent,
                     resetAt: w.resetAt,
+                    checkedAt: w.checkedAt,
                   }}
                   now={props.now}
                 />
@@ -657,64 +646,6 @@ function formatWait(ms: number): string {
   return remaining > 0 ? `${minutes}m ${remaining}s` : `${minutes}m`
 }
 
-export function resolveQuotaDialogActiveId(
-  state: SidebarStateV1,
-  sessionId: string | undefined,
-): string | undefined {
-  return (
-    (sessionId ? state.activeRouting[sessionId]?.accountId : undefined) ??
-    state.accounts.find((account) => account.current)?.id
-  )
-}
-
-export function QuotaDialogContent(props: {
-  api: TuiPluginApi
-  controller: SidebarController
-  sessionId: string | undefined
-}): JSX.Element {
-  const prefs = props.controller.prefs
-  const [state, setState] = createSignal<SidebarStateV1>(EMPTY_STATE)
-  const refresh = (): void => {
-    setState(readSidebarState())
-  }
-  createEffect(() => {
-    const timer = setInterval(refresh, prefs().pollMs)
-    onCleanup(() => clearInterval(timer))
-  })
-  setTimeout(refresh, 0)
-
-  const theme = (): 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 (
-    <box flexDirection='column' padding={2} width='100%' alignItems='center'>
-      <box flexDirection='column' width={58}>
-        <box width='100%' justifyContent='center' marginBottom={1}>
-          <text fg={theme().text}>
-            <b>Antigravity Quota</b>
-          </text>
-        </box>
-        <For each={visibleAccounts()}>
-          {(account, index) => (
-            <AccountBlock
-              theme={theme}
-              appearance={prefs().appearance}
-              account={account}
-              active={activeId() === account.id}
-              now={() => Date.now()}
-              marginTop={index() === 0 ? 0 : 1}
-            />
-          )}
-        </For>
-      </box>
-    </box>
-  )
-}
-
 // --- SidebarPanel ----------------------------------------------------------
 
 export function SidebarPanel(props: SidebarPanelProps): JSX.Element {
@@ -856,26 +787,22 @@ export function SidebarPanel(props: SidebarPanelProps): JSX.Element {
           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) return null
-            return Math.max(geminiUsed ?? 0, nonGeminiUsed ?? 0)
+            // 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.min(gemini ?? 100, nonGemini ?? 100)
           }
           const poolText = (key: 'gemini' | 'non-gemini') => {
             const entry = account()?.quota[key]
-            if (!entry) return `${QUOTA_LABELS[key]}: —`
-            const pct = Math.round(100 - clamp(entry.remainingPercent, 0, 100))
+            if (!entry)
+              return `${QUOTA_LABELS[key]}: ${formatQuotaReading(QUOTA_LABELS[key], undefined, now())}`
             // Show binding window when available, else just pool label.
             const bindingWindow = entry.windows?.reduce<
               (typeof entry.windows)[0] | null
@@ -889,7 +816,12 @@ export function SidebarPanel(props: SidebarPanelProps): JSX.Element {
             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()
@@ -908,9 +840,12 @@ export function SidebarPanel(props: SidebarPanelProps): JSX.Element {
                     <text
                       fg={toneColor(
                         theme(),
-                        used() == null
+                        remaining() == null
                           ? 'muted'
-                          : quotaTone(used() ?? 0, prefs().appearance),
+                          : quotaTone(
+                              100 - (remaining() ?? 100),
+                              prefs().appearance,
+                            ),
                       )}
                     >
                       <b>
@@ -925,7 +860,12 @@ export function SidebarPanel(props: SidebarPanelProps): JSX.Element {
                         theme(),
                         unavailable()
                           ? 'err'
-                          : quotaTone(used() ?? 0, prefs().appearance),
+                          : remaining() == null
+                            ? 'muted'
+                            : quotaTone(
+                                100 - (remaining() ?? 100),
+                                prefs().appearance,
+                              ),
                       )}
                     >
                       {unavailable() ? ' ⊘' : ' ●'}
@@ -1023,9 +963,9 @@ interface RpcNotificationPollOptions {
   pending: (
     lastReceivedId: number,
     sessionId?: string,
-  ) => Promise<RpcNotification[]>
+  ) => 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
@@ -1096,14 +1036,15 @@ const tui: TuiPlugin = async (api) => {
       resolveAntigravityAuthPrefs(prefsRoot),
     )
   }
-  const rpcClient = createRpcClient(
+  // 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),
+      transport.pending(lastReceivedId, sessionId),
     currentSessionId: () => {
       const current = (api.route as { current?: unknown }).current
       const resolved =
@@ -1111,36 +1052,12 @@ const tui: TuiPlugin = async (api) => {
       return (resolved as { params?: { sessionID?: string } } | undefined)
         ?.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(() => (
-          <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)

package/tui.js

@@ -0,0 +1,6 @@
+// Directory forwarder for the `./tui` entry. OpenCode 2 resolves a plugin
+// directory by importing `<directory>/tui` without reading the package's
+// export map, so this file re-exports the same entry that `exports["./tui"]`
+// names.
+export * from './src/tui/entry.mjs'
+export { default } from './src/tui/entry.mjs'