@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
|
@@ -132,6 +132,24 @@ export async function resolveSubagentFallbackModelEligibility(args: {
|
|
|
132
132
|
}
|
|
133
133
|
|
|
134
134
|
|
|
135
|
+
/** Apply display preferences for the adapter that will produce the upstream reply. */
|
|
136
|
+
export function applyReasoningDisplayPolicy(
|
|
137
|
+
parsed: OcxParsedRequest,
|
|
138
|
+
provider: OcxProviderConfig,
|
|
139
|
+
inboundWire: InboundWire,
|
|
140
|
+
): void {
|
|
141
|
+
const summary = (parsed._rawBody as { reasoning?: { summary?: unknown } } | undefined)?.reasoning?.summary;
|
|
142
|
+
parsed.options.rawReasoningAsSummary = inboundWire === "responses"
|
|
143
|
+
&& provider.adapter === "openai-chat" && provider.rawReasoningAsSummary === true
|
|
144
|
+
&& summary !== "none";
|
|
145
|
+
if (inboundWire === "responses" && parsed._rawBody) {
|
|
146
|
+
parsed.options.hideThinkingSummary = summary === "none"
|
|
147
|
+
|| (!summary && !hasValidatedActiveReasoningEffort(parsed.options)
|
|
148
|
+
&& provider.showThinkingSummary !== true && !parsed.options.rawReasoningAsSummary);
|
|
149
|
+
}
|
|
150
|
+
parsed.options.hideRawReasoning = provider.hideRawReasoning === true;
|
|
151
|
+
}
|
|
152
|
+
|
|
135
153
|
/**
|
|
136
154
|
* Apply every route-dependent request mutation against the final selected route.
|
|
137
155
|
* Must run only after subagent fallback has settled the model/provider.
|
|
@@ -202,18 +220,7 @@ export async function applyFinalRouteRequestNormalization(args: {
|
|
|
202
220
|
requestBody: parsed._rawBody,
|
|
203
221
|
});
|
|
204
222
|
if (parsed._plaintextV2AgentMessages) parsed._plaintextV2EverPrepared = true;
|
|
205
|
-
|
|
206
|
-
// A provider default never converts raw reasoning into a summary.
|
|
207
|
-
if (inboundWire === "responses" && parsed._rawBody) {
|
|
208
|
-
const summary = (parsed._rawBody as { reasoning?: { summary?: unknown } }).reasoning?.summary;
|
|
209
|
-
parsed.options.hideThinkingSummary = summary === "none"
|
|
210
|
-
|| (!summary && !hasValidatedActiveReasoningEffort(parsed.options)
|
|
211
|
-
&& route.provider.showThinkingSummary !== true);
|
|
212
|
-
}
|
|
213
|
-
// Provider policy, recomputed per final route like the summary default above so a fallback
|
|
214
|
-
// cannot inherit the previous target's choice. Raw content-channel reasoning is suppressed;
|
|
215
|
-
// provider-authored summaries stay on the summary channel and remain visible.
|
|
216
|
-
parsed.options.hideRawReasoning = route.provider.hideRawReasoning === true;
|
|
223
|
+
applyReasoningDisplayPolicy(parsed, route.provider, inboundWire);
|
|
217
224
|
if (preserveAnthropicResponseModel) parsed._responseModelId = responseModelId;
|
|
218
225
|
logCtx.model = virtualModel?.selectedModelId ?? route.modelId;
|
|
219
226
|
logCtx.provider = route.providerName;
|
|
@@ -9,9 +9,10 @@ import {
|
|
|
9
9
|
} from "../../providers/reasoning-metadata";
|
|
10
10
|
import { isAnthropicFastRefusal } from "../../providers/anthropic-fast";
|
|
11
11
|
import type { AdapterRequest } from "../../adapters/base";
|
|
12
|
-
import { isNonReplayableResponse } from "../../lib/upstream-retry";
|
|
12
|
+
import { isNonReplayableResponse, retainPacedRetryResponse } from "../../lib/upstream-retry";
|
|
13
13
|
import type { OcxParsedRequest } from "../../types";
|
|
14
14
|
import type { RequestLogContext } from "../request-log";
|
|
15
|
+
import { takeLocalFailureState } from "../request-log-failure-detail";
|
|
15
16
|
import type { AttemptRecoveryKind } from "../../usage/log";
|
|
16
17
|
import { rememberReasoningReplayOpaqueBlobRejection } from "../../responses/reasoning-replay-cache";
|
|
17
18
|
import { resolvedAdapterWire } from "../../responses/continuation-ownership";
|
|
@@ -542,6 +543,7 @@ export function prepareOpaqueBlobRecovery(parsed: OcxParsedRequest): void {
|
|
|
542
543
|
|
|
543
544
|
|
|
544
545
|
export function resetStreamedOpaqueBlobLogContext(logCtx: RequestLogContext): void {
|
|
546
|
+
takeLocalFailureState(logCtx);
|
|
545
547
|
delete logCtx.upstreamError;
|
|
546
548
|
delete logCtx.terminalHttpStatus;
|
|
547
549
|
delete logCtx.terminalErrorCode;
|
|
@@ -566,8 +568,9 @@ export async function attemptOpaqueBlobRecovery<Failure = Response>(
|
|
|
566
568
|
parsed: OcxParsedRequest;
|
|
567
569
|
guard: OpaqueBlobRecoveryGuard;
|
|
568
570
|
signal: AbortSignal;
|
|
571
|
+
preserveResponse?: boolean;
|
|
569
572
|
},
|
|
570
|
-
rebuild: (kind: AttemptRecoveryKind) => Promise<Response | { failed: Failure }>,
|
|
573
|
+
rebuild: (kind: AttemptRecoveryKind, preceding?: Response) => Promise<Response | { failed: Failure }>,
|
|
571
574
|
): Promise<OpaqueBlobRecoveryResult<Failure>> {
|
|
572
575
|
const errorBody = await opaqueBlobRejectionBodyForRecovery(
|
|
573
576
|
args.response,
|
|
@@ -597,8 +600,16 @@ export async function attemptOpaqueBlobRecovery<Failure = Response>(
|
|
|
597
600
|
}
|
|
598
601
|
: undefined;
|
|
599
602
|
prepareOpaqueBlobRecovery(args.parsed);
|
|
600
|
-
|
|
601
|
-
|
|
603
|
+
if (!args.preserveResponse) {
|
|
604
|
+
try { void args.response.body?.cancel().catch(() => {}); } catch { /* already consumed/closed */ }
|
|
605
|
+
}
|
|
606
|
+
const preceding = args.preserveResponse ? await retainPacedRetryResponse(args.response, args.signal) : undefined;
|
|
607
|
+
const result = await rebuild("opaque-blob-rejection", preceding);
|
|
608
|
+
if (result === args.response) return { kind: "skipped" };
|
|
609
|
+
if (result === preceding) return { kind: "recovered", response: result };
|
|
610
|
+
if (args.preserveResponse) {
|
|
611
|
+
try { void args.response.body?.cancel().catch(() => {}); } catch { /* already consumed/closed */ }
|
|
612
|
+
}
|
|
602
613
|
if (!("failed" in result) && result.ok) {
|
|
603
614
|
rememberReasoningReplayOpaqueBlobRejection(rejectedScope);
|
|
604
615
|
}
|
|
@@ -1,14 +1,15 @@
|
|
|
1
1
|
import type { ClientFacingModelLabel } from "../../lib/error-destination";
|
|
2
|
+
import type { HostedAdvisorSelection } from "../../claude/inbound-content-options";
|
|
2
3
|
import type { CodexAccountModelRefusal } from "../../combos/failover";
|
|
3
4
|
import type { NativeResponseControl } from "./native-response-control";
|
|
4
|
-
import type { AdapterEvent, OcxUsage, OcxProviderContinuationState, OcxConfig } from "../../types";
|
|
5
|
+
import type { AdapterEvent, OcxUsage, OcxProviderContinuationState, OcxConfig, OcxProviderConfig, OcxVisionSidecarConfig } from "../../types";
|
|
5
6
|
import type { RouteResult } from "../../router";
|
|
6
7
|
import type { SingleUseDispatchPermit } from "../../lib/request-execution-budget";
|
|
7
8
|
import type { CodexAuthPolicyConfig, CodexAuthContext } from "../../codex/auth-context";
|
|
8
9
|
import type { AdmissionLease } from "../../lib/admission";
|
|
9
10
|
import type { DataPlaneAdmission } from "../auth-cors";
|
|
10
11
|
import type { AdmissionModelScope } from "../admission-model-scope";
|
|
11
|
-
import { resolveCodexModelEntitlements } from "../../codex/model-entitlements";
|
|
12
|
+
import type { resolveCodexModelEntitlements } from "../../codex/model-entitlements";
|
|
12
13
|
import type { ResponsesTerminalStatus } from "../../bridge";
|
|
13
14
|
import type { ResponsesTerminalRepairScheduler } from "../responses-terminal-repair";
|
|
14
15
|
import type { BunRuntimeGateInput } from "./ws-upstream";
|
|
@@ -25,8 +26,15 @@ import type { RequestLogContext } from "../request-log";
|
|
|
25
26
|
import type { UpstreamHostAdmissionLease } from "../../codex/upstream-host-health";
|
|
26
27
|
import type { AccountLease } from "../../oauth/kiro-account-load";
|
|
27
28
|
import type { PolicyRequestScope } from "./policy-request-scope";
|
|
29
|
+
import type { SpendAdmissionPolicy } from "../../lib/spend-reservation-ledger";
|
|
28
30
|
import type { OcxParsedRequest } from "../../types";
|
|
29
31
|
import type { PolicyRequestEvidence } from "../../routing/evaluator";
|
|
32
|
+
import type { ConnectionReplayScope } from "../../responses/state/connection-scope";
|
|
33
|
+
|
|
34
|
+
export interface HostedAdvisorSpendScope {
|
|
35
|
+
readonly ceilings: SpendAdmissionPolicy;
|
|
36
|
+
optionalWithheld: boolean;
|
|
37
|
+
}
|
|
30
38
|
|
|
31
39
|
export interface ConsumedComboFailure {
|
|
32
40
|
response: Response;
|
|
@@ -84,6 +92,8 @@ export interface ClientEncoderOption {
|
|
|
84
92
|
stream: boolean;
|
|
85
93
|
model: string;
|
|
86
94
|
inputTokenFloor?: number;
|
|
95
|
+
/** Chat only: the client set `stream_options.include_usage`. */
|
|
96
|
+
includeUsage?: boolean;
|
|
87
97
|
/**
|
|
88
98
|
* `direct` when the request side also skipped the internal Responses body (the Antigravity
|
|
89
99
|
* direct lane), so the attempt's request path is traced as `[inbound, ir, upstream]`.
|
|
@@ -163,6 +173,14 @@ export interface HandleResponsesOptions {
|
|
|
163
173
|
* holder with no principal preserves keyless replay; never populate it from client data.
|
|
164
174
|
*/
|
|
165
175
|
replayPrincipal?: Readonly<{ clientPrincipalId: string | undefined }>;
|
|
176
|
+
/**
|
|
177
|
+
* Internal connection-owned replay scope minted by the /v1/responses WebSocket upgrade for an
|
|
178
|
+
* unidentified loopback caller (src/responses/state/connection-scope.ts). Memory-only, bound to
|
|
179
|
+
* that socket's handshake thread, never sent to the client. It backfills only the replay owner
|
|
180
|
+
* key when no caller principal resolved; it is not a credential, grants no data-plane, history
|
|
181
|
+
* or notes authority, and must never be populated from client data.
|
|
182
|
+
*/
|
|
183
|
+
replayScope?: ConnectionReplayScope;
|
|
166
184
|
/** Captured for the logical request and inherited by retries and combo children. */
|
|
167
185
|
readonly plaintextV2Decision?: boolean;
|
|
168
186
|
/** Called at most once after the complete client body is read and accepted for dispatch. */
|
|
@@ -216,6 +234,10 @@ export interface HandleResponsesOptions {
|
|
|
216
234
|
nativeReasoningMint?: { owner?: NativeReasoningOwner };
|
|
217
235
|
/** The Claude client's typed `web_search_*` / `web_fetch_*` declarations; kept only for `inboundWire: "anthropic"`. */
|
|
218
236
|
anthropicServerTools?: readonly Record<string, unknown>[];
|
|
237
|
+
/** The original Messages choice names a typed hosted Advisor, possibly with a duplicate name. */
|
|
238
|
+
anthropicHostedAdvisorSelection?: HostedAdvisorSelection;
|
|
239
|
+
/** Hosted work shares this state across routing candidates and translated combo children. */
|
|
240
|
+
hostedAdvisorSpendScope?: HostedAdvisorSpendScope;
|
|
219
241
|
/** The Claude client's replayable server-tool exchanges (`replayedAnthropicServerBlocks`); same scope. */
|
|
220
242
|
anthropicServerReplay?: ReadonlyMap<string, readonly Record<string, unknown>[]>;
|
|
221
243
|
/** The caller's cached system prefix (`systemCachePrefix`); same scope. */
|
|
@@ -228,6 +250,8 @@ export interface HandleResponsesOptions {
|
|
|
228
250
|
protocolSource?: import("./core-combo-native").ComboProtocolSource;
|
|
229
251
|
/** Internal transport identity for route-scoped upstream compatibility policy. */
|
|
230
252
|
inboundTransport?: "websocket";
|
|
253
|
+
/** ACP refusal signal captured from the original HTTP request, before any bridge translation. */
|
|
254
|
+
agyAcpUnattendedHttpTurn?: boolean;
|
|
231
255
|
/**
|
|
232
256
|
* Set by the HTTP `/v1/responses` ingress only: a streaming combo turn whose target selection
|
|
233
257
|
* outlasts `COMBO_SELECTION_KEEPALIVE_THRESHOLD_MS` commits a 200 SSE head and sends keepalive
|
|
@@ -254,6 +278,18 @@ export interface HandleResponsesOptions {
|
|
|
254
278
|
callerDirectAuth?: CallerDirectAuth | null;
|
|
255
279
|
/** Internal recursion guard; callers outside this module must not set it. */
|
|
256
280
|
comboAttempt?: boolean;
|
|
281
|
+
/** `union` combo with no member whose window fits: the child keeps the loose direct admission. */
|
|
282
|
+
comboContextDegraded?: boolean;
|
|
283
|
+
/** A union combo admitted this image-bearing child through a dispatchable vision plan. */
|
|
284
|
+
comboRequiresVisionPlan?: boolean;
|
|
285
|
+
/** The union combo exhausted its image-serving targets and selected omission. */
|
|
286
|
+
comboOmitImages?: boolean;
|
|
287
|
+
/**
|
|
288
|
+
* The request-start Vision Sidecar settings the combo admitted this request under. Vision
|
|
289
|
+
* planning reads `settings` instead of the live `visionSidecar`, so an edit made while the
|
|
290
|
+
* request is in flight applies to the next request. Credentials still resolve from live config.
|
|
291
|
+
*/
|
|
292
|
+
comboVisionSidecar?: { settings: OcxVisionSidecarConfig | undefined };
|
|
257
293
|
/**
|
|
258
294
|
* Set by the combo loop for each child. A child logs into its own context, which the combo
|
|
259
295
|
* copies once when the child commits, and the bridge reports usage after that, at the terminal
|
|
@@ -261,6 +297,9 @@ export interface HandleResponsesOptions {
|
|
|
261
297
|
* can carry the binding to the context that writes the row.
|
|
262
298
|
*/
|
|
263
299
|
onBridgeUsageBound?: () => void;
|
|
300
|
+
/** A web-search deadline has been recorded on the child before its failure is emitted. */
|
|
301
|
+
onWebSearchLocalFailure?: () => void;
|
|
302
|
+
onHostedWebSearchStream?: () => void;
|
|
264
303
|
/** Child-owned prepaid initial send; capacity remains charged until dispatch or unsent release. */
|
|
265
304
|
comboInitialSend?: { permit: SingleUseDispatchPermit; producerOwned?: boolean };
|
|
266
305
|
/** Exact externally booked combo hop, used for its child's spend preflight and send reports. */
|
|
@@ -306,11 +345,12 @@ export interface HandleResponsesOptions {
|
|
|
306
345
|
* Terminal advisor marker: true when the inbound request IS the advisor sidecar's own loopback
|
|
307
346
|
* consultation. The advisor planner then never plans a consultation — a depth cap of 1 that
|
|
308
347
|
* keeps Worker → Advisor → Advisor recursion impossible (same structure as
|
|
309
|
-
* {@linkcode visionDescribeTerminal}). The Chat surface
|
|
310
|
-
*
|
|
311
|
-
* fact through this flag.
|
|
348
|
+
* {@linkcode visionDescribeTerminal}). The Chat surface validates the capability and registered
|
|
349
|
+
* policy before its bridge rebuilds headers and carries the fact through this flag.
|
|
312
350
|
*/
|
|
313
351
|
advisorInternal?: boolean;
|
|
352
|
+
/** A local Chat helper authenticated through its registered process capability. */
|
|
353
|
+
internalSidecarCall?: boolean;
|
|
314
354
|
/**
|
|
315
355
|
* Set only by the Chat and Messages ingresses when `protocols.rollout.directEncoders` is on and
|
|
316
356
|
* the settled route is one non-Responses target. Adapter delivery then encodes the adapter
|
|
@@ -331,6 +371,11 @@ export interface HandleResponsesOptions {
|
|
|
331
371
|
directRequest?: DirectRequestOption;
|
|
332
372
|
}
|
|
333
373
|
|
|
374
|
+
/** The internal Responses handoff for /responses/compact keeps the endpoint's global budgets. */
|
|
375
|
+
export function responsesTimeoutProvider(options: HandleResponsesOptions, provider: OcxProviderConfig): OcxProviderConfig | undefined {
|
|
376
|
+
return options.compactionRecoveryKind === "compaction-v1" ? undefined : provider;
|
|
377
|
+
}
|
|
378
|
+
|
|
334
379
|
/** Values shared by the call, not a bag of mutable pipeline state. */
|
|
335
380
|
export interface ResponsesRequestContext {
|
|
336
381
|
req: Request;
|
|
@@ -11,6 +11,7 @@ import type {
|
|
|
11
11
|
import type { TranslatorBudget } from "../../lib/translator-budget";
|
|
12
12
|
import { prepareResponsesRequest } from "./request-prepare";
|
|
13
13
|
import { prepareResponsesTransport } from "./request-transport";
|
|
14
|
+
import { initialHostedAdvisorSpendRefusal } from "./hosted-advisor-spend";
|
|
14
15
|
import { prepareResponsesSidecarAuth } from "./request-sidecar-auth";
|
|
15
16
|
import { createResponsesEffects } from "./response-effects";
|
|
16
17
|
import { createResponsesSendBudget } from "./request-send-budget";
|
|
@@ -27,6 +28,7 @@ import { formatErrorResponse } from "../../bridge";
|
|
|
27
28
|
import { InvalidRetainedCompactionSummary, prepareCompactionRetention } from "./compaction-retention";
|
|
28
29
|
import { responsesHasInstructionImage } from "../../adapters/claude-cli/instruction-images";
|
|
29
30
|
import { markResponseNonReplayable } from "../../lib/upstream-retry";
|
|
31
|
+
import { agyAcpPreflightResponse } from "./agy-acp-preflight";
|
|
30
32
|
|
|
31
33
|
/** Compose request phases while retaining the original admission-finally ownership. */
|
|
32
34
|
export async function handleResponsesInner(
|
|
@@ -48,6 +50,15 @@ export async function handleResponsesInner(
|
|
|
48
50
|
if (requestState instanceof Response) return requestState;
|
|
49
51
|
const transportState = await prepareResponsesTransport(requestContext, admissionState, requestState);
|
|
50
52
|
if (transportState instanceof Response) return markProxyError(transportState);
|
|
53
|
+
const agyAcpRefusal = agyAcpPreflightResponse({
|
|
54
|
+
adapterName: transportState.runTurnAdapter.name, requestHeaders: req.headers,
|
|
55
|
+
forwardHeaders: requestState.selectedForwardHeaders, body: requestState.parsed._rawBody, comboAttempt: options.comboAttempt === true,
|
|
56
|
+
internalDecisionCall: options.internalDecisionCall === true, subagentFallback: requestState.subagentFallbackSelected,
|
|
57
|
+
inboundTransport: options.inboundTransport, unattendedHttpTurn: options.agyAcpUnattendedHttpTurn, logCtx,
|
|
58
|
+
});
|
|
59
|
+
if (agyAcpRefusal) return agyAcpRefusal;
|
|
60
|
+
const hostedAdvisorRefusal = initialHostedAdvisorSpendRefusal(requestContext, requestState, transportState);
|
|
61
|
+
if (hostedAdvisorRefusal) return hostedAdvisorRefusal;
|
|
51
62
|
if (transportState.runTurnAdapter.name === "claude-cli") {
|
|
52
63
|
const instructionImage = options.chatInstructionImage || options.responsesInstructionImage
|
|
53
64
|
|| responsesHasInstructionImage(requestState.parsed._rawBody)
|
|
@@ -20,7 +20,9 @@ import {
|
|
|
20
20
|
import { registerTurn, unregisterTurn } from "../lifecycle";
|
|
21
21
|
import { runWithCompactionRecovery } from "./compaction-recovery";
|
|
22
22
|
import { captureAdmissionPolicy } from "../capture-admission-policy";
|
|
23
|
+
import { captureHostedAdvisorSpendScope } from "./hosted-advisor-spend";
|
|
23
24
|
import { isPlaintextV2AgentMessagesEnabled } from "../../config/multi-agent-surface";
|
|
25
|
+
import { isUnattendedAgyAcpHttpTurn } from "../../adapters/agy-acp/policy";
|
|
24
26
|
/**
|
|
25
27
|
* Route one `/v1/responses` request through the adapter pipeline: recovery loop, passthrough
|
|
26
28
|
* wire, image/web-search bridges, and the terminal-guard continuation.
|
|
@@ -33,6 +35,7 @@ export async function handleResponses(
|
|
|
33
35
|
): Promise<Response> {
|
|
34
36
|
const ownsBudget = options.translatorBudget === undefined;
|
|
35
37
|
const translatorBudget = options.translatorBudget ?? createTranslatorBudget();
|
|
38
|
+
const hostedAdvisorSpendScope = captureHostedAdvisorSpendScope(options);
|
|
36
39
|
const abortSignal = options.abortSignal ?? req.signal;
|
|
37
40
|
const accountLoad = { lease: null as import("../../oauth/kiro-account-load").AccountLease | null,
|
|
38
41
|
cancelled: abortSignal.aborted };
|
|
@@ -53,10 +56,13 @@ export async function handleResponses(
|
|
|
53
56
|
// Capture before combo replay rebuilds the Request headers; children carry options.
|
|
54
57
|
visionDescribeTerminal: options.visionDescribeTerminal === true
|
|
55
58
|
|| req.headers.get("x-opencodex-vision-describe") === "1",
|
|
59
|
+
agyAcpUnattendedHttpTurn: options.agyAcpUnattendedHttpTurn === true
|
|
60
|
+
|| (options.inboundTransport !== "websocket" && isUnattendedAgyAcpHttpTurn(req.headers)),
|
|
56
61
|
translatorBudget,
|
|
57
62
|
accountLoad,
|
|
63
|
+
hostedAdvisorSpendScope,
|
|
58
64
|
// Once at ingress, spend observer included: a combo child inherits the parent's holder.
|
|
59
|
-
sendBudget: options.sendBudget ?? createInferenceSendBudget(req, logCtx),
|
|
65
|
+
sendBudget: options.sendBudget ?? createInferenceSendBudget(req, logCtx, hostedAdvisorSpendScope?.ceilings),
|
|
60
66
|
}, (req, config, logCtx, options) => handleResponsesInner(req, config, logCtx, options, requestDispatchers));
|
|
61
67
|
const finalResponse = ownsBudget ? finalizeOwnedTranslatorBudget(response, translatorBudget, abortSignal) : response;
|
|
62
68
|
if (!accountLoad.lease) { release(); return finalResponse; }
|
|
@@ -1,5 +1,7 @@
|
|
|
1
|
+
import { markProxyError } from "../../lib/client-error-body";
|
|
1
2
|
import type { AdapterEvent, OcxConfig, OcxUsage } from "../../types";
|
|
2
3
|
import { sanitizeLogMetadataString } from "../../lib/redact";
|
|
4
|
+
import { sumCreditReadings } from "../../usage/credit-billing";
|
|
3
5
|
|
|
4
6
|
/**
|
|
5
7
|
* Empty-completion guard for Responses turns (port of codex-router's
|
|
@@ -159,9 +161,13 @@ export function emptyCompletionRetryFailedEvent(
|
|
|
159
161
|
export function mergeUsage(
|
|
160
162
|
first: OcxUsage | undefined,
|
|
161
163
|
second: OcxUsage | undefined,
|
|
164
|
+
firstIsAttempt = false,
|
|
162
165
|
): OcxUsage | undefined {
|
|
163
|
-
if (!first
|
|
164
|
-
|
|
166
|
+
if (!first || !second) {
|
|
167
|
+
const usage = first ?? second;
|
|
168
|
+
const providerCredits = firstIsAttempt ? sumCreditReadings([first?.providerCredits, second?.providerCredits]) : usage?.providerCredits;
|
|
169
|
+
return usage && { ...usage, ...(providerCredits !== undefined ? { providerCredits } : {}) };
|
|
170
|
+
}
|
|
165
171
|
const sumOptional = (key: keyof OcxUsage): number | undefined => {
|
|
166
172
|
const left = first[key];
|
|
167
173
|
const right = second[key];
|
|
@@ -174,7 +180,7 @@ export function mergeUsage(
|
|
|
174
180
|
const cacheCreationInputTokens = sumOptional("cacheCreationInputTokens");
|
|
175
181
|
const cacheCreation1hInputTokens = sumOptional("cacheCreation1hInputTokens");
|
|
176
182
|
const reasoningOutputTokens = sumOptional("reasoningOutputTokens");
|
|
177
|
-
const providerCredits =
|
|
183
|
+
const providerCredits = sumCreditReadings([first.providerCredits, second.providerCredits]);
|
|
178
184
|
const contextTotalTokens = second.contextTotalTokens ?? first.contextTotalTokens;
|
|
179
185
|
const inputTokens = first.inputTokens + second.inputTokens;
|
|
180
186
|
const outputTokens = first.outputTokens + second.outputTokens;
|
|
@@ -233,10 +239,11 @@ export async function* guardEmptyCompletionEventStream(
|
|
|
233
239
|
let sawContent = false;
|
|
234
240
|
let passthrough = false;
|
|
235
241
|
let retries = 0;
|
|
242
|
+
let dispatchedLegs = 1;
|
|
236
243
|
let usage: OcxUsage | undefined;
|
|
237
244
|
|
|
238
245
|
const withUsage = (event: AdapterEvent & { usage?: OcxUsage }): AdapterEvent => {
|
|
239
|
-
const merged = mergeUsage(usage, event.usage);
|
|
246
|
+
const merged = mergeUsage(usage, event.usage, dispatchedLegs > 1);
|
|
240
247
|
return merged ? { ...event, ...(merged ? { usage: merged } : {}) } : event;
|
|
241
248
|
};
|
|
242
249
|
const releaseHeld = (): AdapterEvent[] => {
|
|
@@ -275,7 +282,7 @@ export async function* guardEmptyCompletionEventStream(
|
|
|
275
282
|
continue;
|
|
276
283
|
}
|
|
277
284
|
if (event.type === "done") {
|
|
278
|
-
usage = mergeUsage(usage, event.usage);
|
|
285
|
+
usage = mergeUsage(usage, event.usage, dispatchedLegs > 1);
|
|
279
286
|
if (event.stopReason !== undefined && VISIBLE_INCOMPLETE_STOP_REASONS.has(event.stopReason)) {
|
|
280
287
|
// Rendered as response.incomplete: a stated failure, not the silent
|
|
281
288
|
// empty success this guard exists to catch.
|
|
@@ -290,6 +297,7 @@ export async function* guardEmptyCompletionEventStream(
|
|
|
290
297
|
retries += 1;
|
|
291
298
|
try {
|
|
292
299
|
source = await options.continuation();
|
|
300
|
+
dispatchedLegs += 1;
|
|
293
301
|
} catch {
|
|
294
302
|
yield emptyCompletionRetryFailedEvent(usage, true);
|
|
295
303
|
return;
|
|
@@ -307,11 +315,12 @@ export async function* guardEmptyCompletionEventStream(
|
|
|
307
315
|
// The upstream failed the turn before any text or tool call (#6876: Vertex dropped a
|
|
308
316
|
// malformed function call). Nothing actionable reached the client, so this is the same
|
|
309
317
|
// replay-safe shape as an empty completion: retry the identical turn once.
|
|
310
|
-
usage = mergeUsage(usage, event.usage);
|
|
318
|
+
usage = mergeUsage(usage, event.usage, dispatchedLegs > 1);
|
|
311
319
|
markRetryBoundary();
|
|
312
320
|
retries += 1;
|
|
313
321
|
try {
|
|
314
322
|
source = await options.continuation();
|
|
323
|
+
dispatchedLegs += 1;
|
|
315
324
|
} catch {
|
|
316
325
|
yield emptyCompletionRetryFailedEvent(usage, true);
|
|
317
326
|
return;
|
|
@@ -326,7 +335,7 @@ export async function* guardEmptyCompletionEventStream(
|
|
|
326
335
|
// the stream's own error framing — same move as the router's
|
|
327
336
|
// empty_completion_retry_failed. Client cancels (499) pass through, and a
|
|
328
337
|
// replay-safe failure that repeats keeps its own, more specific message.
|
|
329
|
-
yield emptyCompletionRetryFailedEvent(mergeUsage(usage, event.usage), true);
|
|
338
|
+
yield emptyCompletionRetryFailedEvent(mergeUsage(usage, event.usage, dispatchedLegs > 1), true);
|
|
330
339
|
return;
|
|
331
340
|
}
|
|
332
341
|
yield* releaseHeld();
|
|
@@ -357,6 +366,7 @@ export async function* guardEmptyCompletionEventStream(
|
|
|
357
366
|
if (isReasoningEvent(event)) yield { type: "heartbeat" };
|
|
358
367
|
}
|
|
359
368
|
if (!terminalSeen) {
|
|
369
|
+
usage = mergeUsage(usage, undefined, dispatchedLegs > 1);
|
|
360
370
|
// A terminal-less EOF before text or a tool call is replay-safe: nothing
|
|
361
371
|
// actionable reached the client. Retry once, then surface a stated error
|
|
362
372
|
// instead of letting the bridge reduce the turn to adapter_eof.
|
|
@@ -365,6 +375,7 @@ export async function* guardEmptyCompletionEventStream(
|
|
|
365
375
|
retries += 1;
|
|
366
376
|
try {
|
|
367
377
|
source = await options.continuation();
|
|
378
|
+
dispatchedLegs += 1;
|
|
368
379
|
} catch {
|
|
369
380
|
yield emptyCompletionRetryFailedEvent(usage, true);
|
|
370
381
|
return;
|
|
@@ -378,6 +389,9 @@ export async function* guardEmptyCompletionEventStream(
|
|
|
378
389
|
// Post-output EOF remains incomplete; replaying could duplicate text or
|
|
379
390
|
// executable tool calls.
|
|
380
391
|
yield* releaseHeld();
|
|
392
|
+
if (retries > 0 && usage) {
|
|
393
|
+
yield markProxyError({ type: "incomplete" as const, reason: "adapter_eof", usage });
|
|
394
|
+
}
|
|
381
395
|
return;
|
|
382
396
|
}
|
|
383
397
|
}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { estimateTokens } from "../../lib/token-estimate";
|
|
2
|
+
import { responsesCompletionError } from "../../lib/errors";
|
|
2
3
|
import type { SsePayloadRewrite } from "../sse-payload-rewrite";
|
|
3
4
|
import type { HandleResponsesOptions } from "./core-options";
|
|
4
5
|
import type { OcxProviderConfig } from "../../types";
|
|
@@ -98,7 +99,7 @@ export function createEstimatedUsagePayloadRewrite(
|
|
|
98
99
|
streamedOutputTokens += estimateTokens(outputText([parsed.item]), modelId);
|
|
99
100
|
return payload;
|
|
100
101
|
}
|
|
101
|
-
if (!TERMINAL_TYPES.has(parsed.type)) return payload;
|
|
102
|
+
if (!TERMINAL_TYPES.has(parsed.type) || responsesCompletionError(parsed) != null) return payload;
|
|
102
103
|
const response = withEstimatedUsage(parsed.response, inputTokens(), modelId, streamedOutputTokens);
|
|
103
104
|
if (!response) return payload;
|
|
104
105
|
onApplied?.();
|