Skip to content

Commit a65bfc0

Browse files
committed
fix(catalog): capture service-tier wire authority
1 parent af622b2 commit a65bfc0

2 files changed

Lines changed: 49 additions & 3 deletions

File tree

‎src/codex/catalog/provider-fetch.ts‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,11 @@ import { modelInList } from "../../types";
3232
import { CODEX_REASONING_LEVELS, codexEffortRank, configuredReasoningEfforts, modelRecordValue, sanitizeCodexReasoningEfforts } from "../../reasoning-effort";
3333
import { getModelMetadata, getModelMetadataCaseInsensitive, listModelMetadata, resolveMetadataProvider } from "../../generated/model-metadata";
3434
import { enrichProviderFromRegistry, shouldCaseFoldMetadataModelId } from "../../providers/derive";
35-
import { serviceTierSupportForModel } from "../../providers/service-tier";
35+
import {
36+
captureServiceTierAdapterAuthority,
37+
serviceTierSupportForModel,
38+
type CapturedServiceTierAdapterAuthority,
39+
} from "../../providers/service-tier";
3640
import { effectiveGoogleMode, getProviderRegistryEntry, providerMatchesRegistryTransport } from "../../providers/registry";
3741
import { parseAntigravityAvailableModels } from "../../providers/antigravity-models";
3842
import { applyProviderContextCap, providerContextCap } from "../../providers/context-cap";
@@ -151,6 +155,7 @@ interface CapturedProviderGather {
151155
readonly discovery: ResolvedProviderModelDiscovery;
152156
readonly policy: CatalogProviderDiscoveryPolicySnapshot;
153157
readonly request: CapturedModelsRequest;
158+
readonly serviceTierAdapterAuthority: CapturedServiceTierAdapterAuthority;
154159
readonly observedAuth?: ModelsAuthResolution;
155160
/**
156161
* Configured model ids this provider must keep even when live discovery omits
@@ -402,6 +407,12 @@ function captureProviderGather(
402407
): CapturedProviderGather {
403408
const enriched = detachedClone(withCanonicalOpenAiForwardAuthDefault(name, configured));
404409
enrichProviderFromRegistry(name, enriched);
410+
const registryTransportMatch = providerMatchesRegistryTransport(name, enriched);
411+
const serviceTierAdapterAuthority = captureServiceTierAdapterAuthority(
412+
name,
413+
enriched,
414+
registryTransportMatch,
415+
);
405416
const provider = recursivelyFreeze(enriched);
406417
const observedAuth = authResolver.kind === "observed"
407418
&& provider.authMode !== "forward"
@@ -415,7 +426,6 @@ function captureProviderGather(
415426
maxResponseBytes: resolved.maxResponseBytes,
416427
maxModels: resolved.maxModels,
417428
});
418-
const registryTransportMatch = providerMatchesRegistryTransport(name, provider);
419429
const trustedOpenAiApi = captureTrustedOpenAiApiPolicy(name, registryTransportMatch);
420430
const policy = detachedFrozen({
421431
provider: name,
@@ -439,6 +449,7 @@ function captureProviderGather(
439449
discovery,
440450
policy,
441451
request,
452+
serviceTierAdapterAuthority,
442453
...(observedAuth ? { observedAuth: Object.freeze({ ...observedAuth }) } : {}),
443454
...(retainConfiguredModelIds && retainConfiguredModelIds.size > 0
444455
? { retainConfiguredModelIds }
@@ -507,6 +518,7 @@ function captureGatherFlight(
507518
// It is the one member of a provider row that is legitimately a function,
508519
// so it is dropped here rather than allowed to break every encode.
509520
provider: omitProviderTransportExecutor(provider.provider),
521+
serviceTierAdapterAuthority: provider.serviceTierAdapterAuthority,
510522
// Combo retention is capture-time state, not a provider-row field. Two
511523
// gathers that share providers but differ in combo targets must not join.
512524
retainConfiguredModelIds: [...(provider.retainConfiguredModelIds ?? [])].sort(),

‎src/providers/service-tier.ts‎

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
import type { OcxProviderConfig } from "../types";
22
import { MODEL_ADAPTER_OVERRIDE_ALLOWED } from "../types";
3-
import { providerModelWireDefault, type InboundWire } from "./registry";
3+
import { getProviderRegistryEntry, providerModelWireDefault, type InboundWire } from "./registry";
44

55
/** OpenAI-compatible adapters that can carry the standard `service_tier` field. */
66
export const SERVICE_TIER_ADAPTERS = new Set(["openai-chat", "openai-responses"]);
77

8+
export type CapturedServiceTierAdapterAuthority = Readonly<Record<string, string>>;
9+
10+
const capturedAdapterAuthority = new WeakMap<object, CapturedServiceTierAdapterAuthority>();
11+
812
type ServiceTierCapabilityProvider = Pick<
913
OcxProviderConfig,
1014
"adapter" | "supportsServiceTier" | "modelSupportsServiceTier" | "modelAdapters" | "baseUrl" | "authMode" | "chatServiceTier"
@@ -56,6 +60,32 @@ export function canSerializeServiceTierForChatModel(
5660
return provider.chatServiceTier === true || exact === true;
5761
}
5862

63+
/** Capture registry-owned model wire defaults before an asynchronous catalog flight begins. */
64+
export function captureServiceTierAdapterAuthority(
65+
providerName: string,
66+
provider: Pick<OcxProviderConfig, "adapter" | "baseUrl" | "authMode">,
67+
registryTransportMatch: boolean,
68+
inbound: InboundWire = "responses",
69+
): CapturedServiceTierAdapterAuthority {
70+
const authority: Record<string, string> = {};
71+
const defaults = registryTransportMatch
72+
? getProviderRegistryEntry(providerName)?.modelWireDefaults
73+
: undefined;
74+
for (const modelId of Object.keys(defaults ?? {})) {
75+
const adapter = providerModelWireDefault(
76+
providerName,
77+
provider,
78+
modelId,
79+
MODEL_ADAPTER_OVERRIDE_ALLOWED,
80+
inbound,
81+
);
82+
if (adapter !== undefined) authority[modelId.trim().toLowerCase()] = adapter;
83+
}
84+
const frozen = Object.freeze(authority);
85+
capturedAdapterAuthority.set(provider, frozen);
86+
return frozen;
87+
}
88+
5989
/** Resolve an explicit model wire override for catalog-time capability projection. */
6090
export function serviceTierAdapterForModel(
6191
providerName: string,
@@ -67,6 +97,10 @@ export function serviceTierAdapterForModel(
6797
// entries are exact-case keys, while registry defaults intentionally normalize ids there.
6898
const configured = provider.modelAdapters?.[modelId];
6999
if (configured !== undefined && MODEL_ADAPTER_OVERRIDE_ALLOWED.has(configured)) return configured;
100+
const captured = capturedAdapterAuthority.get(provider);
101+
if (captured !== undefined) {
102+
return captured[modelId.trim().toLowerCase()] ?? provider.adapter;
103+
}
70104
return providerModelWireDefault(
71105
providerName,
72106
provider,

0 commit comments

Comments
 (0)