Skip to content

Commit b060249

Browse files
olddonkeyclaude
andcommitted
fix(chat): apply the Fast capability gate to the native passthrough
The native /v1/chat/completions passthrough decided service-tier forwarding with a single provider-level check: if (provider.chatServiceTier && rawBody.service_tier !== undefined) That bypassed the FastWire policy layer entirely, and the worst consequence was not the one A0 recorded. An explicit supportsServiceTier: false — the fail-closed declaration meaning "this upstream is documented not to accept the field" — was ignored here, so a caller tier still reached that upstream whenever chatServiceTier happened to be true. Exact-model false was likewise ignored (the bug A0 locked), and B1's split between capability-authorized canonical Fast and CallerTierForward-authorized foreign tiers never reached this surface. Both Chat surfaces now call one shared gate, so they cannot drift apart by construction rather than by convention. The passthrough resolves its policy in chat-native.ts, where the route and config already live, and the key-rotation rebuild path resolves it too. What deliberately still differs: the Responses surface normalizes a caller's "fast" spelling to the provider's canonical wire value, while the passthrough forwards the caller's exact bytes. That is this builder's documented contract — caller fields retain their exact wire representation while capability gates stay centralized — and the difference is now asserted by a test and explained at the call site, so a future reader does not mistake it for a missed translation. Known gap, left for its own unit: the passthrough neither runs through the adapter registry decorator nor calls recordAdapterTier, so it produces no AttemptTierOutcome and a stripped tier is not yet visible as callerTierDropped. Building half of that pipeline here would have been worse than naming it. Full suite: 13332 pass / 10 skip / 2 fail — the pre-existing dev-side key-login-live-update regression, and one load-sensitive codex-shim timeout that passes in isolation (69 pass). Co-Authored-By: Claude Fable 5 <[email protected]>
1 parent bcc77c0 commit b060249

5 files changed

Lines changed: 280 additions & 22 deletions

File tree

‎src/adapters/openai-chat.ts‎

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import {
1919
import {
2020
canonicalFastTierMarker,
2121
createAdapterTierMetadata,
22+
type ResolvedFastPolicy,
2223
} from "../providers/fastwire";
2324
import { openaiChatCompletionsUrl } from "./openai-chat-url";
2425
import { stripResponsesOnlyEncryptedMarker } from "./responses-tool-schema";
@@ -95,6 +96,7 @@ export function buildOpenAIChatPassthroughRequest(
9596
rawBody: Record<string, unknown>,
9697
modelId: string,
9798
stream: boolean,
99+
fastPolicy: ResolvedFastPolicy,
98100
): AdapterRequest {
99101
const { url, headers, hasCredential } = openAIChatTransport(provider);
100102

@@ -118,7 +120,10 @@ export function buildOpenAIChatPassthroughRequest(
118120
}
119121
if (modelInList(provider.noStructuredOutputModels, modelId)) delete body.response_format;
120122

121-
if (provider.chatServiceTier && rawBody.service_tier !== undefined) {
123+
// Share the ordinary openai-chat adapter's capability gate, while preserving the
124+
// caller's exact wire representation promised by this passthrough contract. The
125+
// Responses surface may normalize canonical Fast spelling; this difference is intentional.
126+
if (canSerializeOpenAIChatServiceTier(provider, modelId, rawBody.service_tier, undefined, fastPolicy)) {
122127
body.service_tier = rawBody.service_tier;
123128
}
124129
if (provider.promptCacheKey && rawBody.prompt_cache_key !== undefined) {
@@ -1280,6 +1285,26 @@ function thinkingBudgetForEffort(parsed: OcxParsedRequest, reasoningEffort: stri
12801285
return fraction === undefined ? undefined : Math.max(1, Math.floor(maxBudget * fraction));
12811286
}
12821287

1288+
function canSerializeOpenAIChatServiceTier(
1289+
provider: OcxProviderConfig,
1290+
modelId: string,
1291+
serviceTier: unknown,
1292+
tierDecision?: OcxParsedRequest["options"]["tierDecision"],
1293+
resolvedPolicy?: Pick<ResolvedFastPolicy, "capability">,
1294+
): boolean {
1295+
if (serviceTier === undefined) return false;
1296+
if (tierDecision !== undefined) {
1297+
return tierDecision.kind === "set" || tierDecision.kind === "forward-caller";
1298+
}
1299+
const callerTier = typeof serviceTier === "string" ? serviceTier : undefined;
1300+
const callerCanonicalFast = canonicalFastTierMarker(callerTier) !== undefined;
1301+
const capability = resolvedPolicy === undefined
1302+
? supportsServiceTierForModel(provider, modelId)
1303+
: resolvedPolicy.capability;
1304+
const callerTierForwardAllowed = canForwardForeignServiceTierForChatModel(provider, modelId);
1305+
return callerTierForwardAllowed || (callerCanonicalFast && capability === true);
1306+
}
1307+
12831308
export function createOpenAIChatAdapter(provider: OcxProviderConfig): ProviderAdapter {
12841309
return {
12851310
name: "openai-chat",
@@ -1302,13 +1327,12 @@ export function createOpenAIChatAdapter(provider: OcxProviderConfig): ProviderAd
13021327
// unclassified Chat routes remain behind the caller-forwarding opt-in.
13031328
const serviceTier = parsed.options.serviceTier;
13041329
const tierDecision = parsed.options.tierDecision;
1305-
const callerCanonicalFast = canonicalFastTierMarker(serviceTier) !== undefined;
1306-
const callerTierForwardAllowed = canForwardForeignServiceTierForChatModel(provider, parsed.modelId);
1307-
const canonicalFastCapability = callerCanonicalFast
1308-
&& supportsServiceTierForModel(provider, parsed.modelId) === true;
1309-
const canSerializeServiceTier = tierDecision?.kind === "set"
1310-
|| tierDecision?.kind === "forward-caller"
1311-
|| (tierDecision === undefined && (callerTierForwardAllowed || canonicalFastCapability));
1330+
const canSerializeServiceTier = canSerializeOpenAIChatServiceTier(
1331+
provider,
1332+
parsed.modelId,
1333+
serviceTier,
1334+
tierDecision,
1335+
);
13121336
if (canSerializeServiceTier && serviceTier !== undefined) {
13131337
body.service_tier = serviceTier;
13141338
}

‎src/server/chat-native.ts‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import {
2727
rateLimitRetryPolicyFor,
2828
rotateProviderTransportOn429,
2929
} from "../providers/key-failover";
30+
import { fastPolicyForModel } from "../providers/service-tier";
3031
import type { RouteResult } from "../router";
3132
import type { OcxConfig, OcxProviderConfig } from "../types";
3233
import { fetchWithHeaderTimeout, providerFetch, safeHostLabel } from "./responses/fetch-helpers";
@@ -154,8 +155,15 @@ export async function handleNativeChatCompletions(options: HandleNativeChatOptio
154155
translatorBudget.chargeRetained(bytes, { kind: "request_copies" });
155156
retainedRequestBytes = bytes;
156157
};
158+
const buildActiveRequest = () => buildOpenAIChatPassthroughRequest(
159+
activeProvider,
160+
options.chatBody,
161+
route.modelId,
162+
requestedStream,
163+
fastPolicyForModel(activeProvider, route.modelId, route.providerName, "chat"),
164+
);
157165
try {
158-
activeRequest = buildOpenAIChatPassthroughRequest(activeProvider, options.chatBody, route.modelId, requestedStream);
166+
activeRequest = buildActiveRequest();
159167
retainRequest(activeRequest);
160168
} catch (error) {
161169
releaseRetainedRequest();
@@ -222,7 +230,7 @@ export async function handleNativeChatCompletions(options: HandleNativeChatOptio
222230
activeProvider = rotated;
223231
activeAdapter = createOpenAIChatAdapter(activeProvider);
224232
releaseRetainedRequest();
225-
activeRequest = buildOpenAIChatPassthroughRequest(activeProvider, options.chatBody, route.modelId, requestedStream);
233+
activeRequest = buildActiveRequest();
226234
retainRequest(activeRequest);
227235
response = await send(activeRequest, "key-429");
228236
}

‎tests/fastwire-characterization-wire.test.ts‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { afterEach, describe, expect, spyOn, test } from "bun:test";
22
import { buildOpenAIChatPassthroughRequest } from "../src/adapters/openai-chat";
33
import { chatCompletionsToResponsesBody } from "../src/chat/inbound";
4+
import { fastPolicyForModel } from "../src/providers/service-tier";
45
import * as adapterResolveModule from "../src/server/adapter-resolve";
56
import type { RequestLogContext } from "../src/server/request-log";
67
import { handleResponses } from "../src/server/responses/core";
@@ -364,27 +365,30 @@ describe("FastWire characterization: rawBody observation point", () => {
364365
});
365366

366367
describe("FastWire characterization: known bugs", () => {
367-
test("characterization (known bug): native chat passthrough ignores exact-model false", () => {
368+
test("characterization: native chat passthrough honors exact-model false", () => {
369+
// FastWire #1886 native-chat policy fix: exact-model false now strips the caller tier.
370+
const provider: OcxProviderConfig = {
371+
adapter: "openai-chat",
372+
baseUrl: "https://native-chat.example.test/v1",
373+
authMode: "key",
374+
apiKey: "sk-test",
375+
supportsServiceTier: true,
376+
chatServiceTier: true,
377+
modelSupportsServiceTier: { model: false },
378+
};
368379
const request = buildOpenAIChatPassthroughRequest(
369-
{
370-
adapter: "openai-chat",
371-
baseUrl: "https://native-chat.example.test/v1",
372-
authMode: "key",
373-
apiKey: "sk-test",
374-
supportsServiceTier: true,
375-
chatServiceTier: true,
376-
modelSupportsServiceTier: { model: false },
377-
},
380+
provider,
378381
{
379382
model: "model",
380383
messages: [{ role: "user", content: "ping" }],
381384
service_tier: "flex",
382385
},
383386
"model",
384387
false,
388+
fastPolicyForModel(provider, "model", "native-chat", "chat"),
385389
);
386390
const body = JSON.parse(request.body) as Record<string, unknown>;
387-
expect(body.service_tier).toBe("flex");
391+
expect(body).not.toHaveProperty("service_tier");
388392
});
389393

390394
test("characterization: chat-to-responses conversion preserves service_tier", () => {
Lines changed: 221 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,221 @@
1+
import { afterEach, describe, expect, test } from "bun:test";
2+
import {
3+
buildOpenAIChatPassthroughRequest,
4+
createOpenAIChatAdapter,
5+
} from "../src/adapters/openai-chat";
6+
import {
7+
decideTier,
8+
tierValueAfterDecision,
9+
} from "../src/providers/fastwire";
10+
import { fastPolicyForModel } from "../src/providers/service-tier";
11+
import { handleChatCompletions } from "../src/server/chat-completions";
12+
import type { OcxConfig, OcxParsedRequest, OcxProviderConfig } from "../src/types";
13+
14+
const PROVIDER_NAME = "native-tier-fixture";
15+
const MODEL_ID = "model";
16+
const originalFetch = globalThis.fetch;
17+
18+
afterEach(() => {
19+
globalThis.fetch = originalFetch;
20+
});
21+
22+
function provider(overrides: Partial<OcxProviderConfig> = {}): OcxProviderConfig {
23+
return {
24+
adapter: "openai-chat",
25+
baseUrl: "https://native-tier.example.test/v1",
26+
authMode: "key",
27+
apiKey: "sk-test",
28+
...overrides,
29+
};
30+
}
31+
32+
function nativeBody(
33+
target: OcxProviderConfig,
34+
callerTier: string,
35+
modelId = MODEL_ID,
36+
): Record<string, unknown> {
37+
const policy = fastPolicyForModel(target, modelId, PROVIDER_NAME, "chat");
38+
const request = buildOpenAIChatPassthroughRequest(
39+
target,
40+
{
41+
model: modelId,
42+
messages: [{ role: "user", content: "ping" }],
43+
service_tier: callerTier,
44+
},
45+
modelId,
46+
false,
47+
policy,
48+
);
49+
return JSON.parse(request.body) as Record<string, unknown>;
50+
}
51+
52+
function mainPathBody(
53+
target: OcxProviderConfig,
54+
callerTier: string,
55+
modelId = MODEL_ID,
56+
): Record<string, unknown> {
57+
const policy = fastPolicyForModel(target, modelId, PROVIDER_NAME, "chat");
58+
const tierDecision = decideTier(policy, undefined, callerTier);
59+
const serviceTier = tierValueAfterDecision(tierDecision, callerTier);
60+
const parsed: OcxParsedRequest = {
61+
modelId,
62+
stream: false,
63+
context: { messages: [{ role: "user", content: "ping" }], tools: [] },
64+
options: {
65+
...(serviceTier === undefined ? {} : { serviceTier }),
66+
tierDecision,
67+
},
68+
};
69+
const request = createOpenAIChatAdapter(target).buildRequest(parsed);
70+
return JSON.parse(request.body) as Record<string, unknown>;
71+
}
72+
73+
function forwardsTier(body: Record<string, unknown>): boolean {
74+
return Object.hasOwn(body, "service_tier");
75+
}
76+
77+
describe("native Chat passthrough service-tier policy", () => {
78+
test.each([
79+
{
80+
name: "provider false stays fail-closed even with CallerTierForward",
81+
config: { supportsServiceTier: false, chatServiceTier: true },
82+
callerTier: "priority",
83+
expectedTier: undefined,
84+
},
85+
{
86+
name: "exact-model false narrows provider support",
87+
config: {
88+
supportsServiceTier: true,
89+
chatServiceTier: true,
90+
modelSupportsServiceTier: { [MODEL_ID]: false },
91+
},
92+
callerTier: "priority",
93+
expectedTier: undefined,
94+
},
95+
{
96+
name: "exact-model true authorizes canonical Fast without CallerTierForward",
97+
config: { modelSupportsServiceTier: { [MODEL_ID]: true } },
98+
callerTier: "FAST",
99+
expectedTier: "FAST",
100+
},
101+
{
102+
name: "exact-model true does not authorize a foreign tier",
103+
config: { modelSupportsServiceTier: { [MODEL_ID]: true } },
104+
callerTier: "flex",
105+
expectedTier: undefined,
106+
},
107+
{
108+
name: "unclassified support drops a caller tier without CallerTierForward",
109+
config: {},
110+
callerTier: "flex",
111+
expectedTier: undefined,
112+
},
113+
{
114+
name: "unclassified support forwards a caller tier with CallerTierForward",
115+
config: { chatServiceTier: true },
116+
callerTier: "flex",
117+
expectedTier: "flex",
118+
},
119+
] as const)("$name", ({ config, callerTier, expectedTier }) => {
120+
const body = nativeBody(provider(config), callerTier);
121+
if (expectedTier === undefined) expect(body).not.toHaveProperty("service_tier");
122+
else expect(body.service_tier).toBe(expectedTier);
123+
});
124+
125+
test("the native handler passes its resolved fail-closed policy to the builder", async () => {
126+
const captured: Record<string, unknown>[] = [];
127+
globalThis.fetch = (async (_input: RequestInfo | URL, init?: RequestInit) => {
128+
captured.push(JSON.parse(String(init?.body ?? "{}")) as Record<string, unknown>);
129+
return Response.json({
130+
id: "chatcmpl_native_tier",
131+
object: "chat.completion",
132+
choices: [{ index: 0, message: { role: "assistant", content: "ok" }, finish_reason: "stop" }],
133+
});
134+
}) as typeof fetch;
135+
const target = provider({ supportsServiceTier: false, chatServiceTier: true });
136+
const config = {
137+
port: 0,
138+
defaultProvider: PROVIDER_NAME,
139+
providers: { [PROVIDER_NAME]: target },
140+
} as OcxConfig;
141+
142+
const response = await handleChatCompletions(
143+
new Request("http://localhost/v1/chat/completions", {
144+
method: "POST",
145+
headers: { "content-type": "application/json" },
146+
body: JSON.stringify({
147+
model: `${PROVIDER_NAME}/${MODEL_ID}`,
148+
messages: [{ role: "user", content: "ping" }],
149+
service_tier: "priority",
150+
}),
151+
}),
152+
config,
153+
{ model: "", provider: "" },
154+
);
155+
156+
expect(response.status).toBe(200);
157+
expect(captured).toHaveLength(1);
158+
expect(captured[0]).not.toHaveProperty("service_tier");
159+
});
160+
});
161+
162+
describe("main and native Chat tier authorization parity", () => {
163+
test.each([
164+
{
165+
name: "provider fail-closed",
166+
config: { supportsServiceTier: false, chatServiceTier: true },
167+
callerTier: "priority",
168+
forwarded: false,
169+
},
170+
{
171+
name: "exact-model fail-closed",
172+
config: {
173+
supportsServiceTier: true,
174+
chatServiceTier: true,
175+
modelSupportsServiceTier: { [MODEL_ID]: false },
176+
},
177+
callerTier: "priority",
178+
forwarded: false,
179+
},
180+
{
181+
name: "exact-model canonical Fast",
182+
config: { modelSupportsServiceTier: { [MODEL_ID]: true } },
183+
callerTier: "fast",
184+
forwarded: true,
185+
mainTier: "priority",
186+
nativeTier: "fast",
187+
},
188+
{
189+
name: "exact-model foreign tier",
190+
config: { modelSupportsServiceTier: { [MODEL_ID]: true } },
191+
callerTier: "flex",
192+
forwarded: false,
193+
},
194+
{
195+
name: "unclassified without CallerTierForward",
196+
config: {},
197+
callerTier: "priority",
198+
forwarded: false,
199+
},
200+
{
201+
name: "unclassified with CallerTierForward",
202+
config: { chatServiceTier: true },
203+
callerTier: "flex",
204+
forwarded: true,
205+
mainTier: "flex",
206+
nativeTier: "flex",
207+
},
208+
] as const)("$name makes the same forward/drop decision", row => {
209+
const target = provider(row.config);
210+
const main = mainPathBody(target, row.callerTier);
211+
const native = nativeBody(target, row.callerTier);
212+
213+
expect(forwardsTier(main)).toBe(row.forwarded);
214+
expect(forwardsTier(native)).toBe(row.forwarded);
215+
expect(forwardsTier(native)).toBe(forwardsTier(main));
216+
if (row.forwarded) {
217+
expect(main.service_tier).toBe(row.mainTier);
218+
expect(native.service_tier).toBe(row.nativeTier);
219+
}
220+
});
221+
});

‎tests/openrouter-provider-routing.test.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import {
77
openRouterRoutingConfigError,
88
openRouterProviderPayload,
99
} from "../src/providers/openrouter-routing";
10+
import { fastPolicyForModel } from "../src/providers/service-tier";
1011
import { clearKeyCooldowns, rotateProviderTransportOn429 } from "../src/providers/key-failover";
1112
import { routeModel } from "../src/router";
1213
import { providerManagementConfigError, safeConfigDTO } from "../src/server/auth-cors";
@@ -39,7 +40,7 @@ function passthroughBody(
3940
const request = buildOpenAIChatPassthroughRequest(providerConfig, {
4041
messages: [{ role: "user", content: "hello" }],
4142
...rawBody,
42-
}, modelId, false);
43+
}, modelId, false, fastPolicyForModel(providerConfig, modelId, undefined, "chat"));
4344
return JSON.parse(request.body as string) as Record<string, unknown>;
4445
}
4546

0 commit comments

Comments
 (0)