@bitkyc08/opencodex 2.96.0 → 2.97.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/ocx.mjs +214 -19
- package/gui/dist/assets/{App-bwugJRKn.js → App-DuNhggE1.js} +15 -15
- package/gui/dist/assets/{Tray-BOPQyDbH.js → Tray-CEw0y0jR.js} +1 -1
- package/gui/dist/assets/index-CynE_Rue.js +94 -0
- package/gui/dist/assets/{quota-summary-6HsrHQAy.js → quota-summary-VHFSlUuM.js} +1 -1
- package/gui/dist/index.html +1 -1
- package/package.json +1 -1
- package/src/adapters/command-code.ts +15 -16
- package/src/adapters/cursor/transport-retry.ts +2 -2
- package/src/adapters/devin/cloud-direct/chat.ts +15 -6
- package/src/adapters/kiro/stream.ts +63 -4
- package/src/adapters/kiro-constants.ts +15 -1
- package/src/adapters/kiro-events.ts +31 -1
- package/src/adapters/kiro-retry.ts +3 -3
- package/src/adapters/ollama-native.ts +11 -1
- package/src/adapters/openai-responses/empty-assistant.ts +15 -3
- package/src/adapters/openai-responses/passthrough.ts +5 -4
- package/src/adapters/openai-responses/reasoning.ts +9 -4
- package/src/adapters/openai-responses/request-strips.ts +1 -1
- package/src/adapters/physical-send.ts +3 -3
- package/src/adapters/zed-openai-stream.ts +2 -1
- package/src/bridge/errors.ts +11 -2
- package/src/bridge/response-json.ts +2 -1
- package/src/bridge/sse.ts +14 -6
- package/src/chat/failure-verdict.ts +21 -0
- package/src/chat/outbound.ts +139 -21
- package/src/claude/outbound.ts +49 -2
- package/src/cli/capabilities-base.ts +25 -3
- package/src/cli/capabilities-command.ts +12 -3
- package/src/cli/capability-contracts.ts +2 -0
- package/src/cli/codex-launch-auth.ts +30 -1
- package/src/cli/codex-launcher.ts +12 -5
- package/src/cli/codex-shim-autorestore.ts +5 -4
- package/src/cli/dispatch.ts +11 -176
- package/src/cli/help.ts +2 -2
- package/src/cli/index.ts +5 -1
- package/src/cli/link.ts +1 -1
- package/src/cli/registry.ts +11 -3
- package/src/cli/root.ts +8 -0
- package/src/cli/sync-command.ts +243 -0
- package/src/cli/sync-fanout-process.ts +92 -0
- package/src/cli/sync-fanout.ts +150 -0
- package/src/cli/sync-flags.ts +10 -0
- package/src/cli/sync-link-status.ts +39 -0
- package/src/cli/sync-update-guard.ts +18 -0
- package/src/client/connect.ts +31 -14
- package/src/client/link-home.ts +3 -2
- package/src/client/machine-listener.ts +3 -0
- package/src/client/restore-ownership.ts +19 -1
- package/src/client/runtime-restart.ts +12 -4
- package/src/client/runtime.ts +40 -11
- package/src/client/stop-routing.ts +62 -0
- package/src/client/sync-runtime.ts +65 -0
- package/src/clients/config-export.ts +32 -3
- package/src/codex/auth-context.ts +49 -103
- package/src/codex/catalog/antigravity-discovery.ts +16 -5
- package/src/codex/catalog/provider-models.ts +6 -8
- package/src/codex/forward-transport-headers.ts +35 -6
- package/src/codex/inject/config-toml.ts +88 -0
- package/src/codex/inject/multi-agent-v2.ts +30 -4
- package/src/codex/inject/plan.ts +34 -7
- package/src/codex/inject-coordination.ts +11 -0
- package/src/codex/inject.ts +18 -7
- package/src/codex/lineage.ts +13 -7
- package/src/codex/quota.ts +22 -6
- package/src/codex/request-owned-affinity-key.ts +11 -0
- package/src/codex/request-owned-affinity.ts +118 -0
- package/src/codex/request-owned-main-pin.ts +86 -0
- package/src/codex/role-capability.ts +52 -41
- package/src/codex/routing/active-account.ts +13 -5
- package/src/codex/routing/selection.ts +40 -1
- package/src/codex/routing/thread-affinity-store.ts +916 -0
- package/src/codex/routing/thread-affinity.ts +90 -12
- package/src/codex/toml-source-lines.ts +72 -13
- package/src/combos/failover.ts +6 -109
- package/src/combos/request.ts +2 -2
- package/src/combos/resolve.ts +29 -11
- package/src/config/process-state.ts +5 -0
- package/src/config/schema/leaf-validators.ts +1 -0
- package/src/generated/compatibility-version.json +433 -165
- package/src/images/loop.ts +2 -1
- package/src/lib/client-error-body.ts +184 -0
- package/src/lib/client-retry-after.ts +66 -0
- package/src/lib/config-ownership.ts +4 -0
- package/src/lib/context-overflow-verdict.ts +113 -0
- package/src/lib/desktop-cli-handoff.d.mts +1 -1
- package/src/lib/desktop-cli-handoff.mjs +11 -1
- package/src/lib/empty-tool-catalog.ts +25 -3
- package/src/lib/error-destination.ts +47 -0
- package/src/lib/failure-detail.ts +66 -0
- package/src/lib/model-identity.ts +44 -0
- package/src/lib/private-sqlite-path.ts +124 -0
- package/src/lib/response-service-tier.ts +17 -0
- package/src/lib/retry-after.ts +3 -0
- package/src/lib/spend-ledger-owner.ts +43 -4
- package/src/lib/upstream-condition.ts +142 -0
- package/src/lib/upstream-retry.ts +14 -11
- package/src/lib/windows-owner-acl.ts +13 -6
- package/src/link/remote-platform.ts +14 -0
- package/src/link/remote-windows.ts +51 -9
- package/src/link/ssh-argv.ts +63 -10
- package/src/oauth/generic-account-failover.ts +13 -11
- package/src/oauth/index.ts +36 -74
- package/src/oauth/oauth-errors.ts +67 -0
- package/src/oauth/store.ts +1 -1
- package/src/protocols/codecs/ollama.ts +197 -0
- package/src/protocols/encoders/adapter-events.ts +4 -0
- package/src/protocols/encoders/chat.ts +18 -10
- package/src/protocols/trace.ts +18 -0
- package/src/providers/fastwire.ts +3 -2
- package/src/providers/quota/anthropic-usage-windows.ts +13 -3
- package/src/providers/quota/vendor-probes-key.ts +60 -24
- package/src/providers/request-pacing.ts +3 -2
- package/src/responses/apply-patch-envelope.ts +45 -19
- package/src/responses/compaction-history-framing.ts +5 -1
- package/src/responses/freeform-wrapper-scan.ts +5 -3
- package/src/responses/progressive-freeform-input.ts +354 -45
- package/src/routing/fallback-policy.ts +3 -1
- package/src/server/admission-model-scope.ts +17 -6
- package/src/server/admitted-http-turn.ts +56 -0
- package/src/server/auth-cors.ts +5 -0
- package/src/server/chat-completions.ts +45 -20
- package/src/server/chat-native-sse.ts +52 -7
- package/src/server/chat-native.ts +60 -35
- package/src/server/claude-bridge-pool-session.ts +59 -0
- package/src/server/claude-messages.ts +51 -24
- package/src/server/context-history.ts +5 -1
- package/src/server/inbound-body-admission.ts +11 -4
- package/src/server/index/ollama-routes.ts +89 -0
- package/src/server/index/serve-options.ts +21 -4
- package/src/server/index/websocket-handler.ts +4 -2
- package/src/server/index.ts +6 -36
- package/src/server/inference/client-encoder-delivery.ts +4 -2
- package/src/server/json-serialized-bytes.ts +44 -0
- package/src/server/management/agent-settings-routes.ts +24 -21
- package/src/server/management/codex-cli-update-routes.ts +2 -1
- package/src/server/management/route-registry.ts +1 -1
- package/src/server/messages-native-scope.ts +2 -1
- package/src/server/messages-native-tool-guard.ts +1 -1
- package/src/server/messages-native.ts +12 -7
- package/src/server/messages-shared.ts +6 -2
- package/src/server/native-final-log.ts +93 -0
- package/src/server/ollama-inbound.ts +349 -0
- package/src/server/ollama-native-paths.ts +21 -0
- package/src/server/ollama-route-policy.ts +73 -0
- package/src/server/relay.ts +22 -3
- package/src/server/request-decompress.ts +4 -2
- package/src/server/request-log-failure-attribution.ts +22 -0
- package/src/server/request-log-failure-detail.ts +80 -0
- package/src/server/request-log-terminal-status.ts +4 -2
- package/src/server/request-log.ts +79 -42
- package/src/server/response-log-body.ts +6 -1
- package/src/server/responses/account-change-state.ts +17 -6
- package/src/server/responses/adapter-continuation.ts +9 -4
- package/src/server/responses/adapter-delivery.ts +5 -4
- package/src/server/responses/adapter-dispatch.ts +31 -30
- package/src/server/responses/anthropic-thinking-recovery.ts +3 -0
- package/src/server/responses/codex-auth-error.ts +19 -18
- package/src/server/responses/codex-ws-exchange.ts +11 -8
- package/src/server/responses/codex-ws-metadata.ts +94 -21
- package/src/server/responses/codex-ws-request.ts +3 -1
- package/src/server/responses/compact.ts +53 -23
- package/src/server/responses/compaction-recovery.ts +4 -2
- package/src/server/responses/compaction-routing.ts +9 -4
- package/src/server/responses/core-auth.ts +32 -14
- package/src/server/responses/core-codex-account.ts +17 -6
- package/src/server/responses/core-combo-failure.ts +5 -1
- package/src/server/responses/core-combo-native.ts +2 -1
- package/src/server/responses/core-combo.ts +41 -27
- package/src/server/responses/core-errors.ts +22 -20
- package/src/server/responses/core-lifetime.ts +6 -3
- package/src/server/responses/core-normalize.ts +1 -0
- package/src/server/responses/core-options.ts +7 -0
- package/src/server/responses/core-pipeline.ts +4 -3
- package/src/server/responses/fetch-helpers.ts +7 -1
- package/src/server/responses/input-admission.ts +28 -2
- package/src/server/responses/native-injection.ts +1 -1
- package/src/server/responses/native-response-json.ts +13 -4
- package/src/server/responses/native-response-output.ts +1 -2
- package/src/server/responses/non-replayable-error.ts +2 -1
- package/src/server/responses/pacing-overload.ts +3 -2
- package/src/server/responses/passthrough-delivery.ts +55 -14
- package/src/server/responses/passthrough-dispatch.ts +19 -17
- package/src/server/responses/passthrough-error.ts +9 -9
- package/src/server/responses/policy-fallback.ts +2 -1
- package/src/server/responses/request-prepare.ts +67 -48
- package/src/server/responses/request-transport.ts +35 -31
- package/src/server/responses/run-turn-execution.ts +6 -6
- package/src/server/responses/sidecar-execution.ts +16 -12
- package/src/server/responses/spend-storage-error.ts +2 -1
- package/src/server/responses/ws-upstream.ts +9 -0
- package/src/server/responses-custom-tool-repair.ts +14 -3
- package/src/server/responses-terminal-repair.ts +5 -2
- package/src/server/responses-undeclared-tool-guard.ts +39 -16
- package/src/server/safe-response-headers.ts +162 -13
- package/src/server/turn-state-handles.ts +164 -0
- package/src/server/workflow-refusal.ts +2 -1
- package/src/service/ownership-mutation-lease.d.mts +11 -2
- package/src/service/ownership-mutation-lease.mjs +53 -11
- package/src/types/config.ts +2 -0
- package/src/update/index.ts +133 -25
- package/src/update/npm-install.d.mts +8 -0
- package/src/update/npm-install.mjs +20 -1
- package/src/update/orchestrated-admission.d.mts +4 -0
- package/src/update/orchestrated-admission.mjs +12 -0
- package/src/update/orchestrated-arguments.d.mts +12 -0
- package/src/update/orchestrated-arguments.mjs +64 -0
- package/src/update/orchestrated-child.d.mts +12 -0
- package/src/update/orchestrated-child.mjs +70 -0
- package/src/update/orchestrated-entry.ts +234 -0
- package/src/update/orchestrated-identity-probe-entry.ts +20 -0
- package/src/update/orchestrated-identity.ts +53 -0
- package/src/update/orchestrated-live-identity.ts +48 -0
- package/src/update/orchestrated-node-driver.mjs +99 -0
- package/src/update/orchestrated-outcome.d.mts +21 -0
- package/src/update/orchestrated-outcome.mjs +40 -0
- package/src/update/orchestrated-plan.ts +49 -0
- package/src/update/orchestrated-pnpm.d.mts +8 -0
- package/src/update/orchestrated-pnpm.mjs +33 -0
- package/src/update/orchestrated-session.d.mts +37 -0
- package/src/update/orchestrated-session.mjs +264 -0
- package/src/update/orchestrated-token.d.mts +10 -0
- package/src/update/orchestrated-token.mjs +21 -0
- package/src/update/orchestrated-token.ts +3 -0
- package/src/update/orchestrated-tree.d.mts +1 -0
- package/src/update/orchestrated-tree.mjs +14 -0
- package/src/update/pnpm-global-install.d.mts +6 -0
- package/src/update/pnpm-global-install.mjs +9 -2
- package/src/update/posix-install-supervisor-entry.mjs +6 -0
- package/src/update/posix-install-supervisor.d.mts +10 -0
- package/src/update/posix-install-supervisor.mjs +88 -0
- package/src/update/sync-update-mutex.d.mts +10 -0
- package/src/update/sync-update-mutex.mjs +164 -0
- package/src/update/sync-update-mutex.ts +1 -0
- package/src/update/test-home-guard.mjs +33 -0
- package/src/update/transactional-install.mjs +2 -2
- package/src/usage/error-detail.ts +225 -0
- package/src/usage/log.ts +60 -27
- package/src/web-search/loop.ts +31 -5
- package/gui/dist/assets/index-ebuVUtB7.js +0 -94
|
@@ -1,3 +1,6 @@
|
|
|
1
|
+
import { clientFacingModelText } from "../../lib/error-destination";
|
|
2
|
+
import { projectLocalModelRefusalLog } from "../request-log-failure-detail";
|
|
3
|
+
import { markProxyError, carryProxyError } from "../../lib/client-error-body";
|
|
1
4
|
import { codexAdapterBuildRefusal } from "./passthrough-build-error";
|
|
2
5
|
import { recoverAutoPausedAccount } from "./account-auto-pause-recovery";
|
|
3
6
|
import { wasAccountAutoPaused, wasPermanentAccountRefusal } from "../../oauth/account-auto-pause";
|
|
@@ -51,7 +54,7 @@ import {
|
|
|
51
54
|
fetchWithTransientRetry,
|
|
52
55
|
fetchWithResetRetry,
|
|
53
56
|
applyUpstreamRecoveryInit,
|
|
54
|
-
SendBudgetExhaustedError,
|
|
57
|
+
SendBudgetExhaustedError, errorDestinationLabel,
|
|
55
58
|
UpstreamRetryEvidenceError,
|
|
56
59
|
prepareSameTarget429Wait,
|
|
57
60
|
sleepWithAbort,
|
|
@@ -120,8 +123,7 @@ import { chargeWorkflowSends } from "../../lib/workflow-budget";
|
|
|
120
123
|
import { isAntigravityValidationRefusal } from "./antigravity-validation-refusal";
|
|
121
124
|
import { createAntigravityModelDenialRecovery, recoverAntigravityAccount } from "./antigravity-model-denial-recovery";
|
|
122
125
|
import { unboundPoolSpendRefusalResponse } from "../workflow-refusal";
|
|
123
|
-
import { AdmissionModelDeniedError, admissionModelDeniedResponse } from "../admission-model-scope";
|
|
124
|
-
|
|
126
|
+
import { AdmissionModelDeniedError, admissionModelDeniedResponse, projectAdmissionModelDeniedLog } from "../admission-model-scope";
|
|
125
127
|
/** One responsibility of the Responses request pipeline; state owners are explicit. */
|
|
126
128
|
export async function prepareAdapterExchange(
|
|
127
129
|
requestContext: Pick<ResponsesRequestContext, "options" | "config" | "logCtx" | "req">,
|
|
@@ -232,8 +234,6 @@ export async function prepareAdapterExchange(
|
|
|
232
234
|
reserveCredentialHop,
|
|
233
235
|
claimAmbiguousResend,
|
|
234
236
|
} = sendBudgetState;
|
|
235
|
-
|
|
236
|
-
|
|
237
237
|
let selfContainedJudgment: boolean | undefined;
|
|
238
238
|
// On the Antigravity direct lane the raw body carries only settings; judge the body the bridge
|
|
239
239
|
// would have sent, built only if an ambiguous reset actually asks.
|
|
@@ -397,7 +397,7 @@ export async function prepareAdapterExchange(
|
|
|
397
397
|
const headers = new Headers(original.headers);
|
|
398
398
|
headers.delete("content-length");
|
|
399
399
|
headers.delete("content-encoding");
|
|
400
|
-
upstreamResponse = new Response(text, { status: original.status, statusText: original.statusText, headers });
|
|
400
|
+
upstreamResponse = carryProxyError(original, new Response(text, { status: original.status, statusText: original.statusText, headers }));
|
|
401
401
|
return upstreamResponse;
|
|
402
402
|
};
|
|
403
403
|
const autoPauseEnabled = config.providers[route.providerName]?.accountAutoPause?.enabled === true;
|
|
@@ -454,7 +454,7 @@ export async function prepareAdapterExchange(
|
|
|
454
454
|
targetKey: `${route.providerName}|${builtInitialRequest.url}|${route.modelId}`,
|
|
455
455
|
countedExternally: true,
|
|
456
456
|
});
|
|
457
|
-
if (!decision.allowed) throw new SendBudgetExhaustedError(
|
|
457
|
+
if (!decision.allowed) throw new SendBudgetExhaustedError(errorDestinationLabel(builtInitialRequest.url));
|
|
458
458
|
handoffPermit = decision.permit;
|
|
459
459
|
}
|
|
460
460
|
const compactPrepaid = handoffPermit ?? (options.compactionRecoveryAttempted ? sendBudgetState.pendingHopPermit : undefined);
|
|
@@ -489,7 +489,7 @@ export async function prepareAdapterExchange(
|
|
|
489
489
|
});
|
|
490
490
|
// Receipt mode books the physical send at executor admission instead of here.
|
|
491
491
|
if (!deferredInitial && !receiptMode && compactPrepaid && !compactPrepaidUsed) {
|
|
492
|
-
if (!compactPrepaid.use()) throw new SendBudgetExhaustedError(
|
|
492
|
+
if (!compactPrepaid.use()) throw new SendBudgetExhaustedError(errorDestinationLabel(builtInitialRequest.url));
|
|
493
493
|
compactPrepaidUsed = true;
|
|
494
494
|
}
|
|
495
495
|
// Key transport keeps this metadata pending until it binds the actual selection.
|
|
@@ -505,9 +505,9 @@ export async function prepareAdapterExchange(
|
|
|
505
505
|
modelId: route.modelId,
|
|
506
506
|
onPhysicalDispatch: () => {
|
|
507
507
|
if (deferredInitial) {
|
|
508
|
-
if (!deferredInitial.beforeDispatch()) throw new SendBudgetExhaustedError(
|
|
508
|
+
if (!deferredInitial.beforeDispatch()) throw new SendBudgetExhaustedError(errorDestinationLabel(builtInitialRequest.url));
|
|
509
509
|
if (compactPrepaid && !compactPrepaidUsed) {
|
|
510
|
-
if (!compactPrepaid.use()) throw new SendBudgetExhaustedError(
|
|
510
|
+
if (!compactPrepaid.use()) throw new SendBudgetExhaustedError(errorDestinationLabel(builtInitialRequest.url));
|
|
511
511
|
compactPrepaidUsed = true;
|
|
512
512
|
}
|
|
513
513
|
}
|
|
@@ -524,7 +524,7 @@ export async function prepareAdapterExchange(
|
|
|
524
524
|
},
|
|
525
525
|
{
|
|
526
526
|
abortSignal: upstream.signal,
|
|
527
|
-
label: safeHostLabel(builtInitialRequest.url),
|
|
527
|
+
label: safeHostLabel(builtInitialRequest.url), destination: errorDestinationLabel(builtInitialRequest.url),
|
|
528
528
|
claimAmbiguousResend: claimPreHeaderResend,
|
|
529
529
|
...(sendBudgetState.adapterSendBudget?.spendEnforced || options.comboDispatchPermit || transientPolicy || resetPolicy || compactPrepaid || options.comboAttempt
|
|
530
530
|
|| billingPoolRequest || autoPauseEnabled
|
|
@@ -558,7 +558,7 @@ export async function prepareAdapterExchange(
|
|
|
558
558
|
const refusal = err instanceof UpstreamRetryEvidenceError ? err.cause : err;
|
|
559
559
|
if (refusal instanceof AdmissionModelDeniedError) {
|
|
560
560
|
releaseCodexAuthContextProbeLease(admissionState.authCtx);
|
|
561
|
-
return admissionModelDeniedResponse(refusal);
|
|
561
|
+
return admissionModelDeniedResponse(projectAdmissionModelDeniedLog(refusal, logCtx));
|
|
562
562
|
}
|
|
563
563
|
const codexRefusal = mapCodexAuthContextErrorToResponse(unwrapUpstreamRetryEvidenceError(err), {
|
|
564
564
|
now: Date.now(), accountSelector: route.codexAccountNamespace,
|
|
@@ -569,10 +569,10 @@ export async function prepareAdapterExchange(
|
|
|
569
569
|
}
|
|
570
570
|
// A pause committed during pacing is local admission policy, not a failed upstream.
|
|
571
571
|
if (refusal instanceof OAuthAccountPausedError) {
|
|
572
|
-
return formatErrorResponse(403, "permission_error", publicOAuthAuthenticationErrorMessage(refusal));
|
|
572
|
+
return markProxyError(formatErrorResponse(403, "permission_error", publicOAuthAuthenticationErrorMessage(refusal)));
|
|
573
573
|
}
|
|
574
574
|
if (refusal instanceof OAuthLoginRequiredError) {
|
|
575
|
-
return formatErrorResponse(401, "authentication_error", publicOAuthAuthenticationErrorMessage(refusal));
|
|
575
|
+
return markProxyError(formatErrorResponse(401, "authentication_error", publicOAuthAuthenticationErrorMessage(refusal)));
|
|
576
576
|
}
|
|
577
577
|
if (refusal instanceof AnthropicAccountCooldownError) {
|
|
578
578
|
return anthropicPoolCooldownResponse(refusal, { comboAttempt: options.comboAttempt, logCtx });
|
|
@@ -583,7 +583,7 @@ export async function prepareAdapterExchange(
|
|
|
583
583
|
// budget exists to stop. The passthrough path has answered 429 here since #4546.
|
|
584
584
|
if (err instanceof SendBudgetExhaustedError) {
|
|
585
585
|
return unboundPoolSpendRefusalResponse(logCtx)
|
|
586
|
-
?? formatErrorResponse(429, SEND_BUDGET_EXHAUSTED_CODE, err.message);
|
|
586
|
+
?? markProxyError(formatErrorResponse(429, SEND_BUDGET_EXHAUSTED_CODE, err.message));
|
|
587
587
|
}
|
|
588
588
|
const msg = describeUpstreamConnectFailure(err, connectMs);
|
|
589
589
|
return formatErrorResponse(502, "upstream_error", msg);
|
|
@@ -610,7 +610,7 @@ export async function prepareAdapterExchange(
|
|
|
610
610
|
let imageRetryAttempted = false;
|
|
611
611
|
const opaqueBlobRecoveryGuard: OpaqueBlobRecoveryGuard = { attempted: false };
|
|
612
612
|
const thinkingSignatureRecovery = createAnthropicThinkingRecovery(
|
|
613
|
-
parsed, upstream.signal, opaqueBlobRecoveryGuard, () => !sendBudgetExhausted(),
|
|
613
|
+
parsed, upstream.signal, opaqueBlobRecoveryGuard, () => !sendBudgetExhausted(), logCtx,
|
|
614
614
|
);
|
|
615
615
|
// Console Go answers a transient 400 "Invalid upload request." for bodies it accepts
|
|
616
616
|
// moments later; at most one byte-identical replay is allowed per request.
|
|
@@ -781,7 +781,7 @@ export async function prepareAdapterExchange(
|
|
|
781
781
|
if (pendingKeyMetadata) transportState.noteRoutedAttemptSend(retryEstimate, recoveryKind ?? recovery);
|
|
782
782
|
const confirmDispatch = () => {
|
|
783
783
|
if (refetchAllowance?.permit && !refetchPermitUsed) {
|
|
784
|
-
if (!refetchAllowance.permit.use()) throw new SendBudgetExhaustedError(
|
|
784
|
+
if (!refetchAllowance.permit.use()) throw new SendBudgetExhaustedError(errorDestinationLabel(retryRequest.url));
|
|
785
785
|
refetchPermitUsed = true;
|
|
786
786
|
}
|
|
787
787
|
if (!pendingKeyMetadata) transportState.noteRoutedAttemptSend(retryEstimate, recoveryKind ?? recovery);
|
|
@@ -799,7 +799,7 @@ export async function prepareAdapterExchange(
|
|
|
799
799
|
providerFetch(route.provider, options.codexWsRuntimeIdentity, {
|
|
800
800
|
dispatchOverride: oauthDispatch(retryRequest),
|
|
801
801
|
onPhysicalDispatch: deferredRefetch ? () => {
|
|
802
|
-
if (!deferredRefetch.beforeDispatch()) throw new SendBudgetExhaustedError(
|
|
802
|
+
if (!deferredRefetch.beforeDispatch()) throw new SendBudgetExhaustedError(errorDestinationLabel(retryRequest.url));
|
|
803
803
|
confirmDispatch();
|
|
804
804
|
} : undefined,
|
|
805
805
|
providerName: route.providerName,
|
|
@@ -810,7 +810,7 @@ export async function prepareAdapterExchange(
|
|
|
810
810
|
},
|
|
811
811
|
{
|
|
812
812
|
abortSignal: upstream.signal,
|
|
813
|
-
label: safeHostLabel(retryRequest.url),
|
|
813
|
+
label: safeHostLabel(retryRequest.url), destination: errorDestinationLabel(retryRequest.url),
|
|
814
814
|
claimAmbiguousResend: claimPreHeaderResend,
|
|
815
815
|
...(refetchAllowance
|
|
816
816
|
? {
|
|
@@ -841,7 +841,7 @@ export async function prepareAdapterExchange(
|
|
|
841
841
|
cleanupUpstreamAbort();
|
|
842
842
|
upstream.abort();
|
|
843
843
|
releaseCodexAuthContextProbeLease(admissionState.authCtx);
|
|
844
|
-
return { failed: admissionModelDeniedResponse(scopeRefusal) };
|
|
844
|
+
return { failed: admissionModelDeniedResponse(projectAdmissionModelDeniedLog(scopeRefusal, logCtx)) };
|
|
845
845
|
}
|
|
846
846
|
const codexRefusal = !options.abortSignal?.aborted && mapCodexAuthContextErrorToResponse(unwrapUpstreamRetryEvidenceError(err), {
|
|
847
847
|
now: Date.now(), accountSelector: route.codexAccountNamespace,
|
|
@@ -861,10 +861,10 @@ export async function prepareAdapterExchange(
|
|
|
861
861
|
}
|
|
862
862
|
const refusal = err instanceof UpstreamRetryEvidenceError ? err.cause : err;
|
|
863
863
|
if (refusal instanceof OAuthAccountPausedError) {
|
|
864
|
-
return { failed: formatErrorResponse(403, "permission_error", publicOAuthAuthenticationErrorMessage(refusal)) };
|
|
864
|
+
return { failed: markProxyError(formatErrorResponse(403, "permission_error", publicOAuthAuthenticationErrorMessage(refusal))) };
|
|
865
865
|
}
|
|
866
866
|
if (refusal instanceof OAuthLoginRequiredError) {
|
|
867
|
-
return { failed: formatErrorResponse(401, "authentication_error", publicOAuthAuthenticationErrorMessage(refusal)) };
|
|
867
|
+
return { failed: markProxyError(formatErrorResponse(401, "authentication_error", publicOAuthAuthenticationErrorMessage(refusal))) };
|
|
868
868
|
}
|
|
869
869
|
if (refusal instanceof AnthropicAccountCooldownError) {
|
|
870
870
|
return { failed: anthropicPoolCooldownResponse(refusal, { comboAttempt: options.comboAttempt, logCtx }) };
|
|
@@ -873,7 +873,7 @@ export async function prepareAdapterExchange(
|
|
|
873
873
|
// this proxy rather than the provider it never reached.
|
|
874
874
|
if (err instanceof SendBudgetExhaustedError) {
|
|
875
875
|
return { failed: unboundPoolSpendRefusalResponse(logCtx)
|
|
876
|
-
?? formatErrorResponse(429, SEND_BUDGET_EXHAUSTED_CODE, err.message) };
|
|
876
|
+
?? markProxyError(formatErrorResponse(429, SEND_BUDGET_EXHAUSTED_CODE, err.message)) };
|
|
877
877
|
}
|
|
878
878
|
const msg = describeUpstreamConnectFailure(err, connectMs);
|
|
879
879
|
return { failed: formatErrorResponse(502, "upstream_error", msg) };
|
|
@@ -975,7 +975,7 @@ export async function prepareAdapterExchange(
|
|
|
975
975
|
try { void upstreamResponse.body?.cancel().catch(() => {}); } catch { /* already closed */ }
|
|
976
976
|
releaseCodexAuthContextProbeLease(admissionState.authCtx);
|
|
977
977
|
return cancelled ? clientCancelledResponse()
|
|
978
|
-
: formatErrorResponse(503, "server_error", publicOAuthAuthenticationErrorMessage(err), { retryAfter: "1" });
|
|
978
|
+
: markProxyError(formatErrorResponse(503, "server_error", publicOAuthAuthenticationErrorMessage(err), { retryAfter: "1" }));
|
|
979
979
|
}
|
|
980
980
|
const failed = transportState.sentOAuthSnapshot;
|
|
981
981
|
if (route.providerName === "google-antigravity" && !antigravityAuthRotationAttempted
|
|
@@ -1027,13 +1027,13 @@ export async function prepareAdapterExchange(
|
|
|
1027
1027
|
}
|
|
1028
1028
|
cleanupUpstreamAbort();
|
|
1029
1029
|
if (err instanceof OAuthAccountPausedError) {
|
|
1030
|
-
return formatErrorResponse(403, "permission_error", publicOAuthAuthenticationErrorMessage(err));
|
|
1030
|
+
return markProxyError(formatErrorResponse(403, "permission_error", publicOAuthAuthenticationErrorMessage(err)));
|
|
1031
1031
|
}
|
|
1032
|
-
return formatErrorResponse(401, "authentication_error", publicOAuthAuthenticationErrorMessage(err));
|
|
1032
|
+
return markProxyError(formatErrorResponse(401, "authentication_error", publicOAuthAuthenticationErrorMessage(err)));
|
|
1033
1033
|
}
|
|
1034
1034
|
if (route.provider.googleMode === "cloud-code-assist" && !refreshed.projectId) {
|
|
1035
1035
|
cleanupUpstreamAbort();
|
|
1036
|
-
return formatErrorResponse(401, "authentication_error", publicOAuthAuthenticationErrorMessage(new Error("Cloud Code Assist project is required")));
|
|
1036
|
+
return markProxyError(formatErrorResponse(401, "authentication_error", publicOAuthAuthenticationErrorMessage(new Error("Cloud Code Assist project is required"))));
|
|
1037
1037
|
}
|
|
1038
1038
|
transportState.sentOAuthSnapshot = refreshed;
|
|
1039
1039
|
transportState.replayOAuthCredentialSnapshot = {
|
|
@@ -1651,7 +1651,7 @@ export async function prepareAdapterExchange(
|
|
|
1651
1651
|
cleanupUpstreamAbort();
|
|
1652
1652
|
upstream.abort();
|
|
1653
1653
|
releaseCodexAuthContextProbeLease(admissionState.authCtx);
|
|
1654
|
-
return admissionModelDeniedResponse(scopeRefusal);
|
|
1654
|
+
return admissionModelDeniedResponse(projectAdmissionModelDeniedLog(scopeRefusal, logCtx));
|
|
1655
1655
|
}
|
|
1656
1656
|
// A throw before the send — snapshot fetch, credential application, adapter
|
|
1657
1657
|
// resolution — must hand the reservation back. Without this the ladder charges the
|
|
@@ -1886,15 +1886,16 @@ export async function prepareAdapterExchange(
|
|
|
1886
1886
|
cleanupUpstreamAbort();
|
|
1887
1887
|
}
|
|
1888
1888
|
if (upstreamResponse.status === 413) {
|
|
1889
|
+
if (options.clientModelLabel) projectLocalModelRefusalLog(logCtx, options.clientModelLabel);
|
|
1889
1890
|
return clientRequestedStream
|
|
1890
|
-
? streamingContextOverflowResponse(
|
|
1891
|
+
? streamingContextOverflowResponse(clientFacingModelText(options.clientModelLabel), translatorBudget)
|
|
1891
1892
|
: jsonContextOverflowResponse();
|
|
1892
1893
|
}
|
|
1893
1894
|
const policyRefusal = rewriteUpstreamPolicyRefusal({
|
|
1894
1895
|
status: upstreamResponse.status,
|
|
1895
1896
|
errorText,
|
|
1896
1897
|
stream: clientRequestedStream,
|
|
1897
|
-
modelId:
|
|
1898
|
+
modelId: clientFacingModelText(options.clientModelLabel),
|
|
1898
1899
|
// The same host check covers the openai-chat wire: both xAI hosts serve Chat too.
|
|
1899
1900
|
destinationIsXai: isXaiResponsesDestination(route.provider),
|
|
1900
1901
|
translatorBudget,
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { isProxyError, rememberProxyErrorMessage } from "../../lib/client-error-body";
|
|
1
2
|
import { anthropicRejectionPolicy, bindAnthropicRejectionPolicy, rejectedAnthropicPayloads } from "../../adapters/anthropic-rejection-memo";
|
|
2
3
|
import { normalizeUpstreamErrorText, readDisplaySafeErrorText } from "./core-errors";
|
|
3
4
|
import { sanitizeNonReplayableUpstreamError } from "./non-replayable-error";
|
|
@@ -28,6 +29,7 @@ export function createAnthropicThinkingRecovery(
|
|
|
28
29
|
signal: AbortSignal,
|
|
29
30
|
guard: OpaqueBlobRecoveryGuard,
|
|
30
31
|
canRetry: () => boolean,
|
|
32
|
+
proxyErrorContext?: object,
|
|
31
33
|
) {
|
|
32
34
|
let rejectedScope: OcxParsedRequest["_reasoningReplayScope"];
|
|
33
35
|
let rejectedPayloads: ReadonlySet<string> | undefined;
|
|
@@ -146,6 +148,7 @@ export function createAnthropicThinkingRecovery(
|
|
|
146
148
|
if (nonReplayable) response = await sanitizeNonReplayableUpstreamError(response, abortSignal);
|
|
147
149
|
const text = await readDisplaySafeErrorText(response, abortSignal, `Provider error ${response.status}`);
|
|
148
150
|
const error = normalizeUpstreamErrorText(text, `Provider error ${response.status}`);
|
|
151
|
+
if (proxyErrorContext && isProxyError(response)) rememberProxyErrorMessage(proxyErrorContext, error.message ?? error.safeText, { status: response.status, type: error.type ?? "upstream_error", code: error.code });
|
|
149
152
|
return { type: "error", status: response.status, message: error.message ?? error.safeText,
|
|
150
153
|
errorType: error.type ?? "upstream_error", ...(error.code ? { code: error.code } : {}),
|
|
151
154
|
...(nonReplayable ? { retryable: false } : {}) };
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { markProxyError } from "../../lib/client-error-body";
|
|
1
2
|
import { CodexInstallationIdUnavailableError } from "../../codex/installation-id";
|
|
2
3
|
import { formatErrorResponse } from "../../bridge";
|
|
3
4
|
import {
|
|
@@ -27,9 +28,9 @@ export interface CodexAuthContextErrorResponseOptions {
|
|
|
27
28
|
|
|
28
29
|
export function codexModelAvailabilityErrorResponse(error: CodexModelAvailabilityError): Response {
|
|
29
30
|
if (error.reason === "temporarily_unavailable") {
|
|
30
|
-
return formatErrorResponse(429, "rate_limit_error", error.message);
|
|
31
|
+
return markProxyError(formatErrorResponse(429, "rate_limit_error", error.message));
|
|
31
32
|
}
|
|
32
|
-
return formatErrorResponse(400, "invalid_request_error", error.message);
|
|
33
|
+
return markProxyError(formatErrorResponse(400, "invalid_request_error", error.message));
|
|
33
34
|
}
|
|
34
35
|
|
|
35
36
|
/** Actionable sign-in guidance without guessing which upstream revocation cause occurred. */
|
|
@@ -40,7 +41,7 @@ export function nativeMainRefreshFailureResponse(error: unknown): Response {
|
|
|
40
41
|
if (error instanceof MainAccountTokenRefreshError && error.reason === "reauth") {
|
|
41
42
|
// Same sentence the quarantine produces on every later request, so the first refusal and the
|
|
42
43
|
// ones after it do not describe one dead credential two different ways.
|
|
43
|
-
return formatErrorResponse(401, "authentication_error", CODEX_MAIN_SIGN_IN_REQUIRED_MESSAGE);
|
|
44
|
+
return markProxyError(formatErrorResponse(401, "authentication_error", CODEX_MAIN_SIGN_IN_REQUIRED_MESSAGE));
|
|
44
45
|
}
|
|
45
46
|
if (error instanceof MainAccountTokenRefreshError
|
|
46
47
|
|| error instanceof MainAuthJsonChangedDuringRefreshError
|
|
@@ -61,17 +62,17 @@ export function nativeMainRefreshFailureResponse(error: unknown): Response {
|
|
|
61
62
|
// bad API key and the client stops retrying. The pool path documented this trap and this one
|
|
62
63
|
// walked into it anyway, which is why the test below now asserts the classification and not
|
|
63
64
|
// just the sentence.
|
|
64
|
-
const response = formatErrorResponse(
|
|
65
|
+
const response = markProxyError(formatErrorResponse(
|
|
65
66
|
503,
|
|
66
67
|
"server_busy",
|
|
67
68
|
"Codex main credential refresh did not complete; retry this request. "
|
|
68
69
|
+ "If it keeps failing, sign in to the main Codex account again.",
|
|
69
|
-
);
|
|
70
|
+
));
|
|
70
71
|
const headers = new Headers(response.headers);
|
|
71
72
|
headers.set("Retry-After", "1");
|
|
72
|
-
return new Response(response.body, { status: response.status, headers });
|
|
73
|
+
return markProxyError(new Response(response.body, { status: response.status, headers }));
|
|
73
74
|
}
|
|
74
|
-
return formatErrorResponse(401, "authentication_error", "No usable Codex main credential to serve this request");
|
|
75
|
+
return markProxyError(formatErrorResponse(401, "authentication_error", "No usable Codex main credential to serve this request"));
|
|
75
76
|
}
|
|
76
77
|
|
|
77
78
|
/** Shared HTTP contract for Codex auth-context failures on Responses surfaces. */
|
|
@@ -80,48 +81,48 @@ export function mapCodexAuthContextErrorToResponse(
|
|
|
80
81
|
options: CodexAuthContextErrorResponseOptions,
|
|
81
82
|
): Response | undefined {
|
|
82
83
|
if (error instanceof CodexInstallationIdUnavailableError) {
|
|
83
|
-
return formatErrorResponse(503, "server_busy", error.message);
|
|
84
|
+
return markProxyError(formatErrorResponse(503, "server_busy", error.message));
|
|
84
85
|
}
|
|
85
86
|
if (error instanceof CodexAccountCooldownError) {
|
|
86
87
|
const response = cooldownErrorResponse(error, options.now, options.accountSelector);
|
|
87
88
|
// Exact class only (#7850): main hard-lock, credit, Reserve, recovery-withheld and future
|
|
88
89
|
// policy subclasses keep their own retry semantics, including in combo target cooldowns.
|
|
89
|
-
return error.constructor === CodexAccountCooldownError ? markCodexAccountCooldownResponse(response) : response;
|
|
90
|
+
return markProxyError(error.constructor === CodexAccountCooldownError ? markCodexAccountCooldownResponse(response) : response);
|
|
90
91
|
}
|
|
91
92
|
if (error instanceof CodexMainProfileDrainingError) {
|
|
92
|
-
return codexMainProfileDrainingResponse();
|
|
93
|
+
return markProxyError(codexMainProfileDrainingResponse());
|
|
93
94
|
}
|
|
94
95
|
if (error instanceof CodexThreadAffinityExpiredError) {
|
|
95
|
-
return formatErrorResponse(
|
|
96
|
+
return markProxyError(formatErrorResponse(
|
|
96
97
|
409,
|
|
97
98
|
"invalid_request_error",
|
|
98
99
|
"Codex thread account affinity expired; start a new session",
|
|
99
|
-
);
|
|
100
|
+
));
|
|
100
101
|
}
|
|
101
102
|
if (error instanceof CodexAuthContextError) {
|
|
102
103
|
if (error.accountId === MAIN_CODEX_ACCOUNT_ID) {
|
|
103
104
|
return nativeMainRefreshFailureResponse(error.cause);
|
|
104
105
|
}
|
|
105
|
-
return formatErrorResponse(
|
|
106
|
+
return markProxyError(formatErrorResponse(
|
|
106
107
|
401,
|
|
107
108
|
"authentication_error",
|
|
108
109
|
"Selected Codex account needs reauthentication",
|
|
109
|
-
);
|
|
110
|
+
));
|
|
110
111
|
}
|
|
111
112
|
if (error instanceof CodexModelAvailabilityError) {
|
|
112
113
|
return codexModelAvailabilityErrorResponse(error);
|
|
113
114
|
}
|
|
114
115
|
if (error instanceof CodexPoolAuthenticationError || error instanceof CodexDirectAuthenticationError) {
|
|
115
|
-
return formatErrorResponse(401, "authentication_error",
|
|
116
|
+
return markProxyError(formatErrorResponse(401, "authentication_error",
|
|
116
117
|
error instanceof CodexPoolAuthenticationError && error.quarantinedMain
|
|
117
|
-
? CODEX_MAIN_SIGN_IN_REQUIRED_MESSAGE : error.message);
|
|
118
|
+
? CODEX_MAIN_SIGN_IN_REQUIRED_MESSAGE : error.message));
|
|
118
119
|
}
|
|
119
120
|
if (error instanceof CodexMainSubstitutionUnavailableError) {
|
|
120
|
-
return formatErrorResponse(
|
|
121
|
+
return markProxyError(formatErrorResponse(
|
|
121
122
|
401,
|
|
122
123
|
"authentication_error",
|
|
123
124
|
"No usable Codex main credential to serve this request",
|
|
124
|
-
);
|
|
125
|
+
));
|
|
125
126
|
}
|
|
126
127
|
return undefined;
|
|
127
128
|
}
|
|
@@ -3,7 +3,7 @@ import { mergeSteeringContinuation } from "./native-steering-settings";
|
|
|
3
3
|
import { markNativeControlResponse } from "./native-response-control";
|
|
4
4
|
import type { NativeResponseControl } from "./native-response-control";
|
|
5
5
|
import { MAX_CLIENT_SSE_FRAME_BYTES } from "../sse-frame-buffer";
|
|
6
|
-
import { isSafeResponseHeader } from "../safe-response-headers";
|
|
6
|
+
import { isSafeResponseHeader, type ResponseMetadataContext } from "../safe-response-headers";
|
|
7
7
|
import { CodexWsMetadata, type CodexWsQuotaObserver } from "./codex-ws-metadata";
|
|
8
8
|
import { CODEX_RESPONSES_HTTP_URL, type PreparedCodexWsRequest } from "./codex-ws-request";
|
|
9
9
|
import { CodexWsCorrelation } from "./codex-ws-correlation";
|
|
@@ -36,6 +36,8 @@ interface ExchangeOptions {
|
|
|
36
36
|
* control exchanges and on transports without the metadata channel.
|
|
37
37
|
*/
|
|
38
38
|
preOutputRefusalHold?: CodexWsPreOutputRefusalHold;
|
|
39
|
+
/** Turn-state binding and known models for the metadata this exchange relays. */
|
|
40
|
+
metadataContext?: ResponseMetadataContext;
|
|
39
41
|
}
|
|
40
42
|
|
|
41
43
|
const HTTP_HEADER_TOKEN = /^[!#$%&'*+.^_`|~0-9a-z-]+$/i;
|
|
@@ -45,7 +47,7 @@ function record(value: unknown): value is Record<string, unknown> {
|
|
|
45
47
|
}
|
|
46
48
|
|
|
47
49
|
/** Rebuild only permitted metadata: upstream framing describes a different body. */
|
|
48
|
-
function rejectionHeaders(source: Record<string, unknown>, prelude: Headers): Headers {
|
|
50
|
+
function rejectionHeaders(source: Record<string, unknown>, prelude: Headers, context: ResponseMetadataContext): Headers {
|
|
49
51
|
const connectionHeaders = new Set<string>();
|
|
50
52
|
for (const [name, value] of Object.entries(source)) {
|
|
51
53
|
if (name.toLowerCase() !== "connection" || typeof value !== "string") continue;
|
|
@@ -57,7 +59,7 @@ function rejectionHeaders(source: Record<string, unknown>, prelude: Headers): He
|
|
|
57
59
|
// Reuse the metadata owner's count/value/family budgets and window freshness
|
|
58
60
|
// rules, without publishing quota twice. Pool bookkeeping consumes the HTTP
|
|
59
61
|
// projection; plain-main publication belongs only to the WS observer.
|
|
60
|
-
const projected = new CodexWsMetadata();
|
|
62
|
+
const projected = new CodexWsMetadata(undefined, context);
|
|
61
63
|
try {
|
|
62
64
|
for (const values of [Object.fromEntries(prelude), source]) {
|
|
63
65
|
const headers = Object.fromEntries(Object.entries(values).filter(([name, value]) => {
|
|
@@ -88,7 +90,7 @@ function rejectionHeaders(source: Record<string, unknown>, prelude: Headers): He
|
|
|
88
90
|
* The one 5xx exception is the opt-in pre-output refusal below (#6969): a structured upstream
|
|
89
91
|
* refusal with nothing relayed but empty lifecycle frames, which the caller may replay.
|
|
90
92
|
*/
|
|
91
|
-
function wrappedRejectionResponse(payload: Record<string, unknown>, prelude: Headers): Response | null {
|
|
93
|
+
function wrappedRejectionResponse(payload: Record<string, unknown>, prelude: Headers, context: ResponseMetadataContext): Response | null {
|
|
92
94
|
if (payload.type !== "error" || payload.stream_id !== undefined) return null;
|
|
93
95
|
// The native typed wrapper has one aliased field, not two competing statuses.
|
|
94
96
|
if (Object.hasOwn(payload, "status_code") && Object.hasOwn(payload, "status")) return null;
|
|
@@ -98,7 +100,7 @@ function wrappedRejectionResponse(payload: Record<string, unknown>, prelude: Hea
|
|
|
98
100
|
if (error != null && (!record(error)
|
|
99
101
|
|| [error.code, error.message].some(value => value != null && typeof value !== "string"))) return null;
|
|
100
102
|
if (payload.headers != null && !record(payload.headers)) return null;
|
|
101
|
-
const headers = rejectionHeaders(record(payload.headers) ? payload.headers : {}, prelude);
|
|
103
|
+
const headers = rejectionHeaders(record(payload.headers) ? payload.headers : {}, prelude, context);
|
|
102
104
|
return new Response(JSON.stringify({
|
|
103
105
|
error: error ?? { type: "upstream_error", message: "Upstream rejected the request" },
|
|
104
106
|
}), { status, headers });
|
|
@@ -118,6 +120,7 @@ function refusalErrorBody(source: unknown): Record<string, string> {
|
|
|
118
120
|
export function codexWsExchange(options: ExchangeOptions): Promise<Response> {
|
|
119
121
|
const { session, url, init, prepared, sseFallback, onQuota, beforeDispatch, bunVersion, nativeControl, beforeContinuation,
|
|
120
122
|
preOutputRefusalHold } = options;
|
|
123
|
+
const metadataContext = options.metadataContext ?? {};
|
|
121
124
|
const { frameText, headers } = prepared;
|
|
122
125
|
const signal = init.signal ?? undefined;
|
|
123
126
|
return new Promise<Response>((resolve, reject) => {
|
|
@@ -148,7 +151,7 @@ export function codexWsExchange(options: ExchangeOptions): Promise<Response> {
|
|
|
148
151
|
let terminalErrorStatus: number | null = null;
|
|
149
152
|
let controller: ReadableStreamDefaultController<Uint8Array> | null = null;
|
|
150
153
|
const encoder = new TextEncoder();
|
|
151
|
-
const metadata = url === CODEX_RESPONSES_HTTP_URL ? new CodexWsMetadata(onQuota) : null;
|
|
154
|
+
const metadata = url === CODEX_RESPONSES_HTTP_URL ? new CodexWsMetadata(onQuota, metadataContext) : null;
|
|
152
155
|
const correlation = session.retainable ? new CodexWsCorrelation(session.reused, id => session.hasCompleted(id)) : null;
|
|
153
156
|
let detachOwner = () => {};
|
|
154
157
|
let detachSteering = () => {};
|
|
@@ -656,7 +659,7 @@ export function codexWsExchange(options: ExchangeOptions): Promise<Response> {
|
|
|
656
659
|
// in-body delivery, so a held 429 can never become a quota rotation it was not before.
|
|
657
660
|
if (metadata && sent && !responseCommitted && !deferredCommit && type === "error") {
|
|
658
661
|
let rejection: Response | null;
|
|
659
|
-
try { rejection = wrappedRejectionResponse(normalized.payload, metadata.snapshot()); }
|
|
662
|
+
try { rejection = wrappedRejectionResponse(normalized.payload, metadata.snapshot(), metadataContext); }
|
|
660
663
|
catch (error) { failStream(error); return; }
|
|
661
664
|
if (rejection) {
|
|
662
665
|
terminal = true;
|
|
@@ -677,7 +680,7 @@ export function codexWsExchange(options: ExchangeOptions): Promise<Response> {
|
|
|
677
680
|
try {
|
|
678
681
|
refusalPrelude = heldHeaders ?? metadata?.snapshot() ?? new Headers();
|
|
679
682
|
const declared = normalized.payload.headers;
|
|
680
|
-
refusalHeaders = rejectionHeaders(record(declared) ? declared : {}, refusalPrelude);
|
|
683
|
+
refusalHeaders = rejectionHeaders(record(declared) ? declared : {}, refusalPrelude, metadataContext);
|
|
681
684
|
} catch {
|
|
682
685
|
refusalStatus = undefined;
|
|
683
686
|
}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {
|
|
2
|
+
CODEX_QUOTA_FAMILIES, isSafeResponseHeader, normalizeSafeResponseHeader, safeResponseHeaders, type ResponseMetadataContext,
|
|
3
|
+
} from "../safe-response-headers";
|
|
2
4
|
|
|
3
5
|
export const CODEX_WS_METADATA_MAX_BYTES = 32 * 1024;
|
|
4
6
|
export const CODEX_WS_METADATA_MAX_FAMILIES = 16;
|
|
@@ -52,35 +54,98 @@ function finiteNonnegative(value: unknown): value is number {
|
|
|
52
54
|
return typeof value === "number" && Number.isFinite(value) && value >= 0;
|
|
53
55
|
}
|
|
54
56
|
|
|
55
|
-
function
|
|
56
|
-
|
|
57
|
+
function boundedInteger(value: unknown, max: number): value is number {
|
|
58
|
+
return finiteNonnegative(value) && Number.isSafeInteger(value) && value <= max;
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
// Native limit ids this proxy relays, keyed by their folded spelling; the value is the canonical id.
|
|
62
|
+
const NATIVE_LIMIT_IDS = new Map<string, string>([
|
|
63
|
+
["codex", "codex"], ...CODEX_QUOTA_FAMILIES.map(family => [`codex-${family}`, `codex_${family}`] as [string, string]),
|
|
64
|
+
]);
|
|
65
|
+
// ChatGPT plan labels relayed in the native frame; anything else is omitted.
|
|
66
|
+
const PLAN_TYPES = new Set(["free", "go", "plus", "pro", "team", "business", "enterprise", "edu"]);
|
|
67
|
+
|
|
68
|
+
/** Canonical native limit id, undefined when absent, null when present but not a known id. */
|
|
69
|
+
function nativeLimitId(raw: unknown): string | null | undefined {
|
|
70
|
+
if (raw === undefined) return undefined;
|
|
57
71
|
if (typeof raw !== "string") return null;
|
|
58
|
-
|
|
59
|
-
|
|
72
|
+
return NATIVE_LIMIT_IDS.get(raw.trim().toLowerCase().replaceAll("_", "-")) ?? null;
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
function nativeLimitFamily(event: Record<string, unknown>): string | null {
|
|
76
|
+
const id = nativeLimitId(event.metered_limit_name ?? event.limit_name ?? "codex");
|
|
77
|
+
return id ? id.replaceAll("_", "-") : null;
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
type QuotaWindow = { used_percent: number; window_minutes?: number; reset_at?: number };
|
|
81
|
+
|
|
82
|
+
/** A quota window rebuilt from bounded numbers: percent clamped to 100 at two decimals, integer window and reset. */
|
|
83
|
+
function quotaWindow(value: unknown): QuotaWindow | undefined {
|
|
84
|
+
if (!record(value) || !finiteNonnegative(value.used_percent)) return undefined;
|
|
85
|
+
const window: QuotaWindow = { used_percent: Math.round(Math.min(value.used_percent, 100) * 100) / 100 };
|
|
86
|
+
if (boundedInteger(value.window_minutes, 1e7)) window.window_minutes = value.window_minutes;
|
|
87
|
+
if (boundedInteger(value.reset_at, 1e11)) window.reset_at = value.reset_at;
|
|
88
|
+
return window;
|
|
60
89
|
}
|
|
61
90
|
|
|
62
|
-
function writeWindow(headers: Headers, prefix: string,
|
|
63
|
-
if (!
|
|
64
|
-
headers.set(`${prefix}-used-percent`, String(
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
91
|
+
function writeWindow(headers: Headers, prefix: string, window: QuotaWindow | undefined): void {
|
|
92
|
+
if (!window) return;
|
|
93
|
+
headers.set(`${prefix}-used-percent`, String(window.used_percent));
|
|
94
|
+
if (window.window_minutes !== undefined) headers.set(`${prefix}-window-minutes`, String(window.window_minutes));
|
|
95
|
+
if (window.reset_at !== undefined) headers.set(`${prefix}-reset-at`, String(window.reset_at));
|
|
96
|
+
}
|
|
97
|
+
|
|
98
|
+
/**
|
|
99
|
+
* The `codex.rate_limits` frame relayed to the client, rebuilt field by field: known limit ids and
|
|
100
|
+
* plan labels, boolean flags and bounded quota windows. Every other field is discarded, including
|
|
101
|
+
* the credit balance (it is only relayed as the proxy-formatted `x-codex-credits-balance` header).
|
|
102
|
+
* Windows of an unknown limit id are dropped, never relabelled as ordinary quota.
|
|
103
|
+
*/
|
|
104
|
+
function rateLimitsFrame(event: Record<string, unknown>): Record<string, unknown> {
|
|
105
|
+
const frame: Record<string, unknown> = { type: "codex.rate_limits" };
|
|
106
|
+
if (typeof event.plan_type === "string" && PLAN_TYPES.has(event.plan_type)) frame.plan_type = event.plan_type;
|
|
107
|
+
for (const field of ["metered_limit_name", "limit_name"] as const) {
|
|
108
|
+
const id = nativeLimitId(event[field]);
|
|
109
|
+
if (id) frame[field] = id;
|
|
110
|
+
}
|
|
111
|
+
if (record(event.rate_limits)) {
|
|
112
|
+
const limits: Record<string, unknown> = {};
|
|
113
|
+
for (const flag of ["allowed", "limit_reached"]) {
|
|
114
|
+
if (typeof event.rate_limits[flag] === "boolean") limits[flag] = event.rate_limits[flag];
|
|
115
|
+
}
|
|
116
|
+
if (nativeLimitFamily(event)) {
|
|
117
|
+
for (const name of ["primary", "secondary"]) {
|
|
118
|
+
const window = quotaWindow(event.rate_limits[name]);
|
|
119
|
+
if (window) limits[name] = window;
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
frame.rate_limits = limits;
|
|
123
|
+
}
|
|
124
|
+
if (record(event.credits)) {
|
|
125
|
+
const credits: Record<string, unknown> = {};
|
|
126
|
+
for (const flag of ["has_credits", "unlimited"]) {
|
|
127
|
+
if (typeof event.credits[flag] === "boolean") credits[flag] = event.credits[flag];
|
|
128
|
+
}
|
|
129
|
+
frame.credits = credits;
|
|
68
130
|
}
|
|
131
|
+
return frame;
|
|
69
132
|
}
|
|
70
133
|
|
|
71
134
|
function quotaHeaders(event: Record<string, unknown>): Headers {
|
|
72
135
|
const headers = new Headers();
|
|
73
136
|
const family = nativeLimitFamily(event);
|
|
74
137
|
if (family && record(event.rate_limits)) {
|
|
75
|
-
writeWindow(headers, `x-${family}-primary`, event.rate_limits.primary);
|
|
76
|
-
writeWindow(headers, `x-${family}-secondary`, event.rate_limits.secondary);
|
|
138
|
+
writeWindow(headers, `x-${family}-primary`, quotaWindow(event.rate_limits.primary));
|
|
139
|
+
writeWindow(headers, `x-${family}-secondary`, quotaWindow(event.rate_limits.secondary));
|
|
77
140
|
}
|
|
78
141
|
if (record(event.credits)) {
|
|
79
142
|
for (const [field, suffix] of [["has_credits", "has-credits"], ["unlimited", "unlimited"]]) {
|
|
80
143
|
const value = event.credits[field!];
|
|
81
144
|
if (typeof value === "boolean") headers.set(`x-codex-credits-${suffix}`, String(value));
|
|
82
145
|
}
|
|
83
|
-
|
|
146
|
+
const balance = typeof event.credits.balance === "string"
|
|
147
|
+
? normalizeSafeResponseHeader("x-codex-credits-balance", event.credits.balance) : undefined;
|
|
148
|
+
if (balance !== undefined) setMetadataHeader(headers, "x-codex-credits-balance", balance);
|
|
84
149
|
}
|
|
85
150
|
return headers;
|
|
86
151
|
}
|
|
@@ -91,13 +156,17 @@ function setMetadataHeader(headers: Headers, name: string, value: string): void
|
|
|
91
156
|
try { headers.set(name, value); } catch { /* invalid provider header is not HTTP authority */ }
|
|
92
157
|
}
|
|
93
158
|
|
|
94
|
-
function responseHeaders(value: unknown): Headers {
|
|
159
|
+
function responseHeaders(value: unknown, context: ResponseMetadataContext): Headers {
|
|
95
160
|
const headers = new Headers();
|
|
96
161
|
if (!record(value)) return headers;
|
|
97
162
|
for (const [name, field] of Object.entries(value)) {
|
|
98
163
|
if (!isSafeResponseHeader(name)) continue;
|
|
99
164
|
if (typeof field !== "string" && typeof field !== "number" && typeof field !== "boolean") continue;
|
|
100
|
-
|
|
165
|
+
const raw = String(field);
|
|
166
|
+
// The byte budget applies to what the upstream sent; then only a value that fits its contract stays.
|
|
167
|
+
if (Buffer.byteLength(raw) > CODEX_WS_METADATA_MAX_VALUE_BYTES) throw new Error("codex websocket metadata value exceeds the size limit");
|
|
168
|
+
const normalized = normalizeSafeResponseHeader(name, raw, context);
|
|
169
|
+
if (normalized !== undefined) setMetadataHeader(headers, name, normalized);
|
|
101
170
|
}
|
|
102
171
|
return headers;
|
|
103
172
|
}
|
|
@@ -124,7 +193,7 @@ export class CodexWsMetadata {
|
|
|
124
193
|
private preludeBytes = 0;
|
|
125
194
|
private committed = false;
|
|
126
195
|
|
|
127
|
-
constructor(private observer?: CodexWsQuotaObserver) {}
|
|
196
|
+
constructor(private observer?: CodexWsQuotaObserver, private readonly context: ResponseMetadataContext = {}) {}
|
|
128
197
|
|
|
129
198
|
snapshot(): Headers { return new Headers(this.headers); }
|
|
130
199
|
|
|
@@ -132,7 +201,11 @@ export class CodexWsMetadata {
|
|
|
132
201
|
seed(headers: Headers): void {
|
|
133
202
|
if (this.ended || this.committed || this.headers.has(REASONING_INCLUDED_HEADER)) return;
|
|
134
203
|
const value = headers.get(REASONING_INCLUDED_HEADER);
|
|
135
|
-
if (value
|
|
204
|
+
if (value === null) return;
|
|
205
|
+
// Codex reads this header by presence. Keep it present, but only as bytes this proxy writes:
|
|
206
|
+
// an exact boolean, otherwise an empty value.
|
|
207
|
+
const folded = value.trim().toLowerCase();
|
|
208
|
+
setMetadataHeader(this.headers, REASONING_INCLUDED_HEADER, folded === "true" || folded === "false" ? folded : "");
|
|
136
209
|
}
|
|
137
210
|
|
|
138
211
|
private publishQuota(headers: Headers): void {
|
|
@@ -152,7 +225,7 @@ export class CodexWsMetadata {
|
|
|
152
225
|
if (bytes > CODEX_WS_METADATA_MAX_BYTES) throw new Error("codex websocket metadata frame exceeds the size limit");
|
|
153
226
|
if (!this.committed) this.preludeBytes += bytes;
|
|
154
227
|
if (this.preludeBytes > CODEX_WS_METADATA_MAX_BYTES) throw new Error("codex websocket metadata prelude exceeds the size limit");
|
|
155
|
-
const updates = event.type === "codex.rate_limits" ? quotaHeaders(event) : responseHeaders(event.headers);
|
|
228
|
+
const updates = event.type === "codex.rate_limits" ? quotaHeaders(event) : responseHeaders(event.headers, this.context);
|
|
156
229
|
const next = this.snapshot();
|
|
157
230
|
for (const name of updates.keys()) {
|
|
158
231
|
if (!name.endsWith("-used-percent")) continue;
|
|
@@ -167,8 +240,8 @@ export class CodexWsMetadata {
|
|
|
167
240
|
this.publishQuota(updates);
|
|
168
241
|
}
|
|
169
242
|
return event.type === "codex.response.metadata"
|
|
170
|
-
? JSON.stringify({ type: event.type, headers: safeResponseHeaders(updates) })
|
|
171
|
-
: JSON.stringify(event);
|
|
243
|
+
? JSON.stringify({ type: event.type, headers: safeResponseHeaders(updates, this.context) })
|
|
244
|
+
: JSON.stringify(rateLimitsFrame(event));
|
|
172
245
|
}
|
|
173
246
|
|
|
174
247
|
finish(): void {
|
|
@@ -18,6 +18,8 @@ export interface PreparedCodexWsRequest {
|
|
|
18
18
|
/** Original HTTP body/framing/options with only the canonical routing hint re-derived. */
|
|
19
19
|
httpInit: RequestInit;
|
|
20
20
|
canonical: boolean;
|
|
21
|
+
/** The request's model id, when the body names one: a model the relayed metadata may report. */
|
|
22
|
+
model?: string;
|
|
21
23
|
}
|
|
22
24
|
|
|
23
25
|
function isRecord(value: unknown): value is Record<string, unknown> {
|
|
@@ -83,7 +85,7 @@ export function prepareCodexWsRequest(url: string, init: RequestInit): PreparedC
|
|
|
83
85
|
? headers["openai-beta"]
|
|
84
86
|
: `${headers["openai-beta"]}, ${WS_BETA}`
|
|
85
87
|
: WS_BETA;
|
|
86
|
-
return { frameText, headers, httpInit, canonical };
|
|
88
|
+
return { frameText, headers, httpInit, canonical, ...(typeof body.model === "string" ? { model: body.model } : {}) };
|
|
87
89
|
} catch {
|
|
88
90
|
return null;
|
|
89
91
|
}
|