Fix GET thread goal fallback keying

ndycode · ndycode · commit 6a1a74a29e42 · 2026-05-01T18:14:33.000+08:00
diff --git a/lib/runtime-rotation-proxy.ts b/lib/runtime-rotation-proxy.ts
@@ -336,6 +336,11 @@ function readStringRecordValue(record: Record<string, unknown>, key: string): st
 		: null;
 }
 
+function readStringSearchParam(searchParams: URLSearchParams, key: string): string | null {
+	const value = searchParams.get(key);
+	return value && value.trim().length > 0 ? value.trim() : null;
+}
+
 function resolveSessionKey(headers: Headers, parsedBody: RequestBody | null): string | null {
 	const headerKey =
 		headers.get(OPENAI_HEADERS.SESSION_ID) ??
@@ -404,11 +409,15 @@ function buildThreadGoalRequestContext(
 ): RequestContext {
 	const headers = headersFromIncoming(req);
 	const parsedBody = parseRequestBody(body);
-	const sessionKey = parsedBody
+	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") ??
-			resolveSessionKey(headers, parsedBody))
-		: resolveSessionKey(headers, null);
+			readStringRecordValue(parsedBody, "threadId"))
+		: null;
+	const sessionKey = bodyThreadKey ?? queryThreadKey ?? resolveSessionKey(headers, parsedBody);
 	return {
 		body,
 		headers,
diff --git a/test/runtime-rotation-proxy.test.ts b/test/runtime-rotation-proxy.test.ts
@@ -167,6 +167,21 @@ async function postThreadGoal(
 	});
 }
 
+async function getThreadGoal(
+	proxy: RuntimeRotationProxyServer,
+	path = "/thread/goal/get",
+	headers: Record<string, string> = {},
+): Promise<Response> {
+	return fetch(`${proxy.baseUrl}${path}`, {
+		method: "GET",
+		headers: {
+			authorization: `Bearer ${DEFAULT_CLIENT_API_KEY}`,
+			"x-api-key": "caller-key",
+			...headers,
+		},
+	});
+}
+
 async function postRawResponses(
 	proxy: RuntimeRotationProxyServer,
 	body: string,
@@ -617,6 +632,33 @@ describe("runtime rotation proxy", () => {
 		]);
 	});
 
+	it("keys blocked GET thread goal fallbacks by query thread id", async () => {
+		const now = Date.now();
+		const accountManager = new AccountManager(undefined, createStorage(now));
+		const { calls, fetchImpl } = createRecordingFetch(
+			() =>
+				new Response("<html>blocked</html>", {
+					status: HTTP_STATUS.FORBIDDEN,
+					headers: { "content-type": "text/html" },
+				}),
+		);
+		const proxy = await startProxy({ accountManager, fetchImpl });
+
+		await postThreadGoal(
+			proxy,
+			{ threadId: "thread-1", goal: "ship it" },
+			"/thread/goal/set",
+		);
+		const response = await getThreadGoal(proxy, "/thread/goal/get?thread_id=thread-1");
+
+		expect(response.status).toBe(HTTP_STATUS.OK);
+		expect(await response.json()).toEqual({ goal: "ship it" });
+		expect(calls.map((call) => call.url)).toEqual([
+			"https://example.test/backend-api/codex/thread/goal/set",
+			"https://example.test/backend-api/codex/thread/goal/get?thread_id=thread-1",
+		]);
+	});
+
 	it("rejects unauthenticated model discovery requests", async () => {
 		const now = Date.now();
 		const accountManager = new AccountManager(undefined, createStorage(now));
