codex-multi-auth 2.16.0 → 2.17.2

package/dist/lib/quota-cache.js

@@ -1,9 +1,10 @@
-import { existsSync, promises as fs } from "node:fs";
+import { promises as fs } from "node:fs";
 import { basename, join } from "node:path";
 import { withRetry } from "./fs-retry.js";
 import { logWarn } from "./logger.js";
 import { getCodexMultiAuthDir } from "./runtime-paths.js";
 import { tempPathFor } from "./temp-path.js";
+import { withFileTransactionLock } from "./storage/file-lock.js";
 import { isRecord } from "./utils.js";
 const QUOTA_CACHE_PATH = join(getCodexMultiAuthDir(), "quota-cache.json");
 const QUOTA_CACHE_LABEL = basename(QUOTA_CACHE_PATH);
@@ -127,29 +128,57 @@ export function getQuotaCachePath() {
  *          will be empty if the on-disk file is absent, malformed, or could not be read.
  */
 export async function loadQuotaCache() {
-    if (!existsSync(QUOTA_CACHE_PATH)) {
-        return { byAccountId: {}, byEmail: {} };
-    }
     try {
-        const content = await readCacheFileWithRetry(QUOTA_CACHE_PATH);
-        const parsed = JSON.parse(content);
-        if (!isRecord(parsed)) {
-            return { byAccountId: {}, byEmail: {} };
-        }
-        if (parsed.version !== 1) {
-            logWarn(`Quota cache rejected due to version mismatch: ${String(parsed.version)}`);
-            return { byAccountId: {}, byEmail: {} };
-        }
-        return {
-            byAccountId: normalizeEntryMap(parsed.byAccountId),
-            byEmail: normalizeEntryMap(parsed.byEmail),
-        };
+        return await readQuotaCache();
     }
     catch (error) {
         logWarn(`Failed to load quota cache from ${QUOTA_CACHE_LABEL}: ${error instanceof Error ? error.message : String(error)}`);
         return { byAccountId: {}, byEmail: {} };
     }
 }
+/** Only a missing file is empty for writers; read failures must never erase concurrent data. */
+async function readQuotaCache() {
+    let content;
+    try {
+        content = await readCacheFileWithRetry(QUOTA_CACHE_PATH);
+    }
+    catch (error) {
+        if (error.code === "ENOENT")
+            return { byAccountId: {}, byEmail: {} };
+        throw error;
+    }
+    const parsed = JSON.parse(content);
+    if (!isRecord(parsed) || parsed.version !== 1) {
+        throw Error("Quota cache rejected due to version mismatch or invalid payload");
+    }
+    return {
+        byAccountId: normalizeEntryMap(parsed.byAccountId),
+        byEmail: normalizeEntryMap(parsed.byEmail),
+        ...(parsed.byWorkspace ? { byWorkspace: normalizeEntryMap(parsed.byWorkspace) } : {}),
+    };
+}
+/** Reapply this run's changed entries, preserving unrelated or newer concurrent observations. */
+function mergeQuotaChanges(current, proposed, baseline) {
+    const same = (a, b) => JSON.stringify(a) === JSON.stringify(b);
+    for (const namespace of ["byAccountId", "byEmail", "byWorkspace"]) {
+        const before = baseline[namespace] ?? {}, next = proposed[namespace] ?? {};
+        for (const key of new Set([...Object.keys(before), ...Object.keys(next)])) {
+            if (same(before[key], next[key]))
+                continue;
+            const latest = current[namespace]?.[key], update = next[key];
+            if (update) {
+                if (!latest || update.updatedAt >= latest.updatedAt) {
+                    current[namespace] ??= {};
+                    current[namespace][key] = update;
+                }
+            }
+            else if (same(latest, before[key])) {
+                delete current[namespace]?.[key];
+            }
+        }
+    }
+    return current;
+}
 /**
  * Persist the quota cache to the on-disk JSON file used by the multi-auth runtime.
  *
@@ -157,8 +186,9 @@ export async function loadQuotaCache() {
  * quota cache path. Failures are logged and do not throw, so callers should handle
  * eventual consistency or retry as needed.
  *
- * Concurrency: concurrent writers may race and overwrite each other; callers should
- * serialize writes if strong consistency is required.
+ * Concurrency: reload, apply changes since `baseline`, and atomically write under
+ * a cross-process lock. Pass the pre-edit snapshot for read–modify–write callers.
+ * Without a baseline, supplied entries are upserts; omitted entries are retained.
  *
  * Filesystem notes: Windows path length, permissions, or antivirus locks may cause
  * write failures; such errors are logged rather than thrown.
@@ -168,54 +198,56 @@ export async function loadQuotaCache() {
  *
  * @param data - The quota cache data (byAccountId and byEmail maps) to persist; callers
  *               should pass normalized QuotaCacheData.
+ * @param baseline - The unmodified pre-edit snapshot; only changes since it are applied.
  */
-export async function saveQuotaCache(data) {
-    const payload = {
-        version: 1,
-        byAccountId: data.byAccountId,
-        byEmail: data.byEmail,
-    };
+export async function saveQuotaCache(data, baseline = { byAccountId: {}, byEmail: {} }) {
+    // Snapshot at invocation, not after waiting behind other writers.
+    const proposed = structuredClone(data), before = structuredClone(baseline);
     const writeTask = async () => {
         try {
-            const cacheDir = getCodexMultiAuthDir();
-            // The quota cache lives alongside other at-rest secrets, so keep the
-            // directory owner-only on POSIX (mode is a no-op on win32 / ACL-based).
-            await fs.mkdir(cacheDir, { recursive: true, mode: 0o700 });
-            // mkdir's mode only applies to a freshly-created dir; an upgrade with a
-            // pre-existing multi-auth dir keeps its old (possibly world-listable)
-            // perms, so re-assert 0o700 on POSIX. Best-effort: a chmod failure must
-            // not break the cache write (the 0o600 file below still protects data).
-            if (process.platform !== "win32") {
-                try {
-                    await fs.chmod(cacheDir, 0o700);
-                }
-                catch {
-                    // Best-effort hardening only.
-                }
-            }
-            const tempPath = tempPathFor(QUOTA_CACHE_PATH);
-            await fs.writeFile(tempPath, `${JSON.stringify(payload, null, 2)}\n`, {
-                encoding: "utf8",
-                mode: 0o600,
-            });
-            let renamed = false;
-            try {
-                await withRetry(() => fs.rename(tempPath, QUOTA_CACHE_PATH), {
-                    maxAttempts: 5,
-                    backoffMs: (attempt) => 10 * 2 ** (attempt - 1),
-                });
-                renamed = true;
-            }
-            finally {
-                if (!renamed) {
+            await withFileTransactionLock(QUOTA_CACHE_PATH, async () => {
+                const merged = mergeQuotaChanges(await readQuotaCache(), proposed, before);
+                const payload = { version: 1, ...merged };
+                const cacheDir = getCodexMultiAuthDir();
+                // The quota cache lives alongside other at-rest secrets, so keep the
+                // directory owner-only on POSIX (mode is a no-op on win32 / ACL-based).
+                await fs.mkdir(cacheDir, { recursive: true, mode: 0o700 });
+                // mkdir's mode only applies to a freshly-created dir; an upgrade with a
+                // pre-existing multi-auth dir keeps its old (possibly world-listable)
+                // perms, so re-assert 0o700 on POSIX. Best-effort: a chmod failure must
+                // not break the cache write (the 0o600 file below still protects data).
+                if (process.platform !== "win32") {
                     try {
-                        await fs.unlink(tempPath);
+                        await fs.chmod(cacheDir, 0o700);
                     }
                     catch {
-                        // Best effort temp cleanup.
+                        // Best-effort hardening only.
                     }
                 }
-            }
+                const tempPath = tempPathFor(QUOTA_CACHE_PATH);
+                await fs.writeFile(tempPath, `${JSON.stringify(payload, null, 2)}\n`, {
+                    encoding: "utf8",
+                    mode: 0o600,
+                });
+                let renamed = false;
+                try {
+                    await withRetry(() => fs.rename(tempPath, QUOTA_CACHE_PATH), {
+                        maxAttempts: 5,
+                        backoffMs: (attempt) => 10 * 2 ** (attempt - 1),
+                    });
+                    renamed = true;
+                }
+                finally {
+                    if (!renamed) {
+                        try {
+                            await fs.unlink(tempPath);
+                        }
+                        catch {
+                            // Best effort temp cleanup.
+                        }
+                    }
+                }
+            });
         }
         catch (error) {
             logWarn(`Failed to save quota cache to ${QUOTA_CACHE_LABEL}: ${error instanceof Error ? error.message : String(error)}`);

package/dist/lib/quota-probe.d.ts

@@ -1,3 +1,4 @@
+import { FirstUseProbeError } from "./runtime/subscription-first-use.js";
 /**
  * Human-readable note shown when a live probe fails solely because the account
  * lacks Codex entitlement (see {@link CodexUnavailableError}). Centralized so
@@ -25,6 +26,8 @@ export interface CodexQuotaWindow {
     resetAtMs?: number;
 }
 export interface CodexQuotaSnapshot {
+    primingCompleted?: boolean;
+    primingFailure?: FirstUseProbeError["reason"];
     status: number;
     planType?: string;
     activeLimit?: number;
@@ -57,6 +60,8 @@ export declare function formatQuotaResetAt(resetAtMs: number | undefined, nowMs?
  */
 export declare function formatQuotaSnapshotLine(snapshot: CodexQuotaSnapshot): string;
 export interface ProbeCodexQuotaOptions {
+    signal?: AbortSignal;
+    primeUnusedSubscription?: boolean;
     accountId: string;
     accessToken: string;
     model?: string;

package/dist/lib/quota-probe.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"quota-probe.d.ts","sourceRoot":"","sources":["../../lib/quota-probe.ts"],"names":[],"mappings":"AAYA;;;;;GAKG;AACH,eAAO,MAAM,4BAA4B,yCAAyC,CAAC;AAEnF;;;;;;;;;;;;GAYG;AACH,wBAAgB,yBAAyB,CACxC,KAAK,EAAE,OAAO,EACd,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,GACrC,MAAM,CAMR;AAED,MAAM,WAAW,gBAAgB;IAChC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,kBAAkB;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,gBAAgB,CAAC;IAC1B,SAAS,EAAE,gBAAgB,CAAC;IAC5B,KAAK,EAAE,MAAM,CAAC;CACd;AA0MD;;;;;;;;;;;GAWG;AACH,wBAAgB,kBAAkB,CACjC,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,KAAK,SAAa,GAChB,MAAM,GAAG,SAAS,CAqBpB;AAwBD;;;;;;;;;GASG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,MAAM,CAa5E;AAED,MAAM,WAAW,sBAAsB;IACtC,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,cAAc,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACnC,SAAS,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,uBAAuB,CAC5C,OAAO,EAAE,sBAAsB,GAC7B,OAAO,CAAC,kBAAkB,CAAC,CA4G7B"}
+{"version":3,"file":"quota-probe.d.ts","sourceRoot":"","sources":["../../lib/quota-probe.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,kBAAkB,EAAyD,MAAM,qCAAqC,CAAC;AAEhI;;;;;GAKG;AACH,eAAO,MAAM,4BAA4B,yCAAyC,CAAC;AAEnF;;;;;;;;;;;;GAYG;AACH,wBAAgB,yBAAyB,CACxC,KAAK,EAAE,OAAO,EACd,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,GACrC,MAAM,CAMR;AAED,MAAM,WAAW,gBAAgB;IAChC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,kBAAkB;IAClC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,cAAc,CAAC,EAAE,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IAC9C,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,gBAAgB,CAAC;IAC1B,SAAS,EAAE,gBAAgB,CAAC;IAC5B,KAAK,EAAE,MAAM,CAAC;CACd;AAiND;;;;;;;;;;;GAWG;AACH,wBAAgB,kBAAkB,CACjC,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,KAAK,SAAa,GAChB,MAAM,GAAG,SAAS,CAqBpB;AAwBD;;;;;;;;;GASG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,MAAM,CAa5E;AAED,MAAM,WAAW,sBAAsB;IACtC,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,cAAc,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACnC,SAAS,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,uBAAuB,CAC5C,OAAO,EAAE,sBAAsB,GAC7B,OAAO,CAAC,kBAAkB,CAAC,CA0H7B"}

package/dist/lib/quota-probe.js

@@ -1,10 +1,11 @@
-import { CODEX_BASE_URL } from "./constants.js";
+import { CODEX_BASE_URL, MAX_RATE_LIMIT_DELAY_MS } from "./constants.js";
 import { createCodexHeaders, getUnsupportedCodexModelInfo } from "./request/fetch-helpers.js";
 import { QUOTA_PROBE_MODEL_CHAIN, resolveProbeReasoningEffort, } from "./request/helpers/model-map.js";
 import { CodexUnavailableError, isCodexUnavailableError } from "./errors.js";
 import { getCodexInstructions } from "./prompts/codex.js";
 import { mutateRuntimeObservabilitySnapshot } from "./runtime/runtime-observability.js";
 import { isRecord } from "./utils.js";
+import { FirstUseProbeError, finishSubscriptionFirstUse, needsSubscriptionFirstUse } from "./runtime/subscription-first-use.js";
 /**
  * Human-readable note shown when a live probe fails solely because the account
  * lacks Codex entitlement (see {@link CodexUnavailableError}). Centralized so
@@ -79,6 +80,12 @@ function parseFiniteIntHeader(headers, name) {
  * Security: does not emit or persist header values; callers must redact any sensitive tokens before storing or logging headers.
  */
 function parseResetAtMs(headers, prefix) {
+    const raw = parseUnboundedResetAtMs(headers, prefix);
+    // A bogus header (finite, but overflowing once scaled to ms) must not read as
+    // a window that never resets.
+    return raw === undefined || Number.isNaN(raw) ? undefined : Math.min(raw, Date.now() + MAX_RATE_LIMIT_DELAY_MS);
+}
+function parseUnboundedResetAtMs(headers, prefix) {
     const resetAfterSeconds = parseFiniteIntHeader(headers, `${prefix}-reset-after-seconds`);
     if (typeof resetAfterSeconds === "number" && resetAfterSeconds > 0) {
         return Date.now() + resetAfterSeconds * 1000;
@@ -324,9 +331,11 @@ export async function fetchCodexQuotaSnapshot(options) {
     let sawUnsupportedModel = false;
     let sawOtherFailure = false;
     for (const model of models) {
+        options.signal?.throwIfAborted();
         attemptedAnyModel = true;
         try {
             const instructions = await getCodexInstructions(model);
+            options.signal?.throwIfAborted();
             const probeBody = {
                 model,
                 stream: true,
@@ -362,7 +371,7 @@ export async function fetchCodexQuotaSnapshot(options) {
                     method: "POST",
                     headers,
                     body: JSON.stringify(probeBody),
-                    signal: controller.signal,
+                    signal: options.signal ? AbortSignal.any([controller.signal, options.signal]) : controller.signal,
                 });
             }
             finally {
@@ -370,6 +379,18 @@ export async function fetchCodexQuotaSnapshot(options) {
             }
             const snapshotBase = parseQuotaSnapshotBase(response.headers, response.status);
             if (snapshotBase) {
+                if (options.primeUnusedSubscription && needsSubscriptionFirstUse(snapshotBase, Date.now())) {
+                    try {
+                        await finishSubscriptionFirstUse(response, timeoutMs);
+                        return { ...snapshotBase, model, primingCompleted: true };
+                    }
+                    catch (error) {
+                        // Keep valid quota data without retrying an accepted inference.
+                        if (error instanceof FirstUseProbeError)
+                            return { ...snapshotBase, model, primingFailure: error.reason };
+                        throw error;
+                    }
+                }
                 try {
                     await response.body?.cancel();
                 }
@@ -406,6 +427,9 @@ export async function fetchCodexQuotaSnapshot(options) {
             lastError = new Error("Codex response did not include quota headers");
         }
         catch (error) {
+            options.signal?.throwIfAborted();
+            if (error instanceof FirstUseProbeError)
+                throw error;
             sawOtherFailure = true;
             lastError = error instanceof Error ? error : new Error(String(error));
         }

package/dist/lib/quota-readiness.d.ts

@@ -1,6 +1,6 @@
 import type { QuotaCacheData, QuotaCacheEntry } from "./quota-cache.js";
 import type { AccountMetadataV3 } from "./storage.js";
-export type QuotaCacheAccountRef = Pick<AccountMetadataV3, "accountId" | "email">;
+export type QuotaCacheAccountRef = Pick<AccountMetadataV3, "accountId" | "email" | "recordId" | "workspaces" | "currentWorkspaceIndex"> & Partial<Pick<AccountMetadataV3, "refreshToken" | "addedAt">>;
 export declare function normalizeQuotaAccountId(value: string | undefined): string | null;
 export declare function normalizeQuotaEmail(value: string | undefined): string | null;
 export declare function hasUniqueQuotaAccountId(accounts: readonly QuotaCacheAccountRef[], account: QuotaCacheAccountRef): boolean;
@@ -15,5 +15,10 @@ export declare function quotaUsedPercentIsExhausted(usedPercent: number | undefi
 export declare function isQuotaCacheEntryExhausted(entry: Pick<QuotaCacheEntry, "primary" | "secondary"> & {
     updatedAt?: number;
 } | null | undefined, now?: number): boolean;
-export declare function findQuotaCacheEntryForAccount(cache: QuotaCacheData | null | undefined, account: QuotaCacheAccountRef, accounts: readonly QuotaCacheAccountRef[], emailFallbackState?: ReadonlyMap<string, QuotaEmailFallbackState>): QuotaCacheEntry | null;
+/** Cache identity includes the credential record, so shared organization IDs cannot collide. */
+export declare function quotaWorkspaceKey(account: QuotaCacheAccountRef, workspaceId: string): string | undefined;
+/** Display the selected workspace; callers routing another scope must pass that exact workspace. */
+export declare function quotaWorkspaceId(account: QuotaCacheAccountRef): string | undefined;
+/** Read exact-workspace quota, using legacy binding entries only for that binding. */
+export declare function findQuotaCacheEntryForAccount(cache: QuotaCacheData | null | undefined, account: QuotaCacheAccountRef, accounts: readonly QuotaCacheAccountRef[], emailFallbackState?: ReadonlyMap<string, QuotaEmailFallbackState>, workspaceId?: string | undefined): QuotaCacheEntry | null;
 //# sourceMappingURL=quota-readiness.d.ts.map

package/dist/lib/quota-readiness.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"quota-readiness.d.ts","sourceRoot":"","sources":["../../lib/quota-readiness.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAoB,MAAM,kBAAkB,CAAC;AAC1F,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEtD,MAAM,MAAM,oBAAoB,GAAG,IAAI,CAAC,iBAAiB,EAAE,WAAW,GAAG,OAAO,CAAC,CAAC;AAIlF,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAGhF;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAG5E;AAED,wBAAgB,uBAAuB,CACtC,QAAQ,EAAE,SAAS,oBAAoB,EAAE,EACzC,OAAO,EAAE,oBAAoB,GAC3B,OAAO,CAQT;AAED,MAAM,MAAM,uBAAuB,GAAG;IACrC,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAChC,CAAC;AAEF,wBAAgB,4BAA4B,CAC3C,QAAQ,EAAE,SAAS,oBAAoB,EAAE,GACvC,WAAW,CAAC,MAAM,EAAE,uBAAuB,CAAC,CAiB9C;AAED,wBAAgB,yBAAyB,CACxC,kBAAkB,EAAE,WAAW,CAAC,MAAM,EAAE,uBAAuB,CAAC,EAChE,OAAO,EAAE,oBAAoB,GAC3B,OAAO,CAMT;AAED,wBAAgB,wBAAwB,CACvC,WAAW,EAAE,MAAM,GAAG,SAAS,GAC7B,MAAM,GAAG,SAAS,CAKpB;AAQD,wBAAgB,2BAA2B,CAC1C,WAAW,EAAE,MAAM,GAAG,SAAS,GAC7B,OAAO,CAMT;AA2BD,wBAAgB,0BAA0B,CACzC,KAAK,EAAE,IAAI,CAAC,eAAe,EAAE,SAAS,GAAG,WAAW,CAAC,GAAG;IAAE,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,GAAG,SAAS,EACjG,GAAG,SAAa,GACd,OAAO,CAQT;AAED,wBAAgB,6BAA6B,CAC5C,KAAK,EAAE,cAAc,GAAG,IAAI,GAAG,SAAS,EACxC,OAAO,EAAE,oBAAoB,EAC7B,QAAQ,EAAE,SAAS,oBAAoB,EAAE,EACzC,kBAAkB,+CAAyC,GACzD,eAAe,GAAG,IAAI,CAWxB"}
+{"version":3,"file":"quota-readiness.d.ts","sourceRoot":"","sources":["../../lib/quota-readiness.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAoB,MAAM,kBAAkB,CAAC;AAC1F,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEtD,MAAM,MAAM,oBAAoB,GAAG,IAAI,CAAC,iBAAiB,EAAE,WAAW,GAAG,OAAO,GAAG,UAAU,GAAG,YAAY,GAAG,uBAAuB,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,iBAAiB,EAAE,cAAc,GAAG,SAAS,CAAC,CAAC,CAAC;AAIvM,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAGhF;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAG5E;AAED,wBAAgB,uBAAuB,CACtC,QAAQ,EAAE,SAAS,oBAAoB,EAAE,EACzC,OAAO,EAAE,oBAAoB,GAC3B,OAAO,CAQT;AAED,MAAM,MAAM,uBAAuB,GAAG;IACrC,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAChC,CAAC;AAEF,wBAAgB,4BAA4B,CAC3C,QAAQ,EAAE,SAAS,oBAAoB,EAAE,GACvC,WAAW,CAAC,MAAM,EAAE,uBAAuB,CAAC,CAiB9C;AAED,wBAAgB,yBAAyB,CACxC,kBAAkB,EAAE,WAAW,CAAC,MAAM,EAAE,uBAAuB,CAAC,EAChE,OAAO,EAAE,oBAAoB,GAC3B,OAAO,CAMT;AAED,wBAAgB,wBAAwB,CACvC,WAAW,EAAE,MAAM,GAAG,SAAS,GAC7B,MAAM,GAAG,SAAS,CAKpB;AAQD,wBAAgB,2BAA2B,CAC1C,WAAW,EAAE,MAAM,GAAG,SAAS,GAC7B,OAAO,CAMT;AA2BD,wBAAgB,0BAA0B,CACzC,KAAK,EAAE,IAAI,CAAC,eAAe,EAAE,SAAS,GAAG,WAAW,CAAC,GAAG;IAAE,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,GAAG,SAAS,EACjG,GAAG,SAAa,GACd,OAAO,CAQT;AAED,gGAAgG;AAChG,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,oBAAoB,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAIxG;AAED,oGAAoG;AACpG,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,oBAAoB,GAAG,MAAM,GAAG,SAAS,CAIlF;AAED,sFAAsF;AACtF,wBAAgB,6BAA6B,CAC5C,KAAK,EAAE,cAAc,GAAG,IAAI,GAAG,SAAS,EACxC,OAAO,EAAE,oBAAoB,EAC7B,QAAQ,EAAE,SAAS,oBAAoB,EAAE,EACzC,kBAAkB,+CAAyC,EAC3D,WAAW,qBAA4B,GACrC,eAAe,GAAG,IAAI,CAgBxB"}

package/dist/lib/quota-readiness.js

@@ -1,3 +1,5 @@
+import { createHash } from "node:crypto";
+import { resolveAccountRecordId } from "./storage/record-identity.js";
 export function normalizeQuotaAccountId(value) {
     const trimmed = value?.trim();
     return trimmed && trimmed.length > 0 ? trimmed : null;
@@ -89,16 +91,35 @@ export function isQuotaCacheEntryExhausted(entry, now = Date.now()) {
     return (quotaWindowIsExhausted(entry?.primary, now, updatedAt) ||
         quotaWindowIsExhausted(entry?.secondary, now, updatedAt));
 }
-export function findQuotaCacheEntryForAccount(cache, account, accounts, emailFallbackState = buildQuotaEmailFallbackState(accounts)) {
+/** Cache identity includes the credential record, so shared organization IDs cannot collide. */
+export function quotaWorkspaceKey(account, workspaceId) {
+    const recordId = account.recordId?.trim() || (account.refreshToken !== undefined && account.addedAt !== undefined
+        ? resolveAccountRecordId({ ...account, refreshToken: account.refreshToken, addedAt: account.addedAt }) : undefined);
+    return recordId ? createHash("sha256").update(JSON.stringify(["oauth", recordId, workspaceId.trim()])).digest("hex") : undefined;
+}
+/** Display the selected workspace; callers routing another scope must pass that exact workspace. */
+export function quotaWorkspaceId(account) {
+    return account.workspaces?.length
+        ? account.workspaces[account.currentWorkspaceIndex ?? 0]?.id.trim()
+        : account.accountId?.trim();
+}
+/** Read exact-workspace quota, using legacy binding entries only for that binding. */
+export function findQuotaCacheEntryForAccount(cache, account, accounts, emailFallbackState = buildQuotaEmailFallbackState(accounts), workspaceId = quotaWorkspaceId(account)) {
     if (!cache)
         return null;
+    const key = workspaceId && quotaWorkspaceKey(account, workspaceId);
+    const scoped = key ? cache.byWorkspace?.[key] : undefined;
+    // Legacy entries describe only the stored binding, never a sibling workspace.
+    if (normalizeQuotaAccountId(workspaceId) !== normalizeQuotaAccountId(account.accountId))
+        return scoped ?? null;
     const accountId = normalizeQuotaAccountId(account.accountId);
+    const newer = (legacy) => scoped && (!legacy || scoped.updatedAt >= legacy.updatedAt) ? scoped : legacy ?? null;
     if (accountId && hasUniqueQuotaAccountId(accounts, account) && cache.byAccountId[accountId]) {
-        return cache.byAccountId[accountId] ?? null;
+        return newer(cache.byAccountId[accountId]);
     }
     const email = normalizeQuotaEmail(account.email);
     if (email && hasSafeQuotaEmailFallback(emailFallbackState, account) && cache.byEmail[email]) {
-        return cache.byEmail[email] ?? null;
+        return newer(cache.byEmail[email]);
     }
-    return null;
+    return scoped ?? null;
 }

package/dist/lib/request/client-cancellation.d.ts

@@ -0,0 +1,5 @@
+/** Internal transport marker: upstream timeouts may also use AbortError. */
+export declare class ClientCancellationError extends Error {
+    constructor();
+}
+//# sourceMappingURL=client-cancellation.d.ts.map

package/dist/lib/request/client-cancellation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"client-cancellation.d.ts","sourceRoot":"","sources":["../../../lib/request/client-cancellation.ts"],"names":[],"mappings":"AAAA,4EAA4E;AAC5E,qBAAa,uBAAwB,SAAQ,KAAK;;CAKjD"}

package/dist/lib/request/client-cancellation.js

@@ -0,0 +1,7 @@
+/** Internal transport marker: upstream timeouts may also use AbortError. */
+export class ClientCancellationError extends Error {
+    constructor() {
+        super("Client cancelled request");
+        this.name = "AbortError";
+    }
+}

package/dist/lib/request/response-outcome.d.ts

@@ -0,0 +1,25 @@
+export interface StreamCompletion {
+    success: boolean;
+    errorCode: string | null;
+    missingTerminal: boolean;
+}
+/** Protocol completion, separate from socket delivery. Never retain output or error messages. */
+export declare class ResponseOutcome {
+    private readonly requireTerminal;
+    private terminal;
+    rejection: {
+        error: {
+            code?: string;
+            param?: string;
+        };
+    } | undefined;
+    constructor(requireTerminal: boolean);
+    observe(value: unknown): void;
+    /**
+     * `response.incomplete` (e.g. max_output_tokens) is a delivered response, not an
+     * account failure: it counts as success for health and affinity, and its terminal
+     * type survives only as the usage annotation in `errorCode`.
+     */
+    finish(): StreamCompletion;
+}
+//# sourceMappingURL=response-outcome.d.ts.map

package/dist/lib/request/response-outcome.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"response-outcome.d.ts","sourceRoot":"","sources":["../../../lib/request/response-outcome.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,gBAAgB;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,eAAe,EAAE,OAAO,CAAC;CACzB;AAED,iGAAiG;AACjG,qBAAa,eAAe;IAIf,OAAO,CAAC,QAAQ,CAAC,eAAe;IAH5C,OAAO,CAAC,QAAQ,CAAkE;IAClF,SAAS,EAAE;QAAE,KAAK,EAAE;YAAE,IAAI,CAAC,EAAE,MAAM,CAAC;YAAC,KAAK,CAAC,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,GAAG,SAAS,CAAC;gBAEvC,eAAe,EAAE,OAAO;IAErD,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAuB7B;;;;OAIG;IACH,MAAM,IAAI,gBAAgB;CAS1B"}

package/dist/lib/request/response-outcome.js

@@ -0,0 +1,49 @@
+import { isRecord } from "../utils.js";
+/** Protocol completion, separate from socket delivery. Never retain output or error messages. */
+export class ResponseOutcome {
+    requireTerminal;
+    terminal;
+    rejection;
+    constructor(requireTerminal) {
+        this.requireTerminal = requireTerminal;
+    }
+    observe(value) {
+        if (!isRecord(value))
+            return;
+        let type = value.type ?? (value.object === "response" && typeof value.status === "string" ? `response.${value.status}` : undefined);
+        // SSE `response.done` carries its outcome in the nested status.
+        if (type === "response.done") {
+            const status = isRecord(value.response) ? value.response.status : undefined;
+            type = typeof status === "string" ? `response.${status}` : "response.completed";
+        }
+        if (type === "response.completed") {
+            if (!this.terminal)
+                this.terminal = "completed";
+            return;
+        }
+        const failure = type === "response.failed" || type === "error";
+        if (!failure && type !== "response.incomplete" && type !== "response.cancelled")
+            return;
+        this.terminal = failure ? "failed" : type === "response.incomplete" ? "incomplete" : "cancelled";
+        const response = isRecord(value.response) ? value.response : value;
+        const error = isRecord(response.error) ? response.error : type === "error" ? value : undefined;
+        if (error) {
+            const safe = (v) => typeof v === "string" && /^[A-Za-z0-9._-]{1,100}$/.test(v) ? v : undefined;
+            this.rejection = { error: { code: safe(error.code), param: safe(error.param) } };
+        }
+    }
+    /**
+     * `response.incomplete` (e.g. max_output_tokens) is a delivered response, not an
+     * account failure: it counts as success for health and affinity, and its terminal
+     * type survives only as the usage annotation in `errorCode`.
+     */
+    finish() {
+        const missingTerminal = this.requireTerminal && !this.terminal;
+        const success = !missingTerminal && (!this.terminal || this.terminal === "completed" || this.terminal === "incomplete");
+        return {
+            success,
+            missingTerminal,
+            errorCode: missingTerminal ? "upstream_missing_terminal" : this.terminal && this.terminal !== "completed" ? `upstream_response_${this.terminal}` : null,
+        };
+    }
+}

package/dist/lib/request/stream-failover-runtime.d.ts

@@ -1,5 +1,6 @@
 import type { ServerResponse } from "node:http";
 import type { RuntimeRotationProxyStatus } from "../runtime/rotation-server-types.js";
+import type { StreamCompletion } from "./response-outcome.js";
 export declare const HOP_BY_HOP_HEADERS: Set<string>;
 export declare function responseHeadersForClient(upstreamHeaders: Headers): Record<string, string>;
 export declare function withTimeout<T>(promise: Promise<T>, timeoutMs: number, onTimeout: () => void, message: string): Promise<T>;
@@ -13,5 +14,5 @@ export declare function forwardStreamingResponse(upstream: Response, res: Server
  */
 onChunk?: (chunk: Uint8Array) => void, 
 /** Additional response headers, applied after (so they can override) the forwarded upstream ones. */
-extraHeaders?: Record<string, string>): Promise<boolean>;
+extraHeaders?: Record<string, string>, completion?: () => StreamCompletion): Promise<boolean>;
 //# sourceMappingURL=stream-failover-runtime.d.ts.map

package/dist/lib/request/stream-failover-runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stream-failover-runtime.d.ts","sourceRoot":"","sources":["../../../lib/request/stream-failover-runtime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,qCAAqC,CAAC;AAEtF,eAAO,MAAM,kBAAkB,aAW7B,CAAC;AAWH,wBAAgB,wBAAwB,CAAC,eAAe,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAUzF;AAED,wBAAsB,WAAW,CAAC,CAAC,EAClC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,EACnB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,IAAI,EACrB,OAAO,EAAE,MAAM,GACb,OAAO,CAAC,CAAC,CAAC,CAmBZ;AAED,wBAAsB,aAAa,CAClC,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAE,MAAM,EACjB,QAAQ,SAAc,GACpB,OAAO,CAAC,MAAM,CAAC,CAuDjB;AAoBD,wBAAsB,wBAAwB,CAC7C,QAAQ,EAAE,QAAQ,EAClB,GAAG,EAAE,cAAc,EACnB,MAAM,EAAE,0BAA0B,EAClC,aAAa,EAAE,MAAM,IAAI,EACzB,oBAAoB,EAAE,MAAM;AAC5B;;;;;GAKG;AACH,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,IAAI;AACrC,qGAAqG;AACrG,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACnC,OAAO,CAAC,OAAO,CAAC,CAsDlB"}
+{"version":3,"file":"stream-failover-runtime.d.ts","sourceRoot":"","sources":["../../../lib/request/stream-failover-runtime.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,qCAAqC,CAAC;AACtF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAE9D,eAAO,MAAM,kBAAkB,aAW7B,CAAC;AAWH,wBAAgB,wBAAwB,CAAC,eAAe,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAUzF;AAED,wBAAsB,WAAW,CAAC,CAAC,EAClC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,EACnB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,IAAI,EACrB,OAAO,EAAE,MAAM,GACb,OAAO,CAAC,CAAC,CAAC,CAmBZ;AAED,wBAAsB,aAAa,CAClC,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAE,MAAM,EACjB,QAAQ,SAAc,GACpB,OAAO,CAAC,MAAM,CAAC,CAuDjB;AAoBD,wBAAsB,wBAAwB,CAC7C,QAAQ,EAAE,QAAQ,EAClB,GAAG,EAAE,cAAc,EACnB,MAAM,EAAE,0BAA0B,EAClC,aAAa,EAAE,MAAM,IAAI,EACzB,oBAAoB,EAAE,MAAM;AAC5B;;;;;GAKG;AACH,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,IAAI;AACrC,qGAAqG;AACrG,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACrC,UAAU,CAAC,EAAE,MAAM,gBAAgB,GACjC,OAAO,CAAC,OAAO,CAAC,CAmElB"}

package/dist/lib/request/stream-failover-runtime.js

@@ -1,3 +1,4 @@
+import { ClientCancellationError } from "./client-cancellation.js";
 export const HOP_BY_HOP_HEADERS = new Set([
     "connection",
     "content-length",
@@ -137,19 +138,34 @@ export async function forwardStreamingResponse(upstream, res, status, onStreamEr
  */
 onChunk, 
 /** Additional response headers, applied after (so they can override) the forwarded upstream ones. */
-extraHeaders) {
+extraHeaders, completion) {
     status.streamsStarted += 1;
     res.writeHead(upstream.status, {
         ...responseHeadersForClient(upstream.headers),
         ...extraHeaders,
     });
-    if (!upstream.body) {
+    let clientDisconnected = false;
+    const finish = () => {
+        if (clientDisconnected || res.destroyed)
+            return false;
+        const result = completion?.();
+        // Already ended by a concurrent close path: never write after end.
+        if (res.writableEnded)
+            return false;
+        if (result && !result.success) {
+            status.lastError = result.errorCode;
+            if (result.missingTerminal)
+                res.write(Buffer.from(`data: ${JSON.stringify({ type: "error", error: { code: result.errorCode, message: "Upstream ended before completing the response." } })}\n\n`));
+        }
         res.end();
-        return true;
-    }
+        return result?.success ?? true;
+    };
+    if (!upstream.body)
+        return finish();
     const reader = upstream.body.getReader();
     res.on("close", () => {
         if (!res.writableEnded) {
+            clientDisconnected = true;
             void reader.cancel().catch(() => undefined);
         }
     });
@@ -163,10 +179,9 @@ extraHeaders) {
             if (value && value.byteLength > 0) {
                 onChunk?.(value);
                 // If the response is already finished (clean end by a concurrent
-                // close-then-reader-cancel path), stop writing. Do NOT guard on
-                // res.destroyed here: a socket-error-during-backpressure scenario sets
-                // destroyed=true and then lets the next res.write() throw so the catch
-                // block can record the error and fire onStreamError correctly.
+                // close-then-reader-cancel path), stop writing. A destroyed response
+                // is left to the next res.write(), which throws into the catch below;
+                // that path returns false without penalizing the upstream account.
                 if (res.writableEnded)
                     break;
                 // Respect backpressure: when the client's socket buffer is full,
@@ -177,10 +192,14 @@ extraHeaders) {
                 }
             }
         }
-        res.end();
-        return true;
+        return finish();
     }
     catch (error) {
+        if (clientDisconnected || res.destroyed || (error instanceof ClientCancellationError)) {
+            if (!res.destroyed)
+                res.destroy();
+            return false;
+        }
         status.lastError = error instanceof Error ? error.message : String(error);
         onStreamError();
         if (!res.destroyed) {

package/dist/lib/runtime/account-check.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"account-check.d.ts","sourceRoot":"","sources":["../../../lib/runtime/account-check.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EACN,KAAK,gBAAgB,EAErB,KAAK,wBAAwB,EAE7B,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAChE,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AACzE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAE7D,wBAAsB,sBAAsB,CAC3C,SAAS,EAAE,OAAO,EAClB,IAAI,EAAE;IACL,aAAa,EAAE,CACd,OAAO,EAAE,gBAAgB,GAAG,IAAI,KAC5B,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAAC;IACtC,YAAY,EAAE,MAAM,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAAC;IACrD,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;IAC3C,mBAAmB,EAAE,MAAM,OAAO,CAAC;QAClC,OAAO,EAAE,CAAC,CAAC;QACX,QAAQ,EAAE,wBAAwB,EAAE,CAAC;KACrC,CAAC,CAAC;IACH,8BAA8B,EAAE,CAAC,cAAc,EAAE;QAChD,OAAO,EAAE,CAAC,CAAC;QACX,QAAQ,EAAE,wBAAwB,EAAE,CAAC;KACrC,KAAK,wBAAwB,CAAC;IAC/B,2BAA2B,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,KAAK,OAAO,CAChE;QACA,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,CAAC,EAAE,MAAM,CAAC;KAClB,GACD,IAAI,GACJ,SAAS,CACX,CAAC;IACF,gBAAgB,EAAE,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,KAAK,MAAM,GAAG,SAAS,CAAC;IAC1E,8BAA8B,EAAE,CAC/B,MAAM,EAAE,eAAe,GAAG,SAAS,EACnC,gBAAgB,EAAE,MAAM,GAAG,SAAS,KAChC,OAAO,CAAC;IACb,aAAa,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,KAAK,MAAM,GAAG,SAAS,CAAC;IACjE,mBAAmB,EAAE,CACpB,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,KACxB,MAAM,GAAG,SAAS,CAAC;IACxB,aAAa,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,WAAW,CAAC,CAAC;IAC9D,yBAAyB,EAAE,CAC1B,OAAO,EAAE,OAAO,CAAC,WAAW,EAAE;QAAE,IAAI,EAAE,QAAQ,CAAA;KAAE,CAAC,KAC7C,OAAO,CAAC;IACb,uBAAuB,EAAE,CAAC,MAAM,EAAE;QACjC,SAAS,EAAE,MAAM,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;KACpB,KAAK,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAClC,uBAAuB,EAAE,CACxB,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,eAAe,EAAE,eAAe,GAAG,SAAS,EAC5C,cAAc,EAAE,MAAM,GAAG,SAAS,KAC9B,MAAM,GAAG,SAAS,CAAC;IACxB,oBAAoB,EAAE,CAAC,QAAQ,EAAE,kBAAkB,KAAK,MAAM,CAAC;IAC/D,yBAAyB,EAAE,CAC1B,OAAO,EAAE,gBAAgB,EACzB,aAAa,EAAE,SAAS,WAAW,EAAE,KACjC,IAAI,CAAC;IACV,cAAc,EAAE,SAAS,WAAW,EAAE,CAAC;IACvC,YAAY,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3D,6BAA6B,EAAE,MAAM,IAAI,CAAC;IAC1C,mBAAmB,EAAE,CAAC,OAAO,EAAE;QAC9B,OAAO,EAAE,CAAC,CAAC;QACX,QAAQ,EAAE,wBAAwB,EAAE,CAAC;KACrC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACpB,+BAA+B,CAAC,EAAE,CACjC,cAAc,EAAE,gBAAgB,EAChC,cAAc,EAAE;QACf,OAAO,EAAE,CAAC,CAAC;QACX,QAAQ,EAAE,wBAAwB,EAAE,CAAC;KACrC,KACG,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,QAAQ,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACpC,GACC,OAAO,CAAC,IAAI,CAAC,CA2Sf"}
+{"version":3,"file":"account-check.d.ts","sourceRoot":"","sources":["../../../lib/runtime/account-check.ts"],"names":[],"mappings":"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"}

package/dist/lib/runtime/account-check.js

@@ -1,17 +1,11 @@
 import { maskEmail } from "../logger.js";
 import { CODEX_UNAVAILABLE_PROBE_NOTE } from "../quota-probe.js";
 import { isCodexUnavailableError } from "../errors.js";
-import { bumpStorageAffinityGeneration, reconcilePinnedAccountIndex, } from "../storage.js";
+import { cloneTrackedAccountStorage, bumpStorageAffinityGeneration, reconcilePinnedAccountIndex, } from "../storage.js";
 export async function runRuntimeAccountCheck(deepProbe, deps) {
     const loadedStorage = await deps.hydrateEmails(await deps.loadAccounts());
     const workingStorage = loadedStorage
-        ? {
-            ...loadedStorage,
-            accounts: loadedStorage.accounts.map((account) => ({ ...account })),
-            activeIndexByFamily: loadedStorage.activeIndexByFamily
-                ? { ...loadedStorage.activeIndexByFamily }
-                : {},
-        }
+        ? cloneTrackedAccountStorage(loadedStorage)
         : deps.createEmptyStorage();
     if (workingStorage.accounts.length === 0) {
         deps.showLine("\nNo accounts to check.\n");