@kaitranntt/ccs 8.6.1 → 8.7.0-dev.1

package/dist/web-server/usage/native-quota-collector.d.ts

@@ -14,18 +14,38 @@
  *   - circuit breaker stops calling after repeated 429s for a cooldown
  *   - serve-stale-on-failure; only omit a row when there is genuinely no data
  *
- * Claude path: reads native credentials + polls api.anthropic.com/api/oauth/usage.
+ * Claude path: reads per-profile .credentials.json (file-only, NO keychain)
+ * and polls api.anthropic.com/api/oauth/usage. If the file is absent the
+ * profile is emitted as a parked row (paused:true) — never a keychain call.
+ *
  * Codex path: PRIMARY = live network (chatgpt.com/backend-api/wham/usage, via
  * fetchCodexQuota), FALLBACK = local session logs (getCodexLocalQuota), mirroring
  * the same safety pattern as the Claude path.
+ *
+ * Multi-profile: each Claude or Codex profile gets its own ProviderState so a
+ * 429 on one profile never trips the breaker of another. The active/default
+ * profile for each surface is live-polled (paused:false); all other profiles are
+ * cache-only (paused:true, force=false hardcoded) so the 2.5s /summary deadline
+ * is maintained — at most 2 live upstream calls per /summary regardless of
+ * profile count.
+ *
+ * NO macOS Keychain access anywhere in this module. The old global-default
+ * Claude reader (readClaudeCredentials) is kept for back-compat but is no longer
+ * used by the multi-profile path.
  */
 import { type ClaudeNativeCredentials } from './claude-native-credentials';
 import { type CodexLocalQuota } from './codex-local-quota-collector';
 import type { ClaudeQuotaResult, CodexQuotaResult } from '../../cliproxy/quota/quota-types';
 import type { BarSummaryRow } from '../routes/bar-routes';
 export interface NativeQuotaDeps {
-    /** Read the native Claude Code credentials. */
+    /** Read the native Claude Code credentials (global default path). */
     readCredentials?: () => ClaudeNativeCredentials | null;
+    /**
+     * Read credentials for a specific Claude profile (file-only, no keychain).
+     * Injected so tests never touch real fs or Keychain.
+     * profile: the profile name (e.g. "work"); returns null when absent/unparseable.
+     */
+    readClaudeCredentialsForProfile?: (profile: string) => ClaudeNativeCredentials | null;
     /** Fetch Claude quota with a directly-supplied native token. */
     fetchClaudeQuota?: (accessToken: string, accountId?: string) => Promise<ClaudeQuotaResult>;
     /**
@@ -40,6 +60,23 @@ export interface NativeQuotaDeps {
     fetchCodexNetworkQuota?: (accountId: string) => Promise<CodexQuotaResult>;
     /** Read Codex quota from local session logs (zero network, fallback). */
     getCodexQuota?: () => Promise<CodexLocalQuota | null>;
+    /**
+     * Read the native Codex auth for a profile (file-only, no keychain).
+     * DEFAULT_PROFILE ('default') reads ~/.codex/auth.json; other names read codex-instances/<name>/auth.json.
+     * Returns null when absent/unparseable.
+     */
+    readCodexNativeAuth?: (profile: string) => {
+        accessToken: string;
+        accountId: string;
+    } | null;
+    /** Enumerate Claude profile names. Injected so tests never touch real fs. */
+    listClaudeProfiles?: () => string[];
+    /** Enumerate Codex profile names (including DEFAULT_PROFILE for bare ~/.codex). */
+    listCodexProfiles?: () => string[];
+    /** Resolve the default Claude profile name. */
+    defaultClaudeProfile?: () => string | null;
+    /** Resolve the default Codex profile name. */
+    defaultCodexProfile?: () => string | null;
     /** Clock seam for deterministic backoff/TTL/breaker tests. */
     now?: () => number;
     /** Sleep seam (no real delay in tests). */
@@ -48,14 +85,19 @@ export interface NativeQuotaDeps {
 /** Reset all module state. Tests call this to avoid cross-test pollution. */
 export declare function resetNativeQuotaState(): void;
 /**
- * Build the native subscription rows (Claude Code + Codex) for /summary.
+ * Build the native subscription rows for /summary.
+ *
+ * When profile-enumeration deps are injected (listClaudeProfiles / listCodexProfiles
+ * etc.), all profiles are enumerated and the active/default profile is live-polled
+ * while non-default profiles are cache-only (parked). This keeps the 2.5s deadline:
+ * at most 2 live upstream calls per /summary regardless of profile count.
  *
- * Each path is independently try/caught so one failing source never blocks the
- * other or the response. Returns only rows that represent real data.
+ * When no enumeration deps are injected (legacy mode / old tests that stub only
+ * readCredentials + getDefaultCodexAccountId), the old single-profile collectors
+ * are used for backward compatibility.
  *
- * `opts.force` bypasses the TTL short-circuit on both paths so a debounce-
- * passing refresh re-pulls native rows live. The circuit breaker is always
- * respected regardless of force (account protection).
+ * `opts.force` bypasses the TTL short-circuit on the ACTIVE profile. The circuit
+ * breaker is always respected regardless of force (account protection).
  */
 export declare function getNativeAccountRows(deps?: NativeQuotaDeps, opts?: {
     force?: boolean;

package/dist/web-server/usage/native-quota-collector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"native-quota-collector.d.ts","sourceRoot":"","sources":["../../../src/web-server/usage/native-quota-collector.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,EAKL,KAAK,uBAAuB,EAC7B,MAAM,6BAA6B,CAAC;AAIrC,OAAO,EAAsB,KAAK,eAAe,EAAE,MAAM,+BAA+B,CAAC;AACzF,OAAO,KAAK,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAC5F,OAAO,KAAK,EAAE,aAAa,EAAqB,MAAM,sBAAsB,CAAC;AAgC7E,MAAM,WAAW,eAAe;IAC9B,+CAA+C;IAC/C,eAAe,CAAC,EAAE,MAAM,uBAAuB,GAAG,IAAI,CAAC;IACvD,gEAAgE;IAChE,gBAAgB,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAC3F;;;OAGG;IACH,wBAAwB,CAAC,EAAE,MAAM,MAAM,GAAG,IAAI,CAAC;IAC/C;;;OAGG;IACH,sBAAsB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC1E,yEAAyE;IACzE,aAAa,CAAC,EAAE,MAAM,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC;IACtD,8DAA8D;IAC9D,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,2CAA2C;IAC3C,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACvC;AAsCD,6EAA6E;AAC7E,wBAAgB,qBAAqB,IAAI,IAAI,CAG5C;AA0gBD;;;;;;;;;GASG;AACH,wBAAsB,oBAAoB,CACxC,IAAI,GAAE,eAAoB,EAC1B,IAAI,CAAC,EAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,GACzB,OAAO,CAAC,aAAa,EAAE,CAAC,CAW1B;AAED;;;;;;;GAOG;AACH,wBAAgB,0BAA0B,IAAI,aAAa,EAAE,CAK5D"}
+{"version":3,"file":"native-quota-collector.d.ts","sourceRoot":"","sources":["../../../src/web-server/usage/native-quota-collector.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AAEH,OAAO,EAKL,KAAK,uBAAuB,EAC7B,MAAM,6BAA6B,CAAC;AAIrC,OAAO,EAAsB,KAAK,eAAe,EAAE,MAAM,+BAA+B,CAAC;AACzF,OAAO,KAAK,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAC5F,OAAO,KAAK,EAAE,aAAa,EAAqB,MAAM,sBAAsB,CAAC;AA4D7E,MAAM,WAAW,eAAe;IAC9B,qEAAqE;IACrE,eAAe,CAAC,EAAE,MAAM,uBAAuB,GAAG,IAAI,CAAC;IACvD;;;;OAIG;IACH,+BAA+B,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,uBAAuB,GAAG,IAAI,CAAC;IACtF,gEAAgE;IAChE,gBAAgB,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAC3F;;;OAGG;IACH,wBAAwB,CAAC,EAAE,MAAM,MAAM,GAAG,IAAI,CAAC;IAC/C;;;OAGG;IACH,sBAAsB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC1E,yEAAyE;IACzE,aAAa,CAAC,EAAE,MAAM,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC;IACtD;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAC7F,6EAA6E;IAC7E,kBAAkB,CAAC,EAAE,MAAM,MAAM,EAAE,CAAC;IACpC,mFAAmF;IACnF,iBAAiB,CAAC,EAAE,MAAM,MAAM,EAAE,CAAC;IACnC,+CAA+C;IAC/C,oBAAoB,CAAC,EAAE,MAAM,MAAM,GAAG,IAAI,CAAC;IAC3C,8CAA8C;IAC9C,mBAAmB,CAAC,EAAE,MAAM,MAAM,GAAG,IAAI,CAAC;IAC1C,8DAA8D;IAC9D,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,2CAA2C;IAC3C,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACvC;AAgDD,6EAA6E;AAC7E,wBAAgB,qBAAqB,IAAI,IAAI,CAG5C;AAouCD;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,oBAAoB,CACxC,IAAI,GAAE,eAAoB,EAC1B,IAAI,CAAC,EAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,GACzB,OAAO,CAAC,aAAa,EAAE,CAAC,CAmC1B;AA2ED;;;;;;;GAOG;AACH,wBAAgB,0BAA0B,IAAI,aAAa,EAAE,CAS5D"}