@bitkyc08/opencodex 2.100.5 → 2.100.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/bin/ocx.mjs +2 -0
- package/gui/dist/assets/App-BI8LQ7Qk.css +1 -0
- package/gui/dist/assets/App-CsZ1Gr7S.js +60 -0
- package/gui/dist/assets/Tray-CVqm4S4W.js +1 -0
- package/gui/dist/assets/brand-mark-BebhnAtV.js +1 -0
- package/gui/dist/assets/index-BtwVlpeQ.css +2 -0
- package/gui/dist/assets/index-CEeMegqE.js +138 -0
- package/gui/dist/assets/{segment-thumb-features-Bquysdn5.js → segment-thumb-features-COdzmORE.js} +1 -1
- package/gui/dist/classic/assets/App-BJgUWNJ8.js +59 -0
- package/gui/dist/classic/assets/App-CoiVLRW3.css +1 -0
- package/gui/dist/classic/assets/Tray-BDlcOLDK.js +1 -0
- package/gui/dist/classic/assets/index-B9Jgli_W.js +138 -0
- package/gui/dist/classic/assets/usage-companion-chart-vbzDcND0.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.lock +62 -0
- package/native/ocx-child/Cargo.toml +1 -0
- package/native/ocx-child/src/journal.rs +32 -10
- package/native/ocx-child/src/state.rs +2 -1
- package/native/ocx-child/src/toml_surgeon.rs +183 -72
- package/package.json +2 -2
- package/src/adapters/agy-acp/acp.ts +202 -0
- package/src/adapters/agy-acp/adapter.ts +554 -0
- package/src/adapters/agy-acp/binary.ts +79 -0
- package/src/adapters/agy-acp/options.ts +163 -0
- package/src/adapters/agy-acp/output-redaction.ts +270 -0
- package/src/adapters/agy-acp/policy.ts +105 -0
- package/src/adapters/agy-acp/process.ts +218 -0
- package/src/adapters/anthropic/account-metadata.ts +4 -1
- package/src/adapters/anthropic/advisor-tool.ts +43 -9
- package/src/adapters/anthropic/client-identity.ts +2 -0
- package/src/adapters/anthropic.ts +102 -14
- package/src/adapters/antigravity-refusal.ts +5 -1
- package/src/adapters/base.ts +25 -2
- package/src/adapters/claude-cli/adapter.ts +1 -0
- package/src/adapters/claude-cli/usage-admission.ts +12 -9
- package/src/adapters/codebuddy/adapter.ts +1 -0
- package/src/adapters/command-code.ts +2 -2
- package/src/adapters/cursor/http1-bidi.ts +7 -2
- package/src/adapters/cursor/live-transport.ts +2 -0
- package/src/adapters/cursor/request-builder.ts +4 -4
- package/src/adapters/cursor/tool-naming.ts +5 -5
- package/src/adapters/cursor/transport-retry.ts +14 -8
- package/src/adapters/cursor/transport.ts +2 -0
- package/src/adapters/cursor.ts +8 -2
- package/src/adapters/google-error-details.ts +105 -0
- package/src/adapters/google-errors.ts +183 -31
- package/src/adapters/google-http.ts +66 -22
- package/src/adapters/google-truncation.ts +48 -3
- package/src/adapters/google-vertex-endpoint.ts +12 -1
- package/src/adapters/google.ts +54 -26
- package/src/adapters/kiro/adapter.ts +39 -38
- package/src/adapters/kiro/stream.ts +59 -9
- package/src/adapters/kiro-retry.ts +5 -3
- package/src/adapters/m365-copilot/LICENSE +21 -0
- package/src/adapters/m365-copilot/fenced.ts +745 -0
- package/src/adapters/m365-copilot/images.ts +89 -0
- package/src/adapters/m365-copilot/tools.ts +284 -0
- package/src/adapters/m365-copilot/transport.ts +232 -0
- package/src/adapters/m365-copilot.ts +143 -0
- package/src/adapters/openai-chat/tool-schema.ts +2 -2
- package/src/adapters/openai-responses/passthrough.ts +1 -0
- package/src/adapters/openai-responses/reasoning.ts +23 -3
- package/src/adapters/physical-send.ts +11 -4
- package/src/adapters/qoder/adapter.ts +17 -3
- package/src/adapters/registry.ts +15 -1
- package/src/adapters/zed.ts +2 -1
- package/src/advisor/consult.ts +1 -0
- package/src/bridge/response-json.ts +6 -2
- package/src/bridge/sse.ts +21 -9
- package/src/chat/inbound.ts +11 -8
- package/src/chat/outbound.ts +28 -7
- package/src/claude/context-windows.ts +32 -8
- package/src/claude/desktop-3p.ts +18 -14
- package/src/claude/desktop-picker-platform.ts +1 -1
- package/src/claude/desktop-picker.ts +3 -3
- package/src/claude/inbound-content-options.ts +11 -1
- package/src/claude/intercept/picker-ca-cleanup.ts +17 -5
- package/src/claude/intercept/picker-ca.ts +162 -27
- package/src/claude/intercept/picker-trust-linux.ts +411 -0
- package/src/claude/intercept/picker-trust.ts +35 -3
- package/src/claude/intercept/runtime.ts +2 -2
- package/src/claude/subagent-force-status.ts +24 -5
- package/src/claude/subscription-reserve.ts +87 -0
- package/src/cli/account-api.ts +3 -0
- package/src/cli/account-auth.ts +65 -11
- package/src/cli/account-extended.ts +1 -1
- package/src/cli/account-next-actions.ts +4 -1
- package/src/cli/account-policy-dto.ts +1 -1
- package/src/cli/account-policy.ts +6 -3
- package/src/cli/account-probe.ts +66 -0
- package/src/cli/account.ts +8 -2
- package/src/cli/capabilities-accounts.ts +8 -1
- package/src/cli/capabilities-agents-routing.ts +2 -2
- package/src/cli/capabilities-base.ts +4 -4
- package/src/cli/capabilities-integrations.ts +44 -4
- package/src/cli/capabilities-provider-models.ts +6 -0
- package/src/cli/claude-context-settings.ts +60 -0
- package/src/cli/claude-desktop.ts +2 -2
- package/src/cli/claude.ts +15 -7
- package/src/cli/client-start-fence.ts +64 -1
- package/src/cli/combo-result.ts +1 -0
- package/src/cli/combo-stats.ts +1 -1
- package/src/cli/combo.ts +19 -2
- package/src/cli/config-command.ts +21 -8
- package/src/cli/connect.ts +16 -0
- package/src/cli/cross-home-owner.ts +65 -18
- package/src/cli/dispatch.ts +4 -0
- package/src/cli/gateway-client-command.ts +128 -0
- package/src/cli/index.ts +98 -97
- package/src/cli/init.ts +20 -4
- package/src/cli/integrations.ts +23 -3
- package/src/cli/launcher-context.ts +12 -1
- package/src/cli/link.ts +24 -5
- package/src/cli/models-runtime-subcommands.ts +1 -0
- package/src/cli/models-runtime.ts +32 -0
- package/src/cli/start-owner-fence.ts +5 -2
- package/src/cli/status.ts +3 -3
- package/src/cli/stop-client-process.ts +51 -0
- package/src/cli/stop-restore.ts +383 -36
- package/src/cli/sync-command.ts +2 -2
- package/src/cli/uninstall-client-state.ts +7 -0
- package/src/client/connect.ts +72 -13
- package/src/client/hub-client.ts +38 -0
- package/src/client/hub-relay.ts +61 -36
- package/src/client/hub-session.ts +106 -0
- package/src/client/lifecycle-lock.ts +6 -1
- package/src/client/link-relay.ts +2 -1
- package/src/client/machine-listener.ts +60 -1
- package/src/client/runtime-restart.ts +1 -0
- package/src/client/runtime.ts +104 -34
- package/src/client/state.ts +11 -0
- package/src/client/stop-darwin-process.ts +73 -0
- package/src/client/stop-file-routing.ts +49 -0
- package/src/client/stop-native-handoff.ts +108 -0
- package/src/client/stop-routing.ts +41 -7
- package/src/client/stop-teardown-owner.ts +173 -0
- package/src/client/sync-runtime.ts +23 -4
- package/src/clients/config-export/opencode-wire.ts +24 -0
- package/src/clients/config-export.ts +28 -19
- package/src/codex/auth-api/login-flow.ts +68 -33
- package/src/codex/auth-api/main-account-probe.ts +3 -3
- package/src/codex/auth-api/pool-quota-probe.ts +8 -7
- package/src/codex/auth-api/routes.ts +1 -1
- package/src/codex/catalog/aggregation.ts +22 -10
- package/src/codex/catalog/gather-capture.ts +11 -2
- package/src/codex/catalog/m365-copilot-models.ts +52 -0
- package/src/codex/catalog/provider-models.ts +126 -53
- package/src/codex/catalog/routed-gather.ts +26 -12
- package/src/codex/catalog-admission.ts +4 -6
- package/src/codex/catalog-auto-refresh.ts +4 -2
- package/src/codex/catalog-self-heal.ts +4 -2
- package/src/codex/control-plane-models.ts +6 -0
- package/src/codex/convergence.ts +10 -0
- package/src/codex/desktop-app/picker-freshness.ts +3 -14
- package/src/codex/desktop-app/types.ts +6 -0
- package/src/codex/desktop-app/windows-command-payload.ts +9 -0
- package/src/codex/desktop-app/windows.ts +20 -12
- package/src/codex/desktop-compatibility/installed-build.ts +61 -58
- package/src/codex/desktop-compatibility/runtime-ownership.ts +11 -5
- package/src/codex/desktop-compatibility/runtime.ts +51 -14
- package/src/codex/desktop-compatibility/windows-activation-source.ts +28 -13
- package/src/codex/desktop-compatibility/windows-package-command.ts +73 -33
- package/src/codex/desktop-compatibility/windows-package-launch.ts +41 -9
- package/src/codex/desktop-compatibility/windows-package-proof.ts +104 -0
- package/src/codex/inject/config-toml.ts +67 -73
- package/src/codex/inject/plan.ts +11 -10
- package/src/codex/inject/remove.ts +4 -1
- package/src/codex/inject.ts +1 -0
- package/src/codex/journal-config-restore.ts +31 -4
- package/src/codex/journal.ts +16 -4
- package/src/codex/model-cache.ts +98 -27
- package/src/codex/native-residue.ts +14 -13
- package/src/codex/paths.ts +65 -28
- package/src/codex/quota-observation-freshness.ts +4 -0
- package/src/codex/quota.ts +71 -8
- package/src/codex/routing/selection.ts +32 -8
- package/src/combos/capability-policy.ts +31 -0
- package/src/combos/failover.ts +82 -74
- package/src/combos/identifiers.ts +2 -2
- package/src/combos/index.ts +3 -0
- package/src/combos/jev-model-backend.ts +12 -4
- package/src/combos/jev-session-pin-config.ts +22 -9
- package/src/combos/jev.ts +15 -4
- package/src/combos/request-capability.ts +214 -0
- package/src/combos/request.ts +22 -15
- package/src/combos/resolve.ts +5 -2
- package/src/combos/suggestion-channel.ts +89 -0
- package/src/combos/types.ts +14 -1
- package/src/config/account-auto-pause-revisions.ts +33 -10
- package/src/config/atomic-write.ts +1 -1
- package/src/config/codex-ws-incremental-setting.ts +34 -0
- package/src/config/diagnostics.ts +47 -8
- package/src/config/live-topology.ts +4 -2
- package/src/config/load-degrade.ts +96 -2
- package/src/config/mutation-lock.ts +7 -3
- package/src/config/paths.ts +3 -0
- package/src/config/pending-teardown.ts +19 -3
- package/src/config/process-state.ts +30 -12
- package/src/config/provider-validation.ts +10 -0
- package/src/config/salvage.ts +2 -2
- package/src/config/schema/account-auto-pause.ts +15 -1
- package/src/config/schema/agy-acp-references.ts +257 -0
- package/src/config/schema/config-schema.ts +32 -0
- package/src/config/schema/leaf-validators.ts +42 -0
- package/src/config/schema/subscription-reserve.ts +33 -0
- package/src/config/windows-process-command-line.ts +27 -9
- package/src/config.ts +6 -0
- package/src/generated/compatibility-version.json +806 -402
- package/src/images/loop.ts +79 -39
- package/src/integrations/catalog-refresh.ts +19 -1
- package/src/integrations/gateway-clients/agy.ts +340 -0
- package/src/integrations/gateway-clients/antigravity.ts +224 -0
- package/src/integrations/gateway-clients/index.ts +89 -0
- package/src/integrations/gateway-clients/io.ts +278 -0
- package/src/integrations/gateway-clients/types.ts +80 -0
- package/src/integrations/route-intent-disconnect.ts +37 -21
- package/src/lib/app-owned-memory-stores.ts +9 -0
- package/src/lib/cloud-code-appeal-link.ts +30 -0
- package/src/lib/errors.ts +32 -0
- package/src/lib/executor-physical-send-receipt.ts +42 -0
- package/src/lib/failure-detail.ts +1 -0
- package/src/lib/gcp-adc.ts +5 -0
- package/src/lib/http-date.ts +91 -0
- package/src/lib/lab-passive-linker-registration.ts +2 -1
- package/src/lib/local-chat-completion.ts +13 -3
- package/src/lib/local-internal-call-capability.ts +1 -3
- package/src/lib/messages-error-body.ts +2 -1
- package/src/lib/outbound-credential-registry.ts +40 -4
- package/src/lib/pinned-http.ts +7 -2
- package/src/lib/process-control.ts +1 -0
- package/src/lib/provider-egress.ts +16 -0
- package/src/lib/provider-outbound.ts +3 -0
- package/src/lib/redact-folding.ts +12 -3
- package/src/lib/redact.ts +37 -19
- package/src/lib/request-execution-budget.ts +241 -32
- package/src/lib/request-peer-scope.ts +64 -0
- package/src/lib/response-send-readings.ts +41 -0
- package/src/lib/state-store-registrations.ts +5 -0
- package/src/lib/tool-envelope-echo-filter.ts +33 -5
- package/src/lib/upstream-condition.ts +10 -3
- package/src/lib/upstream-retry.ts +95 -20
- package/src/lib/windows-secret-acl.ts +24 -7
- package/src/link/child-activity.ts +60 -4
- package/src/link/codex-settings.ts +2 -1
- package/src/link/relay-auth.ts +1 -0
- package/src/link/route-rounds.ts +32 -9
- package/src/link/status-projection.ts +42 -5
- package/src/link/supervisor.ts +96 -11
- package/src/link/tunnel-history.ts +5 -0
- package/src/oauth/account-auto-pause-policy.ts +72 -19
- package/src/oauth/account-auto-pause.ts +40 -16
- package/src/oauth/anthropic-account-refusal.ts +7 -0
- package/src/oauth/anthropic-continuity.ts +70 -9
- package/src/oauth/anthropic-identity.ts +75 -11
- package/src/oauth/anthropic-login-slot.ts +258 -0
- package/src/oauth/anthropic-routing.ts +24 -9
- package/src/oauth/anthropic-send-ownership.ts +4 -3
- package/src/oauth/anthropic.ts +30 -11
- package/src/oauth/health.ts +7 -2
- package/src/oauth/index.ts +50 -48
- package/src/oauth/key-providers.ts +2 -0
- package/src/oauth/login-cli.ts +11 -0
- package/src/oauth/login-flow-state.ts +10 -4
- package/src/oauth/m365-copilot-browser.ts +222 -0
- package/src/oauth/m365-copilot-web-session.ts +25 -0
- package/src/oauth/m365-copilot.ts +57 -0
- package/src/oauth/model-discovery-auth.ts +5 -0
- package/src/oauth/plan.ts +44 -0
- package/src/oauth/pool-kernel.ts +22 -8
- package/src/oauth/pool-settings-capability.ts +14 -3
- package/src/oauth/reauth-precheck.ts +27 -0
- package/src/oauth/store-anthropic-instance.ts +3 -1
- package/src/oauth/store.ts +121 -23
- package/src/oauth/types.ts +27 -2
- package/src/protocols/codecs/chat-ir.ts +7 -4
- package/src/protocols/codecs/gemini-interactions.ts +770 -0
- package/src/protocols/codecs/gemini.ts +470 -0
- package/src/protocols/contract.ts +2 -0
- package/src/protocols/encoders/adapter-events.ts +5 -3
- package/src/protocols/encoders/chat.ts +23 -7
- package/src/protocols/settings.ts +3 -0
- package/src/providers/account-quota-disk.ts +26 -8
- package/src/providers/api-key-pause.ts +2 -2
- package/src/providers/api-key-response-ownership.ts +14 -4
- package/src/providers/claude-cli-usage-state.ts +1 -0
- package/src/providers/claude-cli-usage.ts +24 -7
- package/src/providers/default-aliases.ts +11 -5
- package/src/providers/derive.ts +5 -1
- package/src/providers/fastwire.ts +6 -5
- package/src/providers/free-directory.ts +2 -2
- package/src/providers/google-vertex-location.ts +2 -1
- package/src/providers/google-vertex-model-discovery.ts +22 -0
- package/src/providers/key-failover.ts +18 -23
- package/src/providers/m365-copilot-discovery-fetch.ts +17 -0
- package/src/providers/m365-copilot-discovery.ts +68 -0
- package/src/providers/m365-copilot-models.ts +32 -0
- package/src/providers/model-rename-fields.ts +6 -0
- package/src/providers/new-model-policy-runtime.ts +27 -6
- package/src/providers/openai-forward-destination.ts +19 -0
- package/src/providers/openai-tiers-destination.ts +3 -19
- package/src/providers/quota/account-cache.ts +183 -27
- package/src/providers/quota/anthropic-account-quota.ts +21 -17
- package/src/providers/quota/anthropic-cooldown-recovery.ts +57 -27
- package/src/providers/quota/anthropic-decision-windows.ts +7 -3
- package/src/providers/quota/anthropic-usage-windows.ts +34 -4
- package/src/providers/quota/antigravity-account-probe.ts +165 -0
- package/src/providers/quota/antigravity.ts +71 -3
- package/src/providers/quota/vendor-probes-oauth.ts +52 -28
- package/src/providers/quota-decision-publication.ts +1 -1
- package/src/providers/quota-decision-snapshot.ts +4 -1
- package/src/providers/quota-types.ts +2 -0
- package/src/providers/quota.ts +8 -7
- package/src/providers/registry/agy-acp-models.ts +3 -0
- package/src/providers/registry/entries-core.ts +9 -0
- package/src/providers/registry/entries-extended.ts +60 -0
- package/src/providers/registry/model-seeds.ts +51 -0
- package/src/providers/request-pacing.ts +37 -7
- package/src/providers/service-tier.ts +2 -0
- package/src/providers/xai-privacy-mode.ts +52 -0
- package/src/remote/hub-management-relay.ts +74 -0
- package/src/responses/id-limits.ts +2 -0
- package/src/responses/input-media.ts +15 -3
- package/src/responses/parser-tools.ts +74 -11
- package/src/responses/parser.ts +16 -14
- package/src/responses/provider-opaque-metadata.ts +10 -0
- package/src/responses/reasoning-envelope.ts +3 -0
- package/src/responses/schema.ts +2 -3
- package/src/responses/spill-store.ts +5 -3
- package/src/responses/state/connection-scope.ts +232 -0
- package/src/responses/state/entry-types.ts +47 -0
- package/src/responses/state/snapshot-codec.ts +75 -14
- package/src/responses/state/snapshot-select.ts +2 -0
- package/src/responses/state/spill-codec.ts +59 -0
- package/src/responses/state/spill-queue.ts +11 -2
- package/src/responses/state.ts +178 -159
- package/src/router.ts +2 -6
- package/src/routing/compatibility/behavior.ts +6 -2
- package/src/routing/compatibility/subject.ts +17 -12
- package/src/routing/machine-weighted-routing.ts +58 -0
- package/src/server/advisor-admission-scope.ts +15 -7
- package/src/server/auth-cors.ts +27 -0
- package/src/server/chat-completions.ts +37 -17
- package/src/server/chat-native-eligibility.ts +21 -0
- package/src/server/chat-native.ts +15 -6
- package/src/server/claude-messages.ts +54 -6
- package/src/server/credential-recovery-attempt.ts +32 -0
- package/src/server/effort-policy.ts +6 -3
- package/src/server/gemini-inbound.ts +267 -0
- package/src/server/gemini-interactions-inbound.ts +229 -0
- package/src/server/gemini-interactions-store.ts +129 -0
- package/src/server/gemini-native-catalog.ts +64 -0
- package/src/server/gemini-native-log.ts +33 -0
- package/src/server/gemini-native-paths.ts +88 -0
- package/src/server/gemini-native-wire.ts +201 -0
- package/src/server/gemini-native.ts +218 -0
- package/src/server/grok-upstream-envelope-echo.ts +8 -2
- package/src/server/hub-relay-auth.ts +87 -0
- package/src/server/hub-usage-windows.ts +135 -0
- package/src/server/hub-usage.ts +16 -3
- package/src/server/inbound-body-admission.ts +2 -1
- package/src/server/index/anthropic-model-listing.ts +75 -0
- package/src/server/index/gemini-routes.ts +147 -0
- package/src/server/index/link-management.ts +3 -22
- package/src/server/index/link-relay-sessions.ts +71 -13
- package/src/server/index/link-websocket.ts +2 -0
- package/src/server/index/passive-management-read.ts +55 -0
- package/src/server/index/serve-options.ts +93 -107
- package/src/server/index/websocket-handler.ts +15 -2
- package/src/server/index.ts +10 -0
- package/src/server/inference/client-encoder-delivery.ts +2 -1
- package/src/server/inference/context.ts +33 -6
- package/src/server/management/agent-settings-routes.ts +33 -16
- package/src/server/management/claude-code-settings-patch.ts +6 -0
- package/src/server/management/combo-routes.ts +21 -1
- package/src/server/management/combo-suggestion-routes.ts +212 -0
- package/src/server/management/config-routes.ts +12 -4
- package/src/server/management/context.ts +2 -0
- package/src/server/management/gateway-client-routes.ts +62 -0
- package/src/server/management/integration-routes.ts +5 -0
- package/src/server/management/link-routes.ts +5 -1
- package/src/server/management/m365-copilot-provider-probe.ts +23 -0
- package/src/server/management/model-routes.ts +32 -2
- package/src/server/management/model-rows.ts +36 -3
- package/src/server/management/oauth-account-routes.ts +68 -15
- package/src/server/management/protocol-settings-patch.ts +1 -0
- package/src/server/management/provider-omitted-fields.ts +25 -0
- package/src/server/management/provider-overwrite-carry.ts +33 -8
- package/src/server/management/provider-routes.ts +10 -16
- package/src/server/management/request-history-routes.ts +2 -2
- package/src/server/management/route-registry.ts +10 -0
- package/src/server/management/shared.ts +118 -30
- package/src/server/management/sibling-guard.ts +2 -1
- package/src/server/management/system-routes.ts +6 -0
- package/src/server/management-auth.ts +8 -1
- package/src/server/messages-native-scope.ts +19 -0
- package/src/server/messages-native.ts +156 -59
- package/src/server/messages-shared.ts +6 -0
- package/src/server/models-capabilities.ts +24 -0
- package/src/server/native-chat-bridge.ts +259 -0
- package/src/server/ollama-inbound.ts +36 -184
- package/src/server/passive-route-linker.ts +3 -1
- package/src/server/port-reclaim.ts +48 -4
- package/src/server/proxy-liveness.ts +79 -22
- package/src/server/relay.ts +16 -9
- package/src/server/request-log-account-rotation.ts +2 -1
- package/src/server/request-log-attempt-recovery.ts +24 -2
- package/src/server/request-log-attempt-usage.ts +5 -4
- package/src/server/request-log-committed-terminal.ts +87 -0
- package/src/server/request-log-failure-attribution.ts +3 -3
- package/src/server/request-log-failure-detail.ts +34 -0
- package/src/server/request-log-key-failure.ts +27 -0
- package/src/server/request-log-terminal-status.ts +25 -12
- package/src/server/request-log.ts +59 -63
- package/src/server/responses/adapter-continuation.ts +77 -44
- package/src/server/responses/adapter-delivery.ts +47 -22
- package/src/server/responses/adapter-dispatch.ts +150 -149
- package/src/server/responses/advisor-retention.ts +12 -4
- package/src/server/responses/advisor-slot.ts +97 -2
- package/src/server/responses/agent-task-recovery.ts +44 -11
- package/src/server/responses/agy-acp-preflight.ts +41 -0
- package/src/server/responses/anthropic-image-context.ts +44 -0
- package/src/server/responses/antigravity-validation-refusal.ts +25 -1
- package/src/server/responses/buffered-sse-json.ts +18 -1
- package/src/server/responses/codex-ws-correlation.ts +5 -2
- package/src/server/responses/codex-ws-exchange.ts +91 -8
- package/src/server/responses/codex-ws-incremental.ts +136 -0
- package/src/server/responses/codex-ws-pool.ts +22 -8
- package/src/server/responses/codex-ws-request.ts +5 -0
- package/src/server/responses/codex-ws-send-accounting.ts +8 -0
- package/src/server/responses/codex-ws-session.ts +14 -0
- package/src/server/responses/codex-ws-wire.ts +44 -22
- package/src/server/responses/combo-admission-snapshot.ts +93 -0
- package/src/server/responses/combo-required-tool-stream.ts +16 -4
- package/src/server/responses/combo-selection-keepalive.ts +5 -0
- package/src/server/responses/combo-stream-preflight.ts +182 -73
- package/src/server/responses/compact-response-body.ts +27 -0
- package/src/server/responses/compact.ts +174 -121
- package/src/server/responses/compaction-recovery.ts +7 -0
- package/src/server/responses/core-codex-account.ts +88 -62
- package/src/server/responses/core-combo-failure.ts +15 -0
- package/src/server/responses/core-combo-native.ts +12 -1
- package/src/server/responses/core-combo.ts +340 -94
- package/src/server/responses/core-normalize.ts +19 -12
- package/src/server/responses/core-opaque-recovery.ts +15 -4
- package/src/server/responses/core-options.ts +50 -5
- package/src/server/responses/core-pipeline.ts +11 -0
- package/src/server/responses/core.ts +7 -1
- package/src/server/responses/empty-completion-guard.ts +21 -7
- package/src/server/responses/estimated-usage.ts +2 -1
- package/src/server/responses/fetch-helpers.ts +95 -19
- package/src/server/responses/history-slim.ts +204 -0
- package/src/server/responses/hosted-advisor-spend.ts +49 -0
- package/src/server/responses/image-context-recovery.ts +199 -0
- package/src/server/responses/input-admission.ts +36 -11
- package/src/server/responses/jev-model-invoke.ts +23 -16
- package/src/server/responses/non-replayable-error.ts +12 -2
- package/src/server/responses/passthrough-build-error.ts +5 -3
- package/src/server/responses/passthrough-delivery.ts +74 -33
- package/src/server/responses/passthrough-dispatch.ts +170 -197
- package/src/server/responses/policy-fallback.ts +7 -2
- package/src/server/responses/policy-request-scope.ts +36 -2
- package/src/server/responses/replay-owner.ts +20 -0
- package/src/server/responses/request-prepare.ts +97 -16
- package/src/server/responses/request-send-budget.ts +97 -25
- package/src/server/responses/request-sidecar-auth.ts +138 -65
- package/src/server/responses/request-spend-target.ts +13 -1
- package/src/server/responses/request-spend.ts +228 -47
- package/src/server/responses/request-transport.ts +395 -70
- package/src/server/responses/run-turn-execution.ts +40 -9
- package/src/server/responses/sidecar-execution.ts +214 -67
- package/src/server/responses/sidecar-send-budget.ts +9 -9
- package/src/server/responses/terminal-guard.ts +35 -9
- package/src/server/responses/ws-upstream.ts +27 -6
- package/src/server/responses-phase-inference.ts +32 -9
- package/src/server/responses-terminal-repair.ts +14 -35
- package/src/server/system-env.ts +8 -5
- package/src/server/ws-bridge.ts +23 -17
- package/src/service/health-sentinel-linux.ts +16 -7
- package/src/service/systemd.ts +11 -2
- package/src/service/windows-checked-stop-live.ts +60 -55
- package/src/service/windows-checked-stop.ts +29 -11
- package/src/service/windows-guarded-manager.ts +14 -26
- package/src/service/windows-process-evidence.ts +82 -74
- package/src/service/windows-process-native.ts +69 -20
- package/src/service/windows-service-stop.ts +14 -12
- package/src/service/windows-stop-binding.ts +14 -5
- package/src/service/windows-stop-confirm.ts +1 -1
- package/src/service/windows-task-instance-stop.ts +98 -0
- package/src/service/windows-taskxml.ts +30 -7
- package/src/sidecar/anthropic-binding.ts +1 -1
- package/src/stall-timeout.ts +30 -0
- package/src/telemetry/aggregate.ts +6 -3
- package/src/types/account-auto-pause.ts +19 -1
- package/src/types/accounts.ts +21 -0
- package/src/types/anthropic-account-pool.ts +1 -1
- package/src/types/combo-capability-policy.ts +19 -0
- package/src/types/config.ts +22 -2
- package/src/types/provider.ts +42 -8
- package/src/types/request.ts +15 -0
- package/src/types/tools.ts +22 -5
- package/src/types/wire.ts +1 -0
- package/src/types.ts +4 -0
- package/src/update/check-types.ts +2 -0
- package/src/update/job.ts +8 -3
- package/src/update/managed-release.ts +6 -0
- package/src/update/orchestrated-entry.ts +13 -4
- package/src/update/refresh-scheduler.ts +17 -7
- package/src/usage/attempt-delivery.ts +6 -0
- package/src/usage/cache-provenance.ts +71 -0
- package/src/usage/cost.ts +216 -27
- package/src/usage/credit-billing.ts +88 -0
- package/src/usage/jev-stats.ts +13 -9
- package/src/usage/log.ts +5 -33
- package/src/usage/summary.ts +8 -43
- package/src/usage/user-cost-overlays.ts +13 -1
- package/src/vision/index.ts +8 -3
- package/src/vision/plan.ts +28 -14
- package/src/vision/routed-describe.ts +24 -36
- package/src/web-search/header-deadline.ts +14 -3
- package/src/web-search/index.ts +6 -4
- package/src/web-search/loop.ts +240 -78
- package/src/web-search/progress-stream.ts +29 -2
- package/src/web-search/run-turn-loop.ts +5 -1
- package/gui/dist/assets/App-BGP8I0V4.css +0 -1
- package/gui/dist/assets/App-BRExzhwL.js +0 -60
- package/gui/dist/assets/Tray-DHCWAn8V.js +0 -1
- package/gui/dist/assets/brand-mark-C70PuQ3j.js +0 -1
- package/gui/dist/assets/index-DJxM-imn.css +0 -2
- package/gui/dist/assets/index-Dy1jIGty.js +0 -138
- package/gui/dist/classic/assets/App-B4j-Txmb.css +0 -1
- package/gui/dist/classic/assets/App-CaC-E6Vl.js +0 -59
- package/gui/dist/classic/assets/Tray-BG253fiL.js +0 -1
- package/gui/dist/classic/assets/index-CR_AThOp.js +0 -138
- package/gui/dist/classic/assets/quota-summary-B7KQPpEC.js +0 -1
|
@@ -1,4 +1,7 @@
|
|
|
1
|
+
import { slimOutboundCodexHistory } from "./history-slim";
|
|
2
|
+
import type { PhysicalSendRecovery } from "../../lib/request-execution-budget";
|
|
1
3
|
import type { NativeResponseControl } from "./native-response-control";
|
|
4
|
+
import { codexWsCallerKey, codexWsIncrementalUploadEnabled } from "./codex-ws-incremental";
|
|
2
5
|
import { PROVIDER_HEADER_DEADLINE as HEADER_DEADLINE, type ProviderHeaderDeadline as HeaderDeadline } from "../../lib/provider-admission-wait";
|
|
3
6
|
import type { CodexWsPreOutputRefusalHold } from "./codex-ws-wire";
|
|
4
7
|
import type { Server } from "bun";
|
|
@@ -25,6 +28,7 @@ import { configuredOutboundFetch } from "../../lib/proxy-env";
|
|
|
25
28
|
import { isLoopbackUrl, rewriteUpstream } from "../../plugins/upstream-hooks";
|
|
26
29
|
import {
|
|
27
30
|
describeProviderEgressForLog,
|
|
31
|
+
bindProviderSocketRoute,
|
|
28
32
|
markEgressTransparentExecutor,
|
|
29
33
|
providerEgressSendInit,
|
|
30
34
|
providerEgressIsExplicit,
|
|
@@ -35,6 +39,7 @@ import { redactSecretString } from "../../lib/redact";
|
|
|
35
39
|
import { outboundCredentials } from "../../lib/outbound-credential-registry";
|
|
36
40
|
import { compressUpstreamRequestBody, isCanonicalCodexResponsesUrl } from "./request-compression";
|
|
37
41
|
import { redeemOutboundTurnState, TURN_STATE_BINDING_INIT, turnStateBinding } from "../turn-state-handles";
|
|
42
|
+
import { EXECUTOR_PHYSICAL_SEND_RECEIPT, inheritAdapterSupportExecutor, markPhysicalSendReceiptExecutor, registerAdapterSupportExecutor } from "../../lib/executor-physical-send-receipt";
|
|
38
43
|
|
|
39
44
|
export { withUpstreamHttpVersion };
|
|
40
45
|
|
|
@@ -57,7 +62,7 @@ const PHYSICAL_DISPATCH = Symbol.for("opencodex.physical-dispatch");
|
|
|
57
62
|
const PHYSICAL_SEND_OBSERVER = Symbol.for("opencodex.physical-send-observer");
|
|
58
63
|
const PHYSICAL_SEND_GUARD = Symbol.for("opencodex.physical-send-guard");
|
|
59
64
|
export type AccountAutoPauseObserver = ((response: Response) => Promise<Response>) & {
|
|
60
|
-
physical?: (sameDestination: boolean, headers: Headers) => void;
|
|
65
|
+
physical?: (sameDestination: boolean, headers: Headers, destination: string) => void;
|
|
61
66
|
};
|
|
62
67
|
/** Init fragment that reports the final send of the observer's attempt; empty when nothing observes. */
|
|
63
68
|
export function physicalSendObserverInit(observer: AccountAutoPauseObserver | undefined, target: string, onPhysicalSend?: () => void,
|
|
@@ -66,7 +71,7 @@ export function physicalSendObserverInit(observer: AccountAutoPauseObserver | un
|
|
|
66
71
|
let noted = false;
|
|
67
72
|
return physical || onPhysicalSend || onFinalSend ? { [PHYSICAL_SEND_OBSERVER]: (destination: string, headers: Headers) => {
|
|
68
73
|
if (onPhysicalSend && !noted) { onPhysicalSend(); noted = true; }
|
|
69
|
-
physical?.(destination === target, headers);
|
|
74
|
+
physical?.(destination === target, headers, destination);
|
|
70
75
|
onFinalSend?.(destination === target, headers);
|
|
71
76
|
} } : {};
|
|
72
77
|
}
|
|
@@ -241,13 +246,7 @@ export function sendWithConnectionPolicy(
|
|
|
241
246
|
const largeCodexBody = !compressed && typeof body === "string"
|
|
242
247
|
&& isCanonicalCodexResponsesUrl(target)
|
|
243
248
|
&& Buffer.byteLength(body, "utf8") >= 1024 * 1024;
|
|
244
|
-
|
|
245
|
-
(init as Record<symbol, ((body: BodyInit | null | undefined) => void) | undefined> | undefined)?.[PHYSICAL_DISPATCH]?.(body);
|
|
246
|
-
(init as Record<symbol, ((destination: string, headers: Headers) => void) | undefined> | undefined)?.[PHYSICAL_SEND_OBSERVER]?.(target, headers);
|
|
247
|
-
// Final headers, after plugin rewrites: an upstream can only echo what it received here, so the
|
|
248
|
-
// request log refuses any diagnostic that repeats one of these values (see request-log-terminal-status).
|
|
249
|
-
outboundCredentials().remember(headers);
|
|
250
|
-
return physicalFetch(input, {
|
|
249
|
+
const sendInit: RequestInit = {
|
|
251
250
|
...init,
|
|
252
251
|
...(compressed ? { body: compressed.body } : largeCodexBody ? { body: Buffer.from(body, "utf8") } : {}),
|
|
253
252
|
headers,
|
|
@@ -256,7 +255,16 @@ export function sendWithConnectionPolicy(
|
|
|
256
255
|
...egressInit,
|
|
257
256
|
...(decide || redirectedToLoopback ? { [EGRESS_DECIDED]: true } : {}),
|
|
258
257
|
...{ [UPSTREAM_REWRITTEN]: true },
|
|
259
|
-
}
|
|
258
|
+
};
|
|
259
|
+
(init as Record<symbol, ((destination: string, headers: Headers) => void) | undefined> | undefined)?.[PHYSICAL_SEND_GUARD]?.(target, headers);
|
|
260
|
+
// Final headers, after plugin rewrites: an upstream can only echo what it received here, so the
|
|
261
|
+
// request log refuses any diagnostic that repeats one of these values (see request-log-terminal-status).
|
|
262
|
+
outboundCredentials().remember(headers);
|
|
263
|
+
const signal = sendInit.signal ?? (input instanceof Request ? input.signal : undefined);
|
|
264
|
+
if (signal?.aborted) return Promise.reject(signal.reason);
|
|
265
|
+
(init as Record<symbol, ((body: BodyInit | null | undefined) => void) | undefined> | undefined)?.[PHYSICAL_DISPATCH]?.(body);
|
|
266
|
+
(init as Record<symbol, ((destination: string, headers: Headers) => void) | undefined> | undefined)?.[PHYSICAL_SEND_OBSERVER]?.(target, headers);
|
|
267
|
+
return physicalFetch(input, sendInit);
|
|
260
268
|
}
|
|
261
269
|
|
|
262
270
|
interface CodexWsExecutor { provider: OcxProviderConfig; http: typeof globalThis.fetch }
|
|
@@ -273,7 +281,28 @@ const codexWsExecutor = (send: (input: Parameters<typeof globalThis.fetch>[0], i
|
|
|
273
281
|
export const codexWsExecutorBinding = (execute: unknown): CodexWsExecutor | undefined =>
|
|
274
282
|
typeof execute === "function" ? codexWsExecutors.get(execute) : undefined;
|
|
275
283
|
|
|
284
|
+
/**
|
|
285
|
+
* Trusted caller key for pooled Codex WS reuse (codexWsCallerKey), taken from data-plane admission
|
|
286
|
+
* and never from the request body. A combo attempt has stripped provisional credentials, so it
|
|
287
|
+
* carries the principal captured at admission, matching request-prepare and core-combo; otherwise
|
|
288
|
+
* `contextPrincipal` resolves it (resolveContextPrincipal).
|
|
289
|
+
*/
|
|
290
|
+
export function codexWsAdmittedCaller(
|
|
291
|
+
replayPrincipal: Readonly<{ clientPrincipalId: string | undefined }> | undefined,
|
|
292
|
+
contextPrincipal: () => string | undefined,
|
|
293
|
+
): string | undefined {
|
|
294
|
+
return codexWsCallerKey(replayPrincipal ? replayPrincipal.clientPrincipalId : contextPrincipal());
|
|
295
|
+
}
|
|
296
|
+
|
|
276
297
|
export interface ProviderFetchOptions {
|
|
298
|
+
/** Shared request-owner admission for another physical send after a proxy delta refusal. */
|
|
299
|
+
captureCodexWsRecovery?: () => PhysicalSendRecovery | undefined;
|
|
300
|
+
/**
|
|
301
|
+
* Observes the body of a Codex WS recovery send after its own permit admitted it. Never books
|
|
302
|
+
* a send: the recovery permit already did. Wired to the replay guard so it judges the full frame
|
|
303
|
+
* that actually left rather than the delta it replaced (#8453).
|
|
304
|
+
*/
|
|
305
|
+
onRecoveryPhysicalDispatch?: (body: BodyInit | null | undefined) => void;
|
|
277
306
|
accountAutoPause?: (name: string, provider: OcxProviderConfig, headers: Headers) => AccountAutoPauseObserver | undefined;
|
|
278
307
|
/**
|
|
279
308
|
* Keep this send on HTTP even where the WebSocket upstream would normally be selected.
|
|
@@ -305,6 +334,11 @@ export interface ProviderFetchOptions {
|
|
|
305
334
|
* restores the projection afterwards (restoreCodexWsPreOutputRefusal) may set it.
|
|
306
335
|
*/
|
|
307
336
|
preOutputRefusalHold?: CodexWsPreOutputRefusalHold;
|
|
337
|
+
/**
|
|
338
|
+
* Trusted admitted caller for a Codex WebSocket send (codexWsCallerKey). Pooled sockets and
|
|
339
|
+
* incremental prefixes are scoped to it; absent means no caller may continue a prefix.
|
|
340
|
+
*/
|
|
341
|
+
codexWsCaller?: string;
|
|
308
342
|
/** Revalidate/rebuild a queued request at its physical send boundary, after pacing. */
|
|
309
343
|
dispatchOverride?: (input: Parameters<typeof globalThis.fetch>[0], init: RequestInit, execute: typeof globalThis.fetch,
|
|
310
344
|
reacquirePacing?: (provider: OcxProviderConfig, modelId?: string) => Promise<void>) => Promise<Response>;
|
|
@@ -377,15 +411,21 @@ export function providerFetch(
|
|
|
377
411
|
// mutator, and the copy it receives is deliberately not threaded onward. `Connection`
|
|
378
412
|
// is decided inside `dispatch`, which runs after this, so the fresh-connection policy
|
|
379
413
|
// wins regardless of what any caller or hook put in the header.
|
|
414
|
+
init = slimOutboundCodexHistory(input, init);
|
|
380
415
|
options.beforeDispatch?.(new Headers(init?.headers ?? (input instanceof Request ? input.headers : undefined)));
|
|
381
416
|
// No proxy option is attached here: a `dispatchOverride` may rebuild this request against
|
|
382
417
|
// a different destination, so the route is decided at the physical send instead.
|
|
383
418
|
const sharedReceipt = (init as Record<symbol, ((body: BodyInit | null | undefined) => void) | undefined> | undefined)?.[WS_FALLBACK_RECEIPT];
|
|
419
|
+
const adapterReceipt = (init as Record<symbol, (() => void) | undefined> | undefined)?.[EXECUTOR_PHYSICAL_SEND_RECEIPT];
|
|
384
420
|
let notified = false;
|
|
385
421
|
const dispatchInit = { ...withUpstreamHttpVersion(input, init, provider), timeout: 0,
|
|
386
|
-
...(options.onPhysicalDispatch ? { [PHYSICAL_DISPATCH]: (body: BodyInit | null | undefined) => {
|
|
422
|
+
...(options.onPhysicalDispatch || adapterReceipt || sharedReceipt ? { [PHYSICAL_DISPATCH]: (body: BodyInit | null | undefined) => {
|
|
387
423
|
if (sharedReceipt) sharedReceipt(body);
|
|
388
|
-
else if (!notified) {
|
|
424
|
+
else if (!notified) {
|
|
425
|
+
adapterReceipt?.();
|
|
426
|
+
options.onPhysicalDispatch?.(body);
|
|
427
|
+
notified = true;
|
|
428
|
+
}
|
|
389
429
|
} } : {}),
|
|
390
430
|
};
|
|
391
431
|
return override
|
|
@@ -417,7 +457,11 @@ export function providerFetch(
|
|
|
417
457
|
return httpFetch(input, init, reacquirePacing);
|
|
418
458
|
}
|
|
419
459
|
const egress = egressFor(input);
|
|
420
|
-
|
|
460
|
+
const explicitWsProxy = codexWsIncrementalUploadEnabled()
|
|
461
|
+
&& input === "https://chatgpt.com/backend-api/codex/responses"
|
|
462
|
+
&& !(provider as OcxProviderConfig & { fetch?: unknown }).fetch
|
|
463
|
+
&& egress.kind === "proxy" && egress.transport === "http" ? egress.proxyUrl : undefined;
|
|
464
|
+
if (providerEgressIsExplicit(egress) && !explicitWsProxy) {
|
|
421
465
|
warnEgressWebsocketDowngradeOnce(providerName, describeProviderEgressForLog(egress));
|
|
422
466
|
return httpFetch(input, init, reacquirePacing);
|
|
423
467
|
}
|
|
@@ -426,17 +470,33 @@ export function providerFetch(
|
|
|
426
470
|
// request over HTTP, and dropping the provider's `upstreamHttpVersion`
|
|
427
471
|
// there would silently negotiate a transport the operator ruled out.
|
|
428
472
|
let notified = false;
|
|
473
|
+
const recoverPhysicalSend = codexWsIncrementalUploadEnabled() && isCanonicalCodexResponsesUrl(input) && options.codexWsCaller
|
|
474
|
+
? options.captureCodexWsRecovery?.() : undefined;
|
|
475
|
+
let recoveryDispatch: ((body: BodyInit | null | undefined) => void) | undefined;
|
|
429
476
|
const notifyOnce = (body: BodyInit | null | undefined): void => {
|
|
477
|
+
if (recoveryDispatch) { recoveryDispatch(body); return; }
|
|
430
478
|
if (notified) return;
|
|
479
|
+
(init as Record<symbol, (() => void) | undefined>)[EXECUTOR_PHYSICAL_SEND_RECEIPT]?.();
|
|
431
480
|
options.onPhysicalDispatch?.(body);
|
|
432
481
|
notified = true;
|
|
433
482
|
};
|
|
434
483
|
const fallback = ((url: Parameters<typeof globalThis.fetch>[0], fallbackInit?: RequestInit) =>
|
|
435
484
|
httpFetch(url, { ...fallbackInit, [WS_FALLBACK_RECEIPT]: notifyOnce } as RequestInit, reacquirePacing, null)) as typeof globalThis.fetch;
|
|
485
|
+
// History slimming runs on the final URL and init of every WS send, including an init a
|
|
486
|
+
// dispatchOverride rebuilt, so an override never re-expands the outbound history.
|
|
487
|
+
const finalWsInit = (url: Parameters<typeof globalThis.fetch>[0], wsInit: RequestInit): RequestInit =>
|
|
488
|
+
codexWsIncrementalUploadEnabled() ? (slimOutboundCodexHistory(url, wsInit) ?? wsInit) : wsInit;
|
|
436
489
|
const wsSend = codexWsExecutor((url: Parameters<typeof globalThis.fetch>[0], wsInit?: RequestInit) => codexWsUpstreamFetch(String(url),
|
|
437
|
-
{ ...(wsInit ?? init), [TURN_STATE_BINDING_INIT]: turnStateBinding(providerName, sendHeaders(wsInit ?? init)) } as RequestInit,
|
|
490
|
+
{ ...finalWsInit(url, wsInit ?? init), [TURN_STATE_BINDING_INIT]: turnStateBinding(providerName, sendHeaders(wsInit ?? init)) } as RequestInit,
|
|
438
491
|
fallback, runtime, options.onCodexWsQuota, options.beforeDispatch, options.nativeControl,
|
|
439
|
-
async () => { (await waitForPacing(init.signal ?? undefined))?.release(); }, notifyOnce, options.preOutputRefusalHold,
|
|
492
|
+
async () => { (await waitForPacing(init.signal ?? undefined))?.release(); }, notifyOnce, options.preOutputRefusalHold,
|
|
493
|
+
options.onContinuationDispatch, explicitWsProxy, options.codexWsCaller,
|
|
494
|
+
async (send, estimatedInputTokens) => recoverPhysicalSend ? recoverPhysicalSend(async dispatch => {
|
|
495
|
+
// The recovery frame is a fresh physical start: its own permit (#8149 send ceiling)
|
|
496
|
+
// is claimed first, then the replay guard records the full frame that left (#8453).
|
|
497
|
+
recoveryDispatch = body => { dispatch(); options.onRecoveryPhysicalDispatch?.(body); };
|
|
498
|
+
try { await send(); } finally { recoveryDispatch = undefined; }
|
|
499
|
+
}, estimatedInputTokens) : false, options.providerName),
|
|
440
500
|
{ provider, http: markEgressTransparentExecutor(fallback) });
|
|
441
501
|
// A WS frame is a physical send like any other, so it runs the same override: that is where a
|
|
442
502
|
// key-auth send is committed to its attempt row and the send budget is rebound to the
|
|
@@ -464,7 +524,7 @@ export function providerFetch(
|
|
|
464
524
|
// Cursor RunSSE and BidiAppend can overlap. The runTurn owner releases this slot when
|
|
465
525
|
// the whole turn finishes; transferring it to RunSSE's body would admit another turn
|
|
466
526
|
// while a BidiAppend from this one is still active.
|
|
467
|
-
return options.turnScopedPacing ? undefined : options.pacingSlot;
|
|
527
|
+
if (!options.pacingSlot?.released) return options.turnScopedPacing ? undefined : options.pacingSlot;
|
|
468
528
|
}
|
|
469
529
|
if (options.providerName) {
|
|
470
530
|
return waitForProviderRequestSlot(options.providerName, provider, options.modelId, signal,
|
|
@@ -504,10 +564,24 @@ export function providerFetch(
|
|
|
504
564
|
preconnect,
|
|
505
565
|
waitForPacing,
|
|
506
566
|
fetchWithPacingSlot,
|
|
507
|
-
unpacedFetch: Object.assign(unpaced, { preconnect }),
|
|
567
|
+
unpacedFetch: markPhysicalSendReceiptExecutor(Object.assign(unpaced, { preconnect }) as typeof globalThis.fetch),
|
|
508
568
|
});
|
|
509
569
|
markEgressTransparentExecutor(paceAware as unknown as typeof globalThis.fetch);
|
|
510
|
-
|
|
570
|
+
if (customExecutor === undefined && transport === base && !options.dispatchOverride) bindProviderSocketRoute(paceAware, providerName, provider);
|
|
571
|
+
const { onPhysicalDispatch, dispatchOverride, beforeDispatch, accountAutoPause, ...supportOptions } = options;
|
|
572
|
+
if (onPhysicalDispatch || dispatchOverride || beforeDispatch || accountAutoPause) {
|
|
573
|
+
let support: ProviderFetch | undefined;
|
|
574
|
+
const getSupport = () => support ??= providerFetch(provider, runtime, {
|
|
575
|
+
...supportOptions,
|
|
576
|
+
httpOnly: true,
|
|
577
|
+
// Preparation can borrow a live lease across several sends. Only inference can
|
|
578
|
+
// transfer the attempt's lease to a body; attempt cleanup owns unsent leases.
|
|
579
|
+
turnScopedPacing: options.turnScopedPacing || !!options.pacingSlot,
|
|
580
|
+
});
|
|
581
|
+
registerAdapterSupportExecutor(paceAware as ProviderFetch, getSupport);
|
|
582
|
+
registerAdapterSupportExecutor(paceAware.unpacedFetch, () => getSupport().unpacedFetch ?? getSupport());
|
|
583
|
+
}
|
|
584
|
+
return markPhysicalSendReceiptExecutor(paceAware as ProviderFetch);
|
|
511
585
|
}
|
|
512
586
|
|
|
513
587
|
|
|
@@ -554,7 +628,8 @@ export function storedPoolReplayDispatchNotifier(
|
|
|
554
628
|
}
|
|
555
629
|
return sendTrackingRequestSlot(await executor.waitForPacing?.(init?.signal ?? undefined), () => unpaced!(input, init));
|
|
556
630
|
};
|
|
557
|
-
|
|
631
|
+
if (unpaced) inheritAdapterSupportExecutor(unpaced, unpacedSource);
|
|
632
|
+
const notifying = Object.assign(wrapped, {
|
|
558
633
|
preconnect: executor.preconnect,
|
|
559
634
|
waitForPacing: executor.waitForPacing,
|
|
560
635
|
unpacedFetch: unpaced,
|
|
@@ -563,6 +638,7 @@ export function storedPoolReplayDispatchNotifier(
|
|
|
563
638
|
return executor.fetchWithPacingSlot!(slot, input, init);
|
|
564
639
|
} } : {}),
|
|
565
640
|
}) as ProviderFetch;
|
|
641
|
+
return inheritAdapterSupportExecutor(notifying, executor);
|
|
566
642
|
}
|
|
567
643
|
|
|
568
644
|
/**
|
|
@@ -0,0 +1,204 @@
|
|
|
1
|
+
import { Buffer } from "node:buffer";
|
|
2
|
+
import type { OcxConfig } from "../../types";
|
|
3
|
+
import { isPlainObject } from "../../adapters/openai-responses/internal";
|
|
4
|
+
import { CODEX_RESPONSES_HTTP_URL } from "./codex-ws-request";
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* Shorten stale screenshots and fat tool outputs on the outbound ChatGPT Codex
|
|
8
|
+
* body. The local session and previous_response_id cache keep the originals;
|
|
9
|
+
* only the string about to be sent is replaced.
|
|
10
|
+
*
|
|
11
|
+
* Full-context HTTP turns repeat prior inline images, which barely shrink
|
|
12
|
+
* under transport compression. This optional policy changes only outbound
|
|
13
|
+
* history before the latest user message; it is not a lossless image cache.
|
|
14
|
+
*/
|
|
15
|
+
export type UpstreamHistorySlim = "off" | "codex";
|
|
16
|
+
|
|
17
|
+
const TEXT_LIMIT = 32 * 1024;
|
|
18
|
+
const TEXT_HEAD = 2 * 1024;
|
|
19
|
+
const TEXT_TAIL = 1024;
|
|
20
|
+
/** Inline image payloads only. A file id or a short URL is not the metered cost. */
|
|
21
|
+
const IMAGE_INLINE_MIN_BYTES = 1024;
|
|
22
|
+
const TOOL_OUTPUT_TYPES = new Set(["function_call_output", "custom_tool_call_output"]);
|
|
23
|
+
const TEXT_KEYS = new Set(["text", "output", "content", "refusal"]);
|
|
24
|
+
const STRUCTURAL_KEYS = new Set(["call_id", "id", "name", "type", "status", "role", "file_id"]);
|
|
25
|
+
|
|
26
|
+
let boundConfig: Pick<OcxConfig, "upstreamHistorySlim"> | null = null;
|
|
27
|
+
let slimmedRequests = 0;
|
|
28
|
+
let slimmedBytes = 0;
|
|
29
|
+
|
|
30
|
+
/** Scalar counters only. They do not retain request text or image bytes. */
|
|
31
|
+
export function upstreamHistorySlimCounters(): { requests: number; bytes: number } {
|
|
32
|
+
return { requests: slimmedRequests, bytes: slimmedBytes };
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
export function bindUpstreamHistorySlimConfig(config: Pick<OcxConfig, "upstreamHistorySlim"> | null): void {
|
|
36
|
+
boundConfig = config;
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
export function resolveUpstreamHistorySlim(value: unknown): UpstreamHistorySlim {
|
|
40
|
+
return value === "codex" ? "codex" : "off";
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
export function currentUpstreamHistorySlim(): UpstreamHistorySlim {
|
|
44
|
+
return resolveUpstreamHistorySlim(boundConfig?.upstreamHistorySlim);
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
function utf8(text: string, start: number, end: number): string {
|
|
48
|
+
const bytes = Buffer.from(text, "utf8");
|
|
49
|
+
let from = Math.max(0, Math.min(start, bytes.length));
|
|
50
|
+
let to = Math.max(from, Math.min(end, bytes.length));
|
|
51
|
+
if (from > 0) {
|
|
52
|
+
while (from < to && (bytes[from]! & 0xc0) === 0x80) from += 1;
|
|
53
|
+
}
|
|
54
|
+
if (to < bytes.length) {
|
|
55
|
+
while (to > from && (bytes[to]! & 0xc0) === 0x80) to -= 1;
|
|
56
|
+
}
|
|
57
|
+
return bytes.subarray(from, to).toString("utf8");
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
function imageInlineBytes(part: Record<string, unknown>): number {
|
|
61
|
+
const url = part.image_url;
|
|
62
|
+
const value = typeof url === "string" ? url : isPlainObject(url) ? url.url : undefined;
|
|
63
|
+
return typeof value === "string" && /^data:/i.test(value) ? Buffer.byteLength(value) : 0;
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
function imageStub(bytes: number): Record<string, unknown> {
|
|
67
|
+
return {
|
|
68
|
+
type: "input_text",
|
|
69
|
+
text: `[image omitted, ${bytes} bytes, original remains in the local session]`,
|
|
70
|
+
};
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
/** Replace inline images. Returns whether any part changed. */
|
|
74
|
+
function stripInlineImages(value: unknown): { value: unknown; changed: boolean } {
|
|
75
|
+
if (Array.isArray(value)) {
|
|
76
|
+
let changed = false;
|
|
77
|
+
const next = value.map(entry => {
|
|
78
|
+
const stripped = stripInlineImages(entry);
|
|
79
|
+
changed ||= stripped.changed;
|
|
80
|
+
return stripped.value;
|
|
81
|
+
});
|
|
82
|
+
return changed ? { value: next, changed } : { value, changed: false };
|
|
83
|
+
}
|
|
84
|
+
if (!isPlainObject(value)) return { value, changed: false };
|
|
85
|
+
if (value.type === "input_image") {
|
|
86
|
+
const bytes = imageInlineBytes(value);
|
|
87
|
+
if (bytes > IMAGE_INLINE_MIN_BYTES) return { value: imageStub(bytes), changed: true };
|
|
88
|
+
return { value, changed: false };
|
|
89
|
+
}
|
|
90
|
+
let changed = false;
|
|
91
|
+
const next: Record<string, unknown> = {};
|
|
92
|
+
for (const [key, entry] of Object.entries(value)) {
|
|
93
|
+
if (STRUCTURAL_KEYS.has(key) && typeof entry !== "object") {
|
|
94
|
+
next[key] = entry;
|
|
95
|
+
continue;
|
|
96
|
+
}
|
|
97
|
+
const stripped = stripInlineImages(entry);
|
|
98
|
+
changed ||= stripped.changed;
|
|
99
|
+
next[key] = stripped.value;
|
|
100
|
+
}
|
|
101
|
+
return changed ? { value: next, changed } : { value, changed: false };
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
type TextSlot = { parent: Record<string, unknown>; key: string; bytes: number };
|
|
105
|
+
|
|
106
|
+
function collectTextSlots(value: unknown, slots: TextSlot[]): void {
|
|
107
|
+
if (Array.isArray(value)) {
|
|
108
|
+
for (const entry of value) collectTextSlots(entry, slots);
|
|
109
|
+
return;
|
|
110
|
+
}
|
|
111
|
+
if (!isPlainObject(value)) return;
|
|
112
|
+
for (const [key, entry] of Object.entries(value)) {
|
|
113
|
+
if (STRUCTURAL_KEYS.has(key)) continue;
|
|
114
|
+
if (typeof entry === "string" && TEXT_KEYS.has(key)) {
|
|
115
|
+
slots.push({ parent: value, key, bytes: Buffer.byteLength(entry) });
|
|
116
|
+
} else if (entry && typeof entry === "object") {
|
|
117
|
+
collectTextSlots(entry, slots);
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
|
|
122
|
+
function excerptText(text: string, size: number): string {
|
|
123
|
+
const head = utf8(text, 0, TEXT_HEAD);
|
|
124
|
+
const tail = utf8(text, Math.max(0, size - TEXT_TAIL), size);
|
|
125
|
+
return `[tool output shortened, original ${size} bytes, full output remains in the local session]\n${head}\n[${size} bytes omitted]\n${tail}`;
|
|
126
|
+
}
|
|
127
|
+
|
|
128
|
+
/**
|
|
129
|
+
* Budget against the whole serialized tool output, not one field: an output split into many
|
|
130
|
+
* text parts below 32 KiB each still has its largest parts excerpted until the item fits.
|
|
131
|
+
*/
|
|
132
|
+
function trimToolOutput(item: Record<string, unknown>): boolean {
|
|
133
|
+
if (typeof item.type !== "string" || !TOOL_OUTPUT_TYPES.has(item.type)) return false;
|
|
134
|
+
let total = Buffer.byteLength(JSON.stringify(item));
|
|
135
|
+
if (total <= TEXT_LIMIT) return false;
|
|
136
|
+
const slots: TextSlot[] = [];
|
|
137
|
+
collectTextSlots(item, slots);
|
|
138
|
+
slots.sort((a, b) => b.bytes - a.bytes);
|
|
139
|
+
let changed = false;
|
|
140
|
+
for (const slot of slots) {
|
|
141
|
+
if (total <= TEXT_LIMIT) break;
|
|
142
|
+
const current = slot.parent[slot.key];
|
|
143
|
+
if (typeof current !== "string") continue;
|
|
144
|
+
const next = excerptText(current, slot.bytes);
|
|
145
|
+
const saved = Buffer.byteLength(JSON.stringify(current)) - Buffer.byteLength(JSON.stringify(next));
|
|
146
|
+
if (saved <= 0) continue;
|
|
147
|
+
slot.parent[slot.key] = next;
|
|
148
|
+
total -= saved;
|
|
149
|
+
changed = true;
|
|
150
|
+
}
|
|
151
|
+
return changed;
|
|
152
|
+
}
|
|
153
|
+
|
|
154
|
+
function isUserMessage(item: unknown): boolean {
|
|
155
|
+
if (!isPlainObject(item) || item.role !== "user") return false;
|
|
156
|
+
return item.type === undefined || item.type === "message";
|
|
157
|
+
}
|
|
158
|
+
|
|
159
|
+
/**
|
|
160
|
+
* Returns a new JSON body when a prefix item was shortened, or null when the
|
|
161
|
+
* outbound body should be sent unchanged. Null keeps the caller's bytes intact
|
|
162
|
+
* so an unchanged turn does not get a fresh serialization.
|
|
163
|
+
*/
|
|
164
|
+
export function slimCodexHistoryJson(body: string): string | null {
|
|
165
|
+
let parsed: unknown;
|
|
166
|
+
try {
|
|
167
|
+
parsed = JSON.parse(body);
|
|
168
|
+
} catch {
|
|
169
|
+
return null;
|
|
170
|
+
}
|
|
171
|
+
if (!isPlainObject(parsed) || !Array.isArray(parsed.input)) return null;
|
|
172
|
+
let lastUser = -1;
|
|
173
|
+
for (let index = 0; index < parsed.input.length; index += 1) {
|
|
174
|
+
if (isUserMessage(parsed.input[index])) lastUser = index;
|
|
175
|
+
}
|
|
176
|
+
if (lastUser <= 0) return null;
|
|
177
|
+
let changed = false;
|
|
178
|
+
const input = parsed.input.map((item, index) => {
|
|
179
|
+
if (index >= lastUser) return item;
|
|
180
|
+
const stripped = stripInlineImages(item);
|
|
181
|
+
let next = stripped.value;
|
|
182
|
+
changed ||= stripped.changed;
|
|
183
|
+
if (isPlainObject(next) && trimToolOutput(next)) changed = true;
|
|
184
|
+
return next;
|
|
185
|
+
});
|
|
186
|
+
if (!changed) return null;
|
|
187
|
+
const next = JSON.stringify({ ...parsed, input });
|
|
188
|
+
slimmedRequests += 1;
|
|
189
|
+
slimmedBytes += Math.max(0, Buffer.byteLength(body) - Buffer.byteLength(next));
|
|
190
|
+
return next;
|
|
191
|
+
}
|
|
192
|
+
|
|
193
|
+
/** Slim ordinary Codex creates. The compact endpoint receives the complete context. */
|
|
194
|
+
export function slimOutboundCodexHistory(
|
|
195
|
+
input: Parameters<typeof globalThis.fetch>[0],
|
|
196
|
+
init?: RequestInit,
|
|
197
|
+
): RequestInit | undefined {
|
|
198
|
+
if (!init || currentUpstreamHistorySlim() !== "codex" || typeof init.body !== "string") return init;
|
|
199
|
+
const target = input instanceof Request ? input.url : String(input);
|
|
200
|
+
if (target !== CODEX_RESPONSES_HTTP_URL) return init;
|
|
201
|
+
const next = slimCodexHistoryJson(init.body);
|
|
202
|
+
if (next === null) return init;
|
|
203
|
+
return { ...init, body: next };
|
|
204
|
+
}
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
import { advisorServerToolDestination, hasAdvisorServerTools } from "../../adapters/anthropic/advisor-tool";
|
|
2
|
+
import { addProtocolEntryReason } from "../../protocols/trace";
|
|
3
|
+
import { hasConflictingApiKeyHeaders } from "../../providers/api-key-response-ownership";
|
|
4
|
+
import type { OcxProviderConfig } from "../../types";
|
|
5
|
+
import type { HandleResponsesOptions, HostedAdvisorSpendScope, ResponsesRequestContext } from "./core-options";
|
|
6
|
+
import { HostedAdvisorSpendRefusal } from "./policy-request-scope";
|
|
7
|
+
import type { PreparedResponsesRequest } from "./request-prepare";
|
|
8
|
+
import { responsesHasCapturedSpendCeiling } from "./request-send-budget";
|
|
9
|
+
import { responsesHostedAdvisorSpendTarget } from "./request-spend-target";
|
|
10
|
+
import { captureRequestSpendPolicy } from "./request-spend";
|
|
11
|
+
import type { ResponsesTransport } from "./request-transport";
|
|
12
|
+
|
|
13
|
+
/** Keep the numeric snapshot and optional decision on the original translated turn. */
|
|
14
|
+
export function captureHostedAdvisorSpendScope(options: HandleResponsesOptions): HostedAdvisorSpendScope | undefined {
|
|
15
|
+
if (options.hostedAdvisorSpendScope) return options.hostedAdvisorSpendScope;
|
|
16
|
+
if (options.inboundWire === "anthropic" && hasAdvisorServerTools({
|
|
17
|
+
_anthropicServerTools: options.anthropicServerTools,
|
|
18
|
+
_anthropicServerReplay: options.anthropicServerReplay,
|
|
19
|
+
})) return { ceilings: captureRequestSpendPolicy(), optionalWithheld: false };
|
|
20
|
+
return undefined;
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
/** Operator headers are appended by the Messages serializer and cannot establish credential ownership. */
|
|
24
|
+
export function hostedAdvisorSpendRefusalFor(
|
|
25
|
+
provider: OcxProviderConfig, hasCapturedSpendCeiling: () => boolean,
|
|
26
|
+
): HostedAdvisorSpendRefusal | undefined {
|
|
27
|
+
if (!advisorServerToolDestination(provider)) return undefined;
|
|
28
|
+
if (provider.headers && hasConflictingApiKeyHeaders(Object.keys(provider.headers))) {
|
|
29
|
+
return new HostedAdvisorSpendRefusal("ambiguous-credentials");
|
|
30
|
+
}
|
|
31
|
+
if (hasCapturedSpendCeiling()) return new HostedAdvisorSpendRefusal("ceiling");
|
|
32
|
+
return undefined;
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
/** Refuse the admitted candidate before vision can send any part of the turn. */
|
|
36
|
+
export function initialHostedAdvisorSpendRefusal(
|
|
37
|
+
context: ResponsesRequestContext,
|
|
38
|
+
{ parsed, route }: Pick<PreparedResponsesRequest, "parsed" | "route">,
|
|
39
|
+
{ initialAdapterProvider }: Pick<ResponsesTransport, "initialAdapterProvider">,
|
|
40
|
+
): Response | undefined {
|
|
41
|
+
const { options, req, logCtx } = context;
|
|
42
|
+
if (options.anthropicHostedAdvisorSelection !== "selected" || !hasAdvisorServerTools(parsed)) return undefined;
|
|
43
|
+
const { sendBudget } = options;
|
|
44
|
+
const refusal = hostedAdvisorSpendRefusalFor(initialAdapterProvider, () => sendBudget !== undefined
|
|
45
|
+
&& responsesHasCapturedSpendCeiling(sendBudget, req, logCtx, responsesHostedAdvisorSpendTarget(logCtx, route.providerName, initialAdapterProvider)));
|
|
46
|
+
if (!refusal) return undefined;
|
|
47
|
+
addProtocolEntryReason(logCtx, "advisor-tool-withheld-by-spend-policy");
|
|
48
|
+
return refusal.response();
|
|
49
|
+
}
|