@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
|
@@ -10,14 +10,16 @@ import { isOpenCodeGoResponsesUrl } from "../../adapters/opencode-go-additional-
|
|
|
10
10
|
import { buildResponsesTransport } from "../../adapters/openai-responses/transport";
|
|
11
11
|
import { anthropicBillingPhysicalFetch } from "../../providers/anthropic-billing-ownership";
|
|
12
12
|
import { passiveKeyPhysicalFetch } from "../../providers/passive-key-observation";
|
|
13
|
-
import { rebindPhysicalSend } from "../../lib/request-execution-budget";
|
|
13
|
+
import { captureCurrentPhysicalSendUsage, rebindPhysicalSend, recordCurrentPhysicalSendUsage } from "../../lib/request-execution-budget";
|
|
14
|
+
import { withMissingCreditReading } from "../../usage/credit-billing";
|
|
14
15
|
import { anthropicModelQuotaFor } from "../../oauth/anthropic-model-quota";
|
|
15
16
|
import { anthropicRatePolicyFor } from "../../oauth/anthropic-rate-limit-policy";
|
|
16
17
|
import { configuredAnthropicInstance } from "../../providers/anthropic-instance";
|
|
17
|
-
import { resolveAnthropicMessagesUrl } from "../../adapters/anthropic";
|
|
18
|
+
import { anthropicApiKeyForRequest, resolveAnthropicMessagesUrl } from "../../adapters/anthropic";
|
|
19
|
+
import { hostedAdvisorCredentials, stripHostedAdvisorBeta } from "../../adapters/anthropic/advisor-tool";
|
|
18
20
|
import { bindAnthropicRefusalCredentialForSend } from "../../oauth/anthropic-account-refusal";
|
|
19
21
|
import { captureAnthropicPhysicalSendOwnership, anthropicPhysicalSendOwnershipIsCurrent, type AnthropicPhysicalSendOwnership } from "../../oauth/anthropic-send-ownership";
|
|
20
|
-
import type
|
|
22
|
+
import { responsesTimeoutProvider, type ResponsesRequestContext, type ResponsesAdmissionState } from "./core-options";
|
|
21
23
|
import type { PreparedResponsesRequest } from "./request-prepare";
|
|
22
24
|
import type { OAuthAccessSnapshot } from "../../oauth";
|
|
23
25
|
import {
|
|
@@ -30,7 +32,8 @@ import {
|
|
|
30
32
|
import { refreshKiroAccountModelsDetached } from "../../providers/kiro-model-catalog";
|
|
31
33
|
import type { ProviderAdapter, AdapterRequest } from "../../adapters/base";
|
|
32
34
|
import { copyVertexRequestAuthority, hasVertexRequestAuthority, vertexRequestAuthorityIsCurrent } from "../../lib/gcp-adc";
|
|
33
|
-
import { releaseProviderRequestSlot, waitForProviderRequestSlot, type ProviderRequestSlot } from "../../providers/request-pacing";
|
|
35
|
+
import { registerProviderResponseProvenance, releaseProviderRequestSlot, waitForProviderRequestSlot, type ProviderRequestSlot } from "../../providers/request-pacing";
|
|
36
|
+
import type { AnthropicImageRecoveryPin } from "./anthropic-image-context";
|
|
34
37
|
import type { AdapterEvent, OcxParsedRequest, OcxProviderConfig, OcxUsage } from "../../types";
|
|
35
38
|
import type { AnthropicAccountSelectionReason } from "../../oauth/anthropic-routing";
|
|
36
39
|
import { resolveAnthropicModelRouteForInstance, routeCandidates, type AnthropicRouteDecision } from "../../oauth/anthropic-model-routes";
|
|
@@ -68,13 +71,14 @@ import { oauthSessionKeyFromParts } from "../../oauth/session-affinity-key";
|
|
|
68
71
|
import { resolveContextPrincipal } from "../auth-cors";
|
|
69
72
|
import { tryKiroAlternateAfterTerminalRefresh } from "../../oauth/kiro-terminal-failover";
|
|
70
73
|
import { classifyModelFamilyForQuota } from "../../oauth/account-quota-rank";
|
|
71
|
-
import { expandInferenceOAuthSendBudget } from "../inference/context";
|
|
74
|
+
import { expandInferenceOAuthSendBudget, fundChatGptRetryAttempts } from "../inference/context";
|
|
72
75
|
import { stampOAuthAccountLabel, stampApiKeyAccountLabel, usesApiKeyAccount } from "../../providers/label";
|
|
73
|
-
import {
|
|
76
|
+
import { apiKeyAccountLogLabel, oauthAccountLogLabel } from "../../codex/account-label";
|
|
77
|
+
import { bindResponsesHostedAdvisorSpendTarget, bindResponsesSpendTarget, responsesSpendTarget } from "./request-spend-target";
|
|
74
78
|
import { isXaiResponsesDestination, resolveProviderTransport } from "../../providers/xai-transport";
|
|
75
79
|
import { captureRouteStaticPolicy } from "../../router";
|
|
76
80
|
import { CopilotAutoHttpError, resolveCopilotAuto } from "../../providers/github-copilot-auto";
|
|
77
|
-
import { PolicyCandidateUnavailableError, MandatoryToolChoiceUnavailableError, mandatoryToolChoiceUnavailableResponse, policyCandidateRefusalResponse } from "./policy-request-scope";
|
|
81
|
+
import { HostedAdvisorSpendRefusal, PolicyCandidateUnavailableError, MandatoryToolChoiceUnavailableError, mandatoryToolChoiceUnavailableResponse, policyCandidateRefusalResponse } from "./policy-request-scope";
|
|
78
82
|
import { chatCanPreserveMandatoryToolChoice } from "./combo-required-tool-contract";
|
|
79
83
|
import {
|
|
80
84
|
AdmissionModelDeniedError,
|
|
@@ -90,8 +94,9 @@ import {
|
|
|
90
94
|
} from "../../providers/api-key-selection";
|
|
91
95
|
import { isProviderApiKeyPaused, ProviderApiKeyPausedError } from "../../providers/api-key-pause";
|
|
92
96
|
import { resolveAdapter, resolveWireProtocolOverride } from "../adapter-resolve";
|
|
97
|
+
import { applyReasoningDisplayPolicy } from "./core-normalize";
|
|
93
98
|
import { codexWsExecutorBinding, fetchWithHeaderTimeout, physicalSendGuardInit, physicalSendObserverInit, providerFetch, sendWithConnectionPolicy } from "./fetch-helpers";
|
|
94
|
-
import { resolveConnectTimeoutMs } from "../../stall-timeout";
|
|
99
|
+
import { providerConnectTimeoutMs, resolveConnectTimeoutMs } from "../../stall-timeout";
|
|
95
100
|
import { isLocalUpstream } from "../../lib/local-upstream";
|
|
96
101
|
import { deepSeekImageFileBody, needsDeepSeekImageFiles } from "./deepseek-image-files";
|
|
97
102
|
import type { ProviderFetchOptions } from "./fetch-helpers";
|
|
@@ -103,8 +108,8 @@ import { bindRouteReasoningReplayScope } from "./core-replay";
|
|
|
103
108
|
import { affinityLaneFromRequest, assignNativeLogConversationId, normalizeLogConversationId, sessionIdHeaderFromRequest } from "../request-log-conversation";
|
|
104
109
|
import { redactSecretString } from "../../lib/redact";
|
|
105
110
|
import { captureAccountAutoPauseAttempt } from "../../oauth/account-auto-pause";
|
|
106
|
-
import { selectProactiveApiKeyTransport } from "../../providers/key-failover";
|
|
107
|
-
import { distributedKeyPhysicalFetch } from "../../providers/api-key-response-ownership";
|
|
111
|
+
import { selectProactiveApiKeyTransport, transientRetryPolicyFor } from "../../providers/key-failover";
|
|
112
|
+
import { distributedKeyPhysicalFetch, hasConflictingApiKeyHeaders } from "../../providers/api-key-response-ownership";
|
|
108
113
|
import { isCanonicalOpenAiForwardProvider } from "../../providers/openai-tiers";
|
|
109
114
|
import { providerConsumesCallerAuthorization } from "../../providers/caller-authorization";
|
|
110
115
|
import { releaseCodexAuthContextProbeLease, stripCodexRuntimeProviderFields } from "../../codex/auth-context";
|
|
@@ -112,18 +117,33 @@ import {
|
|
|
112
117
|
beginRequestAttempt,
|
|
113
118
|
sealRequestAttemptIdentity,
|
|
114
119
|
recordAttemptCredentialSource,
|
|
120
|
+
recordAdapterReasoning,
|
|
121
|
+
recordAdapterTier,
|
|
115
122
|
recordAdapterTierMetadata,
|
|
123
|
+
recordAttemptRequestedEffort,
|
|
116
124
|
noteProviderAttemptSend,
|
|
117
|
-
recordKeyAttemptFailure,
|
|
118
125
|
recordKeyAttemptUsage,
|
|
119
126
|
rebindCacheDiagnosticBody,
|
|
127
|
+
type RequestLogContext,
|
|
120
128
|
} from "../request-log";
|
|
129
|
+
import { recordKeyAttemptFailure } from "../request-log-key-failure";
|
|
130
|
+
import { sealCredentialRefusal } from "../credential-recovery-attempt";
|
|
131
|
+
import { sealedCredentialRefusals } from "../request-log-attempt-recovery";
|
|
121
132
|
import type { AttemptRecoveryKind } from "../../usage/log";
|
|
122
133
|
import { bindAttemptDeliveryRecorder } from "../../usage/attempt-delivery";
|
|
134
|
+
import { observeResponseSendReadings } from "../../lib/response-send-readings";
|
|
123
135
|
import { resolvePassiveRouteSubjectId } from "../passive-route-linker";
|
|
124
136
|
import { anthropicPoolCooldownResponse, clientCancelledResponse } from "./core-errors";
|
|
125
137
|
import { acquireAccountLease, KIRO_ACCOUNT_WAIT_MS } from "../../oauth/kiro-account-load";
|
|
126
138
|
|
|
139
|
+
type CopilotInferenceReceipt = {
|
|
140
|
+
attempt: NonNullable<RequestLogContext["activeAttempt"]>;
|
|
141
|
+
ordinal: number;
|
|
142
|
+
sendCount: number;
|
|
143
|
+
};
|
|
144
|
+
const copilotInferenceReceipts = new WeakMap<Response, CopilotInferenceReceipt>();
|
|
145
|
+
registerProviderResponseProvenance(copilotInferenceReceipts);
|
|
146
|
+
|
|
127
147
|
/** Return a renewed Chat wire to the native owner before sending inference. */
|
|
128
148
|
export class CopilotAutoAdapterHandoff extends Error {
|
|
129
149
|
constructor(readonly adapter: ProviderAdapter) {
|
|
@@ -131,6 +151,10 @@ export class CopilotAutoAdapterHandoff extends Error {
|
|
|
131
151
|
}
|
|
132
152
|
}
|
|
133
153
|
|
|
154
|
+
type ImageDispatchPin = { current(): boolean; matches(target: string, headers: Headers): boolean };
|
|
155
|
+
const imageRefusals = new WeakMap<Response, AnthropicImageRecoveryPin | null>();
|
|
156
|
+
registerProviderResponseProvenance(imageRefusals);
|
|
157
|
+
|
|
134
158
|
/** Owns live credential selection and adapter bindings for one request. */
|
|
135
159
|
export async function prepareResponsesTransport(
|
|
136
160
|
requestContext: Pick<ResponsesRequestContext, "config" | "logCtx" | "options" | "req">,
|
|
@@ -152,10 +176,6 @@ export async function prepareResponsesTransport(
|
|
|
152
176
|
const deferPhysicalAttribution = route.providerName === "github-copilot" && route.provider.authMode !== "forward";
|
|
153
177
|
let copilotCandidate: { model: string; adapter: string; accountLogLabel?: string } | undefined;
|
|
154
178
|
bindResponsesSpendTarget(logCtx);
|
|
155
|
-
if (deferPhysicalAttribution) bindResponsesSpendTarget(logCtx, () => ({
|
|
156
|
-
poolId: logCtx.spendPoolId ?? route.providerName,
|
|
157
|
-
identityId: copilotCandidate ? copilotCandidate.accountLogLabel : logCtx.accountLogLabel,
|
|
158
|
-
}));
|
|
159
179
|
const genericAffinityMode = genericSessionAffinityEnabled(config, route.providerName);
|
|
160
180
|
const anthropicInstance = route.provider.authMode === "oauth"
|
|
161
181
|
? configuredAnthropicInstance(config, route.providerName) : undefined;
|
|
@@ -232,6 +252,24 @@ export async function prepareResponsesTransport(
|
|
|
232
252
|
? captureOAuthAccountSelection(route.providerName) : null;
|
|
233
253
|
const anthropicManualSelectionGeneration = anthropicRouting?.captureAnthropicManualSelectionGeneration();
|
|
234
254
|
let servingOAuthSnapshot: OAuthAccessSnapshot | undefined;
|
|
255
|
+
let hostedAdvisorSpendGuard: ((request: OcxParsedRequest, provider: OcxProviderConfig, finalRefusal?: HostedAdvisorSpendRefusal) => void) | undefined;
|
|
256
|
+
let hostedAdvisorCredentialWithheld = false;
|
|
257
|
+
if (deferPhysicalAttribution) bindResponsesSpendTarget(logCtx, () => ({
|
|
258
|
+
poolId: logCtx.spendPoolId ?? route.providerName,
|
|
259
|
+
identityId: copilotCandidate ? copilotCandidate.accountLogLabel : logCtx.accountLogLabel,
|
|
260
|
+
}));
|
|
261
|
+
// Hosted-Advisor identity follows admitted credentials without changing main-model accounting.
|
|
262
|
+
// Anthropic's log uses a provider tag; its snapshot keeps same-ID instances distinct here.
|
|
263
|
+
bindResponsesHostedAdvisorSpendTarget(logCtx, (provider = route.provider) => {
|
|
264
|
+
const apiKey = provider.adapter === "anthropic" ? anthropicApiKeyForRequest(provider) : undefined;
|
|
265
|
+
return {
|
|
266
|
+
poolId: logCtx.spendPoolId ?? route.providerName,
|
|
267
|
+
identityId: apiKey !== undefined
|
|
268
|
+
? apiKeyAccountLogLabel(route.providerName, provider._apiKeyAttempt?.reference ? provider._apiKeyAttempt : { reference: apiKey })
|
|
269
|
+
: anthropicInstance && servingOAuthSnapshot ? oauthAccountLogLabel(servingOAuthSnapshot.accountId, servingOAuthSnapshot.provider)
|
|
270
|
+
: logCtx.accountLogLabel,
|
|
271
|
+
};
|
|
272
|
+
});
|
|
235
273
|
// These owners also serve early passthrough and sidecar sends. A dispatch-time
|
|
236
274
|
// rebuild must update every later builder, without entering a later block's TDZ.
|
|
237
275
|
let adapter: ProviderAdapter;
|
|
@@ -247,6 +285,12 @@ export async function prepareResponsesTransport(
|
|
|
247
285
|
| { kind: "oauth"; selection: NonNullable<typeof oauthSelection>; snapshot: OAuthAccessSnapshot }
|
|
248
286
|
| { kind: "api-key"; provider: OcxProviderConfig };
|
|
249
287
|
const requestBindings = new WeakMap<AdapterRequest, DispatchBinding>();
|
|
288
|
+
const capturedImagePins = new WeakSet<AnthropicImageRecoveryPin>();
|
|
289
|
+
const imageHistoryPins = new WeakMap<AnthropicImageRecoveryPin["owner"], (request: AdapterRequest) => ImageDispatchPin>();
|
|
290
|
+
const hostedAdvisorDispatches = new WeakMap<AdapterRequest, {
|
|
291
|
+
credential: NonNullable<ReturnType<typeof hostedAdvisorCredentials.get>>;
|
|
292
|
+
rebuild: (refusal: HostedAdvisorSpendRefusal, signal: AbortSignal) => Promise<AdapterRequest>;
|
|
293
|
+
}>();
|
|
250
294
|
const adapterBindings = new WeakMap<ProviderAdapter, DispatchBinding>();
|
|
251
295
|
const rawRunTurns = new WeakMap<ProviderAdapter, NonNullable<ProviderAdapter["runTurn"]>>();
|
|
252
296
|
const commitResolvedOAuthSelection = async (
|
|
@@ -461,6 +505,7 @@ export async function prepareResponsesTransport(
|
|
|
461
505
|
copilotAutoAdapter = autoAdapter;
|
|
462
506
|
for (const target of new Set([parsed, requestParsed])) {
|
|
463
507
|
target.modelId = selected.modelId;
|
|
508
|
+
applyReasoningDisplayPolicy(target, negotiatedWire, inboundWire);
|
|
464
509
|
if (target._rawBody && typeof target._rawBody === "object")
|
|
465
510
|
(target._rawBody as { model?: string }).model = selected.modelId;
|
|
466
511
|
target.context = renameRoutedIdentityInContext(target.context, selected.modelId);
|
|
@@ -582,8 +627,7 @@ export async function prepareResponsesTransport(
|
|
|
582
627
|
if (attemptSendDeferred()) pendingKeySend = { estimate, recovery };
|
|
583
628
|
else noteProviderAttemptSend(logCtx, route.providerName, route.provider, estimate, recovery);
|
|
584
629
|
};
|
|
585
|
-
const
|
|
586
|
-
if (!attemptSendDeferred()) return;
|
|
630
|
+
const commitRoutedAttemptSend = (estimate: number | undefined, recovery?: AttemptRecoveryKind, resolved = copilotCandidate): void => {
|
|
587
631
|
if (copilotCandidate) {
|
|
588
632
|
logCtx.model = copilotCandidate.model;
|
|
589
633
|
logCtx.providerAdapter = copilotCandidate.adapter;
|
|
@@ -594,14 +638,86 @@ export async function prepareResponsesTransport(
|
|
|
594
638
|
sentOAuthSnapshot = servingOAuthSnapshot;
|
|
595
639
|
}
|
|
596
640
|
}
|
|
597
|
-
noteProviderAttemptSend(logCtx, route.providerName, route.provider,
|
|
598
|
-
|
|
641
|
+
noteProviderAttemptSend(logCtx, route.providerName, route.provider, estimate, recovery, resolved);
|
|
642
|
+
};
|
|
643
|
+
const commitKeyAttemptSend = (): void => {
|
|
644
|
+
if (!attemptSendDeferred()) return;
|
|
645
|
+
const pending = pendingKeySend;
|
|
646
|
+
pendingKeySend = undefined;
|
|
647
|
+
commitRoutedAttemptSend(pending?.estimate ?? logCtx.usageLogInputTokens, pending?.recovery);
|
|
648
|
+
};
|
|
649
|
+
const bindPassiveSubject = (adapter: string, model: string): void => {
|
|
650
|
+
const attempt = logCtx.activeAttempt;
|
|
651
|
+
if (!attempt || sealedCredentialRefusals.has(attempt)) return;
|
|
652
|
+
const subject = resolvePassiveRouteSubjectId(config, route.providerName, model, route.provider, inboundWire, adapter);
|
|
653
|
+
if (subject) attempt.labRouteSubjectId = subject;
|
|
654
|
+
else delete attempt.labRouteSubjectId;
|
|
655
|
+
};
|
|
656
|
+
const commitRunTurnAttemptSend = (requestParsed: OcxParsedRequest, recovery?: AttemptRecoveryKind): void => {
|
|
657
|
+
const selected = runTurnAdapter;
|
|
658
|
+
pendingKeySend = undefined;
|
|
659
|
+
commitRoutedAttemptSend(logCtx.usageLogInputTokens, recovery, { model: route.modelId, adapter: selected.name });
|
|
660
|
+
logCtx.providerAdapter = selected.name;
|
|
661
|
+
bindPassiveSubject(selected.name, route.modelId);
|
|
662
|
+
recordAttemptRequestedEffort(logCtx);
|
|
663
|
+
recordAdapterTierMetadata(logCtx, selected.tierLogForRunTurn?.(requestParsed));
|
|
664
|
+
};
|
|
665
|
+
const commitAdapterAttemptSend = (request: AdapterRequest, adapter: string, recovery?: AttemptRecoveryKind): void => {
|
|
666
|
+
const estimate = request.usageLog?.inputTokens;
|
|
599
667
|
pendingKeySend = undefined;
|
|
668
|
+
const identity = copilotCandidate ?? { model: route.modelId, adapter };
|
|
669
|
+
commitRoutedAttemptSend(estimate, recovery, identity);
|
|
670
|
+
logCtx.providerAdapter = identity.adapter;
|
|
671
|
+
logCtx.usageLogInputTokens = estimate;
|
|
672
|
+
recordAdapterReasoning(logCtx, request);
|
|
673
|
+
recordAdapterTier(logCtx, request);
|
|
674
|
+
};
|
|
675
|
+
const createCredentialReplayAttempt = (status: number, recovery: AttemptRecoveryKind) => {
|
|
676
|
+
sealCredentialRefusal(logCtx, status, recovery);
|
|
677
|
+
let dispatched = false;
|
|
678
|
+
return (request: AdapterRequest, adapter: string, transportRecovery?: AttemptRecoveryKind): void => {
|
|
679
|
+
const estimate = request.usageLog?.inputTokens;
|
|
680
|
+
const identity = copilotCandidate ?? { model: route.modelId, adapter };
|
|
681
|
+
if (!dispatched) pendingKeySend = undefined;
|
|
682
|
+
commitRoutedAttemptSend(estimate, dispatched ? transportRecovery : recovery, identity);
|
|
683
|
+
if (dispatched) return;
|
|
684
|
+
logCtx.providerAdapter = identity.adapter;
|
|
685
|
+
logCtx.usageLogInputTokens = estimate;
|
|
686
|
+
bindPassiveSubject(identity.adapter, identity.model);
|
|
687
|
+
recordAdapterReasoning(logCtx, request);
|
|
688
|
+
recordAdapterTier(logCtx, request);
|
|
689
|
+
dispatched = true;
|
|
690
|
+
};
|
|
691
|
+
};
|
|
692
|
+
let credentialReplayHandoff: ReturnType<typeof createCredentialReplayAttempt> | undefined;
|
|
693
|
+
const isCurrentInferenceResponse = (response: Response): boolean => {
|
|
694
|
+
if (route.providerName !== "github-copilot" || route.provider.authMode === "forward") return true;
|
|
695
|
+
const receipt = copilotInferenceReceipts.get(response);
|
|
696
|
+
const attempt = logCtx.activeAttempt;
|
|
697
|
+
return receipt !== undefined && receipt.attempt === attempt
|
|
698
|
+
&& receipt.ordinal === attempt.ordinal && receipt.sendCount === attempt.sendCount;
|
|
699
|
+
};
|
|
700
|
+
let guardedOAuthAttemptOrdinal: number | undefined;
|
|
701
|
+
const trackGuardedOAuthAttemptUsage = (): void => {
|
|
702
|
+
if (route.provider.authMode === "oauth") guardedOAuthAttemptOrdinal = logCtx.activeAttempt?.ordinal;
|
|
703
|
+
};
|
|
704
|
+
// Attempt ordinals that dispatched a parsed leg with no usage: their parser-built credit total
|
|
705
|
+
// is incomplete however many other legs reported one (#8452). Keyed by ordinal, never by the
|
|
706
|
+
// attempt object: a rotation reuses the live object for the next attempt.
|
|
707
|
+
const attemptsMissingCredit = new Set<number>();
|
|
708
|
+
const markMissingCredit = (attempt: typeof logCtx.activeAttempt): void => {
|
|
709
|
+
if (attempt?.usage && attemptsMissingCredit.has(attempt.ordinal)) attempt.usage = withMissingCreditReading(attempt.usage);
|
|
600
710
|
};
|
|
601
711
|
const bindKeyUsageFromBridge = (usage: OcxUsage | undefined): void => {
|
|
602
712
|
logCtx.usageFromBridge = true;
|
|
713
|
+
if (logCtx.activeAttempt && sealedCredentialRefusals.has(logCtx.activeAttempt)) return;
|
|
603
714
|
if (usesApiKeyAccount(route.provider)) {
|
|
604
715
|
if (!logCtx.activeAttempt?.usage && usage) recordKeyAttemptUsage(logCtx, usage);
|
|
716
|
+
markMissingCredit(logCtx.activeAttempt);
|
|
717
|
+
logCtx.usage = logCtx.activeAttempt?.usage;
|
|
718
|
+
} else if (guardedOAuthAttemptOrdinal !== undefined && logCtx.activeAttempt?.ordinal !== guardedOAuthAttemptOrdinal) {
|
|
719
|
+
// The bridge can sum across accounts. The parser already bound each response before rotation.
|
|
720
|
+
markMissingCredit(logCtx.activeAttempt);
|
|
605
721
|
logCtx.usage = logCtx.activeAttempt?.usage;
|
|
606
722
|
} else if (usage) {
|
|
607
723
|
logCtx.usage = usage;
|
|
@@ -663,6 +779,27 @@ export async function prepareResponsesTransport(
|
|
|
663
779
|
return buildWithOriginalCatalog({ ...requestParsed, _rawBody: projected }, incoming);
|
|
664
780
|
};
|
|
665
781
|
}
|
|
782
|
+
const buildWithHostedAdvisorPolicy = resolved.buildRequest.bind(resolved);
|
|
783
|
+
resolved.buildRequest = (requestParsed, incoming) => {
|
|
784
|
+
hostedAdvisorSpendGuard?.(requestParsed, provider);
|
|
785
|
+
const built = buildWithHostedAdvisorPolicy(requestParsed, incoming);
|
|
786
|
+
if (resolved.name !== "anthropic") return built;
|
|
787
|
+
return Promise.resolve(built).then(request => {
|
|
788
|
+
const credential = hostedAdvisorCredentials.get(request);
|
|
789
|
+
if (credential) hostedAdvisorDispatches.set(request, {
|
|
790
|
+
credential,
|
|
791
|
+
rebuild: async (refusal, signal) => {
|
|
792
|
+
if (!hostedAdvisorSpendGuard) throw refusal;
|
|
793
|
+
hostedAdvisorSpendGuard(requestParsed, provider, refusal);
|
|
794
|
+
hostedAdvisorCredentialWithheld = true;
|
|
795
|
+
const rebuilt = await buildWithHostedAdvisorPolicy(requestParsed, { ...incoming, abortSignal: signal });
|
|
796
|
+
if (hostedAdvisorCredentials.has(rebuilt)) throw refusal;
|
|
797
|
+
return rebuilt;
|
|
798
|
+
},
|
|
799
|
+
});
|
|
800
|
+
return request;
|
|
801
|
+
});
|
|
802
|
+
};
|
|
666
803
|
if (route.provider.authMode === "forward") return resolved;
|
|
667
804
|
const binding: DispatchBinding | undefined = route.provider.authMode === "oauth"
|
|
668
805
|
? oauthSelection && servingOAuthSnapshot
|
|
@@ -673,18 +810,59 @@ export async function prepareResponsesTransport(
|
|
|
673
810
|
// Observe terminals before search/image loops or continuation guards hide earlier rounds.
|
|
674
811
|
// Each adapter parser is called once per physical response; bridge totals are client-only.
|
|
675
812
|
const observedResponses = new WeakSet<object>();
|
|
813
|
+
const parserOwnsUsage = (): boolean => usesApiKeyAccount(provider) || guardedOAuthAttemptOrdinal !== undefined;
|
|
676
814
|
const observeUsage = (event: AdapterEvent, response: object): void => {
|
|
677
|
-
if (
|
|
815
|
+
if (parserOwnsUsage() && "usage" in event && event.usage && !observedResponses.has(response)) {
|
|
678
816
|
observedResponses.add(response);
|
|
679
817
|
recordKeyAttemptUsage(logCtx, event.usage);
|
|
818
|
+
markMissingCredit(logCtx.activeAttempt);
|
|
680
819
|
}
|
|
681
820
|
};
|
|
821
|
+
// One parse is one physical response. Its usage settles the send that produced it (#8902),
|
|
822
|
+
// and a response that reports none leaves its issuing attempt's credits incomplete (#8452).
|
|
823
|
+
// A parser that dispatches its own retry reports each response's reading instead, because its
|
|
824
|
+
// terminal sums the sends; those readings then settle the sends and the terminal settles none.
|
|
825
|
+
const observeLeg = (response: object) => {
|
|
826
|
+
const recordSpend = logCtx.spendTracker?.captureRoutedSendUsage?.();
|
|
827
|
+
const ordinal = logCtx.activeAttempt?.ordinal;
|
|
828
|
+
let reported = false;
|
|
829
|
+
let readings = 0;
|
|
830
|
+
const releaseReadings = observeResponseSendReadings(response, reading => {
|
|
831
|
+
// An absent reading marks its send unmetered, so no aggregate can settle it either.
|
|
832
|
+
recordSpend?.(reading ?? null, readings === 0 ? "issuing" : "newest");
|
|
833
|
+
readings++;
|
|
834
|
+
});
|
|
835
|
+
const end = (): void => {
|
|
836
|
+
releaseReadings();
|
|
837
|
+
if (reported || ordinal === undefined || !parserOwnsUsage()) return;
|
|
838
|
+
attemptsMissingCredit.add(ordinal);
|
|
839
|
+
// A rotation during this parse sealed the issuing attempt into its own row; a row with no
|
|
840
|
+
// usage already leaves the request-wide credit sum incomplete.
|
|
841
|
+
const live = logCtx.activeAttempt;
|
|
842
|
+
markMissingCredit(live?.ordinal === ordinal ? live
|
|
843
|
+
: logCtx.attempts?.find(attempt => attempt !== live && attempt.ordinal === ordinal));
|
|
844
|
+
};
|
|
845
|
+
return {
|
|
846
|
+
event(event: AdapterEvent): void {
|
|
847
|
+
if (!reported && "usage" in event && event.usage) {
|
|
848
|
+
reported = true;
|
|
849
|
+
if (readings === 0) recordSpend?.(event.usage);
|
|
850
|
+
}
|
|
851
|
+
// Before the consumer binds the terminal's usage, which can precede this parse's close.
|
|
852
|
+
if (event.type === "done" || event.type === "incomplete" || event.type === "error") end();
|
|
853
|
+
},
|
|
854
|
+
end,
|
|
855
|
+
};
|
|
856
|
+
};
|
|
682
857
|
// Counted at the one seam every adapter parse passes, and counted for EVERY event rather
|
|
683
858
|
// than only usage-bearing ones: the number this pairs with is the frame count the client
|
|
684
859
|
// transport relayed, and a difference between the two is the loss signal (#3983). Reading
|
|
685
860
|
// the current attempt through logCtx rather than capturing one keeps the count with the
|
|
686
861
|
// attempt that is live when the event arrives, across a mid-request attempt rotation.
|
|
687
|
-
const delivery = bindAttemptDeliveryRecorder(translatorBudget, () =>
|
|
862
|
+
const delivery = bindAttemptDeliveryRecorder(translatorBudget, () => {
|
|
863
|
+
const attempt = logCtx.activeAttempt;
|
|
864
|
+
return attempt && !sealedCredentialRefusals.has(attempt) ? attempt : undefined;
|
|
865
|
+
});
|
|
688
866
|
const observeEvent = (event: AdapterEvent, response: object): void => {
|
|
689
867
|
delivery.noteAdapterEvent();
|
|
690
868
|
observeUsage(event, response);
|
|
@@ -692,13 +870,19 @@ export async function prepareResponsesTransport(
|
|
|
692
870
|
};
|
|
693
871
|
const parseStream = resolved.parseStream.bind(resolved);
|
|
694
872
|
resolved.parseStream = async function* (...args) {
|
|
695
|
-
|
|
873
|
+
const leg = observeLeg(args[0]);
|
|
874
|
+
// A guard stops reading at the terminal, which closes this generator early.
|
|
875
|
+
try {
|
|
876
|
+
for await (const event of parseStream(...args)) { observeEvent(event, args[0]); leg.event(event); yield event; }
|
|
877
|
+
} finally { leg.end(); }
|
|
696
878
|
};
|
|
697
879
|
if (resolved.parseResponse) {
|
|
698
880
|
const parseResponse = resolved.parseResponse.bind(resolved);
|
|
699
881
|
resolved.parseResponse = async (...args) => {
|
|
882
|
+
const leg = observeLeg(args[0]);
|
|
700
883
|
const events = await parseResponse(...args);
|
|
701
|
-
events.forEach(event => observeEvent(event, args[0]));
|
|
884
|
+
events.forEach(event => { observeEvent(event, args[0]); leg.event(event); });
|
|
885
|
+
leg.end();
|
|
702
886
|
return events;
|
|
703
887
|
};
|
|
704
888
|
}
|
|
@@ -886,6 +1070,14 @@ export async function prepareResponsesTransport(
|
|
|
886
1070
|
refused = true;
|
|
887
1071
|
throw new Error("Account selection changed before turn admission");
|
|
888
1072
|
}
|
|
1073
|
+
const beforeCredentialSend = (): void => {
|
|
1074
|
+
incoming.abortSignal?.throwIfAborted();
|
|
1075
|
+
incoming.beforeCredentialSend?.();
|
|
1076
|
+
if (!selectionIsCurrent(binding)) {
|
|
1077
|
+
refused = !sent;
|
|
1078
|
+
throw new Error("Account selection changed before turn dispatch");
|
|
1079
|
+
}
|
|
1080
|
+
};
|
|
889
1081
|
const beforePhysicalSend = (): void => {
|
|
890
1082
|
incoming.abortSignal?.throwIfAborted();
|
|
891
1083
|
if (sent) {
|
|
@@ -893,13 +1085,8 @@ export async function prepareResponsesTransport(
|
|
|
893
1085
|
&& !selectionIsCurrent(binding)) throw new Error("API key became unavailable during the turn");
|
|
894
1086
|
return;
|
|
895
1087
|
}
|
|
896
|
-
|
|
897
|
-
refused = true;
|
|
898
|
-
throw new Error("Account selection changed before the first turn dispatch");
|
|
899
|
-
}
|
|
1088
|
+
beforeCredentialSend();
|
|
900
1089
|
incoming.beforePhysicalSend?.();
|
|
901
|
-
commitKeyAttemptSend();
|
|
902
|
-
sent = true;
|
|
903
1090
|
};
|
|
904
1091
|
const fetch = providerFetch(route.provider, options.codexWsRuntimeIdentity, {
|
|
905
1092
|
providerName: route.providerName, modelId: route.modelId, pacingSlotAcquired: true,
|
|
@@ -907,8 +1094,15 @@ export async function prepareResponsesTransport(
|
|
|
907
1094
|
turnScopedPacing: true,
|
|
908
1095
|
accountAutoPause: (name, provider, headers) => captureAccountAutoPauseAttempt(name, provider, { config, oauth: binding?.kind === "oauth" ? binding.snapshot : undefined }, headers),
|
|
909
1096
|
beforeDispatch: beforePhysicalSend,
|
|
1097
|
+
onPhysicalDispatch: () => {
|
|
1098
|
+
sent = true;
|
|
1099
|
+
if (incoming.onGuardedDispatch) incoming.onGuardedDispatch();
|
|
1100
|
+
else if (!selectedAdapter.reportsPhysicalSends) commitKeyAttemptSend();
|
|
1101
|
+
},
|
|
910
1102
|
});
|
|
911
|
-
await run(requestParsed, { ...incoming, pacingSlot: attemptSlot, providerFetch: fetch, beforePhysicalSend
|
|
1103
|
+
await run(requestParsed, { ...incoming, pacingSlot: attemptSlot, providerFetch: fetch, beforePhysicalSend, beforeCredentialSend,
|
|
1104
|
+
onPhysicalSend: send => { sent = true; incoming.onPhysicalSend?.(send); },
|
|
1105
|
+
}, event => { if (!refused) emit(event); });
|
|
912
1106
|
} catch (error) {
|
|
913
1107
|
if (!refused) throw error;
|
|
914
1108
|
} finally {
|
|
@@ -923,28 +1117,69 @@ export async function prepareResponsesTransport(
|
|
|
923
1117
|
} finally { producer?.close(); }
|
|
924
1118
|
};
|
|
925
1119
|
/** Fence the physical send, with bounded credential/session rebuilds and safe negotiated refusals. */
|
|
926
|
-
const oauthDispatch = (wireRequest: AdapterRequest, requestParsed = parsed, owner: "adapter" | "passthrough" = "adapter"
|
|
927
|
-
|
|
928
|
-
|
|
1120
|
+
const oauthDispatch = (wireRequest: AdapterRequest, requestParsed = parsed, owner: "adapter" | "passthrough" = "adapter",
|
|
1121
|
+
explicitAttemptCommit = false, imagePin?: ImageDispatchPin): ProviderFetchOptions["dispatchOverride"] => {
|
|
1122
|
+
const priorImageOwner = requestParsed._anthropicImageOwner;
|
|
1123
|
+
const pinned = imagePin ?? (priorImageOwner ? imageHistoryPins.get(priorImageOwner)?.(wireRequest) : undefined);
|
|
1124
|
+
if (priorImageOwner && (!pinned || route.provider.authMode === "forward")) {
|
|
1125
|
+
throw new Error("Anthropic image context has no dispatch authority");
|
|
1126
|
+
}
|
|
1127
|
+
const stripWithheldAdvisorBeta = () => hostedAdvisorCredentialWithheld
|
|
1128
|
+
|| (route.provider.adapter === "anthropic" && options.hostedAdvisorSpendScope?.optionalWithheld === true);
|
|
1129
|
+
if (route.provider.authMode === "forward" && !hostedAdvisorDispatches.has(wireRequest)
|
|
1130
|
+
&& !stripWithheldAdvisorBeta()) return undefined;
|
|
1131
|
+
return async (input, init, execute, reacquirePacing) => {
|
|
929
1132
|
let destination = input;
|
|
930
1133
|
let dispatchInit = init;
|
|
931
1134
|
let pacingChanged = false;
|
|
932
|
-
|
|
1135
|
+
// Withholding can rebuild once, independently of credential/session re-admission.
|
|
1136
|
+
let advisorRebuilt = false;
|
|
1137
|
+
for (let attempt = 0; attempt < 3 + Number(advisorRebuilt); attempt++) {
|
|
1138
|
+
let rebuildHostedAdvisor: (() => Promise<AdapterRequest>) | undefined;
|
|
933
1139
|
if (pacingChanged) {
|
|
934
1140
|
if (!reacquirePacing) throw new Error("Refreshed dispatch requires pacing readmission");
|
|
935
1141
|
await reacquirePacing(route.provider, route.modelId);
|
|
936
1142
|
pacingChanged = false;
|
|
937
1143
|
}
|
|
1144
|
+
if (pinned && !pinned.current()) throw new Error("Anthropic image recovery owner changed before dispatch");
|
|
938
1145
|
if (selectionIsCurrent(requestBindings.get(wireRequest)) && vertexRequestAuthorityIsCurrent(wireRequest) && copilotSessionExpiresAt > Date.now() + 1000) {
|
|
939
1146
|
const ws = codexWsExecutorBinding(execute);
|
|
940
1147
|
const fetchImpl = (route.provider as OcxProviderConfig & { fetch?: typeof globalThis.fetch }).fetch ?? ws?.http ?? execute;
|
|
941
1148
|
const binding = requestBindings.get(wireRequest);
|
|
1149
|
+
const hostedAdvisor = hostedAdvisorDispatches.get(wireRequest);
|
|
1150
|
+
const advisorCredential = hostedAdvisor?.credential;
|
|
1151
|
+
const advisorRefusal = advisorCredential && new HostedAdvisorSpendRefusal("credential-binding");
|
|
1152
|
+
const stripAdvisorBeta = stripWithheldAdvisorBeta();
|
|
1153
|
+
const vertexAuthority = hasVertexRequestAuthority(wireRequest);
|
|
942
1154
|
const snapshot = anthropicInstance !== undefined && binding?.kind === "oauth"
|
|
943
1155
|
? binding.snapshot : undefined;
|
|
944
1156
|
const target = destination instanceof Request ? destination.url : String(destination);
|
|
945
1157
|
if (authorizedAnthropicTarget && target !== authorizedAnthropicTarget) {
|
|
946
1158
|
throw new OAuthLoginRequiredError(anthropicInstance!);
|
|
947
1159
|
}
|
|
1160
|
+
const recoveryOwner = owner === "adapter" && route.provider.adapter === "anthropic"
|
|
1161
|
+
&& route.provider.anthropicImageContextRecovery === true ? requestParsed._providerContinuationOwner : undefined;
|
|
1162
|
+
const expectedHeaders = recoveryOwner ? new Headers(wireRequest.headers) : undefined;
|
|
1163
|
+
const expectedKey = binding?.kind === "oauth" ? binding.snapshot.accessToken : binding?.provider.apiKey;
|
|
1164
|
+
const bearer = binding?.kind === "oauth" || route.provider.apiKeyTransport === "bearer";
|
|
1165
|
+
const carriesSelectedKey = !!expectedKey && (bearer
|
|
1166
|
+
? expectedHeaders?.get("authorization") === `Bearer ${expectedKey}` && !expectedHeaders.has("x-api-key")
|
|
1167
|
+
: expectedHeaders?.get("x-api-key") === expectedKey && !expectedHeaders.has("authorization"));
|
|
1168
|
+
const recoveryGeneration = recoveryOwner ? captureConfigGeneration() : undefined;
|
|
1169
|
+
const recoveryProvider = route.provider;
|
|
1170
|
+
const configuredProvider = recoveryOwner ? config.providers[route.providerName] : undefined;
|
|
1171
|
+
const configuredBase = configuredProvider?.baseUrl;
|
|
1172
|
+
const wireUrl = wireRequest.url;
|
|
1173
|
+
const wireMatches = (finalTarget: string, finalHeaders: Headers): boolean =>
|
|
1174
|
+
finalTarget === wireUrl && expectedHeaders !== undefined
|
|
1175
|
+
&& finalHeaders.get("authorization") === expectedHeaders.get("authorization")
|
|
1176
|
+
&& finalHeaders.get("x-api-key") === expectedHeaders.get("x-api-key")
|
|
1177
|
+
&& !finalHeaders.has("api-key") && !finalHeaders.has("cookie");
|
|
1178
|
+
const recoveryCurrent = (): boolean => recoveryGeneration === captureConfigGeneration()
|
|
1179
|
+
&& route.provider === recoveryProvider && config.providers[route.providerName] === configuredProvider
|
|
1180
|
+
&& configuredProvider?.baseUrl === configuredBase && configuredProvider?.anthropicImageContextRecovery === true
|
|
1181
|
+
&& resolveAnthropicMessagesUrl(recoveryProvider) === wireUrl && selectionIsCurrent(binding);
|
|
1182
|
+
let imageOwnerMatched = false;
|
|
948
1183
|
const writerGeneration = snapshot ? captureConfigGeneration() : 0;
|
|
949
1184
|
const sentHeaders = snapshot ? new Headers(dispatchInit.headers) : undefined;
|
|
950
1185
|
const ownsBearer = snapshot !== undefined
|
|
@@ -961,7 +1196,8 @@ export async function prepareResponsesTransport(
|
|
|
961
1196
|
if (!releaseFamily) throw new AnthropicAccountCooldownError(1);
|
|
962
1197
|
const observeAutoPause = captureAccountAutoPauseAttempt(route.providerName, binding?.kind === "api-key" ? binding.provider : route.provider,
|
|
963
1198
|
{ config, oauth: binding?.kind === "oauth" ? binding.snapshot : undefined }, new Headers(dispatchInit.headers));
|
|
964
|
-
let response: Response;
|
|
1199
|
+
let response: Response | undefined;
|
|
1200
|
+
let copilotReceipt: CopilotInferenceReceipt | undefined;
|
|
965
1201
|
let physicalOwner: AnthropicPhysicalSendOwnership | null = null;
|
|
966
1202
|
try {
|
|
967
1203
|
requireAnthropicAdmission();
|
|
@@ -978,7 +1214,8 @@ export async function prepareResponsesTransport(
|
|
|
978
1214
|
// Copilot's local negotiation may refuse before this point, and spend admission
|
|
979
1215
|
// may still refuse at the HTTP executor. Its note follows that final admission.
|
|
980
1216
|
const deferredCopilotNote = route.providerName === "github-copilot" && route.provider.authMode !== "forward";
|
|
981
|
-
|
|
1217
|
+
const deferAttemptNote = deferredCopilotNote || advisorCredential !== undefined || pinned !== undefined;
|
|
1218
|
+
if (!explicitAttemptCommit && !deferAttemptNote) commitKeyAttemptSend();
|
|
982
1219
|
// The WS executor dials its own socket: HTTP connection policy and body coding do not apply.
|
|
983
1220
|
// WS eligibility (egress, pacing, URL) was checked for the provider it was built for; a
|
|
984
1221
|
// provider reselected above was not, so it takes the HTTP fallback under its own route.
|
|
@@ -986,19 +1223,48 @@ export async function prepareResponsesTransport(
|
|
|
986
1223
|
passiveKeyPhysicalFetch(distributedKeyPhysicalFetch(anthropicBillingPhysicalFetch(fetchImpl, route.providerName, route.provider), route.providerName, route.provider, target), config, route.providerName, route.provider),
|
|
987
1224
|
input,
|
|
988
1225
|
{ ...physicalInit, redirect: "manual",
|
|
989
|
-
...physicalSendObserverInit(observeAutoPause,
|
|
990
|
-
|
|
991
|
-
|
|
1226
|
+
...physicalSendObserverInit(observeAutoPause, target, (!explicitAttemptCommit && deferAttemptNote) || pinned ? () => {
|
|
1227
|
+
// An explicit caller commit has already published this attempt at dispatch.
|
|
1228
|
+
if (!explicitAttemptCommit) commitKeyAttemptSend();
|
|
1229
|
+
// A pinned receipt keeps its estimate until this send reports usage.
|
|
1230
|
+
if (pinned) recordCurrentPhysicalSendUsage(null);
|
|
1231
|
+
} : undefined,
|
|
1232
|
+
deferredCopilotNote ? () => {
|
|
1233
|
+
const attempt = logCtx.activeAttempt;
|
|
1234
|
+
if (attempt?.sendCount) copilotReceipt = { attempt, ordinal: attempt.ordinal, sendCount: attempt.sendCount };
|
|
1235
|
+
} : undefined),
|
|
1236
|
+
...(pinned || recoveryOwner || vertexAuthority || advisorCredential || stripAdvisorBeta ? physicalSendGuardInit((finalTarget, finalHeaders) => {
|
|
1237
|
+
if (pinned && (!pinned.current() || !pinned.matches(finalTarget, finalHeaders))) {
|
|
1238
|
+
throw new Error("Anthropic image recovery destination or credential changed before dispatch");
|
|
1239
|
+
}
|
|
1240
|
+
if (vertexAuthority && (!selectionIsCurrent(binding) || !vertexRequestAuthorityIsCurrent(wireRequest, finalTarget, finalHeaders))) {
|
|
1241
|
+
throw new Error("Vertex credential authority changed before dispatch");
|
|
1242
|
+
}
|
|
1243
|
+
if (advisorCredential && (stripAdvisorBeta || !selectionIsCurrent(binding)
|
|
1244
|
+
|| finalHeaders.get(advisorCredential.header) !== advisorCredential.value
|
|
1245
|
+
|| hasConflictingApiKeyHeaders(finalHeaders.keys(), advisorCredential.header))) throw advisorRefusal;
|
|
1246
|
+
if (stripAdvisorBeta) stripHostedAdvisorBeta(finalHeaders);
|
|
1247
|
+
imageOwnerMatched = wireMatches(finalTarget, finalHeaders);
|
|
992
1248
|
}) : {}) },
|
|
993
1249
|
{ providerName: route.providerName, provider: route.provider },
|
|
994
1250
|
)) as typeof globalThis.fetch;
|
|
1251
|
+
const connectTimeoutMs = providerConnectTimeoutMs(config, owner === "passthrough" ? undefined : responsesTimeoutProvider(options, route.provider));
|
|
995
1252
|
response = await fetchWithHeaderTimeout(target, dispatchInit, dispatchInit.signal ?? options.abortSignal ?? req.signal,
|
|
996
|
-
resolveConnectTimeoutMs(
|
|
1253
|
+
resolveConnectTimeoutMs(connectTimeoutMs, { localUpstream: isLocalUpstream(target) }), requestParsed.stream, physicalFetch);
|
|
1254
|
+
} catch (error) {
|
|
1255
|
+
if (pinned || !advisorRefusal || error !== advisorRefusal || !hostedAdvisor || advisorRebuilt) throw error;
|
|
1256
|
+
const signal = dispatchInit.signal ?? options.abortSignal ?? req.signal;
|
|
1257
|
+
rebuildHostedAdvisor = async () => {
|
|
1258
|
+
signal.throwIfAborted();
|
|
1259
|
+
const rebuilt = await hostedAdvisor.rebuild(advisorRefusal, signal);
|
|
1260
|
+
if (binding) requestBindings.set(rebuilt, binding);
|
|
1261
|
+
return rebuilt;
|
|
1262
|
+
};
|
|
997
1263
|
} finally { releaseFamily(); }
|
|
998
1264
|
// Observe each physical response before retries replace it. The binding belongs to
|
|
999
1265
|
// this dispatch, so a manual switch cannot file A's headers against B. Header
|
|
1000
1266
|
// overrides and credential replacement make ownership unprovable: skip those writes.
|
|
1001
|
-
if (ownsBearer && snapshot && physicalOwner) {
|
|
1267
|
+
if (response && ownsBearer && snapshot && physicalOwner) {
|
|
1002
1268
|
try {
|
|
1003
1269
|
const current = getAccountCredentialWithStatus(anthropicInstance!, snapshot.accountId);
|
|
1004
1270
|
if (anthropicPhysicalSendOwnershipIsCurrent(physicalOwner)
|
|
@@ -1006,37 +1272,72 @@ export async function prepareResponsesTransport(
|
|
|
1006
1272
|
&& current.credential.access === snapshot.accessToken
|
|
1007
1273
|
&& credentialGeneration(current.credential) === snapshot.generation) {
|
|
1008
1274
|
bindAnthropicRefusalCredentialForSend(response, physicalOwner);
|
|
1009
|
-
recordAnthropicAccountQuotaFromHeadersForInstance(anthropicInstance!, snapshot.accountId, response.headers, writerGeneration, response.status, route.modelId, snapshot.generation);
|
|
1275
|
+
recordAnthropicAccountQuotaFromHeadersForInstance(anthropicInstance!, snapshot.accountId, response.headers, writerGeneration, response.status, route.modelId, snapshot.generation, physicalOwner.credentialKey);
|
|
1010
1276
|
}
|
|
1011
1277
|
} catch { /* best-effort observation cannot fail the response */ }
|
|
1012
1278
|
}
|
|
1013
|
-
if (
|
|
1014
|
-
|
|
1015
|
-
|
|
1016
|
-
|
|
1017
|
-
|
|
1018
|
-
|
|
1019
|
-
|
|
1020
|
-
|
|
1021
|
-
|
|
1022
|
-
|
|
1023
|
-
|
|
1279
|
+
if (response) {
|
|
1280
|
+
const recoveryRefusal = !pinned && response.status === 413 && binding && imageOwnerMatched
|
|
1281
|
+
&& recoveryOwner && carriesSelectedKey;
|
|
1282
|
+
const recordFailureSpend = !response.ok && (pinned || recoveryRefusal) ? captureCurrentPhysicalSendUsage() : undefined;
|
|
1283
|
+
const failureUsage = response.ok ? undefined
|
|
1284
|
+
: await recordKeyAttemptFailure(logCtx, response, dispatchInit.signal ?? options.abortSignal,
|
|
1285
|
+
recordFailureSpend !== undefined);
|
|
1286
|
+
if (failureUsage && pinned) recordFailureSpend?.(failureUsage);
|
|
1287
|
+
if (observeAutoPause) response = await observeAutoPause(response);
|
|
1288
|
+
if (recoveryRefusal && response.status === 413) {
|
|
1289
|
+
const immutableRequest = { ...wireRequest, headers: { ...wireRequest.headers } };
|
|
1290
|
+
const bindImageHistory = (wire: AdapterRequest): ImageDispatchPin => ({
|
|
1291
|
+
current: () => recoveryCurrent() && requestBindings.get(wire) === binding
|
|
1292
|
+
&& wireMatches(wire.url, new Headers(wire.headers)),
|
|
1293
|
+
matches: wireMatches,
|
|
1294
|
+
});
|
|
1295
|
+
const pin: AnthropicImageRecoveryPin = {
|
|
1296
|
+
owner: recoveryOwner,
|
|
1297
|
+
request: immutableRequest,
|
|
1298
|
+
isCurrent: recoveryCurrent,
|
|
1299
|
+
recordRefusalSpend: recordFailureSpend && (() => recordFailureSpend(failureUsage ?? null)),
|
|
1300
|
+
dispatchOverride: (wire, input) => oauthDispatch(wire, input, "adapter", false, bindImageHistory(wire))!,
|
|
1301
|
+
};
|
|
1302
|
+
imageHistoryPins.set(recoveryOwner, bindImageHistory);
|
|
1303
|
+
capturedImagePins.add(pin);
|
|
1304
|
+
imageRefusals.set(response, imageRefusals.has(response) ? null : pin);
|
|
1305
|
+
}
|
|
1306
|
+
if (copilotReceipt) copilotInferenceReceipts.set(response, copilotReceipt);
|
|
1307
|
+
return response;
|
|
1308
|
+
}
|
|
1024
1309
|
}
|
|
1025
|
-
|
|
1026
|
-
|
|
1310
|
+
let rebuilt: AdapterRequest;
|
|
1311
|
+
if (rebuildHostedAdvisor) {
|
|
1312
|
+
// The guard fired before the receipt. Keep this send's lease and exact serializer inputs.
|
|
1313
|
+
rebuilt = await rebuildHostedAdvisor();
|
|
1314
|
+
advisorRebuilt = true;
|
|
1315
|
+
} else {
|
|
1316
|
+
if (pinned || requestParsed._anthropicImageOwner) {
|
|
1317
|
+
throw new Error("Anthropic image recovery account changed before dispatch");
|
|
1318
|
+
}
|
|
1319
|
+
let nextAdapter: ProviderAdapter;
|
|
1320
|
+
try { nextAdapter = await refreshDispatchAdapter(requestParsed); }
|
|
1321
|
+
catch (error) {
|
|
1322
|
+
if (error instanceof AdmissionModelDeniedError) throw error;
|
|
1323
|
+
const refusal = copilotRefusalResponse(error);
|
|
1324
|
+
if (refusal) return refusal;
|
|
1325
|
+
throw error;
|
|
1326
|
+
}
|
|
1327
|
+
if (owner === "passthrough" && route.providerName === "github-copilot" && nextAdapter.name === "openai-chat") {
|
|
1328
|
+
throw new CopilotAutoAdapterHandoff(nextAdapter);
|
|
1329
|
+
}
|
|
1330
|
+
// Replay and continuation restoration must use the refreshed identity.
|
|
1331
|
+
bindRouteReasoningReplayScope({ parsed: requestParsed, providerName: route.providerName, provider: route.provider,
|
|
1332
|
+
adapterName: nextAdapter.name, oauthCredentialSnapshot: replayOAuthCredentialSnapshot });
|
|
1333
|
+
rebuilt = await nextAdapter.buildRequest(requestParsed, {
|
|
1334
|
+
completedToolBlocks: requestState.completedToolBlocks,
|
|
1335
|
+
headers: requestState.selectedForwardHeaders, providerName: route.providerName, translatorBudget,
|
|
1336
|
+
abortSignal: dispatchInit.signal ?? options.abortSignal ?? req.signal,
|
|
1337
|
+
dispatchPacingHeld: true,
|
|
1338
|
+
...(imageTierBias > 0 ? { imageTierBias } : {}),
|
|
1339
|
+
});
|
|
1027
1340
|
}
|
|
1028
|
-
// Rebind before rebuilding: the rebuild's bridged-search restore and continuation
|
|
1029
|
-
// restore key on the serving identity, which must be the refreshed route's, not the
|
|
1030
|
-
// credential whose selection just lapsed.
|
|
1031
|
-
bindRouteReasoningReplayScope({ parsed: requestParsed, providerName: route.providerName, provider: route.provider,
|
|
1032
|
-
adapterName: nextAdapter.name, oauthCredentialSnapshot: replayOAuthCredentialSnapshot });
|
|
1033
|
-
const rebuilt = await nextAdapter.buildRequest(requestParsed, {
|
|
1034
|
-
completedToolBlocks: requestState.completedToolBlocks,
|
|
1035
|
-
headers: requestState.selectedForwardHeaders, providerName: route.providerName, translatorBudget,
|
|
1036
|
-
abortSignal: dispatchInit.signal ?? options.abortSignal ?? req.signal,
|
|
1037
|
-
dispatchPacingHeld: true,
|
|
1038
|
-
...(imageTierBias > 0 ? { imageTierBias } : {}),
|
|
1039
|
-
});
|
|
1040
1341
|
const bodySize = checkOutboundBodySize(rebuilt.body, config.maxUpstreamBodyBytes);
|
|
1041
1342
|
if (!bodySize.admitted) {
|
|
1042
1343
|
rebuilt.releaseBodyObservation?.();
|
|
@@ -1054,9 +1355,13 @@ export async function prepareResponsesTransport(
|
|
|
1054
1355
|
const headers = new Headers(dispatchInit.headers);
|
|
1055
1356
|
for (const name of Object.keys(wireRequest.headers)) headers.delete(name);
|
|
1056
1357
|
for (const [name, value] of Object.entries(rebuilt.headers)) headers.set(name, value);
|
|
1358
|
+
if (rebuildHostedAdvisor) headers.delete("content-length");
|
|
1057
1359
|
wireRequest.releaseBodyObservation?.();
|
|
1058
1360
|
Object.assign(wireRequest, rebuilt);
|
|
1059
1361
|
copyVertexRequestAuthority(rebuilt, wireRequest);
|
|
1362
|
+
const hostedAdvisor = hostedAdvisorDispatches.get(rebuilt);
|
|
1363
|
+
if (hostedAdvisor) hostedAdvisorDispatches.set(wireRequest, hostedAdvisor);
|
|
1364
|
+
else hostedAdvisorDispatches.delete(wireRequest);
|
|
1060
1365
|
const binding = requestBindings.get(rebuilt);
|
|
1061
1366
|
if (binding) requestBindings.set(wireRequest, binding);
|
|
1062
1367
|
else requestBindings.delete(wireRequest);
|
|
@@ -1065,7 +1370,7 @@ export async function prepareResponsesTransport(
|
|
|
1065
1370
|
sameTargetToken = transportToken;
|
|
1066
1371
|
destination = rebuilt.url;
|
|
1067
1372
|
dispatchInit = { ...dispatchInit, method: rebuilt.method, headers, body: refreshedBody };
|
|
1068
|
-
pacingChanged = route.provider.requestPacing?.enabled === true
|
|
1373
|
+
pacingChanged = !rebuildHostedAdvisor && route.provider.requestPacing?.enabled === true
|
|
1069
1374
|
&& (!!route.provider.requestPacing.keys || route.provider.requestPacing.keySelection === "round-robin");
|
|
1070
1375
|
// A refreshed key must reacquire admission before the next synchronous send guard.
|
|
1071
1376
|
}
|
|
@@ -1397,8 +1702,9 @@ export async function prepareResponsesTransport(
|
|
|
1397
1702
|
config,
|
|
1398
1703
|
route.providerName,
|
|
1399
1704
|
route.modelId,
|
|
1400
|
-
|
|
1705
|
+
adapterProvider,
|
|
1401
1706
|
inboundWire,
|
|
1707
|
+
adapter.name,
|
|
1402
1708
|
);
|
|
1403
1709
|
if (passiveSubjectId) logCtx.activeAttempt.labRouteSubjectId = passiveSubjectId;
|
|
1404
1710
|
}
|
|
@@ -1432,8 +1738,12 @@ export async function prepareResponsesTransport(
|
|
|
1432
1738
|
]).size : 0;
|
|
1433
1739
|
const anthropicFundedAccounts = Math.min(anthropicRosterSize, GENERIC_OAUTH_MAX_ACCOUNTS_PER_REQUEST);
|
|
1434
1740
|
const anthropicFailoverLimit = Math.max(ANTHROPIC_POOL_MAX_FAILOVERS_PER_REQUEST, anthropicFundedAccounts - 1);
|
|
1435
|
-
if (fundingAccountId || anthropicPoolAccountId)
|
|
1741
|
+
if (fundingAccountId || anthropicPoolAccountId) {
|
|
1436
1742
|
expandInferenceOAuthSendBudget(options.sendBudget, Math.max(fundedAccounts, anthropicFundedAccounts));
|
|
1743
|
+
} else if (isPassthrough && !options.comboAttempt && isCanonicalOpenAiForwardProvider(route.provider)) {
|
|
1744
|
+
const policy = transientRetryPolicyFor(route.provider);
|
|
1745
|
+
if (policy) fundChatGptRetryAttempts(options.sendBudget, policy.attempts);
|
|
1746
|
+
}
|
|
1437
1747
|
|
|
1438
1748
|
return {
|
|
1439
1749
|
genericFailoverLimit, anthropicFailoverLimit,
|
|
@@ -1536,16 +1846,31 @@ export async function prepareResponsesTransport(
|
|
|
1536
1846
|
applyFailoverSnapshot,
|
|
1537
1847
|
selectionIsCurrent,
|
|
1538
1848
|
resolveSelectionAdapter,
|
|
1849
|
+
// Optional preflight sees the same effective wire as the first physical builder.
|
|
1850
|
+
initialAdapterProvider: adapterProvider,
|
|
1851
|
+
get hostedAdvisorSpendGuard() { return hostedAdvisorSpendGuard; },
|
|
1852
|
+
set hostedAdvisorSpendGuard(guard: typeof hostedAdvisorSpendGuard) { hostedAdvisorSpendGuard = guard; },
|
|
1539
1853
|
resolveCopilotSelection,
|
|
1540
1854
|
copilotRefusalResponse,
|
|
1855
|
+
isCurrentInferenceResponse,
|
|
1541
1856
|
refreshRunTurnAdapter,
|
|
1542
1857
|
oauthDispatch,
|
|
1858
|
+
pinAnthropicImageRecovery: (response: Response): AnthropicImageRecoveryPin | undefined => {
|
|
1859
|
+
const pin = imageRefusals.get(response);
|
|
1860
|
+
return pin && capturedImagePins.has(pin) && pin.isCurrent() ? pin : undefined;
|
|
1861
|
+
},
|
|
1543
1862
|
noteRoutedAttemptSend,
|
|
1863
|
+
createCredentialReplayAttempt,
|
|
1864
|
+
commitRunTurnAttemptSend,
|
|
1865
|
+
commitAdapterAttemptSend,
|
|
1866
|
+
get credentialReplayHandoff() { return credentialReplayHandoff; },
|
|
1867
|
+
set credentialReplayHandoff(value: typeof credentialReplayHandoff) { credentialReplayHandoff = value; },
|
|
1544
1868
|
attemptSendDeferred,
|
|
1545
1869
|
deferPhysicalAttribution,
|
|
1546
1870
|
commitKeyAttemptSend,
|
|
1547
1871
|
recoverAutoPausedSelection,
|
|
1548
1872
|
bindKeyUsageFromBridge,
|
|
1873
|
+
trackGuardedOAuthAttemptUsage,
|
|
1549
1874
|
anthropicSessionKey,
|
|
1550
1875
|
isPassthrough,
|
|
1551
1876
|
};
|