Resolve PR body follow-up findings

Author: ndycode

lib/runtime-rotation-proxy.ts

@@ -109,6 +109,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",
@@ -345,6 +346,33 @@ function isThreadGoalFallbackStatus(status: number): boolean {
 	return status === HTTP_STATUS.FORBIDDEN;
 }
 
+function setThreadGoalFallback(
+	fallbacks: Map<string, string | null>,
+	key: string,
+	goal: string | null,
+): void {
+	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: Map<string, string | null>,
+	key: string,
+): string | null {
+	if (!fallbacks.has(key)) return null;
+	const goal = fallbacks.get(key) ?? null;
+	fallbacks.delete(key);
+	fallbacks.set(key, goal);
+	return goal;
+}
+
 function resolveSessionKey(headers: Headers, parsedBody: RequestBody | null): string | null {
 	const headerKey =
 		headers.get(OPENAI_HEADERS.SESSION_ID) ??
@@ -942,7 +970,7 @@ export async function startRuntimeRotationProxy(
 				operation: isModelsRequest
 					? "models"
 					: isThreadGoalRequest
-						? "responses"
+						? "thread-goal"
 						: "responses",
 				model: context.model,
 				projectKey,
@@ -1169,12 +1197,12 @@ export async function startRuntimeRotationProxy(
 						account: refreshed.account,
 					});
 					if (context.upstreamPath.endsWith("/set")) {
-						threadGoalFallbacks.set(fallbackKey, goal);
+						setThreadGoalFallback(threadGoalFallbacks, fallbackKey, goal);
 						writeJson(res, HTTP_STATUS.OK, { ok: true, goal });
 						return;
 					}
 					writeJson(res, HTTP_STATUS.OK, {
-						goal: threadGoalFallbacks.get(fallbackKey) ?? null,
+						goal: getThreadGoalFallback(threadGoalFallbacks, fallbackKey),
 					});
 					return;
 				}

lib/usage/ledger.ts

@@ -40,6 +40,7 @@ const VALID_SOURCES = new Set<UsageLedgerSource>([
 const VALID_OPERATIONS = new Set<UsageLedgerOperation>([
 	"responses",
 	"models",
+	"thread-goal",
 	"auth-refresh",
 	"diagnostic",
 	"unknown",

lib/usage/redaction.ts

@@ -20,6 +20,7 @@ const VALID_SOURCES = new Set<UsageLedgerSource>([
 const VALID_OPERATIONS = new Set<UsageLedgerOperation>([
 	"responses",
 	"models",
+	"thread-goal",
 	"auth-refresh",
 	"diagnostic",
 	"unknown",

lib/usage/types.ts

@@ -8,6 +8,7 @@ export type UsageLedgerSource =
 export type UsageLedgerOperation =
 	| "responses"
 	| "models"
+	| "thread-goal"
 	| "auth-refresh"
 	| "diagnostic"
 	| "unknown";

scripts/codex.js

@@ -2886,8 +2886,7 @@ async function createRuntimeRotationAppHelperContext(
 
 	const cleanup = async ({ exitCode } = {}) => {
 		const livedMs = Date.now() - startedAt;
-		const exitedSuccessfully = exitCode === 0 || exitCode === null || exitCode === undefined;
-		if (exitedSuccessfully && (options.detachOnExit === true || livedMs < detachGraceMs)) {
+		if (exitCode === 0 && (options.detachOnExit === true || livedMs < detachGraceMs)) {
 			helper.stdout?.destroy();
 			helper.stderr?.destroy();
 			helper.unref();

test/runtime-policy.test.ts

@@ -165,4 +165,54 @@ describe("runtime policy", () => {
 		});
 		expect(recorder.hasRecorded()).toBe(true);
 	});
+
+	it("records thread goal usage as a distinct operation", async () => {
+		const append = vi.fn<typeof appendUsageLedgerRow>().mockResolvedValue({
+			version: 1,
+			id: "row-1",
+			createdAt: 100,
+			source: "runtime-proxy",
+			operation: "thread-goal",
+			outcome: "failure",
+			model: null,
+			projectKey: "project-a",
+			account: null,
+			requestId: "thread-1",
+			statusCode: 403,
+			errorCode: "thread_goal_upstream_blocked",
+			durationMs: 0,
+			tokens: {
+				inputTokens: 0,
+				outputTokens: 0,
+				cachedInputTokens: 0,
+				reasoningTokens: 0,
+				totalTokens: 0,
+			},
+			costUsd: 0,
+		});
+		const recorder = createRuntimeUsageRecorder({
+			source: "runtime-proxy",
+			operation: "thread-goal",
+			model: null,
+			projectKey: "project-a",
+			requestId: "thread-1",
+			startedAt: 100,
+			append,
+		});
+
+		await recorder.record({
+			outcome: "failure",
+			statusCode: 403,
+			errorCode: "thread_goal_upstream_blocked",
+		});
+
+		expect(append.mock.calls[0]?.[0]).toMatchObject({
+			source: "runtime-proxy",
+			operation: "thread-goal",
+			outcome: "failure",
+			requestId: "thread-1",
+			statusCode: 403,
+			errorCode: "thread_goal_upstream_blocked",
+		});
+	});
 });

test/runtime-rotation-proxy.test.ts

@@ -765,6 +765,42 @@ describe("runtime rotation proxy", () => {
 		).toHaveLength(2);
 	});
 
+	it("evicts oldest local thread goal fallbacks when capacity is exceeded", async () => {
+		const now = Date.now();
+		const accountManager = new AccountManager(undefined, createStorage(now, 600));
+		const { fetchImpl } = createRecordingFetch(
+			() =>
+				new Response("<html>blocked</html>", {
+					status: HTTP_STATUS.FORBIDDEN,
+					headers: { "content-type": "text/html" },
+				}),
+		);
+		const proxy = await startProxy({ accountManager, fetchImpl });
+
+		for (let index = 0; index < 513; index += 1) {
+			const response = await postThreadGoal(
+				proxy,
+				{ threadId: `thread-${index}`, goal: `goal-${index}` },
+				"/thread/goal/set",
+			);
+			expect(response.status).toBe(HTTP_STATUS.OK);
+		}
+
+		const evicted = await postThreadGoal(
+			proxy,
+			{ threadId: "thread-0" },
+			"/thread/goal/get",
+		);
+		const retained = await postThreadGoal(
+			proxy,
+			{ threadId: "thread-512" },
+			"/thread/goal/get",
+		);
+
+		expect(await evicted.json()).toEqual({ goal: null });
+		expect(await retained.json()).toEqual({ goal: "goal-512" });
+	});
+
 	it("rejects unauthenticated model discovery requests", async () => {
 		const now = Date.now();
 		const accountManager = new AccountManager(undefined, createStorage(now));