@bitkyc08/opencodex 2.100.2 → 2.100.4
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/AGENTS_INSTALL.md +23 -1
- package/README.md +1 -1
- package/bin/ocx.mjs +40 -19
- package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
- package/gui/dist/assets/App-DcpyI78f.js +60 -0
- package/gui/dist/assets/{Tray-BcaI-VCr.js → Tray-CzjPJprT.js} +1 -1
- package/gui/dist/assets/brand-mark-BTIi7e69.js +1 -0
- package/gui/dist/assets/index-DJxM-imn.css +2 -0
- package/gui/dist/assets/index-DVgU6S3y.js +138 -0
- package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.js → segment-thumb-features-Bn6Y-g3R.js} +1 -1
- package/gui/dist/classic/assets/App-eYJAyNHM.js +59 -0
- package/gui/dist/classic/assets/{Tray-DT146AhS.js → Tray-xHMYxLkV.js} +1 -1
- package/gui/dist/classic/assets/index-DSaVRW4F.js +138 -0
- package/gui/dist/classic/assets/quota-summary-DyzHlkFl.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.toml +9 -0
- package/native/ocx-child/src/cli.rs +404 -20
- package/native/ocx-child/src/codex_home.rs +99 -14
- package/native/ocx-child/src/daemon.rs +2 -1
- package/native/ocx-child/src/lib.rs +3 -0
- package/native/ocx-child/src/link_ws.rs +2598 -0
- package/native/ocx-child/src/link_ws_advert.rs +346 -0
- package/native/ocx-child/src/link_ws_frame.rs +749 -0
- package/native/ocx-child/src/parity.rs +5 -1
- package/native/ocx-child/src/platform.rs +152 -6
- package/native/ocx-child/src/relay.rs +150 -19
- package/package.json +3 -3
- package/src/adapters/anthropic/advisor-tool.ts +176 -0
- package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
- package/src/adapters/anthropic/client-identity.ts +3 -1
- package/src/adapters/anthropic/passthrough.ts +9 -3
- package/src/adapters/anthropic/per-message-effort.ts +296 -0
- package/src/adapters/anthropic.ts +34 -14
- package/src/adapters/claude-cli/adapter.ts +1 -0
- package/src/adapters/client-fingerprint.ts +3 -3
- package/src/adapters/cursor/discovery.ts +17 -0
- package/src/adapters/cursor/native-exec-desktop.ts +2 -1
- package/src/adapters/cursor/native-exec-shell.ts +2 -1
- package/src/adapters/cursor/protobuf-request.ts +8 -8
- package/src/adapters/cursor.ts +7 -6
- package/src/adapters/devin/cloud-direct/chat.ts +71 -14
- package/src/adapters/google-antigravity-wire.ts +7 -5
- package/src/adapters/google-errors.ts +14 -2
- package/src/adapters/google-wire-compiler.ts +2 -2
- package/src/adapters/google.ts +9 -2
- package/src/adapters/kiro/payload.ts +7 -4
- package/src/adapters/kiro/reasoning.ts +44 -1
- package/src/adapters/kiro/structured-output.ts +10 -8
- package/src/adapters/kiro-tools.ts +61 -15
- package/src/adapters/openai-chat/destination-policy.ts +16 -0
- package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
- package/src/adapters/qoder/adapter.ts +9 -1
- package/src/adapters/zed.ts +7 -2
- package/src/advisor/consult.ts +15 -4
- package/src/advisor/context.ts +12 -3
- package/src/advisor/runtime.ts +35 -5
- package/src/advisor/settings.ts +8 -0
- package/src/advisor/synthetic-tool.ts +21 -8
- package/src/bridge/response-json.ts +11 -2
- package/src/bridge/sse.ts +43 -8
- package/src/claude/auth-detect.ts +21 -33
- package/src/claude/desktop-3p.ts +11 -5
- package/src/claude/desktop-gateway-state.ts +2 -0
- package/src/claude/desktop-remote-store-artifact.ts +14 -3
- package/src/claude/desktop-remote-store.ts +82 -12
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +21 -1
- package/src/cli/account-auth.ts +83 -22
- package/src/cli/account-extended.ts +33 -2
- package/src/cli/account-key-quota.ts +34 -5
- package/src/cli/account.ts +4 -2
- package/src/cli/advisor.ts +7 -4
- package/src/cli/alias.ts +38 -1
- package/src/cli/capabilities-access-remote.ts +128 -3
- package/src/cli/capabilities-accounts.ts +6 -6
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +49 -19
- package/src/cli/capabilities-integrations.ts +2 -2
- package/src/cli/capabilities-observe-system.ts +2 -2
- package/src/cli/capabilities-provider-models.ts +18 -2
- package/src/cli/capabilities-route-to.ts +43 -0
- package/src/cli/capabilities.ts +2 -0
- package/src/cli/capability-contracts.ts +1 -1
- package/src/cli/claude-desktop.ts +30 -11
- package/src/cli/claude.ts +17 -3
- package/src/cli/codex-launcher.ts +3 -1
- package/src/cli/codex-shim-autorestore.ts +5 -42
- package/src/cli/config-command.ts +14 -1
- package/src/cli/config-root-startup.ts +34 -0
- package/src/cli/connect.ts +88 -16
- package/src/cli/desktop-runtime-guidance.ts +1 -1
- package/src/cli/disconnect-runtime.ts +178 -0
- package/src/cli/dispatch.ts +61 -13
- package/src/cli/export-command.ts +1 -1
- package/src/cli/gui-pair-client.ts +6 -3
- package/src/cli/gui.ts +10 -5
- package/src/cli/help-catalog.ts +11 -0
- package/src/cli/help.ts +4 -3
- package/src/cli/index.ts +85 -94
- package/src/cli/inspect.ts +11 -2
- package/src/cli/integrations.ts +26 -1
- package/src/cli/link-apply-restart.ts +4 -2
- package/src/cli/link-capture.ts +64 -0
- package/src/cli/link-child-ops.ts +218 -40
- package/src/cli/link-cleanup.ts +8 -5
- package/src/cli/link-diagnostics.ts +67 -0
- package/src/cli/link-enrollment.ts +158 -12
- package/src/cli/link-operations.ts +52 -0
- package/src/cli/link-recover.ts +152 -0
- package/src/cli/link-routes.ts +90 -0
- package/src/cli/link-status-child.ts +44 -1
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +315 -37
- package/src/cli/message-command.ts +1 -1
- package/src/cli/message-mcp-command.ts +23 -10
- package/src/cli/models-runtime.ts +3 -3
- package/src/cli/opencode.ts +3 -1
- package/src/cli/pi-sync.ts +35 -0
- package/src/cli/preflight-exemptions.ts +49 -0
- package/src/cli/registry.ts +33 -14
- package/src/cli/resolve.ts +23 -8
- package/src/cli/restart-failure.ts +15 -2
- package/src/cli/root.ts +5 -1
- package/src/cli/route-to.ts +172 -0
- package/src/cli/runtime-api.ts +9 -8
- package/src/cli/status.ts +7 -2
- package/src/cli/stop-approval.ts +66 -19
- package/src/cli/stop-report.ts +23 -0
- package/src/cli/stop-windows-checked.ts +304 -0
- package/src/cli/sync-command.ts +70 -15
- package/src/cli/sync-fanout.ts +74 -19
- package/src/cli/sync-flags.ts +40 -3
- package/src/cli/sync-link-status.ts +18 -2
- package/src/cli/sync-update-guard.ts +7 -2
- package/src/cli/system-command.ts +1 -1
- package/src/cli/system-restart-client.ts +10 -3
- package/src/cli/system-settings-parity.ts +2 -1
- package/src/cli/uninstall-plan.ts +77 -5
- package/src/cli/uninstall-stop.ts +152 -0
- package/src/cli/v2-input.ts +10 -6
- package/src/cli/v2-local-output.ts +3 -2
- package/src/cli/v2-runtime.ts +10 -3
- package/src/cli/v2.ts +22 -7
- package/src/client/connect.ts +376 -35
- package/src/client/desktop-refusal.ts +38 -0
- package/src/client/lifecycle-lock.ts +29 -4
- package/src/client/link-home-features.ts +27 -0
- package/src/client/link-home.ts +92 -4
- package/src/client/link-ingress.ts +21 -3
- package/src/client/link-join.ts +12 -2
- package/src/client/link-parity-reporter.ts +60 -6
- package/src/client/link-relay-transport.ts +161 -36
- package/src/client/link-relay.ts +150 -6
- package/src/client/link-request-compression.ts +84 -0
- package/src/client/link-state.ts +11 -5
- package/src/client/link-status.ts +39 -1
- package/src/client/link-teardown.ts +1 -0
- package/src/client/link-tunnel.ts +56 -5
- package/src/client/link-websocket-limits.ts +89 -0
- package/src/client/link-websocket.ts +586 -0
- package/src/client/link-ws-advertisement.ts +100 -0
- package/src/client/link-ws-framer.ts +241 -0
- package/src/client/link-ws-transport.ts +177 -0
- package/src/client/machine-api.ts +13 -2
- package/src/client/machine-listener.ts +48 -7
- package/src/client/route-intent-apply.ts +293 -0
- package/src/client/route-intent-file-originals.ts +97 -0
- package/src/client/route-intent-native-originals.ts +201 -0
- package/src/client/route-intent-watch.ts +141 -0
- package/src/client/runtime-restart.ts +141 -7
- package/src/client/runtime.ts +63 -15
- package/src/client/state.ts +44 -0
- package/src/client/sync-expectation.ts +36 -2
- package/src/client/sync-runtime.ts +7 -0
- package/src/clients/config-export/alias-selectors.ts +63 -40
- package/src/clients/config-export/contracts.ts +2 -0
- package/src/clients/config-export/nested-selectors.ts +42 -0
- package/src/clients/config-export.ts +22 -3
- package/src/codex/account-pause.ts +4 -0
- package/src/codex/account-runtime-state.ts +4 -0
- package/src/codex/account-store.ts +12 -3
- package/src/codex/account-usability.ts +13 -0
- package/src/codex/auth-api/account-list.ts +29 -3
- package/src/codex/auth-api/main-account-probe.ts +3 -1
- package/src/codex/auth-api/main-hard-lock-refusal-read.ts +172 -0
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +61 -8
- package/src/codex/catalog/build-entries.ts +10 -0
- package/src/codex/catalog/derive-entry.ts +7 -0
- package/src/codex/catalog/gather-capture.ts +8 -2
- package/src/codex/catalog/parsing.ts +7 -3
- package/src/codex/catalog/provider-models.ts +54 -15
- package/src/codex/catalog/reserve-warn.ts +7 -5
- package/src/codex/catalog/reserve.ts +4 -3
- package/src/codex/catalog/retained-sync.ts +4 -1
- package/src/codex/catalog/routed-defaults.ts +35 -0
- package/src/codex/catalog/routed-gather.ts +1 -1
- package/src/codex/catalog-auto-refresh.ts +11 -0
- package/src/codex/cli-update-job.ts +35 -13
- package/src/codex/convergence.ts +4 -2
- package/src/codex/desktop-compatibility/native-identity.ts +4 -8
- package/src/codex/features.ts +2 -2
- package/src/codex/history-provider.ts +31 -0
- package/src/codex/inject/multi-agent-v2.ts +9 -3
- package/src/codex/inject/paginated-openai-compat.ts +54 -1
- package/src/codex/inject/plan.ts +20 -2
- package/src/codex/inject.ts +2 -0
- package/src/codex/journal-config-restore.ts +217 -0
- package/src/codex/journal.ts +75 -6
- package/src/codex/loopback-target.ts +22 -8
- package/src/codex/main-account.ts +109 -57
- package/src/codex/native-main-auth-file.ts +118 -0
- package/src/codex/native-main-credentials.ts +270 -0
- package/src/codex/native-main-owner.ts +3 -0
- package/src/codex/native-main-refresh-mode.ts +14 -1
- package/src/codex/native-profile-manager.ts +4 -3
- package/src/codex/native-profile-store.ts +3 -61
- package/src/codex/orca-import.ts +10 -1
- package/src/codex/quota-history.ts +13 -0
- package/src/codex/quota-window-conflict.ts +103 -0
- package/src/codex/quota.ts +86 -15
- package/src/codex/subagent-model-fallback.ts +3 -1
- package/src/codex/websocket-activity.ts +171 -16
- package/src/codex/websocket-registry.ts +11 -4
- package/src/combos/cooldown-store.ts +25 -5
- package/src/combos/failover.ts +342 -3
- package/src/combos/index.ts +5 -0
- package/src/combos/resolve.ts +115 -19
- package/src/config/dashboard-trusted-proxy.ts +83 -0
- package/src/config/diagnostics.ts +31 -0
- package/src/config/feature-flags.ts +9 -0
- package/src/config/live-reconcile.ts +16 -4
- package/src/config/load-degrade.ts +14 -1
- package/src/config/multi-agent-surface.ts +28 -5
- package/src/config/pending-teardown.ts +60 -3
- package/src/config/persisted-mutation.ts +2 -2
- package/src/config/persisted-projections.ts +18 -0
- package/src/config/process-state.ts +176 -4
- package/src/config/provider-validation.ts +4 -4
- package/src/config/reserve-capability.ts +96 -0
- package/src/config/schema/config-schema.ts +12 -0
- package/src/config/schema/leaf-validators.ts +11 -2
- package/src/config/schema/routed-catalog-defaults.ts +49 -0
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/config.ts +7 -7
- package/src/desktop-update/acquire.ts +202 -0
- package/src/desktop-update/cli.ts +168 -0
- package/src/desktop-update/drain.ts +40 -0
- package/src/desktop-update/headless.ts +285 -0
- package/src/desktop-update/image.ts +85 -0
- package/src/desktop-update/install.ts +53 -0
- package/src/desktop-update/msi.ts +72 -0
- package/src/desktop-update/release.ts +128 -0
- package/src/desktop-update/runtime.ts +155 -0
- package/src/desktop-update/staging.ts +118 -0
- package/src/desktop-update/trust.ts +45 -0
- package/src/generated/compatibility-version.json +1114 -442
- package/src/generated/model-metadata.ts +1 -1
- package/src/images/fulfill-video.ts +3 -3
- package/src/images/loop.ts +9 -2
- package/src/images/plan.ts +147 -11
- package/src/images/types.ts +13 -4
- package/src/images/xai-video-client.ts +72 -10
- package/src/integrations/model-name-guard.ts +25 -0
- package/src/integrations/route-intent-catalog.ts +26 -0
- package/src/integrations/route-intent-connected.ts +262 -0
- package/src/integrations/route-intent-contract.ts +55 -0
- package/src/integrations/route-intent-disconnect.ts +109 -0
- package/src/integrations/route-intent-initial.ts +64 -0
- package/src/integrations/route-intent-state.ts +117 -0
- package/src/integrations/route-intent-tick.ts +65 -0
- package/src/integrations/route-intent.ts +212 -0
- package/src/integrations/writer.ts +44 -11
- package/src/lib/client-retry-after.ts +29 -0
- package/src/lib/config-ownership.ts +13 -0
- package/src/lib/desktop-gui-origin.ts +28 -0
- package/src/lib/errors.ts +1 -1
- package/src/lib/gcp-adc.ts +48 -4
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/messages-error-body.ts +4 -1
- package/src/lib/offline-resend.ts +150 -0
- package/src/lib/outbound-credential-registry.ts +362 -4
- package/src/lib/paced-stream.ts +34 -0
- package/src/lib/passive-key-fetch-proof.ts +30 -0
- package/src/lib/passive-read.ts +5 -0
- package/src/lib/process-control.ts +76 -12
- package/src/lib/provider-outbound.ts +17 -6
- package/src/lib/redact.ts +84 -8
- package/src/lib/request-failure-model.ts +2 -0
- package/src/lib/response-body-inactivity.ts +23 -1
- package/src/lib/state-store-registrations.ts +11 -0
- package/src/lib/state-store-sweeper.ts +4 -0
- package/src/lib/supervisor-markers.ts +18 -0
- package/src/lib/terminal-safe-text.ts +58 -0
- package/src/lib/translator-budget.ts +3 -2
- package/src/lib/upstream-retry.ts +52 -9
- package/src/link/alias-lock.ts +119 -0
- package/src/link/child-activity.ts +28 -2
- package/src/link/child-binary-cache-fill.d.mts +50 -0
- package/src/link/child-binary-cache-fill.mjs +494 -0
- package/src/link/child-binary-cache-start.ts +73 -0
- package/src/link/child-binary-source.ts +12 -5
- package/src/link/child-gated-ocx.ts +29 -11
- package/src/link/child-observations.ts +2 -1
- package/src/link/child-observe.ts +2 -2
- package/src/link/child-ops-engine.ts +159 -91
- package/src/link/child-ops-host.ts +138 -0
- package/src/link/child-ops-runners.ts +319 -0
- package/src/link/child-ops-scheduler.ts +207 -0
- package/src/link/child-ops-types.ts +89 -0
- package/src/link/child-parity.ts +23 -4
- package/src/link/child-policy.ts +93 -0
- package/src/link/child-update-contract.ts +12 -3
- package/src/link/codex-settings.ts +1 -1
- package/src/link/compatibility.ts +18 -1
- package/src/link/diagnostics-read.ts +163 -0
- package/src/link/diagnostics.ts +20 -7
- package/src/link/explicit-route.ts +209 -0
- package/src/link/link-recover.ts +113 -0
- package/src/link/management-routes.ts +3 -1
- package/src/link/operation-recovery-slot.ts +44 -0
- package/src/link/operations-journal.ts +408 -0
- package/src/link/peer-report.ts +1 -1
- package/src/link/relay-auth.ts +14 -0
- package/src/link/remote-plant.ts +152 -14
- package/src/link/remote-platform.ts +21 -10
- package/src/link/remote-probe.ts +11 -3
- package/src/link/remote-windows.ts +124 -36
- package/src/link/request-compression.ts +30 -0
- package/src/link/residual-recovery.ts +66 -0
- package/src/link/retirement.ts +128 -0
- package/src/link/route-intent-watch.ts +41 -0
- package/src/link/route-intent.ts +209 -0
- package/src/link/route-proof.ts +82 -0
- package/src/link/route-rounds.ts +579 -0
- package/src/link/route-select.ts +95 -0
- package/src/link/route-trust.ts +96 -0
- package/src/link/ssh-argv.ts +172 -24
- package/src/link/ssh-capture-redact.ts +253 -0
- package/src/link/ssh-capture.ts +497 -0
- package/src/link/ssh-runner.ts +141 -14
- package/src/link/status-projection.ts +87 -0
- package/src/link/store.ts +54 -1
- package/src/link/supervisor.ts +543 -55
- package/src/link/sync-fanout-classify.ts +16 -0
- package/src/link/sync-then-restart.ts +65 -0
- package/src/link/tombstones.ts +209 -0
- package/src/link/traffic.ts +178 -0
- package/src/link/ws-activity-holds.ts +474 -0
- package/src/local-credentials/publication-fence.ts +20 -1
- package/src/messaging/budget.ts +23 -5
- package/src/messaging/mcp-queue-rpc.ts +1 -1
- package/src/messaging/mcp-queue-server.ts +16 -1
- package/src/messaging/mcp-resume-tools.ts +25 -0
- package/src/messaging/remote-enrollment.ts +3 -3
- package/src/messaging/remote-tunnels.ts +2 -2
- package/src/messaging/resume-permissions.ts +27 -0
- package/src/messaging/rpc.ts +50 -6
- package/src/oauth/anthropic-continuity.ts +23 -7
- package/src/oauth/anthropic-routing.ts +5 -2
- package/src/oauth/anthropic.ts +22 -2
- package/src/oauth/antigravity-risk.ts +126 -0
- package/src/oauth/claude-keychain-read.ts +78 -68
- package/src/oauth/generic-account-failover.ts +89 -18
- package/src/oauth/generic-session-affinity.ts +10 -3
- package/src/oauth/index.ts +24 -6
- package/src/oauth/local-token-detect.ts +8 -29
- package/src/oauth/login-cli-errors.ts +5 -1
- package/src/oauth/login-cli.ts +68 -19
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- package/src/oauth/pool-kernel.ts +3 -3
- package/src/oauth/store.ts +7 -0
- package/src/oauth/xai.ts +248 -14
- package/src/protocols/contract.ts +4 -0
- package/src/protocols/encoders/messages.ts +1 -0
- package/src/providers/alias-template.ts +48 -0
- package/src/providers/anthropic-billing-ownership.ts +2 -0
- package/src/providers/anthropic-billing-refusal.ts +27 -3
- package/src/providers/anthropic-output-caps.ts +46 -0
- package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
- package/src/providers/antigravity-effort-families.ts +11 -3
- package/src/providers/antigravity-models.ts +32 -9
- package/src/providers/antigravity-wire-snapshot.ts +3 -2
- package/src/providers/api-key-pause.ts +3 -0
- package/src/providers/api-key-resolve.ts +49 -7
- package/src/providers/api-key-response-ownership.ts +2 -0
- package/src/providers/api-key-selection.ts +51 -9
- package/src/providers/api-keys.ts +6 -2
- package/src/providers/cache-affinity-identity.ts +73 -0
- package/src/providers/cache-affinity.ts +256 -0
- package/src/providers/default-aliases.ts +98 -20
- package/src/providers/google-vertex-model-discovery.ts +515 -0
- package/src/providers/key-failover.ts +123 -8
- package/src/providers/key-store.ts +3 -3
- package/src/providers/kiro-models.ts +3 -5
- package/src/providers/label.ts +31 -5
- package/src/providers/mistral-transport.ts +17 -4
- package/src/providers/model-rename-fields.ts +5 -0
- package/src/providers/muse-key-quota.ts +14 -6
- package/src/providers/new-model-policy-runtime.ts +17 -4
- package/src/providers/new-model-policy.ts +30 -4
- package/src/providers/passive-key-observation.ts +252 -0
- package/src/providers/quota/account-cache.ts +2 -1
- package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
- package/src/providers/quota/passive-key-limits.ts +272 -0
- package/src/providers/quota/passive-wire-model.ts +126 -0
- package/src/providers/quota/report-cache.ts +61 -2
- package/src/providers/quota/workbuddy.ts +6 -2
- package/src/providers/quota-key-accounts.ts +11 -6
- package/src/providers/quota-types.ts +18 -0
- package/src/providers/quota.ts +11 -12
- package/src/providers/registry/entries-core.ts +34 -16
- package/src/providers/registry/entries-extended.ts +32 -0
- package/src/providers/registry/model-seeds.ts +35 -0
- package/src/providers/resolved-model-policy.ts +7 -0
- package/src/providers/routed-config.ts +8 -3
- package/src/providers/workbuddy-credit-balance.ts +125 -16
- package/src/providers/xai-transport.ts +3 -0
- package/src/remote/features.ts +17 -0
- package/src/responses/anthropic-progress.ts +10 -4
- package/src/responses/citation-markers.ts +231 -0
- package/src/responses/effort-history.ts +732 -0
- package/src/responses/spill-store.ts +5 -1
- package/src/responses/state/replay-input.ts +50 -0
- package/src/responses/state/replay-owner.ts +24 -0
- package/src/responses/state/snapshot-codec.ts +9 -0
- package/src/responses/state/spill-queue.ts +1 -0
- package/src/responses/state.ts +42 -60
- package/src/router.ts +2 -2
- package/src/routing/history/integrity.ts +41 -4
- package/src/routing/home-route-capture.ts +123 -0
- package/src/routing/home-route-intent.ts +200 -0
- package/src/routing/route-intent-state.ts +178 -0
- package/src/routing/route-to-live-settings.ts +35 -0
- package/src/routing/route-to-local.ts +145 -0
- package/src/routing/route-to-status.ts +94 -0
- package/src/routing/route-to-sync-child.ts +32 -0
- package/src/server/adapter-resolve.ts +21 -1
- package/src/server/admitted-http-turn.ts +3 -0
- package/src/server/auth-cors.ts +111 -3
- package/src/server/bare-upstream-error.ts +220 -0
- package/src/server/chat-native.ts +14 -5
- package/src/server/claude-messages.ts +6 -4
- package/src/server/codex-model-list.ts +4 -2
- package/src/server/configured-credentials.ts +37 -5
- package/src/server/direct-local-http.ts +26 -3
- package/src/server/gui-desktop-authorization.ts +36 -0
- package/src/server/gui-pair-delivery.ts +6 -3
- package/src/server/gui-session.ts +10 -1
- package/src/server/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +196 -12
- package/src/server/index/link-management.ts +15 -1
- package/src/server/index/link-relay-sessions.ts +87 -8
- package/src/server/index/link-websocket-limits.ts +136 -0
- package/src/server/index/link-websocket.ts +692 -0
- package/src/server/index/optional-listeners.ts +97 -7
- package/src/server/index/route-intent-watch.ts +47 -0
- package/src/server/index/serve-contract.ts +86 -0
- package/src/server/index/serve-options.ts +36 -86
- package/src/server/index/startup-warnings.ts +8 -2
- package/src/server/index/websocket-handler.ts +26 -4
- package/src/server/index.ts +15 -4
- package/src/server/inference/client-encoder-delivery.ts +2 -0
- package/src/server/inspection-tee.ts +39 -2
- package/src/server/lifecycle.ts +2 -0
- package/src/server/link-turn.ts +149 -0
- package/src/server/management/advisor-routes.ts +10 -2
- package/src/server/management/agent-settings-routes.ts +50 -16
- package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
- package/src/server/management/config-routes.ts +39 -3
- package/src/server/management/context.ts +9 -2
- package/src/server/management/desktop-authorization.ts +41 -0
- package/src/server/management/desktop-compatibility-routes.ts +9 -8
- package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
- package/src/server/management/home-integration-decision.ts +89 -0
- package/src/server/management/integration-routes.ts +208 -81
- package/src/server/management/link-child-ops-routes.ts +145 -43
- package/src/server/management/link-child-preflight.ts +31 -0
- package/src/server/management/link-diagnostics-route.ts +29 -0
- package/src/server/management/link-enrollment.ts +199 -47
- package/src/server/management/link-operation.ts +609 -0
- package/src/server/management/link-recover-route.ts +103 -0
- package/src/server/management/link-route-edit.ts +192 -0
- package/src/server/management/link-route-request.ts +62 -0
- package/src/server/management/link-route-state.ts +83 -7
- package/src/server/management/link-routes.ts +553 -51
- package/src/server/management/link-traffic-status.ts +13 -0
- package/src/server/management/model-routes.ts +122 -36
- package/src/server/management/model-rows.ts +2 -1
- package/src/server/management/native-integration-routes.ts +176 -70
- package/src/server/management/oauth-account-routes.ts +58 -18
- package/src/server/management/protocol-routes.ts +7 -0
- package/src/server/management/provider-completion-test.ts +4 -4
- package/src/server/management/provider-overwrite-carry.ts +14 -0
- package/src/server/management/provider-routes.ts +68 -65
- package/src/server/management/provider-routing-quota.ts +45 -0
- package/src/server/management/route-registry.ts +22 -3
- package/src/server/management/route-to-routes.ts +257 -0
- package/src/server/management/static-catalog-probe.ts +33 -0
- package/src/server/management/system-restart.ts +4 -2
- package/src/server/management/usage-aggregate-cache.ts +101 -66
- package/src/server/management-api.ts +17 -3
- package/src/server/management-auth.ts +13 -1
- package/src/server/messages-native-preflight.ts +27 -4
- package/src/server/messages-native.ts +17 -5
- package/src/server/persistent-gui-session.ts +6 -3
- package/src/server/proxy-liveness.ts +87 -15
- package/src/server/relay-eager.ts +36 -12
- package/src/server/relay.ts +189 -117
- package/src/server/request-body-facts.ts +48 -0
- package/src/server/request-decompress.ts +65 -2
- package/src/server/request-log-account-rotation.ts +6 -0
- package/src/server/request-log-attempt-usage.ts +69 -0
- package/src/server/request-log-cache-affinity.ts +60 -0
- package/src/server/request-log-conversation.ts +45 -2
- package/src/server/request-log-terminal-status.ts +210 -24
- package/src/server/request-log.ts +76 -80
- package/src/server/reserve-capability-startup.ts +32 -0
- package/src/server/responses/adapter-continuation.ts +2 -1
- package/src/server/responses/adapter-delivery.ts +4 -0
- package/src/server/responses/adapter-dispatch.ts +36 -17
- package/src/server/responses/advisor-plan-slot.ts +33 -1
- package/src/server/responses/advisor-question.ts +21 -0
- package/src/server/responses/advisor-slot.ts +10 -3
- package/src/server/responses/antigravity-fault-rotation.ts +24 -0
- package/src/server/responses/antigravity-validation-refusal.ts +43 -6
- package/src/server/responses/bare-namespace-aliases.ts +18 -0
- package/src/server/responses/buffered-sse-json.ts +9 -3
- package/src/server/responses/code-mode-collab-surface.ts +11 -0
- package/src/server/responses/codex-tool-catalog.ts +156 -0
- package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
- package/src/server/responses/combo-selection-keepalive.ts +254 -0
- package/src/server/responses/combo-stream-preflight.ts +557 -54
- package/src/server/responses/compact.ts +32 -8
- package/src/server/responses/core-codex-account.ts +17 -3
- package/src/server/responses/core-combo-failure.ts +8 -0
- package/src/server/responses/core-combo.ts +55 -12
- package/src/server/responses/core-errors.ts +13 -7
- package/src/server/responses/core-lifetime.ts +3 -2
- package/src/server/responses/core-normalize.ts +3 -1
- package/src/server/responses/core-options.ts +14 -0
- package/src/server/responses/core.ts +23 -0
- package/src/server/responses/estimated-usage.ts +115 -0
- package/src/server/responses/fetch-helpers.ts +15 -10
- package/src/server/responses/jev-model-invoke.ts +7 -2
- package/src/server/responses/native-replay-guard.ts +57 -0
- package/src/server/responses/opengateway-completion-guard.ts +10 -4
- package/src/server/responses/outbound-request-body.ts +29 -0
- package/src/server/responses/passthrough-completion.ts +109 -9
- package/src/server/responses/passthrough-delivery.ts +77 -18
- package/src/server/responses/passthrough-dispatch.ts +77 -73
- package/src/server/responses/policy-fallback.ts +13 -1
- package/src/server/responses/request-prepare.ts +59 -11
- package/src/server/responses/request-transport.ts +10 -3
- package/src/server/responses/reset-replay.ts +46 -2
- package/src/server/responses/run-turn-execution.ts +2 -0
- package/src/server/responses/sidecar-execution.ts +19 -0
- package/src/server/responses/terminal-error-redaction.ts +222 -25
- package/src/server/responses/ws-upstream.ts +2 -2
- package/src/server/sse-payload-rewrite.ts +3 -2
- package/src/server/stop-service-route.ts +85 -0
- package/src/server/system-env-shell.ts +12 -1
- package/src/server/system-env.ts +5 -3
- package/src/server/windows-tcp-drop.ts +21 -4
- package/src/server/workflow-refusal.ts +8 -0
- package/src/server/ws-bridge.ts +191 -12
- package/src/service/cli-windows-stop.ts +189 -0
- package/src/service/cli.ts +41 -12
- package/src/service/desktop-supervision.d.mts +2 -0
- package/src/service/desktop-supervision.mjs +5 -0
- package/src/service/disconnected-client-restart.ts +60 -0
- package/src/service/guarded-manager-target.ts +18 -1
- package/src/service/health.ts +99 -6
- package/src/service/launchd.ts +84 -31
- package/src/service/orchestration.ts +418 -91
- package/src/service/repair.ts +223 -6
- package/src/service/restart-proxy-stop.ts +79 -0
- package/src/service/service-child-ownership.ts +6 -2
- package/src/service/windows-checked-stop-live.ts +467 -0
- package/src/service/windows-checked-stop.ts +435 -0
- package/src/service/windows-command-line-token.ts +23 -0
- package/src/service/windows-guarded-manager.ts +77 -34
- package/src/service/windows-ops.ts +38 -56
- package/src/service/windows-process-evidence.ts +292 -0
- package/src/service/windows-process-native.ts +262 -0
- package/src/service/windows-service-stop.ts +321 -0
- package/src/service/windows-stop-binding.ts +187 -0
- package/src/service/windows-stop-budget.ts +123 -0
- package/src/service/windows-stop-confirm.ts +158 -0
- package/src/service/windows-stop-deadline.ts +56 -0
- package/src/service.ts +2 -2
- package/src/stall-timeout.ts +11 -0
- package/src/types/config.ts +57 -110
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +60 -2
- package/src/types/request.ts +23 -0
- package/src/types/routed-catalog-defaults.ts +17 -0
- package/src/types/routing-profile.ts +90 -0
- package/src/types.ts +4 -0
- package/src/update/guarded-runtime-ops.ts +5 -7
- package/src/update/index.ts +26 -11
- package/src/update/install-detection.mjs +3 -1
- package/src/update/job-pinned-start.ts +2 -0
- package/src/update/job-windows-restart.ts +19 -32
- package/src/update/job.ts +12 -5
- package/src/update/npm-install.d.mts +11 -0
- package/src/update/npm-install.mjs +44 -7
- package/src/update/orchestrated-entry.ts +1 -1
- package/src/update/orchestrated-node-driver.mjs +3 -2
- package/src/update/orchestrated-pnpm.d.mts +4 -0
- package/src/update/orchestrated-pnpm.mjs +50 -6
- package/src/update/orchestrated-session.d.mts +3 -1
- package/src/update/orchestrated-session.mjs +21 -6
- package/src/update/pnpm-global-install.d.mts +21 -3
- package/src/update/pnpm-global-install.mjs +322 -19
- package/src/update/pnpm-store-layout.mjs +46 -0
- package/src/update/sync-update-mutex.d.mts +3 -2
- package/src/update/sync-update-mutex.mjs +57 -8
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +545 -12
- package/src/update/windows-installer-marker.d.mts +1 -0
- package/src/update/windows-installer-marker.mjs +44 -0
- package/src/usage/expected-prices.ts +8 -0
- package/src/usage/filter-index.ts +326 -77
- package/src/usage/ledger-scanner.ts +15 -0
- package/src/usage/link-log-fields.ts +48 -0
- package/src/usage/log.ts +57 -6
- package/src/usage/request-body.ts +37 -0
- package/src/usage/telemetry-contract.ts +1 -0
- package/src/web-search/loop.ts +3 -0
- package/src/web-search/passthrough-bridge.ts +7 -0
- package/gui/dist/assets/App-BpJOzw4F.js +0 -59
- package/gui/dist/assets/brand-mark-DU-0Vdkr.js +0 -1
- package/gui/dist/assets/index-Bbor_y80.js +0 -94
- package/gui/dist/assets/index-DJEkIDAi.css +0 -2
- package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
- package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
- package/gui/dist/classic/assets/quota-summary-CakPe9Ni.js +0 -1
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { clientFacingModelText } from "../../lib/error-destination";
|
|
2
2
|
import { projectLocalModelRefusalLog } from "../request-log-failure-detail";
|
|
3
|
+
import { noteRelaySyntheticTail, noteRequestSentValueGuard } from "../request-log-terminal-status";
|
|
4
|
+
import { createSentValueGuard } from "../../lib/outbound-credential-registry";
|
|
3
5
|
import { carryPolicyCandidateRefusal } from "./policy-request-scope";
|
|
4
6
|
import { markProxyError, rememberProxyErrorMessage, carryProxyError } from "../../lib/client-error-body";
|
|
5
7
|
import { releaseRequestOwnedMainOnOutcome, isKeyedRequestOwnedMain } from "../../codex/request-owned-affinity";
|
|
@@ -11,7 +13,7 @@ import { isNativeControlResponse } from "./native-response-control";
|
|
|
11
13
|
import { guardBufferedComboRequiredTool } from "./combo-required-tool-contract";
|
|
12
14
|
import { createComboRequiredToolStreamGuard } from "./combo-required-tool-stream";
|
|
13
15
|
import { attachResponseToolOwnership } from "./response-tool-ownership";
|
|
14
|
-
import { createOutboundCredentialMask, createTerminalErrorRedactionBlockRewrite } from "./terminal-error-redaction";
|
|
16
|
+
import { createForwardedEvidenceRedaction, createOutboundCredentialMask, createSynthesizedCopyMask, createTerminalErrorRedactionBlockRewrite } from "./terminal-error-redaction";
|
|
15
17
|
import type { ResponsesRequestContext, ResponsesAdmissionState } from "./core-options";
|
|
16
18
|
import type { PreparedResponsesRequest } from "./request-prepare";
|
|
17
19
|
import type { ResponsesTransport } from "./request-transport";
|
|
@@ -33,7 +35,9 @@ import {
|
|
|
33
35
|
import { isUsageDebugEnabled } from "../../usage/debug";
|
|
34
36
|
import { isNonReplayableResponse, isReplayRefusalResponse } from "../../lib/upstream-retry";
|
|
35
37
|
import { sanitizeNonReplayableUpstreamError } from "./non-replayable-error";
|
|
36
|
-
import { teeWithBoundedInspection } from "../inspection-tee";
|
|
38
|
+
import { sliceChunks, teeWithBoundedInspection } from "../inspection-tee";
|
|
39
|
+
import { markPacedStream } from "../../lib/paced-stream";
|
|
40
|
+
import { LINK_PACED_SLICE_BYTES, linkTurnPacesReads } from "../link-turn";
|
|
37
41
|
import {
|
|
38
42
|
codexForwardTerminalOutcomeRecorder,
|
|
39
43
|
usesCodexForwardPoolAuth,
|
|
@@ -159,7 +163,12 @@ import { registerTurn, unregisterTurn, trackStreamLifetime } from "../lifecycle"
|
|
|
159
163
|
import { relaySseEagerBounded } from "../relay-eager";
|
|
160
164
|
import { readBoundedResponseBody } from "../../lib/bounded-body";
|
|
161
165
|
import { idleDeadline } from "../../lib/abort";
|
|
162
|
-
import { resolveStallTimeoutMs } from "../../stall-timeout";
|
|
166
|
+
import { explicitStallTimeoutMs, resolveStallTimeoutMs } from "../../stall-timeout";
|
|
167
|
+
import { guardResponseBodyInactivity, isResponseBodyInactivityGuarded } from "../../lib/response-body-inactivity";
|
|
168
|
+
import {
|
|
169
|
+
createEstimatedUsagePayloadRewrite, ESTIMATED_USAGE_HEADER, estimatedUsageJson, estimatesMissingUsage,
|
|
170
|
+
} from "./estimated-usage";
|
|
171
|
+
import { estimateInputTokens } from "./input-admission";
|
|
163
172
|
import { formatErrorResponse } from "../../bridge";
|
|
164
173
|
import {
|
|
165
174
|
httpStatusFromTerminalError,
|
|
@@ -174,11 +183,13 @@ import { restoreRoutedToolSearchCallsInJson } from "../../responses/tool-search-
|
|
|
174
183
|
import { responsesJsonToSseStream } from "../responses-json-events";
|
|
175
184
|
import { isCanonicalOpenAiForwardProvider } from "../../providers/openai-tiers";
|
|
176
185
|
import {
|
|
186
|
+
BUFFERED_RESPONSES_TOTAL_TIMEOUT_MS,
|
|
177
187
|
bufferedResponsesReadOptions,
|
|
178
188
|
collectBufferedResponsesSse,
|
|
179
189
|
type BufferedResponsesSseFailure,
|
|
180
190
|
type BufferedResponsesSseResult,
|
|
181
191
|
} from "./buffered-sse-json";
|
|
192
|
+
import { bufferedResetSelectionStartedAt } from "./passthrough-completion";
|
|
182
193
|
|
|
183
194
|
const PLAINTEXT_V2_SSE_PREFIX_LIMIT = 4096;
|
|
184
195
|
|
|
@@ -439,7 +450,7 @@ export async function deliverPassthroughResponse(
|
|
|
439
450
|
): Promise<Response> {
|
|
440
451
|
const { route } = requestState;
|
|
441
452
|
// The proof must belong to the response whose headers are published.
|
|
442
|
-
const arrivalMainDispatch = liveMainQuotaDispatch(admissionState.authCtx, route.provider);
|
|
453
|
+
const arrivalMainDispatch = liveMainQuotaDispatch(admissionState.authCtx, route.provider, nativeExchange.upstreamResponse);
|
|
443
454
|
const { logCtx, config, options, req } = requestContext;
|
|
444
455
|
const {
|
|
445
456
|
codexSafetyBufferingOptions,
|
|
@@ -464,6 +475,11 @@ export async function deliverPassthroughResponse(
|
|
|
464
475
|
} = nativeExchange;
|
|
465
476
|
const { commitReasoningReplayServingRoute, recordTerminalOutcomes } = responseEffects;
|
|
466
477
|
const { parsed, subagentQuotaFailureModel, clientRequestedStream, translatorBudget } = requestState;
|
|
478
|
+
// #7427: opt-in estimated usage for a provider that omits it. Client-facing only; the request log,
|
|
479
|
+
// spend and quota read the provider's original body.
|
|
480
|
+
const estimateUsage = estimatesMissingUsage(route.provider, options);
|
|
481
|
+
let usageInputEstimate: number | undefined;
|
|
482
|
+
const inputEstimate = (): number => usageInputEstimate ??= estimateInputTokens(parsed, route.modelId, route.provider);
|
|
467
483
|
const { openAiSidecar } = sidecarState;
|
|
468
484
|
const { requestBindings } = transportState;
|
|
469
485
|
|
|
@@ -735,18 +751,26 @@ export async function deliverPassthroughResponse(
|
|
|
735
751
|
});
|
|
736
752
|
// Capture the binding that actually served the first leg, after its permitted reselection.
|
|
737
753
|
const webSearchBridgeBinding = requestBindings.get(nativeExchange.request);
|
|
754
|
+
// #8206: an explicit stallTimeoutSec bounds silence on the native upstream body for every
|
|
755
|
+
// streaming relay. Unset keeps this relay without a clock; the canonical JSON fold keeps
|
|
756
|
+
// its own deadlines, and reset selection already guarded the bodies it published.
|
|
757
|
+
const nativeSseStallMs = canonicalBufferedJson || isResponseBodyInactivityGuarded(upstreamResponse)
|
|
758
|
+
? 0 : explicitStallTimeoutMs(config.stallTimeoutSec);
|
|
759
|
+
const nativeSseBody = nativeSseStallMs > 0
|
|
760
|
+
? guardResponseBodyInactivity(upstreamResponse, upstream.signal, nativeSseStallMs, { explicitBudget: true }).response.body!
|
|
761
|
+
: upstreamResponse.body;
|
|
738
762
|
// Repair must observe the raw first leg before the bridge suppresses an intercepted search
|
|
739
763
|
// lifecycle. Otherwise a provider that leaves that complete call open never arms repair's
|
|
740
764
|
// grace timer, so the bridge cannot execute the search or begin its continuation.
|
|
741
765
|
let passthroughSseBody = terminalRepairPolicy
|
|
742
766
|
? relayResponsesSseWithTerminalRepair(
|
|
743
|
-
|
|
767
|
+
nativeSseBody,
|
|
744
768
|
upstream,
|
|
745
769
|
terminalRepairPolicy,
|
|
746
770
|
translatorBudget,
|
|
747
771
|
options.responsesTerminalRepairScheduler, logCtx,
|
|
748
772
|
)
|
|
749
|
-
:
|
|
773
|
+
: nativeSseBody;
|
|
750
774
|
passthroughSseBody = webSearchBridgePlan
|
|
751
775
|
? createPassthroughWebSearchBridgeStream({
|
|
752
776
|
plan: webSearchBridgePlan,
|
|
@@ -778,17 +802,24 @@ export async function deliverPassthroughResponse(
|
|
|
778
802
|
);
|
|
779
803
|
// The same provider can leave a complete continuation open without a terminal, which
|
|
780
804
|
// stalls the bridge's decide loop exactly like the first leg — so every leg gets the
|
|
781
|
-
// same repair, not only the intercepted first one.
|
|
782
|
-
if (!
|
|
805
|
+
// same repair and the same explicit silence clock, not only the intercepted first one.
|
|
806
|
+
if (!continuation.ok || !continuation.body) return continuation;
|
|
807
|
+
// A continuation is a fresh upstream body: guard it from the explicit budget even when
|
|
808
|
+
// reset selection already guarded the first leg (and so left nativeSseStallMs at 0).
|
|
809
|
+
const continuationStallMs = explicitStallTimeoutMs(config.stallTimeoutSec);
|
|
810
|
+
const guardedContinuation = continuationStallMs > 0
|
|
811
|
+
? guardResponseBodyInactivity(continuation, upstream.signal, continuationStallMs, { explicitBudget: true }).response
|
|
812
|
+
: continuation;
|
|
813
|
+
if (!terminalRepairPolicy) return guardedContinuation;
|
|
783
814
|
return new Response(
|
|
784
815
|
relayResponsesSseWithTerminalRepair(
|
|
785
|
-
|
|
816
|
+
guardedContinuation.body!,
|
|
786
817
|
upstream,
|
|
787
818
|
terminalRepairPolicy,
|
|
788
819
|
translatorBudget,
|
|
789
820
|
options.responsesTerminalRepairScheduler, logCtx,
|
|
790
821
|
),
|
|
791
|
-
|
|
822
|
+
guardedContinuation,
|
|
792
823
|
);
|
|
793
824
|
},
|
|
794
825
|
execute: createPassthroughWebSearchBridgeExecutor(webSearchBridgePlan, {
|
|
@@ -867,6 +898,12 @@ export async function deliverPassthroughResponse(
|
|
|
867
898
|
}, { dispose: () => plaintextInspector.dispose() })
|
|
868
899
|
: undefined;
|
|
869
900
|
const maskCredential = createOutboundCredentialMask(nativeExchange.request.headers);
|
|
901
|
+
// Copy a boundary synthesizes from upstream evidence, and the row's copy, also refuse any value
|
|
902
|
+
// this request sent, decided from its own headers.
|
|
903
|
+
const repeatsSentValue = createSentValueGuard(nativeExchange.request.headers);
|
|
904
|
+
noteRequestSentValueGuard(logCtx, repeatsSentValue);
|
|
905
|
+
const synthesizedCopyMask = createSynthesizedCopyMask(nativeExchange.request.headers, repeatsSentValue);
|
|
906
|
+
const forwardedEvidenceRedaction = createForwardedEvidenceRedaction(nativeExchange.request.headers, maskCredential);
|
|
870
907
|
const requiredStreamEvidence = { replayUnsafe: !!webSearchBridgePlan };
|
|
871
908
|
const normalizeRequiredToolItem = (item: unknown) => {
|
|
872
909
|
item = restoreImageGenCalls(item, imageGenCallAliases).value;
|
|
@@ -969,7 +1006,12 @@ export async function deliverPassthroughResponse(
|
|
|
969
1006
|
(!canonicalBufferedJson || !options.comboAttempt) && isLocalCodexImageClient(req.headers, options.admission?.kind, options.inboundWire)
|
|
970
1007
|
? createHostedImageDisplayRewrite()
|
|
971
1008
|
: undefined,
|
|
1009
|
+
// Last, so it sees the response the client receives; never on the canonical JSON fold.
|
|
1010
|
+
estimateUsage && !canonicalBufferedJson
|
|
1011
|
+
? payloadRewriteAsBlockRewrite(createEstimatedUsagePayloadRewrite(inputEstimate, route.modelId))
|
|
1012
|
+
: undefined,
|
|
972
1013
|
].filter((rewrite): rewrite is NonNullable<typeof rewrite> => rewrite !== undefined);
|
|
1014
|
+
if (estimateUsage && !canonicalBufferedJson) headers.set(ESTIMATED_USAGE_HEADER, "when-missing");
|
|
973
1015
|
const clientBlockRewrite = blockRewrites.length > 0
|
|
974
1016
|
? composeSseBlockRewrites(...blockRewrites)
|
|
975
1017
|
: undefined;
|
|
@@ -977,10 +1019,11 @@ export async function deliverPassthroughResponse(
|
|
|
977
1019
|
|
|
978
1020
|
if (canonicalBufferedJson) {
|
|
979
1021
|
const signal = options.abortSignal ?? req.signal;
|
|
1022
|
+
// A turn whose head waited on reset selection keeps the deadline that wait already spent.
|
|
980
1023
|
const bufferedRead = bufferedResponsesReadOptions(resolveStallTimeoutMs(
|
|
981
1024
|
config.stallTimeoutSec,
|
|
982
1025
|
{ localUpstream: nativeExchange.localUpstream },
|
|
983
|
-
));
|
|
1026
|
+
), BUFFERED_RESPONSES_TOTAL_TIMEOUT_MS, bufferedResetSelectionStartedAt(nativeExchange.upstreamResponse) ?? Date.now());
|
|
984
1027
|
const failBufferedTurn = (
|
|
985
1028
|
message: string,
|
|
986
1029
|
failure?: BufferedResponsesSseFailure,
|
|
@@ -994,9 +1037,9 @@ export async function deliverPassthroughResponse(
|
|
|
994
1037
|
const presentation = rawPresentation === undefined ? undefined : {
|
|
995
1038
|
status: rawPresentation.status,
|
|
996
1039
|
error: {
|
|
997
|
-
type:
|
|
998
|
-
code:
|
|
999
|
-
message:
|
|
1040
|
+
type: synthesizedCopyMask(rawPresentation.error.type),
|
|
1041
|
+
code: synthesizedCopyMask(rawPresentation.error.code),
|
|
1042
|
+
message: synthesizedCopyMask(rawPresentation.error.message),
|
|
1000
1043
|
},
|
|
1001
1044
|
};
|
|
1002
1045
|
if (upstreamError !== undefined) {
|
|
@@ -1048,7 +1091,7 @@ export async function deliverPassthroughResponse(
|
|
|
1048
1091
|
let raw: BufferedResponsesSseResult | undefined = await collectBufferedResponsesSse(
|
|
1049
1092
|
passthroughSseBody,
|
|
1050
1093
|
upstream,
|
|
1051
|
-
{ signal, terminalBoundary: codexSafetyBufferingOptions, read: bufferedRead, retainTranscript: true },
|
|
1094
|
+
{ signal, terminalBoundary: codexSafetyBufferingOptions, read: bufferedRead, retainTranscript: true, maskCredential: synthesizedCopyMask },
|
|
1052
1095
|
);
|
|
1053
1096
|
if (!raw.ok) {
|
|
1054
1097
|
if (raw.kind === "aborted" || signal.aborted) {
|
|
@@ -1080,7 +1123,7 @@ export async function deliverPassthroughResponse(
|
|
|
1080
1123
|
)
|
|
1081
1124
|
: replayBufferedSse(rawBytes);
|
|
1082
1125
|
const client = await collectBufferedResponsesSse(bufferedClientBody, upstream, {
|
|
1083
|
-
signal,
|
|
1126
|
+
signal, maskCredential: synthesizedCopyMask,
|
|
1084
1127
|
read: bufferedRead,
|
|
1085
1128
|
retainTranscript: false,
|
|
1086
1129
|
});
|
|
@@ -1196,6 +1239,10 @@ export async function deliverPassthroughResponse(
|
|
|
1196
1239
|
}
|
|
1197
1240
|
|
|
1198
1241
|
const relayPlatform = relayPlatformForTests ?? process.platform;
|
|
1242
|
+
// Every relayed Remote Link turn reads its upstream only as its client drains (#8601), feature switch or not;
|
|
1243
|
+
// every other request keeps the relays' read-ahead below. Its chunks travel in slices, and the paced mark makes the
|
|
1244
|
+
// tee, the eager relay and every stage after them read one slice at a time as the client asks (src/lib/paced-stream.ts).
|
|
1245
|
+
if (linkTurnPacesReads(logCtx)) passthroughSseBody = markPacedStream(sliceChunks(passthroughSseBody, LINK_PACED_SLICE_BYTES));
|
|
1199
1246
|
// #864: win32 rewrite traffic must never enter the tee()+JS-pull chain
|
|
1200
1247
|
// (Bun#32111 JS-sink segfault — text frames pass, the terminal block is
|
|
1201
1248
|
// lost). The eager single reader applies the same rewrites inline.
|
|
@@ -1276,7 +1323,9 @@ export async function deliverPassthroughResponse(
|
|
|
1276
1323
|
}, {
|
|
1277
1324
|
clientGoneSignal: options.abortSignal,
|
|
1278
1325
|
terminalBoundary: codexSafetyBufferingOptions,
|
|
1279
|
-
maskCredential,
|
|
1326
|
+
maskCredential: synthesizedCopyMask,
|
|
1327
|
+
redactForwardedEvidence: forwardedEvidenceRedaction,
|
|
1328
|
+
onSyntheticTail: (payload, verdict) => noteRelaySyntheticTail(logCtx, payload, verdict),
|
|
1280
1329
|
...(inlineEagerRewrite ? { rewriteBudget: translatorBudget } : {}),
|
|
1281
1330
|
...(logCtx.upstreamError === undefined ? {} : { upstreamError: logCtx.upstreamError }),
|
|
1282
1331
|
});
|
|
@@ -1371,7 +1420,8 @@ export async function deliverPassthroughResponse(
|
|
|
1371
1420
|
responseEffects.responseCompletionCancelled = true;
|
|
1372
1421
|
clientGone.abort(reason);
|
|
1373
1422
|
},
|
|
1374
|
-
{ upstreamError: logCtx.upstreamError, terminalBoundary: codexSafetyBufferingOptions, maskCredential
|
|
1423
|
+
{ upstreamError: logCtx.upstreamError, terminalBoundary: codexSafetyBufferingOptions, maskCredential: synthesizedCopyMask, redactForwardedEvidence: forwardedEvidenceRedaction,
|
|
1424
|
+
onSyntheticTail: (payload, verdict) => noteRelaySyntheticTail(logCtx, payload, verdict) },
|
|
1375
1425
|
);
|
|
1376
1426
|
return markNativePassthroughSseResponse(new Response(clientBody, {
|
|
1377
1427
|
status: upstreamResponse.status,
|
|
@@ -1487,6 +1537,15 @@ export async function deliverPassthroughResponse(
|
|
|
1487
1537
|
throw error;
|
|
1488
1538
|
} finally { imageDisplay.dispose?.(); }
|
|
1489
1539
|
}
|
|
1540
|
+
if (estimateUsage && upstreamResponse.ok) {
|
|
1541
|
+
const estimated = estimatedUsageJson(clientJson, inputEstimate(), route.modelId);
|
|
1542
|
+
if (estimated !== undefined) {
|
|
1543
|
+
clientJson = estimated;
|
|
1544
|
+
headers.set(ESTIMATED_USAGE_HEADER, "true");
|
|
1545
|
+
// The request-log finalizer parses the delivered body again; keep the estimate out of it.
|
|
1546
|
+
logCtx.usageEstimatedForClient = true;
|
|
1547
|
+
}
|
|
1548
|
+
}
|
|
1490
1549
|
// #875: the transport-neutral reliability policy forced a bounded JSON
|
|
1491
1550
|
// upstream for a client that asked for SSE. Reframe the completed JSON
|
|
1492
1551
|
// as the canonical terminal SSE sequence (created → output_item.done →
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { clientFacingModelText } from "../../lib/error-destination";
|
|
2
|
+
import { providerAffinityGenerationIsCurrent } from "../../providers/api-key-selection";
|
|
2
3
|
import { markProxyError } from "../../lib/client-error-body";
|
|
3
4
|
import { CodexInstallationIdUnavailableError } from "../../codex/installation-id";
|
|
4
5
|
import { passthroughBuildErrorResponse } from "./passthrough-build-error";
|
|
@@ -26,7 +27,7 @@ import { renewMainQuotaDispatchForAttempt } from "../../codex/main-account-cache
|
|
|
26
27
|
import { isCanonicalOpenAiForwardProvider } from "../../providers/openai-tiers";
|
|
27
28
|
import { isLocalUpstream } from "../../lib/local-upstream";
|
|
28
29
|
import { resolveConnectTimeoutMs } from "../../stall-timeout";
|
|
29
|
-
import { codexSafetyBufferingFilterOptions,
|
|
30
|
+
import { codexSafetyBufferingFilterOptions, createTerminalStatusTracker } from "../relay";
|
|
30
31
|
import { imageGenToolCallAliases } from "../responses-image-gen-repair";
|
|
31
32
|
import { rememberResponseState, isBodyNonPersistable } from "../../responses/state";
|
|
32
33
|
import {
|
|
@@ -62,7 +63,8 @@ import {
|
|
|
62
63
|
collectFunctionCallRepairSchemas,
|
|
63
64
|
repairFunctionCallsInJson,
|
|
64
65
|
} from "../../responses/function-call-compat";
|
|
65
|
-
import
|
|
66
|
+
import { authorizedBareNamespaceToolAliases as authorizedBareNamespaceAliases } from "./bare-namespace-aliases";
|
|
67
|
+
import { outboundToolScope } from "./outbound-request-body";
|
|
66
68
|
import { hasResponsesSnapshotRepair, repairResponsesSnapshotJson } from "../responses-snapshot-repair";
|
|
67
69
|
import { backfillResponsesFieldsJson } from "./responses-field-backfill";
|
|
68
70
|
import type { AdapterRequest } from "../../adapters/base";
|
|
@@ -137,6 +139,7 @@ import { classifyTransportFailureKind, transportErrorCode } from "../../lib/upst
|
|
|
137
139
|
import { captureAccountAutoPauseAttempt, wasAccountAutoPaused, wasPermanentAccountRefusal } from "../../oauth/account-auto-pause";
|
|
138
140
|
import { codexFailureWindowOutcomeMeta, recordCodexUpstreamOutcome } from "../../codex/routing";
|
|
139
141
|
import { describeUpstreamConnectFailure } from "./upstream-error";
|
|
142
|
+
import { createProviderOfflineResendWait } from "../../lib/offline-resend";
|
|
140
143
|
import type { OpaqueBlobRecoveryGuard } from "./core-opaque-recovery";
|
|
141
144
|
import {
|
|
142
145
|
rateLimitRetryPolicyFor,
|
|
@@ -168,13 +171,17 @@ import {
|
|
|
168
171
|
refusedReasoningEffortDowngrade, withRawBodyReasoningEffort,
|
|
169
172
|
} from "./core-opaque-recovery";
|
|
170
173
|
import type { RequestLogContext } from "../request-log";
|
|
171
|
-
import {
|
|
172
|
-
import {
|
|
174
|
+
import { preflightComboStreamResponse } from "./combo-stream-preflight";
|
|
175
|
+
import type { RequestFailureStage } from "../../lib/request-failure-model";
|
|
176
|
+
import {
|
|
177
|
+
ambiguousResendAllowanceFor, ambiguousResendAuthorizer, UnsafePhysicalReplacement,
|
|
178
|
+
} from "./reset-replay";
|
|
179
|
+
import { createNativeReplayGuard } from "./native-replay-guard";
|
|
173
180
|
import { upstreamErrorMessageFromPayload, ENCRYPTED_FUNCTION_OUTPUT_REJECTION } from "../../lib/errors";
|
|
174
181
|
import { isTransientConsoleGoUploadRejection } from "../../providers/opencode-zen-rate-limit";
|
|
175
182
|
import { unboundPoolSpendRefusalResponse } from "../workflow-refusal";
|
|
176
183
|
import { createNativeContinuationDispatch } from "./native-continuation-send";
|
|
177
|
-
import { guardPassthroughCompletion, parseOutboundRequestBody } from "./passthrough-completion";
|
|
184
|
+
import { guardPassthroughCompletion, isResetReplacementStream, parseOutboundRequestBody, selectPassthroughResetResponse } from "./passthrough-completion";
|
|
178
185
|
|
|
179
186
|
/** Transfer an uncommitted Copilot exchange to the existing translated pipeline without new admission. */
|
|
180
187
|
export interface PassthroughAdapterHandoff { kind: "adapter-handoff" }
|
|
@@ -426,7 +433,8 @@ export async function preparePassthroughExchange(
|
|
|
426
433
|
// `{model, input, stream}` with no tools and Copilot answers with a `custom_tool_call` for
|
|
427
434
|
// `apply_patch`. Policing an absent catalog truncates that turn. An unreadable body lands there
|
|
428
435
|
// too because the proxy cannot establish the caller's declared authorization boundary.
|
|
429
|
-
|
|
436
|
+
// #8601: only the outbound body's tool scope (outbound-request-body.ts) stays with the turn, never a parsed copy of it.
|
|
437
|
+
let outboundRequestScope: Record<string, unknown> | undefined;
|
|
430
438
|
const declaredWireToolNames = new Set<string>();
|
|
431
439
|
const declaredBareWireToolNames = new Set<string>();
|
|
432
440
|
const declaredNamelessClientCallTypes = new Set<string>();
|
|
@@ -437,22 +445,12 @@ export async function preparePassthroughExchange(
|
|
|
437
445
|
// checks. `exec` uses separate handling: its bridge alias is copied into the declared set only
|
|
438
446
|
// when the client itself declared bare `exec`, because otherwise code-mode normalization could
|
|
439
447
|
// authorize the unrelated code-mode helper names.
|
|
440
|
-
const authorizedBareNamespaceToolAliases
|
|
441
|
-
[...toolBridgeMaps.toolNsMap].flatMap(([alias, identity]) =>
|
|
442
|
-
alias === identity.name
|
|
443
|
-
? [[alias, {
|
|
444
|
-
namespace: identity.namespace,
|
|
445
|
-
name: identity.name,
|
|
446
|
-
kind: identity.freeform ? "custom" as const : "function" as const,
|
|
447
|
-
}] as const]
|
|
448
|
-
: []
|
|
449
|
-
),
|
|
450
|
-
);
|
|
448
|
+
const authorizedBareNamespaceToolAliases = authorizedBareNamespaceAliases(toolBridgeMaps.toolNsMap);
|
|
451
449
|
const restoreAuthorizedBareNamespaceToolCalls = (value: unknown): unknown =>
|
|
452
450
|
restoreRoutedNamespaceCalls(value, authorizedBareNamespaceToolAliases).value;
|
|
453
451
|
const normalizeFunctionCompletionJson = (text: string): string => {
|
|
454
452
|
const snapshot = hasResponsesSnapshotRepair(route.provider.responsesSnapshotRepair)
|
|
455
|
-
? repairResponsesSnapshotJson(text,
|
|
453
|
+
? repairResponsesSnapshotJson(text, outboundRequestScope)
|
|
456
454
|
: text;
|
|
457
455
|
// Sparse gateways need completion status inferred before schema repair can
|
|
458
456
|
// distinguish completed arguments from in-progress placeholders.
|
|
@@ -460,7 +458,8 @@ export async function preparePassthroughExchange(
|
|
|
460
458
|
};
|
|
461
459
|
let undeclaredToolGuardActive = false;
|
|
462
460
|
const refreshUndeclaredToolGuard = (builtRequest: AdapterRequest): void => {
|
|
463
|
-
outboundRequestBody = parseOutboundRequestBody(builtRequest.body);
|
|
461
|
+
const outboundRequestBody = parseOutboundRequestBody(builtRequest.body);
|
|
462
|
+
outboundRequestScope = outboundToolScope(outboundRequestBody);
|
|
464
463
|
providerExecutedCallTypes.clear();
|
|
465
464
|
if (isXaiResponsesDestination(route.provider)) {
|
|
466
465
|
// Preserve the caller-declared authorization recognized by the original classifier, then
|
|
@@ -545,7 +544,6 @@ export async function preparePassthroughExchange(
|
|
|
545
544
|
// untouched upstream stream, so it can still observe a `response.completed` the client never
|
|
546
545
|
// received; checking the payload itself rather than a flag shared with the client relay keeps
|
|
547
546
|
// this free of tee ordering races.
|
|
548
|
-
//
|
|
549
547
|
// Checking only the terminal snapshot is not enough. An upstream can announce the undeclared
|
|
550
548
|
// call in `response.output_item.added`, which trips the client guard, and then close with a
|
|
551
549
|
// `response.completed` whose `output` is empty. The client gets `response.failed`, the terminal
|
|
@@ -555,12 +553,13 @@ export async function preparePassthroughExchange(
|
|
|
555
553
|
let inspectedTerminal: ResponsesTerminalStatus | null = null;
|
|
556
554
|
let inspectedCompletionSeen = false;
|
|
557
555
|
let firstTerminalAllowsRecall = false;
|
|
556
|
+
const inspectedTerminalStatus = createTerminalStatusTracker();
|
|
558
557
|
const passiveQuotaObserved = hasPassiveAccountQuota(route.providerName)
|
|
559
558
|
&& route.provider.authMode === "oauth";
|
|
560
559
|
const noteInspectedPayload = (payload: unknown) => {
|
|
561
560
|
// First terminal stays authoritative even in metadata-only inspection, which
|
|
562
561
|
// intentionally continues parsing after a failed/incomplete terminal.
|
|
563
|
-
const terminal =
|
|
562
|
+
const terminal = inspectedTerminalStatus(payload);
|
|
564
563
|
if (inspectedTerminal === null && terminal !== null) {
|
|
565
564
|
inspectedTerminal = terminal;
|
|
566
565
|
// The client boundary accepts a terminal by event type, even without a
|
|
@@ -763,16 +762,15 @@ export async function preparePassthroughExchange(
|
|
|
763
762
|
);
|
|
764
763
|
const configuredTransientSendBudgetExhausted = (): boolean =>
|
|
765
764
|
transientSendPolicy() !== null && transientSendAttempts() === 0;
|
|
766
|
-
|
|
767
|
-
|
|
768
|
-
|
|
769
|
-
|
|
770
|
-
|
|
771
|
-
|
|
772
|
-
|
|
773
|
-
|
|
774
|
-
const
|
|
775
|
-
selfContainedJudgment ??= selfContainedResponsesBody(nativePassthroughReplayJudgmentBody(parsed));
|
|
765
|
+
// Judged once on the inbound body and once per send on the body that physically leaves; the
|
|
766
|
+
// split and its reasons live in the sibling module.
|
|
767
|
+
const replayGuard = createNativeReplayGuard({
|
|
768
|
+
providerExecuted: () => isXaiResponsesDestination(route.provider)
|
|
769
|
+
&& collectProviderExecutedCallTypes(clientToolAuthorizationBody).size > 0,
|
|
770
|
+
parsed,
|
|
771
|
+
currentRequest: () => request,
|
|
772
|
+
});
|
|
773
|
+
const recordPhysicalSend = replayGuard.sendHandler;
|
|
776
774
|
/**
|
|
777
775
|
* The operator's replacement grant for THIS logical request.
|
|
778
776
|
*
|
|
@@ -782,7 +780,7 @@ export async function preparePassthroughExchange(
|
|
|
782
780
|
* child shares, so every ambiguous stage of this request draws on the same grant.
|
|
783
781
|
*/
|
|
784
782
|
const ambiguousResend = () =>
|
|
785
|
-
ambiguousResendAllowanceFor(route.provider,
|
|
783
|
+
ambiguousResendAllowanceFor(route.provider, replayGuard.isSelfContained, claimAmbiguousResend);
|
|
786
784
|
const authorizeAmbiguousResend = ambiguousResendAuthorizer(ambiguousResend, () => safeHostLabel(request.url));
|
|
787
785
|
/**
|
|
788
786
|
* The pre-header row of the stage table, asked through the one gate.
|
|
@@ -791,7 +789,12 @@ export async function preparePassthroughExchange(
|
|
|
791
789
|
* the server tree; routing the answer through `authorizeResendForRecovery` here is what
|
|
792
790
|
* keeps the decision derived from the table rather than restated as a boolean.
|
|
793
791
|
*/
|
|
794
|
-
const
|
|
792
|
+
const claimRecoveryResend = (stage: RequestFailureStage): boolean => {
|
|
793
|
+
const allowed = authorizeAmbiguousResend(stage);
|
|
794
|
+
if (allowed) replayGuard.authorize();
|
|
795
|
+
return allowed;
|
|
796
|
+
};
|
|
797
|
+
const claimPreHeaderResend = (): boolean => claimRecoveryResend("pre-header");
|
|
795
798
|
/**
|
|
796
799
|
* The one replacement send the ambiguous rows at the end of the recovery loop may buy: an SSE
|
|
797
800
|
* body that died before any output, and a Codex WebSocket that died under its create frame
|
|
@@ -827,7 +830,12 @@ export async function preparePassthroughExchange(
|
|
|
827
830
|
providerName: route.providerName,
|
|
828
831
|
modelId: route.modelId,
|
|
829
832
|
dispatchOverride: oauthDispatch(request, parsed, "passthrough"),
|
|
830
|
-
onPhysicalDispatch:
|
|
833
|
+
onPhysicalDispatch: recordPhysicalSend(() => {
|
|
834
|
+
transportState.noteRoutedAttemptSend(passthroughEstimate, "connection-reset");
|
|
835
|
+
if (accounting.onPhysicalDispatch) accounting.onPhysicalDispatch();
|
|
836
|
+
else if (report.beforeSend?.() === false) throw new SendBudgetExhaustedError(errorDestinationLabel(request.url));
|
|
837
|
+
started = true;
|
|
838
|
+
}),
|
|
831
839
|
beforeDispatch: headers => {
|
|
832
840
|
if (signal.aborted) throw signal.reason;
|
|
833
841
|
if (!transportState.selectionIsCurrent(transportState.requestBindings.get(request))) {
|
|
@@ -842,16 +850,6 @@ export async function preparePassthroughExchange(
|
|
|
842
850
|
options.visionDescribeTerminal === true,
|
|
843
851
|
)?.(headers);
|
|
844
852
|
}
|
|
845
|
-
// Recorded with the kind the gate derived its cause from, at the moment the
|
|
846
|
-
// send actually leaves. One authorisation, one recorded reason, one send.
|
|
847
|
-
transportState.noteRoutedAttemptSend(passthroughEstimate, "connection-reset");
|
|
848
|
-
// Charged to the SAME request counter every other send goes through. The
|
|
849
|
-
// replacement is bought here rather than by a nested retry helper, so there is
|
|
850
|
-
// one charge for one send and no per-layer counter to reconcile.
|
|
851
|
-
if (!accounting.onPhysicalDispatch) {
|
|
852
|
-
if (report.beforeSend?.() === false) throw new SendBudgetExhaustedError(errorDestinationLabel(request.url));
|
|
853
|
-
started = true;
|
|
854
|
-
}
|
|
855
853
|
},
|
|
856
854
|
}),
|
|
857
855
|
route.provider.authMode === "forward",
|
|
@@ -912,10 +910,9 @@ export async function preparePassthroughExchange(
|
|
|
912
910
|
return clientCancelledResponse();
|
|
913
911
|
}
|
|
914
912
|
if (lastDistributedResponse) recordDistributedResponseFailure(lastDistributedResponse, config, route.providerName, options.abortSignal);
|
|
915
|
-
// A budget refusal is a
|
|
916
|
-
// 502 upstream_error would blame the provider for a limit this process applied, and
|
|
917
|
-
// would record a fake reachability failure against the account's health.
|
|
913
|
+
// A budget refusal is local; a 502 would falsely record an account reachability failure.
|
|
918
914
|
if (err instanceof SendBudgetExhaustedError) {
|
|
915
|
+
logCtx.terminalSource = "synthetic";
|
|
919
916
|
releaseUpstreamHostAdmission(nativeHostState.lease);
|
|
920
917
|
nativeHostState.lease = null;
|
|
921
918
|
releaseCodexAuthContextProbeLease(admissionState.authCtx);
|
|
@@ -927,12 +924,13 @@ export async function preparePassthroughExchange(
|
|
|
927
924
|
bindRefreshedAdapter(refusal.adapter);
|
|
928
925
|
return handoffToChat(refusal.adapter);
|
|
929
926
|
}
|
|
930
|
-
const
|
|
931
|
-
if (
|
|
932
|
-
|
|
933
|
-
|
|
927
|
+
const pacingRefusal = requestPacingOverloadResponse(refusal);
|
|
928
|
+
if (pacingRefusal) logCtx.terminalSource = "synthetic";
|
|
929
|
+
const localDispatchRefusal = pacingRefusal ?? copilotRefusalResponse(refusal);
|
|
930
|
+
if (localDispatchRefusal) {
|
|
931
|
+
releaseUpstreamHostAdmission(nativeHostState.lease); nativeHostState.lease = null;
|
|
934
932
|
releaseCodexAuthContextProbeLease(admissionState.authCtx);
|
|
935
|
-
return
|
|
933
|
+
return localDispatchRefusal;
|
|
936
934
|
}
|
|
937
935
|
// Pacing may outlive the selected account's admission. No fetch occurred, so do
|
|
938
936
|
// not turn an operator pause into a 502 or charge it to host/account health.
|
|
@@ -1031,7 +1029,7 @@ export async function preparePassthroughExchange(
|
|
|
1031
1029
|
dispatchOverride: oauthDispatch(request, parsed, "passthrough"),
|
|
1032
1030
|
providerName: route.providerName,
|
|
1033
1031
|
modelId: route.modelId,
|
|
1034
|
-
onPhysicalDispatch: receiptMode ? sendBudgetState.noteInitialDispatch : initialAccounting.onPhysicalDispatch,
|
|
1032
|
+
onPhysicalDispatch: recordPhysicalSend(receiptMode ? sendBudgetState.noteInitialDispatch : initialAccounting.onPhysicalDispatch),
|
|
1035
1033
|
onContinuationDispatch,
|
|
1036
1034
|
accountAutoPause: (name, provider, headers) => captureAccountAutoPauseAttempt(name, provider, { config, codex: admissionState.authCtx }, headers),
|
|
1037
1035
|
onCodexWsQuota: codexWsQuotaObserver(admissionState.authCtx, route.provider, route.modelId),
|
|
@@ -1050,6 +1048,8 @@ export async function preparePassthroughExchange(
|
|
|
1050
1048
|
// by `onPhysicalDispatch`; a reporter as well would count them twice.
|
|
1051
1049
|
...(receiptMode ? {} : { onSendsConsumed: initialAccounting.report }),
|
|
1052
1050
|
claimAmbiguousResend: claimPreHeaderResend,
|
|
1051
|
+
// A combo fails over to another member instead of waiting once per target.
|
|
1052
|
+
offlineWait: options.comboAttempt ? undefined : createProviderOfflineResendWait(route.providerName, route.provider, request.url, config.offlineResendWaitSec),
|
|
1053
1053
|
},
|
|
1054
1054
|
);
|
|
1055
1055
|
} catch (err) {
|
|
@@ -1170,7 +1170,7 @@ export async function preparePassthroughExchange(
|
|
|
1170
1170
|
&& responseEffects.plaintextV2AgentMessageToolNames.size === 0
|
|
1171
1171
|
? options.nativeControl : undefined,
|
|
1172
1172
|
dispatchOverride: oauthDispatch(request, parsed, "passthrough"),
|
|
1173
|
-
onPhysicalDispatch: recoveryAccounting.onPhysicalDispatch,
|
|
1173
|
+
onPhysicalDispatch: recordPhysicalSend(recoveryAccounting.onPhysicalDispatch),
|
|
1174
1174
|
providerName: route.providerName,
|
|
1175
1175
|
modelId: route.modelId,
|
|
1176
1176
|
onContinuationDispatch,
|
|
@@ -1208,7 +1208,6 @@ export async function preparePassthroughExchange(
|
|
|
1208
1208
|
upstreamResponse = recovered; continue passthroughRecovery;
|
|
1209
1209
|
}
|
|
1210
1210
|
|
|
1211
|
-
|
|
1212
1211
|
if (
|
|
1213
1212
|
upstreamResponse.status === 401 && !wasPermanentAccountRefusal(upstreamResponse)
|
|
1214
1213
|
&& (admissionState.authCtx.kind === "main-pool" || admissionState.authCtx.kind === "pool")
|
|
@@ -1291,6 +1290,7 @@ export async function preparePassthroughExchange(
|
|
|
1291
1290
|
&& responseEffects.plaintextV2AgentMessageToolNames.size === 0
|
|
1292
1291
|
? options.nativeControl : undefined,
|
|
1293
1292
|
dispatchOverride: oauthDispatch(request, parsed, "passthrough"),
|
|
1293
|
+
onPhysicalDispatch: recordPhysicalSend(),
|
|
1294
1294
|
providerName: route.providerName,
|
|
1295
1295
|
modelId: route.modelId,
|
|
1296
1296
|
onContinuationDispatch,
|
|
@@ -1440,7 +1440,7 @@ export async function preparePassthroughExchange(
|
|
|
1440
1440
|
&& responseEffects.plaintextV2AgentMessageToolNames.size === 0
|
|
1441
1441
|
? options.nativeControl : undefined,
|
|
1442
1442
|
dispatchOverride: oauthDispatch(request, parsed, "passthrough"),
|
|
1443
|
-
onPhysicalDispatch: oauthReplayAccounting.onPhysicalDispatch,
|
|
1443
|
+
onPhysicalDispatch: recordPhysicalSend(oauthReplayAccounting.onPhysicalDispatch),
|
|
1444
1444
|
providerName: route.providerName,
|
|
1445
1445
|
modelId: route.modelId,
|
|
1446
1446
|
onContinuationDispatch,
|
|
@@ -1544,7 +1544,7 @@ export async function preparePassthroughExchange(
|
|
|
1544
1544
|
while (
|
|
1545
1545
|
upstreamResponse.status === 429
|
|
1546
1546
|
&& !isNonReplayableResponse(upstreamResponse)
|
|
1547
|
-
&& rateLimitPolicy !== null
|
|
1547
|
+
&& rateLimitPolicy !== null && providerAffinityGenerationIsCurrent(config, route.providerName, route.provider)
|
|
1548
1548
|
&& rateLimitRetries < rateLimitPolicy.attempts
|
|
1549
1549
|
// Checked here rather than inside the helper: prepareSameTarget429Wait releases the 429
|
|
1550
1550
|
// body, so a refusal discovered after the wait can no longer return the real rate-limit
|
|
@@ -1590,7 +1590,7 @@ export async function preparePassthroughExchange(
|
|
|
1590
1590
|
&& responseEffects.plaintextV2AgentMessageToolNames.size === 0
|
|
1591
1591
|
? options.nativeControl : undefined,
|
|
1592
1592
|
dispatchOverride: oauthDispatch(request, parsed, "passthrough"),
|
|
1593
|
-
onPhysicalDispatch: failoverAccounting.onPhysicalDispatch,
|
|
1593
|
+
onPhysicalDispatch: recordPhysicalSend(failoverAccounting.onPhysicalDispatch),
|
|
1594
1594
|
providerName: route.providerName,
|
|
1595
1595
|
modelId: route.modelId,
|
|
1596
1596
|
onContinuationDispatch,
|
|
@@ -1698,6 +1698,7 @@ export async function preparePassthroughExchange(
|
|
|
1698
1698
|
stream: upstreamRequestsStream,
|
|
1699
1699
|
httpOnly: canonicalBufferedJson,
|
|
1700
1700
|
preOutputRefusalHold: preOutputRefusalHold(),
|
|
1701
|
+
onPhysicalSend: replayGuard.record,
|
|
1701
1702
|
onResponse: (response, retryAuthCtx, retryRequest) => {
|
|
1702
1703
|
adoptCodexWsStage(response, logCtx);
|
|
1703
1704
|
captureAffinityResponse(
|
|
@@ -1862,17 +1863,18 @@ export async function preparePassthroughExchange(
|
|
|
1862
1863
|
// Asked before the gate, which claims last: a replacement the budget cannot fund must not
|
|
1863
1864
|
// spend the request's one grant.
|
|
1864
1865
|
&& remainingTransientSendBudget(transientSendAttempts()) > 0
|
|
1865
|
-
&&
|
|
1866
|
+
&& claimRecoveryResend(socketDeathStage)
|
|
1866
1867
|
) {
|
|
1867
|
-
try { void upstreamResponse.body?.cancel().catch(() => {}); } catch { /* already consumed/closed */ }
|
|
1868
1868
|
console.warn(`[upstream-retry] codex websocket died before any Responses event (${safeHostLabel(request.url)}); `
|
|
1869
1869
|
+ "using one replacement over HTTP");
|
|
1870
1870
|
let replacement: Response | undefined;
|
|
1871
|
+
let unsafeReplacement = false;
|
|
1871
1872
|
while (!replacement) {
|
|
1872
1873
|
try {
|
|
1873
1874
|
replacement = await sendAmbiguousReplacement().then(adoptObservedResponse);
|
|
1874
1875
|
} catch (err) {
|
|
1875
1876
|
if (upstream.signal.aborted) return transportFailureResponse(err);
|
|
1877
|
+
if (err instanceof UnsafePhysicalReplacement) { unsafeReplacement = true; break; }
|
|
1876
1878
|
// A replacement that reset before its head is the pre-header row again: a configured
|
|
1877
1879
|
// second grant (and a send the budget can still fund) may buy one more send. The gate
|
|
1878
1880
|
// claims from the request's finite allowance, so this loop is bounded by it.
|
|
@@ -1886,6 +1888,8 @@ export async function preparePassthroughExchange(
|
|
|
1886
1888
|
}
|
|
1887
1889
|
// The first send may already have run the turn, so a replacement that failed settles as
|
|
1888
1890
|
// the refusal rather than as a transport error the client would retry.
|
|
1891
|
+
if (unsafeReplacement) break passthroughRecovery;
|
|
1892
|
+
try { void upstreamResponse.body?.cancel().catch(() => {}); } catch { /* already consumed/closed */ }
|
|
1889
1893
|
upstreamResponse = replacement ? settleOperatorReplacement(replacement) : replayRefusalResponse();
|
|
1890
1894
|
continue passthroughRecovery;
|
|
1891
1895
|
}
|
|
@@ -1905,32 +1909,32 @@ export async function preparePassthroughExchange(
|
|
|
1905
1909
|
// This preflight retains that event until output commits, so the two contracts cannot
|
|
1906
1910
|
// share one body owner.
|
|
1907
1911
|
&& !(options.nativeControl && options.inboundTransport === "websocket")
|
|
1908
|
-
|
|
1912
|
+
// Only a self-contained request can be replaced; any other preflight only delays its head.
|
|
1913
|
+
&& ambiguousResend()?.selfContained === true
|
|
1909
1914
|
&& remainingTransientSendBudget(transientSendAttempts()) > 0
|
|
1910
1915
|
&& (streamRecoveryContentType.includes("text/event-stream") || (!streamRecoveryContentType && upstreamRequestsStream));
|
|
1911
1916
|
if (protocolRecoveryCandidate) {
|
|
1912
|
-
|
|
1913
|
-
|
|
1917
|
+
// Selection may publish the replacement's own head until one is committed; see the helper.
|
|
1918
|
+
upstreamResponse = await selectPassthroughResetResponse(
|
|
1919
|
+
upstreamResponse, admissionState,
|
|
1914
1920
|
{ model: logCtx.model, provider: logCtx.provider },
|
|
1915
|
-
(error, stage) => refetchAfterProtocolSafeReset(
|
|
1921
|
+
(error, stage, signal, accepts) => refetchAfterProtocolSafeReset(
|
|
1916
1922
|
(signal = upstream.signal) => sendAmbiguousReplacement(signal).then(adoptObservedResponse),
|
|
1917
1923
|
error,
|
|
1918
1924
|
{
|
|
1919
|
-
abortSignal: upstream.signal,
|
|
1925
|
+
abortSignal: AbortSignal.any([upstream.signal, signal]),
|
|
1920
1926
|
label: safeHostLabel(request.url), destination: errorDestinationLabel(request.url),
|
|
1921
1927
|
attempts: remainingTransientSendBudget(transientSendAttempts()),
|
|
1922
1928
|
// The whole decision, including the stage the preflight observed and the grant the
|
|
1923
1929
|
// pre-header helper shares. A committed stage refuses here without touching the
|
|
1924
1930
|
// allowance, which is what keeps a turn that already emitted output from draining
|
|
1925
1931
|
// the replacement a later ambiguous reset would have been entitled to.
|
|
1926
|
-
authorize: () =>
|
|
1927
|
-
acceptResponse: candidate =>
|
|
1928
|
-
const type = candidate.headers.get("content-type")?.toLowerCase() ?? "";
|
|
1929
|
-
return type.includes("text/event-stream") || (!type && upstreamRequestsStream);
|
|
1930
|
-
},
|
|
1932
|
+
authorize: () => claimRecoveryResend(stage),
|
|
1933
|
+
acceptResponse: candidate => accepts(candidate) && isResetReplacementStream(candidate, upstreamRequestsStream),
|
|
1931
1934
|
},
|
|
1932
1935
|
),
|
|
1933
|
-
{ allowMissingContentType: !streamRecoveryContentType && upstreamRequestsStream
|
|
1936
|
+
{ request, config, signal: upstream.signal, allowMissingContentType: !streamRecoveryContentType && upstreamRequestsStream,
|
|
1937
|
+
delivery: canonicalBufferedJson ? "buffered-json" : options.comboAttempt ? "combo-child" : "direct-stream" },
|
|
1934
1938
|
);
|
|
1935
1939
|
}
|
|
1936
1940
|
break;
|
|
@@ -1961,10 +1965,10 @@ export async function preparePassthroughExchange(
|
|
|
1961
1965
|
},
|
|
1962
1966
|
functionRepairSchemas,
|
|
1963
1967
|
get outboundRequestBody(): Record<string, unknown> | undefined {
|
|
1964
|
-
return
|
|
1968
|
+
return outboundRequestScope;
|
|
1965
1969
|
},
|
|
1966
1970
|
set outboundRequestBody(value: Record<string, unknown> | undefined) {
|
|
1967
|
-
|
|
1971
|
+
outboundRequestScope = outboundToolScope(value);
|
|
1968
1972
|
},
|
|
1969
1973
|
declaredWireToolNames,
|
|
1970
1974
|
declaredBareWireToolNames,
|