@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
|
@@ -4,6 +4,7 @@ import { isVerifiedModelNotInPlanResponse } from "../../lib/errors";
|
|
|
4
4
|
import { isShadowSourceModel } from "../../lib/shadow-call";
|
|
5
5
|
import { isNonReplayableResponse } from "../../lib/upstream-retry";
|
|
6
6
|
import { finishRequestAttempt, type RequestLogContext } from "../request-log";
|
|
7
|
+
import { restoreLocalFailureState, takeLocalFailureState, type LocalFailureState } from "../request-log-failure-detail";
|
|
7
8
|
import { linkRequestSessionLane } from "../request-log-conversation";
|
|
8
9
|
import type { OcxConfig } from "../../types";
|
|
9
10
|
import type { RouteCandidateTrace, RouteDecisionTraceV1 } from "../../routing/trace";
|
|
@@ -17,6 +18,7 @@ import { routeConcreteModel } from "../../router";
|
|
|
17
18
|
import { isPolicyCandidateRefusal, isMandatoryToolChoiceRefusal, mandatoryToolChoiceUnavailableResponse, policyWireDestination, type PolicyRequestScope } from "./policy-request-scope";
|
|
18
19
|
import { fallbackTriggerForStatus, guardFallbackHop } from "../../routing/fallback-policy";
|
|
19
20
|
import { captureAdmissionPolicy } from "../capture-admission-policy";
|
|
21
|
+
import { captureHostedAdvisorSpendScope } from "./hosted-advisor-spend";
|
|
20
22
|
import { upstreamCodeForComboFailure } from "../../bridge/errors";
|
|
21
23
|
|
|
22
24
|
type CoreHandler = typeof handleResponsesCore;
|
|
@@ -152,7 +154,7 @@ function isPolicyDecision(trace: RouteDecisionTraceV1 | undefined): trace is Rou
|
|
|
152
154
|
}
|
|
153
155
|
|
|
154
156
|
/** Finalize the failed physical attempt so the retry receives a fresh attempt row. */
|
|
155
|
-
function finishFailedPolicyAttempt(logCtx: RequestLogContext, status: number):
|
|
157
|
+
function finishFailedPolicyAttempt(logCtx: RequestLogContext, status: number): LocalFailureState {
|
|
156
158
|
const attempt = logCtx.activeAttempt;
|
|
157
159
|
if (attempt) {
|
|
158
160
|
const startedAt = logCtx.activeAttemptStartedAt ?? Date.now();
|
|
@@ -175,6 +177,7 @@ function finishFailedPolicyAttempt(logCtx: RequestLogContext, status: number): v
|
|
|
175
177
|
delete logCtx.affinityModel;
|
|
176
178
|
delete logCtx.cacheAffinityApplicable;
|
|
177
179
|
delete logCtx.terminalSource;
|
|
180
|
+
return takeLocalFailureState(logCtx);
|
|
178
181
|
}
|
|
179
182
|
|
|
180
183
|
/**
|
|
@@ -198,6 +201,7 @@ export async function handleResponsesWithPolicyFallback(
|
|
|
198
201
|
const coreOptions: CoreOptions = {
|
|
199
202
|
...options,
|
|
200
203
|
advisorAdmissionPolicy: options.advisorAdmissionPolicy ?? captureAdmissionPolicy(config, options.admission, options.admissionScope),
|
|
204
|
+
hostedAdvisorSpendScope: captureHostedAdvisorSpendScope(options),
|
|
201
205
|
policyRequestScope: policyScope,
|
|
202
206
|
openAiSidecarAuth: options.openAiSidecarAuth === undefined
|
|
203
207
|
? captureExplicitOpenAiCallerAuth(req.headers, config) : options.openAiSidecarAuth,
|
|
@@ -302,7 +306,7 @@ export async function handleResponsesWithPolicyFallback(
|
|
|
302
306
|
// Retain the failed response's log owner until a candidate actually replaces it. This is
|
|
303
307
|
// deliberately shallow: completed attempts and the live spend tracker keep their identity.
|
|
304
308
|
const failureLog = { ...logCtx };
|
|
305
|
-
finishFailedPolicyAttempt(logCtx, response.status);
|
|
309
|
+
const failureLocal = finishFailedPolicyAttempt(logCtx, response.status);
|
|
306
310
|
const retryRequest = requestWithCandidate(req, rawBody, next);
|
|
307
311
|
delete policyScope.preparedDestination;
|
|
308
312
|
try {
|
|
@@ -327,6 +331,7 @@ export async function handleResponsesWithPolicyFallback(
|
|
|
327
331
|
if (!Object.hasOwn(failureLog, key)) Reflect.deleteProperty(logCtx, key);
|
|
328
332
|
}
|
|
329
333
|
Object.assign(logCtx, failureLog);
|
|
334
|
+
restoreLocalFailureState(logCtx, failureLocal);
|
|
330
335
|
} else {
|
|
331
336
|
// Dispatched: only a candidate that was not locally skipped counts as a taken hop.
|
|
332
337
|
try { await response.body?.cancel(); } catch { /* the dispatched candidate replaces the retained failure */ }
|
|
@@ -3,6 +3,7 @@ import { markProxyError } from "../../lib/client-error-body";
|
|
|
3
3
|
import type { RouteResult } from "../../router";
|
|
4
4
|
import type { RouteDecisionTraceV1 } from "../../routing/trace";
|
|
5
5
|
import { resolveOpenAiVirtualModel } from "../../providers/openai-virtual-models";
|
|
6
|
+
import type { AdapterEvent } from "../../types";
|
|
6
7
|
|
|
7
8
|
/** Request-owned authorization, separate from the diagnostic trace and each physical attempt. */
|
|
8
9
|
export interface PolicyRequestScope {
|
|
@@ -35,6 +36,8 @@ export class MandatoryToolChoiceUnavailableError extends PolicyCandidateUnavaila
|
|
|
35
36
|
}
|
|
36
37
|
}
|
|
37
38
|
|
|
39
|
+
export class ComboVisionDescriptionUnavailableError extends PolicyCandidateUnavailableError {}
|
|
40
|
+
|
|
38
41
|
export function mandatoryToolChoiceUnavailableResponse(): Response {
|
|
39
42
|
return markProxyError(formatErrorResponse(400, "invalid_request_error",
|
|
40
43
|
"This mandatory tool_choice cannot be preserved for a translated Chat destination."));
|
|
@@ -42,13 +45,39 @@ export function mandatoryToolChoiceUnavailableResponse(): Response {
|
|
|
42
45
|
|
|
43
46
|
const localRefusals = new WeakSet<Response>();
|
|
44
47
|
const mandatoryToolRefusals = new WeakSet<Response>();
|
|
48
|
+
const visionDescriptionRefusals = new WeakSet<Response>();
|
|
49
|
+
|
|
50
|
+
/** Attach candidate-local provenance without changing the HTTP envelope. */
|
|
51
|
+
export function markPolicyCandidateRefusal(response: Response): Response {
|
|
52
|
+
localRefusals.add(response);
|
|
53
|
+
return response;
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
/** A mandatory hosted selection cannot be admitted under the credential's spend policy. */
|
|
57
|
+
export class HostedAdvisorSpendRefusal extends Error {
|
|
58
|
+
constructor(reason: "ceiling" | "ambiguous-credentials" | "credential-binding") {
|
|
59
|
+
super(reason === "ceiling"
|
|
60
|
+
? "The selected hosted Advisor tool is unavailable under the applicable token spend ceiling."
|
|
61
|
+
: reason === "ambiguous-credentials"
|
|
62
|
+
? "The selected hosted Advisor tool is unavailable with ambiguous upstream credentials."
|
|
63
|
+
: "The selected hosted Advisor tool requires an unambiguous match to the admitted upstream credential.");
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
event(): Extract<AdapterEvent, { type: "error" }> {
|
|
67
|
+
return { type: "error", status: 400, errorType: "invalid_request_error", message: this.message, retryable: false };
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
response(): Response {
|
|
71
|
+
return markPolicyCandidateRefusal(markProxyError(formatErrorResponse(400, "invalid_request_error", this.message)));
|
|
72
|
+
}
|
|
73
|
+
}
|
|
45
74
|
|
|
46
75
|
export function policyCandidateRefusalResponse(error: unknown): Response | undefined {
|
|
47
76
|
if (!(error instanceof PolicyCandidateUnavailableError)) return undefined;
|
|
48
77
|
const response = formatErrorResponse(409, "policy_candidate_unavailable", error.message);
|
|
49
|
-
localRefusals.add(response);
|
|
50
78
|
if (error instanceof MandatoryToolChoiceUnavailableError) mandatoryToolRefusals.add(response);
|
|
51
|
-
|
|
79
|
+
if (error instanceof ComboVisionDescriptionUnavailableError) visionDescriptionRefusals.add(response);
|
|
80
|
+
return markPolicyCandidateRefusal(response);
|
|
52
81
|
}
|
|
53
82
|
|
|
54
83
|
/** Upstream text or a matching error code cannot authorize another policy attempt. */
|
|
@@ -60,10 +89,15 @@ export function isMandatoryToolChoiceRefusal(response: Response): boolean {
|
|
|
60
89
|
return mandatoryToolRefusals.has(response);
|
|
61
90
|
}
|
|
62
91
|
|
|
92
|
+
export function isComboVisionDescriptionRefusal(response: Response): boolean {
|
|
93
|
+
return visionDescriptionRefusals.has(response);
|
|
94
|
+
}
|
|
95
|
+
|
|
63
96
|
/** Preserve local refusal authority when response lifetime owners wrap the body. */
|
|
64
97
|
export function carryPolicyCandidateRefusal(source: Response, target: Response): Response {
|
|
65
98
|
if (localRefusals.has(source)) localRefusals.add(target);
|
|
66
99
|
if (mandatoryToolRefusals.has(source)) mandatoryToolRefusals.add(target);
|
|
100
|
+
if (visionDescriptionRefusals.has(source)) visionDescriptionRefusals.add(target);
|
|
67
101
|
return target;
|
|
68
102
|
}
|
|
69
103
|
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { responseReplayOwnerKey } from "../../responses/state/replay-owner";
|
|
2
|
+
import { connectionReplayScopeForThread, connectionReplayScopeOwnerKey } from "../../responses/state/connection-scope";
|
|
3
|
+
import type { HandleResponsesOptions } from "./core-options";
|
|
4
|
+
|
|
5
|
+
/** Direct and combo ingress use the same credential-first, connection-local replay authority. */
|
|
6
|
+
export function selectResponseReplayOwner(
|
|
7
|
+
strict: boolean,
|
|
8
|
+
principal: string | undefined,
|
|
9
|
+
ownThread: string | undefined,
|
|
10
|
+
options: Pick<HandleResponsesOptions, "inboundTransport" | "admission" | "replayScope">,
|
|
11
|
+
) {
|
|
12
|
+
const credentialOwnerKey = strict ? responseReplayOwnerKey(principal, ownThread) : undefined;
|
|
13
|
+
const replayConnectionScope = credentialOwnerKey === null && options.inboundTransport === "websocket"
|
|
14
|
+
&& options.admission?.kind === "loopback"
|
|
15
|
+
? connectionReplayScopeForThread(options.replayScope, ownThread) : undefined;
|
|
16
|
+
return {
|
|
17
|
+
replayOwnerKey: strict ? credentialOwnerKey ?? connectionReplayScopeOwnerKey(replayConnectionScope) ?? null : undefined,
|
|
18
|
+
replayConnectionScope,
|
|
19
|
+
};
|
|
20
|
+
}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { selectResponseReplayOwner } from "./replay-owner";
|
|
2
2
|
import { isPlaintextV2AgentMessagesEnabled } from "../../config/multi-agent-surface";
|
|
3
3
|
import { projectLocalModelRefusalLog } from "../request-log-failure-detail";
|
|
4
|
+
import { attributePhysicalAttempt } from "../request-log-failure-attribution";
|
|
4
5
|
import { failLinkTurnExpansion, markLinkTurnMissing, observeLinkTurnExpansion } from "../link-turn";
|
|
5
6
|
import { inputAdmissionRefusalMessage } from "./input-admission";
|
|
6
7
|
import { clientFacingModelLabel, clientFacingModelText } from "../../lib/error-destination";
|
|
@@ -10,10 +11,10 @@ import type { HandleResponsesOptions, ResponsesRequestContext, ResponsesAdmissio
|
|
|
10
11
|
import type { PolicyRequestEvidence } from "../../routing/evaluator";
|
|
11
12
|
import type { RequestLogContext } from "../request-log";
|
|
12
13
|
import { addProtocolEntryReason, markProtocolEntry, protocolMarkFeatures } from "../../protocols/trace";
|
|
13
|
-
import {
|
|
14
|
+
import { admitsHostedAdvisor, scopedAnthropicServerTools } from "../messages-native-scope";
|
|
14
15
|
import { advisorServerToolDestination } from "../../adapters/anthropic/advisor-tool";
|
|
15
16
|
import { isAntigravityRoute } from "../antigravity-direct-eligibility";
|
|
16
|
-
import { capturePolicyRequestRoute, assertPolicyNormalizedRoute, recordPolicyPreparedDestination, policyCandidateRefusalResponse, MandatoryToolChoiceUnavailableError, mandatoryToolChoiceUnavailableResponse } from "./policy-request-scope";
|
|
17
|
+
import { capturePolicyRequestRoute, assertPolicyNormalizedRoute, recordPolicyPreparedDestination, policyCandidateRefusalResponse, markPolicyCandidateRefusal, MandatoryToolChoiceUnavailableError, mandatoryToolChoiceUnavailableResponse } from "./policy-request-scope";
|
|
17
18
|
import {
|
|
18
19
|
agentTaskRecoveryConfig,
|
|
19
20
|
restoreCachedEncryptedAgentTasks,
|
|
@@ -90,10 +91,12 @@ import { anthropicSessionKeyFromParts } from "../../oauth/anthropic-routing";
|
|
|
90
91
|
import { configuredAnthropicInstance } from "../../providers/anthropic-instance";
|
|
91
92
|
import { isTranslatorBudgetExceededError } from "../../lib/translator-budget";
|
|
92
93
|
import { bindTurnTerminationScope, rememberDeliveredFinalAnswer } from "../../responses/turn-termination";
|
|
93
|
-
import { noteCodexSelectionAffinity, observeCacheDiagnosticInbound, rebindCacheDiagnosticBody, requestLogSpeedLabel, readConfiguredCodexServiceTier } from "../request-log";
|
|
94
|
+
import { beginRequestAttempt, finishRequestAttempt, markLocalRequestLogRefusal, noteAttemptSend, noteCodexSelectionAffinity, observeCacheDiagnosticInbound, rebindCacheDiagnosticBody, requestLogSpeedLabel, readConfiguredCodexServiceTier, usageFromResponsesPayload } from "../request-log";
|
|
95
|
+
import type { PersistedUsageAttempt } from "../../usage/log";
|
|
94
96
|
import type { RouteResult } from "../../router";
|
|
95
97
|
import {
|
|
96
98
|
captureRouteStaticPolicy,
|
|
99
|
+
previewRouteModel,
|
|
97
100
|
routeConcreteModel,
|
|
98
101
|
routeCompactionModel,
|
|
99
102
|
routeModel,
|
|
@@ -101,6 +104,7 @@ import {
|
|
|
101
104
|
AnthropicSecondaryInstanceUnavailableError,
|
|
102
105
|
} from "../../router";
|
|
103
106
|
import { evidenceFromBody } from "../../routing/request-evidence";
|
|
107
|
+
import { resolvePolicyProfileId } from "../../routing/profile";
|
|
104
108
|
import { OPENAI_CODEX_PROVIDER_ID, isCanonicalOpenAiForwardProvider } from "../../providers/openai-tiers";
|
|
105
109
|
import { resolveNativeReasoningRetention } from "../../config/schema/native-reasoning-retention";
|
|
106
110
|
import { isThreadSpawnRequest } from "../effort-policy";
|
|
@@ -444,7 +448,7 @@ export async function prepareResponsesRequest(
|
|
|
444
448
|
const replayPrincipal = options.replayPrincipal
|
|
445
449
|
? options.replayPrincipal.clientPrincipalId : resolveContextPrincipal(req, config, options.admission);
|
|
446
450
|
const strictReplay = options.plaintextV2Decision ?? isPlaintextV2AgentMessagesEnabled(config);
|
|
447
|
-
const replayOwnerKey = strictReplay
|
|
451
|
+
const { replayOwnerKey, replayConnectionScope } = selectResponseReplayOwner(strictReplay, replayPrincipal, inboundOwnThreadId, options);
|
|
448
452
|
const replayThreadId = strictReplay ? inboundOwnThreadId : inboundClientThreadId;
|
|
449
453
|
const cursorClientThreadId = codexPoolAffinityKey(req.headers);
|
|
450
454
|
const originalBody = body;
|
|
@@ -460,9 +464,33 @@ export async function prepareResponsesRequest(
|
|
|
460
464
|
// Local replay failures require full client replay.
|
|
461
465
|
if (replayFailure) {
|
|
462
466
|
failLinkTurnExpansion(options.linkTurn, req, logCtx, body, replayFailure.reason);
|
|
467
|
+
const { code } = replayFailure;
|
|
468
|
+
if (strictReplay) {
|
|
469
|
+
logCtx.errorCode = code;
|
|
470
|
+
if (logCtx.attempts?.some(attempt => attempt.sendCount > 0)) logCtx.terminalSource = "synthetic";
|
|
471
|
+
else markLocalRequestLogRefusal(logCtx, code);
|
|
472
|
+
// Attribute a direct native refusal using only request metadata and a route preview.
|
|
473
|
+
// A miss never enters auth, subagent fallback or encrypted-task recovery for logging.
|
|
474
|
+
const { model, reasoning } = body as { model?: unknown; reasoning?: unknown };
|
|
475
|
+
try {
|
|
476
|
+
const parsed = parseRequest({ model, reasoning });
|
|
477
|
+
logCtx.requestedModel ??= options.mainHardLockFallbackOverride?.sourceModel
|
|
478
|
+
?? options.compactionRoutingOverride?.sourceModel ?? parsed.modelId;
|
|
479
|
+
logCtx.requestedEffort ??= parsed.options.reasoning;
|
|
480
|
+
if (!concreteSelection && !memoryModelApplies && !shadowCallMatches
|
|
481
|
+
&& !resolveComboId(config, parsed.modelId) && !resolvePolicyProfileId(config, parsed.modelId)) {
|
|
482
|
+
const preview = previewRouteModel(config, parsed.modelId);
|
|
483
|
+
if (isCanonicalOpenAiForwardProvider(preview.provider)) {
|
|
484
|
+
logCtx.provider = preview.providerName;
|
|
485
|
+
logCtx.model = preview.modelId;
|
|
486
|
+
logCtx.routeDecision = preview.routeDecision;
|
|
487
|
+
}
|
|
488
|
+
}
|
|
489
|
+
} catch { /* Unavailable attribution does not change the replay refusal. */ }
|
|
490
|
+
}
|
|
463
491
|
return markProxyError(formatErrorResponse(
|
|
464
492
|
400,
|
|
465
|
-
|
|
493
|
+
code,
|
|
466
494
|
"Continuation state is unavailable or corrupt; resend the full conversation without previous_response_id.",
|
|
467
495
|
));
|
|
468
496
|
}
|
|
@@ -549,11 +577,19 @@ export async function prepareResponsesRequest(
|
|
|
549
577
|
parsed._nativeReasoningReplay = options.nativeReasoningReplay;
|
|
550
578
|
parsed._nativeReasoningMint = options.nativeReasoningMint;
|
|
551
579
|
parsed._anthropicServerTools = options.anthropicServerTools;
|
|
580
|
+
// The lowered named choice serves the wire builder but grants no client or synthetic tool permission.
|
|
581
|
+
if (options.anthropicHostedAdvisorSelection) {
|
|
582
|
+
parsed.options.explicitRootFunctionChoices = [];
|
|
583
|
+
parsed.options.explicitClientToolChoices = [];
|
|
584
|
+
}
|
|
552
585
|
parsed._anthropicServerReplay = options.anthropicServerReplay;
|
|
553
586
|
parsed._anthropicSystemCachePrefix = options.anthropicSystemCachePrefix;
|
|
554
587
|
parsed._anthropicInbound = true;
|
|
555
588
|
if (parsed.options.textFormat?.type === "json_schema") parsed._structuredOutputConformance = true;
|
|
556
589
|
}
|
|
590
|
+
if (options.advisorInternal || options.internalSidecarCall || options.internalDecisionCall) {
|
|
591
|
+
parsed._proxyOwnedSystemPrompt = true;
|
|
592
|
+
}
|
|
557
593
|
// Codex's own "new" turn metadata, for the experimental Anthropic perMessageEffort option (#6895).
|
|
558
594
|
parsed._codexNewHistory = codexTurnStartsNewHistory(body, req.headers, options.inboundTransport);
|
|
559
595
|
parsed._promptCacheKeyIsSharedCohort = options.promptCacheKeyIsSharedCohort;
|
|
@@ -635,6 +671,7 @@ export async function prepareResponsesRequest(
|
|
|
635
671
|
options.onRequestBodyRead?.();
|
|
636
672
|
const responseStateOptions = (force = false) => ({
|
|
637
673
|
replayOwnerKey,
|
|
674
|
+
...(replayConnectionScope ? { connectionScope: replayConnectionScope } : {}),
|
|
638
675
|
compiledPlaintext: parsed._plaintextV2EverPrepared === true,
|
|
639
676
|
...(force ? { force: true } : {}),
|
|
640
677
|
...((strictReplay ? inboundOwnThreadId : parsed._clientThreadId) ? { clientThreadId: strictReplay ? inboundOwnThreadId : parsed._clientThreadId } : {}),
|
|
@@ -1008,6 +1045,10 @@ export async function prepareResponsesRequest(
|
|
|
1008
1045
|
};
|
|
1009
1046
|
let selectedForwardHeaders = req.headers;
|
|
1010
1047
|
let subagentFallbackAccountId = config.activeCodexAccountId ?? null;
|
|
1048
|
+
// A typed fact for providers that refuse fallback-routed turns (the Antigravity ACP policy): set only
|
|
1049
|
+
// where a fallback actually moves the route (a selection that keeps the requested model is not one),
|
|
1050
|
+
// never inferred from headers, models or tools.
|
|
1051
|
+
let subagentFallbackSelected = false;
|
|
1011
1052
|
let subagentFallbackAccountPreview: SubagentPoolAccountPreview | undefined;
|
|
1012
1053
|
let subagentFallbackModelEligibleAccountIdsForModel: SubagentModelEligibleAccountIds | undefined;
|
|
1013
1054
|
let subagentQuotaFailureModel = parsed.modelId;
|
|
@@ -1104,6 +1145,7 @@ export async function prepareResponsesRequest(
|
|
|
1104
1145
|
);
|
|
1105
1146
|
if (fallback?.refusal) return fallback.refusal;
|
|
1106
1147
|
if (fallback) {
|
|
1148
|
+
if (fallback.to !== fallback.from) subagentFallbackSelected = true;
|
|
1107
1149
|
(logCtx as unknown as Record<string, unknown>).subagentModelFallbackFrom = fallback.from;
|
|
1108
1150
|
(logCtx as unknown as Record<string, unknown>).subagentModelFallbackTo = fallback.to;
|
|
1109
1151
|
if (isInjectionDebugEnabled()) {
|
|
@@ -1140,6 +1182,7 @@ export async function prepareResponsesRequest(
|
|
|
1140
1182
|
}
|
|
1141
1183
|
|
|
1142
1184
|
let recoveryFailureReason: AgentTaskRecoveryFailureReason | undefined;
|
|
1185
|
+
let recoveryAttempts: PersistedUsageAttempt[] | undefined;
|
|
1143
1186
|
// Native fallback and explicitly trusted direct Responses routes can consume ciphertext,
|
|
1144
1187
|
// so recover only after final route selection.
|
|
1145
1188
|
//
|
|
@@ -1172,7 +1215,24 @@ export async function prepareResponsesRequest(
|
|
|
1172
1215
|
(body as { input?: unknown } | undefined)?.input,
|
|
1173
1216
|
agentTaskRecovery,
|
|
1174
1217
|
config,
|
|
1175
|
-
{
|
|
1218
|
+
{
|
|
1219
|
+
parentThreadId,
|
|
1220
|
+
abortSignal: options.abortSignal,
|
|
1221
|
+
onSend: hasUnexpandedPreviousResponse ? ({ model, status, durationMs, usage }) => {
|
|
1222
|
+
const attempts = recoveryAttempts ??= [];
|
|
1223
|
+
const ordinal = (logCtx.attempts?.length ?? 0) + attempts.length + 1;
|
|
1224
|
+
const attempt = beginRequestAttempt(ordinal, OPENAI_CODEX_PROVIDER_ID, model, "openai-responses");
|
|
1225
|
+
noteAttemptSend(attempt, undefined);
|
|
1226
|
+
finishRequestAttempt(attempt, status ?? 502, durationMs, usageFromResponsesPayload(usage));
|
|
1227
|
+
if (status === undefined) {
|
|
1228
|
+
attempt.failureStage = "pre-header";
|
|
1229
|
+
attempt.failureCause = "transport-ambiguous";
|
|
1230
|
+
} else {
|
|
1231
|
+
attributePhysicalAttempt(attempt);
|
|
1232
|
+
}
|
|
1233
|
+
attempts.push(attempt);
|
|
1234
|
+
} : undefined,
|
|
1235
|
+
},
|
|
1176
1236
|
);
|
|
1177
1237
|
recovered = result.recovered;
|
|
1178
1238
|
recoveryFailureReason = result.recovered ? undefined : result.reason;
|
|
@@ -1203,6 +1263,7 @@ export async function prepareResponsesRequest(
|
|
|
1203
1263
|
"_nativeReasoningRetention",
|
|
1204
1264
|
"_cursorIsolateConversation",
|
|
1205
1265
|
"_codexNewHistory",
|
|
1266
|
+
"_proxyOwnedSystemPrompt",
|
|
1206
1267
|
];
|
|
1207
1268
|
for (const key of kept) {
|
|
1208
1269
|
if (parsed[key] !== undefined) {
|
|
@@ -1329,6 +1390,7 @@ export async function prepareResponsesRequest(
|
|
|
1329
1390
|
})();
|
|
1330
1391
|
if (fallback?.refusal) return fallback.refusal;
|
|
1331
1392
|
if (fallback) {
|
|
1393
|
+
if (fallback.to !== fallback.from) subagentFallbackSelected = true;
|
|
1332
1394
|
(logCtx as unknown as Record<string, unknown>).subagentModelFallbackFrom = fallback.from;
|
|
1333
1395
|
(logCtx as unknown as Record<string, unknown>).subagentModelFallbackTo = fallback.to;
|
|
1334
1396
|
if (isInjectionDebugEnabled()) {
|
|
@@ -1441,8 +1503,8 @@ export async function prepareResponsesRequest(
|
|
|
1441
1503
|
}
|
|
1442
1504
|
|
|
1443
1505
|
// The canonical ChatGPT backend rejects previous_response_id, so a local replay miss leaves no
|
|
1444
|
-
// safe way to recover the omitted history. Fail before
|
|
1445
|
-
//
|
|
1506
|
+
// safe way to recover the omitted history. Fail before dispatching the continuation itself
|
|
1507
|
+
// instead of stripping the id and silently forwarding a context-free delta (#702).
|
|
1446
1508
|
// Codex recognizes previous_response_not_found on WebSocket errors and reconnects with its
|
|
1447
1509
|
// full input. A generic invalid_request_error instead terminates the task after cache expiry.
|
|
1448
1510
|
if (
|
|
@@ -1450,9 +1512,18 @@ export async function prepareResponsesRequest(
|
|
|
1450
1512
|
&& isCanonicalOpenAiForwardProvider(route.provider)
|
|
1451
1513
|
) {
|
|
1452
1514
|
markLinkTurnMissing(logCtx);
|
|
1515
|
+
const code = "previous_response_not_found";
|
|
1516
|
+
logCtx.provider = route.providerName;
|
|
1517
|
+
logCtx.model = route.modelId;
|
|
1518
|
+
logCtx.errorCode = code;
|
|
1519
|
+
// A recovery send already finished on its own model and status. Keep it off activeAttempt,
|
|
1520
|
+
// which the log finalizer stamps with the continuation's terminal outcome.
|
|
1521
|
+
if (recoveryAttempts) (logCtx.attempts ??= []).push(...recoveryAttempts);
|
|
1522
|
+
if (logCtx.attempts?.some(attempt => attempt.sendCount > 0)) logCtx.terminalSource = "synthetic";
|
|
1523
|
+
else markLocalRequestLogRefusal(logCtx, code);
|
|
1453
1524
|
return markProxyError(formatErrorResponse(
|
|
1454
1525
|
400,
|
|
1455
|
-
|
|
1526
|
+
code,
|
|
1456
1527
|
"Continuation state is unavailable or corrupt; resend the full conversation without previous_response_id.",
|
|
1457
1528
|
));
|
|
1458
1529
|
}
|
|
@@ -1507,7 +1578,7 @@ export async function prepareResponsesRequest(
|
|
|
1507
1578
|
try {
|
|
1508
1579
|
assertPolicyNormalizedRoute(policyScope, admittedPolicyRoute, route);
|
|
1509
1580
|
const copilotNegotiationPending = route.providerName === "github-copilot" && route.provider.authMode !== "forward";
|
|
1510
|
-
if (!copilotNegotiationPending && route.provider.adapter === "openai-chat"
|
|
1581
|
+
if (!options.anthropicHostedAdvisorSelection && !copilotNegotiationPending && route.provider.adapter === "openai-chat"
|
|
1511
1582
|
&& !chatCanPreserveMandatoryToolChoice(parsed._rawBody, route.provider, route.modelId, parsed.context.tools ?? [])) {
|
|
1512
1583
|
// Combo children carry the refusal's local identity too, so a compatible sibling target
|
|
1513
1584
|
// can still be tried; a direct request keeps the client-facing 400 below.
|
|
@@ -1536,15 +1607,24 @@ export async function prepareResponsesRequest(
|
|
|
1536
1607
|
if (!routeAllowedByScope(admissionScope, scopedDestination)) {
|
|
1537
1608
|
return admissionModelDeniedResponse(projectAdmissionModelDeniedLog(new AdmissionModelDeniedError(inboundSelector, scopedDestination), logCtx));
|
|
1538
1609
|
}
|
|
1539
|
-
// A typed Advisor runs its own model server-side on this provider (#8448).
|
|
1540
|
-
//
|
|
1610
|
+
// A typed Advisor runs its own model server-side on this provider (#8448). An out-of-scope
|
|
1611
|
+
// declaration is withheld. A named selection also needs that declaration on the final route.
|
|
1541
1612
|
const serverTools = parsed._anthropicServerTools;
|
|
1542
|
-
const scopedServerTools =
|
|
1543
|
-
!nativeMessagesToolScopeDenial(admissionScope, route.providerName, route.modelId, { tools: [tool] }));
|
|
1613
|
+
const scopedServerTools = scopedAnthropicServerTools(admissionScope, route, serverTools);
|
|
1544
1614
|
if (serverTools && scopedServerTools && scopedServerTools.length !== serverTools.length) {
|
|
1545
1615
|
parsed._anthropicServerTools = scopedServerTools;
|
|
1546
1616
|
if (advisorServerToolDestination(route.provider)) addProtocolEntryReason(logCtx, "advisor-tool-outside-model-scope");
|
|
1547
1617
|
}
|
|
1618
|
+
if (options.anthropicHostedAdvisorSelection) {
|
|
1619
|
+
if (options.anthropicHostedAdvisorSelection === "ambiguous") {
|
|
1620
|
+
return markProxyError(formatErrorResponse(400, "invalid_request_error",
|
|
1621
|
+
"The hosted Advisor tool_choice is ambiguous because multiple tools are named advisor."));
|
|
1622
|
+
}
|
|
1623
|
+
if (!admitsHostedAdvisor(route.provider, scopedServerTools, parsed.context.tools)) {
|
|
1624
|
+
return markPolicyCandidateRefusal(markProxyError(formatErrorResponse(400, "invalid_request_error",
|
|
1625
|
+
"The selected hosted Advisor tool is unavailable for this route or model scope.")));
|
|
1626
|
+
}
|
|
1627
|
+
}
|
|
1548
1628
|
// Attribute local auth/cooldown failures to the public selector too; exact auth may fail before
|
|
1549
1629
|
// the normal post-resolution provider label is assigned.
|
|
1550
1630
|
if (route.codexAccountNamespace) {
|
|
@@ -1589,7 +1669,7 @@ export async function prepareResponsesRequest(
|
|
|
1589
1669
|
// A combo child is the one caller that can afford a strict gate: skipping a target it
|
|
1590
1670
|
// cannot fit is safe before any upstream bytes are sent, and the ladder continues. A
|
|
1591
1671
|
// direct request has nowhere to go, so it keeps the loose pathological-input gate.
|
|
1592
|
-
const inputAdmission = options.comboAttempt
|
|
1672
|
+
const inputAdmission = options.comboAttempt && options.comboContextDegraded !== true
|
|
1593
1673
|
? checkComboTargetInputAdmission(parsed, route.provider, route.providerName, parsed.modelId, nativeContextLimits(config))
|
|
1594
1674
|
: checkInputAdmission(parsed, route.provider, route.providerName, parsed.modelId, nativeContextLimits(config));
|
|
1595
1675
|
if (!inputAdmission.admitted) {
|
|
@@ -1734,6 +1814,7 @@ export async function prepareResponsesRequest(
|
|
|
1734
1814
|
subagentFallbackAccountId = value;
|
|
1735
1815
|
},
|
|
1736
1816
|
subagentQuotaFailureModel,
|
|
1817
|
+
subagentFallbackSelected,
|
|
1737
1818
|
poolAffinityKey,
|
|
1738
1819
|
clientRequestedStream,
|
|
1739
1820
|
substituteMainCredential,
|