Skip to content

fix(responses): narrow the send budget once for the adapter contract (#4546) #4613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lidge-jun merged 1 commit into from
Sep 14, 2026
Merged

fix(responses): narrow the send budget once for the adapter contract (#4546) #4613

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/server/responses/core.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5063,6 +5063,10 @@ async function handleResponsesInner(
isRequestExecutionBudget(sendBudget)
? sendBudget.remainingBaseSends(budget)
: Math.max(0, budget - sendBudget.used);
// The adapter contract needs the full budget, not just the counter. options.sendBudget is
// typed as the narrow holder so a caller that predates this can still pass one, so narrow it
// once here rather than asserting at each adapter call site.
const adapterSendBudget = isRequestExecutionBudget(sendBudget) ? sendBudget : undefined;
const sendBudgetExhausted = (): boolean =>
remainingTransientSendBudget(TRANSIENT_RETRY_MAX_ATTEMPTS) === 0;
/**
Expand Down Expand Up @@ -7745,7 +7749,7 @@ async function handleResponsesInner(
upstreamResponse = await activeAdapter.fetchResponse(builtInitialRequest, {
abortSignal: upstream.signal,
timeoutMs: connectMs,
sendBudget,
sendBudget: adapterSendBudget,
stream: parsed.stream,
executor: providerFetch(route.provider, options.codexWsRuntimeIdentity, {
dispatchOverride: oauthDispatch(builtInitialRequest),
Expand Down Expand Up @@ -7880,7 +7884,7 @@ async function handleResponsesInner(
return await activeAdapter.fetchResponse(retryRequest, {
abortSignal: upstream.signal,
timeoutMs: connectMs,
sendBudget,
sendBudget: adapterSendBudget,
stream: parsed.stream,
executor: providerFetch(route.provider, options.codexWsRuntimeIdentity, {
dispatchOverride: oauthDispatch(retryRequest),
Expand Down Expand Up @@ -8438,7 +8442,7 @@ async function handleResponsesInner(
return await activeAdapter.fetchResponse(builtContinuationRequest, {
abortSignal: upstream.signal,
timeoutMs: connectMs,
sendBudget,
sendBudget: adapterSendBudget,
stream: nextParsed.stream,
executor: providerFetch(route.provider, options.codexWsRuntimeIdentity, {
dispatchOverride: oauthDispatch(builtContinuationRequest, nextParsed),
Expand Down
Loading