Skip to content

Commit fa040a0

Browse files
committed
fix(combo): keep diagnostic types out of hard-stop code evidence
1 parent cf4061b commit fa040a0

5 files changed

Lines changed: 103 additions & 3 deletions

File tree

‎src/combos/failover.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -716,7 +716,8 @@ export function codexAccountModelRefusalHardStopCode(status: number, message: st
716716
for (const record of records) {
717717
const error = record.error && typeof record.error === "object" && !Array.isArray(record.error)
718718
? record.error as Record<string, unknown> : undefined;
719-
for (const code of [error?.code, error?.type, record.code]) {
719+
// Diagnostic type is never code evidence, even when a code is absent or malformed.
720+
for (const code of [error?.code, record.code]) {
720721
if (typeof code !== "string") continue;
721722
if (isNonReplayableUpstreamCode(code) || isCyberPolicyCode(code)) return code;
722723
if (normalizedFailureCode(code) === "origin_rejected") return "origin_rejected";

‎structure/providers-and-adapters.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -570,5 +570,5 @@ Known Claude Sonnet and Opus 5.5 base and low/medium/high IDs share a determinis
570570
`src/server/responses/core-options.ts` carries the value to the combo decision. An inspected non-match
571571
remains authoritative. No raw body is retained in that field, serialized into client errors, or logged.
572572
Presence of both `detail` and `error` across the original root and its own non-array `response` record is ambiguous, regardless of values; null counts and deeper quoted objects do not. This is checked before selecting an error carrier.
573-
For complete bounded HTTP errors, the text wrapper selects root `detail`/`error` when present; otherwise it selects the own `response` record for the same exact `detail` or `error.message` match. It never searches another carrier after a nonmatch or descends further. Policy-fallback and direct callers share this wrapper; SSE message parsing disables nested HTTP selection. The same bounded HTTP parser retains allowlisted hard codes from root and response before display truncation. Policy/direct classification inspects full text only without authoritative carrier metadata; SSE never borrows hard codes from quoted message JSON.
573+
For complete bounded HTTP errors, the text wrapper selects root `detail`/`error` when present; otherwise it selects the own `response` record for the same exact `detail` or `error.message` match. It never searches another carrier after a nonmatch or descends further. Policy-fallback and direct callers share this wrapper; SSE message parsing disables nested HTTP selection. The same bounded HTTP parser retains allowlisted dedicated `code` fields from root and response before display truncation; diagnostic `type` is never promoted, including when code is absent or malformed. Policy/direct classification inspects full text only without authoritative carrier metadata; SSE never borrows hard codes from quoted message JSON.
574574
Committed output, cancellation, hard policy refusals and resend limits remain stronger than model fallback.

‎tests/routing/router-combo-failover-classification.test.ts‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
pickComboTarget,
99
targetKey,
1010
} from "../../src/combos";
11-
import { comboFailureCooldownScope, comboFailureDecision } from "../../src/combos/failover";
11+
import { codexAccountModelRefusalHardStopCode, comboFailureCooldownScope, comboFailureDecision } from "../../src/combos/failover";
1212
import { adapterFailureFromMessage, inferHttpStatusFromAdapterMessage } from "../../src/lib/errors";
1313
import type { OcxConfig } from "../../src/types";
1414

@@ -600,3 +600,31 @@ describe("response_format capability refusal, second gateway", () => {
600600
}
601601
});
602602
});
603+
604+
describe("HTTP hard-code evidence excludes diagnostic types", () => {
605+
test("code/type matrix inspects dedicated code fields only at either level", () => {
606+
const codes: Array<[unknown, string | undefined]> = [
607+
["cyber_policy", "cyber_policy"], ["upstream_no_response", "upstream_no_response"],
608+
["origin-rejected", "origin_rejected"], ["unsupported_model", undefined], ["unknown_code", undefined],
609+
["", undefined], [" ", undefined], [undefined, undefined], [null, undefined], [17, undefined], [{}, undefined],
610+
];
611+
for (const nested of [false, true]) {
612+
for (const [code, expected] of codes) {
613+
for (const type of ["cyber_policy", "upstream_no_response", "upstream_reset_replay_refused", "origin_rejected", "invalid_request_error", null, undefined]) {
614+
const record = { error: { code, type, message: "fixture failure" } };
615+
const body = JSON.stringify(nested ? { response: record } : record);
616+
expect(codexAccountModelRefusalHardStopCode(400, body)).toBe(expected);
617+
}
618+
}
619+
}
620+
});
621+
622+
test("a genuine code in another record still wins over a nonhard code and diagnostic type", () => {
623+
const diagnostic = { error: { code: "unsupported_model", type: "cyber_policy", message: "fixture failure" } };
624+
const hard = { code: "upstream_no_response" };
625+
for (const body of [{ ...diagnostic, response: hard }, { ...hard, response: diagnostic }]) {
626+
expect(codexAccountModelRefusalHardStopCode(400, JSON.stringify(body))).toBe("upstream_no_response");
627+
expect(comboFailureDecision(400, JSON.stringify(body))).toBe("stop");
628+
}
629+
});
630+
});

‎tests/routing/routing-policy-fallback.test.ts‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,28 @@ function seedAttempt(logCtx: RequestLogContext, provider: string, model: string)
6161
}
6262

6363
describe("policy candidate fallback", () => {
64+
for (const nested of [false, true]) {
65+
test.each(["cyber_policy", "upstream_no_response", "upstream_reset_replay_refused"])(
66+
`policy preserves explicit model code over diagnostic %s (nested=${nested})`, async type => {
67+
let calls = 0;
68+
const response = await handleResponsesWithPolicyFallback(request(), fixtureConfig(), {} as RequestLogContext, {}, {
69+
runCore: async (req, _config, context, options) => {
70+
calls++;
71+
options.onRequestBodyParsed?.(await req.json());
72+
context.routeDecision = policyTrace();
73+
if (calls !== 1) return Response.json({ status: "completed" });
74+
const record = { error: { code: "unsupported_model", type,
75+
message: nested ? "The 'gpt-6-astra' model is not supported when using Codex with a ChatGPT account."
76+
: "fixture failure" } };
77+
return Response.json(nested ? { response: record } : record, { status: 400 });
78+
},
79+
});
80+
expect(calls).toBe(2);
81+
expect(response.status).toBe(200);
82+
},
83+
);
84+
}
85+
6486
test.each([undefined, "upstream_no_response", "origin_rejected", "cyber_policy"])(
6587
"nested plan refusal preserves policy hard-stop code %s", async code => {
6688
let calls = 0;

‎tests/server/server-combo-plan-model-refusal.test.ts‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ import { afterEach, beforeEach, expect, test } from "bun:test";
22
import { mkdtempSync } from "node:fs";
33
import { tmpdir } from "node:os";
44
import { join } from "node:path";
5+
import { consumeComboFailure } from "../../src/server/responses/core-combo-failure";
6+
import { isNonReplayableResponse } from "../../src/lib/upstream-retry";
57
import { handleResponses } from "../../src/server/responses";
68
import { captureCallerDirectAuth } from "../../src/providers/caller-authorization";
79
import { clearComboSelectionState, clearComboTargetCooldowns } from "../../src/combos";
@@ -295,3 +297,50 @@ test("SSE structured model code does not borrow a hard stop from quoted HTTP JSO
295297
expect(await response.text()).toContain("fallback succeeded");
296298
expect(sends).toEqual([firstModel, secondModel]);
297299
});
300+
301+
for (const nested of [false, true]) {
302+
for (const type of ["cyber_policy", "upstream_no_response", "upstream_closed_before_response", "upstream_reset_replay_refused"]) {
303+
test.each(["fixture failure", refusal])(`HTTP code overrides diagnostic ${type} (nested=${nested}, message=%s)`, async message => {
304+
const record = { error: { code: "unsupported_model", type, message } };
305+
const { response, sends } = await run(nested ? { response: record } : record);
306+
expect(response.status).toBe(200);
307+
await response.text();
308+
expect(sends).toEqual([firstModel, secondModel]);
309+
});
310+
}
311+
}
312+
313+
test("diagnostic type cannot manufacture consumed/serialized codes, retry headers or replay markers", async () => {
314+
for (const nested of [false, true]) {
315+
for (const code of ["unsupported_model", "unknown_code", "", " ", undefined, null, 17, {}]) {
316+
for (const type of ["cyber_policy", "upstream_no_response", "upstream_reset_replay_refused", "origin_rejected"]) {
317+
const record = { error: { code, type, message: "fixture failure" } };
318+
const consumed = await consumeComboFailure(Response.json(nested ? { response: record } : record, { status: 400 }));
319+
expect(consumed.upstreamCode).toBe(typeof code === "string" && code.trim() ? code.trim() : undefined);
320+
expect(consumed.upstreamType).toBe(type);
321+
expect(consumed.nonReplayable).toBeUndefined();
322+
expect(isNonReplayableResponse(consumed.response)).toBe(false);
323+
expect(consumed.response.status).toBe(400);
324+
expect(consumed.response.headers.get("retry-after")).toBeNull();
325+
expect(consumed.response.headers.get("x-should-retry")).toBeNull();
326+
const wire = await consumed.response.json();
327+
expect(wire.error.code).toBe("invalid_request_error");
328+
expect(wire.error.type).toBe("invalid_request_error");
329+
}
330+
}
331+
}
332+
});
333+
334+
test("genuine hard codes retain formatter identity and non-replayable behavior with benign diagnostic types", async () => {
335+
for (const nested of [false, true]) {
336+
for (const code of ["cyber_policy", "upstream_no_response", "upstream_reset_replay_refused"]) {
337+
const record = { error: { code, type: "invalid_request_error", message: "fixture failure" } };
338+
const consumed = await consumeComboFailure(Response.json(nested ? { response: record } : record, { status: 400 }));
339+
expect(consumed.upstreamCode).toBe(code);
340+
expect((await consumed.response.json()).error.code).toBe(code);
341+
expect(consumed.response.status).toBe(code === "upstream_reset_replay_refused" ? 429 : 400);
342+
expect(isNonReplayableResponse(consumed.response)).toBe(code !== "cyber_policy");
343+
expect(consumed.response.headers.get("x-should-retry")).toBe(code === "upstream_reset_replay_refused" ? "false" : null);
344+
}
345+
}
346+
});

0 commit comments

Comments
 (0)