@bitkyc08/opencodex 2.100.1 → 2.100.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/bin/ocx.mjs +32 -18
- package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
- package/gui/dist/assets/App-Dnb6VMsP.js +59 -0
- package/gui/dist/assets/Tray-BV4ms9U9.js +1 -0
- package/gui/dist/assets/{brand-mark-nr3ziR-T.js → brand-mark-XOLJbomA.js} +1 -1
- package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
- package/gui/dist/assets/index-DQtCRNAw.css +2 -0
- package/gui/dist/assets/{segment-thumb-features-DKCVUUTi.js → segment-thumb-features-DXSidY6D.js} +1 -1
- package/gui/dist/classic/assets/App-DA-scMPq.js +58 -0
- package/gui/dist/classic/assets/{Tray-BedmOsE7.js → Tray-BrHaVRAq.js} +1 -1
- package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
- package/gui/dist/classic/assets/quota-summary-Dy5_wfTT.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 +402 -20
- package/native/ocx-child/src/codex_home.rs +98 -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.ts +31 -14
- package/src/adapters/client-fingerprint.ts +6 -4
- 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/native-exec.ts +3 -2
- package/src/adapters/cursor/protobuf-request.ts +8 -8
- package/src/adapters/cursor/tool-guidance.ts +3 -3
- package/src/adapters/cursor/tool-wording.ts +10 -1
- package/src/adapters/cursor.ts +7 -6
- package/src/adapters/devin/cloud-direct/tool-schema.ts +20 -2
- package/src/adapters/google-antigravity-wire.ts +15 -6
- package/src/adapters/google-truncation.ts +4 -2
- package/src/adapters/google-wire-compiler.ts +2 -2
- package/src/adapters/google.ts +17 -4
- 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/openai-chat/tool-schema.ts +9 -0
- package/src/adapters/openai-responses/tool-schema.ts +18 -4
- package/src/adapters/run-turn-queue.ts +139 -5
- package/src/adapters/upstream-http-error.ts +4 -2
- package/src/adapters/zed.ts +3 -0
- 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 +51 -9
- package/src/claude/auth-detect.ts +21 -33
- package/src/claude/chat-tool-dispatch.ts +233 -0
- 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 +24 -4
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/inbound-tool-loading.ts +42 -17
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +23 -1
- package/src/cli/account-auth.ts +54 -21
- package/src/cli/account-extended.ts +60 -6
- package/src/cli/account-key-quota.ts +56 -7
- package/src/cli/account.ts +5 -3
- package/src/cli/advisor.ts +7 -4
- package/src/cli/alias.ts +38 -1
- package/src/cli/capabilities-access-remote.ts +137 -2
- package/src/cli/capabilities-accounts.ts +3 -3
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +43 -18
- package/src/cli/capabilities-integrations.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 +36 -17
- package/src/cli/codex-launcher.ts +3 -1
- package/src/cli/codex-shim-autorestore.ts +5 -42
- package/src/cli/config-command.ts +38 -2
- package/src/cli/config-root-startup.ts +34 -0
- package/src/cli/connect.ts +124 -19
- package/src/cli/desktop-runtime-guidance.ts +1 -1
- package/src/cli/disconnect-runtime.ts +168 -0
- package/src/cli/dispatch.ts +54 -12
- package/src/cli/export-command.ts +1 -1
- package/src/cli/gui-pair-client.ts +29 -5
- package/src/cli/gui.ts +10 -5
- package/src/cli/help-catalog.ts +11 -0
- package/src/cli/help.ts +5 -4
- package/src/cli/hub.ts +18 -1
- package/src/cli/index.ts +83 -92
- package/src/cli/inspect.ts +11 -2
- package/src/cli/integrations.ts +26 -1
- package/src/cli/link-capture.ts +64 -0
- package/src/cli/link-child-ops.ts +314 -0
- 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 +87 -0
- package/src/cli/link-status-child.ts +137 -0
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +327 -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 +46 -0
- package/src/cli/registry.ts +29 -12
- package/src/cli/restart-failure.ts +5 -2
- package/src/cli/root.ts +5 -1
- package/src/cli/route-to.ts +172 -0
- package/src/cli/runtime-api.ts +5 -8
- package/src/cli/status.ts +3 -1
- 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 -13
- package/src/cli/sync-fanout.ts +81 -99
- 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-restart-client.ts +3 -2
- 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 +321 -34
- 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-readiness.ts +16 -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-status.ts +76 -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 +127 -5
- package/src/client/runtime.ts +61 -15
- package/src/client/state.ts +30 -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 +36 -4
- package/src/codex/account-resume-health.ts +41 -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/login-flow.ts +6 -0
- package/src/codex/auth-api/routes.ts +35 -2
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +21 -6
- package/src/codex/catalog/gather-capture.ts +10 -2
- package/src/codex/catalog/parsing.ts +7 -3
- package/src/codex/catalog/provider-models.ts +67 -23
- package/src/codex/catalog/retained-sync.ts +2 -1
- 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-types.ts +2 -0
- package/src/codex/convergence.ts +2 -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/main-account.ts +23 -30
- package/src/codex/native-main-auth-file.ts +104 -0
- 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 +134 -7
- 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 +228 -0
- package/src/combos/failover.ts +760 -35
- package/src/config/dashboard-trusted-proxy.ts +83 -0
- package/src/config/diagnostics.ts +28 -0
- package/src/config/feature-flags.ts +9 -0
- package/src/config/live-reconcile.ts +10 -1
- package/src/config/load-degrade.ts +12 -1
- package/src/config/multi-agent-surface.ts +28 -5
- package/src/config/pending-teardown.ts +60 -3
- package/src/config/process-state.ts +175 -4
- package/src/config/provider-validation.ts +4 -4
- package/src/config/salvage.ts +1 -0
- package/src/config/schema/config-schema.ts +12 -3
- package/src/config/schema/leaf-validators.ts +43 -14
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/generated/compatibility-version.json +1077 -429
- package/src/generated/model-metadata.ts +1 -1
- package/src/images/loop.ts +3 -0
- 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/catalog-etag.ts +10 -0
- package/src/lib/client-error-body.ts +15 -0
- package/src/lib/client-retry-after.ts +29 -0
- package/src/lib/config-ownership.ts +13 -0
- package/src/lib/context-overflow-verdict.ts +266 -9
- package/src/lib/desktop-gui-origin.ts +28 -0
- package/src/lib/errors.ts +1 -1
- package/src/lib/failure-detail.ts +72 -3
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/hard-refusal.ts +259 -0
- package/src/lib/messages-error-body.ts +4 -1
- 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/redact.ts +84 -8
- 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 +14 -4
- package/src/link/alias-lock.ts +119 -0
- package/src/link/child-activity.ts +83 -0
- 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-catalog-freshness.ts +149 -0
- package/src/link/child-gated-ocx.ts +135 -0
- package/src/link/child-observations.ts +206 -0
- package/src/link/child-observe.ts +121 -0
- package/src/link/child-ops-engine.ts +230 -0
- 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 +174 -0
- 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/paths.ts +5 -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 +88 -12
- package/src/link/request-compression.ts +30 -0
- package/src/link/residual-recovery.ts +54 -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 +285 -43
- 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 +160 -0
- package/src/link/store.ts +54 -1
- package/src/link/supervisor.ts +543 -55
- package/src/link/sync-fanout-classify.ts +114 -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/tunnel-state.ts +10 -4
- package/src/link/ws-activity-holds.ts +474 -0
- package/src/local-credentials/publication-fence.ts +20 -1
- package/src/messaging/mcp-queue-rpc.ts +3 -2
- package/src/messaging/mcp-queue-server.ts +21 -1
- package/src/messaging/mcp-reply-tools.ts +24 -9
- package/src/messaging/mcp-reply-wait.ts +70 -0
- 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 +46 -2
- package/src/oauth/account-resume-health.ts +60 -0
- 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/claude-keychain-read.ts +78 -68
- package/src/oauth/index.ts +25 -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 +33 -18
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- package/src/oauth/store.ts +51 -1
- 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-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-state.ts +23 -0
- package/src/providers/api-key-pause.ts +71 -10
- 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-capture.ts +3 -1
- package/src/providers/api-key-selection.ts +54 -11
- package/src/providers/api-keys.ts +24 -7
- package/src/providers/cache-affinity-identity.ts +73 -0
- package/src/providers/cache-affinity.ts +256 -0
- package/src/providers/claude-cli-usage-state.ts +11 -6
- package/src/providers/claude-cli-usage.ts +27 -9
- package/src/providers/codex-capacity.ts +11 -2
- package/src/providers/default-aliases.ts +98 -20
- package/src/providers/google-vertex-model-discovery.ts +510 -0
- package/src/providers/key-failover.ts +136 -14
- 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-discovery-config.ts +31 -0
- package/src/providers/model-discovery-diagnostic.ts +34 -3
- package/src/providers/model-discovery.ts +43 -7
- 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/openai-sidecar.ts +15 -2
- package/src/providers/passive-key-observation.ts +252 -0
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/account-cache.ts +53 -34
- package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
- package/src/providers/quota/anthropic-usage-windows.ts +19 -9
- 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 +112 -5
- package/src/providers/quota/vendor-probes-key.ts +73 -0
- package/src/providers/quota/vendor-probes-oauth.ts +57 -3
- package/src/providers/quota-key-accounts.ts +22 -10
- package/src/providers/quota-mistral-budget.ts +18 -0
- package/src/providers/quota-types.ts +43 -0
- package/src/providers/quota.ts +31 -32
- package/src/providers/reasoning-metadata.ts +1051 -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/xai-transport.ts +3 -0
- package/src/quota/reset-observer.ts +4 -2
- package/src/quota/reset-seen-store.ts +9 -0
- package/src/quota/window-mapping.ts +1 -0
- package/src/quota-pool/assemble.ts +4 -1
- 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/hosted-tool-policy.ts +56 -12
- 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 +4 -2
- 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 +109 -8
- package/src/server/bare-upstream-error.ts +220 -0
- package/src/server/catalog-download.ts +3 -5
- package/src/server/chat-native.ts +25 -7
- package/src/server/claude-messages.ts +8 -5
- package/src/server/codex-model-list.ts +2 -1
- package/src/server/configured-credentials.ts +37 -5
- 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/images.ts +41 -13
- package/src/server/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +203 -11
- package/src/server/index/link-management.ts +15 -1
- package/src/server/index/link-relay-sessions.ts +128 -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 +115 -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 +35 -86
- package/src/server/index/startup-warnings.ts +8 -2
- package/src/server/index/websocket-handler.ts +26 -4
- package/src/server/index.ts +12 -2
- 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 +137 -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 +7 -1
- 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 +218 -0
- 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 +173 -0
- package/src/server/management/link-route-request.ts +62 -0
- package/src/server/management/link-route-state.ts +92 -6
- package/src/server/management/link-routes.ts +563 -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 +69 -17
- 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 +39 -3
- package/src/server/management/provider-routes.ts +80 -72
- package/src/server/management/provider-routing-quota.ts +45 -0
- package/src/server/management/route-registry.ts +25 -3
- package/src/server/management/route-to-routes.ts +257 -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 +22 -5
- package/src/server/persistent-gui-session.ts +6 -3
- package/src/server/proxy-liveness.ts +33 -6
- package/src/server/relay-eager.ts +36 -12
- package/src/server/relay.ts +183 -116
- 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-failure-detail.ts +59 -1
- package/src/server/request-log-terminal-status.ts +210 -24
- package/src/server/request-log.ts +71 -79
- package/src/server/responses/adapter-continuation.ts +2 -1
- package/src/server/responses/adapter-delivery.ts +2 -0
- package/src/server/responses/adapter-dispatch.ts +40 -51
- 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/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-stream-preflight.ts +701 -81
- package/src/server/responses/compact.ts +47 -12
- package/src/server/responses/context-overflow.ts +58 -2
- package/src/server/responses/core-codex-account.ts +17 -3
- package/src/server/responses/core-combo-failure.ts +37 -4
- package/src/server/responses/core-combo-native.ts +3 -1
- package/src/server/responses/core-combo.ts +62 -7
- package/src/server/responses/core-errors.ts +8 -3
- package/src/server/responses/core-lifetime.ts +3 -2
- package/src/server/responses/core-normalize.ts +3 -1
- package/src/server/responses/core-opaque-recovery.ts +45 -2
- package/src/server/responses/core-options.ts +18 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +15 -10
- 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 +105 -8
- package/src/server/responses/passthrough-delivery.ts +31 -11
- package/src/server/responses/passthrough-dispatch.ts +99 -106
- package/src/server/responses/policy-fallback.ts +13 -1
- package/src/server/responses/request-prepare.ts +50 -6
- package/src/server/responses/request-transport.ts +53 -17
- package/src/server/responses/reset-replay.ts +104 -4
- package/src/server/responses/run-turn-execution.ts +58 -30
- package/src/server/responses/sidecar-execution.ts +14 -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/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/types/claude-tool-loading.ts +48 -0
- package/src/types/config.ts +47 -53
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +68 -2
- package/src/types/request.ts +4 -0
- package/src/types.ts +4 -0
- package/src/update/guarded-runtime-ops.ts +5 -7
- package/src/update/index.ts +25 -10
- 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 +43 -2
- package/src/usage/request-body.ts +37 -0
- package/src/web-search/loop.ts +3 -0
- package/src/web-search/parse.ts +21 -2
- package/gui/dist/assets/App-g3Cm2xhZ.js +0 -59
- package/gui/dist/assets/Tray-BMDkAiXy.js +0 -1
- package/gui/dist/assets/index-Bziu8gTy.css +0 -2
- package/gui/dist/assets/index-OYzhQUNP.js +0 -94
- package/gui/dist/classic/assets/App-CgPBKUP-.js +0 -58
- package/gui/dist/classic/assets/index-BR-HhNrp.js +0 -94
- package/gui/dist/classic/assets/quota-summary-CXKhvSmQ.js +0 -1
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
|
@@ -19,6 +19,7 @@ import { prepareEffortNormalization, stripEmptyLadderEffort, supportedLadderFor
|
|
|
19
19
|
import { resolveOpenCodeGoTransport } from "../../providers/opencode-go-transport";
|
|
20
20
|
import { getOrAllocateRequestSessionLane } from "../request-log-conversation";
|
|
21
21
|
import { shouldPreparePlaintextV2AgentMessages } from "../../responses/plaintext-v2-agent-messages";
|
|
22
|
+
import { isPlaintextV2AgentMessagesEnabled } from "../../config/multi-agent-surface";
|
|
22
23
|
import { hasValidatedActiveReasoningEffort } from "../../responses/parser";
|
|
23
24
|
import { responseTierAuthorityForProvider } from "../../providers/openai-tiers-destination";
|
|
24
25
|
import { isCanonicalOpenAiForwardProvider } from "../../providers/openai-tiers";
|
|
@@ -195,11 +196,12 @@ export async function applyFinalRouteRequestNormalization(args: {
|
|
|
195
196
|
args.claudeGoAffinity ? args.claudeGoAffinity.sessionLane : getOrAllocateRequestSessionLane(req),
|
|
196
197
|
routedProvider);
|
|
197
198
|
parsed._plaintextV2AgentMessages = shouldPreparePlaintextV2AgentMessages({
|
|
198
|
-
enabled:
|
|
199
|
+
enabled: parsed._plaintextV2Decision === true && isPlaintextV2AgentMessagesEnabled(config),
|
|
199
200
|
inboundWire,
|
|
200
201
|
canonicalChatGpt: isCanonicalOpenAiForwardProvider(route.provider),
|
|
201
202
|
requestBody: parsed._rawBody,
|
|
202
203
|
});
|
|
204
|
+
if (parsed._plaintextV2AgentMessages) parsed._plaintextV2EverPrepared = true;
|
|
203
205
|
// Recompute from the original wire preference on every route, including fallback.
|
|
204
206
|
// A provider default never converts raw reasoning into a summary.
|
|
205
207
|
if (inboundWire === "responses" && parsed._rawBody) {
|
|
@@ -1,6 +1,12 @@
|
|
|
1
1
|
import { ENCRYPTED_FUNCTION_OUTPUT_REJECTION, upstreamErrorMessageFromPayload } from "../../lib/errors";
|
|
2
2
|
import { readBoundedResponseBody } from "../../lib/bounded-body";
|
|
3
|
-
import {
|
|
3
|
+
import { isHardPolicyOrOriginRefusal } from "../../lib/hard-refusal";
|
|
4
|
+
import { isPlainObject } from "../../lib/plain-data";
|
|
5
|
+
import {
|
|
6
|
+
hasConflictingReasoningEffortCode,
|
|
7
|
+
isReasoningEffortRejection,
|
|
8
|
+
planReasoningEffortDowngrade,
|
|
9
|
+
} from "../../providers/reasoning-metadata";
|
|
4
10
|
import { isAnthropicFastRefusal } from "../../providers/anthropic-fast";
|
|
5
11
|
import type { AdapterRequest } from "../../adapters/base";
|
|
6
12
|
import { isNonReplayableResponse } from "../../lib/upstream-retry";
|
|
@@ -64,6 +70,43 @@ export function outboundResponsesInput(bodyText: string | undefined): unknown[]
|
|
|
64
70
|
}
|
|
65
71
|
}
|
|
66
72
|
|
|
73
|
+
/**
|
|
74
|
+
* The next published rung after an upstream reasoning-effort refusal, or undefined when no replay
|
|
75
|
+
* applies. A direct request repairs once. A combo candidate may walk the finite ladder one refused
|
|
76
|
+
* rung at a time: each refusal is learned, so a rung is never offered twice, and the request send
|
|
77
|
+
* budget bounds the walk (#8173). The caller sets `guard.attempted` when it actually replays.
|
|
78
|
+
*/
|
|
79
|
+
export async function refusedReasoningEffortDowngrade(
|
|
80
|
+
response: Response,
|
|
81
|
+
signal: AbortSignal,
|
|
82
|
+
guard: { attempted: boolean },
|
|
83
|
+
comboAttempt: boolean | undefined,
|
|
84
|
+
plan: Omit<Parameters<typeof planReasoningEffortDowngrade>[0], "rejectionText">,
|
|
85
|
+
): Promise<ReturnType<typeof planReasoningEffortDowngrade>> {
|
|
86
|
+
if (guard.attempted && !comboAttempt) return undefined;
|
|
87
|
+
const rejectionText = await reasoningEffortRejectionText(response, false, signal);
|
|
88
|
+
return rejectionText === undefined
|
|
89
|
+
? undefined
|
|
90
|
+
: planReasoningEffortDowngrade({ ...plan, rejectionText });
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
/**
|
|
94
|
+
* The passthrough rebuild serializes `_rawBody`, so a downgraded rung has to be written there as
|
|
95
|
+
* well or the replay resends the refused effort.
|
|
96
|
+
*
|
|
97
|
+
* Only shapes that already carry the control are rewritten. An absent `reasoning`, or one the
|
|
98
|
+
* caller sent as a string or `null`, is left exactly as it was: inventing `{ effort }` here would
|
|
99
|
+
* add a reasoning control to a body that never asked for one, and overriding a string would
|
|
100
|
+
* replace whatever that wire meant by it. `reasoning_effort` is kept in step only when present.
|
|
101
|
+
*/
|
|
102
|
+
export function withRawBodyReasoningEffort(rawBody: unknown, effort: string): unknown {
|
|
103
|
+
if (!isPlainObject(rawBody)) return rawBody;
|
|
104
|
+
const next: Record<string, unknown> = { ...rawBody };
|
|
105
|
+
if (isPlainObject(rawBody.reasoning)) next.reasoning = { ...rawBody.reasoning, effort };
|
|
106
|
+
if ("reasoning_effort" in rawBody) next.reasoning_effort = effort;
|
|
107
|
+
return next;
|
|
108
|
+
}
|
|
109
|
+
|
|
67
110
|
|
|
68
111
|
export function outboundResponsesBodyCarriesEncryptedFunctionOutput(bodyText: string | undefined): boolean {
|
|
69
112
|
const input = outboundResponsesInput(bodyText);
|
|
@@ -365,7 +408,7 @@ export async function reasoningEffortRejectionText(
|
|
|
365
408
|
if (response.status !== 400 && response.status !== 403) return undefined;
|
|
366
409
|
try {
|
|
367
410
|
const body = await readBoundedResponseBody(response.clone(), { signal });
|
|
368
|
-
if (!body.displaySafe || body.truncated) return undefined;
|
|
411
|
+
if (!body.displaySafe || body.truncated || isHardPolicyOrOriginRefusal(body.text) || hasConflictingReasoningEffortCode(body.text)) return undefined;
|
|
369
412
|
return isReasoningEffortRejection(body.text) ? body.text : undefined;
|
|
370
413
|
} catch {
|
|
371
414
|
return undefined;
|
|
@@ -33,8 +33,22 @@ export interface ConsumedComboFailure {
|
|
|
33
33
|
classificationText: string;
|
|
34
34
|
/** Complete bounded-envelope evidence captured before display truncation; never serialized. */
|
|
35
35
|
codexModelRefusal?: CodexAccountModelRefusal;
|
|
36
|
+
/** Complete bounded-envelope malformed response_format diagnostic verdict captured before display truncation. */
|
|
37
|
+
malformedResponseFormat?: boolean;
|
|
38
|
+
/** Complete bounded-envelope OpenRouter opaque-400 verdict captured before display truncation. */
|
|
39
|
+
openRouterOpaque400?: boolean;
|
|
40
|
+
/** Complete bounded-envelope provider moderation verdict captured before display truncation. */
|
|
41
|
+
providerModerationRefusal?: boolean;
|
|
36
42
|
/** Structured upstream `error.code` when present in the failure body. */
|
|
37
43
|
upstreamCode?: string;
|
|
44
|
+
/**
|
|
45
|
+
* The envelope root's own structured code when it differs from {@link upstreamCode}.
|
|
46
|
+
*
|
|
47
|
+
* `normalizeUpstreamErrorText` selects the nested record first, so a root verdict would
|
|
48
|
+
* otherwise never reach the combo decision. Both transports pass it, and the decision hops
|
|
49
|
+
* only when the root and the record each would.
|
|
50
|
+
*/
|
|
51
|
+
upstreamRootCode?: string;
|
|
38
52
|
/** Sanitized structured `error.message`; compared only against proxy-owned constants, never emitted. */
|
|
39
53
|
upstreamMessage?: string;
|
|
40
54
|
/** Complete structured provider type, retained for conservative recovery classification. */
|
|
@@ -147,6 +161,8 @@ export interface HandleResponsesOptions {
|
|
|
147
161
|
* holder with no principal preserves keyless replay; never populate it from client data.
|
|
148
162
|
*/
|
|
149
163
|
replayPrincipal?: Readonly<{ clientPrincipalId: string | undefined }>;
|
|
164
|
+
/** Captured for the logical request and inherited by retries and combo children. */
|
|
165
|
+
readonly plaintextV2Decision?: boolean;
|
|
150
166
|
/** Called at most once after the complete client body is read and accepted for dispatch. */
|
|
151
167
|
onRequestBodyRead?: () => void;
|
|
152
168
|
/** Internal handoff for retry wrappers that must reuse the already-accounted request body. */
|
|
@@ -154,6 +170,8 @@ export interface HandleResponsesOptions {
|
|
|
154
170
|
forceEmptyResponseId?: boolean;
|
|
155
171
|
/** Internal, connection-owned control channel; never reconstructed from headers. */
|
|
156
172
|
nativeControl?: NativeResponseControl;
|
|
173
|
+
/** A Remote Link WebSocket turn: told the expanded input and the terminal (src/server/link-turn.ts). */
|
|
174
|
+
linkTurn?: import("../link-turn").LinkTurnObserver;
|
|
157
175
|
abortSignal?: AbortSignal;
|
|
158
176
|
/** One-shot TTFT callback: first non-empty model output observed (WP4). */
|
|
159
177
|
onFirstOutput?: () => void;
|
|
@@ -15,6 +15,7 @@ import { executeComboResponses } from "./core-combo";
|
|
|
15
15
|
import { registerTurn, unregisterTurn } from "../lifecycle";
|
|
16
16
|
import { runWithCompactionRecovery } from "./compaction-recovery";
|
|
17
17
|
import { captureAdmissionPolicy } from "../capture-admission-policy";
|
|
18
|
+
import { isPlaintextV2AgentMessagesEnabled } from "../../config/multi-agent-surface";
|
|
18
19
|
/**
|
|
19
20
|
* Route one `/v1/responses` request through the adapter pipeline: recovery loop, passthrough
|
|
20
21
|
* wire, image/web-search bridges, and the terminal-guard continuation.
|
|
@@ -36,6 +37,7 @@ export async function handleResponses(
|
|
|
36
37
|
try {
|
|
37
38
|
const response = await runWithCompactionRecovery(req, config, logCtx, {
|
|
38
39
|
...options, abortSignal,
|
|
40
|
+
plaintextV2Decision: options.plaintextV2Decision ?? isPlaintextV2AgentMessagesEnabled(config),
|
|
39
41
|
advisorAdmissionPolicy: options.advisorAdmissionPolicy ?? captureAdmissionPolicy(config, options.admission, options.admissionScope),
|
|
40
42
|
openAiSidecarAuth: options.openAiSidecarAuth === undefined
|
|
41
43
|
? captureExplicitOpenAiCallerAuth(req.headers, config) : options.openAiSidecarAuth,
|
|
@@ -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;
|
|
@@ -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,111 @@
|
|
|
1
1
|
import type { AdapterRequest } from "../../adapters/base";
|
|
2
2
|
import { formatErrorResponse } from "../../bridge";
|
|
3
|
+
import type { MainQuotaDispatch } from "../../codex/main-account-cache";
|
|
4
|
+
import { isLocalUpstream } from "../../lib/local-upstream";
|
|
5
|
+
import { guardResponseBodyInactivity } from "../../lib/response-body-inactivity";
|
|
3
6
|
import { 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
|
+
const protect = (source: Response): Response =>
|
|
83
|
+
carryResponseToolOwnership(source, guardResponseBodyInactivity(source, options.signal, stallMs).response);
|
|
84
|
+
const quotaOwner = (): MainQuotaDispatch | undefined =>
|
|
85
|
+
admission.authCtx.kind === "main" ? admission.authCtx.mainQuotaDispatch : undefined;
|
|
86
|
+
const originalOwner = quotaOwner();
|
|
87
|
+
let replacementOwner: MainQuotaDispatch | undefined;
|
|
88
|
+
const heldSince = performance.now();
|
|
89
|
+
const selectionStartedAt = Date.now();
|
|
90
|
+
return selectProtocolSafeResetResponse(protect(response), logCtx, async (error, stage, signal, accepts) => {
|
|
91
|
+
// Recover returns only a validated, fresh body; wrapping earlier would hide its lock state.
|
|
92
|
+
const replacement = await recover(error, stage, signal, accepts);
|
|
93
|
+
if (!replacement) return null;
|
|
94
|
+
replacementOwner = quotaOwner();
|
|
95
|
+
return protect(replacement);
|
|
96
|
+
}, {
|
|
97
|
+
allowMissingContentType: options.allowMissingContentType,
|
|
98
|
+
// The collector's silence clock sees only delivered bytes; a combo parent holds the head itself.
|
|
99
|
+
keepalive: options.delivery === "buffered-json" ? "upstream-activity" : options.delivery === "combo-child" ? "none" : "periodic",
|
|
100
|
+
inspectionWindowMs: options.delivery === "direct-stream" ? DIRECT_RESET_INSPECTION_WINDOW_MS : undefined,
|
|
101
|
+
signal: options.signal,
|
|
102
|
+
maxSelectionMs: stallMs > 0 ? stallMs : undefined,
|
|
103
|
+
onCommit: (published, owner) => {
|
|
104
|
+
if (openGateway) guardedResetResponses.set(published, heldSince);
|
|
105
|
+
if (options.delivery === "buffered-json") bufferedSelectionStarts.set(published, selectionStartedAt);
|
|
106
|
+
bindPublishedMainQuotaDispatch(published, owner === "replacement" ? replacementOwner : originalOwner);
|
|
107
|
+
},
|
|
108
|
+
});
|
|
16
109
|
}
|
|
17
110
|
|
|
18
111
|
export function guardPassthroughCompletion(
|
|
@@ -24,12 +117,16 @@ export function guardPassthroughCompletion(
|
|
|
24
117
|
rebuildAndRefetch: (kind: "empty-completion") => Promise<Response | { failed: Response | { kind: "adapter-handoff" } }>,
|
|
25
118
|
): Promise<Response> {
|
|
26
119
|
if (request.url !== "https://apis.opengateway.ai/v1/responses") return Promise.resolve(response);
|
|
120
|
+
const heldSince = guardedResetResponses.get(response);
|
|
27
121
|
return guardOpenGatewayCompletion(response, {
|
|
28
122
|
url: request.url,
|
|
29
123
|
body: parseOutboundRequestBody(request.body),
|
|
30
124
|
signal,
|
|
31
125
|
retryEnabled: config.emptyCompletionRetry,
|
|
32
126
|
stallTimeoutMs: resolveStallTimeoutMs(config.stallTimeoutSec),
|
|
127
|
+
initialBodyInactivityGuarded: heldSince !== undefined,
|
|
128
|
+
// The completion hold and reset selection share one bound on how long the head waits.
|
|
129
|
+
initialHoldSpentMs: heldSince === undefined ? 0 : performance.now() - heldSince,
|
|
33
130
|
recordUsage: usage => { recordKeyWireAttemptUsage(logCtx, usageFromResponsesPayload(usage)); },
|
|
34
131
|
retry: async () => {
|
|
35
132
|
const result = await rebuildAndRefetch("empty-completion");
|
|
@@ -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,
|
|
@@ -174,11 +178,13 @@ import { restoreRoutedToolSearchCallsInJson } from "../../responses/tool-search-
|
|
|
174
178
|
import { responsesJsonToSseStream } from "../responses-json-events";
|
|
175
179
|
import { isCanonicalOpenAiForwardProvider } from "../../providers/openai-tiers";
|
|
176
180
|
import {
|
|
181
|
+
BUFFERED_RESPONSES_TOTAL_TIMEOUT_MS,
|
|
177
182
|
bufferedResponsesReadOptions,
|
|
178
183
|
collectBufferedResponsesSse,
|
|
179
184
|
type BufferedResponsesSseFailure,
|
|
180
185
|
type BufferedResponsesSseResult,
|
|
181
186
|
} from "./buffered-sse-json";
|
|
187
|
+
import { bufferedResetSelectionStartedAt } from "./passthrough-completion";
|
|
182
188
|
|
|
183
189
|
const PLAINTEXT_V2_SSE_PREFIX_LIMIT = 4096;
|
|
184
190
|
|
|
@@ -439,7 +445,7 @@ export async function deliverPassthroughResponse(
|
|
|
439
445
|
): Promise<Response> {
|
|
440
446
|
const { route } = requestState;
|
|
441
447
|
// The proof must belong to the response whose headers are published.
|
|
442
|
-
const arrivalMainDispatch = liveMainQuotaDispatch(admissionState.authCtx, route.provider);
|
|
448
|
+
const arrivalMainDispatch = liveMainQuotaDispatch(admissionState.authCtx, route.provider, nativeExchange.upstreamResponse);
|
|
443
449
|
const { logCtx, config, options, req } = requestContext;
|
|
444
450
|
const {
|
|
445
451
|
codexSafetyBufferingOptions,
|
|
@@ -867,6 +873,12 @@ export async function deliverPassthroughResponse(
|
|
|
867
873
|
}, { dispose: () => plaintextInspector.dispose() })
|
|
868
874
|
: undefined;
|
|
869
875
|
const maskCredential = createOutboundCredentialMask(nativeExchange.request.headers);
|
|
876
|
+
// Copy a boundary synthesizes from upstream evidence, and the row's copy, also refuse any value
|
|
877
|
+
// this request sent, decided from its own headers.
|
|
878
|
+
const repeatsSentValue = createSentValueGuard(nativeExchange.request.headers);
|
|
879
|
+
noteRequestSentValueGuard(logCtx, repeatsSentValue);
|
|
880
|
+
const synthesizedCopyMask = createSynthesizedCopyMask(nativeExchange.request.headers, repeatsSentValue);
|
|
881
|
+
const forwardedEvidenceRedaction = createForwardedEvidenceRedaction(nativeExchange.request.headers, maskCredential);
|
|
870
882
|
const requiredStreamEvidence = { replayUnsafe: !!webSearchBridgePlan };
|
|
871
883
|
const normalizeRequiredToolItem = (item: unknown) => {
|
|
872
884
|
item = restoreImageGenCalls(item, imageGenCallAliases).value;
|
|
@@ -977,10 +989,11 @@ export async function deliverPassthroughResponse(
|
|
|
977
989
|
|
|
978
990
|
if (canonicalBufferedJson) {
|
|
979
991
|
const signal = options.abortSignal ?? req.signal;
|
|
992
|
+
// A turn whose head waited on reset selection keeps the deadline that wait already spent.
|
|
980
993
|
const bufferedRead = bufferedResponsesReadOptions(resolveStallTimeoutMs(
|
|
981
994
|
config.stallTimeoutSec,
|
|
982
995
|
{ localUpstream: nativeExchange.localUpstream },
|
|
983
|
-
));
|
|
996
|
+
), BUFFERED_RESPONSES_TOTAL_TIMEOUT_MS, bufferedResetSelectionStartedAt(nativeExchange.upstreamResponse) ?? Date.now());
|
|
984
997
|
const failBufferedTurn = (
|
|
985
998
|
message: string,
|
|
986
999
|
failure?: BufferedResponsesSseFailure,
|
|
@@ -994,9 +1007,9 @@ export async function deliverPassthroughResponse(
|
|
|
994
1007
|
const presentation = rawPresentation === undefined ? undefined : {
|
|
995
1008
|
status: rawPresentation.status,
|
|
996
1009
|
error: {
|
|
997
|
-
type:
|
|
998
|
-
code:
|
|
999
|
-
message:
|
|
1010
|
+
type: synthesizedCopyMask(rawPresentation.error.type),
|
|
1011
|
+
code: synthesizedCopyMask(rawPresentation.error.code),
|
|
1012
|
+
message: synthesizedCopyMask(rawPresentation.error.message),
|
|
1000
1013
|
},
|
|
1001
1014
|
};
|
|
1002
1015
|
if (upstreamError !== undefined) {
|
|
@@ -1048,7 +1061,7 @@ export async function deliverPassthroughResponse(
|
|
|
1048
1061
|
let raw: BufferedResponsesSseResult | undefined = await collectBufferedResponsesSse(
|
|
1049
1062
|
passthroughSseBody,
|
|
1050
1063
|
upstream,
|
|
1051
|
-
{ signal, terminalBoundary: codexSafetyBufferingOptions, read: bufferedRead, retainTranscript: true },
|
|
1064
|
+
{ signal, terminalBoundary: codexSafetyBufferingOptions, read: bufferedRead, retainTranscript: true, maskCredential: synthesizedCopyMask },
|
|
1052
1065
|
);
|
|
1053
1066
|
if (!raw.ok) {
|
|
1054
1067
|
if (raw.kind === "aborted" || signal.aborted) {
|
|
@@ -1080,7 +1093,7 @@ export async function deliverPassthroughResponse(
|
|
|
1080
1093
|
)
|
|
1081
1094
|
: replayBufferedSse(rawBytes);
|
|
1082
1095
|
const client = await collectBufferedResponsesSse(bufferedClientBody, upstream, {
|
|
1083
|
-
signal,
|
|
1096
|
+
signal, maskCredential: synthesizedCopyMask,
|
|
1084
1097
|
read: bufferedRead,
|
|
1085
1098
|
retainTranscript: false,
|
|
1086
1099
|
});
|
|
@@ -1196,6 +1209,10 @@ export async function deliverPassthroughResponse(
|
|
|
1196
1209
|
}
|
|
1197
1210
|
|
|
1198
1211
|
const relayPlatform = relayPlatformForTests ?? process.platform;
|
|
1212
|
+
// A Remote Link turn while the link WebSocket feature is on reads its upstream only as its client drains (#8601);
|
|
1213
|
+
// every other request keeps the relays' read-ahead below. Its chunks travel in slices, and the paced mark makes the
|
|
1214
|
+
// tee, the eager relay and every stage after them read one slice at a time as the client asks (src/lib/paced-stream.ts).
|
|
1215
|
+
if (linkTurnPacesReads(logCtx)) passthroughSseBody = markPacedStream(sliceChunks(passthroughSseBody, LINK_PACED_SLICE_BYTES));
|
|
1199
1216
|
// #864: win32 rewrite traffic must never enter the tee()+JS-pull chain
|
|
1200
1217
|
// (Bun#32111 JS-sink segfault — text frames pass, the terminal block is
|
|
1201
1218
|
// lost). The eager single reader applies the same rewrites inline.
|
|
@@ -1276,7 +1293,9 @@ export async function deliverPassthroughResponse(
|
|
|
1276
1293
|
}, {
|
|
1277
1294
|
clientGoneSignal: options.abortSignal,
|
|
1278
1295
|
terminalBoundary: codexSafetyBufferingOptions,
|
|
1279
|
-
maskCredential,
|
|
1296
|
+
maskCredential: synthesizedCopyMask,
|
|
1297
|
+
redactForwardedEvidence: forwardedEvidenceRedaction,
|
|
1298
|
+
onSyntheticTail: (payload, verdict) => noteRelaySyntheticTail(logCtx, payload, verdict),
|
|
1280
1299
|
...(inlineEagerRewrite ? { rewriteBudget: translatorBudget } : {}),
|
|
1281
1300
|
...(logCtx.upstreamError === undefined ? {} : { upstreamError: logCtx.upstreamError }),
|
|
1282
1301
|
});
|
|
@@ -1371,7 +1390,8 @@ export async function deliverPassthroughResponse(
|
|
|
1371
1390
|
responseEffects.responseCompletionCancelled = true;
|
|
1372
1391
|
clientGone.abort(reason);
|
|
1373
1392
|
},
|
|
1374
|
-
{ upstreamError: logCtx.upstreamError, terminalBoundary: codexSafetyBufferingOptions, maskCredential
|
|
1393
|
+
{ upstreamError: logCtx.upstreamError, terminalBoundary: codexSafetyBufferingOptions, maskCredential: synthesizedCopyMask, redactForwardedEvidence: forwardedEvidenceRedaction,
|
|
1394
|
+
onSyntheticTail: (payload, verdict) => noteRelaySyntheticTail(logCtx, payload, verdict) },
|
|
1375
1395
|
);
|
|
1376
1396
|
return markNativePassthroughSseResponse(new Response(clientBody, {
|
|
1377
1397
|
status: upstreamResponse.status,
|