mirror of
https://github.com/MBombeck/HealthLog.git
synced 2026-11-14 22:50:51 +00:00
fix(ai): park a Codex sign-in the issuer refused until the next sign-in
A dead refresh token was asked again on every hop of every run: the proactive refresh failed and was swallowed, the request 401'd, the on-401 refresh failed again, and the nightly warm repeated that for the briefing and every card. A refusal that proves the grant dead now flips the connection to the existing expired state (compare-and-set on the refused token, one signal per transition), so the chain, the presence probe and the AI capabilities stop counting it. A new device-code sign-in clears the refused credential's ledger rows so the fresh one resumes in place.
This commit is contained in:
1 parent
5502342ec5
commit
07d70cd275
6 files changed
+437
-11
No files matched your search
@@ -8,6 +8,7 @@ import { prisma } from "@/lib/db";
|
||||
import { auditLog } from "@/lib/auth/audit";
|
||||
import { getClientIp, apiSuccess, apiError } from "@/lib/api-response";
|
||||
import { annotate } from "@/lib/logging/context";
|
||||
import { forgetProviderHealth } from "@/lib/ai/provider-health-ledger";
|
||||
|
||||
/**
|
||||
* Operator-shared central Codex — device-code poll (admin only).
|
||||
@@ -91,6 +92,9 @@ export const POST = apiHandler(async (request: NextRequest) => {
|
||||
});
|
||||
|
||||
cookieStore.delete("central_codex_device");
|
||||
// A new central sign-in: every account's ledger rows describe the refused
|
||||
// one, and the central connection is one credential shared by all of them.
|
||||
await forgetProviderHealth({ providerType: "admin-codex" });
|
||||
|
||||
await auditLog("admin.central-codex.connected", {
|
||||
userId: user.id,
|
||||
|
||||
@@ -9,6 +9,7 @@ import { auditLog } from "@/lib/auth/audit";
|
||||
import { getClientIp, apiSuccess, apiError } from "@/lib/api-response";
|
||||
import { annotate } from "@/lib/logging/context";
|
||||
import { INSIGHTS_CACHE_CLEARED } from "@/lib/insights/cached-text-cipher";
|
||||
import { forgetProviderHealth } from "@/lib/ai/provider-health-ledger";
|
||||
|
||||
/**
|
||||
* v1.4.7.1: Device-code flow polling endpoint.
|
||||
@@ -88,6 +89,9 @@ export const POST = apiHandler(async (request: NextRequest) => {
|
||||
});
|
||||
|
||||
cookieStore.delete("codex_device");
|
||||
// A new sign-in: whatever the ledger held against the old one no longer
|
||||
// describes this credential.
|
||||
await forgetProviderHealth({ userId: user.id, providerType: "codex" });
|
||||
|
||||
await auditLog("codex.oauth.connected", {
|
||||
userId: user.id,
|
||||
|
||||
@@ -266,6 +266,33 @@ export const postgresProviderHealthLedger: ProviderHealthLedger = {
|
||||
},
|
||||
};
|
||||
|
||||
/**
|
||||
* Drop the recorded outcomes of a credential that has just been replaced.
|
||||
*
|
||||
* The ledger describes a credential, not a provider slot: once the person
|
||||
* (or, for `admin-codex`, the operator) signs in again, the `auth_failed`
|
||||
* row of the refused credential would otherwise keep the fresh one at the
|
||||
* tail of the chain and reported as expired for the rest of its cooldown.
|
||||
* Without `userId` the rows of every account are dropped — the operator's
|
||||
* central connection is one credential shared by all of them. Best effort,
|
||||
* like every ledger write.
|
||||
*/
|
||||
export async function forgetProviderHealth(target: {
|
||||
providerType: ProviderChainType;
|
||||
userId?: string;
|
||||
}): Promise<void> {
|
||||
try {
|
||||
await prisma.providerHealth.deleteMany({
|
||||
where: {
|
||||
providerType: target.providerType,
|
||||
...(target.userId ? { userId: target.userId } : {}),
|
||||
},
|
||||
});
|
||||
} catch {
|
||||
// A stale row only deprioritises; it never blocks.
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Providers whose credential is currently known-bad (auth-class failure
|
||||
* inside the cooldown window) for a user. Drives the proactive
|
||||
|
||||
+137
-10
@@ -30,6 +30,7 @@ import {
|
||||
type ProviderWorkAuthority,
|
||||
} from "@/lib/sharing/provider-work-authority";
|
||||
import { memoizePerRequest } from "@/lib/request-cache";
|
||||
import { emitSignal } from "@/lib/logging/signal";
|
||||
import type { AiModality } from "@/lib/ai/capabilities/types";
|
||||
import type {
|
||||
ProviderEntryPresence,
|
||||
@@ -42,6 +43,93 @@ import {
|
||||
|
||||
const TOKEN_REFRESH_BUFFER_MS = 5 * 60 * 1000; // 5 minutes
|
||||
|
||||
/**
|
||||
* Whether a failed Codex refresh proves the sign-in dead: the issuer refused
|
||||
* the grant itself (`CodexRefreshError.credentialExpired`), as opposed to a
|
||||
* 429, a 5xx or a network error, which say nothing about the credential.
|
||||
* Read by shape rather than `instanceof` so a mocked `codex-oauth` module
|
||||
* classifies the same way.
|
||||
*/
|
||||
function isDeadCodexSignIn(error: unknown): boolean {
|
||||
return (
|
||||
(error as { credentialExpired?: unknown } | null)?.credentialExpired ===
|
||||
true
|
||||
);
|
||||
}
|
||||
|
||||
function oauthErrorOf(error: unknown): string | null {
|
||||
const code = (error as { oauthError?: unknown } | null)?.oauthError;
|
||||
return typeof code === "string" ? code : null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Park a Codex connection whose sign-in the issuer has refused for good.
|
||||
*
|
||||
* Retrying a dead refresh token cannot succeed; until this existed every
|
||||
* generation of every card of every run asked the issuer again, failed with
|
||||
* the same 401, and logged it. Parking flips the connection to the existing
|
||||
* `expired` state — the one Settings already renders as "reconnect ChatGPT" —
|
||||
* so the chain, the presence probe and with it every AI capability stop
|
||||
* counting it, and nothing is sent until the person signs in again (the
|
||||
* device-code flow writes `connected`).
|
||||
*
|
||||
* Compare-and-set on the refresh token that was refused: a reconnect that
|
||||
* landed in between wrote a different one and is left alone, and of several
|
||||
* workers failing at once exactly one flips the row, so the transition is
|
||||
* signalled once and never again per run.
|
||||
*/
|
||||
async function parkUserCodex(
|
||||
userId: string,
|
||||
refusedRefreshEncrypted: string,
|
||||
error: unknown,
|
||||
): Promise<void> {
|
||||
try {
|
||||
const parked = await prisma.user.updateMany({
|
||||
where: {
|
||||
id: userId,
|
||||
codexConnectionStatus: "connected",
|
||||
codexRefreshTokenEncrypted: refusedRefreshEncrypted,
|
||||
},
|
||||
data: { codexConnectionStatus: "expired" },
|
||||
});
|
||||
if (parked.count === 1) {
|
||||
emitSignal({
|
||||
action: "ai.credential.expired",
|
||||
level: "warn",
|
||||
meta: { provider: "codex", oauth_error: oauthErrorOf(error) },
|
||||
});
|
||||
}
|
||||
} catch {
|
||||
// Best effort: an unparked connection is retried exactly as before.
|
||||
}
|
||||
}
|
||||
|
||||
/** The operator's central Codex, parked the same way. */
|
||||
async function parkCentralCodex(
|
||||
refusedRefreshEncrypted: string,
|
||||
error: unknown,
|
||||
): Promise<void> {
|
||||
try {
|
||||
const parked = await prisma.appSettings.updateMany({
|
||||
where: {
|
||||
id: "singleton",
|
||||
adminCodexConnectionStatus: "connected",
|
||||
adminCodexRefreshTokenEncrypted: refusedRefreshEncrypted,
|
||||
},
|
||||
data: { adminCodexConnectionStatus: "expired" },
|
||||
});
|
||||
if (parked.count === 1) {
|
||||
emitSignal({
|
||||
action: "ai.credential.expired",
|
||||
level: "warn",
|
||||
meta: { provider: "admin-codex", oauth_error: oauthErrorOf(error) },
|
||||
});
|
||||
}
|
||||
} catch {
|
||||
// Best effort, as above.
|
||||
}
|
||||
}
|
||||
|
||||
class NoProvider implements AIProvider {
|
||||
readonly type = "none" as const;
|
||||
|
||||
@@ -308,9 +396,15 @@ async function resolveCodexProvider(
|
||||
codexTokenExpiresAt: fresh.expiresAt,
|
||||
},
|
||||
});
|
||||
} catch {
|
||||
// Fall through — CodexClient will trigger an on-401 refresh
|
||||
// and persist there.
|
||||
} catch (error) {
|
||||
// A refused grant parks the connection and drops it from this chain:
|
||||
// calling Codex with the expired access token could only 401 into a
|
||||
// second refusal. Anything else falls through — CodexClient will
|
||||
// trigger an on-401 refresh and persist there.
|
||||
if (isDeadCodexSignIn(error)) {
|
||||
await parkUserCodex(userId, user.codexRefreshTokenEncrypted, error);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -336,9 +430,27 @@ async function resolveCodexProvider(
|
||||
refreshEncrypted: freshUser.codexRefreshTokenEncrypted,
|
||||
});
|
||||
if (!decoded) {
|
||||
throw codexReconnectRequired("token storage corrupt");
|
||||
const error = codexReconnectRequired("token storage corrupt");
|
||||
await parkUserCodex(
|
||||
userId,
|
||||
freshUser.codexRefreshTokenEncrypted,
|
||||
error,
|
||||
);
|
||||
throw error;
|
||||
}
|
||||
let fresh;
|
||||
try {
|
||||
fresh = await refreshDeviceTokens(decoded.refreshToken);
|
||||
} catch (error) {
|
||||
if (isDeadCodexSignIn(error)) {
|
||||
await parkUserCodex(
|
||||
userId,
|
||||
freshUser.codexRefreshTokenEncrypted,
|
||||
error,
|
||||
);
|
||||
}
|
||||
throw error;
|
||||
}
|
||||
const fresh = await refreshDeviceTokens(decoded.refreshToken);
|
||||
const enc = encryptCodexCreds(fresh);
|
||||
await prisma.user.update({
|
||||
where: { id: userId },
|
||||
@@ -421,9 +533,14 @@ async function resolveAdminCodexProvider(): Promise<AIProvider | null> {
|
||||
adminCodexTokenExpiresAt: enc.expiresAt,
|
||||
},
|
||||
});
|
||||
} catch {
|
||||
// Fall through — CodexClient triggers an on-401 refresh and persists via
|
||||
// the callback below.
|
||||
} catch (error) {
|
||||
// A refused grant parks the central connection (see `parkUserCodex`);
|
||||
// anything else falls through — CodexClient triggers an on-401 refresh
|
||||
// and persists via the callback below.
|
||||
if (isDeadCodexSignIn(error)) {
|
||||
await parkCentralCodex(settings.adminCodexRefreshTokenEncrypted, error);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -454,9 +571,19 @@ async function resolveAdminCodexProvider(): Promise<AIProvider | null> {
|
||||
expiresAt: fresh.adminCodexTokenExpiresAt,
|
||||
});
|
||||
if (!decoded) {
|
||||
throw codexReconnectRequired("central token storage corrupt");
|
||||
const error = codexReconnectRequired("central token storage corrupt");
|
||||
await parkCentralCodex(fresh.adminCodexRefreshTokenEncrypted, error);
|
||||
throw error;
|
||||
}
|
||||
let refreshed;
|
||||
try {
|
||||
refreshed = await refreshDeviceTokens(decoded.refreshToken);
|
||||
} catch (error) {
|
||||
if (isDeadCodexSignIn(error)) {
|
||||
await parkCentralCodex(fresh.adminCodexRefreshTokenEncrypted, error);
|
||||
}
|
||||
throw error;
|
||||
}
|
||||
const refreshed = await refreshDeviceTokens(decoded.refreshToken);
|
||||
const enc = encryptAdminCodexCreds(refreshed);
|
||||
await prisma.appSettings.update({
|
||||
where: { id: "singleton" },
|
||||
|
||||
@@ -888,7 +888,8 @@ export async function runInsightPregenerate(
|
||||
} else if (generated.credentialExpired) {
|
||||
// v1.42 — a dead sign-in (a Codex refresh token the issuer
|
||||
// revoked) does not heal in 45 minutes either; the person has
|
||||
// to reconnect, and the ledger already tells them so.
|
||||
// to reconnect. The refusal parked the connection as expired,
|
||||
// which Settings shows, and the next run no longer counts it.
|
||||
settle("auth_failed", generated.reason);
|
||||
} else {
|
||||
settle("failed", generated.reason);
|
||||
|
||||
Reference in new issue
Block a user