@iam-brain/opencode-codex-auth 1.2.4 → 1.2.5

package/dist/lib/fetch-orchestrator.js

@@ -14,6 +14,16 @@ const MAX_SESSION_KEYS = 200;
 const DEFAULT_RATE_LIMIT_TOAST_DEBOUNCE_MS = 60_000;
 const DEFAULT_SESSION_TOAST_DEBOUNCE_MS = 15_000;
 const DEFAULT_ACCOUNT_SWITCH_TOAST_DEBOUNCE_MS = 15_000;
+const MAX_TOAST_DEDUPE_KEYS = 512;
+const TOAST_DEDUPE_TTL_MS = 6 * 60 * 60 * 1000;
+const CROSS_ORIGIN_REDIRECT_STRIPPED_HEADERS = new Set([
+    "authorization",
+    "proxy-authorization",
+    "chatgpt-account-id",
+    "session_id",
+    "cookie",
+    "set-cookie"
+]);
 function normalizeSessionKey(value) {
     if (typeof value !== "string")
         return null;
@@ -39,6 +49,28 @@ function formatAccountLabel(auth) {
         return `id:${idSuffix}`;
     return "account";
 }
+function resolveRetryAccountKey(auth) {
+    const identityKey = auth.identityKey?.trim();
+    if (identityKey)
+        return `identity:${identityKey}`;
+    const attemptKey = auth.selectionTrace?.attemptKey?.trim();
+    if (attemptKey)
+        return `attempt:${attemptKey}`;
+    const accountId = auth.accountId?.trim();
+    const email = auth.email?.trim()?.toLowerCase();
+    const plan = auth.plan?.trim()?.toLowerCase();
+    if (accountId && email && plan) {
+        return `tuple:${accountId}|${email}|${plan}`;
+    }
+    return null;
+}
+function stripCrossOriginRedirectHeaders(headers) {
+    for (const name of [...headers.keys()]) {
+        if (CROSS_ORIGIN_REDIRECT_STRIPPED_HEADERS.has(name.trim().toLowerCase())) {
+            headers.delete(name);
+        }
+    }
+}
 export class FetchOrchestrator {
     deps;
     state;
@@ -68,9 +100,13 @@ export class FetchOrchestrator {
             if (method !== "GET" && method !== "HEAD") {
                 return createSyntheticErrorResponse("Blocked outbound redirect for non-idempotent request method.", 502, "blocked_outbound_redirect", "request");
             }
+            const redirectHeaders = new Headers(current.headers);
+            if (new URL(current.url).origin !== nextUrl.origin) {
+                stripCrossOriginRedirectHeaders(redirectHeaders);
+            }
             current = new Request(nextUrl.toString(), {
                 method,
-                headers: current.headers,
+                headers: redirectHeaders,
                 redirect: "manual"
             });
         }
@@ -89,11 +125,15 @@ export class FetchOrchestrator {
     pruneSessionKeys(now) {
         if (this.state.seenSessionKeys.size === 0)
             return;
+        const staleKeys = [];
         for (const [key, lastSeen] of this.state.seenSessionKeys) {
             if (now - lastSeen > SESSION_KEY_TTL_MS) {
-                this.state.seenSessionKeys.delete(key);
+                staleKeys.push(key);
             }
         }
+        for (const key of staleKeys) {
+            this.state.seenSessionKeys.delete(key);
+        }
     }
     enforceSessionKeyLimit() {
         while (this.state.seenSessionKeys.size > MAX_SESSION_KEYS) {
@@ -104,6 +144,7 @@ export class FetchOrchestrator {
         }
     }
     shouldShowRateLimitToast(identityKey, now) {
+        this.pruneToastDedupeMap(this.state.rateLimitToastShownAt, now);
         const key = identityKey ?? "__global__";
         const debounceMs = Math.max(0, Math.floor(this.deps.rateLimitToastDebounceMs ?? DEFAULT_RATE_LIMIT_TOAST_DEBOUNCE_MS));
         const lastShownAt = this.state.rateLimitToastShownAt.get(key);
@@ -114,6 +155,7 @@ export class FetchOrchestrator {
         return true;
     }
     shouldShowToastByKey(key, now, debounceMs) {
+        this.pruneToastDedupeMap(this.state.toastShownAt, now);
         const normalizedDebounce = Math.max(0, Math.floor(debounceMs));
         const lastShownAt = this.state.toastShownAt.get(key);
         if (lastShownAt !== undefined && now - lastShownAt < normalizedDebounce) {
@@ -122,6 +164,22 @@ export class FetchOrchestrator {
         this.state.toastShownAt.set(key, now);
         return true;
     }
+    pruneToastDedupeMap(map, now) {
+        const staleBefore = now - TOAST_DEDUPE_TTL_MS;
+        if (map.size > 0) {
+            for (const [key, at] of map) {
+                if (at < staleBefore) {
+                    map.delete(key);
+                }
+            }
+        }
+        while (map.size > MAX_TOAST_DEDUPE_KEYS) {
+            const oldest = map.keys().next().value;
+            if (!oldest)
+                break;
+            map.delete(oldest);
+        }
+    }
     async maybeShowToast(message, variant, options) {
         if (!this.deps.showToast)
             return;
@@ -155,7 +213,7 @@ export class FetchOrchestrator {
             if (!hasSeen) {
                 sessionEvent = "new";
             }
-            else if (!this.state.lastSessionKey) {
+            else if (this.state.lastSessionKey === sessionKey) {
                 sessionEvent = "resume";
             }
             else if (this.state.lastSessionKey && this.state.lastSessionKey !== sessionKey) {
@@ -186,10 +244,11 @@ export class FetchOrchestrator {
             const now = nowFn();
             const auth = await this.deps.acquireAuth({ sessionKey });
             const accountLabel = formatAccountLabel(auth);
-            const accountKey = auth.identityKey?.trim() || auth.accountId?.trim() || auth.email?.trim()?.toLowerCase() || accountLabel;
+            const accountDisplayKey = auth.identityKey?.trim() || auth.accountId?.trim() || auth.email?.trim()?.toLowerCase() || accountLabel;
+            const retryAccountKey = resolveRetryAccountKey(auth);
             const attemptReasonCode = attempt === 0 || previousAttemptStatus !== 429
                 ? "initial_attempt"
-                : previousAttemptAccountKey && previousAttemptAccountKey !== accountKey
+                : previousAttemptAccountKey && retryAccountKey && previousAttemptAccountKey !== retryAccountKey
                     ? "retry_switched_account_after_429"
                     : "retry_same_account_after_429";
             if (sessionEvent && !sessionToastEmitted) {
@@ -205,7 +264,7 @@ export class FetchOrchestrator {
                 });
                 sessionToastEmitted = true;
             }
-            if (this.state.lastAccountKey !== null && this.state.lastAccountKey !== accountKey) {
+            if (this.state.lastAccountKey !== null && this.state.lastAccountKey !== accountDisplayKey) {
                 const accountSwitchMessage = attemptReasonCode === "retry_switched_account_after_429"
                     ? `Account switched after rate limit: ${accountLabel}`
                     : `Account switched: ${accountLabel}`;
@@ -215,9 +274,10 @@ export class FetchOrchestrator {
                     now
                 });
             }
-            this.state.lastAccountKey = accountKey;
+            this.state.lastAccountKey = accountDisplayKey;
             let request = baseRequest.clone();
             request.headers.set("Authorization", `Bearer ${auth.access}`);
+            request.headers.delete("ChatGPT-Account-Id");
             if (auth.accountId) {
                 request.headers.set("ChatGPT-Account-Id", auth.accountId);
             }
@@ -266,7 +326,7 @@ export class FetchOrchestrator {
             }
             lastResponse = response;
             previousAttemptStatus = response.status;
-            previousAttemptAccountKey = accountKey;
+            previousAttemptAccountKey = retryAccountKey;
             // Handle 429
             const retryAfterStr = response.headers.get("retry-after");
             if (auth.identityKey) {
@@ -279,7 +339,15 @@ export class FetchOrchestrator {
                     jitterMaxMs: 0
                 });
                 const cooldownUntil = now + (retryAfterMs ?? fallbackMs);
-                await this.deps.setCooldown(auth.identityKey, cooldownUntil);
+                try {
+                    await this.deps.setCooldown(auth.identityKey, cooldownUntil);
+                }
+                catch (error) {
+                    if (error instanceof Error) {
+                        // Cooldown persistence failures should not prevent retrying another account.
+                    }
+                    // Cooldown persistence failures should not prevent retrying another account.
+                }
             }
             if (attempt < maxAttempts - 1 && this.shouldShowRateLimitToast(auth.identityKey, now)) {
                 await this.maybeShowToast("Rate limited - switching account", "warning");
@@ -291,8 +359,10 @@ export class FetchOrchestrator {
             const waitLabel = typeof retryAfterMs === "number" ? formatWaitTime(retryAfterMs) : "a short while";
             return createSyntheticErrorResponse(`All attempted OpenAI accounts are rate limited. Try again in ${waitLabel} or run \`opencode auth login\` to add another account.`, 429, "all_accounts_rate_limited", "accounts");
         }
-        // Safe: the loop always runs at least once (maxAttempts >= 1), so lastResponse is assigned.
-        return lastResponse;
+        if (lastResponse) {
+            return lastResponse;
+        }
+        return createSyntheticErrorResponse("OpenAI request failed before receiving a response. Check connectivity and try again.", 503, "upstream_unreachable", "network");
     }
 }
 //# sourceMappingURL=fetch-orchestrator.js.map

package/dist/lib/fetch-orchestrator.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetch-orchestrator.js","sourceRoot":"","sources":["../../lib/fetch-orchestrator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fetch-orchestrator.js","sourceRoot":"","sources":["../../lib/fetch-orchestrator.ts"],"names":[],"mappings":"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"}

package/dist/lib/identity.d.ts

@@ -6,6 +6,12 @@ export declare function buildIdentityKey(input: {
     email?: string;
     plan?: string;
 }): string | undefined;
+export declare function buildLegacyIdentityFingerprint(input: {
+    accountId?: string;
+    email?: string;
+    plan?: string;
+}): string;
+export declare function assignDeterministicFallbackIdentityKey(account: AccountRecord, occurrence?: number): AccountRecord;
 export declare function ensureIdentityKey(account: AccountRecord): AccountRecord;
 export declare function synchronizeIdentityKey(account: AccountRecord): AccountRecord;
 //# sourceMappingURL=identity.d.ts.map

package/dist/lib/identity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"identity.d.ts","sourceRoot":"","sources":["../../lib/identity.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAE/C,wBAAgB,cAAc,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAKjE;AAED,wBAAgB,aAAa,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAK/D;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,GAAG,SAAS,CAMjH;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,aAAa,GAAG,aAAa,CAKvE;AAQD,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,aAAa,GAAG,aAAa,CAiB5E"}
+{"version":3,"file":"identity.d.ts","sourceRoot":"","sources":["../../lib/identity.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAE/C,wBAAgB,cAAc,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAKjE;AAED,wBAAgB,aAAa,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAK/D;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,GAAG,SAAS,CAMjH;AAQD,wBAAgB,8BAA8B,CAAC,KAAK,EAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAKnH;AAED,wBAAgB,sCAAsC,CAAC,OAAO,EAAE,aAAa,EAAE,UAAU,SAAI,GAAG,aAAa,CAK5G;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,aAAa,GAAG,aAAa,CAKvE;AAQD,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,aAAa,GAAG,aAAa,CAiB5E"}

package/dist/lib/identity.js

@@ -22,6 +22,25 @@ export function buildIdentityKey(input) {
         return undefined;
     return `${accountId}|${email}|${plan}`;
 }
+function normalizeLegacyIdentitySegment(value) {
+    const trimmed = value?.trim();
+    if (!trimmed)
+        return "_";
+    return encodeURIComponent(trimmed);
+}
+export function buildLegacyIdentityFingerprint(input) {
+    const accountId = normalizeLegacyIdentitySegment(input.accountId);
+    const email = normalizeLegacyIdentitySegment(normalizeEmail(input.email));
+    const plan = normalizeLegacyIdentitySegment(normalizePlan(input.plan));
+    return `legacy|${accountId}|${email}|${plan}`;
+}
+export function assignDeterministicFallbackIdentityKey(account, occurrence = 0) {
+    if (account.identityKey)
+        return account;
+    const base = buildLegacyIdentityFingerprint(account);
+    account.identityKey = occurrence > 0 ? `${base}|dup:${occurrence + 1}` : base;
+    return account;
+}
 export function ensureIdentityKey(account) {
     if (!account.identityKey) {
         account.identityKey = buildIdentityKey(account);
@@ -38,14 +57,16 @@ export function synchronizeIdentityKey(account) {
     const canonical = buildIdentityKey(account);
     if (!canonical)
         return account;
-    if (!account.identityKey) {
+    const current = account.identityKey;
+    if (!current) {
         account.identityKey = canonical;
         return account;
     }
-    if (account.identityKey === canonical) {
+    if (current === canonical)
         return account;
-    }
-    if (isCanonicalIdentityKey(account.identityKey)) {
+    // Migrate strict tuple keys and legacy fallback keys, but avoid rewriting
+    // arbitrary non-canonical identifiers that may still be in active use.
+    if (current.startsWith("legacy|") || isCanonicalIdentityKey(current)) {
         account.identityKey = canonical;
     }
     return account;

package/dist/lib/identity.js.map

@@ -1 +1 @@
-{"version":3,"file":"identity.js","sourceRoot":"","sources":["../../lib/identity.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,cAAc,CAAC,KAAc;IAC3C,IAAI,CAAC,KAAK;QAAE,OAAO,SAAS,CAAA;IAC5B,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,CAAA;IAC5B,IAAI,CAAC,OAAO;QAAE,OAAO,SAAS,CAAA;IAC9B,OAAO,OAAO,CAAC,WAAW,EAAE,CAAA;AAC9B,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,IAAa;IACzC,IAAI,CAAC,IAAI;QAAE,OAAO,SAAS,CAAA;IAC3B,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAA;IAC3B,IAAI,CAAC,OAAO;QAAE,OAAO,SAAS,CAAA;IAC9B,OAAO,OAAO,CAAC,WAAW,EAAE,CAAA;AAC9B,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,KAA4D;IAC3F,MAAM,SAAS,GAAG,KAAK,CAAC,SAAS,EAAE,IAAI,EAAE,CAAA;IACzC,MAAM,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;IACzC,MAAM,IAAI,GAAG,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACtC,IAAI,CAAC,SAAS,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI;QAAE,OAAO,SAAS,CAAA;IACnD,OAAO,GAAG,SAAS,IAAI,KAAK,IAAI,IAAI,EAAE,CAAA;AACxC,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,OAAsB;IACtD,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;QACzB,OAAO,CAAC,WAAW,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAA;IACjD,CAAC;IACD,OAAO,OAAO,CAAA;AAChB,CAAC;AAED,SAAS,sBAAsB,CAAC,KAAa;IAC3C,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAC9B,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,CAAA;IACpC,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;AACtD,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,OAAsB;IAC3D,MAAM,SAAS,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAA;IAC3C,IAAI,CAAC,SAAS;QAAE,OAAO,OAAO,CAAA;IAE9B,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;QACzB,OAAO,CAAC,WAAW,GAAG,SAAS,CAAA;QAC/B,OAAO,OAAO,CAAA;IAChB,CAAC;IAED,IAAI,OAAO,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;QACtC,OAAO,OAAO,CAAA;IAChB,CAAC;IAED,IAAI,sBAAsB,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;QAChD,OAAO,CAAC,WAAW,GAAG,SAAS,CAAA;IACjC,CAAC;IACD,OAAO,OAAO,CAAA;AAChB,CAAC"}
+{"version":3,"file":"identity.js","sourceRoot":"","sources":["../../lib/identity.ts"],"names":[],"mappings":"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"}

package/dist/lib/opencode-install.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"opencode-install.d.ts","sourceRoot":"","sources":["../../lib/opencode-install.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,wBAAwB,0CAA0C,CAAA;AAE/E,wBAAgB,yBAAyB,CAAC,GAAG,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAe,GAAG,MAAM,CAMvG;AAOD,MAAM,MAAM,0BAA0B,GAAG;IACvC,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,eAAe,CAAC,EAAE,MAAM,CAAA;CACzB,CAAA;AAED,MAAM,MAAM,2BAA2B,GAAG;IACxC,UAAU,EAAE,MAAM,CAAA;IAClB,eAAe,EAAE,MAAM,CAAA;IACvB,OAAO,EAAE,OAAO,CAAA;IAChB,OAAO,EAAE,OAAO,CAAA;IAChB,OAAO,EAAE,MAAM,EAAE,CAAA;CAClB,CAAA;AAqBD,wBAAsB,qBAAqB,CACzC,KAAK,GAAE,0BAA+B,GACrC,OAAO,CAAC,2BAA2B,CAAC,CA8CtC"}
+{"version":3,"file":"opencode-install.d.ts","sourceRoot":"","sources":["../../lib/opencode-install.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,wBAAwB,0CAA0C,CAAA;AAE/E,wBAAgB,yBAAyB,CAAC,GAAG,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAe,GAAG,MAAM,CAMvG;AAOD,MAAM,MAAM,0BAA0B,GAAG;IACvC,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,eAAe,CAAC,EAAE,MAAM,CAAA;CACzB,CAAA;AAED,MAAM,MAAM,2BAA2B,GAAG;IACxC,UAAU,EAAE,MAAM,CAAA;IAClB,eAAe,EAAE,MAAM,CAAA;IACvB,OAAO,EAAE,OAAO,CAAA;IAChB,OAAO,EAAE,OAAO,CAAA;IAChB,OAAO,EAAE,MAAM,EAAE,CAAA;CAClB,CAAA;AAqBD,wBAAsB,qBAAqB,CACzC,KAAK,GAAE,0BAA+B,GACrC,OAAO,CAAC,2BAA2B,CAAC,CA+CtC"}

package/dist/lib/opencode-install.js

@@ -22,7 +22,7 @@ function normalizePluginList(raw) {
 }
 async function quarantineMalformedConfig(configPath) {
     const quarantineDir = path.join(path.dirname(configPath), "quarantine");
-    await quarantineFile({
+    return quarantineFile({
         sourcePath: configPath,
         quarantineDir,
         now: Date.now
@@ -40,12 +40,11 @@ export async function ensurePluginInstalled(input = {}) {
             current = JSON.parse(raw);
         }
         catch (error) {
-            await quarantineMalformedConfig(configPath);
-            created = true;
-            current = {};
-            if (!(error instanceof SyntaxError)) {
-                throw error;
+            if (error instanceof SyntaxError) {
+                const { quarantinedPath } = await quarantineMalformedConfig(configPath);
+                throw new Error(`Malformed OpenCode config at ${configPath}. Moved corrupt file to ${quarantinedPath}; repair and rerun.`);
             }
+            throw error;
         }
     }
     catch (error) {

package/dist/lib/opencode-install.js.map

@@ -1 +1 @@
-{"version":3,"file":"opencode-install.js","sourceRoot":"","sources":["../../lib/opencode-install.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"opencode-install.js","sourceRoot":"","sources":["../../lib/opencode-install.ts"],"names":[],"mappings":"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"}

package/dist/lib/orchestrator-agent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"orchestrator-agent.d.ts","sourceRoot":"","sources":["../../lib/orchestrator-agent.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,6BAA6B,oBAAoB,CAAA;AAC9D,eAAO,MAAM,sCAAsC,6BAA8C,CAAA;AA8IjG,MAAM,MAAM,6BAA6B,GAAG;IAC1C,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,8BAA8B,GAAG;IAC3C,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,OAAO,CAAA;IAChB,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,yCAAyC,GAAG;IACtD,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,0CAA0C,GAAG;IACvD,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,OAAO,CAAA;IAChB,OAAO,EAAE,OAAO,CAAA;IAChB,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,EAAE,OAAO,CAAA;CACf,CAAA;AAED,wBAAgB,wBAAwB,CAAC,GAAG,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAe,GAAG,MAAM,CAMtG;AAyCD,wBAAsB,wBAAwB,CAC5C,KAAK,GAAE,6BAAkC,GACxC,OAAO,CAAC,8BAA8B,CAAC,CAWzC;AAED,wBAAsB,oCAAoC,CACxD,KAAK,EAAE,yCAAyC,GAC/C,OAAO,CAAC,0CAA0C,CAAC,CAiFrD"}
+{"version":3,"file":"orchestrator-agent.d.ts","sourceRoot":"","sources":["../../lib/orchestrator-agent.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,6BAA6B,oBAAoB,CAAA;AAC9D,eAAO,MAAM,sCAAsC,6BAA8C,CAAA;AAgJjG,MAAM,MAAM,6BAA6B,GAAG;IAC1C,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,8BAA8B,GAAG;IAC3C,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,OAAO,CAAA;IAChB,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,yCAAyC,GAAG;IACtD,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,0CAA0C,GAAG;IACvD,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,OAAO,CAAA;IAChB,OAAO,EAAE,OAAO,CAAA;IAChB,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,EAAE,OAAO,CAAA;CACf,CAAA;AAED,wBAAgB,wBAAwB,CAAC,GAAG,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAe,GAAG,MAAM,CAMtG;AAyCD,wBAAsB,wBAAwB,CAC5C,KAAK,GAAE,6BAAkC,GACxC,OAAO,CAAC,8BAA8B,CAAC,CAWzC;AAED,wBAAsB,oCAAoC,CACxD,KAAK,EAAE,yCAAyC,GAC/C,OAAO,CAAC,0CAA0C,CAAC,CAiFrD"}

package/dist/lib/orchestrator-agent.js

@@ -122,6 +122,7 @@ Sub-agents are their to make you go fast and time is a big constraint so leverag
 4. Iterate on this. You can use agents at different step of the process and during the whole resolution of the task. Never forget to use them.
 5. Ask the user before shutting sub-agents down unless you need to because you reached the agent limit.
 `;
+const CODEX_ORCHESTRATOR_AGENT_PROMPT_FALLBACK = stripLeadingFrontmatter(CODEX_ORCHESTRATOR_AGENT_TEMPLATE);
 function stripLeadingFrontmatter(content) {
     const trimmed = content.trimStart();
     if (!trimmed.startsWith("---\n"))
@@ -141,7 +142,7 @@ async function resolveOrchestratorAgentTemplate(cacheDir) {
     const upstream = prompts.orchestrator?.trim();
     if (upstream)
         return composeTemplateFromPrompt(upstream);
-    return CODEX_ORCHESTRATOR_AGENT_TEMPLATE;
+    return composeTemplateFromPrompt(CODEX_ORCHESTRATOR_AGENT_PROMPT_FALLBACK);
 }
 export function defaultOpencodeAgentsDir(env = process.env) {
     const xdgRoot = env.XDG_CONFIG_HOME?.trim();

package/dist/lib/orchestrator-agent.js.map

@@ -1 +1 @@
-{"version":3,"file":"orchestrator-agent.js","sourceRoot":"","sources":["../../lib/orchestrator-agent.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"orchestrator-agent.js","sourceRoot":"","sources":["../../lib/orchestrator-agent.ts"],"names":[],"mappings":"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"}

package/dist/lib/paths.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../../lib/paths.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,mBAAmB,wBAAwB,CAAA;AACxD,eAAO,MAAM,iCAAiC,+BAA+B,CAAA;AAC7E,eAAO,MAAM,2BAA2B,gCAAgC,CAAA;AACxE,eAAO,MAAM,oBAAoB,yBAAyB,CAAA;AAI1D,wBAAgB,eAAe,IAAI,MAAM,CAExC;AAED,wBAAgB,wBAAwB,CAAC,GAAG,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAe,GAAG,MAAM,CAEtG;AAED,wBAAgB,sCAAsC,CAAC,GAAG,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAe,GAAG,MAAM,CAEpH;AAED,wBAAgB,uBAAuB,CAAC,GAAG,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAe,GAAG,MAAM,CAIrG;AAED,wBAAgB,yBAAyB,CAAC,GAAG,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAe,GAAG,MAAM,CAIvG;AAED,wBAAgB,wBAAwB,CAAC,GAAG,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAe,GAAG,MAAM,CAEtG;AAED,wBAAgB,uBAAuB,CAAC,GAAG,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAe,GAAG,MAAM,CAErG;AAED,wBAAgB,0BAA0B,CAAC,GAAG,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAe,GAAG,MAAM,CAExG;AAED,wBAAgB,iCAAiC,CAAC,GAAG,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAe,GAAG,MAAM,CAE/G;AAED,wBAAgB,uBAAuB,CACrC,UAAU,EAAE,MAAM,EAClB,GAAG,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAe,GACpD,MAAM,CAmBR;AAED,wBAAgB,gCAAgC,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEzE;AAED,wBAAgB,oBAAoB,IAAI,MAAM,CAE7C;AAED,wBAAgB,0BAA0B,CAAC,GAAG,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAe,GAAG,MAAM,CAExG"}
+{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../../lib/paths.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,mBAAmB,wBAAwB,CAAA;AACxD,eAAO,MAAM,iCAAiC,+BAA+B,CAAA;AAC7E,eAAO,MAAM,2BAA2B,gCAAgC,CAAA;AACxE,eAAO,MAAM,oBAAoB,yBAAyB,CAAA;AAU1D,wBAAgB,eAAe,IAAI,MAAM,CAExC;AAED,wBAAgB,wBAAwB,CAAC,GAAG,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAe,GAAG,MAAM,CAEtG;AAED,wBAAgB,sCAAsC,CAAC,GAAG,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAe,GAAG,MAAM,CAEpH;AAED,wBAAgB,uBAAuB,CAAC,GAAG,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAe,GAAG,MAAM,CAIrG;AAED,wBAAgB,yBAAyB,CAAC,GAAG,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAe,GAAG,MAAM,CAIvG;AAED,wBAAgB,wBAAwB,CAAC,GAAG,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAe,GAAG,MAAM,CAEtG;AAED,wBAAgB,uBAAuB,CAAC,GAAG,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAe,GAAG,MAAM,CAErG;AAED,wBAAgB,0BAA0B,CAAC,GAAG,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAe,GAAG,MAAM,CAExG;AAED,wBAAgB,iCAAiC,CAAC,GAAG,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAe,GAAG,MAAM,CAE/G;AAED,wBAAgB,uBAAuB,CACrC,UAAU,EAAE,MAAM,EAClB,GAAG,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAe,GACpD,MAAM,CAmBR;AAED,wBAAgB,gCAAgC,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEzE;AAED,wBAAgB,oBAAoB,IAAI,MAAM,CAE7C;AAED,wBAAgB,0BAA0B,CAAC,GAAG,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAe,GAAG,MAAM,CAExG"}

package/dist/lib/paths.js

@@ -6,6 +6,12 @@ export const CODEX_SESSION_AFFINITY_FILE = "codex-session-affinity.json";
 export const CODEX_SNAPSHOTS_FILE = "codex-snapshots.json";
 const OPENCODE_AUTH_FILE = "auth.json";
 const OPENCODE_SESSION_STORAGE_DIR = path.join("opencode", "storage", "session");
+function readAbsoluteEnvPath(raw) {
+    const trimmed = raw?.trim();
+    if (!trimmed)
+        return undefined;
+    return path.isAbsolute(trimmed) ? trimmed : undefined;
+}
 export function defaultAuthPath() {
     return path.join(defaultOpencodeConfigPath(), CODEX_ACCOUNTS_FILE);
 }
@@ -16,13 +22,13 @@ export function opencodeProviderAuthLegacyFallbackPath(env = process.env) {
     return opencodeProviderAuthPath({ ...env, XDG_DATA_HOME: undefined });
 }
 export function defaultOpencodeDataPath(env = process.env) {
-    const xdgData = env.XDG_DATA_HOME?.trim();
+    const xdgData = readAbsoluteEnvPath(env.XDG_DATA_HOME);
     if (xdgData)
         return xdgData;
     return path.join(os.homedir(), ".local", "share");
 }
 export function defaultOpencodeConfigPath(env = process.env) {
-    const xdgConfig = env.XDG_CONFIG_HOME?.trim();
+    const xdgConfig = readAbsoluteEnvPath(env.XDG_CONFIG_HOME);
     if (xdgConfig)
         return path.join(xdgConfig, "opencode");
     return path.join(os.homedir(), ".config", "opencode");

package/dist/lib/paths.js.map

@@ -1 +1 @@
-{"version":3,"file":"paths.js","sourceRoot":"","sources":["../../lib/paths.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAA;AACxB,OAAO,IAAI,MAAM,WAAW,CAAA;AAE5B,MAAM,CAAC,MAAM,mBAAmB,GAAG,qBAAqB,CAAA;AACxD,MAAM,CAAC,MAAM,iCAAiC,GAAG,4BAA4B,CAAA;AAC7E,MAAM,CAAC,MAAM,2BAA2B,GAAG,6BAA6B,CAAA;AACxE,MAAM,CAAC,MAAM,oBAAoB,GAAG,sBAAsB,CAAA;AAC1D,MAAM,kBAAkB,GAAG,WAAW,CAAA;AACtC,MAAM,4BAA4B,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,SAAS,EAAE,SAAS,CAAC,CAAA;AAEhF,MAAM,UAAU,eAAe;IAC7B,OAAO,IAAI,CAAC,IAAI,CAAC,yBAAyB,EAAE,EAAE,mBAAmB,CAAC,CAAA;AACpE,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,MAA0C,OAAO,CAAC,GAAG;IAC5F,OAAO,IAAI,CAAC,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,EAAE,UAAU,EAAE,kBAAkB,CAAC,CAAA;AAChF,CAAC;AAED,MAAM,UAAU,sCAAsC,CAAC,MAA0C,OAAO,CAAC,GAAG;IAC1G,OAAO,wBAAwB,CAAC,EAAE,GAAG,GAAG,EAAE,aAAa,EAAE,SAAS,EAAE,CAAC,CAAA;AACvE,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,MAA0C,OAAO,CAAC,GAAG;IAC3F,MAAM,OAAO,GAAG,GAAG,CAAC,aAAa,EAAE,IAAI,EAAE,CAAA;IACzC,IAAI,OAAO;QAAE,OAAO,OAAO,CAAA;IAC3B,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAA;AACnD,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAC,MAA0C,OAAO,CAAC,GAAG;IAC7F,MAAM,SAAS,GAAG,GAAG,CAAC,eAAe,EAAE,IAAI,EAAE,CAAA;IAC7C,IAAI,SAAS;QAAE,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,UAAU,CAAC,CAAA;IACtD,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,UAAU,CAAC,CAAA;AACvD,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,MAA0C,OAAO,CAAC,GAAG;IAC5F,OAAO,IAAI,CAAC,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,CAAA;AAC3D,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,MAA0C,OAAO,CAAC,GAAG;IAC3F,OAAO,IAAI,CAAC,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,CAAA;AAC1D,CAAC;AAED,MAAM,UAAU,0BAA0B,CAAC,MAA0C,OAAO,CAAC,GAAG;IAC9F,OAAO,IAAI,CAAC,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,EAAE,cAAc,CAAC,CAAA;AAChE,CAAC;AAED,MAAM,UAAU,iCAAiC,CAAC,MAA0C,OAAO,CAAC,GAAG;IACrG,OAAO,IAAI,CAAC,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,EAAE,4BAA4B,CAAC,CAAA;AAC9E,CAAC;AAED,MAAM,UAAU,uBAAuB,CACrC,UAAkB,EAClB,MAA0C,OAAO,CAAC,GAAG;IAErD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,iCAAiC,CAAC,GAAG,CAAC,CAAC,CAAA;IACpE,MAAM,UAAU,GAAG,UAAU,CAAC,IAAI,EAAE,CAAA;IACpC,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAA;IACxC,CAAC;IACD,IACE,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC;QAC3B,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC;QACzB,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC;QACxB,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,EACzB,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAA;IACxC,CAAC;IACD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,UAAU,OAAO,CAAC,CAAA;IAC7D,IAAI,SAAS,KAAK,OAAO,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC;QAC5E,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAA;IACxC,CAAC;IACD,OAAO,SAAS,CAAA;AAClB,CAAC;AAED,MAAM,UAAU,gCAAgC,CAAC,QAAgB;IAC/D,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,iCAAiC,CAAC,CAAA;AAC7E,CAAC;AAED,MAAM,UAAU,oBAAoB;IAClC,OAAO,IAAI,CAAC,IAAI,CAAC,wBAAwB,EAAE,EAAE,oBAAoB,CAAC,CAAA;AACpE,CAAC;AAED,MAAM,UAAU,0BAA0B,CAAC,MAA0C,OAAO,CAAC,GAAG;IAC9F,OAAO,IAAI,CAAC,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,EAAE,2BAA2B,CAAC,CAAA;AAC9E,CAAC"}
+{"version":3,"file":"paths.js","sourceRoot":"","sources":["../../lib/paths.ts"],"names":[],"mappings":"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"}

package/dist/lib/proactive-refresh.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proactive-refresh.d.ts","sourceRoot":"","sources":["../../lib/proactive-refresh.ts"],"names":[],"mappings":"AAqBA,wBAAsB,0BAA0B,CAAC,KAAK,EAAE;IACtD,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,GAAG,EAAE,MAAM,MAAM,CAAA;IACjB,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CACjG,GAAG,OAAO,CAAC,IAAI,CAAC,CA2FhB"}
+{"version":3,"file":"proactive-refresh.d.ts","sourceRoot":"","sources":["../../lib/proactive-refresh.ts"],"names":[],"mappings":"AAkCA,wBAAsB,0BAA0B,CAAC,KAAK,EAAE;IACtD,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,GAAG,EAAE,MAAM,MAAM,CAAA;IACjB,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CACjG,GAAG,OAAO,CAAC,IAAI,CAAC,CAsHhB"}

package/dist/lib/proactive-refresh.js

@@ -1,20 +1,35 @@
 import { ensureOpenAIOAuthDomain, listOpenAIOAuthDomains, saveAuthStorage } from "./storage.js";
 const PROACTIVE_REFRESH_FAILURE_COOLDOWN_MS = 30_000;
+const TERMINAL_REFRESH_ERROR_CODES = new Set([
+    "invalid_grant",
+    "invalid_refresh_token",
+    "refresh_token_revoked",
+    "token_revoked"
+]);
 function isInvalidGrantError(error) {
     const oauthCode = typeof error === "object" && error !== null && "oauthCode" in error
         ? error.oauthCode
         : undefined;
-    if (typeof oauthCode === "string" && oauthCode.toLowerCase() === "invalid_grant") {
-        return true;
+    if (typeof oauthCode === "string") {
+        const normalized = oauthCode.trim().toLowerCase();
+        if (TERMINAL_REFRESH_ERROR_CODES.has(normalized)) {
+            return true;
+        }
     }
     if (error instanceof Error) {
-        return error.message.toLowerCase().includes("invalid_grant");
+        const message = error.message.trim().toLowerCase();
+        if (message.includes("invalid_grant"))
+            return true;
+        if (message.includes("refresh token") && (message.includes("invalid") || message.includes("revoked"))) {
+            return true;
+        }
     }
     return false;
 }
 export async function runOneProactiveRefreshTick(input) {
     const leaseMs = 120_000;
     const processDomain = async (authMode) => {
+        const staleClaimIdentityKeys = new Set();
         while (true) {
             let claimed;
             await saveAuthStorage(input.authPath, (auth) => {
@@ -27,6 +42,8 @@ export async function runOneProactiveRefreshTick(input) {
                     if (!candidate.identityKey || !candidate.refresh || candidate.expires === undefined) {
                         return false;
                     }
+                    if (staleClaimIdentityKeys.has(candidate.identityKey))
+                        return false;
                     if (candidate.expires > dueCutoff)
                         return false;
                     if (typeof candidate.cooldownUntil === "number" && candidate.cooldownUntil > now) {
@@ -43,10 +60,12 @@ export async function runOneProactiveRefreshTick(input) {
                 const refreshToken = account.refresh;
                 if (!identityKey || !refreshToken)
                     return;
-                account.refreshLeaseUntil = now + leaseMs;
+                const leaseUntil = now + leaseMs;
+                account.refreshLeaseUntil = leaseUntil;
                 claimed = {
                     identityKey,
-                    refresh: refreshToken
+                    refresh: refreshToken,
+                    leaseUntil
                 };
             });
             if (!claimed)
@@ -63,6 +82,14 @@ export async function runOneProactiveRefreshTick(input) {
                     const account = domain.accounts.find((candidate) => candidate.identityKey === claimedAccount.identityKey);
                     if (!account)
                         return;
+                    if (account.refreshLeaseUntil !== claimedAccount.leaseUntil ||
+                        account.refresh !== claimedAccount.refresh) {
+                        staleClaimIdentityKeys.add(claimedAccount.identityKey);
+                        if (account.refreshLeaseUntil === claimedAccount.leaseUntil) {
+                            delete account.refreshLeaseUntil;
+                        }
+                        return;
+                    }
                     delete account.refreshLeaseUntil;
                     if (invalidGrant) {
                         account.enabled = false;
@@ -80,20 +107,30 @@ export async function runOneProactiveRefreshTick(input) {
                 const account = domain.accounts.find((candidate) => candidate.identityKey === claimedAccount.identityKey);
                 if (!account)
                     return;
+                if (account.refreshLeaseUntil !== claimedAccount.leaseUntil ||
+                    account.refresh !== claimedAccount.refresh) {
+                    staleClaimIdentityKeys.add(claimedAccount.identityKey);
+                    if (account.refreshLeaseUntil === claimedAccount.leaseUntil) {
+                        delete account.refreshLeaseUntil;
+                    }
+                    return;
+                }
                 if (account.enabled === false) {
                     delete account.refreshLeaseUntil;
                     return;
                 }
                 const now = input.now();
-                if (typeof account.refreshLeaseUntil === "number" && account.refreshLeaseUntil > now) {
-                    account.access = tokens.access;
-                    account.refresh = tokens.refresh;
-                    account.expires = tokens.expires;
-                    delete account.refreshLeaseUntil;
-                    delete account.cooldownUntil;
+                const dueCutoff = now + input.bufferMs;
+                const nextExpires = Number.isFinite(tokens.expires) ? tokens.expires : 0;
+                account.access = tokens.access;
+                account.refresh = tokens.refresh;
+                account.expires = nextExpires;
+                delete account.refreshLeaseUntil;
+                if (nextExpires <= dueCutoff) {
+                    account.cooldownUntil = now + PROACTIVE_REFRESH_FAILURE_COOLDOWN_MS;
                 }
-                else if (typeof account.refreshLeaseUntil === "number") {
-                    delete account.refreshLeaseUntil;
+                else {
+                    delete account.cooldownUntil;
                 }
             });
         }