@@ -14,12 +14,15 @@ import { buildNonOpenAIToolCatalogNudgeForTools, shouldInjectNonOpenAIToolCatalo
1414import { openRouterProviderPayload , resolveOpenRouterRouting } from "../providers/openrouter-routing" ;
1515import {
1616 canForwardForeignServiceTierForChatModel ,
17+ fastPolicyForModel ,
1718 supportsServiceTierForModel ,
1819} from "../providers/service-tier" ;
1920import {
2021 canonicalFastTierMarker ,
2122 createAdapterTierMetadata ,
23+ decideTier ,
2224 type AdapterTierMetadata ,
25+ type ResolvedFastPolicy ,
2326} from "../providers/fastwire" ;
2427import { openaiChatCompletionsUrl } from "./openai-chat-url" ;
2528import { stripResponsesOnlyEncryptedMarker } from "./responses-tool-schema" ;
@@ -96,6 +99,8 @@ export function buildOpenAIChatPassthroughRequest(
9699 rawBody : Record < string , unknown > ,
97100 modelId : string ,
98101 stream : boolean ,
102+ fastPolicy : ResolvedFastPolicy = fastPolicyForModel ( provider , modelId , undefined , "chat" ) ,
103+ fastMode ?: boolean ,
99104) : AdapterRequest {
100105 const { url, headers, hasCredential } = openAIChatTransport ( provider ) ;
101106
@@ -123,7 +128,16 @@ export function buildOpenAIChatPassthroughRequest(
123128 // `<listed>:<tag>` siblings the operator never opted out, silently returning prose.
124129 if ( provider . noStructuredOutputModels ?. includes ( modelId ) ) delete body . response_format ;
125130
126- if ( provider . chatServiceTier && rawBody . service_tier !== undefined ) {
131+ // Run the same complete Fast policy as the translated Chat path, including explicit
132+ // fastMode and foreign-tier handling. On inherited canonical Fast, the passthrough still
133+ // retains the caller's exact spelling; forced Fast uses the policy-owned wire value.
134+ const callerTier = typeof rawBody . service_tier === "string" ? rawBody . service_tier : undefined ;
135+ const tierDecision = decideTier ( fastPolicy , fastMode , callerTier ) ;
136+ if ( tierDecision . kind === "set" ) {
137+ body . service_tier = fastMode === undefined && canonicalFastTierMarker ( callerTier ) !== undefined
138+ ? callerTier
139+ : tierDecision . value ;
140+ } else if ( tierDecision . kind === "forward-caller" && rawBody . service_tier !== undefined ) {
127141 body . service_tier = rawBody . service_tier ;
128142 }
129143 if ( provider . promptCacheKey && rawBody . prompt_cache_key !== undefined ) {
@@ -1299,6 +1313,26 @@ function thinkingBudgetForEffort(parsed: OcxParsedRequest, reasoningEffort: stri
12991313 return fraction === undefined ? undefined : Math . max ( 1 , Math . floor ( maxBudget * fraction ) ) ;
13001314}
13011315
1316+ function canSerializeOpenAIChatServiceTier (
1317+ provider : OcxProviderConfig ,
1318+ modelId : string ,
1319+ serviceTier : unknown ,
1320+ tierDecision ?: OcxParsedRequest [ "options" ] [ "tierDecision" ] ,
1321+ ) : boolean {
1322+ if ( serviceTier === undefined ) return false ;
1323+ if ( tierDecision !== undefined ) {
1324+ return tierDecision . kind === "set" || tierDecision . kind === "forward-caller" ;
1325+ }
1326+ // No decision from the router means this call did not go through the tier state machine, so
1327+ // ask that machine rather than re-deriving a looser answer beside it. The previous fallback
1328+ // returned true whenever foreign forwarding was allowed at all, which let a caller tier
1329+ // reach the wire in cases `decideTier` would have dropped — the two paths disagreeing is
1330+ // precisely the bug, so there is now only one authority.
1331+ const callerTier = typeof serviceTier === "string" ? serviceTier : undefined ;
1332+ const decision = decideTier ( fastPolicyForModel ( provider , modelId , undefined , "chat" ) , undefined , callerTier ) ;
1333+ return decision . kind === "set" || decision . kind === "forward-caller" ;
1334+ }
1335+
13021336export function createOpenAIChatAdapter ( provider : OcxProviderConfig ) : ProviderAdapter {
13031337 return {
13041338 name : "openai-chat" ,
@@ -1321,13 +1355,12 @@ export function createOpenAIChatAdapter(provider: OcxProviderConfig): ProviderAd
13211355 // unclassified Chat routes remain behind the caller-forwarding opt-in.
13221356 const serviceTier = parsed . options . serviceTier ;
13231357 const tierDecision = parsed . options . tierDecision ;
1324- const callerCanonicalFast = canonicalFastTierMarker ( serviceTier ) !== undefined ;
1325- const callerTierForwardAllowed = canForwardForeignServiceTierForChatModel ( provider , parsed . modelId ) ;
1326- const canonicalFastCapability = callerCanonicalFast
1327- && supportsServiceTierForModel ( provider , parsed . modelId ) === true ;
1328- const canSerializeServiceTier = tierDecision ?. kind === "set"
1329- || tierDecision ?. kind === "forward-caller"
1330- || ( tierDecision === undefined && ( callerTierForwardAllowed || canonicalFastCapability ) ) ;
1358+ const canSerializeServiceTier = canSerializeOpenAIChatServiceTier (
1359+ provider ,
1360+ parsed . modelId ,
1361+ serviceTier ,
1362+ tierDecision ,
1363+ ) ;
13311364 if ( canSerializeServiceTier && serviceTier !== undefined ) {
13321365 body . service_tier = serviceTier ;
13331366 }
0 commit comments