Skip to content

fix(resilience): session affinity wins over reset-aware re-scoring for codex (#5903) #5943

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
diegosouzapw merged 1 commit into from
Jul 2, 2026
Merged

fix(resilience): session affinity wins over reset-aware re-scoring for codex (#5903) #5943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
113 changes: 30 additions & 83 deletions src/sse/services/auth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@ import {
updateProviderConnection,
getSettings,
getCachedSettings,
getSessionAccountAffinity,
upsertSessionAccountAffinity,
touchSessionAccountAffinity,
deleteSessionAccountAffinity,
} from "@/lib/localDb";
import {
DEFAULT_QUOTA_THRESHOLD_PERCENT,
Expand Down Expand Up @@ -60,6 +56,12 @@ import {
WEB_COOKIE_PROVIDERS,
} from "@/shared/constants/providers";
import { isModelExcludedByConnection } from "@/domain/connectionModelRules";
import {
applySessionAffinityPin,
formatSessionKeyForLog,
resolveSessionAffinityTtlMs,
selectSessionAffinityConnection,
} from "./sessionAffinityPin";
import { isNoAuthProviderBlockedBySettings } from "./noAuthProviderSettings";
import { resolveAccountProxiesFromRegistry } from "./noAuthProxyResolution";
import * as log from "../utils/logger";
Expand Down Expand Up @@ -304,10 +306,6 @@ export function extractSessionAffinityKey(
return `input:sha256:${createHash("sha256").update(inputText.slice(0, 4096)).digest("hex")}`;
}

function formatSessionKeyForLog(sessionKey: string): string {
return `${sessionKey.slice(0, 18)}...`;
}

function getCodexLimitPolicy(providerSpecificData: JsonRecord): {
use5h: boolean;
useWeekly: boolean;
Expand Down Expand Up @@ -713,69 +711,6 @@ function compareP2CConnections(
return a.id.localeCompare(b.id);
}

function compareLruConnections(a: ProviderConnectionView, b: ProviderConnectionView): number {
if (!a.lastUsedAt && !b.lastUsedAt) return (a.priority || 999) - (b.priority || 999);
if (!a.lastUsedAt) return -1;
if (!b.lastUsedAt) return 1;
const recencyDelta = new Date(a.lastUsedAt).getTime() - new Date(b.lastUsedAt).getTime();
if (recencyDelta !== 0) return recencyDelta;
if ((a.consecutiveUseCount || 0) !== (b.consecutiveUseCount || 0)) {
return (a.consecutiveUseCount || 0) - (b.consecutiveUseCount || 0);
}
return (a.priority || 999) - (b.priority || 999);
}

async function selectSessionAffinityConnection(
provider: string,
sessionKey: string | null | undefined,
connections: ProviderConnectionView[],
ttlMs = 0
): Promise<ProviderConnectionView | null> {
if (!sessionKey || connections.length === 0 || ttlMs <= 0) return null;

const existing = getSessionAccountAffinity(sessionKey, provider, ttlMs);
if (existing) {
const connection = connections.find((candidate) => candidate.id === existing.connectionId);
if (connection) {
touchSessionAccountAffinity(sessionKey, provider, Date.now(), ttlMs);
await updateProviderConnection(connection.id, {
lastUsedAt: new Date().toISOString(),
consecutiveUseCount: (connection.consecutiveUseCount || 0) + 1,
});
log.info(
"AUTH",
`session_key=${formatSessionKeyForLog(sessionKey)} -> connection ${connection.id.slice(
0,
8
)} (affinity)`
);
return connection;
}

deleteSessionAccountAffinity(sessionKey, provider);
log.info(
"AUTH",
`affinity cleared for session_key=${formatSessionKeyForLog(sessionKey)} provider=${provider}`
);
}

const connection = [...connections].sort(compareLruConnections)[0] ?? null;
if (!connection) return null;

upsertSessionAccountAffinity(sessionKey, provider, connection.id, Date.now(), ttlMs);
await updateProviderConnection(connection.id, {
lastUsedAt: new Date().toISOString(),
consecutiveUseCount: 1,
});
log.info(
"AUTH",
`new affinity created for session_key=${formatSessionKeyForLog(
sessionKey
)} -> connection ${connection.id.slice(0, 8)}`
);
return connection;
}

/**
* Sentinel connection id used for the synthetic credentials of no-auth /
* keyless providers. It is NOT a real DB row, so it
Expand Down Expand Up @@ -1083,7 +1018,7 @@ export async function getProviderCredentials(
const allowRateLimitedConnections =
allowSuppressedConnections || options.allowRateLimitedConnections === true;
const bypassQuotaPolicy = options.bypassQuotaPolicy === true;
const forcedConnectionId =
let forcedConnectionId =
typeof options.forcedConnectionId === "string" && options.forcedConnectionId.trim().length > 0
? options.forcedConnectionId.trim()
: null;
Expand All @@ -1092,6 +1027,11 @@ export async function getProviderCredentials(
options.excludeConnectionIds
);

// Fetched early so the session-affinity-pin override (#5903) can consult
// the TTL before forcedConnectionId narrows the connection pool.
const settings = await getSettings();

@gemini-code-assist gemini-code-assist Bot Jul 2, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

Using getSettings() performs a direct database query on every credential retrieval request, which can become a performance bottleneck under high load. Since getCachedSettings() is already imported and available, we should use it here to retrieve the settings from the in-memory cache instead.

Suggested change
const settings = await getSettings();
const settings = await getCachedSettings();

const sessionAffinityTtlMs = resolveSessionAffinityTtlMs(provider, options, settings);

// Fix #922: Check for aliases (nvidia/nvidia_nim) to ensure credentials are found
const providersToSearch = await getProviderSearchPool(provider);
const connectionResults = await Promise.all(
Expand All @@ -1106,6 +1046,24 @@ export async function getProviderCredentials(
if (allowedConnections && allowedConnections.length > 0) {
connections = connections.filter((conn) => allowedConnections.includes(conn.id));
}

// #5903: an active session-affinity pin outranks a per-request reset-aware
// forcedConnectionId (see sessionAffinityPin leaf for the full rationale).
forcedConnectionId =
applySessionAffinityPin({
forcedConnectionId,
options,
sessionAffinityTtlMs,
connections,
provider,
requestedModel,
excludedConnectionIds,
isTerminalConnectionStatus,
isCodexScopeUnavailable,
isQuotaPolicyBlocked: (c) =>
evaluateQuotaLimitPolicy(provider, c as ProviderConnectionView, requestedModel).blocked,
}) ?? forcedConnectionId;

if (forcedConnectionId) {
connections = connections.filter((conn) => conn.id === forcedConnectionId);
}
Expand Down Expand Up @@ -1483,18 +1441,7 @@ export async function getProviderCredentials(

const orderedConnections = withQuota;

const settings = await getSettings();
const strategy = settings.fallbackStrategy || "fill-first";
const sessionAffinityTtlMs =
provider === "codex"
? Number.isFinite(Number(options.sessionAffinityTtlMs)) &&
Number(options.sessionAffinityTtlMs) > 0
? Number(options.sessionAffinityTtlMs)
: Number.isFinite(Number(settings.codexSessionAffinityTtlMs)) &&
Number(settings.codexSessionAffinityTtlMs) > 0
? Number(settings.codexSessionAffinityTtlMs)
: 0
: 0;

let connection;
const affinityConnection = await selectSessionAffinityConnection(
Expand Down
Loading
Loading