@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,7 +1,7 @@
|
|
|
1
1
|
import { createInferenceSendBudget } from "../inference/context";
|
|
2
2
|
import { responsesSpendTarget } from "./request-spend-target";
|
|
3
3
|
import type { ResponsesRequestContext } from "./core-options";
|
|
4
|
-
import { claimDispatchSpendProof, createPhysicalSendReporter, createRequestExecutionBudget, isRequestExecutionBudget, hasWorkflowSendObserver, reportDispatchSends } from "../../lib/request-execution-budget";
|
|
4
|
+
import { claimDispatchSpendProof, createPhysicalSendReporter, createRequestExecutionBudget, isRequestExecutionBudget, hasWorkflowSendObserver, reportDispatchSends, requestHasCapturedSpendCeiling } from "../../lib/request-execution-budget";
|
|
5
5
|
import {
|
|
6
6
|
chargeWorkflowSends,
|
|
7
7
|
reserveWorkflowSend,
|
|
@@ -11,8 +11,10 @@ import {
|
|
|
11
11
|
import { currentWorkflowBudgetPolicy } from "../../lib/workflow-budget-config";
|
|
12
12
|
import { poolContinuityRefusalReason, workflowRefusalResponse } from "../workflow-refusal";
|
|
13
13
|
import type { AttemptRecoveryKind, AttemptRecoveryWithheld } from "../../usage/log";
|
|
14
|
-
import { noteAttemptRecoveryWithheld, noteAttemptSend } from "../request-log";
|
|
15
|
-
import { TRANSIENT_RETRY_MAX_ATTEMPTS, SendBudgetExhaustedError } from "../../lib/upstream-retry";
|
|
14
|
+
import { noteAttemptRecoveryWithheld, noteAttemptSend, type RequestLogContext } from "../request-log";
|
|
15
|
+
import { TRANSIENT_RETRY_MAX_ATTEMPTS, SendBudgetExhaustedError, type TransientSendBudget } from "../../lib/upstream-retry";
|
|
16
|
+
import type { ErrorDestinationLabel } from "../../lib/error-destination";
|
|
17
|
+
import type { SpendScopes } from "../../lib/spend-reservation-ledger";
|
|
16
18
|
import { estimateTokens } from "../../lib/token-estimate";
|
|
17
19
|
import type {
|
|
18
20
|
DispatchDecision,
|
|
@@ -45,6 +47,52 @@ export function transientSendCapFor(
|
|
|
45
47
|
return Math.max(0, configuredAttempts - Math.max(0, sendsUsed));
|
|
46
48
|
}
|
|
47
49
|
|
|
50
|
+
/** A native compact credential recovery spends one send from the shared request budget. */
|
|
51
|
+
export async function sendSingleCompactRecovery(
|
|
52
|
+
budget: RequestExecutionBudget,
|
|
53
|
+
target: () => SpendScopes,
|
|
54
|
+
targetKey: string,
|
|
55
|
+
destination: ErrorDestinationLabel,
|
|
56
|
+
dispatch: () => Promise<Response>,
|
|
57
|
+
): Promise<Response> {
|
|
58
|
+
const freshRetrySpend = budget.explicitSendCeiling !== undefined;
|
|
59
|
+
const exhausted = () => new SendBudgetExhaustedError(destination);
|
|
60
|
+
if (budget.remainingBaseSends(TRANSIENT_RETRY_MAX_ATTEMPTS) > 0) {
|
|
61
|
+
const report = createPhysicalSendReporter(budget, target);
|
|
62
|
+
let started = false;
|
|
63
|
+
try {
|
|
64
|
+
if (report.beforeSend?.(freshRetrySpend) === false) throw exhausted();
|
|
65
|
+
started = true;
|
|
66
|
+
return await (report.execute ? report.execute(dispatch) : dispatch());
|
|
67
|
+
} finally {
|
|
68
|
+
try { if (started) report(1); }
|
|
69
|
+
finally { report.close?.(); }
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
const decision = budget.reserveDispatch({ sendClass: "auth-recovery", targetKey, freshRetrySpend });
|
|
73
|
+
if (!decision.allowed) throw exhausted();
|
|
74
|
+
const { permit } = decision;
|
|
75
|
+
const run = () => {
|
|
76
|
+
if (!permit.use()) { permit.release(); throw exhausted(); }
|
|
77
|
+
return dispatch();
|
|
78
|
+
};
|
|
79
|
+
return permit.execute ? permit.execute(run) : run();
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
/** Read the admitted target's ceilings without claiming a send or a prepaid proof. */
|
|
83
|
+
export function responsesHasCapturedSpendCeiling(
|
|
84
|
+
sendBudget: TransientSendBudget,
|
|
85
|
+
req: Pick<Request, "headers">,
|
|
86
|
+
logCtx: RequestLogContext,
|
|
87
|
+
target: SpendScopes,
|
|
88
|
+
): boolean {
|
|
89
|
+
return requestHasCapturedSpendCeiling(sendBudget, {
|
|
90
|
+
rootId: req.headers.get("x-codex-parent-thread-id")?.trim() || undefined,
|
|
91
|
+
identityId: target.identityId ?? logCtx.accountLogLabel,
|
|
92
|
+
poolId: target.poolId ?? logCtx.spendPoolId ?? logCtx.provider,
|
|
93
|
+
});
|
|
94
|
+
}
|
|
95
|
+
|
|
48
96
|
/** Owns the shared request send counter and recovery permits. */
|
|
49
97
|
export function createResponsesSendBudget(
|
|
50
98
|
requestContext: Pick<ResponsesRequestContext, "options" | "req" | "logCtx">,
|
|
@@ -58,7 +106,7 @@ export function createResponsesSendBudget(
|
|
|
58
106
|
// fresh default of 3. It is now a holder carried on options, so a combo child inherits the
|
|
59
107
|
// parent's spend instead of starting over per target -- both halves of the measured
|
|
60
108
|
// amplification in #4546.
|
|
61
|
-
const sendBudget = options.sendBudget ?? createInferenceSendBudget(req, logCtx);
|
|
109
|
+
const sendBudget = options.sendBudget ?? createInferenceSendBudget(req, logCtx, options.hostedAdvisorSpendScope?.ceilings);
|
|
62
110
|
// The root workflow is the user-visible task. A per-request cap cannot bound a fan-out that
|
|
63
111
|
// sends once per child seven hundred times, so every send charged to the request is charged
|
|
64
112
|
// to the root as well (#4546).
|
|
@@ -70,6 +118,8 @@ export function createResponsesSendBudget(
|
|
|
70
118
|
?? options.comboInitialSend?.permit;
|
|
71
119
|
let pendingHopPermit: SingleUseDispatchPermit | undefined = options.compactionRecoveryPermit;
|
|
72
120
|
let initialPermit = options.comboInitialSend?.permit;
|
|
121
|
+
const compactHandoffSendCeiling = options.compactionRecoveryKind === "compaction-v1"
|
|
122
|
+
&& isRequestExecutionBudget(sendBudget) && sendBudget.used > 0 ? sendBudget.explicitSendCeiling : undefined;
|
|
73
123
|
// Count this owner's physical sends, not later bookings made by other shared-ledger owners.
|
|
74
124
|
// Direct callers retain sends reported before this owner was constructed.
|
|
75
125
|
let targetSendsUsed = initialPermit ? 0 : Math.max(0,
|
|
@@ -88,26 +138,35 @@ export function createResponsesSendBudget(
|
|
|
88
138
|
};
|
|
89
139
|
const noteTransientSends = (used: number): void => recordTransientSends(used, pendingHopPermit ?? inheritedPermit);
|
|
90
140
|
const physicalSendReporter = (permit?: SingleUseDispatchPermit, explicitContinuation = false,
|
|
91
|
-
|
|
141
|
+
wireEstimate?: { inputTokens: number; outputCeilingTokens: number },
|
|
142
|
+
receiptOwned = false, targetKey = explicitContinuation ? `native-continuation:${crypto.randomUUID()}` : undefined) => {
|
|
92
143
|
let unreportedWorkflowStarts = 0;
|
|
93
|
-
const targetKey = explicitContinuation ? `native-continuation:${crypto.randomUUID()}` : undefined;
|
|
94
144
|
const reporter = createPhysicalSendReporter(sendBudget, () => ({ ...responsesSpendTarget(logCtx),
|
|
95
145
|
...(targetKey ? { targetKey } : {}),
|
|
96
|
-
...(
|
|
146
|
+
...(wireEstimate ? { estimate: wireEstimate, explicitEstimate: true } : {}) }), permit, charged => {
|
|
97
147
|
noteTargetSends(Math.max(0, charged));
|
|
98
148
|
options.onCompactionRecoverySendsReported?.(charged);
|
|
99
149
|
const prepaid = Math.min(unreportedWorkflowStarts, Math.max(0, charged));
|
|
100
150
|
unreportedWorkflowStarts -= prepaid;
|
|
101
151
|
if (!physicalWorkflowAccounting) chargeWorkflowSends(workflowRootId, charged - prepaid);
|
|
102
|
-
}, { explicitContinuation });
|
|
103
|
-
if (
|
|
152
|
+
}, { explicitContinuation, receiptOwned });
|
|
153
|
+
if (compactHandoffSendCeiling !== undefined && !explicitContinuation && reporter.beforeSend) {
|
|
154
|
+
const beforeSend = reporter.beforeSend;
|
|
155
|
+
let prepaid = permit !== undefined;
|
|
156
|
+
reporter.beforeSend = freshRetry => {
|
|
157
|
+
if (!beforeSend(freshRetry || !prepaid)) return false;
|
|
158
|
+
prepaid = false;
|
|
159
|
+
return true;
|
|
160
|
+
};
|
|
161
|
+
}
|
|
162
|
+
if (!receiptOwned && workflowRootId && !physicalWorkflowAccounting) {
|
|
104
163
|
const beforeSend = reporter.beforeSend, close = reporter.close;
|
|
105
164
|
let closed = false;
|
|
106
|
-
reporter.beforeSend =
|
|
165
|
+
reporter.beforeSend = reserveRetrySpend => {
|
|
107
166
|
const policy = currentWorkflowBudgetPolicy();
|
|
108
167
|
// Check before a legacy permit's admission can spend it. No await separates this
|
|
109
168
|
// read from the atomic claim, and the reporter owns the later accounting receipt.
|
|
110
|
-
if (closed || workflowSendCeilingReached(workflowRootId, policy) || beforeSend?.() === false
|
|
169
|
+
if (closed || workflowSendCeilingReached(workflowRootId, policy) || beforeSend?.(reserveRetrySpend) === false
|
|
111
170
|
|| !reserveWorkflowSend(workflowRootId, policy)) return false;
|
|
112
171
|
unreportedWorkflowStarts++;
|
|
113
172
|
return true;
|
|
@@ -117,7 +176,8 @@ export function createResponsesSendBudget(
|
|
|
117
176
|
return reporter;
|
|
118
177
|
};
|
|
119
178
|
// Capture at helper creation, before another leg can replace the pending handoff.
|
|
120
|
-
const transientSendReporter = (permit = pendingHopPermit ?? inheritedPermit) =>
|
|
179
|
+
const transientSendReporter = (permit = pendingHopPermit ?? inheritedPermit, receiptOwned = false) =>
|
|
180
|
+
physicalSendReporter(permit, false, undefined, receiptOwned);
|
|
121
181
|
// A helper owns a fresh booking, never a routed leg's permit or target-local retry counter.
|
|
122
182
|
const dispatchSidecarSend: AuxiliaryModelSend = async (target, dispatch) => {
|
|
123
183
|
if (!isRequestExecutionBudget(sendBudget)) {
|
|
@@ -189,26 +249,19 @@ export function createResponsesSendBudget(
|
|
|
189
249
|
// typed as the narrow holder so a caller that predates this can still pass one, so narrow it
|
|
190
250
|
// once here rather than asserting at each adapter call site.
|
|
191
251
|
const adapterSendBudget = isRequestExecutionBudget(sendBudget) ? sendBudget : undefined;
|
|
252
|
+
const hasCapturedSpendCeiling = (target: SpendScopes = {}): boolean => responsesHasCapturedSpendCeiling(sendBudget, req, logCtx, target);
|
|
192
253
|
/**
|
|
193
254
|
* Records an adapter's OWN inner retries against this attempt.
|
|
194
255
|
*
|
|
195
|
-
*
|
|
196
|
-
*
|
|
197
|
-
* leaves its log byte-for-byte as it was. Kiro reaches roughly eighteen sends per call and
|
|
198
|
-
* Cursor re-sends a whole turn, and both reported one; a count that cannot be observed
|
|
199
|
-
* cannot be pinned by a regression, which is why the instrumentation precedes the cap.
|
|
256
|
+
* The first receipt binds the attempt's identity. The budget counts every receipt, and
|
|
257
|
+
* subsequent sends add to the active attempt without rebinding the credential.
|
|
200
258
|
*/
|
|
201
259
|
const noteAdapterPhysicalSend = (
|
|
202
260
|
inputTokens: number | undefined,
|
|
203
261
|
send: { ordinal: number; recovery?: AttemptRecoveryKind },
|
|
204
|
-
options: { readonly includeFirst?: boolean } = {},
|
|
205
262
|
): void => {
|
|
206
|
-
// Ordinal 1 is skipped because the caller normally records it before dispatch. An adapter
|
|
207
|
-
// that reports every send asks for it to be counted here instead, so that the first send is
|
|
208
|
-
// logged where it actually happens rather than before admission could still refuse it.
|
|
209
263
|
targetSendsUsed += 1;
|
|
210
|
-
if (send.ordinal
|
|
211
|
-
noteAttemptSend(logCtx.activeAttempt, inputTokens, send.recovery);
|
|
264
|
+
if (send.ordinal > 1) noteAttemptSend(logCtx.activeAttempt, inputTokens, send.recovery);
|
|
212
265
|
};
|
|
213
266
|
/**
|
|
214
267
|
* Records a recovery an adapter was ready to make and the budget refused.
|
|
@@ -367,6 +420,19 @@ export function createResponsesSendBudget(
|
|
|
367
420
|
/401|429|oauth|rate-limit|key/.test(recovery) ? "auth-recovery" : "repair";
|
|
368
421
|
|
|
369
422
|
return {
|
|
423
|
+
imageRecoverySendReporter: (body: string, maxOutputTokens: number) => {
|
|
424
|
+
// Each leg needs its own seed at normal capacity, on the ordinary physical-send counter.
|
|
425
|
+
const reporter = physicalSendReporter(undefined, false, { inputTokens: estimateTokens(body, logCtx.model),
|
|
426
|
+
outputCeilingTokens: maxOutputTokens }, false, `image-413:${crypto.randomUUID()}`);
|
|
427
|
+
const beforeSend = reporter.beforeSend;
|
|
428
|
+
reporter.beforeSend = () => {
|
|
429
|
+
const target = responsesSpendTarget(logCtx);
|
|
430
|
+
// A legacy or observe-only holder may know the ceiling without being able to reserve.
|
|
431
|
+
if (adapterSendBudget?.spendEnforced !== true && hasCapturedSpendCeiling(target)) return false;
|
|
432
|
+
return beforeSend?.() !== false;
|
|
433
|
+
};
|
|
434
|
+
return reporter;
|
|
435
|
+
},
|
|
370
436
|
workflowRootId,
|
|
371
437
|
noteTransientSends,
|
|
372
438
|
transientSendReporter,
|
|
@@ -391,7 +457,7 @@ export function createResponsesSendBudget(
|
|
|
391
457
|
initialSendAllowance: (cap: number): number => Math.min(cap,
|
|
392
458
|
remainingTransientSendBudget(cap) + (initialPermit ? 1 : 0)),
|
|
393
459
|
/** At final executor admission, settle only the owning booking or reserve this send. */
|
|
394
|
-
noteInitialDispatch: (prepaid = initialPermit): void => {
|
|
460
|
+
noteInitialDispatch: (prepaid = initialPermit, reserveUnbookedSend = false): void => {
|
|
395
461
|
const policy = currentWorkflowBudgetPolicy();
|
|
396
462
|
if (!physicalWorkflowAccounting && workflowSendCeilingReached(workflowRootId, policy)) {
|
|
397
463
|
prepaid?.release();
|
|
@@ -400,13 +466,14 @@ export function createResponsesSendBudget(
|
|
|
400
466
|
if (prepaid) {
|
|
401
467
|
if (!prepaid.assumeCharge()) { prepaid.release(); throw new SendBudgetExhaustedError(); }
|
|
402
468
|
if (prepaid === initialPermit) initialPermit = undefined;
|
|
403
|
-
} else if (adapterSendBudget && (options.comboInitialSend || options.compactionRecoveryPermit)) {
|
|
469
|
+
} else if (adapterSendBudget && (reserveUnbookedSend || options.comboInitialSend || options.compactionRecoveryPermit)) {
|
|
404
470
|
const decision = adapterSendBudget.reserveDispatch({ sendClass: "transient",
|
|
405
471
|
targetKey: adapterSendBudget.lastTargetKey ?? `${logCtx.provider}/${logCtx.model}` });
|
|
406
472
|
if (!decision.allowed) throw new SendBudgetExhaustedError();
|
|
407
473
|
if (!decision.permit.use()) { decision.permit.release(); throw new SendBudgetExhaustedError(); }
|
|
408
474
|
} else {
|
|
409
475
|
// Legacy direct callers can prebook without handing over a permit; keep their reporter.
|
|
476
|
+
if (reserveUnbookedSend && sendBudgetExhausted()) throw new SendBudgetExhaustedError();
|
|
410
477
|
if (adapterSendBudget?.claimWorkflowSend && !adapterSendBudget.claimWorkflowSend()) throw new SendBudgetExhaustedError();
|
|
411
478
|
if (!physicalWorkflowAccounting && !reserveWorkflowSend(workflowRootId, policy)) throw new SendBudgetExhaustedError();
|
|
412
479
|
recordTransientSends(1, pendingHopPermit ?? inheritedPermit, true);
|
|
@@ -418,6 +485,8 @@ export function createResponsesSendBudget(
|
|
|
418
485
|
},
|
|
419
486
|
/** Physical sends reported by this owner; unrelated shared reservations cannot consume it. */
|
|
420
487
|
get targetSendsUsed(): number { return targetSendsUsed; },
|
|
488
|
+
/** Attribute sends charged by a separate recovery permit to this target. */
|
|
489
|
+
noteTargetSends,
|
|
421
490
|
/**
|
|
422
491
|
* Charged sends, including open prepaid reservations, across this logical request.
|
|
423
492
|
*
|
|
@@ -426,6 +495,8 @@ export function createResponsesSendBudget(
|
|
|
426
495
|
*/
|
|
427
496
|
get sendsUsed(): number { return sendBudget.used; },
|
|
428
497
|
adapterSendBudget,
|
|
498
|
+
compactHandoffSendCeiling,
|
|
499
|
+
hasCapturedSpendCeiling,
|
|
429
500
|
dispatchSidecarSend,
|
|
430
501
|
adapterDispatchBudget,
|
|
431
502
|
refundableAdapterDispatchBudget,
|
|
@@ -474,6 +545,7 @@ function adapterDispatchBudgetView(
|
|
|
474
545
|
get spendEnforced() { return budget.spendEnforced; },
|
|
475
546
|
get spendPolicyStarted() { return budget.spendPolicyStarted; },
|
|
476
547
|
get spendAdmissionPolicy() { return budget.spendAdmissionPolicy; },
|
|
548
|
+
hasCapturedSpendCeiling: target => requestHasCapturedSpendCeiling(budget, target),
|
|
477
549
|
startRequest: target => budget.startRequest?.(target),
|
|
478
550
|
claimPhysicalSend: auxiliary => auxiliary ? budget.claimPhysicalSend?.(true) : budget.claimPhysicalSend?.(),
|
|
479
551
|
claimContinuationPhysicalSend: () => budget.claimContinuationPhysicalSend?.(),
|
|
@@ -2,6 +2,11 @@ import { CodexInstallationIdUnavailableError } from "../../codex/installation-id
|
|
|
2
2
|
import type { ResponsesRequestContext } from "./core-options";
|
|
3
3
|
import type { PreparedResponsesRequest } from "./request-prepare";
|
|
4
4
|
import type { ResponsesTransport } from "./request-transport";
|
|
5
|
+
import type { OcxConfig, OcxParsedRequest } from "../../types";
|
|
6
|
+
import type { ComboTargetRoute } from "../../combos/request-capability";
|
|
7
|
+
import { ComboVisionDescriptionUnavailableError, policyCandidateRefusalResponse } from "./policy-request-scope";
|
|
8
|
+
import { intersectAdmissionModelScopes, resolveAdmissionModelScope } from "../admission-model-scope";
|
|
9
|
+
import { captureAdmissionPolicy } from "../capture-admission-policy";
|
|
5
10
|
import type { ResolvedOpenAiForwardSidecar } from "../../providers/openai-sidecar";
|
|
6
11
|
import { isCanonicalOpenAiForwardProvider, supportsNativeResponsesCompactionTrigger } from "../../providers/openai-tiers";
|
|
7
12
|
import { omitEarlierCompactionImages } from "../../responses/compaction-images";
|
|
@@ -32,9 +37,121 @@ import {
|
|
|
32
37
|
CodexMainProfileDrainingError,
|
|
33
38
|
} from "../../codex/auth-context";
|
|
34
39
|
|
|
40
|
+
type SidecarRequestContext = Pick<ResponsesRequestContext, "options" | "config" | "req">;
|
|
41
|
+
|
|
42
|
+
/** The config vision planning reads: a combo request plans with its request-start sidecar settings. */
|
|
43
|
+
export function responsesVisionConfig({ config, options }: Pick<SidecarRequestContext, "config" | "options">): OcxConfig {
|
|
44
|
+
const admitted = options.comboVisionSidecar;
|
|
45
|
+
return admitted ? { ...config, visionSidecar: admitted.settings } : config;
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
async function resolveResponsesOpenAiSidecar(
|
|
49
|
+
{ options, config, req }: SidecarRequestContext,
|
|
50
|
+
route: Pick<ComboTargetRoute, "codexAccountId">,
|
|
51
|
+
): Promise<ResolvedOpenAiForwardSidecar | undefined> {
|
|
52
|
+
try {
|
|
53
|
+
const candidates = listOpenAiForwardSidecarCandidates(config);
|
|
54
|
+
let sidecarAuth = options.openAiSidecarAuth;
|
|
55
|
+
if (!sidecarAuth && options.allowStoredOpenAiSidecarAuth === true
|
|
56
|
+
&& route.codexAccountId === undefined
|
|
57
|
+
&& candidates.some(candidate => candidate.accountMode === "direct")
|
|
58
|
+
&& tryClaimStoredSidecarMainProfile(options.turnAdmissionLease)) {
|
|
59
|
+
// Request-local helper authority only: never promote this pair to caller, primary,
|
|
60
|
+
// or retry credentials. Claim before reading so profile switches remain fenced.
|
|
61
|
+
try {
|
|
62
|
+
const { getMainAccountToken } = await import("../../codex/main-account");
|
|
63
|
+
const token = getMainAccountToken();
|
|
64
|
+
if (token) sidecarAuth = captureExplicitOpenAiCallerAuth(new Headers({
|
|
65
|
+
authorization: `Bearer ${token.accessToken}`, "chatgpt-account-id": token.chatgptAccountId,
|
|
66
|
+
}), config);
|
|
67
|
+
} catch { /* stored enrichment is optional */ }
|
|
68
|
+
}
|
|
69
|
+
// Preserve explicit OpenAI helper auth across route changes without returning it to
|
|
70
|
+
// primary-provider headers or alternate-main retry. The resolver revalidates scope.
|
|
71
|
+
const sidecarHeaders = new Headers(req.headers);
|
|
72
|
+
sidecarHeaders.delete("authorization");
|
|
73
|
+
sidecarHeaders.delete("chatgpt-account-id");
|
|
74
|
+
if (sidecarAuth) {
|
|
75
|
+
sidecarHeaders.set("authorization", sidecarAuth.authorization);
|
|
76
|
+
sidecarHeaders.set("chatgpt-account-id", sidecarAuth.chatgptAccountId);
|
|
77
|
+
}
|
|
78
|
+
return await resolveFirstUsableOpenAiSidecar(
|
|
79
|
+
candidates,
|
|
80
|
+
sidecarHeaders,
|
|
81
|
+
config,
|
|
82
|
+
{
|
|
83
|
+
admission: options.admission,
|
|
84
|
+
signal: options.abortSignal,
|
|
85
|
+
codexAuthPolicy: options.codexAuthPolicy,
|
|
86
|
+
// Account-qualified native routes are passthrough, so their in-turn helper is vision.
|
|
87
|
+
// Scope its cooldown and outcome to the helper model, not the routed text model.
|
|
88
|
+
...(route.codexAccountId !== undefined
|
|
89
|
+
? { exactAccount: { accountId: route.codexAccountId, modelId: resolveOpenAiVisionModel(responsesVisionConfig({ config, options })) } }
|
|
90
|
+
: {}),
|
|
91
|
+
beginCodexAccountSelection: codexAccountSelectionForTurn(options.turnAdmissionLease),
|
|
92
|
+
},
|
|
93
|
+
);
|
|
94
|
+
} catch (err) {
|
|
95
|
+
// Sidecars are optional helpers for an otherwise independent routed turn.
|
|
96
|
+
// An unavailable/cooling/expired Multi credential disables the helper; it
|
|
97
|
+
// must not turn a valid routed-provider request into a Codex-auth failure.
|
|
98
|
+
if (
|
|
99
|
+
!(err instanceof CodexInstallationIdUnavailableError)
|
|
100
|
+
&& !(err instanceof CodexPoolAuthenticationError)
|
|
101
|
+
&& !(err instanceof CodexAuthContextError)
|
|
102
|
+
&& !(err instanceof CodexAccountCooldownError)
|
|
103
|
+
&& !(err instanceof CodexThreadAffinityExpiredError)
|
|
104
|
+
&& !(err instanceof CodexMainProfileDrainingError)
|
|
105
|
+
) throw err;
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
function responsesVisionPlan(
|
|
110
|
+
{ config, options }: SidecarRequestContext,
|
|
111
|
+
{ provider, providerName, modelId }: ComboTargetRoute,
|
|
112
|
+
parsed: OcxParsedRequest,
|
|
113
|
+
openAiSidecar: ResolvedOpenAiForwardSidecar | undefined,
|
|
114
|
+
) {
|
|
115
|
+
const admissionScope = visionAdmissionScope(config, options);
|
|
116
|
+
const plan = planVisionSidecar(responsesVisionConfig({ config, options }), provider, modelId, parsed, openAiSidecar, {
|
|
117
|
+
admission: options.admission, codexAuthPolicy: options.codexAuthPolicy, providerName,
|
|
118
|
+
admissionScope,
|
|
119
|
+
});
|
|
120
|
+
if (plan?.backend === "routed") {
|
|
121
|
+
const callerPolicy = options.advisorAdmissionPolicy ?? captureAdmissionPolicy(config, options.admission, admissionScope);
|
|
122
|
+
plan.advisorAdmissionPolicy = { ...callerPolicy, modelScope: admissionScope ?? callerPolicy.modelScope };
|
|
123
|
+
}
|
|
124
|
+
return plan;
|
|
125
|
+
}
|
|
126
|
+
|
|
127
|
+
function visionAdmissionScope(config: SidecarRequestContext["config"], options: SidecarRequestContext["options"]) {
|
|
128
|
+
return intersectAdmissionModelScopes(
|
|
129
|
+
options.admissionScope ?? resolveAdmissionModelScope(config, options.admission),
|
|
130
|
+
options.advisorAdmissionPolicy?.modelScope,
|
|
131
|
+
);
|
|
132
|
+
}
|
|
133
|
+
|
|
134
|
+
/** Use the child's real planner and auth rules, then return any unused recovery probe. */
|
|
135
|
+
export async function canDescribeComboImages(
|
|
136
|
+
context: SidecarRequestContext,
|
|
137
|
+
route: ComboTargetRoute,
|
|
138
|
+
parsed: OcxParsedRequest,
|
|
139
|
+
): Promise<boolean> {
|
|
140
|
+
if (context.options.visionDescribeTerminal) return false;
|
|
141
|
+
const openAiSidecar = shouldResolveOpenAiVisionSidecar(responsesVisionConfig(context), route.provider, route.modelId, parsed, route.providerName,
|
|
142
|
+
visionAdmissionScope(context.config, context.options))
|
|
143
|
+
? await resolveResponsesOpenAiSidecar(context, route) : undefined;
|
|
144
|
+
try {
|
|
145
|
+
const plan = responsesVisionPlan(context, route, parsed, openAiSidecar);
|
|
146
|
+
return plan !== undefined && plan.maxDescriptionsPerTurn > 0;
|
|
147
|
+
} finally {
|
|
148
|
+
openAiSidecar?.releaseProbeLease?.();
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
|
|
35
152
|
/** One responsibility of the Responses request pipeline; state owners are explicit. */
|
|
36
153
|
export async function prepareResponsesSidecarAuth(
|
|
37
|
-
requestContext:
|
|
154
|
+
requestContext: SidecarRequestContext,
|
|
38
155
|
requestState: Pick<
|
|
39
156
|
PreparedResponsesRequest,
|
|
40
157
|
| "parsed"
|
|
@@ -44,19 +161,21 @@ export async function prepareResponsesSidecarAuth(
|
|
|
44
161
|
>,
|
|
45
162
|
transportState: Pick<ResponsesTransport, "adapter" | "isPassthrough">,
|
|
46
163
|
) {
|
|
47
|
-
const { options, config
|
|
164
|
+
const { options, config } = requestContext;
|
|
48
165
|
const { parsed, route, translatorBudget } = requestState;
|
|
49
166
|
const { isPassthrough } = transportState;
|
|
50
167
|
|
|
51
168
|
|
|
52
169
|
let openAiSidecar: ResolvedOpenAiForwardSidecar | undefined;
|
|
53
170
|
const visionDescribeTerminal = options.visionDescribeTerminal === true;
|
|
171
|
+
const skipVision = visionDescribeTerminal || options.comboOmitImages === true;
|
|
54
172
|
const routedCompaction = parsed._compactionRequest === true
|
|
55
173
|
&& (!supportsNativeResponsesCompactionTrigger(route.provider) || parsed._portableCompaction === true);
|
|
56
174
|
const preserveCompactionPrefix = routedCompaction && transportState.adapter.name === "anthropic";
|
|
57
175
|
if (routedCompaction) parsed.context.messages = omitEarlierCompactionImages(parsed.context.messages);
|
|
58
|
-
const needsOpenAiVision = !
|
|
59
|
-
&& shouldResolveOpenAiVisionSidecar(
|
|
176
|
+
const needsOpenAiVision = !skipVision
|
|
177
|
+
&& shouldResolveOpenAiVisionSidecar(responsesVisionConfig(requestContext), route.provider, route.modelId, parsed, route.providerName,
|
|
178
|
+
visionAdmissionScope(config, options));
|
|
60
179
|
// LOCAL PATCH (runturn-websearch): runTurn adapters can run the web-search
|
|
61
180
|
// sidecar through src/web-search/run-turn-loop.ts, so resolve the helper
|
|
62
181
|
// credential for them too. The passthrough bridge stays fetch-only.
|
|
@@ -66,60 +185,7 @@ export async function prepareResponsesSidecarAuth(
|
|
|
66
185
|
: (shouldResolveOpenAiWebSearchSidecar(config, parsed, isPassthrough)
|
|
67
186
|
|| shouldResolveOpenAiPassthroughWebSearchBridge(route.provider, parsed, isPassthrough)));
|
|
68
187
|
if (needsOpenAiVision || needsOpenAiSearch) {
|
|
69
|
-
|
|
70
|
-
const candidates = listOpenAiForwardSidecarCandidates(config);
|
|
71
|
-
let sidecarAuth = options.openAiSidecarAuth;
|
|
72
|
-
if (!sidecarAuth && options.allowStoredOpenAiSidecarAuth === true
|
|
73
|
-
&& route.codexAccountId === undefined
|
|
74
|
-
&& candidates.some(candidate => candidate.accountMode === "direct")
|
|
75
|
-
&& tryClaimStoredSidecarMainProfile(options.turnAdmissionLease)) {
|
|
76
|
-
// Request-local helper authority only: never promote this pair to caller, primary,
|
|
77
|
-
// or retry credentials. Claim before reading so profile switches remain fenced.
|
|
78
|
-
try {
|
|
79
|
-
const { getMainAccountToken } = await import("../../codex/main-account");
|
|
80
|
-
const token = getMainAccountToken();
|
|
81
|
-
if (token) sidecarAuth = captureExplicitOpenAiCallerAuth(new Headers({
|
|
82
|
-
authorization: `Bearer ${token.accessToken}`, "chatgpt-account-id": token.chatgptAccountId,
|
|
83
|
-
}), config);
|
|
84
|
-
} catch { /* stored enrichment is optional */ }
|
|
85
|
-
}
|
|
86
|
-
// Preserve explicit OpenAI helper auth across route changes without returning it to
|
|
87
|
-
// primary-provider headers or alternate-main retry. The resolver revalidates scope.
|
|
88
|
-
const sidecarHeaders = new Headers(req.headers);
|
|
89
|
-
sidecarHeaders.delete("authorization");
|
|
90
|
-
sidecarHeaders.delete("chatgpt-account-id");
|
|
91
|
-
if (sidecarAuth) {
|
|
92
|
-
sidecarHeaders.set("authorization", sidecarAuth.authorization);
|
|
93
|
-
sidecarHeaders.set("chatgpt-account-id", sidecarAuth.chatgptAccountId);
|
|
94
|
-
}
|
|
95
|
-
openAiSidecar = await resolveFirstUsableOpenAiSidecar(
|
|
96
|
-
candidates,
|
|
97
|
-
sidecarHeaders,
|
|
98
|
-
config,
|
|
99
|
-
{
|
|
100
|
-
admission: options.admission,
|
|
101
|
-
codexAuthPolicy: options.codexAuthPolicy,
|
|
102
|
-
// Account-qualified native routes are passthrough, so their in-turn helper is vision.
|
|
103
|
-
// Scope its cooldown and outcome to the helper model, not the routed text model.
|
|
104
|
-
...(route.codexAccountId !== undefined
|
|
105
|
-
? { exactAccount: { accountId: route.codexAccountId, modelId: resolveOpenAiVisionModel(config) } }
|
|
106
|
-
: {}),
|
|
107
|
-
beginCodexAccountSelection: codexAccountSelectionForTurn(options.turnAdmissionLease),
|
|
108
|
-
},
|
|
109
|
-
);
|
|
110
|
-
} catch (err) {
|
|
111
|
-
// Sidecars are optional helpers for an otherwise independent routed turn.
|
|
112
|
-
// An unavailable/cooling/expired Multi credential disables the helper; it
|
|
113
|
-
// must not turn a valid routed-provider request into a Codex-auth failure.
|
|
114
|
-
if (
|
|
115
|
-
!(err instanceof CodexInstallationIdUnavailableError)
|
|
116
|
-
&& !(err instanceof CodexPoolAuthenticationError)
|
|
117
|
-
&& !(err instanceof CodexAuthContextError)
|
|
118
|
-
&& !(err instanceof CodexAccountCooldownError)
|
|
119
|
-
&& !(err instanceof CodexThreadAffinityExpiredError)
|
|
120
|
-
&& !(err instanceof CodexMainProfileDrainingError)
|
|
121
|
-
) throw err;
|
|
122
|
-
}
|
|
188
|
+
openAiSidecar = await resolveResponsesOpenAiSidecar(requestContext, route);
|
|
123
189
|
}
|
|
124
190
|
|
|
125
191
|
// Vision sidecar: the routed model can't see images (provider.noVisionModels). Describe each
|
|
@@ -129,23 +195,26 @@ export async function prepareResponsesSidecarAuth(
|
|
|
129
195
|
// call must never plan another describe. The flag arrives from the Chat
|
|
130
196
|
// surface (whose bridge rebuilds headers) or as the raw header for native
|
|
131
197
|
// Responses callers. Marked + text-only routed model → strip, depth cap 1.
|
|
132
|
-
const visionPlan =
|
|
198
|
+
const visionPlan = skipVision
|
|
133
199
|
? undefined
|
|
134
|
-
:
|
|
135
|
-
admission: options.admission, codexAuthPolicy: options.codexAuthPolicy, providerName: route.providerName,
|
|
136
|
-
advisorAdmissionPolicy: options.advisorAdmissionPolicy,
|
|
137
|
-
});
|
|
200
|
+
: responsesVisionPlan(requestContext, route, parsed, openAiSidecar);
|
|
138
201
|
const recordSidecarOutcome = openAiSidecar?.recordOutcome;
|
|
139
|
-
if (visionPlan) {
|
|
202
|
+
if (visionPlan && (!options.comboRequiresVisionPlan || visionPlan.maxDescriptionsPerTurn > 0)) {
|
|
140
203
|
try {
|
|
141
|
-
await describeImagesInPlace(
|
|
204
|
+
const complete = await describeImagesInPlace(
|
|
142
205
|
parsed,
|
|
143
206
|
visionPlan,
|
|
144
207
|
openAiSidecar?.headers ?? requestState.selectedForwardHeaders,
|
|
145
208
|
options.abortSignal,
|
|
146
209
|
recordSidecarOutcome,
|
|
147
210
|
translatorBudget,
|
|
211
|
+
options.comboRequiresVisionPlan,
|
|
148
212
|
);
|
|
213
|
+
if (!complete && options.comboRequiresVisionPlan) {
|
|
214
|
+
openAiSidecar?.releaseProbeLease?.();
|
|
215
|
+
openAiSidecar = undefined;
|
|
216
|
+
return policyCandidateRefusalResponse(new ComboVisionDescriptionUnavailableError())!;
|
|
217
|
+
}
|
|
149
218
|
} finally {
|
|
150
219
|
// Local validation can reject every image before the sidecar fetch records an outcome.
|
|
151
220
|
// Vision-only turns must hand that unused cooldown probe back; when a fetch did run the
|
|
@@ -155,6 +224,10 @@ export async function prepareResponsesSidecarAuth(
|
|
|
155
224
|
} else if (requiresVisionPreprocessing(config, route.provider, route.modelId, route.providerName)) {
|
|
156
225
|
// Image capability is not positively proven but no sidecar plan is dispatchable: fail closed.
|
|
157
226
|
// Never forward raw image bytes to an unverified upstream.
|
|
227
|
+
if (options.comboRequiresVisionPlan) {
|
|
228
|
+
openAiSidecar?.releaseProbeLease?.();
|
|
229
|
+
return policyCandidateRefusalResponse(new ComboVisionDescriptionUnavailableError())!;
|
|
230
|
+
}
|
|
158
231
|
stripImagesInPlace(parsed, translatorBudget);
|
|
159
232
|
if (!needsOpenAiSearch) openAiSidecar?.releaseProbeLease?.();
|
|
160
233
|
}
|
|
@@ -1,13 +1,25 @@
|
|
|
1
1
|
import type { SpendScopes } from "../../lib/spend-reservation-ledger";
|
|
2
|
+
import type { OcxProviderConfig } from "../../types";
|
|
2
3
|
import type { RequestLogContext } from "../request-log";
|
|
3
4
|
|
|
4
5
|
type PhysicalSpendTarget = SpendScopes & { targetKey?: string };
|
|
5
6
|
const targets = new WeakMap<RequestLogContext, () => PhysicalSpendTarget>();
|
|
7
|
+
type HostedAdvisorTarget = (provider?: OcxProviderConfig) => PhysicalSpendTarget;
|
|
8
|
+
const hostedAdvisorTargets = new WeakMap<RequestLogContext, HostedAdvisorTarget>();
|
|
6
9
|
|
|
7
10
|
/** A prepared candidate can own admission without overwriting the last physical send's log. */
|
|
8
11
|
export function bindResponsesSpendTarget(context: RequestLogContext, target?: () => PhysicalSpendTarget): void {
|
|
9
12
|
if (target) targets.set(context, target);
|
|
10
|
-
else targets.delete(context);
|
|
13
|
+
else { targets.delete(context); hostedAdvisorTargets.delete(context); }
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
/** Optional hosted work checks an admitted identity without changing main-model accounting. */
|
|
17
|
+
export function bindResponsesHostedAdvisorSpendTarget(context: RequestLogContext, target: HostedAdvisorTarget): void {
|
|
18
|
+
hostedAdvisorTargets.set(context, target);
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
export function responsesHostedAdvisorSpendTarget(context: RequestLogContext, fallbackPool?: string, provider?: OcxProviderConfig): PhysicalSpendTarget {
|
|
22
|
+
return hostedAdvisorTargets.get(context)?.(provider) ?? responsesSpendTarget(context, fallbackPool);
|
|
11
23
|
}
|
|
12
24
|
|
|
13
25
|
/** Resolve late, after queued negotiation; ordinary callers retain their original pool fallback. */
|