@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
|
@@ -1,15 +1,19 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { advisorPlanRootConfig } from "./advisor-plan-slot";
|
|
2
|
+
import { admitsHostedAdvisor, scopedAnthropicServerTools } from "../messages-native-scope";
|
|
3
|
+
import { selectResponseReplayOwner } from "./replay-owner";
|
|
2
4
|
import { isPlaintextV2AgentMessagesEnabled } from "../../config/multi-agent-surface";
|
|
3
5
|
import { comboLogLabel, comboTargetLogLabel } from "../../combos/resolve";
|
|
4
6
|
import { clientFacingModelLabel, clientFacingModelText } from "../../lib/error-destination";
|
|
5
|
-
import { projectLocalModelRefusalLog } from "../request-log-failure-detail";
|
|
6
|
-
import { carryProxyErrorContext, hasProxyErrorMessage, markProxyError } from "../../lib/client-error-body";
|
|
7
|
+
import { carryLocalFailureState, projectLocalModelRefusalLog, upstreamErrorIsLocal } from "../request-log-failure-detail";
|
|
8
|
+
import { carryProxyErrorContext, hasProxyErrorMessage, isPausedTurn, markProxyError, rememberPausedTurn } from "../../lib/client-error-body";
|
|
9
|
+
import { isXaiPrivacyModeRefusal } from "../../providers/xai-privacy-mode";
|
|
7
10
|
import { classifyUpstreamCondition } from "../../lib/upstream-condition";
|
|
8
11
|
import { effectiveAzureOutputBudget } from "../../adapters/azure";
|
|
12
|
+
import { resolveOutputCeiling } from "./input-admission";
|
|
9
13
|
import { buildResponsesTransport } from "../../adapters/openai-responses/transport";
|
|
10
14
|
import { isMetaAiResponsesDestination } from "../../responses/muse-tool-name-alias";
|
|
11
15
|
import { chatCanPreserveMandatoryToolChoice, hasMandatoryToolChoice } from "./combo-required-tool-contract";
|
|
12
|
-
import { isPolicyCandidateRefusal, isMandatoryToolChoiceRefusal } from "./policy-request-scope";
|
|
16
|
+
import { isComboVisionDescriptionRefusal, isPolicyCandidateRefusal, isMandatoryToolChoiceRefusal } from "./policy-request-scope";
|
|
13
17
|
import { isCodexAccountCooldownResponse } from "../../codex/account-cooldown-response";
|
|
14
18
|
import { resolveWireProtocolOverride } from "../adapter-resolve";
|
|
15
19
|
import { parseSyntheticRowId } from "../fast-row";
|
|
@@ -21,7 +25,7 @@ import {
|
|
|
21
25
|
isDeclaredReasoningEffort,
|
|
22
26
|
resolveEffortAtOrBelow,
|
|
23
27
|
} from "../../reasoning-effort";
|
|
24
|
-
import { admissionMayUseMeteredComboTargets, resolveAdmissionModelScope, routeAllowedByScope } from "../admission-model-scope";
|
|
28
|
+
import { admissionMayUseMeteredComboTargets, admissionModelDeniedResponse, AdmissionModelDeniedError, intersectAdmissionModelScopes, projectAdmissionModelDeniedLog, resolveAdmissionModelScope, routeAllowedByScope } from "../admission-model-scope";
|
|
25
29
|
import { recordAttemptRequestedEffort } from "../request-log";
|
|
26
30
|
import { bindLinkTurnChild, failLinkTurnExpansion, markLinkTurnMissing, observeLinkTurnExpansion } from "../link-turn";
|
|
27
31
|
import {
|
|
@@ -44,7 +48,6 @@ import {
|
|
|
44
48
|
pickComboTargetWithWait,
|
|
45
49
|
targetKey,
|
|
46
50
|
concreteComboRequestBody,
|
|
47
|
-
comboDefaultEffort,
|
|
48
51
|
isComboTargetInCooldown,
|
|
49
52
|
snapshotComboQuotaCooldowns,
|
|
50
53
|
comboExclusion,
|
|
@@ -73,6 +76,10 @@ import {
|
|
|
73
76
|
} from "../../responses/state";
|
|
74
77
|
import { hasUnreadableEncryptedAgentTask } from "./encrypted-payload";
|
|
75
78
|
import { eagerCodexToolCatalogSurface, warnEagerCodexToolCatalog } from "./codex-tool-catalog";
|
|
79
|
+
import { clampComboCallerEffort, comboCapabilityGate } from "../../combos/request-capability";
|
|
80
|
+
import { comboAdvertisesEffortUnion } from "../../combos/capability-policy";
|
|
81
|
+
import { requestStartComboConfig, snapshotComboAdmission, snapshotComboAdmissionProvider } from "./combo-admission-snapshot";
|
|
82
|
+
import { canDescribeComboImages } from "./request-sidecar-auth";
|
|
76
83
|
import { captureRouteStaticPolicy, routeConcreteModel, comboRouteDecisionTrace } from "../../router";
|
|
77
84
|
import { memoryModelRouteReason } from "./memory-models";
|
|
78
85
|
import { baseProviderLabel, poolAccountProviderLabel } from "../../providers/label";
|
|
@@ -120,6 +127,7 @@ import {
|
|
|
120
127
|
import type { CodexAuthContext } from "../../codex/auth-context";
|
|
121
128
|
import type { ResponsesTerminalStatus } from "../../bridge";
|
|
122
129
|
import { beginRequestAttempt, sealRequestAttemptIdentity, finishRequestAttempt } from "../request-log";
|
|
130
|
+
import { sealedCredentialRefusals } from "../request-log-attempt-recovery";
|
|
123
131
|
import { recallComboTurnEffortForLane, rememberComboForLane, type ComboTurnEffort } from "./combo-session-recall";
|
|
124
132
|
import { COMBO_TOOL_LOOP_PIN_REASON, toolLoopPinnedPick } from "./combo-tool-loop-pin";
|
|
125
133
|
import { JEV_SESSION_PIN_ROUTE_REASON, jevSessionPinScope } from "./jev-session-pin";
|
|
@@ -418,6 +426,13 @@ export async function executeComboResponses(
|
|
|
418
426
|
if (!combo) {
|
|
419
427
|
return formatErrorResponse(404, "invalid_request_error", "Unknown combo");
|
|
420
428
|
}
|
|
429
|
+
// Admission reads one detached copy of the request-start config. Mid-request edits to
|
|
430
|
+
// capabilities, sidecars, protocols or the roster apply to the next request. Only spend
|
|
431
|
+
// authority is read live, from the root config that management writes replace.
|
|
432
|
+
const admissionSnapshot = snapshotComboAdmission(config, comboId);
|
|
433
|
+
// Every image probe and the child it admits plan with these request-start sidecar settings.
|
|
434
|
+
const comboVisionSidecar = { settings: admissionSnapshot.vision };
|
|
435
|
+
const liveConfig = advisorPlanRootConfig(config);
|
|
421
436
|
// Resolve against the original request once; every bridge candidate receives the same trusted
|
|
422
437
|
// result after its provisional Authorization is removed, including an explicitly keyless result.
|
|
423
438
|
const replayPrincipal = options.replayPrincipal
|
|
@@ -426,6 +441,9 @@ export async function executeComboResponses(
|
|
|
426
441
|
// internal request carries the caller's captured scope on options.admissionScope even though
|
|
427
442
|
// its own admission is the host's broad key; recomputing from options.admission would lose it.
|
|
428
443
|
const admissionScope = options.admissionScope ?? resolveAdmissionModelScope(config, options.admission);
|
|
444
|
+
// Every paid send also needs the key's current scope: a narrowed key never widens back.
|
|
445
|
+
const currentAdmissionScope = () => intersectAdmissionModelScopes(admissionScope,
|
|
446
|
+
resolveAdmissionModelScope(liveConfig, options.admission));
|
|
429
447
|
// Present only when an opted-in ingress supplied a native source; otherwise every child
|
|
430
448
|
// takes the bridge below exactly as before.
|
|
431
449
|
const protocolLanes = createComboProtocolLanes({
|
|
@@ -452,7 +470,7 @@ export async function executeComboResponses(
|
|
|
452
470
|
const inboundClientThreadId = req.headers.get("x-codex-parent-thread-id")?.trim() || undefined;
|
|
453
471
|
const inboundOwnThreadId = req.headers.get("thread-id")?.trim() || undefined;
|
|
454
472
|
const strictReplay = options.plaintextV2Decision ?? isPlaintextV2AgentMessagesEnabled(config);
|
|
455
|
-
const replayOwnerKey = strictReplay
|
|
473
|
+
const { replayOwnerKey, replayConnectionScope } = selectResponseReplayOwner(strictReplay, replayPrincipal.clientPrincipalId, inboundOwnThreadId, options);
|
|
456
474
|
const body = expandPreviousResponseInput(rawBody, strictReplay ? inboundOwnThreadId : inboundClientThreadId, replayOwnerKey);
|
|
457
475
|
const replayFailure = previousResponseReplayFailure(body);
|
|
458
476
|
if (replayFailure?.reason === "scope_mismatch") {
|
|
@@ -480,17 +498,11 @@ export async function executeComboResponses(
|
|
|
480
498
|
// children replay a snapshot and skip theirs.
|
|
481
499
|
observeLinkTurnExpansion(options.linkTurn, req, logCtx, body,
|
|
482
500
|
requestedPreviousId.trim().length > 0 ? (unresolvedPrevious ? "unexpanded" : "chained") : "none");
|
|
483
|
-
|
|
484
|
-
|
|
485
|
-
|
|
486
|
-
|
|
487
|
-
|
|
488
|
-
"Continuation state is unavailable or corrupt; resend the full conversation without previous_response_id.",
|
|
489
|
-
);
|
|
490
|
-
}
|
|
491
|
-
if (combo.imageInput === "disabled" && comboRequestHasImageInput(body)) {
|
|
492
|
-
return formatErrorResponse(400, "invalid_request_error", "This combo does not accept image input");
|
|
493
|
-
}
|
|
501
|
+
// Live metered consent, checked before every paid send.
|
|
502
|
+
const maySpendOnTarget = (target: (typeof combo.targets)[number]): boolean =>
|
|
503
|
+
!target.metered || admissionMayUseMeteredComboTargets(liveConfig, options.admission, liveConfig.combos?.[comboId]);
|
|
504
|
+
const mayUseTarget = (target: (typeof combo.targets)[number]): boolean =>
|
|
505
|
+
maySpendOnTarget(target) && (combo.strategy !== "jev" || target.provider !== JEV_PROVIDER_ID);
|
|
494
506
|
// The combo ladder owns the whole logical request, so the catalog diagnostic is counted here for
|
|
495
507
|
// combo-routed turns; children run as concrete selections and would otherwise never report it.
|
|
496
508
|
// Counting after the replay expansion keeps restored history out of the tally.
|
|
@@ -561,6 +573,7 @@ export async function executeComboResponses(
|
|
|
561
573
|
activeAttempt: undefined,
|
|
562
574
|
activeAttemptStartedAt: undefined,
|
|
563
575
|
});
|
|
576
|
+
carryLocalFailureState(childLog, logCtx);
|
|
564
577
|
if (requestedModel !== responseModel) {
|
|
565
578
|
projectLocalModelRefusalLog(logCtx, clientModelLabel);
|
|
566
579
|
logCtx.model = responseModel; logCtx.requestedModel = responseModel;
|
|
@@ -584,7 +597,6 @@ export async function executeComboResponses(
|
|
|
584
597
|
let comboPayloadReadable = false;
|
|
585
598
|
const payloadEligible = (target: (typeof combo.targets)[number]): boolean =>
|
|
586
599
|
comboPayloadReadable || !unreadableEncryptedAgentTask || canDecryptUnreadableAgentTask(target);
|
|
587
|
-
const meteredAllowed = admissionMayUseMeteredComboTargets(config, options.admission, combo);
|
|
588
600
|
const museToolEligible = (target: (typeof combo.targets)[number]): boolean => {
|
|
589
601
|
if (!hasMandatoryToolChoice(body)) return true;
|
|
590
602
|
try {
|
|
@@ -611,13 +623,78 @@ export async function executeComboResponses(
|
|
|
611
623
|
// (provider state, quota, live cooldowns) keeps precedence, exactly as in the readable reasons.
|
|
612
624
|
const unsupportedToolChoice = (attempted: number) => comboUnavailableDiagnostics(combo.targets.length, attempted,
|
|
613
625
|
combo.targets.map(target => comboTargetUnavailableCause(config, comboId, target, museToolEligible) ?? "unsupported"));
|
|
614
|
-
|
|
615
|
-
|
|
616
|
-
(meteredAllowed || !target.metered)
|
|
617
|
-
&& (combo.strategy !== "jev" || target.provider !== JEV_PROVIDER_ID)
|
|
626
|
+
const capabilityCandidate = (target: (typeof combo.targets)[number]): boolean =>
|
|
627
|
+
mayUseTarget(target)
|
|
618
628
|
&& museToolEligible(target)
|
|
619
629
|
&& reasoningReplayEligible(target)
|
|
620
630
|
&& (protocolLanes?.pickable(target) ?? true);
|
|
631
|
+
const unservableImageResponse = (): Response =>
|
|
632
|
+
markProxyError(formatErrorResponse(400, "invalid_request_error", "No target of this combo can accept image input"));
|
|
633
|
+
const warnComboImageOmission = (): void =>
|
|
634
|
+
console.warn("[opencodex] combo has no image-capable target; images will be omitted");
|
|
635
|
+
const resolveCapabilityRoute = (target: Pick<(typeof combo.targets)[number], "provider" | "model">) => {
|
|
636
|
+
try {
|
|
637
|
+
const route = routeConcreteModel(config, `${target.provider}/${target.model}`);
|
|
638
|
+
const provider = resolveWireProtocolOverride(route.providerName, route.modelId, route.provider, options.inboundWire);
|
|
639
|
+
return { ...route, provider };
|
|
640
|
+
} catch { return undefined; }
|
|
641
|
+
};
|
|
642
|
+
const admitCombo = async () => {
|
|
643
|
+
if (combo.imageInput === "disabled" && unresolvedPrevious) {
|
|
644
|
+
markLinkTurnMissing(logCtx);
|
|
645
|
+
return formatErrorResponse(
|
|
646
|
+
400,
|
|
647
|
+
"previous_response_not_found",
|
|
648
|
+
"Continuation state is unavailable or corrupt; resend the full conversation without previous_response_id.",
|
|
649
|
+
);
|
|
650
|
+
}
|
|
651
|
+
if (combo.imageInput === "disabled" && comboRequestHasImageInput(body)) {
|
|
652
|
+
return formatErrorResponse(400, "invalid_request_error", "This combo does not accept image input");
|
|
653
|
+
}
|
|
654
|
+
const metadata = {
|
|
655
|
+
providers: admissionSnapshot.providers,
|
|
656
|
+
customModels: admissionSnapshot.customModels,
|
|
657
|
+
providerContextCaps: admissionSnapshot.providerContextCaps,
|
|
658
|
+
visionSidecar: admissionSnapshot.vision,
|
|
659
|
+
};
|
|
660
|
+
const capability = await comboCapabilityGate(metadata, combo, body,
|
|
661
|
+
target => {
|
|
662
|
+
const route = resolveCapabilityRoute(target);
|
|
663
|
+
return route && {
|
|
664
|
+
providerName: route.providerName, modelId: route.modelId, codexAccountId: route.codexAccountId,
|
|
665
|
+
provider: snapshotComboAdmissionProvider(route.provider),
|
|
666
|
+
};
|
|
667
|
+
},
|
|
668
|
+
(target, route, parsed) => capabilityCandidate(target)
|
|
669
|
+
&& (!admissionScope || !!route && routeAllowedByScope(admissionScope, route))
|
|
670
|
+
&& (options.anthropicHostedAdvisorSelection !== "selected" || !!route && admitsHostedAdvisor(
|
|
671
|
+
route.provider, scopedAnthropicServerTools(admissionScope, route, options.anthropicServerTools), parsed?.context.tools,
|
|
672
|
+
)),
|
|
673
|
+
(route, parsed) => canDescribeComboImages(
|
|
674
|
+
{ config, req, options: { ...options, admissionScope, comboVisionSidecar } }, route, parsed));
|
|
675
|
+
if (capability.unservable === "audio") {
|
|
676
|
+
return formatErrorResponse(400, "invalid_request_error", "No target of this combo can accept audio input");
|
|
677
|
+
}
|
|
678
|
+
if (capability.unservable && combo.onUnservable === "reject") {
|
|
679
|
+
return capability.unservable === "context"
|
|
680
|
+
? formatErrorResponse(400, "invalid_request_error", "No target of this combo has a context window large enough for this request")
|
|
681
|
+
: unservableImageResponse();
|
|
682
|
+
}
|
|
683
|
+
return capability;
|
|
684
|
+
};
|
|
685
|
+
const capability = await admitCombo();
|
|
686
|
+
if (capability instanceof Response) return capability;
|
|
687
|
+
if (capability.unservable === "image") warnComboImageOmission();
|
|
688
|
+
if (capability.unservable === "context") console.warn("[opencodex] combo has no target whose context window fits; sending to the largest");
|
|
689
|
+
const visionRejectedTargets = new Set<string>();
|
|
690
|
+
let omittingImages = capability.unservable === "image";
|
|
691
|
+
const useImageDegradation = (target: (typeof combo.targets)[number]): boolean =>
|
|
692
|
+
payloadEligible(target) && capabilityCandidate(target) && capability.imageDegradationEligible(target);
|
|
693
|
+
// Recovery can replace unreadable encrypted input, but cannot relax other admission checks.
|
|
694
|
+
const recoveryEligible = (target: (typeof combo.targets)[number]): boolean =>
|
|
695
|
+
capabilityCandidate(target) && (omittingImages && capability.unservable !== "image"
|
|
696
|
+
? capability.imageDegradationEligible(target)
|
|
697
|
+
: !visionRejectedTargets.has(targetKey(target)) && capability.eligible(target));
|
|
621
698
|
const targetEligible = (target: (typeof combo.targets)[number]): boolean =>
|
|
622
699
|
payloadEligible(target) && recoveryEligible(target);
|
|
623
700
|
const onlyReplayIncompatibleTargetsRemain = (excluded: Iterable<string> = []): boolean => {
|
|
@@ -692,7 +769,7 @@ export async function executeComboResponses(
|
|
|
692
769
|
...pickOptions,
|
|
693
770
|
// Every pick, including the recovery picks that skip `targetEligible`, keeps metered
|
|
694
771
|
// targets away from callers that may not spend on them.
|
|
695
|
-
eligible: target => (
|
|
772
|
+
eligible: target => maySpendOnTarget(target) && (pickOptions.eligible?.(target) ?? true),
|
|
696
773
|
waitForCooldownMs: combo.waitForCooldownMs,
|
|
697
774
|
abortSignal: options.abortSignal,
|
|
698
775
|
});
|
|
@@ -705,7 +782,7 @@ export async function executeComboResponses(
|
|
|
705
782
|
comboId,
|
|
706
783
|
lane: sessionLaneIdFromRequest(req.headers),
|
|
707
784
|
body,
|
|
708
|
-
eligible: target => (
|
|
785
|
+
eligible: target => maySpendOnTarget(target) && targetEligible(target),
|
|
709
786
|
now: initialNow,
|
|
710
787
|
});
|
|
711
788
|
let pick = toolLoopPin ?? await pickWithWait({
|
|
@@ -795,8 +872,22 @@ export async function executeComboResponses(
|
|
|
795
872
|
pendingHopCommit = proactive.commit;
|
|
796
873
|
}
|
|
797
874
|
let jevDecision: JevDecision | undefined;
|
|
875
|
+
let failedPinEffortDecision: JevDecision | undefined;
|
|
798
876
|
if (combo.strategy === "jev" && !toolLoopPin) {
|
|
799
|
-
|
|
877
|
+
// Live spend authority only: consent and the key's current scope.
|
|
878
|
+
const spendAllowed = (scope: typeof admissionScope) => (target: (typeof combo.targets)[number]): boolean => {
|
|
879
|
+
if (!maySpendOnTarget(target)) return false;
|
|
880
|
+
if (!scope) return true;
|
|
881
|
+
try {
|
|
882
|
+
return routeAllowedByScope(scope, routeConcreteModel(config, `${target.provider}/${target.model}`));
|
|
883
|
+
} catch {
|
|
884
|
+
return false;
|
|
885
|
+
}
|
|
886
|
+
};
|
|
887
|
+
// The decision call is a paid send: offer only members that live consent and scope still admit.
|
|
888
|
+
const decisionScope = currentAdmissionScope();
|
|
889
|
+
const choices = eligibleJevComboChoices(config, comboId,
|
|
890
|
+
target => targetEligible(target) && spendAllowed(decisionScope)(target), Date.now(), pick.cooldownReprobeTargets);
|
|
800
891
|
const first = choices[0];
|
|
801
892
|
if (!first) {
|
|
802
893
|
return comboUnavailable(comboId, undefined, comboExclusion(config, comboId, target =>
|
|
@@ -815,16 +906,14 @@ export async function executeComboResponses(
|
|
|
815
906
|
choices.map(choice => choice.candidate),
|
|
816
907
|
combo.decisionQuotaSignals === true ? { config, tiers: combo.decisionQuotaTiers } : undefined,
|
|
817
908
|
);
|
|
818
|
-
|
|
819
|
-
|
|
820
|
-
else try {
|
|
821
|
-
decision = await resolveJevComboDecision({
|
|
909
|
+
const decide = (candidates: JevCandidate[], fallbackDecision: Pick<JevDecision, "targetKey" | "effort">) =>
|
|
910
|
+
resolveJevComboDecision({
|
|
822
911
|
body,
|
|
823
|
-
candidates
|
|
824
|
-
fallback,
|
|
912
|
+
candidates,
|
|
913
|
+
fallback: fallbackDecision,
|
|
825
914
|
config,
|
|
826
915
|
isDestinationAllowed: (providerName, modelId) => routeAllowedByScope(
|
|
827
|
-
|
|
916
|
+
decisionScope, { providerName, modelId },
|
|
828
917
|
),
|
|
829
918
|
...(combo.decisionQuotaSignals === true ? { decisionQuotaSignals: true, decisionQuotaTiers: combo.decisionQuotaTiers } : {}),
|
|
830
919
|
...(combo.decisionProvider ? { decisionProvider: combo.decisionProvider } : {}),
|
|
@@ -834,7 +923,7 @@ export async function executeComboResponses(
|
|
|
834
923
|
invokeModel: createJevModelInvoker({
|
|
835
924
|
req,
|
|
836
925
|
config,
|
|
837
|
-
options: { ...options, admissionScope },
|
|
926
|
+
options: { ...options, admissionScope: decisionScope },
|
|
838
927
|
handleResponses: requestDispatchers.handleResponses,
|
|
839
928
|
}),
|
|
840
929
|
}
|
|
@@ -842,6 +931,40 @@ export async function executeComboResponses(
|
|
|
842
931
|
...(combo.decisionTimeoutMs !== undefined ? { timeoutMs: combo.decisionTimeoutMs } : {}),
|
|
843
932
|
signal: options.abortSignal,
|
|
844
933
|
});
|
|
934
|
+
let decision: JevDecision;
|
|
935
|
+
let awaitedPinEffort = false;
|
|
936
|
+
if (pinReuse?.decision) {
|
|
937
|
+
const pinned = pinReuse.decision;
|
|
938
|
+
decision = pinned;
|
|
939
|
+
// `effort: "per-turn"` keeps the pinned target and asks only for its effort, offering the
|
|
940
|
+
// pinned target alone. Anything but an applied answer for that target keeps the pinned effort.
|
|
941
|
+
const pinnedChoice = combo.sessionPin?.effort === "per-turn" && combo.jevEffortMode !== "client"
|
|
942
|
+
? choices.find(choice => choice.candidate.key === pinned.targetKey)
|
|
943
|
+
: undefined;
|
|
944
|
+
if (pinnedChoice && pinnedChoice.candidate.reasoningEfforts.length > 1) {
|
|
945
|
+
awaitedPinEffort = true;
|
|
946
|
+
decision = { ...pinned, pinReason: "session_effort" };
|
|
947
|
+
const fallback = { targetKey: pinned.targetKey, effort: pinned.effort };
|
|
948
|
+
try {
|
|
949
|
+
const effortDecision = await decide([pinnedChoice.candidate], fallback);
|
|
950
|
+
if (effortDecision.gate === "apply" && effortDecision.targetKey === pinned.targetKey) {
|
|
951
|
+
decision = { ...effortDecision, pinned: true, pinReason: "session_effort" };
|
|
952
|
+
} else {
|
|
953
|
+
failedPinEffortDecision = {
|
|
954
|
+
...effortDecision, ...fallback,
|
|
955
|
+
gate: effortDecision.gate === "apply" ? "invalid" : effortDecision.gate,
|
|
956
|
+
};
|
|
957
|
+
}
|
|
958
|
+
} catch {
|
|
959
|
+
if (options.abortSignal?.aborted) return clientCancelledResponse();
|
|
960
|
+
failedPinEffortDecision = {
|
|
961
|
+
...fallback, backend: jevDecisionBackendFor(combo), gate: "network",
|
|
962
|
+
latencyMs: Math.max(0, Date.now() - decisionStartedAt),
|
|
963
|
+
};
|
|
964
|
+
}
|
|
965
|
+
}
|
|
966
|
+
} else try {
|
|
967
|
+
decision = await decide(choices.map(choice => choice.candidate), fallback);
|
|
845
968
|
} catch (error) {
|
|
846
969
|
if (options.abortSignal?.aborted) return clientCancelledResponse();
|
|
847
970
|
decision = {
|
|
@@ -852,11 +975,42 @@ export async function executeComboResponses(
|
|
|
852
975
|
};
|
|
853
976
|
}
|
|
854
977
|
let selected = choices.find(choice => choice.candidate.key === decision.targetKey) ?? first;
|
|
978
|
+
const recordDecision = (observedDecision: JevDecision) => logCtx.jevDecision = !options.clientModelLabel || requestedModel === responseModel ? normalizePersistedJevDecision({
|
|
979
|
+
version: 1,
|
|
980
|
+
comboId,
|
|
981
|
+
selected: {
|
|
982
|
+
provider: selected.pick.target.provider,
|
|
983
|
+
model: selected.pick.target.model,
|
|
984
|
+
effort: decision.effort,
|
|
985
|
+
},
|
|
986
|
+
gate: observedDecision.gate,
|
|
987
|
+
latencyMs: observedDecision.latencyMs,
|
|
988
|
+
backend: observedDecision.backend,
|
|
989
|
+
...(observedDecision.confidence !== undefined ? { confidence: observedDecision.confidence } : {}),
|
|
990
|
+
...(observedDecision.chosenProbability !== undefined
|
|
991
|
+
? { chosenProbability: observedDecision.chosenProbability }
|
|
992
|
+
: {}),
|
|
993
|
+
...(observedDecision.usage ? { usage: observedDecision.usage } : {}),
|
|
994
|
+
...(observedDecision.quota ? { quota: observedDecision.quota } : {}),
|
|
995
|
+
...(decision.pinned ? { pinned: true } : {}),
|
|
996
|
+
...(decision.pinReason ? { pinReason: decision.pinReason } : {}),
|
|
997
|
+
}) : undefined;
|
|
855
998
|
let selectionUnavailable = false;
|
|
856
|
-
if (pick.cooldownReprobeTargets && !options.abortSignal?.aborted) {
|
|
857
|
-
//
|
|
858
|
-
|
|
859
|
-
|
|
999
|
+
if ((!pinReuse?.decision || pick.cooldownReprobeTargets || awaitedPinEffort) && !options.abortSignal?.aborted) {
|
|
1000
|
+
// Record the paid decision before anything below can refuse or throw.
|
|
1001
|
+
recordDecision(failedPinEffortDecision ?? decision);
|
|
1002
|
+
// The decided choices were admitted against the request-start snapshot. Recheck only what
|
|
1003
|
+
// can change their spend: availability (cooldowns, reprobe reservations), live consent and
|
|
1004
|
+
// the key's current scope. Capability edits made meanwhile apply to the next request.
|
|
1005
|
+
let currentChoices: typeof choices;
|
|
1006
|
+
try {
|
|
1007
|
+
const available = new Set(eligibleJevComboChoices(requestStartComboConfig(config, comboId, admissionSnapshot.rawCombo),
|
|
1008
|
+
comboId, spendAllowed(currentAdmissionScope()), Date.now(), pick.cooldownReprobeTargets)
|
|
1009
|
+
.map(choice => choice.candidate.key));
|
|
1010
|
+
currentChoices = choices.filter(choice => available.has(choice.candidate.key));
|
|
1011
|
+
} catch {
|
|
1012
|
+
return options.abortSignal?.aborted ? clientCancelledResponse() : comboUnavailable(comboId);
|
|
1013
|
+
}
|
|
860
1014
|
const current = currentChoices.find(choice => choice.candidate.key === decision.targetKey
|
|
861
1015
|
&& (decision.effort === null ? choice.candidate.reasoningEfforts.length === 0
|
|
862
1016
|
: choice.candidate.reasoningEfforts.includes(decision.effort)));
|
|
@@ -878,38 +1032,21 @@ export async function executeComboResponses(
|
|
|
878
1032
|
if (pinReuse?.released) decision = { ...decision, pinReason: pinReuse.released };
|
|
879
1033
|
jevDecision = decision;
|
|
880
1034
|
pick = { ...selected.pick, attempted: [targetKey(selected.pick.target)] };
|
|
881
|
-
|
|
882
|
-
|
|
883
|
-
|
|
884
|
-
selected: {
|
|
885
|
-
provider: selected.pick.target.provider,
|
|
886
|
-
model: selected.pick.target.model,
|
|
887
|
-
effort: decision.effort,
|
|
888
|
-
},
|
|
889
|
-
gate: decision.gate,
|
|
890
|
-
latencyMs: decision.latencyMs,
|
|
891
|
-
backend: decision.backend,
|
|
892
|
-
...(decision.confidence !== undefined ? { confidence: decision.confidence } : {}),
|
|
893
|
-
...(decision.chosenProbability !== undefined
|
|
894
|
-
? { chosenProbability: decision.chosenProbability }
|
|
895
|
-
: {}),
|
|
896
|
-
...(decision.usage ? { usage: decision.usage } : {}),
|
|
897
|
-
...(decision.quota ? { quota: decision.quota } : {}),
|
|
898
|
-
...(decision.pinned ? { pinned: true } : {}),
|
|
899
|
-
...(decision.pinReason ? { pinReason: decision.pinReason } : {}),
|
|
900
|
-
}) : undefined;
|
|
1035
|
+
// Keep effort-call telemetry and take pin attribution from the final selection.
|
|
1036
|
+
const observedDecision = failedPinEffortDecision ?? decision;
|
|
1037
|
+
recordDecision(observedDecision);
|
|
901
1038
|
console.debug("[combo] JEV decision", {
|
|
902
|
-
backend:
|
|
1039
|
+
backend: observedDecision.backend,
|
|
903
1040
|
target: comboTargetLogLabel(config, comboId, pick.target),
|
|
904
1041
|
effort: decision.effort,
|
|
905
|
-
gate:
|
|
906
|
-
latencyMs:
|
|
1042
|
+
gate: observedDecision.gate,
|
|
1043
|
+
latencyMs: observedDecision.latencyMs,
|
|
907
1044
|
...(decision.pinReason ? { pinReason: decision.pinReason } : {}),
|
|
908
|
-
...(
|
|
909
|
-
...(
|
|
910
|
-
? { chosenProbability:
|
|
1045
|
+
...(observedDecision.confidence !== undefined ? { confidence: observedDecision.confidence } : {}),
|
|
1046
|
+
...(observedDecision.chosenProbability !== undefined
|
|
1047
|
+
? { chosenProbability: observedDecision.chosenProbability }
|
|
911
1048
|
: {}),
|
|
912
|
-
...(
|
|
1049
|
+
...(observedDecision.usage ? { usage: observedDecision.usage } : {}),
|
|
913
1050
|
});
|
|
914
1051
|
// A completed decision belongs to the parent log even if no model can be dispatched.
|
|
915
1052
|
if (selectionUnavailable) {
|
|
@@ -972,26 +1109,33 @@ export async function executeComboResponses(
|
|
|
972
1109
|
let quotaFailure: Response | undefined;
|
|
973
1110
|
let quotaFailedChildLog: RequestLogContext | undefined;
|
|
974
1111
|
let contextFailure: { response: Response; childLog: RequestLogContext } | undefined;
|
|
1112
|
+
let xaiPrivacyFailure: { response: Response; childLog: RequestLogContext } | undefined;
|
|
975
1113
|
// Snapshotted before dispatch: a 401/403 inside this ladder cools its own provider, and that
|
|
976
1114
|
// fresh cooldown is not a reason the request found no target.
|
|
977
1115
|
const quotaCooldownSnapshot = snapshotComboQuotaCooldowns(config, comboId);
|
|
978
1116
|
const exhaustedFailure = (targetsExhausted = false): Response => {
|
|
1117
|
+
const finalize = (response: Response, childLog = lastFailedChildLog): Response => {
|
|
1118
|
+
if (childLog) adoptFailedChildLog(childLog);
|
|
1119
|
+
return response;
|
|
1120
|
+
};
|
|
979
1121
|
if (contextFailure) {
|
|
980
|
-
|
|
981
|
-
return contextFailure.response;
|
|
1122
|
+
return finalize(contextFailure.response, contextFailure.childLog);
|
|
982
1123
|
}
|
|
983
1124
|
if (lastFailure && lastFailureUpstreamCode === "zero_output_token_limit" && zeroOutputLimitFailure) {
|
|
984
1125
|
adoptFailedChildLog(zeroOutputLimitFailure.childLog);
|
|
1126
|
+
// The terminal builder normalizes wire usage even when the child supplied none.
|
|
1127
|
+
logCtx.clientResponseUsage = "synthetic";
|
|
985
1128
|
return wantsStream
|
|
986
1129
|
? streamingIncompleteResponse(responseModel, zeroOutputLimitFailure.usage, "max_output_tokens", options.translatorBudget)
|
|
987
1130
|
: jsonIncompleteResponse(responseModel, zeroOutputLimitFailure.usage, "max_output_tokens");
|
|
988
1131
|
}
|
|
989
|
-
|
|
990
|
-
|
|
991
|
-
|
|
992
|
-
|
|
993
|
-
|
|
994
|
-
if (
|
|
1132
|
+
if (targetsExhausted && toolChoiceRefusalsOnly === true) return finalize(comboUnavailableResponse("No available targets for combo; attempted targets cannot preserve mandatory tool_choice", { diagnostics: unsupportedToolChoice(comboTargetsDispatched) }));
|
|
1133
|
+
if (lastFailure?.status === 429 || lastFailure?.status === 402) return finalize(lastFailure);
|
|
1134
|
+
const privacyOrLastFailure = () => xaiPrivacyFailure
|
|
1135
|
+
? finalize(xaiPrivacyFailure.response, xaiPrivacyFailure.childLog)
|
|
1136
|
+
: finalize(lastFailure!);
|
|
1137
|
+
if (!lastFailure || ![400, 401, 403].includes(lastFailure.status)) return privacyOrLastFailure();
|
|
1138
|
+
if (quotaFailure) return finalize(quotaFailure, quotaFailedChildLog);
|
|
995
1139
|
// The quota-refused target was cooled before this request picked, so the ladder never saw
|
|
996
1140
|
// its refusal. The cooldown, with its Retry-After, is still the honest answer.
|
|
997
1141
|
let quotaCooldownUntil: number | undefined;
|
|
@@ -1010,12 +1154,12 @@ export async function executeComboResponses(
|
|
|
1010
1154
|
}
|
|
1011
1155
|
const remainingQuotaCooldownMs = quotaCooldownUntil === undefined ? 0 : quotaCooldownUntil - Date.now();
|
|
1012
1156
|
return remainingQuotaCooldownMs > 0
|
|
1013
|
-
? comboUnavailableResponse("No available targets for combo", {
|
|
1157
|
+
? finalize(comboUnavailableResponse("No available targets for combo", {
|
|
1014
1158
|
retryAfter: String(Math.max(1, Math.ceil(remainingQuotaCooldownMs / 1000))),
|
|
1015
1159
|
// Only quota-cooled eligible targets can produce this answer, so its class is quota.
|
|
1016
1160
|
diagnostics: comboUnavailableDiagnostics(combo.targets.length, comboTargetsDispatched,
|
|
1017
1161
|
Array.from({ length: quotaCooledTargets }, () => "quota" as const)),
|
|
1018
|
-
}) :
|
|
1162
|
+
})) : privacyOrLastFailure();
|
|
1019
1163
|
};
|
|
1020
1164
|
// The caller's output ceiling, captured once so a floor applied to one target never
|
|
1021
1165
|
// leaks into the next. An established parent estimate wins; otherwise (combo dispatch
|
|
@@ -1030,6 +1174,31 @@ export async function executeComboResponses(
|
|
|
1030
1174
|
// The physical destination after provider aliases and blockedModelRedirects: hops are
|
|
1031
1175
|
// classified by where the request really goes, not by the selector the combo names.
|
|
1032
1176
|
const targetRoute = routeConcreteModel(config, `${pick.target.provider}/${pick.target.model}`);
|
|
1177
|
+
// Every child send rechecks live metered consent and the key's current scope; a member that
|
|
1178
|
+
// fails either is skipped and an eligible sibling may still run.
|
|
1179
|
+
const dispatchScope = currentAdmissionScope();
|
|
1180
|
+
const scopeAllowed = routeAllowedByScope(dispatchScope, targetRoute);
|
|
1181
|
+
if (!scopeAllowed || !maySpendOnTarget(pick.target)) {
|
|
1182
|
+
const skipped: ComboPick = pick;
|
|
1183
|
+
pick = await pickWithWait({
|
|
1184
|
+
exclude: skipped.attempted,
|
|
1185
|
+
eligible: targetEligible,
|
|
1186
|
+
allowCooldownReprobe: false,
|
|
1187
|
+
cooldownReprobeTargets: Object.entries(skipped.cooldownReprobeTargets ?? {}),
|
|
1188
|
+
});
|
|
1189
|
+
if (options.abortSignal?.aborted) return clientCancelledResponse();
|
|
1190
|
+
if (!pick) {
|
|
1191
|
+
// A scope refusal keeps the child's own 403; a consent refusal ends like any exhausted ladder.
|
|
1192
|
+
if (!scopeAllowed) {
|
|
1193
|
+
return admissionModelDeniedResponse(projectAdmissionModelDeniedLog(
|
|
1194
|
+
new AdmissionModelDeniedError(clientModelLabel, targetRoute), logCtx));
|
|
1195
|
+
}
|
|
1196
|
+
return lastFailure ? exhaustedFailure() : comboUnavailable(comboId);
|
|
1197
|
+
}
|
|
1198
|
+
jevDecision = undefined;
|
|
1199
|
+
toolLoopTurnEffort = undefined;
|
|
1200
|
+
continue;
|
|
1201
|
+
}
|
|
1033
1202
|
// Selection-free hard-lock preflight grants no hop. Enforce this actual first destination
|
|
1034
1203
|
// against the locked source, after aliases and redirects resolve.
|
|
1035
1204
|
if (firstComboTarget && options.mainHardLockFallbackOverride) {
|
|
@@ -1110,9 +1279,17 @@ export async function executeComboResponses(
|
|
|
1110
1279
|
const initialSend = hopDecision?.allowed ? { permit: hopDecision.permit, producerOwned: false } : undefined;
|
|
1111
1280
|
try {
|
|
1112
1281
|
comboTargetsDispatched += 1;
|
|
1282
|
+
const targetOutputCeiling = resolveOutputCeiling(
|
|
1283
|
+
targetRoute.provider,
|
|
1284
|
+
targetRoute.providerName,
|
|
1285
|
+
targetRoute.modelId,
|
|
1286
|
+
);
|
|
1113
1287
|
const childLog: RequestLogContext = {
|
|
1114
1288
|
model: pick.target.model,
|
|
1115
1289
|
provider: pick.target.provider,
|
|
1290
|
+
comboTarget: pick.target,
|
|
1291
|
+
comboWriterGeneration: pick.writerGeneration,
|
|
1292
|
+
comboTargetOutputCeiling: targetOutputCeiling,
|
|
1116
1293
|
...(logCtx.conversationId ? { conversationId: logCtx.conversationId, conversationIdIsHermesFallback: logCtx.conversationIdIsHermesFallback } : {}),
|
|
1117
1294
|
...(logCtx.affinityLane ? { affinityLane: logCtx.affinityLane } : {}),
|
|
1118
1295
|
...(logCtx.surface ? { surface: logCtx.surface } : {}),
|
|
@@ -1140,13 +1317,16 @@ export async function executeComboResponses(
|
|
|
1140
1317
|
const childBody = concreteComboRequestBody(
|
|
1141
1318
|
childInput,
|
|
1142
1319
|
pick.target,
|
|
1143
|
-
jevEffortApplies ? turnEffort.effort :
|
|
1320
|
+
jevEffortApplies ? turnEffort.effort : combo.defaultEffort,
|
|
1144
1321
|
jevEffortApplies && turnEffort.effort === null ? [] : targetReasoningEfforts,
|
|
1145
1322
|
combo.reasoningEffortMode,
|
|
1146
1323
|
jevEffortApplies
|
|
1147
1324
|
? (turnEffort.effort === null ? "fallback" : "force")
|
|
1148
1325
|
: combo.defaultEffortMode,
|
|
1149
1326
|
);
|
|
1327
|
+
if (comboAdvertisesEffortUnion(combo.capabilityPolicy, combo.reasoningEffortMode)) {
|
|
1328
|
+
clampComboCallerEffort(childBody, targetReasoningEfforts, pick.target);
|
|
1329
|
+
}
|
|
1150
1330
|
if (turnEffort) {
|
|
1151
1331
|
if (jevEffortApplies) delete childBody.service_tier;
|
|
1152
1332
|
if (jevEffortApplies && turnEffort.effort !== null) {
|
|
@@ -1216,14 +1396,26 @@ export async function executeComboResponses(
|
|
|
1216
1396
|
if (!childCommitted || !childUsageBound) return;
|
|
1217
1397
|
logCtx.usageFromBridge = true;
|
|
1218
1398
|
if (childLog.usage) logCtx.usage = childLog.usage;
|
|
1399
|
+
if (isPausedTurn(childLog)) rememberPausedTurn(logCtx);
|
|
1219
1400
|
};
|
|
1220
1401
|
const completedTarget = { provider: pick.target.provider, model: pick.target.model };
|
|
1221
1402
|
const writerGeneration = pick.writerGeneration;
|
|
1403
|
+
const servingPick = pick;
|
|
1404
|
+
let comboSuccessSettled = false;
|
|
1405
|
+
const settleServingSuccess = (): void => {
|
|
1406
|
+
if (comboSuccessSettled) return;
|
|
1407
|
+
comboSuccessSettled = true;
|
|
1408
|
+
noteComboSuccess(comboId, combo, servingPick.target, writerGeneration);
|
|
1409
|
+
settleComboReprobeSuccess(servingPick);
|
|
1410
|
+
};
|
|
1411
|
+
let hostedWebSearchStream = false;
|
|
1222
1412
|
let consumedChildFailure: ConsumedComboFailure | undefined;
|
|
1223
1413
|
let preflightModelRefusal: CodexAccountModelRefusal | undefined;
|
|
1224
1414
|
const callbackGate = createChildPassthroughCallbackGate({
|
|
1225
1415
|
...options,
|
|
1226
1416
|
onResponseComplete: model => {
|
|
1417
|
+
if (isPausedTurn(childLog)) rememberPausedTurn(logCtx);
|
|
1418
|
+
if (hostedWebSearchStream) settleServingSuccess();
|
|
1227
1419
|
// The live config can change while the child is streaming. Never retain credentials.
|
|
1228
1420
|
const currentCombo = getCombo(config, comboId);
|
|
1229
1421
|
const provider = config.providers[completedTarget.provider];
|
|
@@ -1235,7 +1427,8 @@ export async function executeComboResponses(
|
|
|
1235
1427
|
sessionLaneIdFromRequest(req.headers), comboId, completedTarget, model, writerGeneration,
|
|
1236
1428
|
jevEffortApplies ? turnEffort : undefined,
|
|
1237
1429
|
);
|
|
1238
|
-
|
|
1430
|
+
// A failed effort decision only refreshes the live pin, which another turn may have updated.
|
|
1431
|
+
jevPin?.complete(targetKey(completedTarget), failedPinEffortDecision ? undefined : initialJevDecision, writerGeneration);
|
|
1239
1432
|
}
|
|
1240
1433
|
options.onResponseComplete?.(model);
|
|
1241
1434
|
},
|
|
@@ -1246,10 +1439,19 @@ export async function executeComboResponses(
|
|
|
1246
1439
|
// Undefined child fields must preserve metadata already inspected by WS.
|
|
1247
1440
|
if (childLog.terminalHttpStatus !== undefined) logCtx.terminalHttpStatus = childLog.terminalHttpStatus;
|
|
1248
1441
|
if (childLog.terminalIncompleteReason !== undefined) logCtx.terminalIncompleteReason = childLog.terminalIncompleteReason;
|
|
1442
|
+
if (childLog.committedIncompleteReason !== undefined) logCtx.committedIncompleteReason = childLog.committedIncompleteReason;
|
|
1249
1443
|
if (childLog.terminalErrorCode !== undefined) logCtx.terminalErrorCode = childLog.terminalErrorCode;
|
|
1444
|
+
if (childLog.observedTerminalStatus !== undefined) logCtx.observedTerminalStatus = childLog.observedTerminalStatus;
|
|
1250
1445
|
if (childLog.upstreamError !== undefined) logCtx.upstreamError = childLog.upstreamError;
|
|
1446
|
+
// Raw usage may arrive after the commit copy. Publish it before spend is finalized.
|
|
1447
|
+
if (childLog.usage !== undefined) {
|
|
1448
|
+
logCtx.usage = childLog.usage;
|
|
1449
|
+
logCtx.usageWireParsed = childLog.usageWireParsed;
|
|
1450
|
+
}
|
|
1451
|
+
if (isPausedTurn(childLog)) rememberPausedTurn(logCtx);
|
|
1251
1452
|
// A committed stream that ends failed is a target failure too; incomplete is an answer.
|
|
1252
1453
|
if (status === "failed") jevPin?.forget();
|
|
1454
|
+
else settleServingSuccess();
|
|
1253
1455
|
options.onNativePassthroughTerminal?.(status);
|
|
1254
1456
|
},
|
|
1255
1457
|
});
|
|
@@ -1277,7 +1479,7 @@ export async function executeComboResponses(
|
|
|
1277
1479
|
...(options.turnAdmissionLease ? { turnAdmissionLease: options.turnAdmissionLease } : {}),
|
|
1278
1480
|
// Attempt-relative TTFT, recorded here for the same reason as the bridge child below.
|
|
1279
1481
|
onFirstOutput: () => {
|
|
1280
|
-
if (attempt.firstOutputMs === undefined) {
|
|
1482
|
+
if (!sealedCredentialRefusals.has(attempt) && attempt.firstOutputMs === undefined) {
|
|
1281
1483
|
attempt.firstOutputMs = Math.max(0, Date.now() - segmentStartedAt());
|
|
1282
1484
|
}
|
|
1283
1485
|
options.onFirstOutput?.();
|
|
@@ -1289,6 +1491,7 @@ export async function executeComboResponses(
|
|
|
1289
1491
|
},
|
|
1290
1492
|
}) : await requestDispatchers.handleResponses(childRequest, config, childLog, {
|
|
1291
1493
|
...options,
|
|
1494
|
+
admissionScope: dispatchScope,
|
|
1292
1495
|
plaintextV2Decision: strictReplay,
|
|
1293
1496
|
replayPrincipal,
|
|
1294
1497
|
// A bridge child is a concrete route; the native source belongs to this loop only.
|
|
@@ -1297,6 +1500,10 @@ export async function executeComboResponses(
|
|
|
1297
1500
|
// parent arrived with.
|
|
1298
1501
|
sendBudget: targetSendBudget,
|
|
1299
1502
|
comboAttempt: true,
|
|
1503
|
+
comboVisionSidecar,
|
|
1504
|
+
...(omittingImages ? { comboOmitImages: true }
|
|
1505
|
+
: capability.requiresVisionPlan(pick.target) ? { comboRequiresVisionPlan: true } : {}),
|
|
1506
|
+
...(capability.unservable === "context" ? { comboContextDegraded: true } : {}),
|
|
1300
1507
|
comboInitialSend: initialSend,
|
|
1301
1508
|
comboDispatchPermit: hopDecision?.allowed ? hopDecision.permit : undefined,
|
|
1302
1509
|
comboReplaySnapshot,
|
|
@@ -1305,10 +1512,14 @@ export async function executeComboResponses(
|
|
|
1305
1512
|
childUsageBound = true;
|
|
1306
1513
|
forwardChildUsage();
|
|
1307
1514
|
},
|
|
1515
|
+
onHostedWebSearchStream: () => { hostedWebSearchStream = true; },
|
|
1516
|
+
onWebSearchLocalFailure: () => {
|
|
1517
|
+
if (childCommitted) carryLocalFailureState(childLog, logCtx);
|
|
1518
|
+
},
|
|
1308
1519
|
// Attempt-relative TTFT is recorded HERE (not via childLog.firstOutputMs — a later
|
|
1309
1520
|
// Object.assign(logCtx, childLog) would overwrite the request-relative value).
|
|
1310
1521
|
onFirstOutput: () => {
|
|
1311
|
-
if (attempt.firstOutputMs === undefined) {
|
|
1522
|
+
if (!sealedCredentialRefusals.has(attempt) && attempt.firstOutputMs === undefined) {
|
|
1312
1523
|
attempt.firstOutputMs = Math.max(0, Date.now() - segmentStartedAt());
|
|
1313
1524
|
}
|
|
1314
1525
|
options.onFirstOutput?.();
|
|
@@ -1350,6 +1561,7 @@ export async function executeComboResponses(
|
|
|
1350
1561
|
preflight = await preflightComboStreamResponse(response, childLog, undefined, {
|
|
1351
1562
|
signal: options.abortSignal,
|
|
1352
1563
|
requiredToolPrelude: childLog.providerAdapter === "openai-responses" && requiredToolContractOf(rawBody) !== undefined,
|
|
1564
|
+
degeneratePrelude: true,
|
|
1353
1565
|
});
|
|
1354
1566
|
} catch (error) {
|
|
1355
1567
|
callbackGate.discard();
|
|
@@ -1388,8 +1600,9 @@ export async function executeComboResponses(
|
|
|
1388
1600
|
childLog.accountLogLabel,
|
|
1389
1601
|
);
|
|
1390
1602
|
attemptRetained = true;
|
|
1391
|
-
|
|
1392
|
-
|
|
1603
|
+
// Native SSE can carry a failed verdict after HTTP acceptance, including after preflight.
|
|
1604
|
+
// A hosted web-search stream settles only when the loop reports a completed response.
|
|
1605
|
+
if (!isNativePassthroughSseResponse(response) && !hostedWebSearchStream) settleServingSuccess();
|
|
1393
1606
|
carryProxyErrorContext(childLog, logCtx);
|
|
1394
1607
|
Object.assign(logCtx, childLog, {
|
|
1395
1608
|
client: logCtx.client,
|
|
@@ -1397,14 +1610,22 @@ export async function executeComboResponses(
|
|
|
1397
1610
|
model: responseModel,
|
|
1398
1611
|
provider: "combo",
|
|
1399
1612
|
comboId,
|
|
1613
|
+
comboTarget: pick.target,
|
|
1614
|
+
comboWriterGeneration: pick.writerGeneration,
|
|
1615
|
+
comboTargetOutputCeiling: targetOutputCeiling,
|
|
1400
1616
|
routeDecision: logCtx.routeDecision,
|
|
1401
1617
|
attempts: logCtx.attempts,
|
|
1402
1618
|
activeAttempt: attempt,
|
|
1403
1619
|
activeAttemptStartedAt: segmentStartedAt(),
|
|
1404
1620
|
resolvedModel: childLog.resolvedModel ?? childLog.model,
|
|
1405
1621
|
});
|
|
1622
|
+
carryLocalFailureState(childLog, logCtx);
|
|
1406
1623
|
options.onCodexAuthContextResolved?.(resolvedAuth);
|
|
1407
|
-
options.setTerminalOutcomeRecorder?.(
|
|
1624
|
+
options.setTerminalOutcomeRecorder?.((status, httpStatusOverride) => {
|
|
1625
|
+
if (isPausedTurn(childLog)) rememberPausedTurn(logCtx);
|
|
1626
|
+
if (status !== "failed" && !hostedWebSearchStream) settleServingSuccess();
|
|
1627
|
+
terminalRecorder?.(status, httpStatusOverride);
|
|
1628
|
+
});
|
|
1408
1629
|
callbackGate.commit();
|
|
1409
1630
|
childCommitted = true;
|
|
1410
1631
|
forwardChildUsage();
|
|
@@ -1451,11 +1672,15 @@ export async function executeComboResponses(
|
|
|
1451
1672
|
Date.now() - segmentStartedAt(),
|
|
1452
1673
|
failure.usage ?? childLog.usage,
|
|
1453
1674
|
);
|
|
1454
|
-
|
|
1675
|
+
const visionDescriptionRefused = isComboVisionDescriptionRefusal(failure.response);
|
|
1676
|
+
if (visionDescriptionRefused) visionRejectedTargets.add(targetKey(pick.target));
|
|
1677
|
+
const replayRefusal = isReplayRefusalResponse(failure.response);
|
|
1678
|
+
if (replayRefusal) {
|
|
1455
1679
|
// Numeric 429 is a client replay policy here, not an upstream quota observation.
|
|
1456
1680
|
childLog.causeHint = "transport-ambiguous";
|
|
1457
1681
|
childLog.terminalSource = "synthetic";
|
|
1458
|
-
childLog.errorCode =
|
|
1682
|
+
childLog.errorCode = UPSTREAM_RESET_REPLAY_REFUSED_CODE;
|
|
1683
|
+
if (!sealedCredentialRefusals.has(attempt)) attempt.errorCode = childLog.errorCode;
|
|
1459
1684
|
}
|
|
1460
1685
|
if (failure.upstreamCode === "input_admission_refused" && attempt.sendCount === 0) {
|
|
1461
1686
|
attempt.errorCode = failure.upstreamCode;
|
|
@@ -1467,9 +1692,10 @@ export async function executeComboResponses(
|
|
|
1467
1692
|
lastFailure = failure.response;
|
|
1468
1693
|
lastFailureUpstreamCode = failure.upstreamCode;
|
|
1469
1694
|
toolChoiceRefusalsOnly = (toolChoiceRefusalsOnly ?? true) && isMandatoryToolChoiceRefusal(failure.response);
|
|
1470
|
-
|
|
1471
|
-
|
|
1472
|
-
if (!
|
|
1695
|
+
const localDeadline = failure.response.status === 504 && upstreamErrorIsLocal(childLog);
|
|
1696
|
+
// A real target failure ends the session pin (#7525).
|
|
1697
|
+
if (!localDeadline) jevPin?.forget();
|
|
1698
|
+
if (!quotaFailure && !replayRefusal && (lastFailure.status === 429 || lastFailure.status === 402)) {
|
|
1473
1699
|
quotaFailure = lastFailure;
|
|
1474
1700
|
quotaFailedChildLog = childLog;
|
|
1475
1701
|
}
|
|
@@ -1488,11 +1714,11 @@ export async function executeComboResponses(
|
|
|
1488
1714
|
return settled;
|
|
1489
1715
|
}
|
|
1490
1716
|
}
|
|
1491
|
-
// A non-replayable failure
|
|
1492
|
-
//
|
|
1717
|
+
// A non-replayable failure can come from a committed provider terminal or a send whose
|
|
1718
|
+
// outcome is ambiguous. Neither permits another target, regardless of the HTTP status.
|
|
1493
1719
|
const failureDecision = failure.nonReplayable || spentReplacement
|
|
1494
1720
|
? "stop"
|
|
1495
|
-
: isPolicyCandidateRefusal(failure.response) ? "hop"
|
|
1721
|
+
: localDeadline || isPolicyCandidateRefusal(failure.response) ? "hop"
|
|
1496
1722
|
: comboFailureDecision(failure.response.status, failure.classificationText, {
|
|
1497
1723
|
code: failure.upstreamCode,
|
|
1498
1724
|
rootCode: failure.upstreamRootCode,
|
|
@@ -1553,6 +1779,8 @@ export async function executeComboResponses(
|
|
|
1553
1779
|
}
|
|
1554
1780
|
return lastFailure;
|
|
1555
1781
|
}
|
|
1782
|
+
const xaiPrivacyRefusal = isXaiPrivacyModeRefusal(failure.response);
|
|
1783
|
+
if (xaiPrivacyRefusal) xaiPrivacyFailure = { response: failure.response, childLog };
|
|
1556
1784
|
// Retain a confirmed target context refusal when later retryable failures exhaust the ladder.
|
|
1557
1785
|
// Hard stops above still return their own verdict, and every attempt keeps its own usage.
|
|
1558
1786
|
if (!contextFailure && failure.response.status === 400 && isDefiniteContextOverflow(400, failure.classificationText)) {
|
|
@@ -1567,7 +1795,7 @@ export async function executeComboResponses(
|
|
|
1567
1795
|
}
|
|
1568
1796
|
// A bare status made a revoked credential read as a provider outage. Log the classified
|
|
1569
1797
|
// condition (a closed member), never upstream-authored code or message text.
|
|
1570
|
-
const failureReason = classifyUpstreamCondition({
|
|
1798
|
+
const failureReason = localDeadline ? undefined : classifyUpstreamCondition({
|
|
1571
1799
|
status: failure.response.status, code: failure.upstreamCode, type: failure.upstreamType, message: failure.upstreamMessage,
|
|
1572
1800
|
});
|
|
1573
1801
|
console.warn(
|
|
@@ -1576,7 +1804,8 @@ export async function executeComboResponses(
|
|
|
1576
1804
|
);
|
|
1577
1805
|
const failureNow = Date.now();
|
|
1578
1806
|
const attemptedTargets = pick.attempted;
|
|
1579
|
-
|
|
1807
|
+
// Legacy privacy mode is specific to the serving account.
|
|
1808
|
+
const failureCooldownScope = localDeadline || xaiPrivacyRefusal || isPolicyCandidateRefusal(failure.response) ? "none" : comboFailureCooldownScope(failure.response.status, failure.classificationText, {
|
|
1580
1809
|
code: failure.upstreamCode,
|
|
1581
1810
|
malformedResponseFormat: failure.malformedResponseFormat,
|
|
1582
1811
|
openRouterOpaque400: failure.openRouterOpaque400,
|
|
@@ -1607,7 +1836,7 @@ export async function executeComboResponses(
|
|
|
1607
1836
|
resetAt: codexLocalRefusal ? undefined : failure.resetAt,
|
|
1608
1837
|
cooldownMs: combo.cooldownMs,
|
|
1609
1838
|
now: failureNow,
|
|
1610
|
-
cooldownScope: failureCooldownScope,
|
|
1839
|
+
recordFailure: !localDeadline, cooldownScope: failureCooldownScope,
|
|
1611
1840
|
eligible: targetEligible,
|
|
1612
1841
|
status: failure.response.status,
|
|
1613
1842
|
code: failure.upstreamCode,
|
|
@@ -1666,7 +1895,7 @@ export async function executeComboResponses(
|
|
|
1666
1895
|
if (!pick) {
|
|
1667
1896
|
if (options.abortSignal?.aborted) return clientCancelledResponse();
|
|
1668
1897
|
if (onlyReplayIncompatibleTargetsRemain(attemptedTargets)) {
|
|
1669
|
-
if (contextFailure) return exhaustedFailure();
|
|
1898
|
+
if (contextFailure || xaiPrivacyFailure) return exhaustedFailure();
|
|
1670
1899
|
adoptFailedChildLog(childLog);
|
|
1671
1900
|
return targetIncompatibleResponse();
|
|
1672
1901
|
}
|
|
@@ -1684,6 +1913,23 @@ export async function executeComboResponses(
|
|
|
1684
1913
|
}
|
|
1685
1914
|
// Waiting or recovery may have observed cancellation after the check above.
|
|
1686
1915
|
if (options.abortSignal?.aborted) return clientCancelledResponse();
|
|
1916
|
+
if (visionRejectedTargets.size > 0 && !omittingImages) {
|
|
1917
|
+
if (combo.onUnservable !== "reject") {
|
|
1918
|
+
// These children refused before sending the primary turn, so they can still serve it
|
|
1919
|
+
// with omission. Keep exclusions for every target that did attempt the primary turn.
|
|
1920
|
+
pick = await pickWithWait({
|
|
1921
|
+
exclude: attemptedTargets.filter(key => !visionRejectedTargets.has(key)),
|
|
1922
|
+
eligible: useImageDegradation,
|
|
1923
|
+
cooldownReprobeTargets: carriedReprobe ? Object.entries(carriedReprobe) : undefined,
|
|
1924
|
+
});
|
|
1925
|
+
if (options.abortSignal?.aborted) return clientCancelledResponse();
|
|
1926
|
+
if (pick) {
|
|
1927
|
+
omittingImages = true;
|
|
1928
|
+
warnComboImageOmission();
|
|
1929
|
+
}
|
|
1930
|
+
}
|
|
1931
|
+
if (!pick && visionDescriptionRefused) return unservableImageResponse();
|
|
1932
|
+
}
|
|
1687
1933
|
}
|
|
1688
1934
|
} finally {
|
|
1689
1935
|
// External receipts make release a no-op after real work. runTurn owns its asynchronous
|