@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
|
@@ -0,0 +1,115 @@
|
|
|
1
|
+
import { estimateTokens } from "../../lib/token-estimate";
|
|
2
|
+
import type { SsePayloadRewrite } from "../sse-payload-rewrite";
|
|
3
|
+
import type { HandleResponsesOptions } from "./core-options";
|
|
4
|
+
import type { OcxProviderConfig } from "../../types";
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* Response header marking estimated usage (#7427). `true`: the JSON body's usage is an estimate.
|
|
8
|
+
* `when-missing`: the stream's usage is estimated wherever the provider omitted it.
|
|
9
|
+
*/
|
|
10
|
+
export const ESTIMATED_USAGE_HEADER = "x-opencodex-usage-estimated";
|
|
11
|
+
|
|
12
|
+
/** Terminal events whose `response.usage` a client reads for context accounting. */
|
|
13
|
+
const TERMINAL_TYPES = new Set(["response.completed", "response.incomplete"]);
|
|
14
|
+
/** Response statuses that end a turn with output a client counts; failed and running ones do not. */
|
|
15
|
+
const TERMINAL_STATUSES = new Set(["completed", "incomplete"]);
|
|
16
|
+
|
|
17
|
+
/**
|
|
18
|
+
* Whether this turn may carry an estimate: the provider opted in, and the client spoke HTTP
|
|
19
|
+
* Responses. The Chat Completions and Claude Messages bridges and the WebSocket ingress rebuild
|
|
20
|
+
* their own usage fields from the response and would pass an estimate on without the marker, so
|
|
21
|
+
* they never get one. An internal decision call (JEV) settles spend from its response body, so it
|
|
22
|
+
* never gets one either.
|
|
23
|
+
*/
|
|
24
|
+
export function estimatesMissingUsage(
|
|
25
|
+
provider: Pick<OcxProviderConfig, "estimateMissingUsage">,
|
|
26
|
+
options: Pick<HandleResponsesOptions, "inboundWire" | "inboundTransport" | "internalDecisionCall">,
|
|
27
|
+
): boolean {
|
|
28
|
+
return provider.estimateMissingUsage === true
|
|
29
|
+
&& (options.inboundWire ?? "responses") === "responses"
|
|
30
|
+
&& options.inboundTransport !== "websocket"
|
|
31
|
+
&& options.internalDecisionCall !== true;
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
function isRecord(value: unknown): value is Record<string, unknown> {
|
|
35
|
+
return value !== null && typeof value === "object" && !Array.isArray(value);
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
/** Text a model produced in a Responses `output` array: messages, refusals, tool input, summaries. */
|
|
39
|
+
function outputText(output: unknown): string {
|
|
40
|
+
if (!Array.isArray(output)) return "";
|
|
41
|
+
const parts: string[] = [];
|
|
42
|
+
for (const item of output) {
|
|
43
|
+
if (!isRecord(item)) continue;
|
|
44
|
+
for (const field of ["arguments", "input", "name"] as const) {
|
|
45
|
+
if (typeof item[field] === "string") parts.push(item[field] as string);
|
|
46
|
+
}
|
|
47
|
+
for (const list of [item.content, item.summary]) {
|
|
48
|
+
if (!Array.isArray(list)) continue;
|
|
49
|
+
for (const part of list) {
|
|
50
|
+
if (!isRecord(part)) continue;
|
|
51
|
+
if (typeof part.text === "string") parts.push(part.text);
|
|
52
|
+
if (typeof part.refusal === "string") parts.push(part.refusal);
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
return parts.join("\n");
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
/**
|
|
60
|
+
* The response with an estimated `usage` when the provider sent none, or `undefined` when it has
|
|
61
|
+
* usage already or is not a response object. Input comes from the request estimate, output from
|
|
62
|
+
* the response's own output items. A client's context meter reads it; OpenCodex's cost, spend and
|
|
63
|
+
* quota accounting never does, because they read the provider's original body.
|
|
64
|
+
*/
|
|
65
|
+
export function withEstimatedUsage(
|
|
66
|
+
response: unknown, inputTokens: number, modelId: string, streamedOutputTokens?: number,
|
|
67
|
+
): Record<string, unknown> | undefined {
|
|
68
|
+
// Only a finished Responses object with output; error bodies, failed turns and partial events
|
|
69
|
+
// are left alone even when they arrive with HTTP 200.
|
|
70
|
+
if (!isRecord(response) || isRecord(response.usage) || !Array.isArray(response.output)) return undefined;
|
|
71
|
+
if (typeof response.status !== "string" || !TERMINAL_STATUSES.has(response.status)) return undefined;
|
|
72
|
+
if (response.error !== undefined && response.error !== null) return undefined;
|
|
73
|
+
const input = Math.max(0, Math.round(inputTokens));
|
|
74
|
+
// A terminal that closes with an empty list counts the items streamed before it instead.
|
|
75
|
+
const output = response.output.length === 0 && streamedOutputTokens !== undefined
|
|
76
|
+
? streamedOutputTokens
|
|
77
|
+
: estimateTokens(outputText(response.output), modelId);
|
|
78
|
+
return { ...response, usage: { input_tokens: input, output_tokens: output, total_tokens: input + output } };
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
/**
|
|
82
|
+
* SSE payload rewrite for opted-in native routes; `onApplied` fires once per estimated terminal.
|
|
83
|
+
* Each `response.output_item.done` adds its estimate to one running count, so a terminal whose
|
|
84
|
+
* `output` is empty is still estimated without the stream retaining any item.
|
|
85
|
+
*/
|
|
86
|
+
export function createEstimatedUsagePayloadRewrite(
|
|
87
|
+
inputTokens: () => number, modelId: string, onApplied?: () => void,
|
|
88
|
+
): SsePayloadRewrite {
|
|
89
|
+
let streamedOutputTokens = 0;
|
|
90
|
+
return payload => {
|
|
91
|
+
// Cheap gate: only finished items and terminal events are parsed, never every delta.
|
|
92
|
+
const itemDone = payload.includes("response.output_item.done");
|
|
93
|
+
if (!itemDone && !payload.includes("response.completed") && !payload.includes("response.incomplete")) return payload;
|
|
94
|
+
let parsed: unknown;
|
|
95
|
+
try { parsed = JSON.parse(payload); } catch { return payload; }
|
|
96
|
+
if (!isRecord(parsed) || typeof parsed.type !== "string") return payload;
|
|
97
|
+
if (parsed.type === "response.output_item.done") {
|
|
98
|
+
streamedOutputTokens += estimateTokens(outputText([parsed.item]), modelId);
|
|
99
|
+
return payload;
|
|
100
|
+
}
|
|
101
|
+
if (!TERMINAL_TYPES.has(parsed.type)) return payload;
|
|
102
|
+
const response = withEstimatedUsage(parsed.response, inputTokens(), modelId, streamedOutputTokens);
|
|
103
|
+
if (!response) return payload;
|
|
104
|
+
onApplied?.();
|
|
105
|
+
return JSON.stringify({ ...parsed, response });
|
|
106
|
+
};
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
/** The JSON body with estimated usage, or `undefined` when it already had usage or is not JSON. */
|
|
110
|
+
export function estimatedUsageJson(json: string, inputTokens: number, modelId: string): string | undefined {
|
|
111
|
+
let parsed: unknown;
|
|
112
|
+
try { parsed = JSON.parse(json); } catch { return undefined; }
|
|
113
|
+
const response = withEstimatedUsage(parsed, inputTokens, modelId);
|
|
114
|
+
return response ? JSON.stringify(response) : undefined;
|
|
115
|
+
}
|
|
@@ -19,6 +19,7 @@ import {
|
|
|
19
19
|
} from "../../providers/request-pacing";
|
|
20
20
|
import { withUpstreamHttpVersion } from "../../lib/upstream-http-version";
|
|
21
21
|
import { providerTlsFetch } from "../../lib/provider-tls-profile";
|
|
22
|
+
import { inheritPassiveKeyProof, markPassiveKeyTransparent } from "../../lib/passive-key-fetch-proof";
|
|
22
23
|
import type { CodexWsQuotaObserver } from "./codex-ws-metadata";
|
|
23
24
|
import { configuredOutboundFetch } from "../../lib/proxy-env";
|
|
24
25
|
import { isLoopbackUrl, rewriteUpstream } from "../../plugins/upstream-hooks";
|
|
@@ -59,12 +60,14 @@ export type AccountAutoPauseObserver = ((response: Response) => Promise<Response
|
|
|
59
60
|
physical?: (sameDestination: boolean, headers: Headers) => void;
|
|
60
61
|
};
|
|
61
62
|
/** Init fragment that reports the final send of the observer's attempt; empty when nothing observes. */
|
|
62
|
-
export function physicalSendObserverInit(observer: AccountAutoPauseObserver | undefined, target: string, onPhysicalSend?: () => void
|
|
63
|
+
export function physicalSendObserverInit(observer: AccountAutoPauseObserver | undefined, target: string, onPhysicalSend?: () => void,
|
|
64
|
+
onFinalSend?: (sameDestination: boolean, headers: Headers) => void): Record<symbol, unknown> {
|
|
63
65
|
const physical = observer?.physical;
|
|
64
66
|
let noted = false;
|
|
65
|
-
return physical || onPhysicalSend ? { [PHYSICAL_SEND_OBSERVER]: (destination: string, headers: Headers) => {
|
|
67
|
+
return physical || onPhysicalSend || onFinalSend ? { [PHYSICAL_SEND_OBSERVER]: (destination: string, headers: Headers) => {
|
|
66
68
|
if (onPhysicalSend && !noted) { onPhysicalSend(); noted = true; }
|
|
67
69
|
physical?.(destination === target, headers);
|
|
70
|
+
onFinalSend?.(destination === target, headers);
|
|
68
71
|
} } : {};
|
|
69
72
|
}
|
|
70
73
|
export function physicalSendGuardInit(guard: (destination: string, headers: Headers) => void): Record<symbol, unknown> {
|
|
@@ -239,7 +242,7 @@ export function sendWithConnectionPolicy(
|
|
|
239
242
|
&& isCanonicalCodexResponsesUrl(target)
|
|
240
243
|
&& Buffer.byteLength(body, "utf8") >= 1024 * 1024;
|
|
241
244
|
(init as Record<symbol, ((destination: string, headers: Headers) => void) | undefined> | undefined)?.[PHYSICAL_SEND_GUARD]?.(target, headers);
|
|
242
|
-
(init as Record<symbol, (() => void) | undefined> | undefined)?.[PHYSICAL_DISPATCH]?.();
|
|
245
|
+
(init as Record<symbol, ((body: BodyInit | null | undefined) => void) | undefined> | undefined)?.[PHYSICAL_DISPATCH]?.(body);
|
|
243
246
|
(init as Record<symbol, ((destination: string, headers: Headers) => void) | undefined> | undefined)?.[PHYSICAL_SEND_OBSERVER]?.(target, headers);
|
|
244
247
|
// Final headers, after plugin rewrites: an upstream can only echo what it received here, so the
|
|
245
248
|
// request log refuses any diagnostic that repeats one of these values (see request-log-terminal-status).
|
|
@@ -293,7 +296,7 @@ export interface ProviderFetchOptions {
|
|
|
293
296
|
/** Synchronous admission at actual credential dispatch, after pacing/backoff. */
|
|
294
297
|
beforeDispatch?: (headers: Headers) => void;
|
|
295
298
|
/** One-shot receipt after final local HTTP admission, immediately before executor entry. */
|
|
296
|
-
onPhysicalDispatch?: () => void;
|
|
299
|
+
onPhysicalDispatch?: (body?: BodyInit | null) => void;
|
|
297
300
|
/** Repeatable admission for native successor creates, after pacing and auth checks. */
|
|
298
301
|
onContinuationDispatch?: (frame: { body: Record<string, unknown>; text: string }) => void;
|
|
299
302
|
/**
|
|
@@ -332,6 +335,7 @@ export function providerFetch(
|
|
|
332
335
|
(input: Parameters<typeof globalThis.fetch>[0], init?: RequestInit) => configuredOutboundFetch(input, init),
|
|
333
336
|
{ preconnect: globalThis.fetch.preconnect?.bind(globalThis.fetch) },
|
|
334
337
|
) as typeof globalThis.fetch);
|
|
338
|
+
markPassiveKeyTransparent(configuredFetch);
|
|
335
339
|
const base = customExecutor ?? configuredFetch;
|
|
336
340
|
const transport = options.providerName ? providerTlsFetch(options.providerName, provider, base) : base;
|
|
337
341
|
const preconnect = (...args: Parameters<typeof globalThis.fetch.preconnect>): void => {
|
|
@@ -352,6 +356,7 @@ export function providerFetch(
|
|
|
352
356
|
sendWithConnectionPolicy(transport, input, init, egressBinding),
|
|
353
357
|
{ preconnect },
|
|
354
358
|
) as typeof globalThis.fetch);
|
|
359
|
+
inheritPassiveKeyProof(dispatch, transport);
|
|
355
360
|
const httpFetch = Object.assign(
|
|
356
361
|
async (input: Parameters<typeof globalThis.fetch>[0], init?: RequestInit,
|
|
357
362
|
reacquirePacing?: (provider: OcxProviderConfig, modelId?: string) => Promise<void>,
|
|
@@ -375,12 +380,12 @@ export function providerFetch(
|
|
|
375
380
|
options.beforeDispatch?.(new Headers(init?.headers ?? (input instanceof Request ? input.headers : undefined)));
|
|
376
381
|
// No proxy option is attached here: a `dispatchOverride` may rebuild this request against
|
|
377
382
|
// a different destination, so the route is decided at the physical send instead.
|
|
378
|
-
const sharedReceipt = (init as Record<symbol, (() => void) | undefined> | undefined)?.[WS_FALLBACK_RECEIPT];
|
|
383
|
+
const sharedReceipt = (init as Record<symbol, ((body: BodyInit | null | undefined) => void) | undefined> | undefined)?.[WS_FALLBACK_RECEIPT];
|
|
379
384
|
let notified = false;
|
|
380
385
|
const dispatchInit = { ...withUpstreamHttpVersion(input, init, provider), timeout: 0,
|
|
381
|
-
...(options.onPhysicalDispatch ? { [PHYSICAL_DISPATCH]: () => {
|
|
382
|
-
if (sharedReceipt) sharedReceipt();
|
|
383
|
-
else if (!notified) { options.onPhysicalDispatch!(); notified = true; }
|
|
386
|
+
...(options.onPhysicalDispatch ? { [PHYSICAL_DISPATCH]: (body: BodyInit | null | undefined) => {
|
|
387
|
+
if (sharedReceipt) sharedReceipt(body);
|
|
388
|
+
else if (!notified) { options.onPhysicalDispatch!(body); notified = true; }
|
|
384
389
|
} } : {}),
|
|
385
390
|
};
|
|
386
391
|
return override
|
|
@@ -421,10 +426,10 @@ export function providerFetch(
|
|
|
421
426
|
// request over HTTP, and dropping the provider's `upstreamHttpVersion`
|
|
422
427
|
// there would silently negotiate a transport the operator ruled out.
|
|
423
428
|
let notified = false;
|
|
424
|
-
const notifyOnce = (): void => {
|
|
429
|
+
const notifyOnce = (body: BodyInit | null | undefined): void => {
|
|
425
430
|
if (notified) return;
|
|
431
|
+
options.onPhysicalDispatch?.(body);
|
|
426
432
|
notified = true;
|
|
427
|
-
options.onPhysicalDispatch?.();
|
|
428
433
|
};
|
|
429
434
|
const fallback = ((url: Parameters<typeof globalThis.fetch>[0], fallbackInit?: RequestInit) =>
|
|
430
435
|
httpFetch(url, { ...fallbackInit, [WS_FALLBACK_RECEIPT]: notifyOnce } as RequestInit, reacquirePacing, null)) as typeof globalThis.fetch;
|
|
@@ -12,6 +12,7 @@ import { tryAdmitTurn } from "../lifecycle";
|
|
|
12
12
|
import type { RequestLogContext } from "../request-log";
|
|
13
13
|
import { createSseInspector } from "../relay";
|
|
14
14
|
import type { HandleResponsesOptions } from "./core-options";
|
|
15
|
+
import { ESTIMATED_USAGE_HEADER } from "./estimated-usage";
|
|
15
16
|
|
|
16
17
|
type HandleResponses = (
|
|
17
18
|
req: Request,
|
|
@@ -183,8 +184,12 @@ export function createJevModelInvoker(context: JevModelInvokerContext): JevModel
|
|
|
183
184
|
if (!isRecord(parsed)) throw new JevModelInvokeError("malformed", "decision response is not an object");
|
|
184
185
|
return terminalResult(parsed, "");
|
|
185
186
|
})();
|
|
186
|
-
|
|
187
|
-
|
|
187
|
+
// A marked response carries an estimate for a client's display, never spend evidence.
|
|
188
|
+
const estimated = response.headers.has(ESTIMATED_USAGE_HEADER);
|
|
189
|
+
const { usage: bodyUsage, ...withoutUsage } = result;
|
|
190
|
+
const settled = estimated ? withoutUsage : result;
|
|
191
|
+
usage = estimated ? undefined : bodyUsage;
|
|
192
|
+
return quotaOmitted ? { ...settled, quotaOmitted: true } : settled;
|
|
188
193
|
} finally {
|
|
189
194
|
// No final log row is written for this detached context, so settle its spend here.
|
|
190
195
|
childLog.spendTracker?.settle(childLog.usage ?? (usage
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The replay judgment a native passthrough request carries into every one of its sends.
|
|
3
|
+
*
|
|
4
|
+
* Two questions are answered together, because they share the same answer: may this request be
|
|
5
|
+
* sent a second time at all, and did the attempt that physically left stay inside that judgment?
|
|
6
|
+
* The inbound body is judged ONCE -- it does not change between legs, and every rebuild this lane
|
|
7
|
+
* performs only ever removes a hazard -- while the physical guard is asked on every call, because
|
|
8
|
+
* a rebuild queued behind a claimed replacement grant can reintroduce a hazard the inbound body
|
|
9
|
+
* never had.
|
|
10
|
+
*
|
|
11
|
+
* The physical guard also carries the grant: `authorize` marks the next physical send as the
|
|
12
|
+
* replacement a caller just bought, and `send` clears that mark whatever happens to it. A refused
|
|
13
|
+
* rebuild or an exhausted send budget must not leave the next ordinary send judged as one.
|
|
14
|
+
*/
|
|
15
|
+
import type { AdapterRequest } from "../../adapters/base";
|
|
16
|
+
import {
|
|
17
|
+
createPhysicalReplayGuard, nativePassthroughReplayJudgmentBody, selfContainedResponsesBody,
|
|
18
|
+
} from "./reset-replay";
|
|
19
|
+
|
|
20
|
+
export interface NativeReplayGuardOptions {
|
|
21
|
+
/** Whether the destination the request is dialled against executes tools on the origin. */
|
|
22
|
+
providerExecuted: () => boolean;
|
|
23
|
+
/** The parsed inbound body the judgment is made on. */
|
|
24
|
+
parsed: Parameters<typeof nativePassthroughReplayJudgmentBody>[0];
|
|
25
|
+
/**
|
|
26
|
+
* The outbound request, read per send: the recovery loop reassigns it as adapters rebuild.
|
|
27
|
+
* Received as a thunk rather than a value for exactly that reason.
|
|
28
|
+
*/
|
|
29
|
+
currentRequest: () => AdapterRequest;
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
export interface NativeReplayGuard {
|
|
33
|
+
/** Whether this request, and the body about to leave, may be replayed. */
|
|
34
|
+
isSelfContained: () => boolean;
|
|
35
|
+
/** Mark the one physical send a recovery grant just bought. */
|
|
36
|
+
authorize: () => void;
|
|
37
|
+
/** The `onPhysicalDispatch` handler for a send of the current request. */
|
|
38
|
+
sendHandler: (next?: () => void) => (body?: BodyInit | null) => void;
|
|
39
|
+
/** Record a send whose request the caller already holds (a retry with a rebuilt request). */
|
|
40
|
+
record: (request: AdapterRequest, body: BodyInit | null | undefined) => void;
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
export function createNativeReplayGuard(options: NativeReplayGuardOptions): NativeReplayGuard {
|
|
44
|
+
const physical = createPhysicalReplayGuard(options.providerExecuted);
|
|
45
|
+
// Judged once: walking the input array is not something a provider that never opted in should
|
|
46
|
+
// pay for on every leg, and the inbound body cannot change mid-request.
|
|
47
|
+
let selfContained: boolean | undefined;
|
|
48
|
+
return {
|
|
49
|
+
isSelfContained: (): boolean =>
|
|
50
|
+
(selfContained ??= selfContainedResponsesBody(nativePassthroughReplayJudgmentBody(options.parsed)))
|
|
51
|
+
&& physical.isSelfContained(options.currentRequest()),
|
|
52
|
+
authorize: () => physical.authorize(),
|
|
53
|
+
sendHandler: (next?: () => void) => (body?: BodyInit | null): void =>
|
|
54
|
+
physical.record(options.currentRequest(), body, next),
|
|
55
|
+
record: (request: AdapterRequest, body: BodyInit | null | undefined) => physical.record(request, body),
|
|
56
|
+
};
|
|
57
|
+
}
|
|
@@ -60,6 +60,10 @@ export interface OpenGatewayCompletionGuardOptions {
|
|
|
60
60
|
readonly recordUsage: (usage: unknown) => void;
|
|
61
61
|
readonly retryEnabled?: boolean;
|
|
62
62
|
readonly stallTimeoutMs?: number;
|
|
63
|
+
/** This response's real upstream body is already guarded before reset preflight. */
|
|
64
|
+
readonly initialBodyInactivityGuarded?: boolean;
|
|
65
|
+
/** Time reset selection already held this response's head; the first hold is shortened by it. */
|
|
66
|
+
readonly initialHoldSpentMs?: number;
|
|
63
67
|
/** Expiry releases original bytes; it never aborts a healthy upstream. */
|
|
64
68
|
readonly holdTimeoutMs?: number;
|
|
65
69
|
}
|
|
@@ -67,19 +71,19 @@ export interface OpenGatewayCompletionGuardOptions {
|
|
|
67
71
|
type Inspection = { kind: "pass"; response: Response }
|
|
68
72
|
| { kind: "empty" | "invalid"; snapshot: RecordValue; streaming: boolean };
|
|
69
73
|
|
|
70
|
-
async function inspect(response: Response, options: OpenGatewayCompletionGuardOptions): Promise<Inspection> {
|
|
74
|
+
async function inspect(response: Response, options: OpenGatewayCompletionGuardOptions, alreadyGuarded: boolean, heldMs: number): Promise<Inspection> {
|
|
71
75
|
const contentType = response.headers.get("content-type")?.toLowerCase() ?? "";
|
|
72
76
|
const streaming = contentType.includes("text/event-stream")
|
|
73
77
|
|| (!contentType && isPlainObject(options.body) && options.body.stream === true);
|
|
74
78
|
if (!response.body || (!streaming && !contentType.includes("application/json"))) return { kind: "pass", response };
|
|
75
|
-
const guarded = guardResponseBodyInactivity(response, options.signal, streaming ? options.stallTimeoutMs ?? 0 : 0);
|
|
79
|
+
const guarded = guardResponseBodyInactivity(response, options.signal, streaming && !alreadyGuarded ? options.stallTimeoutMs ?? 0 : 0);
|
|
76
80
|
const reader = guarded.response.body?.getReader();
|
|
77
81
|
if (!reader) return { kind: "pass", response };
|
|
78
82
|
const framer = new BoundedSseFrameBuffer(MAX_BYTES);
|
|
79
83
|
const held: Array<Uint8Array | undefined> = [];
|
|
80
84
|
let bytes = 0, events = 0, transferred = false, cleaned = false;
|
|
81
85
|
let pending: ReturnType<typeof reader.read> | undefined;
|
|
82
|
-
const holdMs = options.holdTimeoutMs ?? MAX_HOLD_MS;
|
|
86
|
+
const holdMs = Math.max(0, (options.holdTimeoutMs ?? MAX_HOLD_MS) - heldMs);
|
|
83
87
|
const deadline = performance.now() + holdMs;
|
|
84
88
|
let timer: ReturnType<typeof setTimeout> | undefined;
|
|
85
89
|
const expired = new Promise<"expired">(resolve => { timer = setTimeout(() => resolve("expired"), holdMs); });
|
|
@@ -217,7 +221,9 @@ export async function guardOpenGatewayCompletion(response: Response, options: Op
|
|
|
217
221
|
&& selfContainedResponsesBody(body) && !isNonReplayableResponse(response);
|
|
218
222
|
let selected = response;
|
|
219
223
|
for (let attempt = 0; ; attempt++) {
|
|
220
|
-
const
|
|
224
|
+
const initial = attempt === 0;
|
|
225
|
+
const inspected = await inspect(selected, options, initial && options.initialBodyInactivityGuarded === true,
|
|
226
|
+
initial ? Math.max(0, options.initialHoldSpentMs ?? 0) : 0);
|
|
221
227
|
if (inspected.kind === "pass") return inspected.response;
|
|
222
228
|
const usage = inspected.snapshot.usage;
|
|
223
229
|
options.recordUsage(usage);
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
import { isPlainObject } from "../responses-snapshot-codec";
|
|
2
|
+
|
|
3
|
+
/** Parse the physical outbound request without accepting arrays or primitive JSON. */
|
|
4
|
+
export function parseOutboundRequestBody(bodyText: string): Record<string, unknown> | undefined {
|
|
5
|
+
try {
|
|
6
|
+
const body: unknown = JSON.parse(bodyText);
|
|
7
|
+
return isPlainObject(body) ? body : undefined;
|
|
8
|
+
} catch {
|
|
9
|
+
return undefined;
|
|
10
|
+
}
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
/** Input item types that declare tools; the tool scope keeps these and drops every other input item. */
|
|
14
|
+
const TOOL_SCOPE_INPUT_TYPES = new Set(["additional_tools", "tool_search_output"]);
|
|
15
|
+
|
|
16
|
+
/**
|
|
17
|
+
* The part of the outbound body its response readers need (#8601): the tool catalog, the tool selection, the parallel
|
|
18
|
+
* flag and the input items that declare tools. Snapshot repair and the Grok tool scope read only these, so a turn keeps
|
|
19
|
+
* this while it streams instead of a parsed copy of the whole request.
|
|
20
|
+
*/
|
|
21
|
+
export function outboundToolScope(body: Record<string, unknown> | undefined): Record<string, unknown> | undefined {
|
|
22
|
+
if (!body) return undefined;
|
|
23
|
+
const scope: Record<string, unknown> = {};
|
|
24
|
+
for (const key of ["tools", "tool_choice", "parallel_tool_calls"]) if (Object.hasOwn(body, key)) scope[key] = body[key];
|
|
25
|
+
if (Array.isArray(body.input)) {
|
|
26
|
+
scope.input = body.input.filter(item => isPlainObject(item) && typeof item.type === "string" && TOOL_SCOPE_INPUT_TYPES.has(item.type));
|
|
27
|
+
}
|
|
28
|
+
return scope;
|
|
29
|
+
}
|
|
@@ -1,18 +1,114 @@
|
|
|
1
1
|
import type { AdapterRequest } from "../../adapters/base";
|
|
2
2
|
import { formatErrorResponse } from "../../bridge";
|
|
3
|
-
import {
|
|
3
|
+
import type { MainQuotaDispatch } from "../../codex/main-account-cache";
|
|
4
|
+
import { isLocalUpstream } from "../../lib/local-upstream";
|
|
5
|
+
import { guardResponseBodyInactivity, markResponseBodyInactivityGuarded } from "../../lib/response-body-inactivity";
|
|
6
|
+
import { explicitStallTimeoutMs, resolveStallTimeoutMs } from "../../stall-timeout";
|
|
4
7
|
import type { OcxConfig } from "../../types";
|
|
5
8
|
import { recordKeyWireAttemptUsage, usageFromResponsesPayload, type RequestLogContext } from "../request-log";
|
|
6
|
-
import {
|
|
9
|
+
import { selectProtocolSafeResetResponse, type ProtocolSafeResetRecovery } from "./combo-stream-preflight";
|
|
10
|
+
import { bindPublishedMainQuotaDispatch } from "./core-codex-account";
|
|
11
|
+
import type { ResponsesAdmissionState } from "./core-options";
|
|
7
12
|
import { guardOpenGatewayCompletion } from "./opengateway-completion-guard";
|
|
13
|
+
import { parseOutboundRequestBody } from "./outbound-request-body";
|
|
14
|
+
import { carryResponseToolOwnership } from "./response-tool-ownership";
|
|
8
15
|
|
|
9
|
-
export
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
+
export { parseOutboundRequestBody } from "./outbound-request-body";
|
|
17
|
+
|
|
18
|
+
// A guarded published reset response, mapped to when its selection began holding the head.
|
|
19
|
+
const guardedResetResponses = new WeakMap<Response, number>();
|
|
20
|
+
// A canonical JSON turn's published head, mapped to the wall-clock time its selection began (#8343).
|
|
21
|
+
const bufferedSelectionStarts = new WeakMap<Response, number>();
|
|
22
|
+
|
|
23
|
+
/**
|
|
24
|
+
* When reset selection began holding this canonical JSON turn's head, if it ran. The collector's
|
|
25
|
+
* whole-turn deadline starts there, so the time selection held the head counts against it.
|
|
26
|
+
*/
|
|
27
|
+
export function bufferedResetSelectionStartedAt(response: Response): number | undefined {
|
|
28
|
+
return bufferedSelectionStarts.get(response);
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
/**
|
|
32
|
+
* How long a direct stream's head may wait on the original's own inspection.
|
|
33
|
+
*
|
|
34
|
+
* Returning the response is the latest point this code can still choose a head, but it does not
|
|
35
|
+
* send one: Bun's server writes the head together with the first body bytes, so a window commit
|
|
36
|
+
* also gives the client a comment at once. A healthy slow upstream and a dying one look the same
|
|
37
|
+
* until the source fails, so a direct client gets the original head promptly instead of after a
|
|
38
|
+
* heartbeat interval. A failure observed inside this window may still publish the replacement's
|
|
39
|
+
* own head, as a pre-header reset does.
|
|
40
|
+
*/
|
|
41
|
+
export const DIRECT_RESET_INSPECTION_WINDOW_MS = 200;
|
|
42
|
+
|
|
43
|
+
/** Who consumes the selected head: the client directly, the canonical JSON collector, or a combo parent. */
|
|
44
|
+
export type ResetSelectionDelivery = "direct-stream" | "buffered-json" | "combo-child";
|
|
45
|
+
|
|
46
|
+
/** A replacement must still be the stream the upstream request asked for; refetch requires 2xx. */
|
|
47
|
+
export function isResetReplacementStream(candidate: Response, upstreamRequestsStream: boolean): boolean {
|
|
48
|
+
const type = candidate.headers.get("content-type")?.toLowerCase() ?? "";
|
|
49
|
+
return type.includes("text/event-stream") || (!type && upstreamRequestsStream);
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
/**
|
|
53
|
+
* Select the native response a reset preflight publishes.
|
|
54
|
+
*
|
|
55
|
+
* A direct stream's head waits on the original's inspection for at most
|
|
56
|
+
* `DIRECT_RESET_INSPECTION_WINDOW_MS`. The canonical JSON collector and a combo parent publish no
|
|
57
|
+
* head before their own inspection ends, so their selection may wait one heartbeat interval. No
|
|
58
|
+
* selection waits longer than the stall budget; see `selectProtocolSafeResetResponse`. A consumer that measures silence on the bytes it
|
|
59
|
+
* receives cannot tell a held prelude, its later replay or a generated comment from an upstream
|
|
60
|
+
* read, and it starts after selection already waited. Both bodies are guarded before preflight, so each physical
|
|
61
|
+
* attempt's stall budget runs on its own upstream reads from its own head. The guard's failure is
|
|
62
|
+
* a timeout, which the reset gate never treats as replayable. The published head carries the main
|
|
63
|
+
* quota proof of the physical attempt that produced it, because the replacement send renews the
|
|
64
|
+
* context's proof.
|
|
65
|
+
*/
|
|
66
|
+
export function selectPassthroughResetResponse(
|
|
67
|
+
response: Response,
|
|
68
|
+
admission: Pick<ResponsesAdmissionState, "authCtx">,
|
|
69
|
+
logCtx: RequestLogContext,
|
|
70
|
+
recover: ProtocolSafeResetRecovery,
|
|
71
|
+
options: {
|
|
72
|
+
request: AdapterRequest;
|
|
73
|
+
config: Pick<OcxConfig, "stallTimeoutSec">;
|
|
74
|
+
signal: AbortSignal;
|
|
75
|
+
allowMissingContentType: boolean;
|
|
76
|
+
delivery: ResetSelectionDelivery;
|
|
77
|
+
},
|
|
78
|
+
): Promise<Response> {
|
|
79
|
+
const openGateway = options.request.url === "https://apis.opengateway.ai/v1/responses"
|
|
80
|
+
&& response.status === 200 && response.body !== null;
|
|
81
|
+
const stallMs = resolveStallTimeoutMs(options.config.stallTimeoutSec, { localUpstream: isLocalUpstream(options.request.url) });
|
|
82
|
+
// The same budget, but reported as a stall only when the operator set it explicitly (#8206).
|
|
83
|
+
const explicitBudget = explicitStallTimeoutMs(options.config.stallTimeoutSec) > 0;
|
|
84
|
+
const protect = (source: Response): Response =>
|
|
85
|
+
carryResponseToolOwnership(source, guardResponseBodyInactivity(source, options.signal, stallMs, { explicitBudget }).response);
|
|
86
|
+
const quotaOwner = (): MainQuotaDispatch | undefined =>
|
|
87
|
+
admission.authCtx.kind === "main" ? admission.authCtx.mainQuotaDispatch : undefined;
|
|
88
|
+
const originalOwner = quotaOwner();
|
|
89
|
+
let replacementOwner: MainQuotaDispatch | undefined;
|
|
90
|
+
const heldSince = performance.now();
|
|
91
|
+
const selectionStartedAt = Date.now();
|
|
92
|
+
return selectProtocolSafeResetResponse(protect(response), logCtx, async (error, stage, signal, accepts) => {
|
|
93
|
+
// Recover returns only a validated, fresh body; wrapping earlier would hide its lock state.
|
|
94
|
+
const replacement = await recover(error, stage, signal, accepts);
|
|
95
|
+
if (!replacement) return null;
|
|
96
|
+
replacementOwner = quotaOwner();
|
|
97
|
+
return protect(replacement);
|
|
98
|
+
}, {
|
|
99
|
+
allowMissingContentType: options.allowMissingContentType,
|
|
100
|
+
// The collector's silence clock sees only delivered bytes; a combo parent holds the head itself.
|
|
101
|
+
keepalive: options.delivery === "buffered-json" ? "upstream-activity" : options.delivery === "combo-child" ? "none" : "periodic",
|
|
102
|
+
inspectionWindowMs: options.delivery === "direct-stream" ? DIRECT_RESET_INSPECTION_WINDOW_MS : undefined,
|
|
103
|
+
signal: options.signal,
|
|
104
|
+
maxSelectionMs: stallMs > 0 ? stallMs : undefined,
|
|
105
|
+
onCommit: (published, owner) => {
|
|
106
|
+
if (stallMs > 0) markResponseBodyInactivityGuarded(published);
|
|
107
|
+
if (openGateway) guardedResetResponses.set(published, heldSince);
|
|
108
|
+
if (options.delivery === "buffered-json") bufferedSelectionStarts.set(published, selectionStartedAt);
|
|
109
|
+
bindPublishedMainQuotaDispatch(published, owner === "replacement" ? replacementOwner : originalOwner);
|
|
110
|
+
},
|
|
111
|
+
});
|
|
16
112
|
}
|
|
17
113
|
|
|
18
114
|
export function guardPassthroughCompletion(
|
|
@@ -24,12 +120,16 @@ export function guardPassthroughCompletion(
|
|
|
24
120
|
rebuildAndRefetch: (kind: "empty-completion") => Promise<Response | { failed: Response | { kind: "adapter-handoff" } }>,
|
|
25
121
|
): Promise<Response> {
|
|
26
122
|
if (request.url !== "https://apis.opengateway.ai/v1/responses") return Promise.resolve(response);
|
|
123
|
+
const heldSince = guardedResetResponses.get(response);
|
|
27
124
|
return guardOpenGatewayCompletion(response, {
|
|
28
125
|
url: request.url,
|
|
29
126
|
body: parseOutboundRequestBody(request.body),
|
|
30
127
|
signal,
|
|
31
128
|
retryEnabled: config.emptyCompletionRetry,
|
|
32
129
|
stallTimeoutMs: resolveStallTimeoutMs(config.stallTimeoutSec),
|
|
130
|
+
initialBodyInactivityGuarded: heldSince !== undefined,
|
|
131
|
+
// The completion hold and reset selection share one bound on how long the head waits.
|
|
132
|
+
initialHoldSpentMs: heldSince === undefined ? 0 : performance.now() - heldSince,
|
|
33
133
|
recordUsage: usage => { recordKeyWireAttemptUsage(logCtx, usageFromResponsesPayload(usage)); },
|
|
34
134
|
retry: async () => {
|
|
35
135
|
const result = await rebuildAndRefetch("empty-completion");
|