@bitkyc08/opencodex 2.100.5 → 2.100.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/bin/ocx.mjs +2 -0
- package/gui/dist/assets/App-BI8LQ7Qk.css +1 -0
- package/gui/dist/assets/App-CsZ1Gr7S.js +60 -0
- package/gui/dist/assets/Tray-CVqm4S4W.js +1 -0
- package/gui/dist/assets/brand-mark-BebhnAtV.js +1 -0
- package/gui/dist/assets/index-BtwVlpeQ.css +2 -0
- package/gui/dist/assets/index-CEeMegqE.js +138 -0
- package/gui/dist/assets/{segment-thumb-features-Bquysdn5.js → segment-thumb-features-COdzmORE.js} +1 -1
- package/gui/dist/classic/assets/App-BJgUWNJ8.js +59 -0
- package/gui/dist/classic/assets/App-CoiVLRW3.css +1 -0
- package/gui/dist/classic/assets/Tray-BDlcOLDK.js +1 -0
- package/gui/dist/classic/assets/index-B9Jgli_W.js +138 -0
- package/gui/dist/classic/assets/usage-companion-chart-vbzDcND0.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.lock +62 -0
- package/native/ocx-child/Cargo.toml +1 -0
- package/native/ocx-child/src/journal.rs +32 -10
- package/native/ocx-child/src/state.rs +2 -1
- package/native/ocx-child/src/toml_surgeon.rs +183 -72
- package/package.json +2 -2
- package/src/adapters/agy-acp/acp.ts +202 -0
- package/src/adapters/agy-acp/adapter.ts +554 -0
- package/src/adapters/agy-acp/binary.ts +79 -0
- package/src/adapters/agy-acp/options.ts +163 -0
- package/src/adapters/agy-acp/output-redaction.ts +270 -0
- package/src/adapters/agy-acp/policy.ts +105 -0
- package/src/adapters/agy-acp/process.ts +218 -0
- package/src/adapters/anthropic/account-metadata.ts +4 -1
- package/src/adapters/anthropic/advisor-tool.ts +43 -9
- package/src/adapters/anthropic/client-identity.ts +2 -0
- package/src/adapters/anthropic.ts +102 -14
- package/src/adapters/antigravity-refusal.ts +5 -1
- package/src/adapters/base.ts +25 -2
- package/src/adapters/claude-cli/adapter.ts +1 -0
- package/src/adapters/claude-cli/usage-admission.ts +12 -9
- package/src/adapters/codebuddy/adapter.ts +1 -0
- package/src/adapters/command-code.ts +2 -2
- package/src/adapters/cursor/http1-bidi.ts +7 -2
- package/src/adapters/cursor/live-transport.ts +2 -0
- package/src/adapters/cursor/request-builder.ts +4 -4
- package/src/adapters/cursor/tool-naming.ts +5 -5
- package/src/adapters/cursor/transport-retry.ts +14 -8
- package/src/adapters/cursor/transport.ts +2 -0
- package/src/adapters/cursor.ts +8 -2
- package/src/adapters/google-error-details.ts +105 -0
- package/src/adapters/google-errors.ts +183 -31
- package/src/adapters/google-http.ts +66 -22
- package/src/adapters/google-truncation.ts +48 -3
- package/src/adapters/google-vertex-endpoint.ts +12 -1
- package/src/adapters/google.ts +54 -26
- package/src/adapters/kiro/adapter.ts +39 -38
- package/src/adapters/kiro/stream.ts +59 -9
- package/src/adapters/kiro-retry.ts +5 -3
- package/src/adapters/m365-copilot/LICENSE +21 -0
- package/src/adapters/m365-copilot/fenced.ts +745 -0
- package/src/adapters/m365-copilot/images.ts +89 -0
- package/src/adapters/m365-copilot/tools.ts +284 -0
- package/src/adapters/m365-copilot/transport.ts +232 -0
- package/src/adapters/m365-copilot.ts +143 -0
- package/src/adapters/openai-chat/tool-schema.ts +2 -2
- package/src/adapters/openai-responses/passthrough.ts +1 -0
- package/src/adapters/openai-responses/reasoning.ts +23 -3
- package/src/adapters/physical-send.ts +11 -4
- package/src/adapters/qoder/adapter.ts +17 -3
- package/src/adapters/registry.ts +15 -1
- package/src/adapters/zed.ts +2 -1
- package/src/advisor/consult.ts +1 -0
- package/src/bridge/response-json.ts +6 -2
- package/src/bridge/sse.ts +21 -9
- package/src/chat/inbound.ts +11 -8
- package/src/chat/outbound.ts +28 -7
- package/src/claude/context-windows.ts +32 -8
- package/src/claude/desktop-3p.ts +18 -14
- package/src/claude/desktop-picker-platform.ts +1 -1
- package/src/claude/desktop-picker.ts +3 -3
- package/src/claude/inbound-content-options.ts +11 -1
- package/src/claude/intercept/picker-ca-cleanup.ts +17 -5
- package/src/claude/intercept/picker-ca.ts +162 -27
- package/src/claude/intercept/picker-trust-linux.ts +411 -0
- package/src/claude/intercept/picker-trust.ts +35 -3
- package/src/claude/intercept/runtime.ts +2 -2
- package/src/claude/subagent-force-status.ts +24 -5
- package/src/claude/subscription-reserve.ts +87 -0
- package/src/cli/account-api.ts +3 -0
- package/src/cli/account-auth.ts +65 -11
- package/src/cli/account-extended.ts +1 -1
- package/src/cli/account-next-actions.ts +4 -1
- package/src/cli/account-policy-dto.ts +1 -1
- package/src/cli/account-policy.ts +6 -3
- package/src/cli/account-probe.ts +66 -0
- package/src/cli/account.ts +8 -2
- package/src/cli/capabilities-accounts.ts +8 -1
- package/src/cli/capabilities-agents-routing.ts +2 -2
- package/src/cli/capabilities-base.ts +4 -4
- package/src/cli/capabilities-integrations.ts +44 -4
- package/src/cli/capabilities-provider-models.ts +6 -0
- package/src/cli/claude-context-settings.ts +60 -0
- package/src/cli/claude-desktop.ts +2 -2
- package/src/cli/claude.ts +15 -7
- package/src/cli/client-start-fence.ts +64 -1
- package/src/cli/combo-result.ts +1 -0
- package/src/cli/combo-stats.ts +1 -1
- package/src/cli/combo.ts +19 -2
- package/src/cli/config-command.ts +21 -8
- package/src/cli/connect.ts +16 -0
- package/src/cli/cross-home-owner.ts +65 -18
- package/src/cli/dispatch.ts +4 -0
- package/src/cli/gateway-client-command.ts +128 -0
- package/src/cli/index.ts +98 -97
- package/src/cli/init.ts +20 -4
- package/src/cli/integrations.ts +23 -3
- package/src/cli/launcher-context.ts +12 -1
- package/src/cli/link.ts +24 -5
- package/src/cli/models-runtime-subcommands.ts +1 -0
- package/src/cli/models-runtime.ts +32 -0
- package/src/cli/start-owner-fence.ts +5 -2
- package/src/cli/status.ts +3 -3
- package/src/cli/stop-client-process.ts +51 -0
- package/src/cli/stop-restore.ts +383 -36
- package/src/cli/sync-command.ts +2 -2
- package/src/cli/uninstall-client-state.ts +7 -0
- package/src/client/connect.ts +72 -13
- package/src/client/hub-client.ts +38 -0
- package/src/client/hub-relay.ts +61 -36
- package/src/client/hub-session.ts +106 -0
- package/src/client/lifecycle-lock.ts +6 -1
- package/src/client/link-relay.ts +2 -1
- package/src/client/machine-listener.ts +60 -1
- package/src/client/runtime-restart.ts +1 -0
- package/src/client/runtime.ts +104 -34
- package/src/client/state.ts +11 -0
- package/src/client/stop-darwin-process.ts +73 -0
- package/src/client/stop-file-routing.ts +49 -0
- package/src/client/stop-native-handoff.ts +108 -0
- package/src/client/stop-routing.ts +41 -7
- package/src/client/stop-teardown-owner.ts +173 -0
- package/src/client/sync-runtime.ts +23 -4
- package/src/clients/config-export/opencode-wire.ts +24 -0
- package/src/clients/config-export.ts +28 -19
- package/src/codex/auth-api/login-flow.ts +68 -33
- package/src/codex/auth-api/main-account-probe.ts +3 -3
- package/src/codex/auth-api/pool-quota-probe.ts +8 -7
- package/src/codex/auth-api/routes.ts +1 -1
- package/src/codex/catalog/aggregation.ts +22 -10
- package/src/codex/catalog/gather-capture.ts +11 -2
- package/src/codex/catalog/m365-copilot-models.ts +52 -0
- package/src/codex/catalog/provider-models.ts +126 -53
- package/src/codex/catalog/routed-gather.ts +26 -12
- package/src/codex/catalog-admission.ts +4 -6
- package/src/codex/catalog-auto-refresh.ts +4 -2
- package/src/codex/catalog-self-heal.ts +4 -2
- package/src/codex/control-plane-models.ts +6 -0
- package/src/codex/convergence.ts +10 -0
- package/src/codex/desktop-app/picker-freshness.ts +3 -14
- package/src/codex/desktop-app/types.ts +6 -0
- package/src/codex/desktop-app/windows-command-payload.ts +9 -0
- package/src/codex/desktop-app/windows.ts +20 -12
- package/src/codex/desktop-compatibility/installed-build.ts +61 -58
- package/src/codex/desktop-compatibility/runtime-ownership.ts +11 -5
- package/src/codex/desktop-compatibility/runtime.ts +51 -14
- package/src/codex/desktop-compatibility/windows-activation-source.ts +28 -13
- package/src/codex/desktop-compatibility/windows-package-command.ts +73 -33
- package/src/codex/desktop-compatibility/windows-package-launch.ts +41 -9
- package/src/codex/desktop-compatibility/windows-package-proof.ts +104 -0
- package/src/codex/inject/config-toml.ts +67 -73
- package/src/codex/inject/plan.ts +11 -10
- package/src/codex/inject/remove.ts +4 -1
- package/src/codex/inject.ts +1 -0
- package/src/codex/journal-config-restore.ts +31 -4
- package/src/codex/journal.ts +16 -4
- package/src/codex/model-cache.ts +98 -27
- package/src/codex/native-residue.ts +14 -13
- package/src/codex/paths.ts +65 -28
- package/src/codex/quota-observation-freshness.ts +4 -0
- package/src/codex/quota.ts +71 -8
- package/src/codex/routing/selection.ts +32 -8
- package/src/combos/capability-policy.ts +31 -0
- package/src/combos/failover.ts +82 -74
- package/src/combos/identifiers.ts +2 -2
- package/src/combos/index.ts +3 -0
- package/src/combos/jev-model-backend.ts +12 -4
- package/src/combos/jev-session-pin-config.ts +22 -9
- package/src/combos/jev.ts +15 -4
- package/src/combos/request-capability.ts +214 -0
- package/src/combos/request.ts +22 -15
- package/src/combos/resolve.ts +5 -2
- package/src/combos/suggestion-channel.ts +89 -0
- package/src/combos/types.ts +14 -1
- package/src/config/account-auto-pause-revisions.ts +33 -10
- package/src/config/atomic-write.ts +1 -1
- package/src/config/codex-ws-incremental-setting.ts +34 -0
- package/src/config/diagnostics.ts +47 -8
- package/src/config/live-topology.ts +4 -2
- package/src/config/load-degrade.ts +96 -2
- package/src/config/mutation-lock.ts +7 -3
- package/src/config/paths.ts +3 -0
- package/src/config/pending-teardown.ts +19 -3
- package/src/config/process-state.ts +30 -12
- package/src/config/provider-validation.ts +10 -0
- package/src/config/salvage.ts +2 -2
- package/src/config/schema/account-auto-pause.ts +15 -1
- package/src/config/schema/agy-acp-references.ts +257 -0
- package/src/config/schema/config-schema.ts +32 -0
- package/src/config/schema/leaf-validators.ts +42 -0
- package/src/config/schema/subscription-reserve.ts +33 -0
- package/src/config/windows-process-command-line.ts +27 -9
- package/src/config.ts +6 -0
- package/src/generated/compatibility-version.json +806 -402
- package/src/images/loop.ts +79 -39
- package/src/integrations/catalog-refresh.ts +19 -1
- package/src/integrations/gateway-clients/agy.ts +340 -0
- package/src/integrations/gateway-clients/antigravity.ts +224 -0
- package/src/integrations/gateway-clients/index.ts +89 -0
- package/src/integrations/gateway-clients/io.ts +278 -0
- package/src/integrations/gateway-clients/types.ts +80 -0
- package/src/integrations/route-intent-disconnect.ts +37 -21
- package/src/lib/app-owned-memory-stores.ts +9 -0
- package/src/lib/cloud-code-appeal-link.ts +30 -0
- package/src/lib/errors.ts +32 -0
- package/src/lib/executor-physical-send-receipt.ts +42 -0
- package/src/lib/failure-detail.ts +1 -0
- package/src/lib/gcp-adc.ts +5 -0
- package/src/lib/http-date.ts +91 -0
- package/src/lib/lab-passive-linker-registration.ts +2 -1
- package/src/lib/local-chat-completion.ts +13 -3
- package/src/lib/local-internal-call-capability.ts +1 -3
- package/src/lib/messages-error-body.ts +2 -1
- package/src/lib/outbound-credential-registry.ts +40 -4
- package/src/lib/pinned-http.ts +7 -2
- package/src/lib/process-control.ts +1 -0
- package/src/lib/provider-egress.ts +16 -0
- package/src/lib/provider-outbound.ts +3 -0
- package/src/lib/redact-folding.ts +12 -3
- package/src/lib/redact.ts +37 -19
- package/src/lib/request-execution-budget.ts +241 -32
- package/src/lib/request-peer-scope.ts +64 -0
- package/src/lib/response-send-readings.ts +41 -0
- package/src/lib/state-store-registrations.ts +5 -0
- package/src/lib/tool-envelope-echo-filter.ts +33 -5
- package/src/lib/upstream-condition.ts +10 -3
- package/src/lib/upstream-retry.ts +95 -20
- package/src/lib/windows-secret-acl.ts +24 -7
- package/src/link/child-activity.ts +60 -4
- package/src/link/codex-settings.ts +2 -1
- package/src/link/relay-auth.ts +1 -0
- package/src/link/route-rounds.ts +32 -9
- package/src/link/status-projection.ts +42 -5
- package/src/link/supervisor.ts +96 -11
- package/src/link/tunnel-history.ts +5 -0
- package/src/oauth/account-auto-pause-policy.ts +72 -19
- package/src/oauth/account-auto-pause.ts +40 -16
- package/src/oauth/anthropic-account-refusal.ts +7 -0
- package/src/oauth/anthropic-continuity.ts +70 -9
- package/src/oauth/anthropic-identity.ts +75 -11
- package/src/oauth/anthropic-login-slot.ts +258 -0
- package/src/oauth/anthropic-routing.ts +24 -9
- package/src/oauth/anthropic-send-ownership.ts +4 -3
- package/src/oauth/anthropic.ts +30 -11
- package/src/oauth/health.ts +7 -2
- package/src/oauth/index.ts +50 -48
- package/src/oauth/key-providers.ts +2 -0
- package/src/oauth/login-cli.ts +11 -0
- package/src/oauth/login-flow-state.ts +10 -4
- package/src/oauth/m365-copilot-browser.ts +222 -0
- package/src/oauth/m365-copilot-web-session.ts +25 -0
- package/src/oauth/m365-copilot.ts +57 -0
- package/src/oauth/model-discovery-auth.ts +5 -0
- package/src/oauth/plan.ts +44 -0
- package/src/oauth/pool-kernel.ts +22 -8
- package/src/oauth/pool-settings-capability.ts +14 -3
- package/src/oauth/reauth-precheck.ts +27 -0
- package/src/oauth/store-anthropic-instance.ts +3 -1
- package/src/oauth/store.ts +121 -23
- package/src/oauth/types.ts +27 -2
- package/src/protocols/codecs/chat-ir.ts +7 -4
- package/src/protocols/codecs/gemini-interactions.ts +770 -0
- package/src/protocols/codecs/gemini.ts +470 -0
- package/src/protocols/contract.ts +2 -0
- package/src/protocols/encoders/adapter-events.ts +5 -3
- package/src/protocols/encoders/chat.ts +23 -7
- package/src/protocols/settings.ts +3 -0
- package/src/providers/account-quota-disk.ts +26 -8
- package/src/providers/api-key-pause.ts +2 -2
- package/src/providers/api-key-response-ownership.ts +14 -4
- package/src/providers/claude-cli-usage-state.ts +1 -0
- package/src/providers/claude-cli-usage.ts +24 -7
- package/src/providers/default-aliases.ts +11 -5
- package/src/providers/derive.ts +5 -1
- package/src/providers/fastwire.ts +6 -5
- package/src/providers/free-directory.ts +2 -2
- package/src/providers/google-vertex-location.ts +2 -1
- package/src/providers/google-vertex-model-discovery.ts +22 -0
- package/src/providers/key-failover.ts +18 -23
- package/src/providers/m365-copilot-discovery-fetch.ts +17 -0
- package/src/providers/m365-copilot-discovery.ts +68 -0
- package/src/providers/m365-copilot-models.ts +32 -0
- package/src/providers/model-rename-fields.ts +6 -0
- package/src/providers/new-model-policy-runtime.ts +27 -6
- package/src/providers/openai-forward-destination.ts +19 -0
- package/src/providers/openai-tiers-destination.ts +3 -19
- package/src/providers/quota/account-cache.ts +183 -27
- package/src/providers/quota/anthropic-account-quota.ts +21 -17
- package/src/providers/quota/anthropic-cooldown-recovery.ts +57 -27
- package/src/providers/quota/anthropic-decision-windows.ts +7 -3
- package/src/providers/quota/anthropic-usage-windows.ts +34 -4
- package/src/providers/quota/antigravity-account-probe.ts +165 -0
- package/src/providers/quota/antigravity.ts +71 -3
- package/src/providers/quota/vendor-probes-oauth.ts +52 -28
- package/src/providers/quota-decision-publication.ts +1 -1
- package/src/providers/quota-decision-snapshot.ts +4 -1
- package/src/providers/quota-types.ts +2 -0
- package/src/providers/quota.ts +8 -7
- package/src/providers/registry/agy-acp-models.ts +3 -0
- package/src/providers/registry/entries-core.ts +9 -0
- package/src/providers/registry/entries-extended.ts +60 -0
- package/src/providers/registry/model-seeds.ts +51 -0
- package/src/providers/request-pacing.ts +37 -7
- package/src/providers/service-tier.ts +2 -0
- package/src/providers/xai-privacy-mode.ts +52 -0
- package/src/remote/hub-management-relay.ts +74 -0
- package/src/responses/id-limits.ts +2 -0
- package/src/responses/input-media.ts +15 -3
- package/src/responses/parser-tools.ts +74 -11
- package/src/responses/parser.ts +16 -14
- package/src/responses/provider-opaque-metadata.ts +10 -0
- package/src/responses/reasoning-envelope.ts +3 -0
- package/src/responses/schema.ts +2 -3
- package/src/responses/spill-store.ts +5 -3
- package/src/responses/state/connection-scope.ts +232 -0
- package/src/responses/state/entry-types.ts +47 -0
- package/src/responses/state/snapshot-codec.ts +75 -14
- package/src/responses/state/snapshot-select.ts +2 -0
- package/src/responses/state/spill-codec.ts +59 -0
- package/src/responses/state/spill-queue.ts +11 -2
- package/src/responses/state.ts +178 -159
- package/src/router.ts +2 -6
- package/src/routing/compatibility/behavior.ts +6 -2
- package/src/routing/compatibility/subject.ts +17 -12
- package/src/routing/machine-weighted-routing.ts +58 -0
- package/src/server/advisor-admission-scope.ts +15 -7
- package/src/server/auth-cors.ts +27 -0
- package/src/server/chat-completions.ts +37 -17
- package/src/server/chat-native-eligibility.ts +21 -0
- package/src/server/chat-native.ts +15 -6
- package/src/server/claude-messages.ts +54 -6
- package/src/server/credential-recovery-attempt.ts +32 -0
- package/src/server/effort-policy.ts +6 -3
- package/src/server/gemini-inbound.ts +267 -0
- package/src/server/gemini-interactions-inbound.ts +229 -0
- package/src/server/gemini-interactions-store.ts +129 -0
- package/src/server/gemini-native-catalog.ts +64 -0
- package/src/server/gemini-native-log.ts +33 -0
- package/src/server/gemini-native-paths.ts +88 -0
- package/src/server/gemini-native-wire.ts +201 -0
- package/src/server/gemini-native.ts +218 -0
- package/src/server/grok-upstream-envelope-echo.ts +8 -2
- package/src/server/hub-relay-auth.ts +87 -0
- package/src/server/hub-usage-windows.ts +135 -0
- package/src/server/hub-usage.ts +16 -3
- package/src/server/inbound-body-admission.ts +2 -1
- package/src/server/index/anthropic-model-listing.ts +75 -0
- package/src/server/index/gemini-routes.ts +147 -0
- package/src/server/index/link-management.ts +3 -22
- package/src/server/index/link-relay-sessions.ts +71 -13
- package/src/server/index/link-websocket.ts +2 -0
- package/src/server/index/passive-management-read.ts +55 -0
- package/src/server/index/serve-options.ts +93 -107
- package/src/server/index/websocket-handler.ts +15 -2
- package/src/server/index.ts +10 -0
- package/src/server/inference/client-encoder-delivery.ts +2 -1
- package/src/server/inference/context.ts +33 -6
- package/src/server/management/agent-settings-routes.ts +33 -16
- package/src/server/management/claude-code-settings-patch.ts +6 -0
- package/src/server/management/combo-routes.ts +21 -1
- package/src/server/management/combo-suggestion-routes.ts +212 -0
- package/src/server/management/config-routes.ts +12 -4
- package/src/server/management/context.ts +2 -0
- package/src/server/management/gateway-client-routes.ts +62 -0
- package/src/server/management/integration-routes.ts +5 -0
- package/src/server/management/link-routes.ts +5 -1
- package/src/server/management/m365-copilot-provider-probe.ts +23 -0
- package/src/server/management/model-routes.ts +32 -2
- package/src/server/management/model-rows.ts +36 -3
- package/src/server/management/oauth-account-routes.ts +68 -15
- package/src/server/management/protocol-settings-patch.ts +1 -0
- package/src/server/management/provider-omitted-fields.ts +25 -0
- package/src/server/management/provider-overwrite-carry.ts +33 -8
- package/src/server/management/provider-routes.ts +10 -16
- package/src/server/management/request-history-routes.ts +2 -2
- package/src/server/management/route-registry.ts +10 -0
- package/src/server/management/shared.ts +118 -30
- package/src/server/management/sibling-guard.ts +2 -1
- package/src/server/management/system-routes.ts +6 -0
- package/src/server/management-auth.ts +8 -1
- package/src/server/messages-native-scope.ts +19 -0
- package/src/server/messages-native.ts +156 -59
- package/src/server/messages-shared.ts +6 -0
- package/src/server/models-capabilities.ts +24 -0
- package/src/server/native-chat-bridge.ts +259 -0
- package/src/server/ollama-inbound.ts +36 -184
- package/src/server/passive-route-linker.ts +3 -1
- package/src/server/port-reclaim.ts +48 -4
- package/src/server/proxy-liveness.ts +79 -22
- package/src/server/relay.ts +16 -9
- package/src/server/request-log-account-rotation.ts +2 -1
- package/src/server/request-log-attempt-recovery.ts +24 -2
- package/src/server/request-log-attempt-usage.ts +5 -4
- package/src/server/request-log-committed-terminal.ts +87 -0
- package/src/server/request-log-failure-attribution.ts +3 -3
- package/src/server/request-log-failure-detail.ts +34 -0
- package/src/server/request-log-key-failure.ts +27 -0
- package/src/server/request-log-terminal-status.ts +25 -12
- package/src/server/request-log.ts +59 -63
- package/src/server/responses/adapter-continuation.ts +77 -44
- package/src/server/responses/adapter-delivery.ts +47 -22
- package/src/server/responses/adapter-dispatch.ts +150 -149
- package/src/server/responses/advisor-retention.ts +12 -4
- package/src/server/responses/advisor-slot.ts +97 -2
- package/src/server/responses/agent-task-recovery.ts +44 -11
- package/src/server/responses/agy-acp-preflight.ts +41 -0
- package/src/server/responses/anthropic-image-context.ts +44 -0
- package/src/server/responses/antigravity-validation-refusal.ts +25 -1
- package/src/server/responses/buffered-sse-json.ts +18 -1
- package/src/server/responses/codex-ws-correlation.ts +5 -2
- package/src/server/responses/codex-ws-exchange.ts +91 -8
- package/src/server/responses/codex-ws-incremental.ts +136 -0
- package/src/server/responses/codex-ws-pool.ts +22 -8
- package/src/server/responses/codex-ws-request.ts +5 -0
- package/src/server/responses/codex-ws-send-accounting.ts +8 -0
- package/src/server/responses/codex-ws-session.ts +14 -0
- package/src/server/responses/codex-ws-wire.ts +44 -22
- package/src/server/responses/combo-admission-snapshot.ts +93 -0
- package/src/server/responses/combo-required-tool-stream.ts +16 -4
- package/src/server/responses/combo-selection-keepalive.ts +5 -0
- package/src/server/responses/combo-stream-preflight.ts +182 -73
- package/src/server/responses/compact-response-body.ts +27 -0
- package/src/server/responses/compact.ts +174 -121
- package/src/server/responses/compaction-recovery.ts +7 -0
- package/src/server/responses/core-codex-account.ts +88 -62
- package/src/server/responses/core-combo-failure.ts +15 -0
- package/src/server/responses/core-combo-native.ts +12 -1
- package/src/server/responses/core-combo.ts +340 -94
- package/src/server/responses/core-normalize.ts +19 -12
- package/src/server/responses/core-opaque-recovery.ts +15 -4
- package/src/server/responses/core-options.ts +50 -5
- package/src/server/responses/core-pipeline.ts +11 -0
- package/src/server/responses/core.ts +7 -1
- package/src/server/responses/empty-completion-guard.ts +21 -7
- package/src/server/responses/estimated-usage.ts +2 -1
- package/src/server/responses/fetch-helpers.ts +95 -19
- package/src/server/responses/history-slim.ts +204 -0
- package/src/server/responses/hosted-advisor-spend.ts +49 -0
- package/src/server/responses/image-context-recovery.ts +199 -0
- package/src/server/responses/input-admission.ts +36 -11
- package/src/server/responses/jev-model-invoke.ts +23 -16
- package/src/server/responses/non-replayable-error.ts +12 -2
- package/src/server/responses/passthrough-build-error.ts +5 -3
- package/src/server/responses/passthrough-delivery.ts +74 -33
- package/src/server/responses/passthrough-dispatch.ts +170 -197
- package/src/server/responses/policy-fallback.ts +7 -2
- package/src/server/responses/policy-request-scope.ts +36 -2
- package/src/server/responses/replay-owner.ts +20 -0
- package/src/server/responses/request-prepare.ts +97 -16
- package/src/server/responses/request-send-budget.ts +97 -25
- package/src/server/responses/request-sidecar-auth.ts +138 -65
- package/src/server/responses/request-spend-target.ts +13 -1
- package/src/server/responses/request-spend.ts +228 -47
- package/src/server/responses/request-transport.ts +395 -70
- package/src/server/responses/run-turn-execution.ts +40 -9
- package/src/server/responses/sidecar-execution.ts +214 -67
- package/src/server/responses/sidecar-send-budget.ts +9 -9
- package/src/server/responses/terminal-guard.ts +35 -9
- package/src/server/responses/ws-upstream.ts +27 -6
- package/src/server/responses-phase-inference.ts +32 -9
- package/src/server/responses-terminal-repair.ts +14 -35
- package/src/server/system-env.ts +8 -5
- package/src/server/ws-bridge.ts +23 -17
- package/src/service/health-sentinel-linux.ts +16 -7
- package/src/service/systemd.ts +11 -2
- package/src/service/windows-checked-stop-live.ts +60 -55
- package/src/service/windows-checked-stop.ts +29 -11
- package/src/service/windows-guarded-manager.ts +14 -26
- package/src/service/windows-process-evidence.ts +82 -74
- package/src/service/windows-process-native.ts +69 -20
- package/src/service/windows-service-stop.ts +14 -12
- package/src/service/windows-stop-binding.ts +14 -5
- package/src/service/windows-stop-confirm.ts +1 -1
- package/src/service/windows-task-instance-stop.ts +98 -0
- package/src/service/windows-taskxml.ts +30 -7
- package/src/sidecar/anthropic-binding.ts +1 -1
- package/src/stall-timeout.ts +30 -0
- package/src/telemetry/aggregate.ts +6 -3
- package/src/types/account-auto-pause.ts +19 -1
- package/src/types/accounts.ts +21 -0
- package/src/types/anthropic-account-pool.ts +1 -1
- package/src/types/combo-capability-policy.ts +19 -0
- package/src/types/config.ts +22 -2
- package/src/types/provider.ts +42 -8
- package/src/types/request.ts +15 -0
- package/src/types/tools.ts +22 -5
- package/src/types/wire.ts +1 -0
- package/src/types.ts +4 -0
- package/src/update/check-types.ts +2 -0
- package/src/update/job.ts +8 -3
- package/src/update/managed-release.ts +6 -0
- package/src/update/orchestrated-entry.ts +13 -4
- package/src/update/refresh-scheduler.ts +17 -7
- package/src/usage/attempt-delivery.ts +6 -0
- package/src/usage/cache-provenance.ts +71 -0
- package/src/usage/cost.ts +216 -27
- package/src/usage/credit-billing.ts +88 -0
- package/src/usage/jev-stats.ts +13 -9
- package/src/usage/log.ts +5 -33
- package/src/usage/summary.ts +8 -43
- package/src/usage/user-cost-overlays.ts +13 -1
- package/src/vision/index.ts +8 -3
- package/src/vision/plan.ts +28 -14
- package/src/vision/routed-describe.ts +24 -36
- package/src/web-search/header-deadline.ts +14 -3
- package/src/web-search/index.ts +6 -4
- package/src/web-search/loop.ts +240 -78
- package/src/web-search/progress-stream.ts +29 -2
- package/src/web-search/run-turn-loop.ts +5 -1
- package/gui/dist/assets/App-BGP8I0V4.css +0 -1
- package/gui/dist/assets/App-BRExzhwL.js +0 -60
- package/gui/dist/assets/Tray-DHCWAn8V.js +0 -1
- package/gui/dist/assets/brand-mark-C70PuQ3j.js +0 -1
- package/gui/dist/assets/index-DJxM-imn.css +0 -2
- package/gui/dist/assets/index-Dy1jIGty.js +0 -138
- package/gui/dist/classic/assets/App-B4j-Txmb.css +0 -1
- package/gui/dist/classic/assets/App-CaC-E6Vl.js +0 -59
- package/gui/dist/classic/assets/Tray-BG253fiL.js +0 -1
- package/gui/dist/classic/assets/index-CR_AThOp.js +0 -138
- package/gui/dist/classic/assets/quota-summary-B7KQPpEC.js +0 -1
|
@@ -1,6 +1,7 @@
|
|
|
1
|
+
import { expandInferenceSearchSendBudget } from "../inference/context";
|
|
1
2
|
import { clientFacingModelText } from "../../lib/error-destination";
|
|
2
3
|
import { createAnthropicThinkingRecovery } from "./anthropic-thinking-recovery";
|
|
3
|
-
import { rotateAnthropicAccountOnResponseForInstance } from "../../oauth/anthropic-account-refusal";
|
|
4
|
+
import { anthropicRefusalCredentialChanged, rotateAnthropicAccountOnResponseForInstance } from "../../oauth/anthropic-account-refusal";
|
|
4
5
|
import type { ResponsesRequestContext } from "./core-options";
|
|
5
6
|
import type { PreparedResponsesRequest } from "./request-prepare";
|
|
6
7
|
import type { ResponsesTransport } from "./request-transport";
|
|
@@ -10,9 +11,12 @@ import type { ResponsesSendBudget } from "./request-send-budget";
|
|
|
10
11
|
import { formatErrorResponse } from "../../bridge";
|
|
11
12
|
import { planWebSearch, buildWebSearchTool, runWithWebSearch } from "../../web-search";
|
|
12
13
|
import { createRegisteredAdvisorPlan } from "./advisor-plan-slot";
|
|
13
|
-
import { ADVISOR_TOOL_NAME, createAdvisorSidecarStep } from "./advisor-slot";
|
|
14
|
-
import { advisorServerToolDestination, withholdAdvisorServerTools } from "../../adapters/anthropic/advisor-tool";
|
|
14
|
+
import { ADVISOR_TOOL_NAME, advisorToolAllowed, createAdvisorSidecarStep } from "./advisor-slot";
|
|
15
|
+
import { advisorServerToolDestination, hasAdvisorServerTools, withholdAdvisorServerTools } from "../../adapters/anthropic/advisor-tool";
|
|
15
16
|
import { addProtocolEntryReason } from "../../protocols/trace";
|
|
17
|
+
import { responsesHostedAdvisorSpendTarget } from "./request-spend-target";
|
|
18
|
+
import { hostedAdvisorSpendRefusalFor } from "./hosted-advisor-spend";
|
|
19
|
+
import type { HostedAdvisorSpendRefusal } from "./policy-request-scope";
|
|
16
20
|
import { buildToolBridgeMaps } from "./collaboration";
|
|
17
21
|
import {
|
|
18
22
|
planImageBridge,
|
|
@@ -25,7 +29,7 @@ import {
|
|
|
25
29
|
clampImageMaxRounds,
|
|
26
30
|
} from "../../images";
|
|
27
31
|
import type { AdapterRequest, ProviderAdapter } from "../../adapters/base";
|
|
28
|
-
import type { OcxParsedRequest, OcxUsage } from "../../types";
|
|
32
|
+
import type { OcxParsedRequest, OcxProviderConfig, OcxUsage } from "../../types";
|
|
29
33
|
import { rotateProviderTransportOn429, rateLimitRetryPolicyFor } from "../../providers/key-failover";
|
|
30
34
|
import {
|
|
31
35
|
isGenericOAuthFailoverEnabled,
|
|
@@ -51,10 +55,11 @@ import {
|
|
|
51
55
|
} from "../../oauth/anthropic-routing";
|
|
52
56
|
import { resolveWireProtocolOverride } from "../adapter-resolve";
|
|
53
57
|
import { bindRouteReasoningReplayScope, adapterNeedsForcedContinuation, adapterNeedsToolCallContinuation } from "./core-replay";
|
|
54
|
-
import { namespacedToolName,
|
|
58
|
+
import { namespacedToolName, toolChoiceCandidates } from "../../types";
|
|
55
59
|
import { providerFetch } from "./fetch-helpers";
|
|
60
|
+
import { createAnthropicImageRecovery } from "./image-context-recovery";
|
|
56
61
|
import type { AttemptRecoveryKind } from "../../usage/log";
|
|
57
|
-
import {
|
|
62
|
+
import { sealCredentialRefusal } from "../credential-recovery-attempt";
|
|
58
63
|
import { assignNativeLogConversationId, normalizeLogConversationId } from "../request-log-conversation";
|
|
59
64
|
import { attemptAccountChanged } from "../request-log-account-rotation";
|
|
60
65
|
import { rememberResponseState } from "../../responses/state";
|
|
@@ -62,6 +67,7 @@ import { trackStreamLifetime } from "../lifecycle";
|
|
|
62
67
|
import { isAntigravityRawValidationRefusal } from "./antigravity-validation-refusal";
|
|
63
68
|
import { createSidecarSendBudget } from "./sidecar-send-budget";
|
|
64
69
|
import { stripReplayedSearchPairs } from "../../web-search/sidecar-search-replay";
|
|
70
|
+
import { providerConnectTimeoutMs, providerStallTimeoutSec } from "../../stall-timeout";
|
|
65
71
|
import { settleAnthropicPerMessageEffort, shareAnthropicPerMessageEffortTurn } from "../../adapters/anthropic/per-message-effort";
|
|
66
72
|
|
|
67
73
|
/** One responsibility of the Responses request pipeline; state owners are explicit. */
|
|
@@ -72,8 +78,10 @@ export async function executeResponsesSidecars(
|
|
|
72
78
|
| "parsed"
|
|
73
79
|
| "route"
|
|
74
80
|
| "inboundWire"
|
|
81
|
+
| "subagentFallbackSelected"
|
|
75
82
|
| "selectedForwardHeaders"
|
|
76
83
|
| "translatorBudget"
|
|
84
|
+
| "completedToolBlocks"
|
|
77
85
|
| "clientToolCatalogRestriction"
|
|
78
86
|
| "toolBridgeMaps"
|
|
79
87
|
| "rememberKiroDeliveredFinalAnswer"
|
|
@@ -99,8 +107,12 @@ export async function executeResponsesSidecars(
|
|
|
99
107
|
| "resolveSelectionAdapter"
|
|
100
108
|
| "resolveCopilotSelection"
|
|
101
109
|
| "oauthDispatch"
|
|
102
|
-
| "
|
|
110
|
+
| "pinAnthropicImageRecovery"
|
|
111
|
+
| "noteRoutedAttemptSend" | "createCredentialReplayAttempt" | "credentialReplayHandoff"
|
|
112
|
+
| "commitRunTurnAttemptSend" | "commitAdapterAttemptSend" | "isCurrentInferenceResponse"
|
|
103
113
|
| "bindKeyUsageFromBridge"
|
|
114
|
+
| "hostedAdvisorSpendGuard"
|
|
115
|
+
| "initialAdapterProvider"
|
|
104
116
|
>,
|
|
105
117
|
sidecarState: Pick<ResponsesSidecarAuth, "routedCompaction" | "openAiSidecar">,
|
|
106
118
|
responseEffects: Pick<
|
|
@@ -110,7 +122,7 @@ export async function executeResponsesSidecars(
|
|
|
110
122
|
| "notifyResponseComplete"
|
|
111
123
|
| "cancelResponseCompletion"
|
|
112
124
|
>,
|
|
113
|
-
sendBudgetState: Pick<ResponsesSendBudget, "initialSendAllowance" | "sendBudgetExhausted" | "reserveCredentialHop" | "refundableAdapterDispatchBudget" | "adapterDispatchBudget" | "noteInitialDispatch" | "noteAdapterPhysicalSend" | "noteAdapterRecoveryWithheld" | "pendingHopPermit" | "dispatchSidecarSend">,
|
|
125
|
+
sendBudgetState: Pick<ResponsesSendBudget, "initialSendAllowance" | "sendBudgetExhausted" | "hasCapturedSpendCeiling" | "reserveCredentialHop" | "refundableAdapterDispatchBudget" | "adapterDispatchBudget" | "adapterSendBudget" | "noteInitialDispatch" | "noteAdapterPhysicalSend" | "noteAdapterRecoveryWithheld" | "pendingHopPermit" | "dispatchSidecarSend" | "remainingTransientSendBudget" | "targetSendsUsed" | "imageRecoverySendReporter">,
|
|
114
126
|
) {
|
|
115
127
|
const { config, options, logCtx } = requestContext;
|
|
116
128
|
const antigravityPoolActivated = requestState.route.providerName === "google-antigravity"
|
|
@@ -188,6 +200,54 @@ export async function executeResponsesSidecars(
|
|
|
188
200
|
}
|
|
189
201
|
}
|
|
190
202
|
|
|
203
|
+
// Hosted Advisor usage is not independently accounted by the main model's terminal usage.
|
|
204
|
+
// Read the actual authenticated target's captured ceilings before an optional plan can await;
|
|
205
|
+
// this query never starts or changes the main-model accounting mode.
|
|
206
|
+
const hostedAdvisorSpendScope = options.hostedAdvisorSpendScope ?? { optionalWithheld: false };
|
|
207
|
+
let hostedAdvisorSpendRefusal: HostedAdvisorSpendRefusal | undefined;
|
|
208
|
+
const explicitlySelectedHostedAdvisor = options.anthropicHostedAdvisorSelection === "selected";
|
|
209
|
+
const withholdHostedAdvisorBySpend = (request: OcxParsedRequest, provider: OcxProviderConfig, finalRefusal?: HostedAdvisorSpendRefusal) => {
|
|
210
|
+
if (!hostedAdvisorSpendScope.optionalWithheld && !hostedAdvisorSpendRefusal
|
|
211
|
+
&& (finalRefusal || hasAdvisorServerTools(parsed) || hasAdvisorServerTools(request))) {
|
|
212
|
+
const refusal = finalRefusal ?? hostedAdvisorSpendRefusalFor(provider, () =>
|
|
213
|
+
sendBudgetState.hasCapturedSpendCeiling(responsesHostedAdvisorSpendTarget(logCtx, route.providerName, provider)));
|
|
214
|
+
if (refusal) {
|
|
215
|
+
if (explicitlySelectedHostedAdvisor) hostedAdvisorSpendRefusal = refusal;
|
|
216
|
+
else hostedAdvisorSpendScope.optionalWithheld = true;
|
|
217
|
+
addProtocolEntryReason(logCtx, "advisor-tool-withheld-by-spend-policy");
|
|
218
|
+
}
|
|
219
|
+
}
|
|
220
|
+
if (hostedAdvisorSpendScope.optionalWithheld) {
|
|
221
|
+
withholdAdvisorServerTools(parsed);
|
|
222
|
+
if (request !== parsed) withholdAdvisorServerTools(request);
|
|
223
|
+
}
|
|
224
|
+
};
|
|
225
|
+
withholdHostedAdvisorBySpend(parsed, transportState.initialAdapterProvider);
|
|
226
|
+
if (hostedAdvisorSpendRefusal) {
|
|
227
|
+
releaseSearchProbeLease();
|
|
228
|
+
return hostedAdvisorSpendRefusal.response();
|
|
229
|
+
}
|
|
230
|
+
const normalizeWithheldAdvisorChoice = (request = parsed) => {
|
|
231
|
+
const choice = request.options.toolChoice;
|
|
232
|
+
// Wait for the final catalog: a client function or the later proxy Advisor may own this name.
|
|
233
|
+
if (!hostedAdvisorSpendScope.optionalWithheld || typeof choice !== "object" || choice === null || !("name" in choice)
|
|
234
|
+
|| choice.name !== ADVISOR_TOOL_NAME || toolChoiceCandidates(request.context.tools, choice.name).length !== 0) return;
|
|
235
|
+
request.options = { ...request.options, toolChoice: "auto" };
|
|
236
|
+
// The unmatched named choice authorized no earlier map entries. Charge the newly usable
|
|
237
|
+
// tools once and rebuild their delivery mappings before an adapter can emit their calls.
|
|
238
|
+
if (request === parsed) requestState.toolBridgeMaps = buildToolBridgeMaps(parsed, translatorBudget);
|
|
239
|
+
};
|
|
240
|
+
// A replacement key/OAuth identity can have a different answer from an authoritative holder.
|
|
241
|
+
// Every physical adapter builder, including sidecar copies and dispatch-time reselection,
|
|
242
|
+
// passes its resolved wire, which can differ from the rebuilt credential route's default.
|
|
243
|
+
// Withholding is monotonic across all later identities/copies.
|
|
244
|
+
transportState.hostedAdvisorSpendGuard = (request, provider, finalRefusal) => {
|
|
245
|
+
withholdHostedAdvisorBySpend(request, provider, finalRefusal);
|
|
246
|
+
if (hostedAdvisorSpendRefusal) throw hostedAdvisorSpendRefusal;
|
|
247
|
+
normalizeWithheldAdvisorChoice();
|
|
248
|
+
if (request !== parsed) normalizeWithheldAdvisorChoice(request);
|
|
249
|
+
};
|
|
250
|
+
|
|
191
251
|
// Advisor sidecar plan (optional subsystem; null when disabled, unconfigured, or when this
|
|
192
252
|
// request IS an advisor loopback consultation — the recursion fence). The plan carries
|
|
193
253
|
// request-scoped state only; preflight keeps fixed policy separate from user-role advice
|
|
@@ -205,14 +265,15 @@ export async function executeResponsesSidecars(
|
|
|
205
265
|
});
|
|
206
266
|
// Preflight only on real worker turns: a routed-compaction turn is a summarization request,
|
|
207
267
|
// and injecting advice into it would pollute the summary Codex replaces its history with.
|
|
208
|
-
|
|
268
|
+
// An explicit hosted Advisor choice reserves this turn's consultation for Anthropic.
|
|
269
|
+
if (advisorPlan && !routedCompaction && !options.anthropicHostedAdvisorSelection) {
|
|
209
270
|
await advisorPlan.preflightInject(parsed);
|
|
210
271
|
}
|
|
211
272
|
// The synthetic `advisor` owns the name for the whole turn it joins, so a typed Advisor declaration
|
|
212
273
|
// is withheld here, not only while the function is on the catalog: a later loop iteration that
|
|
213
274
|
// drops the synthetic tool must not forward it either (adapters/anthropic/advisor-tool.ts).
|
|
214
275
|
const withholdShadowedAdvisorTool = () => {
|
|
215
|
-
if (withholdAdvisorServerTools(parsed) && advisorServerToolDestination(
|
|
276
|
+
if (withholdAdvisorServerTools(parsed) && advisorServerToolDestination(transportState.initialAdapterProvider)) {
|
|
216
277
|
addProtocolEntryReason(logCtx, "advisor-tool-shadowed-by-proxy-advisor");
|
|
217
278
|
}
|
|
218
279
|
};
|
|
@@ -233,6 +294,7 @@ export async function executeResponsesSidecars(
|
|
|
233
294
|
const wsPlan = !routedCompaction
|
|
234
295
|
? planWebSearch(config, parsed, false, route.provider, route.modelId, openAiSidecar, {
|
|
235
296
|
admission: options.admission, codexAuthPolicy: options.codexAuthPolicy, providerName: route.providerName,
|
|
297
|
+
routedTransport: transportState.adapter.runTurn ? "runTurn" : "http",
|
|
236
298
|
})
|
|
237
299
|
: undefined;
|
|
238
300
|
const imgPlan = !routedCompaction ? await planImageBridge(config, parsed, route.provider) : undefined;
|
|
@@ -259,10 +321,22 @@ export async function executeResponsesSidecars(
|
|
|
259
321
|
if (refusal instanceof AdmissionModelDeniedError) sidecarScopeDenial ??= refusal;
|
|
260
322
|
};
|
|
261
323
|
const sidecarScopeRefusal = (response: Response): Response | undefined => {
|
|
262
|
-
if (
|
|
324
|
+
if (response.ok) return undefined;
|
|
325
|
+
const hostedSpendRefusal = response.status === 400 ? hostedAdvisorSpendRefusal : undefined;
|
|
326
|
+
if (!sidecarScopeDenial && !hostedSpendRefusal) return undefined;
|
|
263
327
|
void response.body?.cancel().catch(() => {});
|
|
264
328
|
releaseSearchProbeLease();
|
|
265
|
-
return admissionModelDeniedResponse(projectAdmissionModelDeniedLog(sidecarScopeDenial, logCtx))
|
|
329
|
+
return sidecarScopeDenial ? admissionModelDeniedResponse(projectAdmissionModelDeniedLog(sidecarScopeDenial, logCtx))
|
|
330
|
+
: hostedSpendRefusal?.response();
|
|
331
|
+
};
|
|
332
|
+
let sentSidecarInference = false;
|
|
333
|
+
let pendingSidecarReplay: { status: number; kind: AttemptRecoveryKind; dispatched?: boolean } | undefined;
|
|
334
|
+
let sidecarRetryKind: AttemptRecoveryKind | undefined;
|
|
335
|
+
const noteSidecarAttempt = (recovery?: AttemptRecoveryKind): void => {
|
|
336
|
+
sidecarRetryKind = recovery;
|
|
337
|
+
if (transportState.adapter.runTurn && !transportState.adapter.reportsPhysicalSends) {
|
|
338
|
+
transportState.noteRoutedAttemptSend(logCtx.usageLogInputTokens, recovery);
|
|
339
|
+
}
|
|
266
340
|
};
|
|
267
341
|
/** Admit a replacement credential, or leave the loop's original refusal authoritative. */
|
|
268
342
|
const rotateSidecarProviderOn429 = async (
|
|
@@ -270,11 +344,18 @@ export async function executeResponsesSidecars(
|
|
|
270
344
|
responseHeaders?: Headers,
|
|
271
345
|
retryParsed?: OcxParsedRequest,
|
|
272
346
|
originalResponse?: Response,
|
|
347
|
+
hiddenUsage?: OcxUsage,
|
|
273
348
|
): Promise<{ adapter: ProviderAdapter; recoveryKind: AttemptRecoveryKind } | null> => {
|
|
349
|
+
if (originalResponse && !transportState.isCurrentInferenceResponse(originalResponse)) return null;
|
|
274
350
|
const antigravityValidationResponse = canRunWebSearch && route.providerName === "google-antigravity"
|
|
275
351
|
&& route.provider.authMode === "oauth" && originalResponse?.status === 403;
|
|
276
352
|
if (route.providerName !== "kiro" && !(anthropicInstance && (originalResponse?.status === 403 || originalResponse?.status === 401))
|
|
277
353
|
&& !antigravityValidationResponse && originalResponse && originalResponse.status !== 429) return null;
|
|
354
|
+
const sealSidecarRefusal = (recovery: AttemptRecoveryKind | undefined): void => {
|
|
355
|
+
if (!originalResponse) return;
|
|
356
|
+
if (hiddenUsage) transportState.bindKeyUsageFromBridge(hiddenUsage);
|
|
357
|
+
sealCredentialRefusal(logCtx, originalResponse.status, recovery);
|
|
358
|
+
};
|
|
278
359
|
let antigravityVerification = false;
|
|
279
360
|
if (antigravityValidationResponse) {
|
|
280
361
|
if (transportState.adapter.name !== "google" || !antigravityPoolActivated
|
|
@@ -336,8 +417,7 @@ export async function executeResponsesSidecars(
|
|
|
336
417
|
return null;
|
|
337
418
|
}
|
|
338
419
|
recoveryKind = "oauth-account-403";
|
|
339
|
-
|
|
340
|
-
else sidecarBudget.ownCredentialHop(hop.permit);
|
|
420
|
+
sidecarBudget.ownCredentialHop(hop.permit);
|
|
341
421
|
}
|
|
342
422
|
const rotated = !originalResponse || originalResponse.status === 429
|
|
343
423
|
? rotateProviderTransportOn429(config, route.providerName, route.provider, {
|
|
@@ -352,6 +432,7 @@ export async function executeResponsesSidecars(
|
|
|
352
432
|
route.provider = rotated;
|
|
353
433
|
try { await resolveCopilotSelection(retryParsed ?? parsed); }
|
|
354
434
|
catch (error) { // Keep the sidecar's original refusal when replacement negotiation fails.
|
|
435
|
+
sealSidecarRefusal(recoveryKind);
|
|
355
436
|
noteSidecarScopeDenial(error);
|
|
356
437
|
return null;
|
|
357
438
|
}
|
|
@@ -365,9 +446,8 @@ export async function executeResponsesSidecars(
|
|
|
365
446
|
&& isGenericOAuthFailoverEnabled(config, route.providerName)
|
|
366
447
|
) {
|
|
367
448
|
// Intersection with the request's shared budget. The sidecar replay is dispatched by the
|
|
368
|
-
// web-search/image loop
|
|
369
|
-
//
|
|
370
|
-
// physical-send owner instead; a refusal preserves the real 429.
|
|
449
|
+
// web-search/image loop. Its guarded executor or adapter settles this reservation
|
|
450
|
+
// when the replacement is admitted to the wire.
|
|
371
451
|
const hop = reserveCredentialHop(
|
|
372
452
|
"auth-recovery",
|
|
373
453
|
`${route.providerName}|${route.modelId}|sidecar-oauth-429`,
|
|
@@ -392,19 +472,19 @@ export async function executeResponsesSidecars(
|
|
|
392
472
|
const snapshot = await failoverAccountSnapshot(route.providerName, nextAccountId);
|
|
393
473
|
if (route.providerName !== "kiro") transportState.genericFailovers += 1;
|
|
394
474
|
if (!await applyFailoverSnapshot(snapshot, retryParsed)) {
|
|
475
|
+
sealSidecarRefusal("oauth-account-429");
|
|
395
476
|
hop.permit?.release();
|
|
396
477
|
return null;
|
|
397
478
|
}
|
|
398
479
|
if (route.providerName === "kiro") transportState.genericFailovers += 1;
|
|
399
480
|
} catch (error) {
|
|
481
|
+
sealSidecarRefusal("oauth-account-429");
|
|
400
482
|
noteSidecarScopeDenial(error);
|
|
401
483
|
hop.permit?.release();
|
|
402
484
|
return null;
|
|
403
485
|
}
|
|
404
486
|
recoveryKind = "oauth-account-429";
|
|
405
|
-
|
|
406
|
-
sendBudgetState.pendingHopPermit = hop.permit;
|
|
407
|
-
else sidecarBudget.ownCredentialHop(hop.permit, (canRunWebSearch || !!imgPlan || !!vidPlan) && transportState.adapter.name === "anthropic");
|
|
487
|
+
sidecarBudget.ownCredentialHop(hop.permit);
|
|
408
488
|
} else if (
|
|
409
489
|
// Anthropic's pool is excluded from generic failover, so without this arm a 429 inside a
|
|
410
490
|
// web-search or image-bridge turn was terminal even with the pool fully enabled -- while
|
|
@@ -436,6 +516,9 @@ export async function executeResponsesSidecars(
|
|
|
436
516
|
// same way.
|
|
437
517
|
const admitted = await commitResolvedOAuthSelection(await anthropicRoutingFor(anthropicInstance).getAnthropicPoolAccessSnapshot(nextAccountId));
|
|
438
518
|
if (!admitted) throw new Error("OAuth selection changed during recovery");
|
|
519
|
+
recoveryKind = originalResponse && !anthropicRefusalCredentialChanged(originalResponse, admitted) ? "rate-limit-429"
|
|
520
|
+
: originalResponse?.status === 401 ? "oauth-401"
|
|
521
|
+
: originalResponse?.status === 403 ? "oauth-account-403" : "anthropic-oauth-429";
|
|
439
522
|
transportState.anthropicPoolAccountId = admitted.accountId;
|
|
440
523
|
transportState.anthropicPoolFailovers += 1;
|
|
441
524
|
route.provider = { ...route.provider, apiKey: admitted.accessToken };
|
|
@@ -444,9 +527,7 @@ export async function executeResponsesSidecars(
|
|
|
444
527
|
hop.permit?.release();
|
|
445
528
|
return null;
|
|
446
529
|
}
|
|
447
|
-
|
|
448
|
-
: originalResponse?.status === 403 ? "oauth-account-403" : "anthropic-oauth-429";
|
|
449
|
-
sidecarBudget.ownCredentialHop(hop.permit, (canRunWebSearch || !!imgPlan || !!vidPlan) && transportState.adapter.name === "anthropic");
|
|
530
|
+
sidecarBudget.ownCredentialHop(hop.permit);
|
|
450
531
|
} else {
|
|
451
532
|
// No key pool, no generic OAuth roster, no Anthropic pool could produce a replacement
|
|
452
533
|
// credential. The 429 is terminal for this sidecar turn.
|
|
@@ -477,8 +558,18 @@ export async function executeResponsesSidecars(
|
|
|
477
558
|
adapterName: rotatedAdapter.name,
|
|
478
559
|
...(antigravityVerification ? { oauthCredentialSnapshot: transportState.replayOAuthCredentialSnapshot } : {}),
|
|
479
560
|
});
|
|
561
|
+
if (sentSidecarInference && originalResponse && recoveryKind !== "rate-limit-429") {
|
|
562
|
+
pendingSidecarReplay = { status: originalResponse.status, kind: recoveryKind };
|
|
563
|
+
}
|
|
480
564
|
return { adapter: rotatedAdapter, recoveryKind };
|
|
481
565
|
};
|
|
566
|
+
const recoverImageContext = route.provider.anthropicImageContextRecovery === true && transportState.adapter.name === "anthropic"
|
|
567
|
+
? createAnthropicImageRecovery(requestContext, requestState, transportState, sendBudgetState, providerConnectTimeoutMs(config, route.provider) ?? 200_000)
|
|
568
|
+
: undefined;
|
|
569
|
+
// Legacy sidecar sends under spend enforcement do not carry an authoritative physical receipt.
|
|
570
|
+
const imageRecovery: typeof recoverImageContext = recoverImageContext && ((response, ...args) =>
|
|
571
|
+
sendBudgetState.adapterDispatchBudget?.spendEnforced === true
|
|
572
|
+
? Promise.resolve({ response }) : recoverImageContext(response, ...args));
|
|
482
573
|
// One guard follows the active sidecar across all iterations. Enforced spend has no
|
|
483
574
|
// authoritative receipt for earlier legacy sends, so recovery cannot claim headroom there.
|
|
484
575
|
const thinkingRecovery = createAnthropicThinkingRecovery(parsed,
|
|
@@ -490,7 +581,8 @@ export async function executeResponsesSidecars(
|
|
|
490
581
|
adapter.name !== "anthropic" ? {} : { onPhysicalDispatch: () => {
|
|
491
582
|
if (recovery === "opaque-blob-rejection") {
|
|
492
583
|
const decision = sendBudgetState.adapterDispatchBudget?.reserveDispatch({
|
|
493
|
-
sendClass: "repair", targetKey:
|
|
584
|
+
sendClass: "repair", targetKey: sendBudgetState.adapterDispatchBudget.lastTargetKey
|
|
585
|
+
?? `${route.providerName}|${request.url}|${route.modelId}`,
|
|
494
586
|
});
|
|
495
587
|
if (sendBudgetState.adapterDispatchBudget?.spendEnforced || !decision?.allowed) {
|
|
496
588
|
if (decision?.allowed) decision.permit.release();
|
|
@@ -509,15 +601,59 @@ export async function executeResponsesSidecars(
|
|
|
509
601
|
}
|
|
510
602
|
}
|
|
511
603
|
} };
|
|
604
|
+
const sidecarRequestFetch = (request: AdapterRequest, iterParsed: OcxParsedRequest, adapter: ProviderAdapter, recovery?: AttemptRecoveryKind, onPhysicalDispatch?: () => void) => {
|
|
605
|
+
const staged = pendingSidecarReplay?.kind === recovery ? pendingSidecarReplay : undefined;
|
|
606
|
+
if (!staged) pendingSidecarReplay = undefined;
|
|
607
|
+
const handoff = transportState.credentialReplayHandoff;
|
|
608
|
+
const commit = handoff ?? (staged && transportState.createCredentialReplayAttempt(staged.status, staged.kind));
|
|
609
|
+
const physicalOptions = { ...sidecarBudget.fetchOptions(adapter), ...thinkingReceipt(request, adapter, recovery) };
|
|
610
|
+
let published = false;
|
|
611
|
+
return providerFetch(route.provider, options.codexWsRuntimeIdentity, {
|
|
612
|
+
dispatchOverride: oauthDispatch(request, iterParsed, "adapter", true),
|
|
613
|
+
providerName: route.providerName, modelId: route.modelId, ...physicalOptions,
|
|
614
|
+
onPhysicalDispatch: () => {
|
|
615
|
+
if (physicalOptions.onPhysicalDispatch) physicalOptions.onPhysicalDispatch();
|
|
616
|
+
else if (!(adapter.fetchResponse && sendBudgetState.adapterDispatchBudget)
|
|
617
|
+
&& (handoff || sendBudgetState.pendingHopPermit)) {
|
|
618
|
+
const prepaid = sendBudgetState.pendingHopPermit;
|
|
619
|
+
if (!prepaid && sendBudgetState.sendBudgetExhausted()) throw new SendBudgetExhaustedError(errorDestinationLabel(request.url));
|
|
620
|
+
sendBudgetState.noteInitialDispatch(prepaid);
|
|
621
|
+
sendBudgetState.pendingHopPermit = undefined;
|
|
622
|
+
}
|
|
623
|
+
if (!adapter.fetchResponse || !published) {
|
|
624
|
+
if (commit) {
|
|
625
|
+
commit(request, adapter.name, sidecarRetryKind === recovery ? undefined : sidecarRetryKind);
|
|
626
|
+
if (staged) staged.dispatched = true;
|
|
627
|
+
if (handoff) transportState.credentialReplayHandoff = undefined;
|
|
628
|
+
} else {
|
|
629
|
+
transportState.commitAdapterAttemptSend(request, adapter.name, sidecarRetryKind);
|
|
630
|
+
}
|
|
631
|
+
published = true;
|
|
632
|
+
}
|
|
633
|
+
sentSidecarInference = true;
|
|
634
|
+
onPhysicalDispatch?.();
|
|
635
|
+
},
|
|
636
|
+
});
|
|
637
|
+
};
|
|
638
|
+
const releaseSidecarHop = (): void => {
|
|
639
|
+
if (pendingSidecarReplay && !pendingSidecarReplay.dispatched) {
|
|
640
|
+
sealCredentialRefusal(logCtx, pendingSidecarReplay.status, pendingSidecarReplay.kind);
|
|
641
|
+
}
|
|
642
|
+
pendingSidecarReplay = undefined;
|
|
643
|
+
sidecarBudget.releaseUnsentHop();
|
|
644
|
+
};
|
|
512
645
|
// A loop's hidden rounds before a rotation were spent by the account it left. Bill them to that
|
|
513
|
-
//
|
|
514
|
-
//
|
|
515
|
-
const billRotatedUsage = (usage: OcxUsage): boolean => {
|
|
646
|
+
// attempt while it is still open. A staged credential replay also starts a new row even
|
|
647
|
+
// when the account label stays the same. In-place retries keep the loop’s accumulated usage.
|
|
648
|
+
const billRotatedUsage = (usage: OcxUsage | undefined): boolean => {
|
|
516
649
|
const attempt = logCtx.activeAttempt;
|
|
517
|
-
if (!attempt || !attemptAccountChanged(attempt.accountLogLabel, logCtx.accountLogLabel, attempt.provider, logCtx.provider)) return false;
|
|
518
|
-
transportState.bindKeyUsageFromBridge(usage);
|
|
650
|
+
if (!attempt || (!pendingSidecarReplay && !attemptAccountChanged(attempt.accountLogLabel, logCtx.accountLogLabel, attempt.provider, logCtx.provider))) return false;
|
|
651
|
+
if (usage) transportState.bindKeyUsageFromBridge(usage);
|
|
519
652
|
return true;
|
|
520
653
|
};
|
|
654
|
+
const configureModelSendAllowance = !options.comboAttempt && !options.comboInitialSend && !routedCompaction
|
|
655
|
+
? (baseSends: number) => expandInferenceSearchSendBudget(options.sendBudget, baseSends)
|
|
656
|
+
: undefined;
|
|
521
657
|
if ((imgPlan || vidPlan) && wsPlan) {
|
|
522
658
|
// Web search takes priority when both are active — the media bridge cannot run
|
|
523
659
|
// alongside runWithWebSearch. Surface a runtime signal so the user knows their
|
|
@@ -568,48 +704,52 @@ export async function executeResponsesSidecars(
|
|
|
568
704
|
&& (tc.name === "image_generation" || imgPlan.toolNames.has(tc.name))) {
|
|
569
705
|
parsed.options.toolChoice = { ...tc, name: IMAGE_GEN_TOOL_NAME };
|
|
570
706
|
}
|
|
707
|
+
normalizeWithheldAdvisorChoice();
|
|
571
708
|
const imageProviderFetch = providerFetch(
|
|
572
709
|
route.provider,
|
|
573
710
|
options.codexWsRuntimeIdentity,
|
|
574
711
|
{ providerName: route.providerName, modelId: route.modelId, ...sidecarBudget.fetchOptions(transportState.adapter) },
|
|
575
712
|
);
|
|
576
713
|
const imgLoopResponse = await runWithImageBridge({
|
|
714
|
+
configureModelSendAllowance,
|
|
577
715
|
parsed, adapter: transportState.adapter,
|
|
578
716
|
chatRawReasoningVisible: options.chatRawReasoningVisible,
|
|
579
717
|
...(transportState.adapter.name === "anthropic" ? { thinkingRecovery } : {}),
|
|
718
|
+
...(imageRecovery ? { imageRecovery } : {}),
|
|
580
719
|
clientToolCatalogRestriction: route.provider.authMode === "forward" ? undefined : requestState.clientToolCatalogRestriction,
|
|
581
|
-
incomingMeta: { headers: requestState.selectedForwardHeaders, providerName: route.providerName, abortSignal: options.abortSignal, translatorBudget,
|
|
720
|
+
incomingMeta: { headers: requestState.selectedForwardHeaders, providerName: route.providerName, abortSignal: options.abortSignal, translatorBudget,
|
|
721
|
+
...(options.comboInitialSend ? { providerFetch: imageProviderFetch } : {}), ...sidecarBudget.incomingMeta,
|
|
722
|
+
// Policy facts ride every runTurn caller, independent of a combo send-budget receipt.
|
|
723
|
+
comboAttempt: options.comboAttempt === true, ...(requestState.subagentFallbackSelected ? { subagentFallback: true } : {}),
|
|
724
|
+
...(options.internalDecisionCall ? { internalDecisionCall: true } : {}),
|
|
725
|
+
...(transportState.adapter.reportsPhysicalSends ? {
|
|
726
|
+
onPhysicalSend: (send: { ordinal: number; recovery?: AttemptRecoveryKind }) => {
|
|
727
|
+
if (send.ordinal === 1) transportState.commitRunTurnAttemptSend(parsed, send.recovery);
|
|
728
|
+
sendBudgetState.noteAdapterPhysicalSend(logCtx.usageLogInputTokens, send);
|
|
729
|
+
},
|
|
730
|
+
} : {}),
|
|
731
|
+
},
|
|
582
732
|
onProducerStart: sidecarBudget.takeProducerOwnership,
|
|
583
733
|
onProducerEnd: sidecarBudget.release,
|
|
584
|
-
onIterationEnd:
|
|
734
|
+
onIterationEnd: releaseSidecarHop,
|
|
585
735
|
...(imgPlan ? { plan: imgPlan } : {}),
|
|
586
736
|
...(vidPlan ? { videoPlan: vidPlan } : {}),
|
|
587
737
|
forwardHeaders: requestState.selectedForwardHeaders,
|
|
588
|
-
onAttemptSend:
|
|
589
|
-
transportState.noteRoutedAttemptSend(logCtx.usageLogInputTokens, recovery),
|
|
738
|
+
onAttemptSend: noteSidecarAttempt,
|
|
590
739
|
abortSignal: options.abortSignal,
|
|
591
740
|
maxRounds: imgPlan && vidPlan
|
|
592
741
|
? clampImageMaxRounds(Math.min(config.images?.maxRounds ?? 3, config.images?.videoMaxRounds ?? 2))
|
|
593
742
|
: imgPlan
|
|
594
743
|
? clampImageMaxRounds(config.images?.maxRounds)
|
|
595
744
|
: clampImageMaxRounds(config.images?.videoMaxRounds ?? 2),
|
|
596
|
-
connectTimeoutMs: config.
|
|
597
|
-
stallTimeoutSec: config.
|
|
745
|
+
connectTimeoutMs: providerConnectTimeoutMs(config, route.provider) ?? 200_000,
|
|
746
|
+
stallTimeoutSec: providerStallTimeoutSec(config, route.provider), proxyErrorContext: logCtx,
|
|
598
747
|
waitForRequestSlot: imageProviderFetch.waitForPacing,
|
|
599
748
|
fetchImpl: imageProviderFetch.unpacedFetch ?? imageProviderFetch,
|
|
600
|
-
fetchForRequest: (
|
|
601
|
-
const fetch =
|
|
602
|
-
dispatchOverride: oauthDispatch(request, iterParsed),
|
|
603
|
-
providerName: route.providerName, modelId: route.modelId, ...sidecarBudget.fetchOptions(adapter),
|
|
604
|
-
...thinkingReceipt(request, adapter, recovery),
|
|
605
|
-
});
|
|
749
|
+
fetchForRequest: (...args) => {
|
|
750
|
+
const fetch = sidecarRequestFetch(...args);
|
|
606
751
|
return fetch.unpacedFetch ?? fetch;
|
|
607
752
|
},
|
|
608
|
-
onRequestBuilt: request => {
|
|
609
|
-
if (typeof request.usageLog?.inputTokens === "number") logCtx.usageLogInputTokens = request.usageLog.inputTokens;
|
|
610
|
-
recordAdapterReasoning(logCtx, request);
|
|
611
|
-
recordAdapterTier(logCtx, request);
|
|
612
|
-
},
|
|
613
753
|
...(vidPlan?.timeoutMs ? { videoTimeoutMs: vidPlan.timeoutMs } : {}),
|
|
614
754
|
onUsage: usage => {
|
|
615
755
|
// Cursor may assign _cursorConversationId inside the image loop's first runTurn;
|
|
@@ -675,8 +815,7 @@ export async function executeResponsesSidecars(
|
|
|
675
815
|
// through web-search instead of being swallowed. runTurn adapters never enter this branch.
|
|
676
816
|
if (canRunWebSearch && wsPlan) {
|
|
677
817
|
const requestedTools = parsed.context.tools ?? [];
|
|
678
|
-
const advisorAllowed = advisorPlan
|
|
679
|
-
&& toolChoiceToolPredicate(parsed.options.toolChoice, [...requestedTools, advisorPlan.tool])(advisorPlan.tool);
|
|
818
|
+
const advisorAllowed = advisorPlan && advisorToolAllowed(parsed, advisorPlan.tool);
|
|
680
819
|
const webSearchAdvisor = advisorPlan && advisorAllowed && !routedCompaction
|
|
681
820
|
&& typeof advisorPlan.consult === "function" && typeof advisorPlan.formatUnavailable === "function"
|
|
682
821
|
? advisorPlan
|
|
@@ -693,6 +832,7 @@ export async function executeResponsesSidecars(
|
|
|
693
832
|
kind: "retained_collectors",
|
|
694
833
|
});
|
|
695
834
|
}
|
|
835
|
+
normalizeWithheldAdvisorChoice();
|
|
696
836
|
// Resolve the mutable route at send time: a 429 rotation replaces route.provider, so retaining
|
|
697
837
|
// one pre-rotation providerFetch would keep the old credential and transport pin.
|
|
698
838
|
const routedProviderFetch = ((input: Parameters<typeof globalThis.fetch>[0], init?: RequestInit) =>
|
|
@@ -702,30 +842,32 @@ export async function executeResponsesSidecars(
|
|
|
702
842
|
...sidecarBudget.fetchOptions(transportState.adapter),
|
|
703
843
|
})(input, init)) as typeof globalThis.fetch;
|
|
704
844
|
const loopResponse = await runWithWebSearch({
|
|
845
|
+
terminalContinuationGuard: route.provider.terminalContinuationGuard === true
|
|
846
|
+
&& !options.comboAttempt && !routedCompaction,
|
|
847
|
+
configureModelSendAllowance,
|
|
705
848
|
emptyCompletionRetry: emptyCompletionRetryEnabled(config) && !options.comboAttempt && !routedCompaction,
|
|
706
849
|
dispatchSidecarSend: sendBudgetState.dispatchSidecarSend,
|
|
707
850
|
parsed, adapter: transportState.adapter,
|
|
708
851
|
...(webSearchAdvisor ? { advisor: createAdvisorSidecarStep(webSearchAdvisor as Parameters<typeof createAdvisorSidecarStep>[0]) } : {}),
|
|
709
852
|
chatRawReasoningVisible: options.chatRawReasoningVisible,
|
|
710
853
|
...(transportState.adapter.name === "anthropic" ? { thinkingRecovery } : {}),
|
|
854
|
+
...(imageRecovery ? { imageRecovery } : {}),
|
|
711
855
|
clientToolCatalogRestriction: route.provider.authMode === "forward" ? undefined : requestState.clientToolCatalogRestriction,
|
|
712
|
-
onIterationEnd:
|
|
713
|
-
fetchForRequest: (
|
|
714
|
-
|
|
715
|
-
providerName: route.providerName, modelId: route.modelId, ...sidecarBudget.fetchOptions(adapter),
|
|
716
|
-
...thinkingReceipt(request, adapter, recovery),
|
|
717
|
-
}),
|
|
856
|
+
onIterationEnd: releaseSidecarHop,
|
|
857
|
+
fetchForRequest: (...args) =>
|
|
858
|
+
Object.assign(sidecarRequestFetch(...args), { reportsPhysicalDispatch: true as const }),
|
|
718
859
|
incomingMeta: {
|
|
719
860
|
headers: requestState.selectedForwardHeaders,
|
|
720
861
|
providerName: route.providerName,
|
|
721
862
|
abortSignal: options.abortSignal,
|
|
722
863
|
translatorBudget,
|
|
723
864
|
providerFetch: routedProviderFetch,
|
|
724
|
-
...
|
|
725
|
-
|
|
726
|
-
|
|
727
|
-
|
|
728
|
-
} :
|
|
865
|
+
...sidecarBudget.incomingMeta,
|
|
866
|
+
...(!options.comboInitialSend && route.providerName === "google-antigravity"
|
|
867
|
+
? { sendBudget: sendBudgetState.refundableAdapterDispatchBudget } : {}),
|
|
868
|
+
comboAttempt: options.comboAttempt === true,
|
|
869
|
+
...(requestState.subagentFallbackSelected ? { subagentFallback: true } : {}),
|
|
870
|
+
...(options.internalDecisionCall ? { internalDecisionCall: true } : {}),
|
|
729
871
|
},
|
|
730
872
|
backend: wsPlan.backend,
|
|
731
873
|
forwardProvider: wsPlan.forwardSidecar?.provider,
|
|
@@ -744,21 +886,16 @@ export async function executeResponsesSidecars(
|
|
|
744
886
|
escapeMemoryCitationTags: inboundWire !== "chat" && inboundWire !== "anthropic",
|
|
745
887
|
abortSignal: options.abortSignal,
|
|
746
888
|
onFirstOutput: noteSidecarOutput,
|
|
747
|
-
|
|
748
|
-
if (typeof request.usageLog?.inputTokens === "number") logCtx.usageLogInputTokens = request.usageLog.inputTokens;
|
|
749
|
-
recordAdapterReasoning(logCtx, request);
|
|
750
|
-
recordAdapterTier(logCtx, request);
|
|
751
|
-
},
|
|
752
|
-
onAttemptSend: (recovery?: AttemptRecoveryKind) =>
|
|
753
|
-
transportState.noteRoutedAttemptSend(logCtx.usageLogInputTokens, recovery),
|
|
889
|
+
onAttemptSend: noteSidecarAttempt,
|
|
754
890
|
onUsage: usage => {
|
|
755
891
|
transportState.bindKeyUsageFromBridge(usage);
|
|
756
892
|
},
|
|
757
893
|
recordSidecarOutcome: wsPlan.forwardSidecar?.recordOutcome,
|
|
758
894
|
beforeSidecarDispatch: wsPlan.forwardSidecar?.beforeDispatch,
|
|
759
|
-
connectTimeoutMs: config.
|
|
895
|
+
connectTimeoutMs: providerConnectTimeoutMs(config, route.provider) ?? 200_000,
|
|
760
896
|
routedModelStallTimeoutMs: wsPlan.routedModelStallTimeoutMs,
|
|
761
897
|
stallTimeoutSec: wsPlan.stallTimeoutSec, proxyErrorContext: logCtx,
|
|
898
|
+
onLocalFailure: options.onWebSearchLocalFailure,
|
|
762
899
|
streamRoutedModelOutput: wsPlan.streamRoutedModelOutput,
|
|
763
900
|
on429: rotateSidecarProviderOn429,
|
|
764
901
|
onRotatedUsage: billRotatedUsage,
|
|
@@ -766,6 +903,7 @@ export async function executeResponsesSidecars(
|
|
|
766
903
|
// The next Antigravity adapter dispatch claims this permit. If request construction,
|
|
767
904
|
// admission or cancellation stopped it first, return the unused send allowance.
|
|
768
905
|
const permit = sendBudgetState.pendingHopPermit;
|
|
906
|
+
releaseSidecarHop();
|
|
769
907
|
sendBudgetState.pendingHopPermit = undefined;
|
|
770
908
|
permit?.release();
|
|
771
909
|
} } : {}),
|
|
@@ -781,6 +919,7 @@ export async function executeResponsesSidecars(
|
|
|
781
919
|
notifyResponseComplete(response);
|
|
782
920
|
},
|
|
783
921
|
});
|
|
922
|
+
if (loopResponse.ok && parsed.stream) options.onHostedWebSearchStream?.();
|
|
784
923
|
const wsScopeRefusal = sidecarScopeRefusal(loopResponse);
|
|
785
924
|
if (wsScopeRefusal) return wsScopeRefusal;
|
|
786
925
|
// A routed Anthropic model whose last pool account refused on spent quota fails the loop's
|
|
@@ -818,6 +957,13 @@ export async function executeResponsesSidecars(
|
|
|
818
957
|
// run-turn adapter, not compaction). Web-search handles advisor in its own loop above; the
|
|
819
958
|
// image/video and run-turn loops cannot intercept it. Preflight still applies to those paths.
|
|
820
959
|
if (advisorPlan && !routedCompaction && !transportState.adapter.runTurn && !wsPlan && !imgPlan && !vidPlan) {
|
|
960
|
+
if (!advisorToolAllowed(parsed, advisorPlan.tool)) {
|
|
961
|
+
// Keep the refusal guard without injecting or shadowing tools. Direct Messages delivery
|
|
962
|
+
// must not expose a forbidden synthetic call merely because it was never advertised.
|
|
963
|
+
normalizeWithheldAdvisorChoice();
|
|
964
|
+
advisorPlan.attachGuard(parsed);
|
|
965
|
+
return undefined;
|
|
966
|
+
}
|
|
821
967
|
// A client-declared tool named "advisor" would collide with the synthetic injection (one
|
|
822
968
|
// wire name, two schemas); the synthetic runtime owns the name for this turn.
|
|
823
969
|
parsed.context.tools = [
|
|
@@ -840,5 +986,6 @@ export async function executeResponsesSidecars(
|
|
|
840
986
|
advisorPlan.attachGuard(parsed);
|
|
841
987
|
}
|
|
842
988
|
|
|
989
|
+
normalizeWithheldAdvisorChoice();
|
|
843
990
|
return undefined;
|
|
844
991
|
}
|
|
@@ -21,32 +21,32 @@ export function createSidecarSendBudget(
|
|
|
21
21
|
permit?.release();
|
|
22
22
|
};
|
|
23
23
|
return {
|
|
24
|
-
/** Retain
|
|
25
|
-
ownCredentialHop(permit?: SingleUseDispatchPermit
|
|
26
|
-
if (!initial && !retainUntilDispatch) { permit?.use(); return; } // Preserve direct callers' reporting contract.
|
|
24
|
+
/** Retain the hop until guarded dispatch or iteration cleanup. */
|
|
25
|
+
ownCredentialHop(permit?: SingleUseDispatchPermit): void {
|
|
27
26
|
releaseHop();
|
|
28
27
|
hopPermit = permit;
|
|
29
28
|
budget.pendingHopPermit = permit;
|
|
30
29
|
},
|
|
31
30
|
// Adapter-owned transports settle through the live dispatch view, not an HTTP receipt too.
|
|
32
|
-
incomingMeta:
|
|
33
|
-
comboAttempt: options.comboAttempt === true,
|
|
31
|
+
incomingMeta: {
|
|
32
|
+
...(initial ? { comboAttempt: options.comboAttempt === true } : {}),
|
|
34
33
|
sendBudget: budget.adapterDispatchBudget,
|
|
35
34
|
onPhysicalSend: send => budget.noteAdapterPhysicalSend(inputTokens(), send),
|
|
36
35
|
onRecoveryWithheld: budget.noteAdapterRecoveryWithheld,
|
|
37
|
-
} satisfies Partial<IncomingMeta
|
|
36
|
+
} satisfies Partial<IncomingMeta>,
|
|
38
37
|
/** Attach HTTP receipts only when the adapter does not own physical dispatch. */
|
|
39
38
|
fetchOptions(adapter: ProviderAdapter): Pick<ProviderFetchOptions, "onPhysicalDispatch"> {
|
|
40
|
-
return
|
|
39
|
+
return !adapter.fetchResponse && !adapter.runTurn
|
|
41
40
|
? { onPhysicalDispatch: () => {
|
|
42
41
|
const prepaid = budget.pendingHopPermit;
|
|
43
42
|
budget.pendingHopPermit = undefined;
|
|
44
|
-
budget.noteInitialDispatch(prepaid);
|
|
43
|
+
budget.noteInitialDispatch(prepaid, true);
|
|
45
44
|
} } : {};
|
|
46
45
|
},
|
|
47
46
|
/** Transfer cleanup to the asynchronous producer before it can outlive the response. */
|
|
48
47
|
takeProducerOwnership(): void {
|
|
49
|
-
if (initial)
|
|
48
|
+
if (initial) initial.producerOwned = true;
|
|
49
|
+
producerActive = true;
|
|
50
50
|
},
|
|
51
51
|
/** Release unused bookings only after the owning producer has settled. */
|
|
52
52
|
release(): void {
|