@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,23 +1,23 @@
|
|
|
1
|
+
import { credentialRecoveryStatus } from "../request-log-attempt-recovery";
|
|
2
|
+
import { sealCredentialRefusal } from "../credential-recovery-attempt";
|
|
1
3
|
import { carryProxyError, proxyErrorPresentation, isProxyError, rememberProxyErrorMessage } from "../../lib/client-error-body";
|
|
2
4
|
import { providerAffinityGenerationIsCurrent } from "../../providers/api-key-selection";
|
|
3
5
|
import { bindAnthropicRejectionResponse } from "../../adapters/anthropic-rejection-memo";
|
|
6
|
+
import { hostedAdvisorCredentials } from "../../adapters/anthropic/advisor-tool";
|
|
4
7
|
import { deferPhysicalSendReporter } from "./deferred-send-reporter";
|
|
5
8
|
import { responsesSpendTarget } from "./request-spend-target";
|
|
6
|
-
import {
|
|
7
|
-
import
|
|
9
|
+
import { adapterResponseSpendObserver, bindAdapterResponseSpend } from "./request-spend";
|
|
10
|
+
import { anthropicRefusalCredentialChanged, rotateAnthropicAccountOnResponseForInstance } from "../../oauth/anthropic-account-refusal";
|
|
11
|
+
import { responsesTimeoutProvider, type ResponsesRequestContext } from "./core-options";
|
|
8
12
|
import type { PreparedResponsesRequest } from "./request-prepare";
|
|
9
13
|
import type { ResponsesTransport } from "./request-transport";
|
|
10
14
|
import type { ResponsesSidecarAuth } from "./request-sidecar-auth";
|
|
11
15
|
import type { ResponsesSendBudget } from "./request-send-budget";
|
|
12
16
|
import type { AdapterExchange } from "./adapter-dispatch";
|
|
13
|
-
import type { OcxParsedRequest, AdapterEvent } from "../../types";
|
|
17
|
+
import type { OcxParsedRequest, AdapterEvent, OcxUsage } from "../../types";
|
|
14
18
|
import type { AttemptRecoveryKind } from "../../usage/log";
|
|
15
19
|
import type { AdapterRequest } from "../../adapters/base";
|
|
16
20
|
import {
|
|
17
|
-
recordAdapterReasoning,
|
|
18
|
-
recordAdapterTier,
|
|
19
|
-
sealRequestAttemptIdentity,
|
|
20
|
-
recordAttemptCredentialSource,
|
|
21
21
|
} from "../request-log";
|
|
22
22
|
import { noteAttemptRecoveryWithheld } from "../request-log";
|
|
23
23
|
import { withProviderRequestSlot } from "../../providers/request-pacing";
|
|
@@ -39,6 +39,7 @@ import {
|
|
|
39
39
|
} from "../../lib/upstream-retry";
|
|
40
40
|
import { unwrapUpstreamRetryEvidenceError } from "../../codex/auth-context";
|
|
41
41
|
import { AdmissionModelDeniedError, MODEL_NOT_ALLOWED_FOR_KEY } from "../admission-model-scope";
|
|
42
|
+
import { HostedAdvisorSpendRefusal } from "./policy-request-scope";
|
|
42
43
|
import { redactSecretString } from "../../lib/redact";
|
|
43
44
|
import { resolveWireProtocolOverride } from "../adapter-resolve";
|
|
44
45
|
import { bindRouteReasoningReplayScope } from "./core-replay";
|
|
@@ -66,7 +67,7 @@ import {
|
|
|
66
67
|
readResponseStreamWithInactivity,
|
|
67
68
|
ResponseBodyInactivityError,
|
|
68
69
|
} from "../../lib/response-body-inactivity";
|
|
69
|
-
import { resolveStallTimeoutMs } from "../../stall-timeout";
|
|
70
|
+
import { providerStallTimeoutSec, resolveStallTimeoutMs } from "../../stall-timeout";
|
|
70
71
|
import { guardTerminalEventStream } from "./terminal-guard";
|
|
71
72
|
|
|
72
73
|
/** One responsibility of the Responses request pipeline; state owners are explicit. */
|
|
@@ -104,7 +105,7 @@ export function createAdapterContinuations(
|
|
|
104
105
|
| "genericFailoverLimit" | "anthropicFailoverLimit"
|
|
105
106
|
| "applyFailoverSnapshot"
|
|
106
107
|
| "replayOAuthCredentialSnapshot"
|
|
107
|
-
| "
|
|
108
|
+
| "commitAdapterAttemptSend" | "createCredentialReplayAttempt" | "isCurrentInferenceResponse"
|
|
108
109
|
>,
|
|
109
110
|
sidecarState: Pick<ResponsesSidecarAuth, "routedCompaction">,
|
|
110
111
|
sendBudgetState: Pick<
|
|
@@ -161,6 +162,7 @@ export function createAdapterContinuations(
|
|
|
161
162
|
return { type: "error", message: "client closed request during terminal continuation", status: 499 };
|
|
162
163
|
}
|
|
163
164
|
const refusal = unwrapUpstreamRetryEvidenceError(error);
|
|
165
|
+
if (refusal instanceof HostedAdvisorSpendRefusal) return refusal.event();
|
|
164
166
|
if (refusal instanceof AdmissionModelDeniedError || refusal instanceof SendBudgetExhaustedError) rememberProxyErrorMessage(logCtx, refusal.message, { status: refusal instanceof AdmissionModelDeniedError ? 403 : 429,
|
|
165
167
|
type: refusal instanceof AdmissionModelDeniedError ? MODEL_NOT_ALLOWED_FOR_KEY : "rate_limit_error", code: refusal instanceof AdmissionModelDeniedError ? MODEL_NOT_ALLOWED_FOR_KEY : refusal.code, presentation: refusal instanceof AdmissionModelDeniedError ? "scope" : "send" });
|
|
166
168
|
if (refusal instanceof AdmissionModelDeniedError) {
|
|
@@ -220,6 +222,8 @@ export function createAdapterContinuations(
|
|
|
220
222
|
* replays).
|
|
221
223
|
*/
|
|
222
224
|
const fetchContinuation = async (recoveryKind?: AttemptRecoveryKind): Promise<Response> => {
|
|
225
|
+
const replay = recoveryKind && credentialRecoveryStatus(recoveryKind) !== undefined && response && logCtx.activeAttempt?.sendCount
|
|
226
|
+
? transportState.createCredentialReplayAttempt(response.status, recoveryKind) : undefined;
|
|
223
227
|
let continuationRequest: AdapterRequest | undefined;
|
|
224
228
|
if (transportState.sameTargetRequest !== undefined && transportState.sameTargetParsed === nextParsed && transportState.sameTargetToken === transportState.transportToken) {
|
|
225
229
|
// Same target (key/adapter/parsed/tier unchanged): replay the exact cached request.
|
|
@@ -233,8 +237,6 @@ export function createAdapterContinuations(
|
|
|
233
237
|
abortSignal: upstream.signal,
|
|
234
238
|
...(transportState.imageTierBias > 0 ? { imageTierBias: transportState.imageTierBias } : {}),
|
|
235
239
|
});
|
|
236
|
-
recordAdapterReasoning(logCtx, continuationRequest);
|
|
237
|
-
recordAdapterTier(logCtx, continuationRequest);
|
|
238
240
|
} catch (err) {
|
|
239
241
|
// The main body is already streaming, so there is no HTTP error surface: release
|
|
240
242
|
// any partial body observation and surface the failure as an in-stream error via
|
|
@@ -253,12 +255,19 @@ export function createAdapterContinuations(
|
|
|
253
255
|
const continuationEstimate = typeof builtContinuationRequest.usageLog?.inputTokens === "number"
|
|
254
256
|
? builtContinuationRequest.usageLog.inputTokens
|
|
255
257
|
: undefined;
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
258
|
+
const commit = (physicalRecovery?: AttemptRecoveryKind): void => {
|
|
259
|
+
const adapter = transportState.activeAdapter.name;
|
|
260
|
+
if (replay) replay(builtContinuationRequest, adapter, physicalRecovery);
|
|
261
|
+
else transportState.commitAdapterAttemptSend(builtContinuationRequest, adapter, physicalRecovery ?? recoveryKind);
|
|
262
|
+
};
|
|
259
263
|
try {
|
|
260
264
|
if (transportState.activeAdapter.fetchResponse) {
|
|
261
|
-
|
|
265
|
+
let published = false;
|
|
266
|
+
const publish = (): void => {
|
|
267
|
+
if (published) return;
|
|
268
|
+
commit();
|
|
269
|
+
published = true;
|
|
270
|
+
};
|
|
262
271
|
const producer = adapterDispatchBudget?.beginSpendProducer?.();
|
|
263
272
|
try {
|
|
264
273
|
return await withProviderRequestSlot(route.providerName, route.provider, nextParsed.modelId, upstream.signal, pacingSlot =>
|
|
@@ -267,13 +276,17 @@ export function createAdapterContinuations(
|
|
|
267
276
|
abortSignal: upstream.signal,
|
|
268
277
|
timeoutMs: route.provider.authMode === "forward" ? connectMs : 0,
|
|
269
278
|
sendBudget: adapterDispatchBudget,
|
|
270
|
-
onPhysicalSend: send =>
|
|
279
|
+
onPhysicalSend: send => {
|
|
280
|
+
if (transportState.activeAdapter.reportsPhysicalSends) publish();
|
|
281
|
+
noteAdapterPhysicalSend(continuationEstimate, send);
|
|
282
|
+
},
|
|
271
283
|
onRecoveryWithheld: noteAdapterRecoveryWithheld,
|
|
272
284
|
stream: nextParsed.stream,
|
|
273
285
|
executor: providerFetch(route.provider, options.codexWsRuntimeIdentity, {
|
|
274
286
|
pacingSlotAcquired: true,
|
|
275
287
|
pacingSlot,
|
|
276
|
-
dispatchOverride: oauthDispatch(builtContinuationRequest, nextParsed),
|
|
288
|
+
dispatchOverride: oauthDispatch(builtContinuationRequest, nextParsed, "adapter", true),
|
|
289
|
+
onPhysicalDispatch: publish,
|
|
277
290
|
providerName: route.providerName,
|
|
278
291
|
modelId: nextParsed.modelId,
|
|
279
292
|
}),
|
|
@@ -287,13 +300,14 @@ export function createAdapterContinuations(
|
|
|
287
300
|
? fetchWithTransientRetry
|
|
288
301
|
: fetchWithResetRetry;
|
|
289
302
|
const continuationReporter = transientSendReporter();
|
|
290
|
-
const
|
|
291
|
-
|
|
303
|
+
const countsContinuationSends = continuationTransientPolicy || anthropicInstance || sendBudgetState.adapterSendBudget?.spendEnforced;
|
|
304
|
+
const deferredContinuation = countsContinuationSends && (hostedAdvisorCredentials.has(builtContinuationRequest)
|
|
305
|
+
|| ((continuationTransientPolicy || sendBudgetState.adapterSendBudget?.spendEnforced)
|
|
306
|
+
&& route.providerName === "github-copilot" && route.provider.authMode !== "forward"))
|
|
292
307
|
? deferPhysicalSendReporter(continuationReporter) : undefined;
|
|
293
|
-
|
|
308
|
+
const continuationResponse = await fetchContinuationWithRetryPolicy(
|
|
294
309
|
recovery => {
|
|
295
310
|
sendBudgetState.adapterSendBudget?.startRequest?.(responsesSpendTarget(logCtx, route.providerName));
|
|
296
|
-
transportState.noteRoutedAttemptSend(continuationEstimate, recovery ?? replayKind);
|
|
297
311
|
return fetchWithHeaderTimeout(
|
|
298
312
|
builtContinuationRequest.url,
|
|
299
313
|
applyUpstreamRecoveryInit({
|
|
@@ -305,10 +319,11 @@ export function createAdapterContinuations(
|
|
|
305
319
|
route.provider.authMode === "forward" ? connectMs : 0,
|
|
306
320
|
nextParsed.stream,
|
|
307
321
|
providerFetch(route.provider, options.codexWsRuntimeIdentity, {
|
|
308
|
-
|
|
309
|
-
onPhysicalDispatch:
|
|
310
|
-
if (!deferredContinuation.beforeDispatch()) throw new SendBudgetExhaustedError(errorDestinationLabel(builtContinuationRequest.url));
|
|
311
|
-
|
|
322
|
+
dispatchOverride: oauthDispatch(builtContinuationRequest, nextParsed, "adapter", true),
|
|
323
|
+
onPhysicalDispatch: () => {
|
|
324
|
+
if (deferredContinuation && !deferredContinuation.beforeDispatch()) throw new SendBudgetExhaustedError(errorDestinationLabel(builtContinuationRequest.url));
|
|
325
|
+
commit(recovery);
|
|
326
|
+
},
|
|
312
327
|
providerName: route.providerName,
|
|
313
328
|
modelId: nextParsed.modelId,
|
|
314
329
|
}),
|
|
@@ -320,7 +335,7 @@ export function createAdapterContinuations(
|
|
|
320
335
|
// Same request-scoped budget as the initial send and the 429/rotation refetches:
|
|
321
336
|
// a terminal-guard continuation is another leg of ONE request, so handing it a
|
|
322
337
|
// fresh `attempts` would let one request exceed the configured total-send ceiling.
|
|
323
|
-
...(
|
|
338
|
+
...(countsContinuationSends
|
|
324
339
|
? {
|
|
325
340
|
attempts: Math.min(continuationTransientPolicy?.attempts ?? 1,
|
|
326
341
|
remainingTransientSendBudget(continuationTransientPolicy?.attempts ?? 1)
|
|
@@ -329,7 +344,11 @@ export function createAdapterContinuations(
|
|
|
329
344
|
}
|
|
330
345
|
: {}),
|
|
331
346
|
},
|
|
332
|
-
|
|
347
|
+
);
|
|
348
|
+
if (nextParsed._anthropicImageOwner && sendBudgetState.adapterSendBudget?.spendEnforced) {
|
|
349
|
+
bindAdapterResponseSpend(continuationResponse, continuationReporter.recordUsage);
|
|
350
|
+
}
|
|
351
|
+
return continuationResponse;
|
|
333
352
|
} finally {
|
|
334
353
|
builtContinuationRequest.releaseBodyObservation?.();
|
|
335
354
|
}
|
|
@@ -383,6 +402,7 @@ export function createAdapterContinuations(
|
|
|
383
402
|
// loop; only after the attempts are exhausted does the continuation fail over.
|
|
384
403
|
while (
|
|
385
404
|
response.status === 429
|
|
405
|
+
&& transportState.isCurrentInferenceResponse(response)
|
|
386
406
|
&& !replaySetupFailed
|
|
387
407
|
// A synthesized replay refusal is not a rate limit; replaying the continuation on
|
|
388
408
|
// it would re-send a turn whose first send may already have been processed.
|
|
@@ -429,6 +449,7 @@ export function createAdapterContinuations(
|
|
|
429
449
|
}
|
|
430
450
|
}
|
|
431
451
|
|
|
452
|
+
if (response.status === 429 && !transportState.isCurrentInferenceResponse(response)) break;
|
|
432
453
|
if (response.status === 429 && !isNonReplayableResponse(response) && hasKeyPoolFailover(route.provider)) {
|
|
433
454
|
const rotated = rotateProviderTransportOn429(config, route.providerName, route.provider, {
|
|
434
455
|
retryAfter: response.headers.get("retry-after"),
|
|
@@ -437,6 +458,7 @@ export function createAdapterContinuations(
|
|
|
437
458
|
promptCacheKey: nextParsed.options.promptCacheKey,
|
|
438
459
|
});
|
|
439
460
|
if (rotated) {
|
|
461
|
+
sealCredentialRefusal(logCtx, response.status, "key-429");
|
|
440
462
|
try { void response.body?.cancel().catch(() => {}); } catch { /* already closed */ }
|
|
441
463
|
route.provider = rotated;
|
|
442
464
|
try { await transportState.resolveCopilotSelection(nextParsed); }
|
|
@@ -487,9 +509,13 @@ export function createAdapterContinuations(
|
|
|
487
509
|
if (!nextAccountId) hop.permit?.release();
|
|
488
510
|
if (nextAccountId) {
|
|
489
511
|
captureRefusalAttribution();
|
|
512
|
+
const recovery = response.status === 401 ? "oauth-401"
|
|
513
|
+
: response.status === 403 ? "oauth-account-403" : "anthropic-oauth-429";
|
|
490
514
|
try {
|
|
491
515
|
const admitted = await commitResolvedOAuthSelection(await anthropicRoutingFor(anthropicInstance).getAnthropicPoolAccessSnapshot(nextAccountId));
|
|
492
516
|
if (!admitted) throw new Error("OAuth selection changed during recovery");
|
|
517
|
+
const changed = anthropicRefusalCredentialChanged(response, admitted);
|
|
518
|
+
if (changed) sealCredentialRefusal(logCtx, response.status, recovery);
|
|
493
519
|
transportState.anthropicPoolAccountId = admitted.accountId;
|
|
494
520
|
transportState.anthropicPoolFailovers += 1;
|
|
495
521
|
route.provider = { ...route.provider, apiKey: admitted.accessToken };
|
|
@@ -509,10 +535,8 @@ export function createAdapterContinuations(
|
|
|
509
535
|
oauthCredentialSnapshot: transportState.replayOAuthCredentialSnapshot,
|
|
510
536
|
});
|
|
511
537
|
}
|
|
512
|
-
|
|
513
|
-
|
|
514
|
-
nextContinuationRecoveryKind = response.status === 401 ? "oauth-401"
|
|
515
|
-
: response.status === 403 ? "oauth-account-403" : "anthropic-oauth-429";
|
|
538
|
+
|
|
539
|
+
nextContinuationRecoveryKind = changed ? recovery : "rate-limit-429";
|
|
516
540
|
sendBudgetState.pendingHopPermit = hop.permit;
|
|
517
541
|
refusalPendingReplay = response;
|
|
518
542
|
continue;
|
|
@@ -577,6 +601,7 @@ export function createAdapterContinuations(
|
|
|
577
601
|
)) noteAttemptRecoveryWithheld(logCtx.activeAttempt, "rotation-send-budget");
|
|
578
602
|
if (!nextAccountId) hop.permit?.release();
|
|
579
603
|
if (nextAccountId) {
|
|
604
|
+
sealCredentialRefusal(logCtx, response.status, "oauth-account-429");
|
|
580
605
|
try {
|
|
581
606
|
// The FULL snapshot through the shared helper, never a bare bearer: Antigravity
|
|
582
607
|
// pairs an account-matched projectId with its token and Kiro carries routing
|
|
@@ -609,8 +634,7 @@ export function createAdapterContinuations(
|
|
|
609
634
|
adapterName: transportState.activeAdapter.name,
|
|
610
635
|
oauthCredentialSnapshot: transportState.replayOAuthCredentialSnapshot,
|
|
611
636
|
});
|
|
612
|
-
|
|
613
|
-
recordAttemptCredentialSource(logCtx.activeAttempt, route.providerName, route.provider, transportState.activeAdapter.name);
|
|
637
|
+
|
|
614
638
|
// The replay goes out on the next iteration. An adapter that owns its ladder
|
|
615
639
|
// reserves for that send itself, so hand this reservation down rather than let it
|
|
616
640
|
// take a second one for the same replay. A helper-routed replay carries the
|
|
@@ -668,6 +692,7 @@ export function createAdapterContinuations(
|
|
|
668
692
|
)) noteAttemptRecoveryWithheld(logCtx.activeAttempt, "rotation-send-budget");
|
|
669
693
|
if (!nextAccountId) hop.permit?.release();
|
|
670
694
|
if (nextAccountId) {
|
|
695
|
+
sealCredentialRefusal(logCtx, response.status, "oauth-account-429");
|
|
671
696
|
try { void response.body?.cancel().catch(() => {}); } catch { /* already closed */ }
|
|
672
697
|
try {
|
|
673
698
|
// The FULL snapshot through the shared helper, never a bare bearer: Antigravity
|
|
@@ -700,8 +725,7 @@ export function createAdapterContinuations(
|
|
|
700
725
|
adapterName: transportState.activeAdapter.name,
|
|
701
726
|
oauthCredentialSnapshot: transportState.replayOAuthCredentialSnapshot,
|
|
702
727
|
});
|
|
703
|
-
|
|
704
|
-
recordAttemptCredentialSource(logCtx.activeAttempt, route.providerName, route.provider, transportState.activeAdapter.name);
|
|
728
|
+
|
|
705
729
|
// The replay goes out on the next iteration. An adapter that owns its ladder
|
|
706
730
|
// reserves for that send itself, so hand this reservation down rather than let it
|
|
707
731
|
// take a second one for the same replay. A helper-routed replay carries the
|
|
@@ -770,18 +794,25 @@ export function createAdapterContinuations(
|
|
|
770
794
|
// The shared signal is not aborted on timeout: this generator must still emit
|
|
771
795
|
// the error that the already-live Responses bridge turns into a terminal.
|
|
772
796
|
const parse = async function* (current: Response): AsyncGenerator<AdapterEvent> {
|
|
773
|
-
const bodyInactivityMs = resolveStallTimeoutMs(config.
|
|
797
|
+
const bodyInactivityMs = resolveStallTimeoutMs(providerStallTimeoutSec(config, responsesTimeoutProvider(options, route.provider)), { localUpstream: isLocalUpstream(transportState.sameTargetRequest?.url ?? route.provider.baseUrl) });
|
|
774
798
|
if (!current.ok) {
|
|
775
799
|
yield await adapterExchange.thinkingSignatureRecovery.projectHttpFailure(current, upstream.signal);
|
|
776
|
-
|
|
777
|
-
|
|
778
|
-
|
|
779
|
-
} else if (transportState.activeAdapter.parseResponse) {
|
|
780
|
-
yield* await readResponseBodyWithInactivity(current, upstream.signal, bodyInactivityMs,
|
|
781
|
-
guarded => transportState.activeAdapter.parseResponse!(guarded, translatorBudget, logCtx.activeTierMetadata));
|
|
782
|
-
} else {
|
|
800
|
+
return;
|
|
801
|
+
}
|
|
802
|
+
if (!nextParsed.stream && !transportState.activeAdapter.parseResponse) {
|
|
783
803
|
try { void current.body?.cancel().catch(() => {}); } catch { /* closed */ }
|
|
784
804
|
yield { type: "error", message: "Provider continuation does not support response parsing" };
|
|
805
|
+
return;
|
|
806
|
+
}
|
|
807
|
+
const observeSpend = adapterResponseSpendObserver(current);
|
|
808
|
+
const events = nextParsed.stream
|
|
809
|
+
? readResponseStreamWithInactivity(current, upstream.signal, bodyInactivityMs,
|
|
810
|
+
guarded => transportState.activeAdapter.parseStream(guarded, translatorBudget, logCtx.activeTierMetadata))
|
|
811
|
+
: await readResponseBodyWithInactivity(current, upstream.signal, bodyInactivityMs,
|
|
812
|
+
guarded => transportState.activeAdapter.parseResponse!(guarded, translatorBudget, logCtx.activeTierMetadata));
|
|
813
|
+
for await (const event of events) {
|
|
814
|
+
observeSpend?.(event);
|
|
815
|
+
yield event;
|
|
785
816
|
}
|
|
786
817
|
};
|
|
787
818
|
yield* adapterExchange.thinkingSignatureRecovery.wrap(parse(response), async function* () {
|
|
@@ -806,7 +837,8 @@ export function createAdapterContinuations(
|
|
|
806
837
|
}
|
|
807
838
|
};
|
|
808
839
|
|
|
809
|
-
|
|
840
|
+
// The delivery's onHiddenUsage, so a re-ask inside the retry keeps its legs off the client terminal (#8877).
|
|
841
|
+
const fetchGuardedEmptyCompletionRetry = (onHiddenUsage?: (usage: OcxUsage) => void): AsyncIterable<AdapterEvent> => {
|
|
810
842
|
const retryEvents = fetchTerminalGuardContinuation(parsed, "empty-completion", true);
|
|
811
843
|
const terminalGuardedRetry = terminalGuardEnabled
|
|
812
844
|
? guardTerminalEventStream({
|
|
@@ -815,6 +847,7 @@ export function createAdapterContinuations(
|
|
|
815
847
|
adapterName: transportState.activeAdapter.name,
|
|
816
848
|
maxAutoContinuations: 1,
|
|
817
849
|
continuation: next => fetchTerminalGuardContinuation(next, undefined, !parsed.stream),
|
|
850
|
+
onHiddenUsage,
|
|
818
851
|
})
|
|
819
852
|
: retryEvents;
|
|
820
853
|
return parsed._advisorGuard
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { proxyErrorPresentation, isProxyError, rememberProxyErrorMessage } from "../../lib/client-error-body";
|
|
2
|
-
import type
|
|
2
|
+
import { responsesTimeoutProvider, type ResponsesRequestContext } from "./core-options";
|
|
3
3
|
import type { PreparedResponsesRequest } from "./request-prepare";
|
|
4
4
|
import type { ResponsesTransport } from "./request-transport";
|
|
5
5
|
import type { ResponsesSidecarAuth } from "./request-sidecar-auth";
|
|
@@ -8,9 +8,10 @@ import type { ResponsesCompletionPolicy } from "./completion-policy";
|
|
|
8
8
|
import type { AdapterExchange } from "./adapter-dispatch";
|
|
9
9
|
import type { AdapterContinuations } from "./adapter-continuation";
|
|
10
10
|
import { guardTerminalEventStream } from "./terminal-guard";
|
|
11
|
-
import { guardEmptyCompletionEventStream } from "./empty-completion-guard";
|
|
11
|
+
import { guardEmptyCompletionEventStream, mergeUsage } from "./empty-completion-guard";
|
|
12
|
+
import { UNDECLARED_TOOL_CALL_ERROR_CODE } from "../../lib/errors";
|
|
12
13
|
import { bridgeToResponsesSSE, buildResponseJSON, formatErrorResponse } from "../../bridge";
|
|
13
|
-
import type { OcxProviderContinuationState, AdapterEvent } from "../../types";
|
|
14
|
+
import type { OcxProviderContinuationState, AdapterEvent, OcxUsage } from "../../types";
|
|
14
15
|
import { rememberResponseState } from "../../responses/state";
|
|
15
16
|
import { trackStreamLifetime } from "../lifecycle";
|
|
16
17
|
import { awaitThoughtSignatureDurability } from "../../responses/thought-signature-replay";
|
|
@@ -20,7 +21,7 @@ import {
|
|
|
20
21
|
readResponseStreamWithInactivity,
|
|
21
22
|
ResponseBodyInactivityError,
|
|
22
23
|
} from "../../lib/response-body-inactivity";
|
|
23
|
-
import { resolveStallTimeoutMs } from "../../stall-timeout";
|
|
24
|
+
import { providerStallTimeoutSec, resolveStallTimeoutMs } from "../../stall-timeout";
|
|
24
25
|
import { clientEncoderForDelivery, deliverClientEncodedResponse } from "../inference/client-encoder-delivery";
|
|
25
26
|
import { noteKiroServedSuccess } from "../../providers/kiro-usage";
|
|
26
27
|
import { persistKiroAccountState } from "../../providers/kiro-account-state-disk";
|
|
@@ -31,6 +32,7 @@ import { isCanonicalOpenAiForwardProvider } from "../../providers/openai-tiers";
|
|
|
31
32
|
import { currentTurnToolBridgeMaps, guardEmptyToolCatalogEvents, guardEmptyToolCatalogStream } from "../../lib/empty-tool-catalog";
|
|
32
33
|
import { guardCompactionSummary } from "../../responses/compaction-summary";
|
|
33
34
|
import { settleAnthropicPerMessageEffort } from "../../adapters/anthropic/per-message-effort";
|
|
35
|
+
import { adapterResponseSpendObserver } from "./request-spend";
|
|
34
36
|
|
|
35
37
|
/** One responsibility of the Responses request pipeline; state owners are explicit. */
|
|
36
38
|
export async function deliverAdapterResponse(
|
|
@@ -47,7 +49,7 @@ export async function deliverAdapterResponse(
|
|
|
47
49
|
| "turnMembership"
|
|
48
50
|
| "completedToolBlocks"
|
|
49
51
|
>,
|
|
50
|
-
transportState: Pick<ResponsesTransport, "activeAdapter" | "bindKeyUsageFromBridge" | "sentOAuthSnapshot">,
|
|
52
|
+
transportState: Pick<ResponsesTransport, "activeAdapter" | "bindKeyUsageFromBridge" | "sentOAuthSnapshot" | "trackGuardedOAuthAttemptUsage">,
|
|
51
53
|
sidecarState: Pick<ResponsesSidecarAuth, "routedCompaction">,
|
|
52
54
|
responseEffects: Pick<
|
|
53
55
|
ResponsesEffects,
|
|
@@ -76,6 +78,8 @@ export async function deliverAdapterResponse(
|
|
|
76
78
|
fetchGuardedEmptyCompletionRetry,
|
|
77
79
|
isContinuationBodyStall,
|
|
78
80
|
} = continuationState;
|
|
81
|
+
const preserveEmptyCompletionRetryError = (event: AdapterEvent) =>
|
|
82
|
+
(event.type === "error" && event.code === UNDECLARED_TOOL_CALL_ERROR_CODE) || isContinuationBodyStall(event);
|
|
79
83
|
const { emptyCompletionGuardEnabled } = completionPolicy;
|
|
80
84
|
const {
|
|
81
85
|
cancelResponseCompletion,
|
|
@@ -84,8 +88,10 @@ export async function deliverAdapterResponse(
|
|
|
84
88
|
notifyResponseComplete,
|
|
85
89
|
} = responseEffects;
|
|
86
90
|
const { routedCompaction } = sidecarState;
|
|
87
|
-
const
|
|
91
|
+
const stallTimeoutSec = () => providerStallTimeoutSec(config, responsesTimeoutProvider(options, route.provider));
|
|
92
|
+
const bodyInactivityMs = resolveStallTimeoutMs(stallTimeoutSec(), { localUpstream });
|
|
88
93
|
const upstreamRequestsStream = parsed.stream || isCanonicalOpenAiForwardProvider(route.provider);
|
|
94
|
+
const observeInitialSpend = adapterResponseSpendObserver(upstreamResponse);
|
|
89
95
|
const recoverThinkingSignature = (events: AsyncIterable<AdapterEvent>): AsyncIterable<AdapterEvent> =>
|
|
90
96
|
thinkingSignatureRecovery.wrap(events, async function* () {
|
|
91
97
|
const result = await refetchThinkingSignature();
|
|
@@ -106,7 +112,8 @@ export async function deliverAdapterResponse(
|
|
|
106
112
|
return;
|
|
107
113
|
}
|
|
108
114
|
try {
|
|
109
|
-
const
|
|
115
|
+
const observeRetrySpend = adapterResponseSpendObserver(response);
|
|
116
|
+
const bodyInactivityMs = resolveStallTimeoutMs(stallTimeoutSec(), { localUpstream: adapterExchange.localUpstream });
|
|
110
117
|
const retryEvents = upstreamRequestsStream
|
|
111
118
|
? readResponseStreamWithInactivity(response, upstream.signal, bodyInactivityMs,
|
|
112
119
|
guarded => transportState.activeAdapter.parseStream(guarded, translatorBudget, logCtx.activeTierMetadata))
|
|
@@ -115,6 +122,7 @@ export async function deliverAdapterResponse(
|
|
|
115
122
|
guarded => transportState.activeAdapter.parseResponse!(guarded, translatorBudget, logCtx.activeTierMetadata));
|
|
116
123
|
})();
|
|
117
124
|
for await (const event of retryEvents) {
|
|
125
|
+
observeRetrySpend?.(event);
|
|
118
126
|
options.onCompactionRecoveryAdapterEvent?.(event);
|
|
119
127
|
yield event;
|
|
120
128
|
}
|
|
@@ -128,6 +136,19 @@ export async function deliverAdapterResponse(
|
|
|
128
136
|
const clientToolCatalog = requestState.clientToolCatalogRestriction && route.provider.authMode !== "forward"
|
|
129
137
|
? requestState.clientToolCatalogRestriction : undefined;
|
|
130
138
|
const deliveryToolBridgeMaps = currentTurnToolBridgeMaps(toolBridgeMaps, clientToolCatalog);
|
|
139
|
+
if (terminalGuardEnabled) transportState.trackGuardedOAuthAttemptUsage();
|
|
140
|
+
// Legs the terminal guard re-asked: the client terminal carries only the final leg's usage
|
|
141
|
+
// (clients size their context window from it, #8877), while the request log meters every leg
|
|
142
|
+
// that was sent. Hidden legs add counters only: their context checkpoint and raw wire usage
|
|
143
|
+
// are not the final terminal's (same split as the web-search loop).
|
|
144
|
+
let terminalGuardHiddenUsage: OcxUsage | undefined;
|
|
145
|
+
const onHiddenUsage = ({ contextTotalTokens: _context, rawUsage: _raw, ...counters }: OcxUsage): void => {
|
|
146
|
+
terminalGuardHiddenUsage = mergeUsage(terminalGuardHiddenUsage, counters);
|
|
147
|
+
};
|
|
148
|
+
const bindDeliveredUsage = (usage: OcxUsage | undefined): void => {
|
|
149
|
+
// A re-asked leg was dispatched, so a delivered leg without a credit reading leaves the credits incomplete (#8452).
|
|
150
|
+
transportState.bindKeyUsageFromBridge(mergeUsage(terminalGuardHiddenUsage, usage, terminalGuardHiddenUsage !== undefined));
|
|
151
|
+
};
|
|
131
152
|
|
|
132
153
|
|
|
133
154
|
if (parsed.stream) {
|
|
@@ -150,6 +171,7 @@ export async function deliverAdapterResponse(
|
|
|
150
171
|
bodyInactivityMs,
|
|
151
172
|
response => transportState.activeAdapter.parseStream(response, translatorBudget, logCtx.activeTierMetadata, { completedToolBlocks: outputItemIds !== undefined }),
|
|
152
173
|
)) {
|
|
174
|
+
observeInitialSpend?.(event);
|
|
153
175
|
options.onCompactionRecoveryAdapterEvent?.(event);
|
|
154
176
|
yield event;
|
|
155
177
|
}
|
|
@@ -175,6 +197,7 @@ export async function deliverAdapterResponse(
|
|
|
175
197
|
adapterName: transportState.activeAdapter.name,
|
|
176
198
|
maxAutoContinuations: 1,
|
|
177
199
|
continuation: next => fetchTerminalGuardContinuation(next, undefined, !parsed.stream),
|
|
200
|
+
onHiddenUsage,
|
|
178
201
|
})
|
|
179
202
|
: recoveredEvents;
|
|
180
203
|
// Optional advisor guard (registered per request by the sidecar planner; absent unless the
|
|
@@ -197,8 +220,8 @@ export async function deliverAdapterResponse(
|
|
|
197
220
|
const completionGuardedEventStream = emptyCompletionGuardEnabled
|
|
198
221
|
? guardEmptyCompletionEventStream({
|
|
199
222
|
firstEvents: advisorStream,
|
|
200
|
-
continuation: fetchGuardedEmptyCompletionRetry,
|
|
201
|
-
preserveRetryError:
|
|
223
|
+
continuation: () => fetchGuardedEmptyCompletionRetry(onHiddenUsage),
|
|
224
|
+
preserveRetryError: preserveEmptyCompletionRetryError,
|
|
202
225
|
})
|
|
203
226
|
: advisorStream;
|
|
204
227
|
const catalogGuardedEventStream = guardEmptyToolCatalogStream(completionGuardedEventStream, clientToolCatalog, translatorBudget);
|
|
@@ -245,14 +268,14 @@ export async function deliverAdapterResponse(
|
|
|
245
268
|
hideRawReasoning: parsed.options.hideRawReasoning,
|
|
246
269
|
toolNsMap, declaredToolNames, toolParameterSchemas, freeformToolNames, bareCustomToolNames, toolSearchToolNames,
|
|
247
270
|
},
|
|
248
|
-
stallTimeoutSec:
|
|
271
|
+
stallTimeoutSec: stallTimeoutSec(),
|
|
249
272
|
get localUpstream() { return adapterExchange.localUpstream; },
|
|
250
273
|
turnAdmissionLease: options.turnAdmissionLease,
|
|
251
274
|
...(options.onFirstOutput ? { onFirstOutput: options.onFirstOutput } : {}),
|
|
252
275
|
stopUpstream: () => { cancelResponseCompletion(); upstream.abort(); },
|
|
253
276
|
onStreamDone: cleanupUpstreamAbort,
|
|
254
277
|
onCompletedResponse,
|
|
255
|
-
bindUsage:
|
|
278
|
+
bindUsage: bindDeliveredUsage,
|
|
256
279
|
});
|
|
257
280
|
}
|
|
258
281
|
const sseStream = bridgeToResponsesSSE(
|
|
@@ -263,11 +286,12 @@ export async function deliverAdapterResponse(
|
|
|
263
286
|
replayCacheScope: parsed._reasoningReplayScope,
|
|
264
287
|
...(outputItemIds ? { outputItemIds } : {}),
|
|
265
288
|
...(options.forceEmptyResponseId ? { responseId: "" } : {}),
|
|
266
|
-
stallTimeoutSec:
|
|
289
|
+
stallTimeoutSec: stallTimeoutSec(),
|
|
267
290
|
get localUpstream() { return adapterExchange.localUpstream; },
|
|
268
291
|
hideThinkingSummary: parsed.options.hideThinkingSummary,
|
|
269
292
|
chatRawReasoningVisible: options.chatRawReasoningVisible,
|
|
270
293
|
hideRawReasoning: parsed.options.hideRawReasoning,
|
|
294
|
+
rawReasoningAsSummary: parsed.options.rawReasoningAsSummary,
|
|
271
295
|
declaredToolNames,
|
|
272
296
|
bareCustomToolNames,
|
|
273
297
|
enforceDeclaredToolNames: options.inboundWire !== "chat" && options.inboundWire !== "anthropic",
|
|
@@ -280,10 +304,8 @@ export async function deliverAdapterResponse(
|
|
|
280
304
|
textFormat: parsed.options.textFormat,
|
|
281
305
|
// Same grok-surface split as the runTurn branch above.
|
|
282
306
|
...(logCtx.surface === "grok" ? { heartbeatStyle: "comment" as const } : {}),
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
transportState.bindKeyUsageFromBridge(usage);
|
|
286
|
-
},
|
|
307
|
+
// Raw adapter usage, pre wire-normalization (see the runTurn branch above).
|
|
308
|
+
onUsage: bindDeliveredUsage,
|
|
287
309
|
onCompletedResponse,
|
|
288
310
|
},
|
|
289
311
|
);
|
|
@@ -317,7 +339,10 @@ export async function deliverAdapterResponse(
|
|
|
317
339
|
response => transportState.activeAdapter.parseResponse!(response, translatorBudget, logCtx.activeTierMetadata),
|
|
318
340
|
));
|
|
319
341
|
}
|
|
320
|
-
for (const event of initialEvents)
|
|
342
|
+
for (const event of initialEvents) {
|
|
343
|
+
observeInitialSpend?.(event);
|
|
344
|
+
options.onCompactionRecoveryAdapterEvent?.(event);
|
|
345
|
+
}
|
|
321
346
|
const recoveredEvents: AdapterEvent[] = [];
|
|
322
347
|
for await (const event of recoverThinkingSignature((async function* () { yield* initialEvents; })())) {
|
|
323
348
|
recoveredEvents.push(event);
|
|
@@ -331,6 +356,7 @@ export async function deliverAdapterResponse(
|
|
|
331
356
|
adapterName: transportState.activeAdapter.name,
|
|
332
357
|
maxAutoContinuations: 1,
|
|
333
358
|
continuation: next => fetchTerminalGuardContinuation(next, undefined, !parsed.stream),
|
|
359
|
+
onHiddenUsage,
|
|
334
360
|
})) guardedEvents.push(event);
|
|
335
361
|
} else {
|
|
336
362
|
guardedEvents = recoveredEvents;
|
|
@@ -350,8 +376,8 @@ export async function deliverAdapterResponse(
|
|
|
350
376
|
events = [];
|
|
351
377
|
for await (const event of guardEmptyCompletionEventStream({
|
|
352
378
|
firstEvents: (async function* () { yield* guardedEvents; })(),
|
|
353
|
-
continuation: fetchGuardedEmptyCompletionRetry,
|
|
354
|
-
preserveRetryError:
|
|
379
|
+
continuation: () => fetchGuardedEmptyCompletionRetry(onHiddenUsage),
|
|
380
|
+
preserveRetryError: preserveEmptyCompletionRetryError,
|
|
355
381
|
})) events.push(event);
|
|
356
382
|
} else {
|
|
357
383
|
events = guardedEvents;
|
|
@@ -380,6 +406,7 @@ export async function deliverAdapterResponse(
|
|
|
380
406
|
hideThinkingSummary: parsed.options.hideThinkingSummary,
|
|
381
407
|
chatRawReasoningVisible: options.chatRawReasoningVisible,
|
|
382
408
|
hideRawReasoning: parsed.options.hideRawReasoning,
|
|
409
|
+
rawReasoningAsSummary: parsed.options.rawReasoningAsSummary,
|
|
383
410
|
toolNsMap,
|
|
384
411
|
declaredToolNames,
|
|
385
412
|
bareCustomToolNames,
|
|
@@ -392,9 +419,7 @@ export async function deliverAdapterResponse(
|
|
|
392
419
|
completeOnMaxOutputTokens: config.completeOnMaxOutputTokens === true && options.inboundWire !== "chat" && options.inboundWire !== "anthropic",
|
|
393
420
|
textFormat: parsed.options.textFormat,
|
|
394
421
|
onProviderState: state => { providerState = state; },
|
|
395
|
-
onUsage:
|
|
396
|
-
transportState.bindKeyUsageFromBridge(usage);
|
|
397
|
-
},
|
|
422
|
+
onUsage: bindDeliveredUsage,
|
|
398
423
|
});
|
|
399
424
|
// See the streaming branch: compaction turns skip the continuation cache.
|
|
400
425
|
if (!routedCompaction) {
|