@bitkyc08/opencodex 2.100.5 → 2.100.6
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/README.md +1 -1
- package/bin/ocx.mjs +2 -0
- package/gui/dist/assets/App-BI8LQ7Qk.css +1 -0
- package/gui/dist/assets/App-CsZ1Gr7S.js +60 -0
- package/gui/dist/assets/Tray-CVqm4S4W.js +1 -0
- package/gui/dist/assets/brand-mark-BebhnAtV.js +1 -0
- package/gui/dist/assets/index-BtwVlpeQ.css +2 -0
- package/gui/dist/assets/index-CEeMegqE.js +138 -0
- package/gui/dist/assets/{segment-thumb-features-Bquysdn5.js → segment-thumb-features-COdzmORE.js} +1 -1
- package/gui/dist/classic/assets/App-BJgUWNJ8.js +59 -0
- package/gui/dist/classic/assets/App-CoiVLRW3.css +1 -0
- package/gui/dist/classic/assets/Tray-BDlcOLDK.js +1 -0
- package/gui/dist/classic/assets/index-B9Jgli_W.js +138 -0
- package/gui/dist/classic/assets/usage-companion-chart-vbzDcND0.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.lock +62 -0
- package/native/ocx-child/Cargo.toml +1 -0
- package/native/ocx-child/src/journal.rs +32 -10
- package/native/ocx-child/src/state.rs +2 -1
- package/native/ocx-child/src/toml_surgeon.rs +183 -72
- package/package.json +2 -2
- package/src/adapters/agy-acp/acp.ts +202 -0
- package/src/adapters/agy-acp/adapter.ts +554 -0
- package/src/adapters/agy-acp/binary.ts +79 -0
- package/src/adapters/agy-acp/options.ts +163 -0
- package/src/adapters/agy-acp/output-redaction.ts +270 -0
- package/src/adapters/agy-acp/policy.ts +105 -0
- package/src/adapters/agy-acp/process.ts +218 -0
- package/src/adapters/anthropic/account-metadata.ts +4 -1
- package/src/adapters/anthropic/advisor-tool.ts +43 -9
- package/src/adapters/anthropic/client-identity.ts +2 -0
- package/src/adapters/anthropic.ts +102 -14
- package/src/adapters/antigravity-refusal.ts +5 -1
- package/src/adapters/base.ts +25 -2
- package/src/adapters/claude-cli/adapter.ts +1 -0
- package/src/adapters/claude-cli/usage-admission.ts +12 -9
- package/src/adapters/codebuddy/adapter.ts +1 -0
- package/src/adapters/command-code.ts +2 -2
- package/src/adapters/cursor/http1-bidi.ts +7 -2
- package/src/adapters/cursor/live-transport.ts +2 -0
- package/src/adapters/cursor/request-builder.ts +4 -4
- package/src/adapters/cursor/tool-naming.ts +5 -5
- package/src/adapters/cursor/transport-retry.ts +14 -8
- package/src/adapters/cursor/transport.ts +2 -0
- package/src/adapters/cursor.ts +8 -2
- package/src/adapters/google-error-details.ts +105 -0
- package/src/adapters/google-errors.ts +183 -31
- package/src/adapters/google-http.ts +66 -22
- package/src/adapters/google-truncation.ts +48 -3
- package/src/adapters/google-vertex-endpoint.ts +12 -1
- package/src/adapters/google.ts +54 -26
- package/src/adapters/kiro/adapter.ts +39 -38
- package/src/adapters/kiro/stream.ts +59 -9
- package/src/adapters/kiro-retry.ts +5 -3
- package/src/adapters/m365-copilot/LICENSE +21 -0
- package/src/adapters/m365-copilot/fenced.ts +745 -0
- package/src/adapters/m365-copilot/images.ts +89 -0
- package/src/adapters/m365-copilot/tools.ts +284 -0
- package/src/adapters/m365-copilot/transport.ts +232 -0
- package/src/adapters/m365-copilot.ts +143 -0
- package/src/adapters/openai-chat/tool-schema.ts +2 -2
- package/src/adapters/openai-responses/passthrough.ts +1 -0
- package/src/adapters/openai-responses/reasoning.ts +23 -3
- package/src/adapters/physical-send.ts +11 -4
- package/src/adapters/qoder/adapter.ts +17 -3
- package/src/adapters/registry.ts +15 -1
- package/src/adapters/zed.ts +2 -1
- package/src/advisor/consult.ts +1 -0
- package/src/bridge/response-json.ts +6 -2
- package/src/bridge/sse.ts +21 -9
- package/src/chat/inbound.ts +11 -8
- package/src/chat/outbound.ts +28 -7
- package/src/claude/context-windows.ts +32 -8
- package/src/claude/desktop-3p.ts +18 -14
- package/src/claude/desktop-picker-platform.ts +1 -1
- package/src/claude/desktop-picker.ts +3 -3
- package/src/claude/inbound-content-options.ts +11 -1
- package/src/claude/intercept/picker-ca-cleanup.ts +17 -5
- package/src/claude/intercept/picker-ca.ts +162 -27
- package/src/claude/intercept/picker-trust-linux.ts +411 -0
- package/src/claude/intercept/picker-trust.ts +35 -3
- package/src/claude/intercept/runtime.ts +2 -2
- package/src/claude/subagent-force-status.ts +24 -5
- package/src/claude/subscription-reserve.ts +87 -0
- package/src/cli/account-api.ts +3 -0
- package/src/cli/account-auth.ts +65 -11
- package/src/cli/account-extended.ts +1 -1
- package/src/cli/account-next-actions.ts +4 -1
- package/src/cli/account-policy-dto.ts +1 -1
- package/src/cli/account-policy.ts +6 -3
- package/src/cli/account-probe.ts +66 -0
- package/src/cli/account.ts +8 -2
- package/src/cli/capabilities-accounts.ts +8 -1
- package/src/cli/capabilities-agents-routing.ts +2 -2
- package/src/cli/capabilities-base.ts +4 -4
- package/src/cli/capabilities-integrations.ts +44 -4
- package/src/cli/capabilities-provider-models.ts +6 -0
- package/src/cli/claude-context-settings.ts +60 -0
- package/src/cli/claude-desktop.ts +2 -2
- package/src/cli/claude.ts +15 -7
- package/src/cli/client-start-fence.ts +64 -1
- package/src/cli/combo-result.ts +1 -0
- package/src/cli/combo-stats.ts +1 -1
- package/src/cli/combo.ts +19 -2
- package/src/cli/config-command.ts +21 -8
- package/src/cli/connect.ts +16 -0
- package/src/cli/cross-home-owner.ts +65 -18
- package/src/cli/dispatch.ts +4 -0
- package/src/cli/gateway-client-command.ts +128 -0
- package/src/cli/index.ts +98 -97
- package/src/cli/init.ts +20 -4
- package/src/cli/integrations.ts +23 -3
- package/src/cli/launcher-context.ts +12 -1
- package/src/cli/link.ts +24 -5
- package/src/cli/models-runtime-subcommands.ts +1 -0
- package/src/cli/models-runtime.ts +32 -0
- package/src/cli/start-owner-fence.ts +5 -2
- package/src/cli/status.ts +3 -3
- package/src/cli/stop-client-process.ts +51 -0
- package/src/cli/stop-restore.ts +383 -36
- package/src/cli/sync-command.ts +2 -2
- package/src/cli/uninstall-client-state.ts +7 -0
- package/src/client/connect.ts +72 -13
- package/src/client/hub-client.ts +38 -0
- package/src/client/hub-relay.ts +61 -36
- package/src/client/hub-session.ts +106 -0
- package/src/client/lifecycle-lock.ts +6 -1
- package/src/client/link-relay.ts +2 -1
- package/src/client/machine-listener.ts +60 -1
- package/src/client/runtime-restart.ts +1 -0
- package/src/client/runtime.ts +104 -34
- package/src/client/state.ts +11 -0
- package/src/client/stop-darwin-process.ts +73 -0
- package/src/client/stop-file-routing.ts +49 -0
- package/src/client/stop-native-handoff.ts +108 -0
- package/src/client/stop-routing.ts +41 -7
- package/src/client/stop-teardown-owner.ts +173 -0
- package/src/client/sync-runtime.ts +23 -4
- package/src/clients/config-export/opencode-wire.ts +24 -0
- package/src/clients/config-export.ts +28 -19
- package/src/codex/auth-api/login-flow.ts +68 -33
- package/src/codex/auth-api/main-account-probe.ts +3 -3
- package/src/codex/auth-api/pool-quota-probe.ts +8 -7
- package/src/codex/auth-api/routes.ts +1 -1
- package/src/codex/catalog/aggregation.ts +22 -10
- package/src/codex/catalog/gather-capture.ts +11 -2
- package/src/codex/catalog/m365-copilot-models.ts +52 -0
- package/src/codex/catalog/provider-models.ts +126 -53
- package/src/codex/catalog/routed-gather.ts +26 -12
- package/src/codex/catalog-admission.ts +4 -6
- package/src/codex/catalog-auto-refresh.ts +4 -2
- package/src/codex/catalog-self-heal.ts +4 -2
- package/src/codex/control-plane-models.ts +6 -0
- package/src/codex/convergence.ts +10 -0
- package/src/codex/desktop-app/picker-freshness.ts +3 -14
- package/src/codex/desktop-app/types.ts +6 -0
- package/src/codex/desktop-app/windows-command-payload.ts +9 -0
- package/src/codex/desktop-app/windows.ts +20 -12
- package/src/codex/desktop-compatibility/installed-build.ts +61 -58
- package/src/codex/desktop-compatibility/runtime-ownership.ts +11 -5
- package/src/codex/desktop-compatibility/runtime.ts +51 -14
- package/src/codex/desktop-compatibility/windows-activation-source.ts +28 -13
- package/src/codex/desktop-compatibility/windows-package-command.ts +73 -33
- package/src/codex/desktop-compatibility/windows-package-launch.ts +41 -9
- package/src/codex/desktop-compatibility/windows-package-proof.ts +104 -0
- package/src/codex/inject/config-toml.ts +67 -73
- package/src/codex/inject/plan.ts +11 -10
- package/src/codex/inject/remove.ts +4 -1
- package/src/codex/inject.ts +1 -0
- package/src/codex/journal-config-restore.ts +31 -4
- package/src/codex/journal.ts +16 -4
- package/src/codex/model-cache.ts +98 -27
- package/src/codex/native-residue.ts +14 -13
- package/src/codex/paths.ts +65 -28
- package/src/codex/quota-observation-freshness.ts +4 -0
- package/src/codex/quota.ts +71 -8
- package/src/codex/routing/selection.ts +32 -8
- package/src/combos/capability-policy.ts +31 -0
- package/src/combos/failover.ts +82 -74
- package/src/combos/identifiers.ts +2 -2
- package/src/combos/index.ts +3 -0
- package/src/combos/jev-model-backend.ts +12 -4
- package/src/combos/jev-session-pin-config.ts +22 -9
- package/src/combos/jev.ts +15 -4
- package/src/combos/request-capability.ts +214 -0
- package/src/combos/request.ts +22 -15
- package/src/combos/resolve.ts +5 -2
- package/src/combos/suggestion-channel.ts +89 -0
- package/src/combos/types.ts +14 -1
- package/src/config/account-auto-pause-revisions.ts +33 -10
- package/src/config/atomic-write.ts +1 -1
- package/src/config/codex-ws-incremental-setting.ts +34 -0
- package/src/config/diagnostics.ts +47 -8
- package/src/config/live-topology.ts +4 -2
- package/src/config/load-degrade.ts +96 -2
- package/src/config/mutation-lock.ts +7 -3
- package/src/config/paths.ts +3 -0
- package/src/config/pending-teardown.ts +19 -3
- package/src/config/process-state.ts +30 -12
- package/src/config/provider-validation.ts +10 -0
- package/src/config/salvage.ts +2 -2
- package/src/config/schema/account-auto-pause.ts +15 -1
- package/src/config/schema/agy-acp-references.ts +257 -0
- package/src/config/schema/config-schema.ts +32 -0
- package/src/config/schema/leaf-validators.ts +42 -0
- package/src/config/schema/subscription-reserve.ts +33 -0
- package/src/config/windows-process-command-line.ts +27 -9
- package/src/config.ts +6 -0
- package/src/generated/compatibility-version.json +806 -402
- package/src/images/loop.ts +79 -39
- package/src/integrations/catalog-refresh.ts +19 -1
- package/src/integrations/gateway-clients/agy.ts +340 -0
- package/src/integrations/gateway-clients/antigravity.ts +224 -0
- package/src/integrations/gateway-clients/index.ts +89 -0
- package/src/integrations/gateway-clients/io.ts +278 -0
- package/src/integrations/gateway-clients/types.ts +80 -0
- package/src/integrations/route-intent-disconnect.ts +37 -21
- package/src/lib/app-owned-memory-stores.ts +9 -0
- package/src/lib/cloud-code-appeal-link.ts +30 -0
- package/src/lib/errors.ts +32 -0
- package/src/lib/executor-physical-send-receipt.ts +42 -0
- package/src/lib/failure-detail.ts +1 -0
- package/src/lib/gcp-adc.ts +5 -0
- package/src/lib/http-date.ts +91 -0
- package/src/lib/lab-passive-linker-registration.ts +2 -1
- package/src/lib/local-chat-completion.ts +13 -3
- package/src/lib/local-internal-call-capability.ts +1 -3
- package/src/lib/messages-error-body.ts +2 -1
- package/src/lib/outbound-credential-registry.ts +40 -4
- package/src/lib/pinned-http.ts +7 -2
- package/src/lib/process-control.ts +1 -0
- package/src/lib/provider-egress.ts +16 -0
- package/src/lib/provider-outbound.ts +3 -0
- package/src/lib/redact-folding.ts +12 -3
- package/src/lib/redact.ts +37 -19
- package/src/lib/request-execution-budget.ts +241 -32
- package/src/lib/request-peer-scope.ts +64 -0
- package/src/lib/response-send-readings.ts +41 -0
- package/src/lib/state-store-registrations.ts +5 -0
- package/src/lib/tool-envelope-echo-filter.ts +33 -5
- package/src/lib/upstream-condition.ts +10 -3
- package/src/lib/upstream-retry.ts +95 -20
- package/src/lib/windows-secret-acl.ts +24 -7
- package/src/link/child-activity.ts +60 -4
- package/src/link/codex-settings.ts +2 -1
- package/src/link/relay-auth.ts +1 -0
- package/src/link/route-rounds.ts +32 -9
- package/src/link/status-projection.ts +42 -5
- package/src/link/supervisor.ts +96 -11
- package/src/link/tunnel-history.ts +5 -0
- package/src/oauth/account-auto-pause-policy.ts +72 -19
- package/src/oauth/account-auto-pause.ts +40 -16
- package/src/oauth/anthropic-account-refusal.ts +7 -0
- package/src/oauth/anthropic-continuity.ts +70 -9
- package/src/oauth/anthropic-identity.ts +75 -11
- package/src/oauth/anthropic-login-slot.ts +258 -0
- package/src/oauth/anthropic-routing.ts +24 -9
- package/src/oauth/anthropic-send-ownership.ts +4 -3
- package/src/oauth/anthropic.ts +30 -11
- package/src/oauth/health.ts +7 -2
- package/src/oauth/index.ts +50 -48
- package/src/oauth/key-providers.ts +2 -0
- package/src/oauth/login-cli.ts +11 -0
- package/src/oauth/login-flow-state.ts +10 -4
- package/src/oauth/m365-copilot-browser.ts +222 -0
- package/src/oauth/m365-copilot-web-session.ts +25 -0
- package/src/oauth/m365-copilot.ts +57 -0
- package/src/oauth/model-discovery-auth.ts +5 -0
- package/src/oauth/plan.ts +44 -0
- package/src/oauth/pool-kernel.ts +22 -8
- package/src/oauth/pool-settings-capability.ts +14 -3
- package/src/oauth/reauth-precheck.ts +27 -0
- package/src/oauth/store-anthropic-instance.ts +3 -1
- package/src/oauth/store.ts +121 -23
- package/src/oauth/types.ts +27 -2
- package/src/protocols/codecs/chat-ir.ts +7 -4
- package/src/protocols/codecs/gemini-interactions.ts +770 -0
- package/src/protocols/codecs/gemini.ts +470 -0
- package/src/protocols/contract.ts +2 -0
- package/src/protocols/encoders/adapter-events.ts +5 -3
- package/src/protocols/encoders/chat.ts +23 -7
- package/src/protocols/settings.ts +3 -0
- package/src/providers/account-quota-disk.ts +26 -8
- package/src/providers/api-key-pause.ts +2 -2
- package/src/providers/api-key-response-ownership.ts +14 -4
- package/src/providers/claude-cli-usage-state.ts +1 -0
- package/src/providers/claude-cli-usage.ts +24 -7
- package/src/providers/default-aliases.ts +11 -5
- package/src/providers/derive.ts +5 -1
- package/src/providers/fastwire.ts +6 -5
- package/src/providers/free-directory.ts +2 -2
- package/src/providers/google-vertex-location.ts +2 -1
- package/src/providers/google-vertex-model-discovery.ts +22 -0
- package/src/providers/key-failover.ts +18 -23
- package/src/providers/m365-copilot-discovery-fetch.ts +17 -0
- package/src/providers/m365-copilot-discovery.ts +68 -0
- package/src/providers/m365-copilot-models.ts +32 -0
- package/src/providers/model-rename-fields.ts +6 -0
- package/src/providers/new-model-policy-runtime.ts +27 -6
- package/src/providers/openai-forward-destination.ts +19 -0
- package/src/providers/openai-tiers-destination.ts +3 -19
- package/src/providers/quota/account-cache.ts +183 -27
- package/src/providers/quota/anthropic-account-quota.ts +21 -17
- package/src/providers/quota/anthropic-cooldown-recovery.ts +57 -27
- package/src/providers/quota/anthropic-decision-windows.ts +7 -3
- package/src/providers/quota/anthropic-usage-windows.ts +34 -4
- package/src/providers/quota/antigravity-account-probe.ts +165 -0
- package/src/providers/quota/antigravity.ts +71 -3
- package/src/providers/quota/vendor-probes-oauth.ts +52 -28
- package/src/providers/quota-decision-publication.ts +1 -1
- package/src/providers/quota-decision-snapshot.ts +4 -1
- package/src/providers/quota-types.ts +2 -0
- package/src/providers/quota.ts +8 -7
- package/src/providers/registry/agy-acp-models.ts +3 -0
- package/src/providers/registry/entries-core.ts +9 -0
- package/src/providers/registry/entries-extended.ts +60 -0
- package/src/providers/registry/model-seeds.ts +51 -0
- package/src/providers/request-pacing.ts +37 -7
- package/src/providers/service-tier.ts +2 -0
- package/src/providers/xai-privacy-mode.ts +52 -0
- package/src/remote/hub-management-relay.ts +74 -0
- package/src/responses/id-limits.ts +2 -0
- package/src/responses/input-media.ts +15 -3
- package/src/responses/parser-tools.ts +74 -11
- package/src/responses/parser.ts +16 -14
- package/src/responses/provider-opaque-metadata.ts +10 -0
- package/src/responses/reasoning-envelope.ts +3 -0
- package/src/responses/schema.ts +2 -3
- package/src/responses/spill-store.ts +5 -3
- package/src/responses/state/connection-scope.ts +232 -0
- package/src/responses/state/entry-types.ts +47 -0
- package/src/responses/state/snapshot-codec.ts +75 -14
- package/src/responses/state/snapshot-select.ts +2 -0
- package/src/responses/state/spill-codec.ts +59 -0
- package/src/responses/state/spill-queue.ts +11 -2
- package/src/responses/state.ts +178 -159
- package/src/router.ts +2 -6
- package/src/routing/compatibility/behavior.ts +6 -2
- package/src/routing/compatibility/subject.ts +17 -12
- package/src/routing/machine-weighted-routing.ts +58 -0
- package/src/server/advisor-admission-scope.ts +15 -7
- package/src/server/auth-cors.ts +27 -0
- package/src/server/chat-completions.ts +37 -17
- package/src/server/chat-native-eligibility.ts +21 -0
- package/src/server/chat-native.ts +15 -6
- package/src/server/claude-messages.ts +54 -6
- package/src/server/credential-recovery-attempt.ts +32 -0
- package/src/server/effort-policy.ts +6 -3
- package/src/server/gemini-inbound.ts +267 -0
- package/src/server/gemini-interactions-inbound.ts +229 -0
- package/src/server/gemini-interactions-store.ts +129 -0
- package/src/server/gemini-native-catalog.ts +64 -0
- package/src/server/gemini-native-log.ts +33 -0
- package/src/server/gemini-native-paths.ts +88 -0
- package/src/server/gemini-native-wire.ts +201 -0
- package/src/server/gemini-native.ts +218 -0
- package/src/server/grok-upstream-envelope-echo.ts +8 -2
- package/src/server/hub-relay-auth.ts +87 -0
- package/src/server/hub-usage-windows.ts +135 -0
- package/src/server/hub-usage.ts +16 -3
- package/src/server/inbound-body-admission.ts +2 -1
- package/src/server/index/anthropic-model-listing.ts +75 -0
- package/src/server/index/gemini-routes.ts +147 -0
- package/src/server/index/link-management.ts +3 -22
- package/src/server/index/link-relay-sessions.ts +71 -13
- package/src/server/index/link-websocket.ts +2 -0
- package/src/server/index/passive-management-read.ts +55 -0
- package/src/server/index/serve-options.ts +93 -107
- package/src/server/index/websocket-handler.ts +15 -2
- package/src/server/index.ts +10 -0
- package/src/server/inference/client-encoder-delivery.ts +2 -1
- package/src/server/inference/context.ts +33 -6
- package/src/server/management/agent-settings-routes.ts +33 -16
- package/src/server/management/claude-code-settings-patch.ts +6 -0
- package/src/server/management/combo-routes.ts +21 -1
- package/src/server/management/combo-suggestion-routes.ts +212 -0
- package/src/server/management/config-routes.ts +12 -4
- package/src/server/management/context.ts +2 -0
- package/src/server/management/gateway-client-routes.ts +62 -0
- package/src/server/management/integration-routes.ts +5 -0
- package/src/server/management/link-routes.ts +5 -1
- package/src/server/management/m365-copilot-provider-probe.ts +23 -0
- package/src/server/management/model-routes.ts +32 -2
- package/src/server/management/model-rows.ts +36 -3
- package/src/server/management/oauth-account-routes.ts +68 -15
- package/src/server/management/protocol-settings-patch.ts +1 -0
- package/src/server/management/provider-omitted-fields.ts +25 -0
- package/src/server/management/provider-overwrite-carry.ts +33 -8
- package/src/server/management/provider-routes.ts +10 -16
- package/src/server/management/request-history-routes.ts +2 -2
- package/src/server/management/route-registry.ts +10 -0
- package/src/server/management/shared.ts +118 -30
- package/src/server/management/sibling-guard.ts +2 -1
- package/src/server/management/system-routes.ts +6 -0
- package/src/server/management-auth.ts +8 -1
- package/src/server/messages-native-scope.ts +19 -0
- package/src/server/messages-native.ts +156 -59
- package/src/server/messages-shared.ts +6 -0
- package/src/server/models-capabilities.ts +24 -0
- package/src/server/native-chat-bridge.ts +259 -0
- package/src/server/ollama-inbound.ts +36 -184
- package/src/server/passive-route-linker.ts +3 -1
- package/src/server/port-reclaim.ts +48 -4
- package/src/server/proxy-liveness.ts +79 -22
- package/src/server/relay.ts +16 -9
- package/src/server/request-log-account-rotation.ts +2 -1
- package/src/server/request-log-attempt-recovery.ts +24 -2
- package/src/server/request-log-attempt-usage.ts +5 -4
- package/src/server/request-log-committed-terminal.ts +87 -0
- package/src/server/request-log-failure-attribution.ts +3 -3
- package/src/server/request-log-failure-detail.ts +34 -0
- package/src/server/request-log-key-failure.ts +27 -0
- package/src/server/request-log-terminal-status.ts +25 -12
- package/src/server/request-log.ts +59 -63
- package/src/server/responses/adapter-continuation.ts +77 -44
- package/src/server/responses/adapter-delivery.ts +47 -22
- package/src/server/responses/adapter-dispatch.ts +150 -149
- package/src/server/responses/advisor-retention.ts +12 -4
- package/src/server/responses/advisor-slot.ts +97 -2
- package/src/server/responses/agent-task-recovery.ts +44 -11
- package/src/server/responses/agy-acp-preflight.ts +41 -0
- package/src/server/responses/anthropic-image-context.ts +44 -0
- package/src/server/responses/antigravity-validation-refusal.ts +25 -1
- package/src/server/responses/buffered-sse-json.ts +18 -1
- package/src/server/responses/codex-ws-correlation.ts +5 -2
- package/src/server/responses/codex-ws-exchange.ts +91 -8
- package/src/server/responses/codex-ws-incremental.ts +136 -0
- package/src/server/responses/codex-ws-pool.ts +22 -8
- package/src/server/responses/codex-ws-request.ts +5 -0
- package/src/server/responses/codex-ws-send-accounting.ts +8 -0
- package/src/server/responses/codex-ws-session.ts +14 -0
- package/src/server/responses/codex-ws-wire.ts +44 -22
- package/src/server/responses/combo-admission-snapshot.ts +93 -0
- package/src/server/responses/combo-required-tool-stream.ts +16 -4
- package/src/server/responses/combo-selection-keepalive.ts +5 -0
- package/src/server/responses/combo-stream-preflight.ts +182 -73
- package/src/server/responses/compact-response-body.ts +27 -0
- package/src/server/responses/compact.ts +174 -121
- package/src/server/responses/compaction-recovery.ts +7 -0
- package/src/server/responses/core-codex-account.ts +88 -62
- package/src/server/responses/core-combo-failure.ts +15 -0
- package/src/server/responses/core-combo-native.ts +12 -1
- package/src/server/responses/core-combo.ts +340 -94
- package/src/server/responses/core-normalize.ts +19 -12
- package/src/server/responses/core-opaque-recovery.ts +15 -4
- package/src/server/responses/core-options.ts +50 -5
- package/src/server/responses/core-pipeline.ts +11 -0
- package/src/server/responses/core.ts +7 -1
- package/src/server/responses/empty-completion-guard.ts +21 -7
- package/src/server/responses/estimated-usage.ts +2 -1
- package/src/server/responses/fetch-helpers.ts +95 -19
- package/src/server/responses/history-slim.ts +204 -0
- package/src/server/responses/hosted-advisor-spend.ts +49 -0
- package/src/server/responses/image-context-recovery.ts +199 -0
- package/src/server/responses/input-admission.ts +36 -11
- package/src/server/responses/jev-model-invoke.ts +23 -16
- package/src/server/responses/non-replayable-error.ts +12 -2
- package/src/server/responses/passthrough-build-error.ts +5 -3
- package/src/server/responses/passthrough-delivery.ts +74 -33
- package/src/server/responses/passthrough-dispatch.ts +170 -197
- package/src/server/responses/policy-fallback.ts +7 -2
- package/src/server/responses/policy-request-scope.ts +36 -2
- package/src/server/responses/replay-owner.ts +20 -0
- package/src/server/responses/request-prepare.ts +97 -16
- package/src/server/responses/request-send-budget.ts +97 -25
- package/src/server/responses/request-sidecar-auth.ts +138 -65
- package/src/server/responses/request-spend-target.ts +13 -1
- package/src/server/responses/request-spend.ts +228 -47
- package/src/server/responses/request-transport.ts +395 -70
- package/src/server/responses/run-turn-execution.ts +40 -9
- package/src/server/responses/sidecar-execution.ts +214 -67
- package/src/server/responses/sidecar-send-budget.ts +9 -9
- package/src/server/responses/terminal-guard.ts +35 -9
- package/src/server/responses/ws-upstream.ts +27 -6
- package/src/server/responses-phase-inference.ts +32 -9
- package/src/server/responses-terminal-repair.ts +14 -35
- package/src/server/system-env.ts +8 -5
- package/src/server/ws-bridge.ts +23 -17
- package/src/service/health-sentinel-linux.ts +16 -7
- package/src/service/systemd.ts +11 -2
- package/src/service/windows-checked-stop-live.ts +60 -55
- package/src/service/windows-checked-stop.ts +29 -11
- package/src/service/windows-guarded-manager.ts +14 -26
- package/src/service/windows-process-evidence.ts +82 -74
- package/src/service/windows-process-native.ts +69 -20
- package/src/service/windows-service-stop.ts +14 -12
- package/src/service/windows-stop-binding.ts +14 -5
- package/src/service/windows-stop-confirm.ts +1 -1
- package/src/service/windows-task-instance-stop.ts +98 -0
- package/src/service/windows-taskxml.ts +30 -7
- package/src/sidecar/anthropic-binding.ts +1 -1
- package/src/stall-timeout.ts +30 -0
- package/src/telemetry/aggregate.ts +6 -3
- package/src/types/account-auto-pause.ts +19 -1
- package/src/types/accounts.ts +21 -0
- package/src/types/anthropic-account-pool.ts +1 -1
- package/src/types/combo-capability-policy.ts +19 -0
- package/src/types/config.ts +22 -2
- package/src/types/provider.ts +42 -8
- package/src/types/request.ts +15 -0
- package/src/types/tools.ts +22 -5
- package/src/types/wire.ts +1 -0
- package/src/types.ts +4 -0
- package/src/update/check-types.ts +2 -0
- package/src/update/job.ts +8 -3
- package/src/update/managed-release.ts +6 -0
- package/src/update/orchestrated-entry.ts +13 -4
- package/src/update/refresh-scheduler.ts +17 -7
- package/src/usage/attempt-delivery.ts +6 -0
- package/src/usage/cache-provenance.ts +71 -0
- package/src/usage/cost.ts +216 -27
- package/src/usage/credit-billing.ts +88 -0
- package/src/usage/jev-stats.ts +13 -9
- package/src/usage/log.ts +5 -33
- package/src/usage/summary.ts +8 -43
- package/src/usage/user-cost-overlays.ts +13 -1
- package/src/vision/index.ts +8 -3
- package/src/vision/plan.ts +28 -14
- package/src/vision/routed-describe.ts +24 -36
- package/src/web-search/header-deadline.ts +14 -3
- package/src/web-search/index.ts +6 -4
- package/src/web-search/loop.ts +240 -78
- package/src/web-search/progress-stream.ts +29 -2
- package/src/web-search/run-turn-loop.ts +5 -1
- package/gui/dist/assets/App-BGP8I0V4.css +0 -1
- package/gui/dist/assets/App-BRExzhwL.js +0 -60
- package/gui/dist/assets/Tray-DHCWAn8V.js +0 -1
- package/gui/dist/assets/brand-mark-C70PuQ3j.js +0 -1
- package/gui/dist/assets/index-DJxM-imn.css +0 -2
- package/gui/dist/assets/index-Dy1jIGty.js +0 -138
- package/gui/dist/classic/assets/App-B4j-Txmb.css +0 -1
- package/gui/dist/classic/assets/App-CaC-E6Vl.js +0 -59
- package/gui/dist/classic/assets/Tray-BG253fiL.js +0 -1
- package/gui/dist/classic/assets/index-CR_AThOp.js +0 -138
- package/gui/dist/classic/assets/quota-summary-B7KQPpEC.js +0 -1
|
@@ -12,6 +12,7 @@ import { requestPacingOverloadResponse } from "./pacing-overload";
|
|
|
12
12
|
import { recordDistributedResponseFailure } from "../../providers/api-key-response-ownership";
|
|
13
13
|
import { createSteeringSettingsNormalizer } from "./native-steering-policy";
|
|
14
14
|
import { nativeResponseControlEligible } from "./native-response-control";
|
|
15
|
+
import { resolveContextPrincipal } from "../auth-cors";
|
|
15
16
|
import { NativeInjectionReplay } from "./native-injection-replay";
|
|
16
17
|
import { NativeSteeringReplay } from "./native-steering-replay";
|
|
17
18
|
import type {
|
|
@@ -85,6 +86,7 @@ import {
|
|
|
85
86
|
recordAttemptCredentialSource,
|
|
86
87
|
} from "../request-log";
|
|
87
88
|
import { noteAttemptRecoveryWithheld } from "../request-log";
|
|
89
|
+
import { credentialRecoveryStatus } from "../request-log-attempt-recovery";
|
|
88
90
|
import {
|
|
89
91
|
upstreamHostHealthKey,
|
|
90
92
|
normalizeUpstreamHostCircuitThreshold,
|
|
@@ -98,7 +100,7 @@ import {
|
|
|
98
100
|
safeOriginLabel,
|
|
99
101
|
fetchWithHeaderTimeout,
|
|
100
102
|
providerFetch,
|
|
101
|
-
safeHostLabel,
|
|
103
|
+
safeHostLabel, codexWsAdmittedCaller,
|
|
102
104
|
} from "./fetch-helpers";
|
|
103
105
|
import { classifyPoolRecoveryDispatch } from "../../routing/probe-lease";
|
|
104
106
|
import { anthropicPoolCooldownResponse, clientCancelledResponse } from "./core-errors";
|
|
@@ -111,13 +113,15 @@ import {
|
|
|
111
113
|
shouldRetryCodexPoolAccountTransient,
|
|
112
114
|
retryCodexPoolOnAlternateAccount,
|
|
113
115
|
PoolPreOutputRefusals,
|
|
114
|
-
|
|
116
|
+
subscriptionPreOutputRefusalHold,
|
|
115
117
|
} from "./core-codex-account";
|
|
118
|
+
import { codexAuthContextLogLabel } from "../../codex/account-label";
|
|
116
119
|
import {
|
|
117
120
|
clearCodexModelDenialEvidence,
|
|
118
121
|
recordCodexModelDenialEvidence,
|
|
119
122
|
} from "../../codex/model-entitlements";
|
|
120
123
|
import { codexWsSocketDeathStage, isCodexWsUpstreamResponse } from "./codex-ws-wire";
|
|
124
|
+
import { codexWsReceiptMode, capturePhysicalSendRecovery } from "./codex-ws-send-accounting";
|
|
121
125
|
import { linkAbortSignal } from "./core-lifetime";
|
|
122
126
|
import type { CodexAuthContext } from "../../codex/auth-context";
|
|
123
127
|
import { checkOutboundBodySize, describeOutboundBodyRefusal } from "./outbound-body-guard";
|
|
@@ -131,6 +135,7 @@ import {
|
|
|
131
135
|
settleOperatorReplacement,
|
|
132
136
|
refetchAfterProtocolSafeReset,
|
|
133
137
|
replayRefusalResponse,
|
|
138
|
+
retainPacedRetryResponse,
|
|
134
139
|
prepareSameTarget429Wait,
|
|
135
140
|
sleepWithAbort,
|
|
136
141
|
} from "../../lib/upstream-retry";
|
|
@@ -227,7 +232,7 @@ export async function preparePassthroughExchange(
|
|
|
227
232
|
| "genericFailovers"
|
|
228
233
|
| "genericFailoverLimit"
|
|
229
234
|
| "applyFailoverSnapshot"
|
|
230
|
-
| "noteRoutedAttemptSend" | "deferPhysicalAttribution"
|
|
235
|
+
| "noteRoutedAttemptSend" | "createCredentialReplayAttempt" | "credentialReplayHandoff" | "deferPhysicalAttribution"
|
|
231
236
|
| "selectionIsCurrent"
|
|
232
237
|
| "requestBindings"
|
|
233
238
|
>,
|
|
@@ -256,12 +261,15 @@ export async function preparePassthroughExchange(
|
|
|
256
261
|
| "workflowRootId"
|
|
257
262
|
| "sendsUsed"
|
|
258
263
|
| "targetSendsUsed"
|
|
264
|
+
| "compactHandoffSendCeiling"
|
|
265
|
+
| "noteTargetSends"
|
|
259
266
|
| "initialSendAllowance"
|
|
260
267
|
| "noteInitialDispatch"
|
|
261
268
|
| "adapterSendBudget"
|
|
262
269
|
>,
|
|
263
270
|
) {
|
|
264
271
|
const { config, logCtx, options, req } = requestContext;
|
|
272
|
+
const codexWsCaller = codexWsAdmittedCaller(options.replayPrincipal, () => resolveContextPrincipal(req, config, options.admission));
|
|
265
273
|
const {
|
|
266
274
|
route,
|
|
267
275
|
toolBridgeMaps,
|
|
@@ -606,8 +614,8 @@ export async function preparePassthroughExchange(
|
|
|
606
614
|
}
|
|
607
615
|
// The snapshot callback opts the inspector into output reconstruction. Compaction
|
|
608
616
|
// has no continuation cache, so use the parsed terminal here without adding retention.
|
|
609
|
-
if (responseEffects.plaintextV2AgentMessageToolNames.size === 0 && !rememberPassthroughResponse
|
|
610
|
-
&& "
|
|
617
|
+
if (responseEffects.plaintextV2AgentMessageToolNames.size === 0 && !rememberPassthroughResponse
|
|
618
|
+
&& terminal === "completed" && inspectedTerminal === "completed" && payload && typeof payload === "object"
|
|
611
619
|
&& "response" in payload && payload.response && typeof payload.response === "object"
|
|
612
620
|
&& !Array.isArray(payload.response)) {
|
|
613
621
|
rememberPassthroughResponseChecked(payload.response as Record<string, unknown>);
|
|
@@ -735,27 +743,11 @@ export async function preparePassthroughExchange(
|
|
|
735
743
|
const cleanupUpstreamAbort = linkAbortSignal(upstream, options.abortSignal ?? req.signal);
|
|
736
744
|
const sendConnectMs = () => route.provider.authMode === "forward" ? resolveConnectTimeoutMs(config.connectTimeoutMs, { localUpstream: isLocalUpstream(request.url) }) : 0;
|
|
737
745
|
const connectMs = resolveConnectTimeoutMs(config.connectTimeoutMs, { localUpstream: isLocalUpstream(route.provider.baseUrl) });
|
|
738
|
-
|
|
739
|
-
* This leg's transient-5xx ladder cap, from the provider's own `transientRetryOn5xx`.
|
|
740
|
-
*
|
|
741
|
-
* The lane used to pass `TRANSIENT_RETRY_MAX_ATTEMPTS` at every call site, so an operator who
|
|
742
|
-
* configured the option on a key-auth `openai-responses` provider changed nothing in either
|
|
743
|
-
* direction, while the same provider on `openai-chat` was tuned normally. That asymmetry is
|
|
744
|
-
* #4893. The gate in `transientRetryPolicyFor` returns null for OAuth and forward providers,
|
|
745
|
-
* so the ChatGPT pool keeps exactly the ladder it has always had.
|
|
746
|
-
*
|
|
747
|
-
* Read per call rather than captured once, for two reasons. `route.provider` is reassigned
|
|
748
|
-
* inside the recovery loop by credential rotation and transport resolution, so a hoisted
|
|
749
|
-
* policy could outlive the provider row it came from. And the configured value is a total for
|
|
750
|
-
* the whole request, so it has to be measured against what the request has already sent at
|
|
751
|
-
* the moment each leg asks.
|
|
752
|
-
*
|
|
753
|
-
* Still bounded by the request: every site feeds this to `remainingTransientSendBudget` or
|
|
754
|
-
* `recoverySendAllowance`, which intersect it with the request-wide base allowance. So a
|
|
755
|
-
* provider can narrow this request's sends exactly and cannot widen the bound that exists to
|
|
756
|
-
* stop per-request amplification (#4546).
|
|
757
|
-
*/
|
|
746
|
+
// Each leg re-reads the live provider policy and remaining physical sends.
|
|
758
747
|
const transientSendPolicy = () => transientRetryPolicyFor(route.provider);
|
|
748
|
+
const { compactHandoffSendCeiling } = sendBudgetState;
|
|
749
|
+
const reserveRetrySpend = () => sendBudgetState.adapterSendBudget?.spendEnforced === true
|
|
750
|
+
&& (compactHandoffSendCeiling !== undefined || isCanonicalOpenAiForwardProvider(route.provider) && transientSendPolicy() !== null);
|
|
759
751
|
const transientSendAttempts = (): number => transientSendCapFor(
|
|
760
752
|
transientSendPolicy()?.attempts,
|
|
761
753
|
sendBudgetState.targetSendsUsed,
|
|
@@ -833,7 +825,7 @@ export async function preparePassthroughExchange(
|
|
|
833
825
|
onPhysicalDispatch: recordPhysicalSend(() => {
|
|
834
826
|
transportState.noteRoutedAttemptSend(passthroughEstimate, "connection-reset");
|
|
835
827
|
if (accounting.onPhysicalDispatch) accounting.onPhysicalDispatch();
|
|
836
|
-
else if (report.beforeSend?.() === false) throw new SendBudgetExhaustedError(errorDestinationLabel(request.url));
|
|
828
|
+
else if (report.beforeSend?.(reserveRetrySpend()) === false) throw new SendBudgetExhaustedError(errorDestinationLabel(request.url));
|
|
837
829
|
started = true;
|
|
838
830
|
}),
|
|
839
831
|
beforeDispatch: headers => {
|
|
@@ -900,7 +892,8 @@ export async function preparePassthroughExchange(
|
|
|
900
892
|
describeOutboundBodyRefusal(result),
|
|
901
893
|
);
|
|
902
894
|
};
|
|
903
|
-
|
|
895
|
+
type CredentialReplay = ReturnType<typeof transportState.createCredentialReplayAttempt>;
|
|
896
|
+
const transportFailureResponse = (err: unknown, replay?: CredentialReplay): Response | PassthroughAdapterHandoff => {
|
|
904
897
|
cleanupUpstreamAbort();
|
|
905
898
|
upstream.abort();
|
|
906
899
|
if (options.abortSignal?.aborted || req.signal.aborted) {
|
|
@@ -921,8 +914,8 @@ export async function preparePassthroughExchange(
|
|
|
921
914
|
}
|
|
922
915
|
const refusal = unwrapUpstreamRetryEvidenceError(err);
|
|
923
916
|
if (refusal instanceof CopilotAutoAdapterHandoff) {
|
|
924
|
-
bindRefreshedAdapter(refusal.adapter);
|
|
925
|
-
return handoffToChat(refusal.adapter);
|
|
917
|
+
bindRefreshedAdapter(refusal.adapter, !replay);
|
|
918
|
+
return handoffToChat(refusal.adapter, replay);
|
|
926
919
|
}
|
|
927
920
|
const pacingRefusal = requestPacingOverloadResponse(refusal);
|
|
928
921
|
if (pacingRefusal) logCtx.terminalSource = "synthetic";
|
|
@@ -993,15 +986,12 @@ export async function preparePassthroughExchange(
|
|
|
993
986
|
};
|
|
994
987
|
const initialBodyRefusal = refuseOversizedOutboundBody(request);
|
|
995
988
|
if (initialBodyRefusal) return initialBodyRefusal;
|
|
996
|
-
|
|
997
|
-
|
|
998
|
-
|
|
999
|
-
//
|
|
1000
|
-
const receiptMode = !sendBudgetState.adapterSendBudget?.spendEnforced && Boolean(options.comboInitialSend);
|
|
1001
|
-
const initialAccounting = copilotSendAccounting();
|
|
1002
|
-
// #6969: Pool sends hold empty lifecycle frames so a pre-output refusal reaches the ladder below.
|
|
989
|
+
const initialAccounting = codexWsReceiptMode(sendBudgetState.adapterSendBudget, Boolean(options.comboInitialSend))
|
|
990
|
+
? { report: transientSendReporter(undefined, true), onPhysicalDispatch: sendBudgetState.noteInitialDispatch }
|
|
991
|
+
: copilotSendAccounting();
|
|
992
|
+
// #6969: Subscription sends hold empty lifecycle frames so a pre-output refusal reaches the ladder below.
|
|
1003
993
|
const preOutputRefusals = new PoolPreOutputRefusals();
|
|
1004
|
-
const preOutputRefusalHold = () =>
|
|
994
|
+
const preOutputRefusalHold = () => subscriptionPreOutputRefusalHold(admissionState.authCtx, route.provider, connectMs, options.comboAttempt);
|
|
1005
995
|
const onContinuationDispatch = createNativeContinuationDispatch(sendBudgetState, logCtx);
|
|
1006
996
|
try {
|
|
1007
997
|
// Transient-5xx pre-stream retry (devlog/_plan/260716_claudecode_hardening/010):
|
|
@@ -1022,14 +1012,14 @@ export async function preparePassthroughExchange(
|
|
|
1022
1012
|
body: request.body,
|
|
1023
1013
|
}, recovery), upstream.signal, sendConnectMs(), upstreamRequestsStream,
|
|
1024
1014
|
providerFetch(route.provider, options.codexWsRuntimeIdentity, {
|
|
1025
|
-
httpOnly: canonicalBufferedJson,
|
|
1015
|
+
httpOnly: canonicalBufferedJson, codexWsCaller, captureCodexWsRecovery: capturePhysicalSendRecovery, onRecoveryPhysicalDispatch: recordPhysicalSend(),
|
|
1026
1016
|
nativeControl: nativeResponseControlEligible(route.provider, options.nativeControl) && options.inboundTransport === "websocket" && !options.comboAttempt
|
|
1027
1017
|
&& responseEffects.plaintextV2AgentMessageToolNames.size === 0
|
|
1028
1018
|
? options.nativeControl : undefined,
|
|
1029
1019
|
dispatchOverride: oauthDispatch(request, parsed, "passthrough"),
|
|
1030
1020
|
providerName: route.providerName,
|
|
1031
1021
|
modelId: route.modelId,
|
|
1032
|
-
onPhysicalDispatch: recordPhysicalSend(
|
|
1022
|
+
onPhysicalDispatch: recordPhysicalSend(initialAccounting.onPhysicalDispatch),
|
|
1033
1023
|
onContinuationDispatch,
|
|
1034
1024
|
accountAutoPause: (name, provider, headers) => captureAccountAutoPauseAttempt(name, provider, { config, codex: admissionState.authCtx }, headers),
|
|
1035
1025
|
onCodexWsQuota: codexWsQuotaObserver(admissionState.authCtx, route.provider, route.modelId),
|
|
@@ -1044,9 +1034,8 @@ export async function preparePassthroughExchange(
|
|
|
1044
1034
|
},
|
|
1045
1035
|
{ abortSignal: upstream.signal, label: safeHostLabel(request.url), destination: errorDestinationLabel(request.url),
|
|
1046
1036
|
attempts: sendBudgetState.initialSendAllowance(transientSendAttempts()),
|
|
1047
|
-
|
|
1048
|
-
|
|
1049
|
-
...(receiptMode ? {} : { onSendsConsumed: initialAccounting.report }),
|
|
1037
|
+
reserveRetrySpend,
|
|
1038
|
+
onSendsConsumed: initialAccounting.report,
|
|
1050
1039
|
claimAmbiguousResend: claimPreHeaderResend,
|
|
1051
1040
|
// A combo fails over to another member instead of waiting once per target.
|
|
1052
1041
|
offlineWait: options.comboAttempt ? undefined : createProviderOfflineResendWait(route.providerName, route.provider, request.url, config.offlineResendWaitSec),
|
|
@@ -1065,7 +1054,7 @@ export async function preparePassthroughExchange(
|
|
|
1065
1054
|
// published ladder one refused rung at a time; the request send budget bounds those retries.
|
|
1066
1055
|
const reasoningEffortDowngradeGuard: { attempted: boolean } = { attempted: false };
|
|
1067
1056
|
/** Rebind the refreshed wire before transferring this request to the Chat pipeline. */
|
|
1068
|
-
function bindRefreshedAdapter(refreshedAdapter: typeof transportState.adapter) {
|
|
1057
|
+
function bindRefreshedAdapter(refreshedAdapter: typeof transportState.adapter, publishAttempt = true) {
|
|
1069
1058
|
bindRouteReasoningReplayScope({
|
|
1070
1059
|
parsed,
|
|
1071
1060
|
providerName: route.providerName,
|
|
@@ -1073,6 +1062,7 @@ export async function preparePassthroughExchange(
|
|
|
1073
1062
|
adapterName: refreshedAdapter.name,
|
|
1074
1063
|
oauthCredentialSnapshot: transportState.replayOAuthCredentialSnapshot,
|
|
1075
1064
|
});
|
|
1065
|
+
if (!publishAttempt) return;
|
|
1076
1066
|
if (!transportState.deferPhysicalAttribution) {
|
|
1077
1067
|
logCtx.providerAdapter = refreshedAdapter.name;
|
|
1078
1068
|
sealRequestAttemptIdentity(logCtx.activeAttempt, logCtx.provider, refreshedAdapter.name, logCtx.accountLogLabel);
|
|
@@ -1080,7 +1070,8 @@ export async function preparePassthroughExchange(
|
|
|
1080
1070
|
recordAttemptCredentialSource(logCtx.activeAttempt, route.providerName, route.provider, refreshedAdapter.name);
|
|
1081
1071
|
}
|
|
1082
1072
|
/** Transfer adapter ownership without retaining the native abort link or request cache. */
|
|
1083
|
-
function handoffToChat(refreshedAdapter: typeof transportState.adapter) {
|
|
1073
|
+
function handoffToChat(refreshedAdapter: typeof transportState.adapter, replay?: CredentialReplay) {
|
|
1074
|
+
transportState.credentialReplayHandoff = replay;
|
|
1084
1075
|
cleanupUpstreamAbort();
|
|
1085
1076
|
upstream.abort();
|
|
1086
1077
|
transportState.adapter = transportState.activeAdapter = transportState.runTurnAdapter = refreshedAdapter;
|
|
@@ -1089,15 +1080,50 @@ export async function preparePassthroughExchange(
|
|
|
1089
1080
|
}
|
|
1090
1081
|
let oauth401ReplayAttempted = transportState.oauth401ReplayAttempted;
|
|
1091
1082
|
let codex401ReplayKind: "main" | "stored" | null = null;
|
|
1083
|
+
let pool401OutcomeSettled = false;
|
|
1092
1084
|
// Console Go answers a transient 400 "Invalid upload request." for bodies it accepts
|
|
1093
1085
|
// moments later; at most one byte-identical replay is allowed per request.
|
|
1094
1086
|
const consoleGoUploadRetryGuard: { attempted: boolean } = { attempted: false };
|
|
1095
1087
|
const rateLimitPolicy = rateLimitRetryPolicyFor(route.provider);
|
|
1096
1088
|
let rateLimitRetries = 0;
|
|
1089
|
+
const fetchCredentialReplay = (commit: CredentialReplay, adapter: string, notify?: () => void, retryFrom?: Response) => {
|
|
1090
|
+
const accounting = copilotSendAccounting();
|
|
1091
|
+
return fetchWithTransientRetry(
|
|
1092
|
+
recovery => fetchWithHeaderTimeout(request.url, applyUpstreamRecoveryInit({
|
|
1093
|
+
method: request.method, headers: request.headers, body: request.body,
|
|
1094
|
+
}, recovery), upstream.signal, sendConnectMs(), upstreamRequestsStream,
|
|
1095
|
+
providerFetch(route.provider, options.codexWsRuntimeIdentity, {
|
|
1096
|
+
httpOnly: canonicalBufferedJson, codexWsCaller, captureCodexWsRecovery: capturePhysicalSendRecovery, onRecoveryPhysicalDispatch: recordPhysicalSend(() => commit(request, adapter)),
|
|
1097
|
+
nativeControl: nativeResponseControlEligible(route.provider, options.nativeControl) && options.inboundTransport === "websocket" && !options.comboAttempt
|
|
1098
|
+
&& responseEffects.plaintextV2AgentMessageToolNames.size === 0 ? options.nativeControl : undefined,
|
|
1099
|
+
dispatchOverride: oauthDispatch(request, parsed, "passthrough", true),
|
|
1100
|
+
onPhysicalDispatch: recordPhysicalSend(() => {
|
|
1101
|
+
upstream.signal.throwIfAborted();
|
|
1102
|
+
accounting.onPhysicalDispatch?.();
|
|
1103
|
+
notify?.();
|
|
1104
|
+
commit(request, adapter, recovery);
|
|
1105
|
+
passthroughEstimate = request.usageLog?.inputTokens;
|
|
1106
|
+
}),
|
|
1107
|
+
providerName: route.providerName,
|
|
1108
|
+
modelId: route.modelId,
|
|
1109
|
+
onContinuationDispatch,
|
|
1110
|
+
accountAutoPause: (name, provider, headers) => captureAccountAutoPauseAttempt(name, provider, { config, codex: admissionState.authCtx }, headers),
|
|
1111
|
+
onCodexWsQuota: codexWsQuotaObserver(admissionState.authCtx, route.provider, route.modelId),
|
|
1112
|
+
beforeDispatch: isCanonicalOpenAiForwardProvider(route.provider)
|
|
1113
|
+
? createCodexAuthDispatchGuard(admissionState.authCtx, options.codexAuthPolicy ?? config, route.modelId, options.admission, options.visionDescribeTerminal === true) : undefined,
|
|
1114
|
+
}), route.provider.authMode === "forward").then(adoptObservedResponse),
|
|
1115
|
+
{ abortSignal: upstream.signal, label: safeHostLabel(request.url), destination: errorDestinationLabel(request.url),
|
|
1116
|
+
attempts: remainingTransientSendBudget(transientSendAttempts()),
|
|
1117
|
+
reserveRetrySpend, retryFrom, onSendsConsumed: accounting.report, claimAmbiguousResend: claimPreHeaderResend },
|
|
1118
|
+
);
|
|
1119
|
+
};
|
|
1097
1120
|
const rebuildAndRefetch = async (
|
|
1098
1121
|
recovery: AttemptRecoveryKind,
|
|
1099
1122
|
preserveFailureResponse?: Response,
|
|
1123
|
+
staged?: CredentialReplay,
|
|
1100
1124
|
): Promise<Response | { failed: Response | PassthroughAdapterHandoff }> => {
|
|
1125
|
+
const replay = staged ?? (credentialRecoveryStatus(recovery) === undefined ? undefined
|
|
1126
|
+
: transportState.createCredentialReplayAttempt(upstreamResponse.status, recovery));
|
|
1101
1127
|
const retryAdapter = resolveSelectionAdapter(
|
|
1102
1128
|
resolveWireProtocolOverride(route.providerName, route.modelId, route.provider, inboundWire, route.staticPolicy),
|
|
1103
1129
|
config.cacheRetention,
|
|
@@ -1115,8 +1141,7 @@ export async function preparePassthroughExchange(
|
|
|
1115
1141
|
});
|
|
1116
1142
|
}
|
|
1117
1143
|
refreshRequestToolAliases(request);
|
|
1118
|
-
recordAdapterReasoning(logCtx, request);
|
|
1119
|
-
recordAdapterTier(logCtx, request);
|
|
1144
|
+
if (!replay) { recordAdapterReasoning(logCtx, request); recordAdapterTier(logCtx, request); }
|
|
1120
1145
|
} catch (err) {
|
|
1121
1146
|
if (err instanceof CodexInstallationIdUnavailableError) return { failed: transportFailureResponse(err) };
|
|
1122
1147
|
upstream.abort();
|
|
@@ -1127,24 +1152,23 @@ export async function preparePassthroughExchange(
|
|
|
1127
1152
|
passthroughEstimate = typeof request.usageLog?.inputTokens === "number"
|
|
1128
1153
|
? request.usageLog.inputTokens
|
|
1129
1154
|
: undefined;
|
|
1130
|
-
if (passthroughEstimate !== undefined) logCtx.usageLogInputTokens = passthroughEstimate;
|
|
1131
1155
|
refreshUndeclaredToolGuard(request);
|
|
1132
|
-
if (!
|
|
1133
|
-
logCtx.
|
|
1134
|
-
|
|
1156
|
+
if (!replay) {
|
|
1157
|
+
if (passthroughEstimate !== undefined) logCtx.usageLogInputTokens = passthroughEstimate;
|
|
1158
|
+
if (!transportState.deferPhysicalAttribution) {
|
|
1159
|
+
logCtx.providerAdapter = retryAdapter.name;
|
|
1160
|
+
sealRequestAttemptIdentity(logCtx.activeAttempt, logCtx.provider, retryAdapter.name, logCtx.accountLogLabel);
|
|
1161
|
+
}
|
|
1162
|
+
recordAttemptCredentialSource(logCtx.activeAttempt, route.providerName, route.provider, retryAdapter.name);
|
|
1135
1163
|
}
|
|
1136
|
-
recordAttemptCredentialSource(logCtx.activeAttempt, route.providerName, route.provider, retryAdapter.name);
|
|
1137
1164
|
const rebuiltBodyRefusal = refuseOversizedOutboundBody(request);
|
|
1138
1165
|
if (rebuiltBodyRefusal) return { failed: rebuiltBodyRefusal };
|
|
1139
|
-
//
|
|
1140
|
-
// final-recovery reserve, which keeps a validated sanitized rebuild after a 5xx streak alive
|
|
1141
|
-
// at four total sends instead of dying at three. An explicit provider total cannot widen.
|
|
1142
|
-
// Reserve outside the try so the finally can hand it back if the leg never reaches its send.
|
|
1166
|
+
// Unconfigured recovery can draw the shared final reserve after base sends are spent.
|
|
1143
1167
|
const allowance = recoverySendAllowance(
|
|
1144
1168
|
transientSendAttempts(),
|
|
1145
1169
|
recoveryClassFor(recovery),
|
|
1146
1170
|
`${route.providerName}|${route.modelId}|${recovery}`,
|
|
1147
|
-
{ allowFinalRecoveryReserve: transientSendPolicy() === null },
|
|
1171
|
+
{ allowFinalRecoveryReserve: transientSendPolicy() === null && !reserveRetrySpend() },
|
|
1148
1172
|
);
|
|
1149
1173
|
if (recovery === "empty-completion") allowance.attempts = Math.min(1, allowance.attempts);
|
|
1150
1174
|
// An unfunded combo rung keeps the upstream refusal for combo failover instead of a budget 429.
|
|
@@ -1153,24 +1177,25 @@ export async function preparePassthroughExchange(
|
|
|
1153
1177
|
try {
|
|
1154
1178
|
return await fetchWithTransientRetry(
|
|
1155
1179
|
innerRecovery => {
|
|
1156
|
-
// Gated on the return, not fire-and-forget: a consumed permit means this leg
|
|
1157
|
-
// already sent once, and letting the second call through would be a free send.
|
|
1158
1180
|
if (!recoveryAccounting.onPhysicalDispatch && allowance.permit && !allowance.permit.use()) {
|
|
1159
1181
|
throw new SendBudgetExhaustedError(errorDestinationLabel(request.url));
|
|
1160
1182
|
}
|
|
1161
|
-
transportState.noteRoutedAttemptSend(passthroughEstimate, innerRecovery ?? recovery);
|
|
1183
|
+
if (!replay) transportState.noteRoutedAttemptSend(passthroughEstimate, innerRecovery ?? recovery);
|
|
1162
1184
|
return fetchWithHeaderTimeout(request.url, applyUpstreamRecoveryInit({
|
|
1163
1185
|
method: request.method,
|
|
1164
1186
|
headers: request.headers,
|
|
1165
1187
|
body: request.body,
|
|
1166
1188
|
}, innerRecovery), upstream.signal, sendConnectMs(), upstreamRequestsStream,
|
|
1167
1189
|
providerFetch(route.provider, options.codexWsRuntimeIdentity, {
|
|
1168
|
-
httpOnly: canonicalBufferedJson,
|
|
1190
|
+
httpOnly: canonicalBufferedJson, codexWsCaller, captureCodexWsRecovery: capturePhysicalSendRecovery, onRecoveryPhysicalDispatch: recordPhysicalSend(),
|
|
1169
1191
|
nativeControl: nativeResponseControlEligible(route.provider, options.nativeControl) && options.inboundTransport === "websocket" && !options.comboAttempt
|
|
1170
1192
|
&& responseEffects.plaintextV2AgentMessageToolNames.size === 0
|
|
1171
1193
|
? options.nativeControl : undefined,
|
|
1172
|
-
dispatchOverride: oauthDispatch(request, parsed, "passthrough"),
|
|
1173
|
-
onPhysicalDispatch: recordPhysicalSend(
|
|
1194
|
+
dispatchOverride: oauthDispatch(request, parsed, "passthrough", Boolean(replay)),
|
|
1195
|
+
onPhysicalDispatch: recordPhysicalSend(() => {
|
|
1196
|
+
recoveryAccounting.onPhysicalDispatch?.();
|
|
1197
|
+
replay?.(request, retryAdapter.name, innerRecovery);
|
|
1198
|
+
}),
|
|
1174
1199
|
providerName: route.providerName,
|
|
1175
1200
|
modelId: route.modelId,
|
|
1176
1201
|
onContinuationDispatch,
|
|
@@ -1183,11 +1208,11 @@ export async function preparePassthroughExchange(
|
|
|
1183
1208
|
.then(adoptObservedResponse);
|
|
1184
1209
|
},
|
|
1185
1210
|
{ abortSignal: upstream.signal, label: safeHostLabel(request.url), destination: errorDestinationLabel(request.url), attempts: allowance.attempts,
|
|
1186
|
-
onSendsConsumed: recoveryAccounting.report,
|
|
1211
|
+
reserveRetrySpend, retryFrom: reserveRetrySpend() ? preserveFailureResponse : undefined, onSendsConsumed: recoveryAccounting.report,
|
|
1187
1212
|
claimAmbiguousResend: recovery === "empty-completion" ? undefined : claimPreHeaderResend },
|
|
1188
1213
|
);
|
|
1189
1214
|
} catch (err) {
|
|
1190
|
-
return { failed: transportFailureResponse(err) };
|
|
1215
|
+
return { failed: transportFailureResponse(err, replay) };
|
|
1191
1216
|
} finally {
|
|
1192
1217
|
// A no-op once the permit was used or once onSendsConsumed settled it; it only refunds
|
|
1193
1218
|
// a reservation whose send never happened.
|
|
@@ -1210,36 +1235,57 @@ export async function preparePassthroughExchange(
|
|
|
1210
1235
|
|
|
1211
1236
|
if (
|
|
1212
1237
|
upstreamResponse.status === 401 && !wasPermanentAccountRefusal(upstreamResponse)
|
|
1213
|
-
&& (admissionState.authCtx.kind === "main-pool" || admissionState.authCtx.kind === "pool")
|
|
1214
1238
|
&& usesCodexForwardPoolAuth(admissionState.authCtx, route.provider)
|
|
1215
1239
|
&& codex401ReplayKind === null
|
|
1216
1240
|
) {
|
|
1217
1241
|
codex401ReplayKind = admissionState.authCtx.kind === "pool" ? "stored" : "main";
|
|
1218
|
-
|
|
1242
|
+
const canReplay = (transientSendPolicy() === null && sendBudgetState.adapterSendBudget?.explicitSendCeiling === undefined)
|
|
1243
|
+
|| remainingTransientSendBudget(transientSendAttempts()) > 0;
|
|
1244
|
+
// Seal only a refusal with a replay plan; an unaffordable replay keeps the 401 final.
|
|
1245
|
+
const commit = canReplay ? transportState.createCredentialReplayAttempt(upstreamResponse.status, "oauth-401") : undefined;
|
|
1246
|
+
const retryFrom = canReplay && reserveRetrySpend() ? await retainPacedRetryResponse(upstreamResponse, upstream.signal) : undefined;
|
|
1247
|
+
if (canReplay && !retryFrom) {
|
|
1248
|
+
try { void upstreamResponse.body?.cancel().catch(() => {}); } catch { /* already consumed */ }
|
|
1249
|
+
}
|
|
1219
1250
|
const poolAuthCtx = admissionState.authCtx.kind === "pool" ? admissionState.authCtx : undefined;
|
|
1220
1251
|
const poolReplay = poolAuthCtx
|
|
1221
|
-
? await refreshPoolForwardAuth({ req, config, route, authCtx: poolAuthCtx, substituteMainCredential, options, logCtx })
|
|
1252
|
+
? await refreshPoolForwardAuth({ req, config, route, authCtx: poolAuthCtx, substituteMainCredential, options, logCtx: canReplay ? logCtx : undefined })
|
|
1222
1253
|
: undefined;
|
|
1223
1254
|
const replay = poolReplay
|
|
1224
1255
|
?? await refreshNativeMainForwardAuth({ req, config, route, authCtx: admissionState.authCtx, substituteMainCredential, options });
|
|
1225
|
-
if (!
|
|
1226
|
-
//
|
|
1227
|
-
|
|
1228
|
-
|
|
1229
|
-
|
|
1230
|
-
|
|
1231
|
-
|
|
1232
|
-
|
|
1233
|
-
|
|
1234
|
-
|
|
1235
|
-
|
|
1236
|
-
|
|
1256
|
+
if (poolAuthCtx && poolReplay && !poolReplay.ok && poolReplay.quarantine) {
|
|
1257
|
+
// A dead grant retires only the rejected credential generation (#2887).
|
|
1258
|
+
recordCodexUpstreamOutcome(config, poolAuthCtx.accountId, 401, {
|
|
1259
|
+
threadId: poolAuthCtx.affinityKey,
|
|
1260
|
+
fixedAccount: poolAuthCtx.fixedAccount,
|
|
1261
|
+
modelId: route.modelId,
|
|
1262
|
+
writerGeneration: poolAuthCtx.writerGeneration,
|
|
1263
|
+
credentialGeneration: poolReplay.quarantineGeneration ?? poolAuthCtx.generation,
|
|
1264
|
+
});
|
|
1265
|
+
}
|
|
1266
|
+
// Keep the original 401 after refresh when another send is unaffordable.
|
|
1267
|
+
if (!commit) {
|
|
1268
|
+
if (!replay.ok) void replay.response.body?.cancel().catch(() => {});
|
|
1269
|
+
if (upstream.signal.aborted || req.signal.aborted) {
|
|
1270
|
+
void upstreamResponse.body?.cancel().catch(() => {});
|
|
1271
|
+
upstream.abort();
|
|
1272
|
+
releaseCodexAuthContextProbeLease(admissionState.authCtx);
|
|
1273
|
+
return clientCancelledResponse();
|
|
1237
1274
|
}
|
|
1275
|
+
pool401OutcomeSettled = true;
|
|
1276
|
+
break passthroughRecovery;
|
|
1277
|
+
}
|
|
1278
|
+
if (!replay.ok) {
|
|
1279
|
+
void retryFrom?.body?.cancel().catch(() => undefined);
|
|
1238
1280
|
upstream.abort();
|
|
1239
1281
|
releaseCodexAuthContextProbeLease(admissionState.authCtx);
|
|
1240
1282
|
return replay.response;
|
|
1241
1283
|
}
|
|
1284
|
+
const rejectedAuthCtx = admissionState.authCtx;
|
|
1285
|
+
const rejectedAccountLabel = logCtx.accountLogLabel;
|
|
1286
|
+
const rejectedProvider = route.provider;
|
|
1242
1287
|
admissionState.authCtx = replay.authCtx;
|
|
1288
|
+
if (retryFrom) logCtx.accountLogLabel = codexAuthContextLogLabel(replay.authCtx, config);
|
|
1243
1289
|
route.provider = replay.provider;
|
|
1244
1290
|
requestState.selectedForwardHeaders = withClaudeNativeSession(replay.headers, replay.provider, options.claudeNativeSessionId);
|
|
1245
1291
|
const replayAdapter = resolveSelectionAdapter(
|
|
@@ -1258,9 +1304,6 @@ export async function preparePassthroughExchange(
|
|
|
1258
1304
|
codexAuthContext: admissionState.authCtx,
|
|
1259
1305
|
forwardHeaders: requestState.selectedForwardHeaders,
|
|
1260
1306
|
});
|
|
1261
|
-
logCtx.providerAdapter = replayAdapter.name;
|
|
1262
|
-
sealRequestAttemptIdentity(logCtx.activeAttempt, logCtx.provider, replayAdapter.name, logCtx.accountLogLabel);
|
|
1263
|
-
recordAttemptCredentialSource(logCtx.activeAttempt, route.providerName, route.provider, replayAdapter.name);
|
|
1264
1307
|
try {
|
|
1265
1308
|
request = await replayAdapter.buildRequest(parsed, {
|
|
1266
1309
|
headers: requestState.selectedForwardHeaders,
|
|
@@ -1268,73 +1311,29 @@ export async function preparePassthroughExchange(
|
|
|
1268
1311
|
translatorBudget,
|
|
1269
1312
|
});
|
|
1270
1313
|
refreshRequestToolAliases(request);
|
|
1271
|
-
recordAdapterReasoning(logCtx, request);
|
|
1272
|
-
recordAdapterTier(logCtx, request);
|
|
1273
1314
|
refreshUndeclaredToolGuard(request);
|
|
1274
|
-
// The 401 replay rebuilds the body before sending, so it needs the same ceiling as
|
|
1275
|
-
// every other build site; a replay is exactly when a grown payload reappears.
|
|
1276
1315
|
const replayBodyRefusal = refuseOversizedOutboundBody(request);
|
|
1277
1316
|
if (replayBodyRefusal) return replayBodyRefusal;
|
|
1278
|
-
// The replay-dispatched signal is what bounds the rest of this logical request, so it
|
|
1279
|
-
// has to describe a send that actually happened. fetchWithHeaderTimeout awaits pacing
|
|
1280
|
-
// admission BEFORE calling the executor, so signalling at the call site would spend the
|
|
1281
|
-
// budget even when a rejected pacing wait means nothing reaches the network. Signal
|
|
1282
|
-
// only after the physical-dispatch policy check succeeds; a local refusal is no send.
|
|
1283
|
-
// A replacement is another send of the same replay, rather than a second announcement.
|
|
1284
|
-
const replayGuard = isCanonicalOpenAiForwardProvider(route.provider)
|
|
1285
|
-
? createCodexAuthDispatchGuard(admissionState.authCtx, options.codexAuthPolicy ?? config, route.modelId, options.admission, options.visionDescribeTerminal === true) : undefined;
|
|
1286
1317
|
let replayNotified = false;
|
|
1287
|
-
|
|
1288
|
-
|
|
1289
|
-
|
|
1290
|
-
|
|
1291
|
-
|
|
1292
|
-
|
|
1293
|
-
onPhysicalDispatch: recordPhysicalSend(),
|
|
1294
|
-
providerName: route.providerName,
|
|
1295
|
-
modelId: route.modelId,
|
|
1296
|
-
onContinuationDispatch,
|
|
1297
|
-
accountAutoPause: (name, provider, headers) => captureAccountAutoPauseAttempt(name, provider, { config, codex: admissionState.authCtx }, headers),
|
|
1298
|
-
onCodexWsQuota: codexWsQuotaObserver(admissionState.authCtx, route.provider, route.modelId),
|
|
1299
|
-
beforeDispatch: headers => {
|
|
1300
|
-
replayGuard?.(headers);
|
|
1301
|
-
if (codex401ReplayKind === "stored" && !replayNotified) {
|
|
1302
|
-
replayNotified = true;
|
|
1303
|
-
options.onStoredPool401ReplayDispatched?.();
|
|
1304
|
-
}
|
|
1305
|
-
},
|
|
1306
|
-
});
|
|
1307
|
-
// Routed through the shared helper so an ambiguous reset on THIS leg answers with the
|
|
1308
|
-
// same refusal every other leg gives. A bare fetch here rejected instead, and the
|
|
1309
|
-
// caller's transport-failure path turns a rejection into a client-retryable 502 --
|
|
1310
|
-
// which invites the whole turn to be sent again, on a leg whose first send may already
|
|
1311
|
-
// have run it.
|
|
1312
|
-
upstreamResponse = await fetchWithTransientRetry(
|
|
1313
|
-
recovery => {
|
|
1314
|
-
transportState.noteRoutedAttemptSend(passthroughEstimate, recovery ?? "oauth-401");
|
|
1315
|
-
return fetchWithHeaderTimeout(
|
|
1316
|
-
request.url,
|
|
1317
|
-
applyUpstreamRecoveryInit({
|
|
1318
|
-
method: request.method,
|
|
1319
|
-
headers: request.headers,
|
|
1320
|
-
body: request.body,
|
|
1321
|
-
}, recovery),
|
|
1322
|
-
upstream.signal,
|
|
1323
|
-
sendConnectMs(),
|
|
1324
|
-
upstreamRequestsStream,
|
|
1325
|
-
oauthReplayExecutor,
|
|
1326
|
-
route.provider.authMode === "forward",
|
|
1327
|
-
).then(adoptObservedResponse);
|
|
1328
|
-
},
|
|
1329
|
-
{ abortSignal: upstream.signal, label: safeHostLabel(request.url), destination: errorDestinationLabel(request.url),
|
|
1330
|
-
attempts: remainingTransientSendBudget(transientSendAttempts()),
|
|
1331
|
-
onSendsConsumed: transientSendReporter(), claimAmbiguousResend: claimPreHeaderResend },
|
|
1332
|
-
);
|
|
1318
|
+
upstreamResponse = await fetchCredentialReplay(commit, replayAdapter.name, () => {
|
|
1319
|
+
if (codex401ReplayKind === "stored" && !replayNotified) {
|
|
1320
|
+
replayNotified = true;
|
|
1321
|
+
options.onStoredPool401ReplayDispatched?.();
|
|
1322
|
+
}
|
|
1323
|
+
}, retryFrom);
|
|
1333
1324
|
} catch (err) {
|
|
1334
1325
|
return transportFailureResponse(err);
|
|
1335
1326
|
} finally {
|
|
1336
1327
|
request.releaseBodyObservation?.();
|
|
1337
1328
|
}
|
|
1329
|
+
if (retryFrom && upstreamResponse === retryFrom) {
|
|
1330
|
+
admissionState.authCtx = rejectedAuthCtx;
|
|
1331
|
+
logCtx.accountLogLabel = rejectedAccountLabel;
|
|
1332
|
+
route.provider = rejectedProvider;
|
|
1333
|
+
releaseCodexAuthContextProbeLease(replay.authCtx);
|
|
1334
|
+
pool401OutcomeSettled = true;
|
|
1335
|
+
break passthroughRecovery;
|
|
1336
|
+
}
|
|
1338
1337
|
continue passthroughRecovery;
|
|
1339
1338
|
}
|
|
1340
1339
|
|
|
@@ -1355,6 +1354,7 @@ export async function preparePassthroughExchange(
|
|
|
1355
1354
|
&& !sendBudgetExhausted(transientSendAttempts())
|
|
1356
1355
|
) {
|
|
1357
1356
|
oauth401ReplayAttempted = transportState.oauth401ReplayAttempted = true;
|
|
1357
|
+
const commit = transportState.createCredentialReplayAttempt(upstreamResponse.status, "oauth-401");
|
|
1358
1358
|
try { void upstreamResponse.body?.cancel().catch(() => {}); } catch { /* already consumed/closed */ }
|
|
1359
1359
|
let refreshed: OAuthAccessSnapshot;
|
|
1360
1360
|
try {
|
|
@@ -1397,10 +1397,10 @@ export async function preparePassthroughExchange(
|
|
|
1397
1397
|
resolveWireProtocolOverride(route.providerName, route.modelId, refreshedProvider, inboundWire, route.staticPolicy),
|
|
1398
1398
|
config.cacheRetention,
|
|
1399
1399
|
);
|
|
1400
|
-
bindRefreshedAdapter(refreshedAdapter);
|
|
1400
|
+
bindRefreshedAdapter(refreshedAdapter, false);
|
|
1401
1401
|
if (!("passthrough" in refreshedAdapter) || !refreshedAdapter.passthrough) {
|
|
1402
1402
|
if (route.providerName === "github-copilot" && refreshedAdapter.name === "openai-chat") {
|
|
1403
|
-
return handoffToChat(refreshedAdapter);
|
|
1403
|
+
return handoffToChat(refreshedAdapter, commit);
|
|
1404
1404
|
}
|
|
1405
1405
|
upstream.abort();
|
|
1406
1406
|
return formatErrorResponse(502, "upstream_error", "OAuth refresh changed the provider wire unexpectedly");
|
|
@@ -1412,8 +1412,6 @@ export async function preparePassthroughExchange(
|
|
|
1412
1412
|
translatorBudget,
|
|
1413
1413
|
});
|
|
1414
1414
|
refreshRequestToolAliases(request);
|
|
1415
|
-
recordAdapterReasoning(logCtx, request);
|
|
1416
|
-
recordAdapterTier(logCtx, request);
|
|
1417
1415
|
} catch (err) {
|
|
1418
1416
|
if (err instanceof CodexInstallationIdUnavailableError) return transportFailureResponse(err);
|
|
1419
1417
|
upstream.abort();
|
|
@@ -1424,39 +1422,10 @@ export async function preparePassthroughExchange(
|
|
|
1424
1422
|
refreshUndeclaredToolGuard(request);
|
|
1425
1423
|
const refreshedBodyRefusal = refuseOversizedOutboundBody(request);
|
|
1426
1424
|
if (refreshedBodyRefusal) return refreshedBodyRefusal;
|
|
1427
|
-
const oauthReplayAccounting = copilotSendAccounting();
|
|
1428
1425
|
try {
|
|
1429
|
-
upstreamResponse = await
|
|
1430
|
-
recovery => {
|
|
1431
|
-
transportState.noteRoutedAttemptSend(passthroughEstimate, recovery ?? "oauth-401");
|
|
1432
|
-
return fetchWithHeaderTimeout(request.url, applyUpstreamRecoveryInit({
|
|
1433
|
-
method: request.method,
|
|
1434
|
-
headers: request.headers,
|
|
1435
|
-
body: request.body,
|
|
1436
|
-
}, recovery), upstream.signal, sendConnectMs(), upstreamRequestsStream,
|
|
1437
|
-
providerFetch(route.provider, options.codexWsRuntimeIdentity, {
|
|
1438
|
-
httpOnly: canonicalBufferedJson,
|
|
1439
|
-
nativeControl: nativeResponseControlEligible(route.provider, options.nativeControl) && options.inboundTransport === "websocket" && !options.comboAttempt
|
|
1440
|
-
&& responseEffects.plaintextV2AgentMessageToolNames.size === 0
|
|
1441
|
-
? options.nativeControl : undefined,
|
|
1442
|
-
dispatchOverride: oauthDispatch(request, parsed, "passthrough"),
|
|
1443
|
-
onPhysicalDispatch: recordPhysicalSend(oauthReplayAccounting.onPhysicalDispatch),
|
|
1444
|
-
providerName: route.providerName,
|
|
1445
|
-
modelId: route.modelId,
|
|
1446
|
-
onContinuationDispatch,
|
|
1447
|
-
accountAutoPause: (name, provider, headers) => captureAccountAutoPauseAttempt(name, provider, { config, codex: admissionState.authCtx }, headers),
|
|
1448
|
-
onCodexWsQuota: codexWsQuotaObserver(admissionState.authCtx, route.provider, route.modelId),
|
|
1449
|
-
beforeDispatch: isCanonicalOpenAiForwardProvider(route.provider)
|
|
1450
|
-
? createCodexAuthDispatchGuard(admissionState.authCtx, options.codexAuthPolicy ?? config, route.modelId, options.admission, options.visionDescribeTerminal === true) : undefined,
|
|
1451
|
-
}),
|
|
1452
|
-
route.provider.authMode === "forward")
|
|
1453
|
-
.then(adoptObservedResponse);
|
|
1454
|
-
},
|
|
1455
|
-
{ abortSignal: upstream.signal, label: safeHostLabel(request.url), destination: errorDestinationLabel(request.url), attempts: remainingTransientSendBudget(transientSendAttempts()),
|
|
1456
|
-
onSendsConsumed: oauthReplayAccounting.report, claimAmbiguousResend: claimPreHeaderResend },
|
|
1457
|
-
);
|
|
1426
|
+
upstreamResponse = await fetchCredentialReplay(commit, refreshedAdapter.name);
|
|
1458
1427
|
} catch (err) {
|
|
1459
|
-
return transportFailureResponse(err);
|
|
1428
|
+
return transportFailureResponse(err, commit);
|
|
1460
1429
|
} finally {
|
|
1461
1430
|
request.releaseBodyObservation?.();
|
|
1462
1431
|
}
|
|
@@ -1492,7 +1461,9 @@ export async function preparePassthroughExchange(
|
|
|
1492
1461
|
route.modelId,
|
|
1493
1462
|
);
|
|
1494
1463
|
let snapshot: OAuthAccessSnapshot | undefined;
|
|
1464
|
+
let commit: CredentialReplay | undefined;
|
|
1495
1465
|
if (nextAccountId) {
|
|
1466
|
+
commit = transportState.createCredentialReplayAttempt(upstreamResponse.status, "oauth-account-429");
|
|
1496
1467
|
try { snapshot = await failoverAccountSnapshot(route.providerName, nextAccountId); }
|
|
1497
1468
|
catch { /* Keep the original 429 body readable when the next credential is unavailable. */ }
|
|
1498
1469
|
}
|
|
@@ -1505,14 +1476,14 @@ export async function preparePassthroughExchange(
|
|
|
1505
1476
|
resolveWireProtocolOverride(route.providerName, route.modelId, route.provider, inboundWire, route.staticPolicy),
|
|
1506
1477
|
config.cacheRetention,
|
|
1507
1478
|
);
|
|
1508
|
-
bindRefreshedAdapter(rotatedAdapter);
|
|
1479
|
+
bindRefreshedAdapter(rotatedAdapter, false);
|
|
1509
1480
|
try { void upstreamResponse.body?.cancel().catch(() => {}); } catch { /* already closed */ }
|
|
1510
1481
|
sendBudgetState.pendingHopPermit = hop.permit;
|
|
1511
1482
|
if (route.providerName === "github-copilot" && rotatedAdapter.name === "openai-chat") {
|
|
1512
1483
|
transferred = true;
|
|
1513
|
-
return handoffToChat(rotatedAdapter);
|
|
1484
|
+
return handoffToChat(rotatedAdapter, commit);
|
|
1514
1485
|
}
|
|
1515
|
-
const result = await rebuildAndRefetch("oauth-account-429");
|
|
1486
|
+
const result = await rebuildAndRefetch("oauth-account-429", undefined, commit);
|
|
1516
1487
|
sendBudgetState.pendingHopPermit = undefined;
|
|
1517
1488
|
if ("failed" in result) return result.failed;
|
|
1518
1489
|
upstreamResponse = result;
|
|
@@ -1554,9 +1525,10 @@ export async function preparePassthroughExchange(
|
|
|
1554
1525
|
rateLimitRetries += 1;
|
|
1555
1526
|
// Release unread body + deliberate wait via the shared same-target helper.
|
|
1556
1527
|
const retryAfterHeader = upstreamResponse.headers.get("retry-after");
|
|
1528
|
+
const retryFrom = reserveRetrySpend() ? await retainPacedRetryResponse(upstreamResponse, upstream.signal) : undefined;
|
|
1557
1529
|
try {
|
|
1558
1530
|
for await (const _ of prepareSameTarget429Wait({
|
|
1559
|
-
body: upstreamResponse.body,
|
|
1531
|
+
body: retryFrom ? null : upstreamResponse.body,
|
|
1560
1532
|
signal: options.abortSignal,
|
|
1561
1533
|
delayMs: rateLimitRetryDelayMs(rateLimitPolicy, retryAfterHeader, Date.now()),
|
|
1562
1534
|
})) {
|
|
@@ -1585,7 +1557,7 @@ export async function preparePassthroughExchange(
|
|
|
1585
1557
|
body: request.body,
|
|
1586
1558
|
}, recovery), upstream.signal, sendConnectMs(), upstreamRequestsStream,
|
|
1587
1559
|
providerFetch(route.provider, options.codexWsRuntimeIdentity, {
|
|
1588
|
-
httpOnly: canonicalBufferedJson,
|
|
1560
|
+
httpOnly: canonicalBufferedJson, codexWsCaller, captureCodexWsRecovery: capturePhysicalSendRecovery, onRecoveryPhysicalDispatch: recordPhysicalSend(),
|
|
1589
1561
|
nativeControl: nativeResponseControlEligible(route.provider, options.nativeControl) && options.inboundTransport === "websocket" && !options.comboAttempt
|
|
1590
1562
|
&& responseEffects.plaintextV2AgentMessageToolNames.size === 0
|
|
1591
1563
|
? options.nativeControl : undefined,
|
|
@@ -1603,11 +1575,12 @@ export async function preparePassthroughExchange(
|
|
|
1603
1575
|
.then(adoptObservedResponse);
|
|
1604
1576
|
},
|
|
1605
1577
|
{ abortSignal: upstream.signal, label: safeHostLabel(request.url), destination: errorDestinationLabel(request.url), attempts: remainingTransientSendBudget(transientSendAttempts()),
|
|
1606
|
-
onSendsConsumed: failoverAccounting.report, claimAmbiguousResend: claimPreHeaderResend },
|
|
1578
|
+
reserveRetrySpend, retryFrom, onSendsConsumed: failoverAccounting.report, claimAmbiguousResend: claimPreHeaderResend },
|
|
1607
1579
|
);
|
|
1608
1580
|
} catch (err) {
|
|
1609
1581
|
return transportFailureResponse(err);
|
|
1610
1582
|
}
|
|
1583
|
+
if (retryFrom && upstreamResponse === retryFrom) break passthroughRecovery;
|
|
1611
1584
|
}
|
|
1612
1585
|
const keyRotation = await rotatePassthroughKeyOn429({ config, route, parsed, response: upstreamResponse, adapterName: transportState.adapter.name, budgetSpent: () => sendBudgetExhausted(transientSendAttempts()), refetch: () => rebuildAndRefetch("key-429") }); if (keyRotation) { if ("failed" in keyRotation) return keyRotation.failed; upstreamResponse = keyRotation; continue passthroughRecovery; }
|
|
1613
1586
|
const captureAffinityResponse = (
|
|
@@ -1673,13 +1646,8 @@ export async function preparePassthroughExchange(
|
|
|
1673
1646
|
}
|
|
1674
1647
|
|
|
1675
1648
|
if (poolRetryOutcome !== undefined) {
|
|
1676
|
-
// A stored Pool
|
|
1677
|
-
//
|
|
1678
|
-
// rather than a status check here as well: a quota failure has no same-account move, so
|
|
1679
|
-
// `sameAccountOnly` makes it terminal by refusing the alternate; the gated-model 400
|
|
1680
|
-
// ladder does have one — retrying the account the refreshed roster still grants — and
|
|
1681
|
-
// keeps it. An earlier revision also broke here on a non-400 outcome, which no test could
|
|
1682
|
-
// justify because this flag already produced the identical result.
|
|
1649
|
+
// A stored Pool replay precludes an account move. The gated-model ladder may continue
|
|
1650
|
+
// on the same confirmed account.
|
|
1683
1651
|
const storedReplaySpent = codex401ReplayKind === "stored" && !wasAccountAutoPaused(upstreamResponse);
|
|
1684
1652
|
const retry = await retryCodexPoolOnAlternateAccount({
|
|
1685
1653
|
callerAuthHeaders,
|
|
@@ -1691,14 +1659,18 @@ export async function preparePassthroughExchange(
|
|
|
1691
1659
|
firstAuthCtx: admissionState.authCtx,
|
|
1692
1660
|
firstResponse: upstreamResponse,
|
|
1693
1661
|
outcomeStatus: poolRetryOutcome,
|
|
1662
|
+
configuredSendsRemaining: transientSendPolicy() ? transientSendAttempts()
|
|
1663
|
+
: compactHandoffSendCeiling === undefined ? undefined : Math.max(0, compactHandoffSendCeiling - sendBudgetState.sendsUsed),
|
|
1694
1664
|
sameAccountOnly: storedReplaySpent,
|
|
1695
1665
|
upstream,
|
|
1696
1666
|
connectMs,
|
|
1697
|
-
passthroughEstimate,
|
|
1698
1667
|
stream: upstreamRequestsStream,
|
|
1699
1668
|
httpOnly: canonicalBufferedJson,
|
|
1700
1669
|
preOutputRefusalHold: preOutputRefusalHold(),
|
|
1701
|
-
onPhysicalSend:
|
|
1670
|
+
onPhysicalSend: (retryRequest, body) => {
|
|
1671
|
+
sendBudgetState.noteTargetSends(1);
|
|
1672
|
+
replayGuard.record(retryRequest, body);
|
|
1673
|
+
},
|
|
1702
1674
|
onResponse: (response, retryAuthCtx, retryRequest) => {
|
|
1703
1675
|
adoptCodexWsStage(response, logCtx);
|
|
1704
1676
|
captureAffinityResponse(
|
|
@@ -1739,6 +1711,7 @@ export async function preparePassthroughExchange(
|
|
|
1739
1711
|
parsed,
|
|
1740
1712
|
guard: opaqueBlobRecoveryGuard,
|
|
1741
1713
|
signal: upstream.signal,
|
|
1714
|
+
preserveResponse: reserveRetrySpend(),
|
|
1742
1715
|
}, rebuildAndRefetch);
|
|
1743
1716
|
if (opaqueBlobRecovery.kind === "failed") return opaqueBlobRecovery.response;
|
|
1744
1717
|
if (opaqueBlobRecovery.kind === "recovered") {
|
|
@@ -1783,6 +1756,7 @@ export async function preparePassthroughExchange(
|
|
|
1783
1756
|
parsed,
|
|
1784
1757
|
guard: opaqueBlobRecoveryGuard,
|
|
1785
1758
|
signal: upstream.signal,
|
|
1759
|
+
preserveResponse: reserveRetrySpend(),
|
|
1786
1760
|
}, rebuildAndRefetch);
|
|
1787
1761
|
if (streamedOpaqueRecovery.kind === "failed") return streamedOpaqueRecovery.response;
|
|
1788
1762
|
if (streamedOpaqueRecovery.kind === "recovered") {
|
|
@@ -1830,22 +1804,19 @@ export async function preparePassthroughExchange(
|
|
|
1830
1804
|
continue passthroughRecovery;
|
|
1831
1805
|
}
|
|
1832
1806
|
}
|
|
1833
|
-
//
|
|
1834
|
-
// model's ladder, not this account's entitlement. Learn each refusal so later turns clamp
|
|
1835
|
-
// before dispatch. Direct requests repair once; combo candidates may retry the next lower
|
|
1836
|
-
// published rung until it works, the ladder ends, or the send budget is spent.
|
|
1807
|
+
// Learn each refused effort. Direct requests repair once and Combo targets can walk the ladder.
|
|
1837
1808
|
const downgrade = await refusedReasoningEffortDowngrade(upstreamResponse, upstream.signal, reasoningEffortDowngradeGuard,
|
|
1838
1809
|
options.comboAttempt, { provider: route.provider, modelId: parsed.modelId, requested: parsed.options.reasoning });
|
|
1839
1810
|
if (downgrade && !configuredTransientSendBudgetExhausted()) {
|
|
1840
1811
|
reasoningEffortDowngradeGuard.attempted = true;
|
|
1841
1812
|
parsed.options.reasoning = downgrade.effort;
|
|
1842
1813
|
parsed._rawBody = withRawBodyReasoningEffort(parsed._rawBody, downgrade.effort);
|
|
1843
|
-
|
|
1844
|
-
|
|
1814
|
+
const refusal = reserveRetrySpend() ? await retainPacedRetryResponse(upstreamResponse, upstream.signal)
|
|
1815
|
+
: options.comboAttempt ? upstreamResponse : undefined;
|
|
1845
1816
|
if (!refusal) try { void upstreamResponse.body?.cancel().catch(() => {}); } catch { /* already consumed/closed */ }
|
|
1846
1817
|
const result = await rebuildAndRefetch("reasoning-effort-downgrade", refusal);
|
|
1847
1818
|
if ("failed" in result) return result.failed;
|
|
1848
|
-
if (refusal) try { void refusal.body?.cancel().catch(() => {}); } catch { /* already consumed/closed */ }
|
|
1819
|
+
if (refusal && refusal !== result) try { void refusal.body?.cancel().catch(() => {}); } catch { /* already consumed/closed */ }
|
|
1849
1820
|
upstreamResponse = result;
|
|
1850
1821
|
continue passthroughRecovery;
|
|
1851
1822
|
}
|
|
@@ -1874,6 +1845,7 @@ export async function preparePassthroughExchange(
|
|
|
1874
1845
|
replacement = await sendAmbiguousReplacement().then(adoptObservedResponse);
|
|
1875
1846
|
} catch (err) {
|
|
1876
1847
|
if (upstream.signal.aborted) return transportFailureResponse(err);
|
|
1848
|
+
if (reserveRetrySpend() && err instanceof SendBudgetExhaustedError) break passthroughRecovery;
|
|
1877
1849
|
if (err instanceof UnsafePhysicalReplacement) { unsafeReplacement = true; break; }
|
|
1878
1850
|
// A replacement that reset before its head is the pre-header row again: a configured
|
|
1879
1851
|
// second grant (and a send the budget can still fund) may buy one more send. The gate
|
|
@@ -1988,6 +1960,7 @@ export async function preparePassthroughExchange(
|
|
|
1988
1960
|
connectMs: resolveConnectTimeoutMs(config.connectTimeoutMs, { localUpstream }),
|
|
1989
1961
|
localUpstream,
|
|
1990
1962
|
upstreamResponse,
|
|
1963
|
+
pool401OutcomeSettled,
|
|
1991
1964
|
terminalOutcomeRecorded: preOutputRefusals.outcomeRecorded,
|
|
1992
1965
|
};
|
|
1993
1966
|
}
|