@bitkyc08/opencodex 2.100.5 → 2.100.6-preview.20261119.1
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-D5qUBOoF.js +60 -0
- package/gui/dist/assets/Tray-DMwQSAli.js +1 -0
- package/gui/dist/assets/brand-mark-ycThul7d.js +1 -0
- package/gui/dist/assets/index-Bp_GaFFu.js +138 -0
- package/gui/dist/assets/index-BtwVlpeQ.css +2 -0
- package/gui/dist/assets/{segment-thumb-features-Bquysdn5.js → segment-thumb-features-BLUW2Fb1.js} +1 -1
- package/gui/dist/classic/assets/App-CoiVLRW3.css +1 -0
- package/gui/dist/classic/assets/App-D39mkP2w.js +59 -0
- package/gui/dist/classic/assets/Tray-nUmdL7K9.js +1 -0
- package/gui/dist/classic/assets/index-BJ4uxZk0.js +138 -0
- package/gui/dist/classic/assets/usage-companion-chart-DFoYm2RY.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
|
@@ -2,6 +2,7 @@ import { modelRecordValue } from "../../reasoning-effort";
|
|
|
2
2
|
import { modelInList } from "../../types";
|
|
3
3
|
import type { OcxConfig, OcxProviderConfig } from "../../types";
|
|
4
4
|
import { PROVIDER_REGISTRY } from "../../providers/registry";
|
|
5
|
+
import type { InboundWire } from "../../providers/registry";
|
|
5
6
|
import { fastPolicyForModel, serviceTierSupportFromPolicy } from "../../providers/service-tier";
|
|
6
7
|
import { resolveProviderAuthTransport } from "../../providers/fastwire";
|
|
7
8
|
import { defaultAnthropicCacheRetention } from "../../adapters/anthropic/cache-retention";
|
|
@@ -25,6 +26,8 @@ export function upstreamProtocolForAdapter(adapter: string): string {
|
|
|
25
26
|
return "anthropic-messages";
|
|
26
27
|
case "google":
|
|
27
28
|
return "google-generate";
|
|
29
|
+
case "agy-acp":
|
|
30
|
+
return "agent-client-protocol";
|
|
28
31
|
default:
|
|
29
32
|
return "openai-responses";
|
|
30
33
|
}
|
|
@@ -33,7 +36,7 @@ export function upstreamProtocolForAdapter(adapter: string): string {
|
|
|
33
36
|
export function surfaceForProtocols(inboundProtocol: string, upstreamProtocol: string): string {
|
|
34
37
|
if (inboundProtocol === "anthropic-messages") return "anthropic-messages-http";
|
|
35
38
|
if (upstreamProtocol === "anthropic-messages") return "responses-http";
|
|
36
|
-
if (upstreamProtocol === "openai-chat") return "responses-sse";
|
|
39
|
+
if (upstreamProtocol === "openai-chat" || upstreamProtocol === "agent-client-protocol") return "responses-sse";
|
|
37
40
|
return "responses-http";
|
|
38
41
|
}
|
|
39
42
|
|
|
@@ -125,6 +128,7 @@ export function resolveProductionBehaviorValues(
|
|
|
125
128
|
modelId: string,
|
|
126
129
|
effective: OcxProviderConfig,
|
|
127
130
|
installationSalt: Uint8Array | string,
|
|
131
|
+
wire?: { inbound: InboundWire; adapter: string },
|
|
128
132
|
): LabBehaviorValues | null {
|
|
129
133
|
const provider = config.providers[providerName];
|
|
130
134
|
if (!provider || provider.disabled === true) return null;
|
|
@@ -143,7 +147,7 @@ export function resolveProductionBehaviorValues(
|
|
|
143
147
|
const project = typeof effective.project === "string" && effective.project ? effective.project : null;
|
|
144
148
|
const location = typeof effective.location === "string" && effective.location ? effective.location : null;
|
|
145
149
|
const nativeLocalExec = effective.nativeLocalExec === "on" || effective.unsafeAllowNativeLocalExec === true;
|
|
146
|
-
const fastPolicy = fastPolicyForModel(effective, modelId, providerName,
|
|
150
|
+
const fastPolicy = fastPolicyForModel(effective, modelId, providerName, wire?.inbound, provider, wire?.adapter);
|
|
147
151
|
|
|
148
152
|
const values: LabBehaviorValues = {
|
|
149
153
|
"wire.adapter": behaviorRow("provider_config", adapter),
|
|
@@ -67,20 +67,22 @@ export function resolveCompatibilitySubjectsForInboundWire(
|
|
|
67
67
|
routed: OcxProviderConfig,
|
|
68
68
|
inboundWire: InboundWire,
|
|
69
69
|
configDir?: string,
|
|
70
|
+
effectiveAdapter?: string,
|
|
70
71
|
): ResolvedPolicyCompatibilitySubjects {
|
|
71
72
|
const registryEntry = getProviderRegistryEntry(providerName);
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
modelId,
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
73
|
+
// Production can already have a negotiated wire. Policy candidates still need static resolution.
|
|
74
|
+
const effective = effectiveAdapter !== undefined ? { ...routed, adapter: effectiveAdapter }
|
|
75
|
+
: resolveWireProtocolOverride(providerName, modelId, routed, inboundWire, resolveModelPolicy({
|
|
76
|
+
providerName,
|
|
77
|
+
modelId,
|
|
78
|
+
provider: routed,
|
|
79
|
+
registryEntry,
|
|
80
|
+
transportMatchedRegistry: !!registryEntry
|
|
81
|
+
&& providerMatchesRegistryTransportWithStaticGuards(providerName, routed),
|
|
82
|
+
inboundWire,
|
|
83
|
+
modelCapabilities: routed.modelCapabilities?.[modelId],
|
|
84
|
+
...(routed.authMode ? { effectiveAuth: { authMode: routed.authMode } } : {}),
|
|
85
|
+
}));
|
|
84
86
|
const baseUrl = typeof effective.baseUrl === "string" ? effective.baseUrl.trim() : "";
|
|
85
87
|
const adapter = effective.adapter ?? "openai-responses";
|
|
86
88
|
const inboundProtocol = inboundProtocolForWire(inboundWire);
|
|
@@ -119,6 +121,7 @@ export function resolveCompatibilitySubjectsForInboundWire(
|
|
|
119
121
|
modelId,
|
|
120
122
|
effective,
|
|
121
123
|
installationSalt,
|
|
124
|
+
effectiveAdapter === undefined ? undefined : { inbound: inboundWire, adapter },
|
|
122
125
|
);
|
|
123
126
|
if (!behaviorValues) return { subjectIds };
|
|
124
127
|
|
|
@@ -194,6 +197,7 @@ export function resolveProductionRouteSubject(
|
|
|
194
197
|
routed: OcxProviderConfig,
|
|
195
198
|
inboundWire: InboundWire,
|
|
196
199
|
configDir?: string,
|
|
200
|
+
effectiveAdapter?: string,
|
|
197
201
|
): ResolvedPolicyRouteSubject | null {
|
|
198
202
|
return resolveCompatibilitySubjectsForInboundWire(
|
|
199
203
|
config,
|
|
@@ -202,5 +206,6 @@ export function resolveProductionRouteSubject(
|
|
|
202
206
|
routed,
|
|
203
207
|
inboundWire,
|
|
204
208
|
configDir,
|
|
209
|
+
effectiveAdapter,
|
|
205
210
|
).route ?? null;
|
|
206
211
|
}
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
/** The shared weekly and five-hour readings used for reset-near-weighted placement. */
|
|
2
|
+
export interface ResetNearQuota {
|
|
3
|
+
weeklyPercent?: number;
|
|
4
|
+
weeklyResetAt?: number;
|
|
5
|
+
weeklyObservedAt?: number;
|
|
6
|
+
fiveHourPercent?: number;
|
|
7
|
+
fiveHourResetAt?: number;
|
|
8
|
+
fiveHourObservedAt?: number;
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
// Use the last day of the weekly cycle to favor quota that would otherwise go unused.
|
|
12
|
+
const WEEKLY_RESET_WINDOW_MS = 24 * 60 * 60_000;
|
|
13
|
+
// Keep burst capacity available for sessions already assigned to the account.
|
|
14
|
+
const FIVE_HOUR_USAGE_LIMIT_PERCENT = 60;
|
|
15
|
+
// Avoid steering new sessions into an account with almost no weekly capacity left.
|
|
16
|
+
const MIN_WEEKLY_REMAINING_PERCENT = 2;
|
|
17
|
+
// Refresh both usage readings within a quarter-hour before giving the account extra traffic.
|
|
18
|
+
const MAX_QUOTA_AGE_MS = 15 * 60_000;
|
|
19
|
+
|
|
20
|
+
function asMs(value: number | undefined): number | null {
|
|
21
|
+
if (typeof value !== "number" || !Number.isFinite(value) || value <= 0) return null;
|
|
22
|
+
return value < 100_000_000_000 ? value * 1000 : value;
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
function isFresh(at: number | undefined, now: number): boolean {
|
|
26
|
+
const ms = asMs(at);
|
|
27
|
+
return ms !== null && ms <= now && now - ms <= MAX_QUOTA_AGE_MS;
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
function below(value: number | undefined, limit: number): boolean {
|
|
31
|
+
return typeof value === "number" && value >= 0 && value < limit;
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
/** Call with the pool's eligible IDs, in rotation order. Undefined means equal weights. */
|
|
35
|
+
export function resetNearWeightOf(
|
|
36
|
+
accountIds: readonly string[],
|
|
37
|
+
quotaOf: (accountId: string) => ResetNearQuota | null,
|
|
38
|
+
now: number,
|
|
39
|
+
): ((accountId: string) => number) | undefined {
|
|
40
|
+
if (accountIds.length < 2) return undefined;
|
|
41
|
+
let target: string | undefined;
|
|
42
|
+
let earliest = Infinity;
|
|
43
|
+
for (const id of accountIds) {
|
|
44
|
+
const quota = quotaOf(id);
|
|
45
|
+
if (!quota || !isFresh(quota.weeklyObservedAt, now) || !isFresh(quota.fiveHourObservedAt, now)
|
|
46
|
+
|| !below(quota.fiveHourPercent, FIVE_HOUR_USAGE_LIMIT_PERCENT)
|
|
47
|
+
|| !below(quota.weeklyPercent, 100 - MIN_WEEKLY_REMAINING_PERCENT)) continue;
|
|
48
|
+
const reset = asMs(quota.weeklyResetAt);
|
|
49
|
+
if (reset === null || reset <= now || reset - now > WEEKLY_RESET_WINDOW_MS) continue;
|
|
50
|
+
const shortReset = asMs(quota.fiveHourResetAt);
|
|
51
|
+
if (quota.fiveHourResetAt !== undefined && (shortReset === null || shortReset <= now)) continue;
|
|
52
|
+
if (target === undefined || reset < earliest || (reset === earliest && id.localeCompare(target) < 0)) {
|
|
53
|
+
target = id;
|
|
54
|
+
earliest = reset;
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
return target === undefined ? undefined : id => id === target ? accountIds.length - 1 : 1;
|
|
58
|
+
}
|
|
@@ -7,26 +7,34 @@ export const ADVISOR_ADMISSION_POLICY_HEADER = "x-opencodex-advisor-admission-po
|
|
|
7
7
|
/** Routed helpers inherit policy without acquiring the Advisor recursion-suppression flag. */
|
|
8
8
|
export const SIDECAR_ADMISSION_POLICY_HEADER = "x-opencodex-sidecar-admission-policy";
|
|
9
9
|
export const SIDECAR_INTERNAL_CAPABILITY_HEADER = "x-opencodex-sidecar-internal";
|
|
10
|
-
const
|
|
10
|
+
const registrations = new Map<string, { capability: string; policy?: CapturedAdmissionPolicy }>();
|
|
11
11
|
|
|
12
|
-
/** A
|
|
13
|
-
export function registerAdvisorAdmissionPolicy(policy: CapturedAdmissionPolicy, signal?: AbortSignal) {
|
|
12
|
+
/** A local call owns its registry entry until completion, failure or cancellation. */
|
|
13
|
+
export function registerAdvisorAdmissionPolicy(policy: CapturedAdmissionPolicy | undefined, signal?: AbortSignal) {
|
|
14
14
|
const token = Buffer.from(crypto.getRandomValues(new Uint8Array(32))).toString("base64url");
|
|
15
15
|
const release = () => {
|
|
16
|
-
|
|
16
|
+
registrations.delete(token);
|
|
17
17
|
signal?.removeEventListener("abort", release);
|
|
18
18
|
};
|
|
19
19
|
if (!signal?.aborted) {
|
|
20
|
-
|
|
20
|
+
registrations.set(token, { capability: internalCallCapability(), policy: policy && immutableAdmissionPolicy(policy) });
|
|
21
21
|
signal?.addEventListener("abort", release, { once: true });
|
|
22
22
|
}
|
|
23
23
|
return { token, release };
|
|
24
24
|
}
|
|
25
25
|
|
|
26
26
|
export function readAdvisorAdmissionPolicy(token: string | null, capability: string | null): CapturedAdmissionPolicy | undefined {
|
|
27
|
+
return readInternalCallRegistration(token, capability)?.policy;
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
/** A registered sidecar can prove its origin even when it has no caller policy to inherit. */
|
|
31
|
+
export function readInternalCallRegistration(
|
|
32
|
+
token: string | null,
|
|
33
|
+
capability: string | null,
|
|
34
|
+
): { readonly policy?: CapturedAdmissionPolicy } | undefined {
|
|
27
35
|
if (!token || !isInternalCallCapability(capability)) return undefined;
|
|
28
|
-
const entry =
|
|
29
|
-
return entry?.capability === capability ? entry
|
|
36
|
+
const entry = registrations.get(token);
|
|
37
|
+
return entry?.capability === capability ? entry : undefined;
|
|
30
38
|
}
|
|
31
39
|
|
|
32
40
|
/** Scope metadata accepted only alongside the process-owned Advisor capability. */
|
package/src/server/auth-cors.ts
CHANGED
|
@@ -1,3 +1,6 @@
|
|
|
1
|
+
import { oauthSubscriptionMaker } from "../combos/suggestion-channel";
|
|
2
|
+
import { isCanonicalOpenAiForwardProvider } from "../providers/openai-forward-destination";
|
|
3
|
+
import { transientRetryOn5xxPolicyConfigError } from "../config/load-degrade";
|
|
1
4
|
import { providerRelativeSendPathConfigError } from "../config/provider-relative-send-path";
|
|
2
5
|
import { contextTierRecordConfigError, modelCapabilitiesConfigError, providerInputModalitiesConfigError } from "../config/provider-validation";
|
|
3
6
|
import { createHmac, randomBytes, timingSafeEqual } from "node:crypto";
|
|
@@ -10,6 +13,7 @@ import {
|
|
|
10
13
|
providerModelCostsConfigError,
|
|
11
14
|
providerWebSearchBridgeConfigError,
|
|
12
15
|
requestPacingConfigError,
|
|
16
|
+
providerTimeoutOverrideConfigError,
|
|
13
17
|
retryOn429PolicyConfigError,
|
|
14
18
|
retryOnResetPolicyConfigError,
|
|
15
19
|
sanitizeModelCostsForDisplay,
|
|
@@ -706,6 +710,8 @@ export const AUTH_MATRIX: readonly ApiAuthMatrixRow[] = [
|
|
|
706
710
|
{ endpoint: "/v1/hub-state", bearer: "accepted", dedicated: "accepted", xApiKey: "accepted" },
|
|
707
711
|
// Usage additionally requires a configured key identity; unscoped environment keys are refused.
|
|
708
712
|
{ endpoint: "/v1/usage", bearer: "rejected", dedicated: "accepted", xApiKey: "rejected" },
|
|
713
|
+
// Usage windows require a configured, single-provider key with full model scope.
|
|
714
|
+
{ endpoint: "/v1/usage/windows", bearer: "accepted", dedicated: "accepted", xApiKey: "rejected" },
|
|
709
715
|
];
|
|
710
716
|
|
|
711
717
|
/** Whether `token` is the environment-provided management secret. */
|
|
@@ -907,6 +913,10 @@ export function providerManagementConfigError(
|
|
|
907
913
|
}
|
|
908
914
|
if (name === "chatgpt") return "provider chatgpt is reserved for internal credential compatibility";
|
|
909
915
|
if (name === "openai-multi") return "provider openai-multi is reserved for legacy config migration";
|
|
916
|
+
const timeoutOverrideError = providerTimeoutOverrideConfigError(raw);
|
|
917
|
+
if (timeoutOverrideError) {
|
|
918
|
+
return `provider ${JSON.stringify(redactSecretString(name))} ${timeoutOverrideError}`;
|
|
919
|
+
}
|
|
910
920
|
if (name === "openai") {
|
|
911
921
|
const entry = getProviderRegistryEntry(name);
|
|
912
922
|
const seed = entry ? providerConfigSeed(entry) : undefined;
|
|
@@ -930,6 +940,7 @@ export function providerManagementConfigError(
|
|
|
930
940
|
// sends recover, not what the canonical forward seed is. Validated below
|
|
931
941
|
// (retryOnResetPolicyConfigError).
|
|
932
942
|
delete canonicalCandidate.retryOnReset;
|
|
943
|
+
delete canonicalCandidate.transientRetryOn5xx;
|
|
933
944
|
// Validated account eligibility policy is independent of the canonical transport.
|
|
934
945
|
delete canonicalCandidate.accountAutoPause;
|
|
935
946
|
// Context windows are the same kind of user-owned overlay as requestPacing: the operator
|
|
@@ -951,6 +962,9 @@ export function providerManagementConfigError(
|
|
|
951
962
|
// forwardClientHeaders is an editor-managed request-metadata overlay. It is validated
|
|
952
963
|
// separately below and must not make an otherwise canonical OpenAI provider fail the seed check.
|
|
953
964
|
delete canonicalCandidate.forwardClientHeaders;
|
|
965
|
+
// Timeout overrides are validated above and are independent of the canonical seed.
|
|
966
|
+
delete canonicalCandidate.connectTimeoutMs;
|
|
967
|
+
delete canonicalCandidate.stallTimeoutSec;
|
|
954
968
|
// Canonical ChatGPT keeps WebSocket as the default, but an operator may
|
|
955
969
|
// select the existing HTTP/SSE path without changing its auth or endpoint.
|
|
956
970
|
if (raw.upstreamWebsocket !== undefined) {
|
|
@@ -996,6 +1010,10 @@ export function providerManagementConfigError(
|
|
|
996
1010
|
// it before it reaches the management API response.
|
|
997
1011
|
return `provider ${JSON.stringify(redactSecretString(name))} ${retryOn429Error}`;
|
|
998
1012
|
}
|
|
1013
|
+
const transientRetryError = transientRetryOn5xxPolicyConfigError(raw.transientRetryOn5xx);
|
|
1014
|
+
if (transientRetryError) {
|
|
1015
|
+
return `provider ${JSON.stringify(redactSecretString(name))} ${transientRetryError}`;
|
|
1016
|
+
}
|
|
999
1017
|
const retryOnResetError = retryOnResetPolicyConfigError(raw.retryOnReset);
|
|
1000
1018
|
if (retryOnResetError) {
|
|
1001
1019
|
return `provider ${JSON.stringify(redactSecretString(name))} ${retryOnResetError}`;
|
|
@@ -1182,6 +1200,8 @@ const PROVIDER_CONFIG_FIELD_POLICY = {
|
|
|
1182
1200
|
codexToolMode: "editor",
|
|
1183
1201
|
projectContext: "editor",
|
|
1184
1202
|
requestPacing: "editor",
|
|
1203
|
+
connectTimeoutMs: "editor",
|
|
1204
|
+
stallTimeoutSec: "editor",
|
|
1185
1205
|
mcpMaxTools: "editor",
|
|
1186
1206
|
mcpMaxSchemaBytes: "editor",
|
|
1187
1207
|
mcpMaxResultBytes: "editor",
|
|
@@ -1254,6 +1274,7 @@ const PROVIDER_CONFIG_FIELD_POLICY = {
|
|
|
1254
1274
|
minMaxOutputTokens: "editor",
|
|
1255
1275
|
modelMaxOutputTokens: "editor",
|
|
1256
1276
|
modelCosts: "editor",
|
|
1277
|
+
creditPriceUsd: "editor",
|
|
1257
1278
|
headers: "redacted",
|
|
1258
1279
|
forwardClientHeaders: "editor",
|
|
1259
1280
|
openRouterRouting: "editor",
|
|
@@ -1320,6 +1341,7 @@ const PROVIDER_CONFIG_FIELD_POLICY = {
|
|
|
1320
1341
|
requiresReasoningPlaceholderModels: "editor",
|
|
1321
1342
|
showThinkingSummary: "editor",
|
|
1322
1343
|
hideRawReasoning: "editor",
|
|
1344
|
+
rawReasoningAsSummary: "editor",
|
|
1323
1345
|
retryOn429: "editor",
|
|
1324
1346
|
transientRetryOn5xx: "editor",
|
|
1325
1347
|
retryOnReset: "editor",
|
|
@@ -1330,6 +1352,7 @@ const PROVIDER_CONFIG_FIELD_POLICY = {
|
|
|
1330
1352
|
thinkingBudgetModels: "editor",
|
|
1331
1353
|
escapeBuiltinToolNames: "editor",
|
|
1332
1354
|
anthropicEofTolerance: "editor",
|
|
1355
|
+
anthropicImageContextRecovery: "editor",
|
|
1333
1356
|
forwardAdvisorTool: "editor",
|
|
1334
1357
|
perMessageEffort: "editor",
|
|
1335
1358
|
noVisionModels: "editor",
|
|
@@ -1343,6 +1366,7 @@ const PROVIDER_CONFIG_FIELD_POLICY = {
|
|
|
1343
1366
|
messagePhaseInference: "editor",
|
|
1344
1367
|
estimateMissingUsage: "editor",
|
|
1345
1368
|
tlsProfile: "editor",
|
|
1369
|
+
anthropicOAuthUserInstructions: "editor",
|
|
1346
1370
|
} as const satisfies Record<keyof OcxProviderConfig, ProviderConfigFieldPolicy>;
|
|
1347
1371
|
|
|
1348
1372
|
type ProviderFieldWithPolicy<Policy extends ProviderConfigFieldPolicy> = {
|
|
@@ -1473,6 +1497,8 @@ export function safeConfigDTO(config: OcxConfig): unknown {
|
|
|
1473
1497
|
...editor.providers[name],
|
|
1474
1498
|
hasApiKey: !!provider.apiKey,
|
|
1475
1499
|
hasHeaders: !!provider.headers && Object.keys(provider.headers).length > 0,
|
|
1500
|
+
...(provider.authMode === "oauth" ? { knownSubscriptionOAuth: oauthSubscriptionMaker({ ...provider, name }) !== undefined } : {}),
|
|
1501
|
+
...(provider.authMode === "forward" ? { canonicalOpenAiForward: isCanonicalOpenAiForwardProvider(provider) } : {}),
|
|
1476
1502
|
};
|
|
1477
1503
|
const registry = getProviderRegistryEntry(name);
|
|
1478
1504
|
const vertex = (provider.adapter === "google" && effectiveGoogleMode(name, provider) === "vertex")
|
|
@@ -1508,6 +1534,7 @@ export function safeConfigDTO(config: OcxConfig): unknown {
|
|
|
1508
1534
|
// historical auto-open behavior.
|
|
1509
1535
|
oauthOpenBrowser: config.oauthOpenBrowser !== false,
|
|
1510
1536
|
showCodexCredits: config.showCodexCredits === true,
|
|
1537
|
+
subscriptionReserve: config.subscriptionReserve,
|
|
1511
1538
|
providers,
|
|
1512
1539
|
};
|
|
1513
1540
|
}
|
|
@@ -19,10 +19,12 @@ import {
|
|
|
19
19
|
ChatCompletionsRequestError,
|
|
20
20
|
} from "../chat/inbound";
|
|
21
21
|
import { chatSettingsBody, chatToResponsesBody } from "../protocols/codecs/chat";
|
|
22
|
+
import { getCombo } from "../combos/types";
|
|
22
23
|
import { chatConversationToIr, chatIrRouteEvidence, withDirectChatConversation, type ChatIrConversation } from "../protocols/codecs/chat-ir";
|
|
23
24
|
import { antigravityDirectDeclineReason } from "./antigravity-direct-eligibility";
|
|
24
25
|
import { normalizeChatImageParts } from "../chat/image-parts";
|
|
25
26
|
import { chatHasInstructionImage } from "../adapters/claude-cli/instruction-images";
|
|
27
|
+
import { AGY_ACP_INTERACTIVE_ONLY, AGY_ACP_LOCAL_ONLY, isUnattendedAgyAcpHttpTurn } from "../adapters/agy-acp/policy";
|
|
26
28
|
import {
|
|
27
29
|
chatCompletionsErrorResponse,
|
|
28
30
|
collectChatCompletion,
|
|
@@ -32,7 +34,7 @@ import {
|
|
|
32
34
|
} from "../chat/outbound";
|
|
33
35
|
import { ADVISOR_INTERNAL_CAPABILITY_HEADER, isInternalCallCapability } from "../lib/local-internal-call-capability";
|
|
34
36
|
import type { CapturedAdmissionPolicy } from "../types/admission-policy";
|
|
35
|
-
import { ADVISOR_ADMISSION_SCOPE_HEADER, decodeAdvisorAdmissionScope, ADVISOR_ADMISSION_POLICY_HEADER, readAdvisorAdmissionPolicy, SIDECAR_ADMISSION_POLICY_HEADER, SIDECAR_INTERNAL_CAPABILITY_HEADER } from "./advisor-admission-scope";
|
|
37
|
+
import { ADVISOR_ADMISSION_SCOPE_HEADER, decodeAdvisorAdmissionScope, ADVISOR_ADMISSION_POLICY_HEADER, readAdvisorAdmissionPolicy, readInternalCallRegistration, SIDECAR_ADMISSION_POLICY_HEADER, SIDECAR_INTERNAL_CAPABILITY_HEADER } from "./advisor-admission-scope";
|
|
36
38
|
import {
|
|
37
39
|
captureAdmissionPolicy, captureSelfFetchCredentialPolicy, inheritAdmissionPolicy, intersectAdmissionPolicies, selfFetchHostPolicy,
|
|
38
40
|
} from "./capture-admission-policy";
|
|
@@ -130,15 +132,22 @@ async function readChatBody(req: Request, budget: TranslatorBudget, maxBytes: nu
|
|
|
130
132
|
}
|
|
131
133
|
}
|
|
132
134
|
|
|
135
|
+
interface ChatCompletionsRequestOptions {
|
|
136
|
+
requestId: string;
|
|
137
|
+
start: number;
|
|
138
|
+
turnAdmissionLease?: AdmissionLease;
|
|
139
|
+
admission?: DataPlaneAdmission;
|
|
140
|
+
advisorAdmissionPolicy?: CapturedAdmissionPolicy;
|
|
141
|
+
suppressProtocolTrace?: boolean;
|
|
142
|
+
/** Turn classification from the original native HTTP request before Chat translation. */
|
|
143
|
+
agyAcpUnattendedHttpTurn?: boolean;
|
|
144
|
+
}
|
|
145
|
+
|
|
133
146
|
export async function handleChatCompletions(
|
|
134
147
|
req: Request,
|
|
135
148
|
config: OcxConfig,
|
|
136
149
|
logCtx: RequestLogContext,
|
|
137
|
-
logIds?:
|
|
138
|
-
requestId: string; start: number; turnAdmissionLease?: AdmissionLease; admission?: DataPlaneAdmission;
|
|
139
|
-
advisorAdmissionPolicy?: CapturedAdmissionPolicy;
|
|
140
|
-
suppressProtocolTrace?: boolean;
|
|
141
|
-
},
|
|
150
|
+
logIds?: ChatCompletionsRequestOptions,
|
|
142
151
|
): Promise<Response> {
|
|
143
152
|
if (logIds?.suppressProtocolTrace) suppressProtocolTrace(logCtx);
|
|
144
153
|
// Set before routing so pre-dispatch refusals stay correlated. A Hermes-only id is marked as a
|
|
@@ -173,24 +182,23 @@ async function handleChatCompletionsWithBudget(
|
|
|
173
182
|
config: OcxConfig,
|
|
174
183
|
logCtx: RequestLogContext,
|
|
175
184
|
translatorBudget: TranslatorBudget,
|
|
176
|
-
logIds?:
|
|
177
|
-
requestId: string; start: number; turnAdmissionLease?: AdmissionLease; admission?: DataPlaneAdmission;
|
|
178
|
-
advisorAdmissionPolicy?: CapturedAdmissionPolicy;
|
|
179
|
-
},
|
|
185
|
+
logIds?: ChatCompletionsRequestOptions,
|
|
180
186
|
): Promise<Response> {
|
|
181
187
|
const advisorInternal = isInternalCallCapability(req.headers.get(ADVISOR_INTERNAL_CAPABILITY_HEADER));
|
|
182
|
-
const
|
|
188
|
+
const sidecarCapability = req.headers.get(SIDECAR_INTERNAL_CAPABILITY_HEADER);
|
|
189
|
+
const sidecarInternal = isInternalCallCapability(sidecarCapability);
|
|
190
|
+
const sidecarRegistration = readInternalCallRegistration(req.headers.get(SIDECAR_ADMISSION_POLICY_HEADER), sidecarCapability);
|
|
183
191
|
const callerPolicy = advisorInternal
|
|
184
192
|
? readAdvisorAdmissionPolicy(req.headers.get(ADVISOR_ADMISSION_POLICY_HEADER), req.headers.get(ADVISOR_INTERNAL_CAPABILITY_HEADER))
|
|
185
|
-
:
|
|
193
|
+
: sidecarRegistration?.policy;
|
|
186
194
|
const decodedScope = advisorInternal
|
|
187
195
|
? decodeAdvisorAdmissionScope(req.headers.get(ADVISOR_ADMISSION_SCOPE_HEADER))
|
|
188
196
|
: undefined;
|
|
189
197
|
// Only a validated internal hop gets its presented credential resolved; loopback admission for
|
|
190
198
|
// every other caller is untouched. An unknown credential fails closed (#7894).
|
|
191
199
|
const selfFetchPolicy = callerPolicy ? captureSelfFetchCredentialPolicy(req, config) : undefined;
|
|
192
|
-
if (
|
|
193
|
-
|| advisorInternal && req.headers.has(ADVISOR_ADMISSION_SCOPE_HEADER) && !decodedScope)) {
|
|
200
|
+
if (selfFetchPolicy === null || (sidecarInternal && !sidecarRegistration)
|
|
201
|
+
|| (advisorInternal && (!callerPolicy || (req.headers.has(ADVISOR_ADMISSION_SCOPE_HEADER) && !decodedScope)))) {
|
|
194
202
|
// Refused requests still own a final log row like every other early rejection.
|
|
195
203
|
if (logIds) addFinalRequestLog(logIds.requestId, logIds.start, logCtx, 403, { closeReason: "non_stream" });
|
|
196
204
|
return chatCompletionsErrorResponse(403, "invalid inherited advisor admission scope", "permission_error", MODEL_NOT_ALLOWED_FOR_KEY);
|
|
@@ -239,6 +247,9 @@ async function handleChatCompletionsWithBudget(
|
|
|
239
247
|
chatBody.service_tier = "priority";
|
|
240
248
|
}
|
|
241
249
|
const stream = chatBody.stream === true;
|
|
250
|
+
const streamOptions = chatBody.stream_options;
|
|
251
|
+
const includeUsage = stream && typeof streamOptions === "object" && streamOptions !== null
|
|
252
|
+
&& (streamOptions as Rec).include_usage === true;
|
|
242
253
|
// Best-effort Grok attribution: the managed fence stamps this header on every model
|
|
243
254
|
// it registers (extra_headers, sent verbatim by upstream Grok). Dashboard usage
|
|
244
255
|
// bucketing only — never an auth or billing signal.
|
|
@@ -418,6 +429,8 @@ async function handleChatCompletionsWithBudget(
|
|
|
418
429
|
internalBody = chatSettingsBody(chatBody);
|
|
419
430
|
} else {
|
|
420
431
|
internalBody = chatToResponsesBody(chatBody, {
|
|
432
|
+
allowInlineAudio: settledRoute?.combo !== undefined
|
|
433
|
+
&& getCombo(config, settledRoute.combo.comboId)?.capabilityPolicy === "union",
|
|
421
434
|
// #7429: only a route that is and stays first-party Anthropic may receive signed thinking
|
|
422
435
|
// a Chat client returns; a combo, policy or rewritten route resolves its target later.
|
|
423
436
|
acceptAnthropicReasoningSignatures: settledRoute !== null && !routeMayChangeCredentialDomain
|
|
@@ -498,6 +511,8 @@ async function handleChatCompletionsWithBudget(
|
|
|
498
511
|
// Caller-owned only: stored-main enrichment below is sidecar authority, never Direct authority.
|
|
499
512
|
const callerDirectAuth = captureCallerDirectAuth(req.headers, config);
|
|
500
513
|
let openAiSidecarAuth = nativeCallerAuth;
|
|
514
|
+
const agyAcpUnattendedHttpTurn = logIds?.agyAcpUnattendedHttpTurn === true
|
|
515
|
+
|| isUnattendedAgyAcpHttpTurn(req.headers, chatBody);
|
|
501
516
|
const headers = new Headers({ "content-type": "application/json" });
|
|
502
517
|
// Internal bridge metadata; the Go resolver scopes and hashes it before upstream use.
|
|
503
518
|
const openCodeSession = req.headers.get("x-opencode-session");
|
|
@@ -562,6 +577,7 @@ async function handleChatCompletionsWithBudget(
|
|
|
562
577
|
const finalizeNativeLog = createFinalRequestLog(logIds, logCtx).finish;
|
|
563
578
|
const upstream = await handleResponses(internalReq, config, logCtx, {
|
|
564
579
|
clientModelLabel: clientFacingModelLabel(requestedModel),
|
|
580
|
+
agyAcpUnattendedHttpTurn,
|
|
565
581
|
openAiSidecarAuth,
|
|
566
582
|
allowStoredOpenAiSidecarAuth: !!(callerAuthorizationRoute && settledRoute
|
|
567
583
|
&& !isCanonicalOpenAiForwardProvider(settledRoute.provider)),
|
|
@@ -601,6 +617,7 @@ async function handleChatCompletionsWithBudget(
|
|
|
601
617
|
// header — so the fact is detected here and carried as an option flag.
|
|
602
618
|
...(visionDescribeTerminal ? { visionDescribeTerminal: true } : {}),
|
|
603
619
|
...(advisorInternal ? { advisorInternal: true } : {}),
|
|
620
|
+
...(sidecarRegistration ? { internalSidecarCall: true } : {}),
|
|
604
621
|
...(inheritedAdmissionScope ? { admissionScope: inheritedAdmissionScope } : {}),
|
|
605
622
|
translatorBudget,
|
|
606
623
|
...(logIds ? { onFirstOutput: () => recordFirstOutput(logCtx, logIds.start) } : {}),
|
|
@@ -610,7 +627,7 @@ async function handleChatCompletionsWithBudget(
|
|
|
610
627
|
// point of the lane is that neither direction passes through the internal Responses body.
|
|
611
628
|
...(directRoute && directConversation
|
|
612
629
|
? {
|
|
613
|
-
clientEncoder: { protocol: "chat" as const, stream, model: requestedModel, requestLane: "direct" as const },
|
|
630
|
+
clientEncoder: { protocol: "chat" as const, stream, includeUsage, model: requestedModel, requestLane: "direct" as const },
|
|
614
631
|
directRequest: {
|
|
615
632
|
protocol: "chat" as const,
|
|
616
633
|
providerName: directRoute.providerName,
|
|
@@ -628,7 +645,7 @@ async function handleChatCompletionsWithBudget(
|
|
|
628
645
|
},
|
|
629
646
|
}
|
|
630
647
|
: directEncodersApply(config, settledRoute)
|
|
631
|
-
? { clientEncoder: { protocol: "chat" as const, stream, model: requestedModel } }
|
|
648
|
+
? { clientEncoder: { protocol: "chat" as const, stream, includeUsage, model: requestedModel } }
|
|
632
649
|
: {}),
|
|
633
650
|
});
|
|
634
651
|
// Already in the Chat wire: no conversion. A direct-encoder body (PF-09) reports its own log
|
|
@@ -701,6 +718,9 @@ async function handleChatCompletionsWithBudget(
|
|
|
701
718
|
// Structured model_not_found must win over classifyError's generic remaps.
|
|
702
719
|
classified.code = "model_not_found";
|
|
703
720
|
classified.type = "invalid_request_error";
|
|
721
|
+
} else if (upstream.status === 403 && isProxyError(upstream) && (upstreamCode === AGY_ACP_INTERACTIVE_ONLY || upstreamCode === AGY_ACP_LOCAL_ONLY)) {
|
|
722
|
+
classified.code = upstreamCode;
|
|
723
|
+
classified.type = "permission_error";
|
|
704
724
|
} else if (upstreamCode === UNDECLARED_TOOL_CALL_ERROR_CODE) {
|
|
705
725
|
// The guard's deterministic refusal keeps its wire identity — same code the
|
|
706
726
|
// streamed `response.failed` frame and the Anthropic surface carry.
|
|
@@ -757,7 +777,7 @@ async function handleChatCompletionsWithBudget(
|
|
|
757
777
|
|
|
758
778
|
if (contentType.includes("text/event-stream") && response.body) {
|
|
759
779
|
const failureVerdictSink: FailureVerdictSink = {};
|
|
760
|
-
const chatSse = responsesSseToChatCompletionsSse(response.body, requestedModel, { translatorBudget, failureVerdictSink, proxyErrorContext: logCtx });
|
|
780
|
+
const chatSse = responsesSseToChatCompletionsSse(response.body, requestedModel, { translatorBudget, failureVerdictSink, proxyErrorContext: logCtx, includeUsage });
|
|
761
781
|
if (stream) {
|
|
762
782
|
// Stream failures surface as an error SSE frame then abort the body — never a
|
|
763
783
|
// success completion that embeds `[error] ...` + clean [DONE].
|
|
@@ -47,6 +47,9 @@ export function nativeChatDeclineReason(
|
|
|
47
47
|
// accepts — can contain signatures or redacted-thinking ciphertext, so use the bridge that
|
|
48
48
|
// projects it to plaintext rather than disclosing it to an unrelated Chat destination.
|
|
49
49
|
if (chatBodyCarriesAnthropicReasoningState(rawBody)) return "opaque-state-stripped";
|
|
50
|
+
// Gemini thought signatures (tool_calls[].extra_content) are Google's opaque state. Only Google's
|
|
51
|
+
// own OpenAI-compatible endpoint reads them; for any other Chat vendor the bridge drops them.
|
|
52
|
+
if (chatBodyCarriesGoogleOpaqueState(rawBody) && !isGoogleChatDestination(provider.baseUrl)) return "opaque-state-stripped";
|
|
50
53
|
// A standard Chat tool message accepts a string or text parts, not image_url, so
|
|
51
54
|
// normalizing a Pi/Anthropic tool image into image_url is not enough on its own —
|
|
52
55
|
// the part is still inside a tool message. The translated adapter already places
|
|
@@ -76,6 +79,24 @@ export function nativeChatDeclineReason(
|
|
|
76
79
|
return undefined;
|
|
77
80
|
}
|
|
78
81
|
|
|
82
|
+
/** Whether an assistant turn in the Chat body echoes provider-opaque tool-call state. */
|
|
83
|
+
function chatBodyCarriesGoogleOpaqueState(rawBody: Rec): boolean {
|
|
84
|
+
if (!Array.isArray(rawBody.messages)) return false;
|
|
85
|
+
return rawBody.messages.some(message => isRec(message) && Array.isArray(message.tool_calls)
|
|
86
|
+
&& message.tool_calls.some(call => isRec(call) && call.extra_content !== undefined));
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
/** Google's Gemini OpenAI-compatible hosts, which accept extra_content.google.thought_signature. */
|
|
90
|
+
function isGoogleChatDestination(baseUrl: unknown): boolean {
|
|
91
|
+
if (typeof baseUrl !== "string") return false;
|
|
92
|
+
try {
|
|
93
|
+
const host = new URL(baseUrl).hostname.toLowerCase();
|
|
94
|
+
return host === "generativelanguage.googleapis.com" || host === "aiplatform.googleapis.com" || host.endsWith("-aiplatform.googleapis.com");
|
|
95
|
+
} catch {
|
|
96
|
+
return false;
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
|
|
79
100
|
export function isNativeChatRouteEligible(route: RouteResult, rawBody: Rec, config?: OcxConfig): boolean {
|
|
80
101
|
return nativeChatDeclineReason(route, rawBody, config) === undefined;
|
|
81
102
|
}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { sealCredentialRefusal } from "./credential-recovery-attempt";
|
|
1
2
|
import { recordUpstreamProviderErrorDetail } from "./request-log-failure-detail";
|
|
2
3
|
import { normalizeNativeChatContent } from "../adapters/openai-chat/native-content";
|
|
3
4
|
import { attachComboFailureEvidence, ownedChatErrorPayload, type ClientErrorContract } from "../lib/client-error-body";
|
|
@@ -72,6 +73,7 @@ import { distributedKeyPhysicalFetch, distributedKeyResponseOwner } from "../pro
|
|
|
72
73
|
import { passiveKeyPhysicalFetch } from "../providers/passive-key-observation";
|
|
73
74
|
import { isProviderApiKeyPaused, ProviderApiKeyPausedError } from "../providers/api-key-pause";
|
|
74
75
|
import { providerAffinityGenerationIsCurrent, providerApiKeySelectionIsCurrent, resolveCurrentProviderApiKeyTransport } from "../providers/api-key-selection";
|
|
76
|
+
import { isXaiGrokOAuth, isXaiLegacyPrivacyError, xaiPrivacyModeRefusal } from "../providers/xai-privacy-mode";
|
|
75
77
|
import type { OcxProviderTransport } from "../providers/xai-transport";
|
|
76
78
|
import type { RouteResult } from "../router";
|
|
77
79
|
import type { OcxConfig, OcxProviderConfig } from "../types";
|
|
@@ -81,12 +83,11 @@ import { resolveConnectTimeoutMs, resolveJsonBodyReadTimeoutMs } from "../stall-
|
|
|
81
83
|
import { linkAbortSignal } from "./responses";
|
|
82
84
|
import {
|
|
83
85
|
noteProviderAttemptSend,
|
|
84
|
-
recordKeyAttemptFailure,
|
|
85
86
|
recordKeyWireAttemptUsage,
|
|
86
87
|
recordFirstOutput,
|
|
87
|
-
recordAttemptCredentialSource,
|
|
88
88
|
type RequestLogContext,
|
|
89
89
|
} from "./request-log";
|
|
90
|
+
import { recordKeyAttemptFailure } from "./request-log-key-failure";
|
|
90
91
|
import { chatResponseHasUndeclaredToolCalls, UNDECLARED_CHAT_TOOL_MESSAGE, jsonCompletionSse, nativeChatSse, structuredError, usageFromChat } from "./chat-native-sse";
|
|
91
92
|
import { beginInferenceAttempt, type InferenceAttempt } from "./inference/attempt";
|
|
92
93
|
import { createFinalRequestLog } from "./inference/final-log";
|
|
@@ -400,7 +401,6 @@ export async function runNativeChatAttempt(
|
|
|
400
401
|
};
|
|
401
402
|
const buildActiveRequest = () => {
|
|
402
403
|
bindNativeChatReplayScope(replayScope, activeProvider, route.providerName, route.modelId);
|
|
403
|
-
recordAttemptCredentialSource(attempt, route.providerName, activeProvider, activeAdapter.name);
|
|
404
404
|
const request = buildOpenAIChatPassthroughRequest(
|
|
405
405
|
activeProvider,
|
|
406
406
|
execution.chatBody,
|
|
@@ -579,7 +579,6 @@ export async function runNativeChatAttempt(
|
|
|
579
579
|
// before the wire refunds the booking rather than charging it.
|
|
580
580
|
if (physicalBudget.spendEnforced) initialSendStarted = true;
|
|
581
581
|
else if (!comboReceipt) settleNonEnforcedSend(request.url);
|
|
582
|
-
noteProviderAttemptSend(logCtx, route.providerName, activeProvider, logCtx.usageLogInputTokens, transportRecovery ?? recovery);
|
|
583
582
|
// A reselected provider transport is still a physical send: the connection policy
|
|
584
583
|
// and manual-redirect ownership wrap the selected implementation (#4992).
|
|
585
584
|
const physicalFetch = ((input, physicalInit) => sendWithConnectionPolicy(
|
|
@@ -592,7 +591,9 @@ export async function runNativeChatAttempt(
|
|
|
592
591
|
request.url,
|
|
593
592
|
applyUpstreamRecoveryInit({
|
|
594
593
|
...init, method: request.method, headers, body: request.body,
|
|
595
|
-
...physicalSendObserverInit(observeAutoPause, request.url)
|
|
594
|
+
...physicalSendObserverInit(observeAutoPause, request.url, () => {
|
|
595
|
+
noteProviderAttemptSend(logCtx, route.providerName, activeProvider, logCtx.usageLogInputTokens, transportRecovery ?? recovery);
|
|
596
|
+
}),
|
|
596
597
|
}, transportRecovery),
|
|
597
598
|
init.signal ?? upstream.signal,
|
|
598
599
|
resolveConnectTimeoutMs(config.connectTimeoutMs, { localUpstream }),
|
|
@@ -645,6 +646,7 @@ export async function runNativeChatAttempt(
|
|
|
645
646
|
const fresh = resolveCurrentProviderApiKeyTransport(config, route.providerName, { ...activeProvider, _apiKeyAttempt: undefined });
|
|
646
647
|
const next = fresh && (selectProactiveApiKeyTransport(config, route.providerName, fresh) ?? fresh);
|
|
647
648
|
if (!next) break;
|
|
649
|
+
sealCredentialRefusal(logCtx, response.status, "key-401");
|
|
648
650
|
try { void response.body?.cancel().catch(() => {}); } catch { /* closed */ }
|
|
649
651
|
activeProvider = next;
|
|
650
652
|
stampApiKeyAccountLabel(logCtx, route.providerName, activeProvider);
|
|
@@ -693,6 +695,8 @@ export async function runNativeChatAttempt(
|
|
|
693
695
|
// Keep that bookkeeping when this request has spent its final send, but preserve the
|
|
694
696
|
// terminal 429 body and do not dispatch with the replacement credential.
|
|
695
697
|
if (!transientSendAvailable()) break;
|
|
698
|
+
const recovery = failureStatus === 401 ? "key-401" : "key-429";
|
|
699
|
+
sealCredentialRefusal(logCtx, failureStatus, recovery);
|
|
696
700
|
try { void response.body?.cancel().catch(() => {}); } catch { /* already closed */ }
|
|
697
701
|
activeProvider = rotated;
|
|
698
702
|
stampApiKeyAccountLabel(logCtx, route.providerName, activeProvider);
|
|
@@ -700,7 +704,7 @@ export async function runNativeChatAttempt(
|
|
|
700
704
|
releaseRetainedRequest();
|
|
701
705
|
activeRequest = buildActiveRequest();
|
|
702
706
|
retainRequest(activeRequest);
|
|
703
|
-
response = await send(activeRequest,
|
|
707
|
+
response = await send(activeRequest, recovery);
|
|
704
708
|
}
|
|
705
709
|
if (response !== priorResponse && wasAccountAutoPaused(response)) continue;
|
|
706
710
|
break;
|
|
@@ -757,6 +761,11 @@ export async function runNativeChatAttempt(
|
|
|
757
761
|
upstream.abort();
|
|
758
762
|
return failLocal(499, "Client cancelled request", "client_cancelled");
|
|
759
763
|
}
|
|
764
|
+
if (isXaiGrokOAuth(route.providerName, route.provider) && isXaiLegacyPrivacyError(response.status, bodyText)) {
|
|
765
|
+
const refusal = xaiPrivacyModeRefusal(logCtx);
|
|
766
|
+
finishLog(refusal.status);
|
|
767
|
+
return refusal;
|
|
768
|
+
}
|
|
760
769
|
const detail = activeAdapter.formatErrorBody?.(response.status, response.headers, bodyText) ?? "";
|
|
761
770
|
let upstreamType: string | undefined;
|
|
762
771
|
let upstreamCode: string | null | undefined;
|