opencode-dux 1.1.1 → 1.2.0

package/src/subscriptions/codex-scraper.ts

@@ -0,0 +1,98 @@
+/**
+ * Codex quota API scraper.
+ *
+ * Fetches usage data from the Codex (chatgpt.com) WHAM usage API using Bearer
+ * token authentication. Returns structured quota data including usage windows
+ * and credit balance.
+ */
+
+import type { CodexUsageEntry, UsageWindow } from './types';
+
+const CODEX_WHAM_URL = 'https://chatgpt.com/backend-api/wham/usage';
+
+const EMPTY_WINDOW: UsageWindow = {
+  usagePercent: 0,
+  percentRemaining: 100,
+  resetInSec: 0,
+  resetTimeIso: '',
+};
+
+const EMPTY_CREDITS = { hasCredits: false, unlimited: false, balance: 0 };
+
+function windowFromApi(
+  w: { used_percent: number; reset_at: number; limit_window_seconds: number } | undefined,
+): UsageWindow {
+  if (!w) return { ...EMPTY_WINDOW };
+  const usagePercent = Math.max(0, Math.min(100, w.used_percent));
+  return {
+    usagePercent,
+    percentRemaining: 100 - usagePercent,
+    resetInSec: Math.max(0, w.limit_window_seconds),
+    resetTimeIso: w.reset_at ? new Date(w.reset_at * 1000).toISOString() : '',
+  };
+}
+
+/**
+ * Fetch Codex quota data via the WHAM usage API.
+ */
+export async function scrapeCodexQuota(
+  accessToken: string,
+  signal?: AbortSignal,
+): Promise<CodexUsageEntry> {
+  const accountName = ''; // filled by caller
+
+  try {
+    const res = await fetch(CODEX_WHAM_URL, {
+      headers: {
+        Authorization: `Bearer ${accessToken}`,
+        Accept: 'application/json',
+      },
+      signal,
+    });
+
+    if (!res.ok) {
+      return {
+        provider: 'codex',
+        accountName,
+        fetchedAt: Date.now(),
+        error: `Codex API returned ${res.status} ${res.statusText}`,
+        primaryWindow: { ...EMPTY_WINDOW },
+        secondaryWindow: { ...EMPTY_WINDOW },
+        credits: { ...EMPTY_CREDITS },
+      };
+    }
+
+    const data = await res.json() as {
+      plan_type?: string;
+      rate_limit?: {
+        primary_window?: { used_percent: number; reset_at: number; limit_window_seconds: number };
+        secondary_window?: { used_percent: number; reset_at: number; limit_window_seconds: number };
+      };
+      credits?: { has_credits: boolean; unlimited: boolean; balance: number };
+    };
+
+    return {
+      provider: 'codex',
+      accountName,
+      fetchedAt: Date.now(),
+      primaryWindow: windowFromApi(data.rate_limit?.primary_window),
+      secondaryWindow: windowFromApi(data.rate_limit?.secondary_window),
+      credits: {
+        hasCredits: data.credits?.has_credits ?? false,
+        unlimited: data.credits?.unlimited ?? false,
+        balance: data.credits?.balance ?? 0,
+      },
+    };
+  } catch (err: unknown) {
+    const message = err instanceof Error ? err.message : String(err);
+    return {
+      provider: 'codex',
+      accountName,
+      fetchedAt: Date.now(),
+      error: `Codex fetch failed: ${message}`,
+      primaryWindow: { ...EMPTY_WINDOW },
+      secondaryWindow: { ...EMPTY_WINDOW },
+      credits: { ...EMPTY_CREDITS },
+    };
+  }
+}

package/src/subscriptions/index.ts

@@ -18,9 +18,11 @@ export {
   setAccountKey,
   updateAccountCookie,
 } from './accounts-store';
+export { scrapeCodexQuota } from './codex-scraper';
 export { scrapeNeuralwattQuota } from './neuralwatt-scraper';
 export { scrapeQuota, scrapeUsagePage } from './opencode-go-scraper';
 export type {
+  CodexUsageEntry,
   NeuralwattUsageEntry,
   OpenCodeGoUsageEntry,
   SubscriptionUsageEntry,

package/src/subscriptions/types.ts

@@ -1,145 +1,170 @@
-/**
- * Type definitions for multi-provider subscription usage tracking.
- *
- * Supports OpenCode Go (dashboard scraping) and Neuralwatt (REST API)
- * as discriminated unions on the `provider` field.
- */
-
-/** Provider discriminator. */
-export type SubscriptionProvider = 'opencode-go' | 'neuralwatt';
-
-// ── Account definitions (discriminated union) ──
-
-export interface OpenCodeGoAccount {
-  provider: 'opencode-go';
-  name: string;
-  workspaceId: string;
-  authCookie: string;
-  apiKey?: string;
-}
-
-export interface NeuralwattAccount {
-  provider: 'neuralwatt';
-  name: string;
-  apiKey: string;
-}
-
-export type StoredAccount = OpenCodeGoAccount | NeuralwattAccount;
-
-// ── Usage window (OpenCode Go) ──
-
-/** Per-time-window usage data scraped from the OpenCode Go dashboard. */
-export interface UsageWindow {
-  /** Usage percentage [0..100] */
-  usagePercent: number;
-  /** Seconds until usage resets */
-  resetInSec: number;
-  /** Remaining percentage [0..100] */
-  percentRemaining: number;
-  /** ISO reset timestamp */
-  resetTimeIso: string;
-}
-
-// ── OpenCode Go usage entry ──
-
-/** Snapshot entry per OpenCode Go account - stored in tui-state.json. */
-export interface OpenCodeGoUsageEntry {
-  provider: 'opencode-go';
-  /** Display name for this account (from config). */
-  accountName: string;
-  /** OpenCode Go workspace ID. */
-  workspaceId: string;
-  /** Rolling (~5h) usage window, when present. */
-  rolling?: UsageWindow;
-  /** Weekly usage window, when present. */
-  weekly?: UsageWindow;
-  /** Monthly usage window, when present. */
-  monthly?: UsageWindow;
-  /** Timestamp when data was fetched. */
-  fetchedAt: number;
-  /** Error message if the scrape failed for this account. */
-  error?: string;
-}
-
-// ── Neuralwatt types ──
-
-export interface NeuralwattBalance {
-  credits_remaining_usd: number;
-  total_credits_usd: number;
-  credits_used_usd: number;
-  accounting_method: string;
-}
-
-export interface NeuralwattUsagePeriod {
-  cost_usd: number;
-  requests: number;
-  tokens: number;
-  energy_kwh: number;
-}
-
-export interface NeuralwattUsage {
-  lifetime: NeuralwattUsagePeriod;
-  current_month: NeuralwattUsagePeriod;
-}
-
-export interface NeuralwattSubscription {
-  plan: string;
-  status: 'active' | 'canceling' | 'past_due' | 'paused' | 'trialing';
-  billing_interval: string | null;
-  current_period_start: string | null;
-  current_period_end: string | null;
-  auto_renew: boolean | null;
-  kwh_included: number | null;
-  kwh_used: number | null;
-  kwh_remaining: number | null;
-  in_overage: boolean | null;
-}
-
-/** Snapshot entry per Neuralwatt account - stored in tui-state.json. */
-export interface NeuralwattUsageEntry {
-  provider: 'neuralwatt';
-  /** Display name for this account. */
-  accountName: string;
-  /** ISO timestamp from the API response. */
-  snapshot_at: string;
-  /** Credit balance. */
-  balance: NeuralwattBalance;
-  /** Usage data (lifetime + current month). */
-  usage: NeuralwattUsage;
-  /** Subscription details, null if no active subscription. */
-  subscription: NeuralwattSubscription | null;
-  /** Timestamp when data was fetched. */
-  fetchedAt: number;
-  /** Error message if the fetch failed. */
-  error?: string;
-}
-
-// ── Unified usage entry ──
-
-export type SubscriptionUsageEntry =
-  | OpenCodeGoUsageEntry
-  | NeuralwattUsageEntry;
-
-// ── Detailed usage (OpenCode Go /usage page) ──
-
-/** Detailed usage data from the /usage page. */
-export interface UsageDetail {
-  /** Total number of API calls. */
-  totalCalls: number;
-  /** Total estimated cost in USD. */
-  totalCost: number;
-  /** Per-model breakdown. */
-  perModel: Array<{
-    model: string;
-    calls: number;
-    cost: number;
-  }>;
-}
-
-// ── Config ──
-
-/** Config for the subscription tracking feature. */
-export interface SubscriptionsConfig {
-  /** Minimum interval between auto-refreshes in ms (default: 60000). */
-  refreshIntervalMs: number;
-}
+/**
+ * Type definitions for multi-provider subscription usage tracking.
+ *
+ * Supports OpenCode Go (dashboard scraping) and Neuralwatt (REST API)
+ * as discriminated unions on the `provider` field.
+ */
+
+/** Provider discriminator. */
+export type SubscriptionProvider = 'opencode-go' | 'neuralwatt' | 'codex';
+
+// ── Account definitions (discriminated union) ──
+
+export interface OpenCodeGoAccount {
+  provider: 'opencode-go';
+  name: string;
+  workspaceId: string;
+  authCookie: string;
+  apiKey?: string;
+}
+
+export interface NeuralwattAccount {
+  provider: 'neuralwatt';
+  name: string;
+  apiKey: string;
+}
+
+export interface CodexAccount {
+  provider: 'codex';
+  name: string;
+  accessToken: string;
+  refreshToken?: string;
+}
+
+export type StoredAccount = OpenCodeGoAccount | NeuralwattAccount | CodexAccount;
+
+// ── Usage window (OpenCode Go) ──
+
+/** Per-time-window usage data scraped from the OpenCode Go dashboard. */
+export interface UsageWindow {
+  /** Usage percentage [0..100] */
+  usagePercent: number;
+  /** Seconds until usage resets */
+  resetInSec: number;
+  /** Remaining percentage [0..100] */
+  percentRemaining: number;
+  /** ISO reset timestamp */
+  resetTimeIso: string;
+}
+
+// ── OpenCode Go usage entry ──
+
+/** Snapshot entry per OpenCode Go account - stored in tui-state.json. */
+export interface OpenCodeGoUsageEntry {
+  provider: 'opencode-go';
+  /** Display name for this account (from config). */
+  accountName: string;
+  /** OpenCode Go workspace ID. */
+  workspaceId: string;
+  /** Rolling (~5h) usage window, when present. */
+  rolling?: UsageWindow;
+  /** Weekly usage window, when present. */
+  weekly?: UsageWindow;
+  /** Monthly usage window, when present. */
+  monthly?: UsageWindow;
+  /** Timestamp when data was fetched. */
+  fetchedAt: number;
+  /** Error message if the scrape failed for this account. */
+  error?: string;
+}
+
+// ── Neuralwatt types ──
+
+export interface NeuralwattBalance {
+  credits_remaining_usd: number;
+  total_credits_usd: number;
+  credits_used_usd: number;
+  accounting_method: string;
+}
+
+export interface NeuralwattUsagePeriod {
+  cost_usd: number;
+  requests: number;
+  tokens: number;
+  energy_kwh: number;
+}
+
+export interface NeuralwattUsage {
+  lifetime: NeuralwattUsagePeriod;
+  current_month: NeuralwattUsagePeriod;
+}
+
+export interface NeuralwattSubscription {
+  plan: string;
+  status: 'active' | 'canceling' | 'past_due' | 'paused' | 'trialing';
+  billing_interval: string | null;
+  current_period_start: string | null;
+  current_period_end: string | null;
+  auto_renew: boolean | null;
+  kwh_included: number | null;
+  kwh_used: number | null;
+  kwh_remaining: number | null;
+  in_overage: boolean | null;
+}
+
+/** Snapshot entry per Neuralwatt account - stored in tui-state.json. */
+export interface NeuralwattUsageEntry {
+  provider: 'neuralwatt';
+  /** Display name for this account. */
+  accountName: string;
+  /** ISO timestamp from the API response. */
+  snapshot_at: string;
+  /** Credit balance. */
+  balance: NeuralwattBalance;
+  /** Usage data (lifetime + current month). */
+  usage: NeuralwattUsage;
+  /** Subscription details, null if no active subscription. */
+  subscription: NeuralwattSubscription | null;
+  /** Timestamp when data was fetched. */
+  fetchedAt: number;
+  /** Error message if the fetch failed. */
+  error?: string;
+}
+
+// ── Codex usage entry ──
+
+export interface CodexUsageEntry {
+  provider: 'codex';
+  accountName: string;
+  fetchedAt: number;
+  error?: string;
+  /** 5-hour rolling window (primary_window from API) */
+  primaryWindow: UsageWindow;
+  /** 7-day rolling window (secondary_window from API) */
+  secondaryWindow: UsageWindow;
+  /** Credit balance info */
+  credits: {
+    hasCredits: boolean;
+    unlimited: boolean;
+    balance: number;
+  };
+}
+
+export type SubscriptionUsageEntry =
+  | OpenCodeGoUsageEntry
+  | NeuralwattUsageEntry
+  | CodexUsageEntry;
+
+// ── Detailed usage (OpenCode Go /usage page) ──
+
+/** Detailed usage data from the /usage page. */
+export interface UsageDetail {
+  /** Total number of API calls. */
+  totalCalls: number;
+  /** Total estimated cost in USD. */
+  totalCost: number;
+  /** Per-model breakdown. */
+  perModel: Array<{
+    model: string;
+    calls: number;
+    cost: number;
+  }>;
+}
+
+// ── Config ──
+
+/** Config for the subscription tracking feature. */
+export interface SubscriptionsConfig {
+  /** Minimum interval between auto-refreshes in ms (default: 60000). */
+  refreshIntervalMs: number;
+}

package/src/subscriptions/usage-service.ts

@@ -29,6 +29,7 @@ import {
   setAccountKey,
   updateAccountCookie,
 } from './accounts-store';
+import { scrapeCodexQuota } from './codex-scraper';
 import { scrapeNeuralwattQuota } from './neuralwatt-scraper';
 import { scrapeQuota } from './opencode-go-scraper';
 import type { SubscriptionProvider, SubscriptionUsageEntry } from './types';
@@ -36,12 +37,12 @@ import type { SubscriptionProvider, SubscriptionUsageEntry } from './types';
 const SUBSCRIPTIONS_COMMAND = 'subscriptions';
 const DEFAULT_REFRESH_INTERVAL_MS = 60_000;
 const DEFAULT_PERIODIC_INTERVAL_MS = 600_000; // 10 minutes
-const PROVIDERS: SubscriptionProvider[] = ['opencode-go', 'neuralwatt'];
+const PROVIDERS: SubscriptionProvider[] = ['opencode-go', 'neuralwatt', 'codex'];
 
 function parseProvider(
   raw: string | undefined,
 ): SubscriptionProvider | undefined {
-  if (raw === 'opencode-go' || raw === 'neuralwatt') return raw;
+  if (raw === 'opencode-go' || raw === 'neuralwatt' || raw === 'codex') return raw;
   return undefined;
 }
 
@@ -146,6 +147,35 @@ export class UsageService {
             );
             entry.accountName = account.name;
             return entry as SubscriptionUsageEntry;
+          } else if (account.provider === 'codex') {
+            if (!account.accessToken?.trim()) {
+              return {
+                provider: 'codex',
+                accountName: account.name,
+                fetchedAt: Date.now(),
+                error:
+                  'Missing Codex access token. Re-add with /subscriptions add-codex.',
+                primaryWindow: {
+                  usagePercent: 0,
+                  percentRemaining: 100,
+                  resetInSec: 0,
+                  resetTimeIso: '',
+                },
+                secondaryWindow: {
+                  usagePercent: 0,
+                  percentRemaining: 100,
+                  resetInSec: 0,
+                  resetTimeIso: '',
+                },
+                credits: { hasCredits: false, unlimited: false, balance: 0 },
+              } as SubscriptionUsageEntry;
+            }
+            const entry = await scrapeCodexQuota(
+              account.accessToken,
+              controller.signal,
+            );
+            entry.accountName = account.name;
+            return entry as SubscriptionUsageEntry;
           } else {
             // neuralwatt
             if (!account.apiKey?.trim()) {
@@ -235,10 +265,11 @@ export class UsageService {
       const key = auth[provider]?.key;
       const match =
         typeof key === 'string' && key.length > 0
-          ? accounts.find(
-              (account) =>
-                account.provider === provider && account.apiKey === key,
-            )
+          ? accounts.find((account): boolean => {
+              if (account.provider !== provider) return false;
+              if (account.provider === 'codex') return account.accessToken === key;
+              return account.apiKey === key;
+            })
           : undefined;
       if (match) {
         activeByProvider[provider] = match.name;
@@ -367,6 +398,26 @@ export class UsageService {
         break;
       }
 
+      case 'add-codex': {
+        const [_, name, ...tokenParts] = parts;
+        const accessToken = tokenParts.join(' ');
+        if (!name || !accessToken) {
+          output.parts.push(
+            createInternalAgentTextPart(
+              'Usage: /subscriptions add-codex <name> <access-token>\n' +
+                'Example: /subscriptions add-codex my-codex eyJhbGci...',
+            ),
+          );
+          return;
+        }
+        saveAccount({ provider: 'codex', name, accessToken });
+        this.refresh(true).catch(() => {});
+        output.parts.push(
+          createInternalAgentTextPart(`✅ Added Codex account "${name}".`),
+        );
+        break;
+      }
+
       case 'remove':
       case 'rm': {
         const [_, name] = parts;
@@ -439,7 +490,7 @@ export class UsageService {
         if (accounts.length === 0) {
           output.parts.push(
             createInternalAgentTextPart(
-              'No accounts configured. Use /subscriptions add-opencode-go or /subscriptions add-neuralwatt to add one.',
+              'No accounts configured. Use /subscriptions add-opencode-go, /subscriptions add-neuralwatt, or /subscriptions add-codex to add one.',
             ),
           );
           return;
@@ -449,11 +500,17 @@ export class UsageService {
           const isActive = activeByProvider[acct.provider] === acct.name;
           const star = isActive ? '★ ' : '  ';
           const providerLabel =
-            acct.provider === 'opencode-go' ? 'OpenCode Go' : 'Neuralwatt';
+            acct.provider === 'opencode-go'
+              ? 'OpenCode Go'
+              : acct.provider === 'codex'
+                ? 'Codex'
+                : 'Neuralwatt';
           lines.push(`${star}${acct.name} (${providerLabel})`);
           if (acct.provider === 'opencode-go') {
             lines.push(`    workspace: ${acct.workspaceId}`);
             lines.push(`    cookie: ${maskCookie(acct.authCookie)}`);
+          } else if (acct.provider === 'codex') {
+            lines.push(`    access-token: ${maskCookie(acct.accessToken)}`);
           } else {
             lines.push(`    api-key: ${maskCookie(acct.apiKey)}`);
           }
@@ -473,6 +530,7 @@ export class UsageService {
           '  /subscriptions add-opencode-go <name> <workspace-id> <auth-cookie>',
         );
         lines.push('  /subscriptions add-neuralwatt <name> <api-key>');
+        lines.push('  /subscriptions add-codex <name> <access-token>');
         lines.push('  /subscriptions remove <name>');
         lines.push('  /subscriptions edit <name> <new-auth-cookie>');
         lines.push('  /subscriptions set-key <name> <api-key>');
@@ -520,7 +578,7 @@ export class UsageService {
           output.parts.push(
             createInternalAgentTextPart(
               'Usage: /subscriptions switch <provider> <name>\n' +
-                'Providers: opencode-go, neuralwatt\n' +
+                'Providers: opencode-go, neuralwatt, codex\n' +
                 'Example: /subscriptions switch opencode-go personal',
             ),
           );
@@ -538,13 +596,24 @@ export class UsageService {
           );
           return;
         }
-        if (!account.apiKey) {
-          output.parts.push(
-            createInternalAgentTextPart(
-              `Account "${name}" has no API key set. Use /subscriptions set-key ${name} <api-key> first.`,
-            ),
-          );
-          return;
+        if (account.provider === 'codex') {
+          if (!account.accessToken) {
+            output.parts.push(
+              createInternalAgentTextPart(
+                `Account "${name}" has no access token set. Use /subscriptions add-codex to re-add.`,
+              ),
+            );
+            return;
+          }
+        } else {
+          if (!account.apiKey) {
+            output.parts.push(
+              createInternalAgentTextPart(
+                `Account "${name}" has no API key set. Use /subscriptions set-key ${name} <api-key> first.`,
+              ),
+            );
+            return;
+          }
         }
         const activeByProvider = this.syncActiveAccounts();
         // No-op if already active for this provider
@@ -558,9 +627,13 @@ export class UsageService {
         }
         try {
           // Write the API key to OpenCode auth.json via SDK's auth.set()
+          const key: string =
+            account.provider === 'codex'
+              ? account.accessToken
+              : (account.apiKey ?? '');
           await this.client.auth.set({
             path: { id: account.provider },
-            body: { type: 'api', key: account.apiKey },
+            body: { type: 'api', key },
           });
         } catch {
           output.parts.push(
@@ -605,6 +678,7 @@ export class UsageService {
               'Commands:\n' +
               '  /subscriptions add-opencode-go <name> <workspace-id> <auth-cookie>   Add an OpenCode Go account\n' +
               '  /subscriptions add-neuralwatt <name> <api-key>                        Add a Neuralwatt account\n' +
+              '  /subscriptions add-codex <name> <access-token>                        Add a Codex account\n' +
               '  /subscriptions remove <name>                                          Remove an account\n' +
               '  /subscriptions edit <name> <new-auth-cookie>                         Update auth cookie (OpenCode Go)\n' +
               '  /subscriptions set-key <name> <api-key>                               Set API key for switching\n' +
@@ -634,7 +708,7 @@ export class UsageService {
         SUBSCRIPTIONS_COMMAND
       ] = {
         template:
-          'Manage subscription accounts (add-opencode-go, add-neuralwatt, remove, list, edit, set-key, switch, refresh)',
+          'Manage subscription accounts (add-opencode-go, add-neuralwatt, add-codex, remove, list, edit, set-key, switch, refresh)',
         description:
           'Add, remove, list, edit, set-key, switch, or refresh subscription accounts for usage tracking in the sidebar',
       };

package/src/tui-state.ts

@@ -616,7 +616,7 @@ function parseSnapshot(value: string): TuiSnapshot | null {
       Record<SubscriptionProvider, string>
     > = {};
     if (parsed.activeSubscriptionByProvider) {
-      for (const provider of ['opencode-go', 'neuralwatt'] as const) {
+      for (const provider of ['opencode-go', 'neuralwatt', 'codex'] as const) {
         const name = parsed.activeSubscriptionByProvider[provider];
         if (typeof name === 'string' && name.length > 0) {
           activeSubscriptionByProvider[provider] = name;