codex-multi-auth 2.1.2 → 2.1.4

package/dist/lib/runtime/config-toml.js

@@ -70,15 +70,39 @@ export function rewriteTopLevelModelProvider(rawConfig) {
         output.push(rewrittenLine);
     return output.join(lineEnding);
 }
-function extractTopLevelModelProviderLine(rawConfig) {
+export function enableTopLevelResponseStorage(rawConfig) {
+    const lineEnding = rawConfig.includes("\r\n") ? "\r\n" : "\n";
+    const lines = rawConfig.length > 0 ? rawConfig.split(/\r?\n/) : [];
+    const output = [];
+    let inTopLevel = true;
+    for (const line of lines) {
+        if (readTomlTableName(line) !== null) {
+            inTopLevel = false;
+            output.push(line);
+            continue;
+        }
+        if (inTopLevel &&
+            /^\s*disable_response_storage\s*=\s*true\s*(?:#.*)?$/i.test(line)) {
+            output.push("disable_response_storage = false");
+            continue;
+        }
+        output.push(line);
+    }
+    return output.join(lineEnding);
+}
+function extractTopLevelLine(rawConfig, key) {
+    const pattern = new RegExp(`^\\s*${key}\\s*=`);
     for (const line of rawConfig.split(/\r?\n/)) {
         if (readTomlTableName(line) !== null)
             return null;
-        if (/^\s*model_provider\s*=/.test(line))
+        if (pattern.test(line))
             return line;
     }
     return null;
 }
+function extractTopLevelModelProviderLine(rawConfig) {
+    return extractTopLevelLine(rawConfig, "model_provider");
+}
 export function restoreTopLevelModelProvider(currentConfig, originalConfig) {
     const lineEnding = currentConfig.includes("\r\n") ? "\r\n" : "\n";
     const originalLine = extractTopLevelModelProviderLine(originalConfig);
@@ -98,6 +122,33 @@ export function restoreTopLevelModelProvider(currentConfig, originalConfig) {
     }
     return output.join(lineEnding);
 }
+export function restoreTopLevelResponseStorage(currentConfig, originalConfig) {
+    const lineEnding = currentConfig.includes("\r\n") ? "\r\n" : "\n";
+    const originalLine = extractTopLevelLine(originalConfig, "disable_response_storage");
+    if (!originalLine)
+        return currentConfig;
+    const lines = currentConfig.length > 0 ? currentConfig.split(/\r?\n/) : [];
+    const output = [];
+    let handled = false;
+    let inTopLevel = true;
+    for (const line of lines) {
+        if (readTomlTableName(line) !== null) {
+            inTopLevel = false;
+            output.push(line);
+            continue;
+        }
+        if (!handled &&
+            inTopLevel &&
+            /^\s*disable_response_storage\s*=/.test(line) &&
+            readTomlTableName(line) === null) {
+            output.push(originalLine);
+            handled = true;
+            continue;
+        }
+        output.push(line);
+    }
+    return output.join(lineEnding);
+}
 export function ensureTomlTrailingNewline(value) {
     return value.replace(/[\r\n]*$/, "\n");
 }
@@ -118,11 +169,13 @@ export function rewriteConfigTomlForRuntimeRotationProvider(rawConfig, baseUrl,
     const lineEnding = rawConfig.includes("\r\n") ? "\r\n" : "\n";
     const withoutOldProvider = removeRuntimeRotationProviderBlock(rawConfig).replace(/[\r\n]*$/, "");
     const withModelProvider = rewriteTopLevelModelProvider(withoutOldProvider).replace(/[\r\n]*$/, "");
+    const withResponseStorage = enableTopLevelResponseStorage(withModelProvider).replace(/[\r\n]*$/, "");
     const providerBlock = createRuntimeRotationProviderBlock(baseUrl, clientApiKey).join(lineEnding);
-    return `${withModelProvider}${lineEnding}${lineEnding}${providerBlock}${lineEnding}`;
+    return `${withResponseStorage}${lineEnding}${lineEnding}${providerBlock}${lineEnding}`;
 }
 export function restoreConfigTomlFromRuntimeRotationProvider(currentConfig, originalConfig) {
     const withoutProvider = removeRuntimeRotationProviderBlock(currentConfig);
-    return ensureTomlTrailingNewline(restoreTopLevelModelProvider(withoutProvider, originalConfig).replace(/[\r\n]*$/, ""));
+    const withResponseStorage = restoreTopLevelResponseStorage(withoutProvider, originalConfig);
+    return ensureTomlTrailingNewline(restoreTopLevelModelProvider(withResponseStorage, originalConfig).replace(/[\r\n]*$/, ""));
 }
 //# sourceMappingURL=config-toml.js.map

package/dist/lib/runtime/config-toml.js.map

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

package/dist/lib/runtime-rotation-proxy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime-rotation-proxy.d.ts","sourceRoot":"","sources":["../../lib/runtime-rotation-proxy.ts"],"names":[],"mappings":"AAGA,OAAO,EACN,cAAc,EAGd,MAAM,eAAe,CAAC;AAiCvB,MAAM,WAAW,0BAA0B;IAC1C,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3B,SAAS,EAAE,MAAM,0BAA0B,CAAC;CAC5C;AAED,MAAM,WAAW,0BAA0B;IAC1C,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;CACpC;AAED,MAAM,WAAW,2BAA2B;IAC3C,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;IACzB,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,8BAA8B,CAAC,EAAE,MAAM,CAAC;IACxC,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAosBD,wBAAsB,yBAAyB,CAC9C,OAAO,EAAE,2BAA2B,GAClC,OAAO,CAAC,0BAA0B,CAAC,CAkcrC"}
+{"version":3,"file":"runtime-rotation-proxy.d.ts","sourceRoot":"","sources":["../../lib/runtime-rotation-proxy.ts"],"names":[],"mappings":"AAGA,OAAO,EACN,cAAc,EAGd,MAAM,eAAe,CAAC;AAkCvB,MAAM,WAAW,0BAA0B;IAC1C,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3B,SAAS,EAAE,MAAM,0BAA0B,CAAC;CAC5C;AAED,MAAM,WAAW,0BAA0B;IAC1C,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;CACpC;AAED,MAAM,WAAW,2BAA2B;IAC3C,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;IACzB,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,8BAA8B,CAAC,EAAE,MAAM,CAAC;IACxC,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAwyBD,wBAAsB,yBAAyB,CAC9C,OAAO,EAAE,2BAA2B,GAClC,OAAO,CAAC,0BAA0B,CAAC,CAkkBrC"}

package/dist/lib/runtime-rotation-proxy.js

@@ -7,6 +7,7 @@ import { getModelFamily } from "./prompts/codex.js";
 import { queuedRefresh } from "./refresh-queue.js";
 import { mutateRuntimeObservabilitySnapshot } from "./runtime/runtime-observability.js";
 import { createRuntimeUsageRecorder, evaluateRuntimePolicy, loadRuntimePolicyState, } from "./policy/runtime-policy.js";
+import { isWorkspaceDisabledError } from "./request/fetch-helpers.js";
 import { SessionAffinityStore } from "./session-affinity.js";
 import { isRecord } from "./utils.js";
 const DEFAULT_HOST = "127.0.0.1";
@@ -14,6 +15,7 @@ const DEFAULT_QUOTA_REMAINING_THRESHOLD = 10;
 const DEFAULT_AUTH_FAILURE_COOLDOWN_MS = 30_000;
 const DEFAULT_MAX_RUNTIME_ACCOUNT_ATTEMPTS = 4;
 const MAX_REQUEST_BODY_BYTES = 64 * 1024 * 1024;
+const MAX_THREAD_GOAL_FALLBACKS = 512;
 const HOP_BY_HOP_HEADERS = new Set([
     "connection",
     "content-length",
@@ -46,12 +48,24 @@ const ALLOWED_MODELS_PATHS = new Set([
     URL_PATHS.MODELS,
     `/v1${URL_PATHS.MODELS}`,
 ]);
+const ALLOWED_THREAD_GOAL_PATHS = new Set([
+    "/thread/goal/get",
+    "/thread/goal/set",
+    "/codex/thread/goal/get",
+    "/codex/thread/goal/set",
+]);
 function isResponsesPath(pathname) {
     return ALLOWED_RESPONSES_PATHS.has(pathname);
 }
 function isModelsPath(pathname) {
     return ALLOWED_MODELS_PATHS.has(pathname);
 }
+function isThreadGoalPath(pathname) {
+    return ALLOWED_THREAD_GOAL_PATHS.has(pathname);
+}
+function normalizeThreadGoalUpstreamPath(pathname) {
+    return pathname.startsWith("/codex/") ? pathname : `/codex${pathname}`;
+}
 function headersFromIncoming(req) {
     const headers = new Headers();
     for (const [key, value] of Object.entries(req.headers)) {
@@ -191,6 +205,33 @@ function readStringRecordValue(record, key) {
         ? value.trim()
         : null;
 }
+function readStringSearchParam(searchParams, key) {
+    const value = searchParams.get(key);
+    return value && value.trim().length > 0 ? value.trim() : null;
+}
+function isThreadGoalFallbackStatus(status) {
+    return status === HTTP_STATUS.FORBIDDEN;
+}
+function setThreadGoalFallback(fallbacks, key, goal) {
+    if (fallbacks.has(key)) {
+        fallbacks.delete(key);
+    }
+    fallbacks.set(key, goal);
+    while (fallbacks.size > MAX_THREAD_GOAL_FALLBACKS) {
+        const oldestKey = fallbacks.keys().next().value;
+        if (typeof oldestKey !== "string")
+            break;
+        fallbacks.delete(oldestKey);
+    }
+}
+function getThreadGoalFallback(fallbacks, key) {
+    if (!fallbacks.has(key))
+        return null;
+    const goal = fallbacks.get(key) ?? null;
+    fallbacks.delete(key);
+    fallbacks.set(key, goal);
+    return goal;
+}
 function resolveSessionKey(headers, parsedBody) {
     const headerKey = headers.get(OPENAI_HEADERS.SESSION_ID) ??
         headers.get(OPENAI_HEADERS.CONVERSATION_ID) ??
@@ -246,6 +287,28 @@ function buildModelsRequestContext(req) {
         sessionKey: null,
     };
 }
+function buildThreadGoalRequestContext(req, body, pathname) {
+    const headers = headersFromIncoming(req);
+    const parsedBody = parseRequestBody(body);
+    const searchParams = new URL(req.url ?? "/", "http://127.0.0.1").searchParams;
+    const queryThreadKey = readStringSearchParam(searchParams, "thread_id") ??
+        readStringSearchParam(searchParams, "threadId");
+    const bodyThreadKey = parsedBody
+        ? (readStringRecordValue(parsedBody, "thread_id") ??
+            readStringRecordValue(parsedBody, "threadId"))
+        : null;
+    const sessionKey = bodyThreadKey ?? queryThreadKey ?? resolveSessionKey(headers, parsedBody);
+    return {
+        body,
+        headers,
+        method: req.method === "GET" ? "GET" : "POST",
+        upstreamPath: normalizeThreadGoalUpstreamPath(pathname),
+        model: null,
+        family: "codex",
+        stream: false,
+        sessionKey,
+    };
+}
 function buildUpstreamUrl(req, upstreamBaseUrl, upstreamPath) {
     const incomingUrl = new URL(req.url ?? "/", "http://127.0.0.1");
     const upstream = new URL(upstreamBaseUrl);
@@ -386,6 +449,29 @@ async function readErrorBody(response) {
         return "";
     }
 }
+function extractErrorCodeFromBody(bodyText) {
+    if (!bodyText.trim())
+        return null;
+    try {
+        const parsed = JSON.parse(bodyText);
+        if (!isRecord(parsed))
+            return null;
+        const directCode = parsed.code;
+        if (typeof directCode === "string" && directCode.trim()) {
+            return directCode.trim();
+        }
+        const maybeError = parsed.error;
+        if (!isRecord(maybeError))
+            return null;
+        const nestedCode = maybeError.code;
+        return typeof nestedCode === "string" && nestedCode.trim()
+            ? nestedCode.trim()
+            : null;
+    }
+    catch {
+        return null;
+    }
+}
 function getQuotaWindowWaitMs(headers, prefix, now) {
     const resetAfterSeconds = Number.parseInt(headers.get(`${prefix}-reset-after-seconds`) ?? "", 10);
     if (Number.isFinite(resetAfterSeconds) && resetAfterSeconds > 0) {
@@ -465,7 +551,7 @@ function writeJson(res, status, payload) {
 function writeMethodOrPathError(res) {
     writeJson(res, 404, {
         error: {
-            message: "Runtime rotation proxy only accepts Responses API and model discovery requests.",
+            message: "Runtime rotation proxy only accepts Responses API, model discovery, and Codex thread goal requests.",
             code: "runtime_rotation_proxy_not_found",
         },
     });
@@ -593,13 +679,16 @@ export async function startRuntimeRotationProxy(options) {
         lastAccountId: null,
         lastAccountUpdatedAt: null,
     };
+    const threadGoalFallbacks = new Map();
     const handleRequest = async (req, res) => {
         let usageRecorder = null;
         try {
             const incomingUrl = new URL(req.url ?? "/", "http://127.0.0.1");
             const isResponsesRequest = req.method === "POST" && isResponsesPath(incomingUrl.pathname);
             const isModelsRequest = req.method === "GET" && isModelsPath(incomingUrl.pathname);
-            if (!isResponsesRequest && !isModelsRequest) {
+            const isThreadGoalRequest = (req.method === "GET" || req.method === "POST") &&
+                isThreadGoalPath(incomingUrl.pathname);
+            if (!isResponsesRequest && !isModelsRequest && !isThreadGoalRequest) {
                 writeMethodOrPathError(res);
                 return;
             }
@@ -609,9 +698,14 @@ export async function startRuntimeRotationProxy(options) {
                 return;
             }
             status.totalRequests += 1;
+            const requestBody = isResponsesRequest || (isThreadGoalRequest && req.method === "POST")
+                ? await readRequestBody(req, maxRequestBodyBytes)
+                : Buffer.alloc(0);
             const context = isModelsRequest
                 ? buildModelsRequestContext(req)
-                : buildResponsesRequestContext(req, await readRequestBody(req, maxRequestBodyBytes));
+                : isThreadGoalRequest
+                    ? buildThreadGoalRequestContext(req, requestBody, incomingUrl.pathname)
+                    : buildResponsesRequestContext(req, requestBody);
             const requestStartedAt = now();
             let policyDecision = null;
             let projectKey = null;
@@ -632,7 +726,11 @@ export async function startRuntimeRotationProxy(options) {
             }
             usageRecorder = createRuntimeUsageRecorder({
                 source: "runtime-proxy",
-                operation: isModelsRequest ? "models" : "responses",
+                operation: isModelsRequest
+                    ? "models"
+                    : isThreadGoalRequest
+                        ? "thread-goal"
+                        : "responses",
                 model: context.model,
                 projectKey,
                 requestId: context.sessionKey,
@@ -670,8 +768,12 @@ export async function startRuntimeRotationProxy(options) {
             const upstreamUrl = buildUpstreamUrl(req, upstreamBaseUrl, context.upstreamPath);
             const attemptedIndexes = new Set();
             let exhaustionReason = "no-account";
-            const accountAttemptLimit = Math.max(1, Math.min(accountManager.getAccountCount(), maxRuntimeAccountAttempts));
-            while (attemptedIndexes.size < accountAttemptLimit) {
+            const accountCount = accountManager.getAccountCount();
+            const transientAttemptLimit = Math.max(1, Math.min(accountCount, maxRuntimeAccountAttempts));
+            let transientAttempts = 0;
+            let transientExhaustionReason = null;
+            while (attemptedIndexes.size < accountCount &&
+                transientAttempts < transientAttemptLimit) {
                 const selected = chooseAccount({
                     accountManager,
                     sessionAffinityStore,
@@ -702,6 +804,8 @@ export async function startRuntimeRotationProxy(options) {
                     exhaustionReason = "auth-failure";
                     if (!refreshed.retryable)
                         continue;
+                    transientAttempts += 1;
+                    transientExhaustionReason = "auth-failure";
                     status.retries += 1;
                     status.rotations += 1;
                     continue;
@@ -712,6 +816,8 @@ export async function startRuntimeRotationProxy(options) {
                     accountManager.recordFailure(refreshed.account, context.family, context.model);
                     accountManager.markAccountCoolingDown(refreshed.account, DEFAULT_AUTH_FAILURE_COOLDOWN_MS, "auth-failure");
                     exhaustionReason = "auth-failure";
+                    transientAttempts += 1;
+                    transientExhaustionReason = "auth-failure";
                     status.retries += 1;
                     status.rotations += 1;
                     continue;
@@ -740,6 +846,8 @@ export async function startRuntimeRotationProxy(options) {
                     accountManager.markAccountCoolingDown(refreshed.account, networkErrorCooldownMs, "network-error");
                     accountManager.saveToDiskDebounced();
                     exhaustionReason = "network-error";
+                    transientAttempts += 1;
+                    transientExhaustionReason = "network-error";
                     status.retries += 1;
                     status.rotations += 1;
                     continue;
@@ -755,10 +863,75 @@ export async function startRuntimeRotationProxy(options) {
                     accountManager.markRateLimitedWithReason(refreshed.account, retryAfterMs, context.family, "quota", context.model);
                     accountManager.saveToDiskDebounced();
                     exhaustionReason = "rate-limit";
+                    transientAttempts += 1;
+                    transientExhaustionReason = "rate-limit";
                     status.retries += 1;
                     status.rotations += 1;
                     continue;
                 }
+                if (upstream.status === 402 || upstream.status === HTTP_STATUS.FORBIDDEN) {
+                    const bodyText = await readErrorBody(upstream);
+                    const errorCode = extractErrorCodeFromBody(bodyText);
+                    if (isWorkspaceDisabledError(upstream.status, errorCode, bodyText)) {
+                        const accountWasEnabled = accountManager.getAccountByIndex(refreshed.account.index)?.enabled !==
+                            false;
+                        accountManager.refundToken(refreshed.account, context.family, context.model);
+                        if (accountWasEnabled) {
+                            accountManager.recordFailure(refreshed.account, context.family, context.model);
+                            accountManager.setAccountEnabled(refreshed.account.index, false);
+                            accountManager.saveToDiskDebounced();
+                        }
+                        sessionAffinityStore?.forgetSession(context.sessionKey);
+                        exhaustionReason = "deactivated";
+                        status.retries += 1;
+                        status.rotations += 1;
+                        continue;
+                    }
+                    if (isThreadGoalRequest && isThreadGoalFallbackStatus(upstream.status)) {
+                        const parsedGoalBody = parseRequestBody(context.body);
+                        const fallbackKey = context.sessionKey;
+                        const goal = typeof parsedGoalBody?.goal === "string" ? parsedGoalBody.goal : null;
+                        if (!fallbackKey) {
+                            await usageRecorder.record({
+                                outcome: "failure",
+                                statusCode: HTTP_STATUS.BAD_REQUEST,
+                                errorCode: "thread_goal_session_key_required",
+                                account: refreshed.account,
+                            });
+                            writeJson(res, HTTP_STATUS.BAD_REQUEST, {
+                                error: {
+                                    message: "Thread goal fallback requires a thread_id, threadId, or session header.",
+                                    code: "thread_goal_session_key_required",
+                                },
+                            });
+                            return;
+                        }
+                        await usageRecorder.record({
+                            outcome: "failure",
+                            statusCode: upstream.status,
+                            errorCode: "thread_goal_upstream_blocked",
+                            account: refreshed.account,
+                        });
+                        if (context.upstreamPath.endsWith("/set")) {
+                            setThreadGoalFallback(threadGoalFallbacks, fallbackKey, goal);
+                            writeJson(res, HTTP_STATUS.OK, { ok: true, goal });
+                            return;
+                        }
+                        writeJson(res, HTTP_STATUS.OK, {
+                            goal: getThreadGoalFallback(threadGoalFallbacks, fallbackKey),
+                        });
+                        return;
+                    }
+                    res.writeHead(upstream.status, responseHeadersForClient(upstream.headers));
+                    res.end(bodyText);
+                    await usageRecorder.record({
+                        outcome: "failure",
+                        statusCode: upstream.status,
+                        errorCode,
+                        account: refreshed.account,
+                    });
+                    return;
+                }
                 if (upstream.status === HTTP_STATUS.UNAUTHORIZED) {
                     await readErrorBody(upstream);
                     accountManager.refundToken(refreshed.account, context.family, context.model);
@@ -766,6 +939,8 @@ export async function startRuntimeRotationProxy(options) {
                     accountManager.markAccountCoolingDown(refreshed.account, DEFAULT_AUTH_FAILURE_COOLDOWN_MS, "auth-failure");
                     accountManager.saveToDiskDebounced();
                     exhaustionReason = "auth-failure";
+                    transientAttempts += 1;
+                    transientExhaustionReason = "auth-failure";
                     status.retries += 1;
                     status.rotations += 1;
                     continue;
@@ -777,10 +952,22 @@ export async function startRuntimeRotationProxy(options) {
                     accountManager.markAccountCoolingDown(refreshed.account, serverErrorCooldownMs, "server-error");
                     accountManager.saveToDiskDebounced();
                     exhaustionReason = "server-error";
+                    transientAttempts += 1;
+                    transientExhaustionReason = "server-error";
                     status.retries += 1;
                     status.rotations += 1;
                     continue;
                 }
+                if (isThreadGoalRequest && upstream.status >= 400) {
+                    const forwarded = await forwardStreamingResponse(upstream, res, status, () => undefined, streamStallTimeoutMs);
+                    await usageRecorder.record({
+                        outcome: "failure",
+                        statusCode: upstream.status,
+                        errorCode: forwarded ? "thread_goal_upstream_error" : "stream_forward_failed",
+                        account: refreshed.account,
+                    });
+                    return;
+                }
                 accountManager.recordSuccess(refreshed.account, context.family, context.model);
                 const nearExhaustionWaitMs = getQuotaNearExhaustionWaitMs(upstream.headers, quotaRemainingPercentThreshold, now());
                 if (nearExhaustionWaitMs > 0) {
@@ -806,10 +993,14 @@ export async function startRuntimeRotationProxy(options) {
                 });
                 return;
             }
-            if (attemptedIndexes.size >= accountAttemptLimit &&
-                accountAttemptLimit < accountManager.getAccountCount()) {
+            if (transientAttempts >= transientAttemptLimit &&
+                attemptedIndexes.size < accountCount) {
                 exhaustionReason = "budget";
             }
+            else if (exhaustionReason === "deactivated" &&
+                transientExhaustionReason) {
+                exhaustionReason = transientExhaustionReason;
+            }
             await usageRecorder?.record({
                 outcome: "failure",
                 statusCode: normalizeExhaustionStatus(exhaustionReason),