codex-ringside 0.1.1 → 0.3.0

package/src/agent.cjs

@@ -65,6 +65,7 @@ async function runAgent({ appPath, root, signal }) {
     seenAuth = stamp;
     log('account file changed, reconnecting');
     dropClient();
+    showUnavailable();
     nextRead = 0;
   }
 
@@ -151,6 +152,7 @@ function loadSettings(root) {
 
 async function main() {
   const { startWatcher } = require('./startup/watch.cjs');
+  const { startAutoUpdater } = require('./update.cjs');
   const root = path.resolve(__dirname, '..');
   const settings = loadSettings(root);
   const abort = new AbortController();
@@ -165,6 +167,7 @@ async function main() {
   process.once('SIGINT', shutdown);
   process.once('SIGTERM', shutdown);
 
+  startAutoUpdater({ root, signal: abort.signal, log });
   await runAgent({ appPath: settings.app, root, signal: abort.signal });
   await watcher.exited;
 }

package/src/card.js

@@ -1,6 +1,6 @@
 // Runs inside the Codex renderer. Must stay self-contained: cdp.cjs injects this file as text.
 function installCodexRingsideCard() {
-  const VERSION = 13;
+  const VERSION = 17;
   const KEY = '__codexRingsideCard';
   const STALE_AFTER_MS = 150000;
   const TICKS = 30;
@@ -18,14 +18,14 @@ function installCodexRingsideCard() {
   const card = document.createElement('div');
   card.id = 'codex-ringside-card';
   card.tabIndex = 0;
-  card.setAttribute('role', 'group');
+  card.setAttribute('role', 'button');
   card.setAttribute('aria-label', 'Codex 剩余额度');
-  card.setAttribute('aria-describedby', 'codex-ringside-tooltip');
   card.setAttribute('aria-haspopup', 'dialog');
 
   const tooltip = document.createElement('div');
   tooltip.id = 'codex-ringside-tooltip';
-  tooltip.setAttribute('role', 'tooltip');
+  tooltip.setAttribute('role', 'dialog');
+  tooltip.setAttribute('aria-label', 'Codex 剩余额度');
   tooltip.hidden = true;
 
   const style = document.createElement('style');
@@ -47,12 +47,16 @@ function installCodexRingsideCard() {
     /* The spread also grows the corners, so the outer radius is 4 + 3 = 7px; the width matches the rail buttons' 36px. */
     #codex-ringside-card:hover { background: var(--ringside-hover); box-shadow: 0 0 0 3px var(--ringside-hover); }
     #codex-ringside-card:active { transform: scale(.96); }
+    /* Keep the native menu available, with Ringside's original background-settings click. */
+    [data-codex-ringside-host] { height: auto !important; min-height: 36px; padding: 3px !important; }
+    [data-codex-ringside-host] > :not(#codex-ringside-card) { display: none !important; }
+    [data-codex-ringside-host] > #codex-ringside-card { margin: 0; pointer-events: none; }
     @media (prefers-reduced-motion: reduce) { #codex-ringside-card { transition: none; } }
     html.dark #codex-ringside-card, html[data-theme="dark"] #codex-ringside-card { ${dark} }
     @media (prefers-color-scheme: dark) {
       html:not(.light):not([data-theme="light"]) #codex-ringside-card { ${dark} }
     }
-    #codex-ringside-card[hidden], #codex-ringside-tooltip[hidden] { display: none !important; }
+    #codex-ringside-card[hidden], #codex-ringside-tooltip[hidden], #codex-ringside-tooltip [hidden] { display: none !important; }
     #codex-ringside-card:focus-visible { outline: 1px solid var(--ringside-text); outline-offset: 2px; }
     #codex-ringside-card .ringside-meter { position: relative; flex: 0 0 auto; width: 30px; height: 30px; }
     #codex-ringside-card .ringside-meter[data-tone="normal"] { --ringside-glow: #34e08280; }
@@ -67,11 +71,12 @@ function installCodexRingsideCard() {
     #codex-ringside-card .ringside-number { font-size: 8px; line-height: 9px; font-weight: 600; letter-spacing: -.3px; white-space: nowrap; }
     #codex-ringside-card .ringside-label { font-size: 6.5px; line-height: 8px; color: var(--ringside-label); white-space: nowrap; }
     #codex-ringside-tooltip {
-      box-sizing: border-box; position: fixed; z-index: 2147483000; min-width: 170px; max-width: min(320px, calc(100vw - 16px));
-      padding: 12px 14px; border: 1px solid color-mix(in srgb, currentColor 12%, transparent); border-radius: 10px;
+      box-sizing: border-box; position: fixed; z-index: 2147483000; min-width: 204px; max-width: min(320px, calc(100vw - 16px));
+      padding: 12px 14px; border: 1px solid color-mix(in srgb, currentColor 12%, transparent); border-radius: 12px;
       background: var(--color-surface-elevated-secondary, #f8f8f7); color: var(--color-text-primary, #303630);
-      box-shadow: 0 4px 18px #0002; pointer-events: none; -webkit-app-region: no-drag;
-      font: 12px/1.5 -apple-system, BlinkMacSystemFont, sans-serif;
+      box-shadow: 0 6px 22px #00000024; -webkit-app-region: no-drag;
+      max-height: calc(100vh - 16px); overflow: auto;
+      font: 12px/1.45 -apple-system, BlinkMacSystemFont, sans-serif;
     }
     html.dark #codex-ringside-tooltip, html[data-theme="dark"] #codex-ringside-tooltip {
       background: var(--color-surface-elevated-secondary, #2c2e2c); color: var(--color-text-primary, #edf0ed);
@@ -81,21 +86,53 @@ function installCodexRingsideCard() {
         background: var(--color-surface-elevated-secondary, #2c2e2c); color: var(--color-text-primary, #edf0ed);
       }
     }
-    #codex-ringside-tooltip .ringside-title { font-weight: 600; }
-    #codex-ringside-tooltip .ringside-sections { display: flex; gap: 20px; margin-top: 8px; }
-    #codex-ringside-tooltip .ringside-section-percent { margin: 2px 0; font-size: 22px; line-height: 26px; font-weight: 700; font-variant-numeric: tabular-nums; }
-    #codex-ringside-tooltip .ringside-dim { opacity: .68; font-size: 11px; white-space: nowrap; }
-    #codex-ringside-tooltip .ringside-footer { margin-top: 10px; padding-top: 8px; border-top: 1px solid color-mix(in srgb, currentColor 10%, transparent); }
+    #codex-ringside-tooltip .ringside-header { display: flex; align-items: center; justify-content: space-between; gap: 12px; }
+    #codex-ringside-tooltip .ringside-title { font-weight: 600; font-size: 12.5px; }
+    #codex-ringside-tooltip .ringside-badge {
+      padding: 1px 7px; border-radius: 999px; font-size: 10.5px; line-height: 16px; font-weight: 500;
+      background: color-mix(in srgb, currentColor 9%, transparent); color: color-mix(in srgb, currentColor 80%, transparent); white-space: nowrap;
+    }
+    #codex-ringside-tooltip .ringside-sections { display: flex; flex-wrap: wrap; gap: 10px 20px; margin-top: 10px; }
+    #codex-ringside-tooltip .ringside-section { flex: 1 1 auto; min-width: 72px; }
+    #codex-ringside-tooltip .ringside-section-percent {
+      margin: 2px 0; font-size: 24px; line-height: 28px; font-weight: 700; letter-spacing: -.02em; font-variant-numeric: tabular-nums;
+    }
+    #codex-ringside-tooltip .ringside-dim { opacity: .68; font-size: 11px; }
+    #codex-ringside-tooltip .ringside-message { margin-top: 8px; }
+    #codex-ringside-tooltip .ringside-footer { margin-top: 10px; padding-top: 9px; border-top: 1px solid color-mix(in srgb, currentColor 10%, transparent); }
+    #codex-ringside-tooltip .ringside-meta { display: flex; flex-direction: column; gap: 6px; }
+    #codex-ringside-tooltip .ringside-row { display: flex; align-items: center; justify-content: space-between; gap: 16px; }
+    #codex-ringside-tooltip .ringside-row[data-label]::before { content: attr(data-label); opacity: .68; font-size: 11px; }
+    #codex-ringside-tooltip .ringside-credit-balance { font-size: 14px; line-height: 18px; font-weight: 600; font-variant-numeric: tabular-nums; }
+    #codex-ringside-tooltip .ringside-meta-value { font-size: 12px; line-height: 16px; font-weight: 500; opacity: .9; font-variant-numeric: tabular-nums; }
+    #codex-ringside-tooltip .ringside-sr { font-size: 0; opacity: 0; }
+    #codex-ringside-tooltip .ringside-actions { display: flex; gap: 6px; }
+    #codex-ringside-tooltip button {
+      flex: 1; padding: 5px 10px; border: 1px solid color-mix(in srgb, currentColor 14%, transparent); border-radius: 6px;
+      font: 500 11.5px/1.35 -apple-system, BlinkMacSystemFont, sans-serif; text-align: center; white-space: nowrap;
+      color: inherit; background: color-mix(in srgb, currentColor 4%, transparent); cursor: pointer;
+      transition: background-color 120ms ease, border-color 120ms ease;
+    }
+    #codex-ringside-tooltip button:hover, #codex-ringside-tooltip button:focus-visible {
+      background: color-mix(in srgb, currentColor 11%, transparent);
+      border-color: color-mix(in srgb, currentColor 22%, transparent);
+    }
+    #codex-ringside-tooltip button:focus-visible { outline: 1px solid currentColor; outline-offset: 1px; }
   `;
 
   let value = { rings: [], message: '正在读取 Codex 剩余额度', note: null, stale: false, updatedAt: null };
   let rail = null;
+  let nativeTrigger = null;
+  let eventTarget = null;
   let placementTimer = null;
   let hoverTimer = null;
+  let hideTimer = null;
+  let suppressFocusTooltip = false;
+  let forwardingNativeAction = false;
   let disposed = false;
 
-  const element = (className, text) => {
-    const node = document.createElement('div');
+  const element = (className, text, tag = 'div') => {
+    const node = document.createElement(tag);
     node.className = className;
     if (text != null) node.textContent = text;
     return node;
@@ -106,6 +143,25 @@ function installCodexRingsideCard() {
     return rect.width > 0 && rect.height > 0 && getComputedStyle(node).visibility !== 'hidden';
   };
   const percentText = percent => (Number.isFinite(percent) ? `${percent}%` : '—');
+  const details = element('ringside-details');
+  const actions = element('ringside-actions ringside-footer');
+  const settingsButton = document.createElement('button');
+  settingsButton.type = 'button';
+  settingsButton.textContent = '背景设置';
+  settingsButton.addEventListener('click', togglePanel);
+  const usageButton = document.createElement('button');
+  usageButton.type = 'button';
+  usageButton.textContent = '用量菜单';
+  usageButton.setAttribute('aria-haspopup', 'menu');
+  usageButton.addEventListener('click', openUsageMenu);
+  actions.append(settingsButton, usageButton);
+  tooltip.append(details, actions);
+
+  function renderActions() {
+    settingsButton.hidden = !window.__codexRingsideBackground?.togglePanel;
+    usageButton.hidden = !nativeTrigger;
+    actions.hidden = settingsButton.hidden && usageButton.hidden;
+  }
 
   // Filled ticks run clockwise from 12 o'clock; the unused part of the circle stays a solid track.
   function ringSvg(percent, tone) {
@@ -151,19 +207,53 @@ function installCodexRingsideCard() {
       if (ring.resetsAt) section.append(element('ringside-dim', `${ring.resetsAt} 重置`));
       sections.append(section);
     }
-    const lines = [element('ringside-title', 'Codex 剩余额度')];
+    const header = element('ringside-header');
+    header.append(element('ringside-title', 'Codex 剩余额度'));
+    if (value.plan) header.append(element('ringside-badge', `${value.plan} 套餐`));
+    const lines = [header];
     if (sections.childElementCount) lines.push(sections);
-    if (value.message) lines.push(element('ringside-dim', value.message));
-    if (value.note) {
-      const footer = element('ringside-dim ringside-footer', value.note);
-      lines.push(footer);
+    if (value.credits || value.note) {
+      const meta = element('ringside-meta ringside-footer');
+      if (value.credits) {
+        const credits = element('ringside-row');
+        credits.append(element('ringside-dim', '额度余额'), element('ringside-credit-balance', value.credits.label));
+        meta.append(credits);
+      }
+      if (value.note) {
+        const parts = /^([^：:]+)([：:]\s*)(.+)$/.exec(value.note);
+        if (parts) {
+          const note = element('ringside-row');
+          note.dataset.label = parts[1];
+          const val = element('ringside-meta-value', parts[3], 'span');
+          val.prepend(element('ringside-sr', `${parts[1]}${parts[2]}`, 'span'));
+          note.append(val);
+          meta.append(note);
+        } else {
+          meta.append(element('ringside-dim', value.note));
+        }
+      }
+      lines.push(meta);
     }
-    tooltip.replaceChildren(...lines);
+    if (value.message) lines.push(element('ringside-dim ringside-message', value.message));
+    details.replaceChildren(...lines);
+    renderActions();
   }
 
   function render() {
-    const rings = value.rings?.length ? value.rings : [{ label: '额度', name: '额度', percent: null, tone: 'muted' }];
-    card.replaceChildren(...rings.map(buildMeter));
+    if (!value.rings?.length && value.credits) {
+      const balance = element('ringside-center');
+      const compact = value.credits.unlimited ? '∞' : new Intl.NumberFormat('zh-CN', {
+        notation: 'compact', maximumFractionDigits: 1
+      }).format(value.credits.balance);
+      balance.append(element('ringside-number', compact), element('ringside-label', '额度'));
+      const meter = element('ringside-meter');
+      meter.setAttribute('aria-label', `额度余额：${value.credits.label}`);
+      meter.append(balance);
+      card.replaceChildren(meter);
+    } else {
+      const rings = value.rings?.length ? value.rings : [{ label: '额度', name: '额度', percent: null, tone: 'muted' }];
+      card.replaceChildren(...rings.map(buildMeter));
+    }
     renderTooltip();
     if (!tooltip.hidden) positionTooltip();
   }
@@ -174,6 +264,9 @@ function installCodexRingsideCard() {
     value = {
       ...value,
       stale: true,
+      credits: null,
+      plan: null,
+      note: null,
       message: '额度数据已过期，正在等待重新连接',
       rings: (value.rings ?? []).map(ring => ({ ...ring, percent: null, tone: 'muted', resetsAt: null }))
     };
@@ -184,31 +277,121 @@ function installCodexRingsideCard() {
   const panelOpen = () => document.getElementById('codex-ringside-panel')?.hidden === false;
   function togglePanel() {
     hideTooltip();
-    window.__codexRingsideBackground?.togglePanel(card);
+    window.__codexRingsideBackground?.togglePanel(nativeTrigger ?? card);
+  }
+
+  function openUsageMenu() {
+    if (!nativeTrigger?.isConnected) return;
+    if (panelOpen()) window.__codexRingsideBackground?.togglePanel(nativeTrigger);
+    hideTooltip();
+    // Current clients open on pointerdown; older triggers may open on click. Pass both
+    // through the untouched native handlers, only for this explicit menu action.
+    forwardingNativeAction = true;
+    try {
+      nativeTrigger.focus();
+      const pointer = { bubbles: true, cancelable: true, button: 0, pointerType: 'mouse', isPrimary: true };
+      nativeTrigger.dispatchEvent(new PointerEvent('pointerdown', { ...pointer, buttons: 1 }));
+      nativeTrigger.dispatchEvent(new PointerEvent('pointerup', { ...pointer, buttons: 0 }));
+      nativeTrigger.click();
+    } finally {
+      forwardingNativeAction = false;
+      hideTooltip();
+    }
   }
 
   function positionTooltip() {
-    const rect = card.getBoundingClientRect();
+    const rect = (nativeTrigger ?? card).getBoundingClientRect();
     tooltip.style.left = `${Math.max(8, Math.min(rect.right + 12, innerWidth - tooltip.offsetWidth - 8))}px`;
     const top = rect.top + rect.height / 2 - tooltip.offsetHeight / 2;
     tooltip.style.top = `${Math.max(8, Math.min(top, innerHeight - tooltip.offsetHeight - 8))}px`;
   }
   function hideTooltip() {
     clearTimeout(hoverTimer);
+    clearTimeout(hideTimer);
     hoverTimer = null;
     tooltip.hidden = true;
   }
   function showTooltip() {
     clearTimeout(hoverTimer);
-    if (disposed || document.hidden || !visible(card) || panelOpen()) return;
+    clearTimeout(hideTimer);
+    if (disposed || suppressFocusTooltip || document.hidden || !visible(card) || panelOpen()
+      || nativeTrigger?.getAttribute('aria-expanded') === 'true') return;
+    renderActions();
     tooltip.hidden = false;
     positionTooltip();
   }
   function scheduleTooltip() {
     clearTimeout(hoverTimer);
+    clearTimeout(hideTimer);
     hoverTimer = setTimeout(showTooltip, 350);
   }
 
+  function scheduleHide() {
+    clearTimeout(hoverTimer);
+    clearTimeout(hideTimer);
+    hideTimer = setTimeout(() => {
+      if (!tooltip.contains(document.activeElement)) hideTooltip();
+    }, 180);
+  }
+
+  // Exact accessible labels cover old builds; the indicator + description covers other locales.
+  // Never select the profile menu or a navigation destination merely because it has an SVG.
+  function findNativeTrigger(container) {
+    return [...(container?.querySelectorAll('button[aria-haspopup="menu"]') ?? [])].find(button =>
+      visible(button) && !button.hasAttribute('data-sidebar-destination') && (
+        /^(usage|用量|使用量)$/i.test(button.getAttribute('aria-label')?.trim() ?? '')
+        || (button.hasAttribute('aria-description') && button.querySelector('[data-transition-phase]'))
+      )) ?? null;
+  }
+
+  const suppressNativeTooltip = event => event.stopPropagation();
+  const onBlur = event => {
+    if (!tooltip.contains(event.relatedTarget) && !eventTarget?.contains(event.relatedTarget)) hideTooltip();
+  };
+  const interceptBackground = event => {
+    if (forwardingNativeAction || !window.__codexRingsideBackground?.togglePanel) return false;
+    event.preventDefault();
+    event.stopPropagation();
+    return true;
+  };
+  const onPointerDown = event => {
+    // Radix opens before click. Stop the left pointerdown as well as the click so
+    // the original menu cannot steal focus or cover the background settings.
+    if (event.button === 0 && interceptBackground(event)) eventTarget?.focus();
+  };
+  const onClick = event => {
+    if (interceptBackground(event)) togglePanel();
+    else hideTooltip();
+  };
+  const onContextMenu = event => {
+    if (!window.__codexRingsideBackground?.togglePanel) return;
+    event.preventDefault();
+    event.stopPropagation();
+    togglePanel();
+  };
+  const onKeyDown = event => {
+    if (event.key === 'ContextMenu' || (event.shiftKey && event.key === 'F10')) return onContextMenu(event);
+    if (!['Enter', ' ', 'ArrowDown'].includes(event.key)) return;
+    if (event.key === 'ArrowDown') {
+      if (nativeTrigger && panelOpen()) window.__codexRingsideBackground?.togglePanel(nativeTrigger);
+      hideTooltip(); // ArrowDown still reaches the native usage-menu handler.
+    } else if (interceptBackground(event)) {
+      if (!event.repeat) togglePanel();
+    }
+  };
+  function bindTarget(target) {
+    if (eventTarget === target) return;
+    const listeners = { mouseenter: scheduleTooltip, mouseleave: scheduleHide, focus: showTooltip,
+      blur: onBlur, pointerdown: onPointerDown, keydown: onKeyDown, click: onClick, contextmenu: onContextMenu,
+      pointerover: suppressNativeTooltip, pointermove: suppressNativeTooltip, focusin: suppressNativeTooltip };
+    for (const [name, handler] of Object.entries(listeners)) {
+      const capture = ['pointerdown', 'keydown', 'click', 'contextmenu'].includes(name);
+      eventTarget?.removeEventListener(name, handler, capture);
+      target?.addEventListener(name, handler, capture);
+    }
+    eventTarget = target;
+  }
+
   function place() {
     if (disposed || !document.body) return;
     if (!style.isConnected) (document.head ?? document.documentElement).appendChild(style);
@@ -219,6 +402,28 @@ function installCodexRingsideCard() {
       rail = nextRail;
       if (rail) resizeObserver.observe(rail);
     }
+    const nextTrigger = findNativeTrigger(rail);
+    if (nativeTrigger !== nextTrigger) {
+      nativeTrigger?.removeAttribute('data-codex-ringside-host');
+      nativeTrigger = nextTrigger;
+      hideTooltip();
+    }
+    if (nativeTrigger) {
+      if (!nativeTrigger.hasAttribute('data-codex-ringside-host')) nativeTrigger.setAttribute('data-codex-ringside-host', '');
+      card.removeAttribute('tabindex');
+      card.setAttribute('role', 'group');
+      card.removeAttribute('aria-haspopup');
+      card.hidden = false;
+      if (card.parentElement !== nativeTrigger) nativeTrigger.append(card);
+      bindTarget(nativeTrigger);
+      if (nativeTrigger.getAttribute('aria-expanded') === 'true') hideTooltip();
+      else if (!tooltip.hidden) positionTooltip();
+      return;
+    }
+    card.tabIndex = 0;
+    card.setAttribute('role', 'button');
+    card.setAttribute('aria-haspopup', 'dialog');
+    bindTarget(card);
     // Own a sibling just before the rail's footer; never move React-owned nodes.
     const footer = rail && [...rail.children]
       .filter(child => child !== card && visible(child) && getComputedStyle(child).position !== 'absolute')
@@ -245,20 +450,26 @@ function installCodexRingsideCard() {
     if (records.some(record => !ownNode(record.target))) schedulePlacement();
   });
   const resizeObserver = new ResizeObserver(schedulePlacement);
-  const onKeyDown = event => {
-    if (event.key === 'Escape') hideTooltip();
-    if (event.key !== 'Enter' && event.key !== ' ') return;
-    event.preventDefault();
-    togglePanel();
+  const onEscape = event => {
+    if (event.key !== 'Escape' || tooltip.hidden) return;
+    if (tooltip.contains(document.activeElement)) {
+      suppressFocusTooltip = true;
+      eventTarget?.focus();
+      suppressFocusTooltip = false;
+    }
+    hideTooltip();
+  };
+  const onOutsidePointer = event => {
+    if (!tooltip.contains(event.target)) hideTooltip();
   };
 
-  observer.observe(document.documentElement, { childList: true, subtree: true });
-  card.addEventListener('mouseenter', scheduleTooltip);
-  card.addEventListener('mouseleave', hideTooltip);
-  card.addEventListener('focus', showTooltip);
-  card.addEventListener('blur', hideTooltip);
-  card.addEventListener('keydown', onKeyDown);
-  card.addEventListener('click', togglePanel);
+  observer.observe(document.documentElement, { childList: true, subtree: true, attributes: true,
+    attributeFilter: ['aria-expanded', 'aria-label', 'aria-description', 'hidden'] });
+  tooltip.addEventListener('mouseenter', () => clearTimeout(hideTimer));
+  tooltip.addEventListener('mouseleave', scheduleHide);
+  tooltip.addEventListener('focusout', onBlur);
+  document.addEventListener('keydown', onEscape);
+  document.addEventListener('pointerdown', onOutsidePointer, true);
   window.addEventListener('resize', schedulePlacement);
   document.addEventListener('visibilitychange', hideTooltip);
 
@@ -274,7 +485,10 @@ function installCodexRingsideCard() {
     status() {
       return {
         version: VERSION,
-        placed: card.parentElement === rail && !card.hidden && visible(card),
+        placed: rail?.contains(card) === true && !card.hidden && visible(card),
+        replacesNative: nativeTrigger?.contains(card) === true,
+        credits: value.credits ?? null,
+        plan: value.plan ?? null,
         rings: value.rings,
         message: value.message,
         stale: value.stale ?? false,
@@ -289,6 +503,10 @@ function installCodexRingsideCard() {
       clearTimeout(placementTimer);
       clearInterval(freshnessTimer);
       hideTooltip();
+      bindTarget(null);
+      nativeTrigger?.removeAttribute('data-codex-ringside-host');
+      document.removeEventListener('keydown', onEscape);
+      document.removeEventListener('pointerdown', onOutsidePointer, true);
       window.removeEventListener('resize', schedulePlacement);
       document.removeEventListener('visibilitychange', hideTooltip);
       card.remove();

package/src/install.cjs

@@ -5,6 +5,7 @@ const path = require('node:path');
 const { execFileSync } = require('node:child_process');
 const launchd = require('./launchd.cjs');
 const { DEFAULT_APP, isExecutable, resolveCodexBin, resolveNode } = require('./resolve.cjs');
+const { inspectBundle, copyBundle } = require('./standalone.cjs');
 
 const SWIFTC = '/usr/bin/swiftc';
 const sleep = ms => new Promise(resolve => setTimeout(resolve, ms));
@@ -29,10 +30,12 @@ function writeJson(file, data) {
   fs.writeFileSync(file, `${JSON.stringify(data, null, 2)}\n`, { mode: 0o600 });
 }
 
-function preflight(settings) {
+function preflight(settings, repoRoot, current) {
   if (process.platform !== 'darwin') throw new Error('只支持 macOS');
   const app = fs.realpathSync(settings.app);
   resolveCodexBin(app);
+  const bundle = inspectBundle(repoRoot);
+  if (bundle) return { app, node: path.join(current.installDir, 'runtime/node'), bundle };
   if (!isExecutable(SWIFTC)) throw new Error('需要 Xcode Command Line Tools：xcode-select --install');
   return { app, node: resolveNode() };
 }
@@ -98,12 +101,13 @@ function selectSettings(current, legacy, env, observe) {
     ?? readJson(path.join(legacy.installDir, 'settings.json')) ?? {};
   return {
     app: env.CODEX_RINGSIDE_APP || env.CODEX_PLUS_APP || saved.app || DEFAULT_APP,
-    allowClientRestart: observe === undefined ? saved.allowClientRestart !== false : !observe
+    allowClientRestart: observe === undefined ? saved.allowClientRestart !== false : !observe,
+    autoUpdate: saved.autoUpdate !== false
   };
 }
 
 function copyUserData(source, stage, destination) {
-  for (const name of ['background.json', 'background', 'user-images']) {
+  for (const name of ['background.json', 'background', 'user-images', 'update-state.json']) {
     copyIfPresent(path.join(source, name), path.join(stage, name));
   }
   const file = path.join(stage, 'background.json');
@@ -123,8 +127,10 @@ function copyUserData(source, stage, destination) {
 async function install(options = {}) {
   const { current, legacy, backupRoot, repoRoot, services } = { ...defaults, ...options };
   return withLock(current, async () => {
+    // Recheck under the install lock: an update downloaded before uninstall/reinstall is stale.
+    options.beforeInstall?.();
     const settings = selectSettings(current, legacy, options.env ?? process.env, options.observe);
-    const checked = await (options.preflight ?? preflight)(settings);
+    const checked = await (options.preflight ?? preflight)(settings, repoRoot, current);
     settings.app = checked.app;
     const stage = fs.mkdtempSync(`${current.installDir}.staging-`);
     const locations = [current, legacy];
@@ -134,8 +140,13 @@ async function install(options = {}) {
     let touched = false;
     try {
       fs.cpSync(path.join(repoRoot, 'src'), path.join(stage, 'src'), { recursive: true });
+      fs.mkdirSync(path.join(stage, 'bin'));
+      fs.copyFileSync(path.join(repoRoot, 'bin/codex-ringside.cjs'), path.join(stage, 'bin/codex-ringside.cjs'));
+      if (checked.bundle) fs.copyFileSync(path.join(repoRoot, 'bin/codex-ringside'), path.join(stage, 'bin/codex-ringside'));
       for (const name of ['package.json', 'LICENSE', 'NOTICE']) fs.copyFileSync(path.join(repoRoot, name), path.join(stage, name));
-      await (options.compile ?? compile)(repoRoot, stage);
+      if (checked.bundle) copyBundle(repoRoot, stage);
+      else await (options.compile ?? compile)(repoRoot, stage);
+      options.beforeInstall?.();
       fs.mkdirSync(backupRoot, { recursive: true, mode: 0o700 });
       backup = fs.mkdtempSync(path.join(backupRoot, 'install-'));
       snapshots = capture(locations, backup);
@@ -194,6 +205,7 @@ async function install(options = {}) {
 async function uninstall(options = {}) {
   const { current, legacy, trashRoot, services } = { ...defaults, ...options };
   return withLock(current, async () => {
+    await services.bootout(launchd.UPDATE_LABEL);
     const locations = [current, legacy];
     const running = locations.map(location => !!services.printJob(location.label));
     const items = locations.flatMap((location, i) => launchd.trashItems(location)
@@ -219,4 +231,4 @@ async function uninstall(options = {}) {
   });
 }
 
-module.exports = { install, uninstall, selectSettings };
+module.exports = { install, uninstall, selectSettings, withLock };

package/src/launchd.cjs

@@ -5,6 +5,7 @@ const path = require('node:path');
 const { execFileSync } = require('node:child_process');
 
 const LABEL = 'com.codexringside.agent';
+const UPDATE_LABEL = 'com.codexringside.update';
 const home = os.homedir();
 const paths = {
   installDir: path.join(home, 'Library/Application Support/CodexRingside'),
@@ -59,6 +60,19 @@ function agentConfig({ node, installDir = paths.installDir, logDir = paths.logDi
   };
 }
 
+// An independent, one-shot job survives bootout of the agent it is upgrading.
+function updateConfig({ node, installDir = paths.installDir, logDir = paths.logDir }) {
+  return {
+    Label: UPDATE_LABEL,
+    ProgramArguments: [node, path.join(installDir, 'src/update.cjs'), '--auto'],
+    RunAtLoad: true,
+    ProcessType: 'Background',
+    EnvironmentVariables: { NODE_OPTIONS: '', NODE_PATH: '' },
+    StandardOutPath: path.join(logDir, 'update.log'),
+    StandardErrorPath: path.join(logDir, 'update.err.log')
+  };
+}
+
 const launchctl = (...args) => execFileSync('/bin/launchctl', args, {
   encoding: 'utf8', timeout: 15000, stdio: ['ignore', 'pipe', 'pipe']
 });
@@ -88,4 +102,4 @@ function writePlist(config, file = paths.plist) {
   execFileSync('/usr/bin/plutil', ['-lint', file], { stdio: 'ignore' });
 }
 
-module.exports = { LABEL, LEGACY_LABEL, legacyPaths, agentConfig, bootout, bootstrap, paths, plistXml, printJob, trashItems, writePlist };
+module.exports = { LABEL, UPDATE_LABEL, LEGACY_LABEL, legacyPaths, agentConfig, updateConfig, bootout, bootstrap, paths, plistXml, printJob, trashItems, writePlist };

package/src/limits.cjs

@@ -70,6 +70,8 @@ function mergeSnapshot(current, patch) {
   return {
     ...base,
     ...patch,
+    credits: patch.credits === undefined ? base?.credits ?? null
+      : isRecord(patch.credits) ? { ...base?.credits, ...patch.credits } : null,
     primary: mergeWindow(base?.primary, patch.primary),
     secondary: mergeWindow(base?.secondary, patch.secondary)
   };
@@ -81,7 +83,10 @@ function mergeResponse(current, patch) {
   if (!isRecord(patch)) return null;
   const changedAccount = hasField(patch, 'accountId') && hasField(current, 'accountId')
     && patch.accountId !== current.accountId;
-  const base = changedAccount ? {} : current ?? {};
+  const oldPlan = pickCodexSnapshot(current)?.planType;
+  const newPlan = pickCodexSnapshot(patch)?.planType;
+  const changedPlan = oldPlan && newPlan && oldPlan !== newPlan;
+  const base = changedAccount || changedPlan ? {} : current ?? {};
   const merged = { ...base, ...patch };
   merged.rateLimits = base.rateLimits ?? null;
   if (isRecord(base.rateLimitsByLimitId)) merged.rateLimitsByLimitId = base.rateLimitsByLimitId;
@@ -122,13 +127,33 @@ function formatUsage(response) {
     const percent = remainingPercent(window.usedPercent);
     return { label: labels.short, name: labels.long, percent, tone: tone(percent), resetsAt: formatResetTime(window.resetsAt) };
   });
+  const credits = formatCredits(snapshot?.credits);
   return {
     rings,
-    message: rings.length ? null : '暂时无法读取 Codex 剩余额度',
+    plan: formatPlan(snapshot?.planType),
+    credits,
+    message: rings.length || credits ? null : '暂时无法读取 Codex 剩余额度',
     note: resetCreditsNote(response)
   };
 }
 
+function formatPlan(plan) {
+  if (typeof plan !== 'string' || !plan.trim()) return null;
+  const labels = { free: 'Free', go: 'Go', plus: 'Plus', pro: 'Pro', team: 'Team', business: 'Business',
+    enterprise: 'Enterprise', edu: 'Edu' };
+  return Object.hasOwn(labels, plan) ? labels[plan] : plan;
+}
+
+function formatCredits(credits) {
+  if (!isRecord(credits)) return null;
+  if (credits.unlimited === true) return { unlimited: true, balance: null, label: '不限额' };
+  const raw = credits.balance;
+  if (typeof raw !== 'number' && (typeof raw !== 'string' || !raw.trim())) return null;
+  const balance = Number(raw);
+  if (!Number.isFinite(balance) || balance < 0) return null;
+  return { unlimited: false, balance, label: new Intl.NumberFormat('zh-CN', { maximumFractionDigits: 0 }).format(balance) };
+}
+
 function resetCreditsNote(response) {
   const count = Number(response?.rateLimitResetCredits?.availableCount);
   return Number.isFinite(count) && count > 0 ? `重置卡：${Math.floor(count)} 张可用` : null;
@@ -139,6 +164,9 @@ function unavailable(value, message = '暂时无法读取 Codex 剩余额度，
     ...value,
     message,
     stale: true,
+    credits: null,
+    plan: null,
+    note: null,
     rings: (value?.rings ?? []).map(ring => ({ ...ring, percent: null, tone: 'muted', resetsAt: null }))
   };
 }