@bitkyc08/opencodex 2.100.2 → 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-BcaI-VCr.js → Tray-BV4ms9U9.js} +1 -1
- package/gui/dist/assets/{brand-mark-DU-0Vdkr.js → brand-mark-XOLJbomA.js} +1 -1
- package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
- package/gui/dist/assets/{index-DJEkIDAi.css → index-DQtCRNAw.css} +1 -1
- package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.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-DT146AhS.js → Tray-BrHaVRAq.js} +1 -1
- package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
- package/gui/dist/classic/assets/{quota-summary-CakPe9Ni.js → quota-summary-Dy5_wfTT.js} +1 -1
- 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 +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/google-antigravity-wire.ts +7 -5
- 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/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 +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 +24 -4
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +17 -1
- package/src/cli/account-auth.ts +54 -21
- 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 +3 -3
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +41 -16
- 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 +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 +168 -0
- package/src/cli/dispatch.ts +54 -12
- 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 +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 +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 +87 -0
- package/src/cli/link-status-child.ts +44 -1
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +314 -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 +28 -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 -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-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-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 +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 +22 -3
- 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-collision.ts +23 -22
- package/src/codex/auth-context.ts +21 -6
- 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/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.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 +23 -1
- 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 +330 -2
- 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/schema/config-schema.ts +6 -0
- package/src/config/schema/leaf-validators.ts +9 -2
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/generated/compatibility-version.json +948 -392
- 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/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/gui-pair-capability.ts +2 -1
- 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 +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 +50 -10
- 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 +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/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 +46 -2
- 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 +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 +33 -18
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- 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-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 +510 -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 +3 -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-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/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/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/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 +98 -0
- 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 +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/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +190 -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 +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/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 +173 -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 +36 -13
- 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 +11 -0
- package/src/server/management/provider-routes.ts +64 -61
- 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/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 +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-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 +5 -7
- 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 +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 +32 -4
- package/src/server/responses/core-errors.ts +5 -2
- 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 +6 -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 +74 -73
- 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 +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 +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/config.ts +42 -18
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +47 -2
- package/src/types/request.ts +4 -0
- package/src/types.ts +3 -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/gui/dist/assets/App-BpJOzw4F.js +0 -59
- package/gui/dist/assets/index-Bbor_y80.js +0 -94
- package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
- package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
|
@@ -152,6 +152,7 @@ import { requiresPlaintextReasoningReplay } from "../../adapters/openai-response
|
|
|
152
152
|
import { destinationDecodesNativeCompactionBlob, isOpenAiOperatedResponsesDestination } from "../../providers/openai-tiers-destination";
|
|
153
153
|
import { bindRouteReasoningReplayScope } from "./core-replay";
|
|
154
154
|
import { commitReasoningReplayServingIdentity } from "../../responses/reasoning-replay-cache";
|
|
155
|
+
import { rewriteRoutedCustomToolsForUpstream, RoutedCustomToolCompatError, validateFinalCustomToolCompatibility } from "../../responses/custom-tool-compat";
|
|
155
156
|
import { findInvalidRetainedCompactionEnvelope, InvalidRetainedCompactionEnvelopeError } from "../../responses/retained-compaction";
|
|
156
157
|
import { nativeCompactResponseSchema } from "../../responses/schema";
|
|
157
158
|
import { NATIVE_RESERVE_MODEL } from "../../codex/catalog/native-models";
|
|
@@ -177,12 +178,13 @@ import {
|
|
|
177
178
|
DecompressedBodyTooLargeError,
|
|
178
179
|
UnsupportedContentEncodingError,
|
|
179
180
|
} from "../request-decompress";
|
|
180
|
-
import { resolveAdapter, resolveWireProtocolOverride } from "../adapter-resolve";
|
|
181
|
+
import { projectCapturedCustomToolPolicy, resolveAdapter, resolveWireProtocolOverride } from "../adapter-resolve";
|
|
181
182
|
import { hasKeyPoolFailover, rotateProviderTransportOn429, selectProactiveApiKeyTransport, transientRetryPolicyFor } from "../../providers/key-failover";
|
|
182
183
|
import { transientSendCapFor } from "./request-send-budget";
|
|
183
184
|
import { distributedKeyPhysicalFetch, recordDistributedResponseFailure } from "../../providers/api-key-response-ownership";
|
|
185
|
+
import { passiveKeyPhysicalFetch } from "../../providers/passive-key-observation";
|
|
184
186
|
import { isProviderApiKeyPaused, ProviderApiKeyPausedError } from "../../providers/api-key-pause";
|
|
185
|
-
import { providerApiKeySelectionIsCurrent, resolveCurrentProviderApiKeyTransport } from "../../providers/api-key-selection";
|
|
187
|
+
import { providerAffinityGenerationIsCurrent, providerApiKeySelectionIsCurrent, resolveCurrentProviderApiKeyTransport } from "../../providers/api-key-selection";
|
|
186
188
|
import { stampApiKeyAccountLabel } from "../../providers/label";
|
|
187
189
|
import { shouldAttemptImageTierRetry } from "../image-retry";
|
|
188
190
|
import { resolveProviderTransport } from "../../providers/xai-transport";
|
|
@@ -236,9 +238,10 @@ import { fetchWithHeaderTimeout, providerFetch, safeHostLabel, safeOriginLabel,
|
|
|
236
238
|
import { requestPacingOverloadResponse } from "./pacing-overload";
|
|
237
239
|
import { shouldRetryCodexPoolAccountQuota, shouldRetryCodexPoolAccountTransient } from "./core-codex-account";
|
|
238
240
|
import { mapCodexAuthContextErrorToResponse, nativeMainRefreshFailureResponse } from "./codex-auth-error";
|
|
239
|
-
import {
|
|
241
|
+
import { affinityLaneFromRequest, linkRequestSessionLane, reasoningReplayConversationIdFromResponsesRequest, sessionIdHeaderFromRequest, sessionLaneIdFromRequest } from "../request-log-conversation";
|
|
240
242
|
import { recallComboForLane } from "./combo-session-recall";
|
|
241
243
|
import { redactHostedImageDisplayPaths } from "../responses-hosted-image-display";
|
|
244
|
+
import { warnEagerCodexToolCatalog } from "./codex-tool-catalog";
|
|
242
245
|
|
|
243
246
|
export const COMPACT_RESPONSE_MAX_BYTES = 32 * 1024 * 1024;
|
|
244
247
|
|
|
@@ -697,6 +700,8 @@ export async function handleResponsesCompact(
|
|
|
697
700
|
}
|
|
698
701
|
const clientModelLabel = options.clientModelLabel ?? clientFacingModelLabel(options.compactionRoutingOverride?.sourceModel ?? (body as { model?: unknown }).model);
|
|
699
702
|
options = { ...options, clientModelLabel };
|
|
703
|
+
// Compaction body `input` is forwarded history, so only the top-level catalog is counted.
|
|
704
|
+
warnEagerCodexToolCatalog(body, req.headers, { surface: "compact", logicalRequest: logCtx });
|
|
700
705
|
// Compaction forwards client history upstream too; keep local artifact paths out of it.
|
|
701
706
|
redactHostedImageDisplayPaths(body);
|
|
702
707
|
if (!options.compactionRoutingOverride) {
|
|
@@ -965,11 +970,14 @@ export async function handleResponsesCompact(
|
|
|
965
970
|
// Transport variant, for the same reason as the Responses core: the persisted row has no
|
|
966
971
|
// registry backfills, and compactProvider is read for its transport fields below.
|
|
967
972
|
let warmKeyProvider;
|
|
968
|
-
|
|
973
|
+
const affinityLane = affinityLaneFromRequest(req, logCtx, config, admission);
|
|
974
|
+
if (affinityLane) logCtx.affinityLane = affinityLane;
|
|
975
|
+
try { warmKeyProvider = selectProactiveApiKeyTransport(config, route.providerName, compactProvider, undefined, Date.now(), { lane: affinityLane, model: route.modelId, log: logCtx }); }
|
|
969
976
|
catch (error) {
|
|
970
977
|
const refusal = requestPacingOverloadResponse(error);
|
|
971
|
-
if (refusal) return refusal;
|
|
978
|
+
if (refusal) { logCtx.terminalSource = "synthetic"; return refusal; }
|
|
972
979
|
if (error instanceof ProviderApiKeyPausedError) {
|
|
980
|
+
logCtx.terminalSource = "synthetic";
|
|
973
981
|
return formatErrorResponse(403, "permission_error", error.message);
|
|
974
982
|
}
|
|
975
983
|
throw error;
|
|
@@ -1193,6 +1201,8 @@ export async function handleResponsesCompact(
|
|
|
1193
1201
|
sendAuthCtx: CodexAuthContext,
|
|
1194
1202
|
onPhysicalDispatch?: () => void,
|
|
1195
1203
|
): Promise<Response> => {
|
|
1204
|
+
// Only the captured custom-tool contract: native compact keeps the provider's own wire.
|
|
1205
|
+
sendProvider = projectCapturedCustomToolPolicy(sendProvider, route.staticPolicy);
|
|
1196
1206
|
// A gateway send carries only its own transport headers, whatever recovery handed in.
|
|
1197
1207
|
// An account-change scrub that removed the turn state from the send headers still applies.
|
|
1198
1208
|
let wireHeaders = gatewayTransport ? new Headers(gatewayTransport.headers) : sendHeaders;
|
|
@@ -1229,8 +1239,17 @@ export async function handleResponsesCompact(
|
|
|
1229
1239
|
replayBody = isolateCodexPoolClientMetadata(replayBody, sendAuthCtx.chatgptAccountId) as typeof replayBody;
|
|
1230
1240
|
}
|
|
1231
1241
|
// A queued key selection can refresh the destination; project only for this send.
|
|
1232
|
-
|
|
1242
|
+
replayBody = isOpenAiOperatedResponsesDestination(sendProvider)
|
|
1233
1243
|
? repairUrlCitationAnnotations(replayBody) : stripCanonicalOnlyInputItems(stripCanonicalOnlyTopLevelFields(replayBody));
|
|
1244
|
+
// Only an explicit `false` lowers custom tools here; with no declaration, native compact
|
|
1245
|
+
// forwards every custom tool and its history exactly as before this capability existed.
|
|
1246
|
+
if (sendProvider.supportsResponsesCustomTools === false && !isCanonicalOpenAiForwardProvider(sendProvider)) {
|
|
1247
|
+
replayBody = rewriteRoutedCustomToolsForUpstream(
|
|
1248
|
+
replayBody, sendProvider.supportsResponsesCustomTools,
|
|
1249
|
+
).body as typeof replayBody;
|
|
1250
|
+
validateFinalCustomToolCompatibility(replayBody, sendProvider.supportsResponsesCustomTools);
|
|
1251
|
+
}
|
|
1252
|
+
return replayBody;
|
|
1234
1253
|
};
|
|
1235
1254
|
const doFetch = (upstreamRecovery?: UpstreamSendRecovery) => fetchWithHeaderTimeout(
|
|
1236
1255
|
compactUrl,
|
|
@@ -1253,6 +1272,7 @@ export async function handleResponsesCompact(
|
|
|
1253
1272
|
dispatchOverride: sendProvider.authMode !== "forward" && sendProvider.apiKey
|
|
1254
1273
|
? async (_input, init, execute, reacquirePacing) => {
|
|
1255
1274
|
for (let attempt = 0; !providerApiKeySelectionIsCurrent(config, route.providerName, sendProvider); attempt++) {
|
|
1275
|
+
if (!providerAffinityGenerationIsCurrent(config, route.providerName, sendProvider)) throw new Error("Provider affinity selection is no longer available");
|
|
1256
1276
|
if (attempt >= 3) throw new Error("Provider key selection changed repeatedly before compact dispatch");
|
|
1257
1277
|
let current = resolveCurrentProviderApiKeyTransport(config, route.providerName, sendProvider);
|
|
1258
1278
|
if (!current && sendProvider.requestPacing?.enabled
|
|
@@ -1264,6 +1284,7 @@ export async function handleResponsesCompact(
|
|
|
1264
1284
|
if (!current?.apiKey && isProviderApiKeyPaused(config.providers[route.providerName])) throw new ProviderApiKeyPausedError();
|
|
1265
1285
|
throw new Error("Provider key selection is no longer available for compact");
|
|
1266
1286
|
}
|
|
1287
|
+
current = projectCapturedCustomToolPolicy(current, route.staticPolicy);
|
|
1267
1288
|
const rebuilt = new Headers(sendHeaders);
|
|
1268
1289
|
for (const name of Object.keys(sendProvider.headers ?? {})) rebuilt.delete(name);
|
|
1269
1290
|
for (const [name, value] of Object.entries(current.headers ?? {})) rebuilt.set(name, value);
|
|
@@ -1288,7 +1309,7 @@ export async function handleResponsesCompact(
|
|
|
1288
1309
|
identityId: logCtx.accountLogLabel })) throw new SendBudgetExhaustedError(errorDestinationLabel(compactUrl));
|
|
1289
1310
|
noteProviderAttemptSend(logCtx, route.providerName, sendProvider, logCtx.usageLogInputTokens, upstreamRecovery);
|
|
1290
1311
|
const physicalFetch = ((input, physicalInit) => sendWithConnectionPolicy(
|
|
1291
|
-
distributedKeyPhysicalFetch((sendProvider as { fetch?: typeof fetch }).fetch ?? execute, route.providerName, sendProvider, compactUrl), String(input),
|
|
1312
|
+
passiveKeyPhysicalFetch(distributedKeyPhysicalFetch((sendProvider as { fetch?: typeof fetch }).fetch ?? execute, route.providerName, sendProvider, compactUrl), config, route.providerName, sendProvider), String(input),
|
|
1292
1313
|
physicalInit, { providerName: route.providerName, provider: sendProvider })) as typeof fetch;
|
|
1293
1314
|
return fetchWithHeaderTimeout(compactUrl,
|
|
1294
1315
|
{ ...init, headers: sendHeaders, body: JSON.stringify({ ...buildCompactSendBody() as typeof compactBody, model: route.modelId }) },
|
|
@@ -1325,7 +1346,9 @@ export async function handleResponsesCompact(
|
|
|
1325
1346
|
let outcomeCtx = authCtx;
|
|
1326
1347
|
const localDispatchRefusal = (error: unknown): Response | undefined => {
|
|
1327
1348
|
const cause = unwrapUpstreamRetryEvidenceError(error);
|
|
1328
|
-
const response = (cause instanceof
|
|
1349
|
+
const response = (cause instanceof RoutedCustomToolCompatError
|
|
1350
|
+
? formatErrorResponse(400, "invalid_request_error", redactSecretString(cause.message))
|
|
1351
|
+
: cause instanceof InvalidRetainedCompactionEnvelopeError
|
|
1329
1352
|
? formatErrorResponse(400, "invalid_request_error", cause.message)
|
|
1330
1353
|
: cause instanceof ProviderApiKeyPausedError ? formatErrorResponse(403, "permission_error", cause.message) : undefined)
|
|
1331
1354
|
?? requestPacingOverloadResponse(cause) ?? spendLedgerStorageErrorResponse(error, logCtx) ?? (cause instanceof SendBudgetExhaustedError
|
|
@@ -1334,6 +1357,7 @@ export async function handleResponsesCompact(
|
|
|
1334
1357
|
now: Date.now(), accountSelector: route.codexAccountNamespace,
|
|
1335
1358
|
}));
|
|
1336
1359
|
if (response) {
|
|
1360
|
+
logCtx.terminalSource = "synthetic";
|
|
1337
1361
|
releaseUpstreamHostAdmission(compactHostAdmissionLease);
|
|
1338
1362
|
compactHostAdmissionLease = null;
|
|
1339
1363
|
releaseCodexAuthContextProbeLease(outcomeCtx);
|
|
@@ -22,6 +22,7 @@ import {
|
|
|
22
22
|
resetUpstreamHostHealth,
|
|
23
23
|
} from "../../codex/upstream-host-health";
|
|
24
24
|
import { safeOriginLabel, fetchWithHeaderTimeout, providerFetch } from "./fetch-helpers";
|
|
25
|
+
import type { AdapterRequest } from "../../adapters/base";
|
|
25
26
|
import { classifyPoolRecoveryDispatch } from "../../routing/probe-lease";
|
|
26
27
|
import { formatErrorResponse } from "../../bridge";
|
|
27
28
|
import { readBoundedResponseBody } from "../../lib/bounded-body";
|
|
@@ -221,14 +222,25 @@ export class PoolPreOutputRefusals {
|
|
|
221
222
|
}
|
|
222
223
|
|
|
223
224
|
|
|
225
|
+
// A recovery that can publish either of two physical attempts binds the proof to the published head.
|
|
226
|
+
const publishedMainQuotaDispatches = new WeakMap<Response, MainQuotaDispatch | null>();
|
|
227
|
+
|
|
228
|
+
/** Bind the quota proof of the attempt whose head `published` carries; none means no proof. */
|
|
229
|
+
export function bindPublishedMainQuotaDispatch(published: Response, dispatch: MainQuotaDispatch | undefined): void {
|
|
230
|
+
publishedMainQuotaDispatches.set(published, dispatch ?? null);
|
|
231
|
+
}
|
|
232
|
+
|
|
224
233
|
/** Live proof that this plain-main response used the observed main credential. */
|
|
225
234
|
export function liveMainQuotaDispatch(
|
|
226
|
-
authCtx: CodexAuthContext, provider: OcxProviderConfig,
|
|
235
|
+
authCtx: CodexAuthContext, provider: OcxProviderConfig, published?: Response,
|
|
227
236
|
): MainQuotaDispatch | undefined {
|
|
228
|
-
if (authCtx.kind !== "main"
|
|
237
|
+
if (authCtx.kind !== "main") return undefined;
|
|
238
|
+
const dispatch = published && publishedMainQuotaDispatches.has(published)
|
|
239
|
+
? publishedMainQuotaDispatches.get(published) : authCtx.mainQuotaDispatch;
|
|
240
|
+
if (!dispatch) return undefined;
|
|
229
241
|
if (!isCanonicalOpenAiForwardProvider(provider)
|
|
230
242
|
|| provider.authMode !== "forward" || provider.adapter !== "openai-responses") return undefined;
|
|
231
|
-
return isMainQuotaDispatchLive(
|
|
243
|
+
return isMainQuotaDispatchLive(dispatch) ? dispatch : undefined;
|
|
232
244
|
}
|
|
233
245
|
|
|
234
246
|
export function codexWsQuotaObserver(authCtx: CodexAuthContext, provider: OcxProviderConfig, modelId?: string): CodexWsQuotaObserver | undefined {
|
|
@@ -529,6 +541,7 @@ export interface CodexPoolAccountRetryArgs {
|
|
|
529
541
|
httpOnly?: boolean;
|
|
530
542
|
/** Pre-output refusal hold for the alternate's WebSocket send (#6969); the caller restores. */
|
|
531
543
|
preOutputRefusalHold?: CodexWsPreOutputRefusalHold;
|
|
544
|
+
onPhysicalSend?: (request: AdapterRequest, body: BodyInit | null | undefined) => void;
|
|
532
545
|
onResponse?: (
|
|
533
546
|
response: Response,
|
|
534
547
|
authCtx: CodexAuthContext,
|
|
@@ -1072,6 +1085,7 @@ export async function retryCodexPoolOnAlternateAccount(
|
|
|
1072
1085
|
httpOnly,
|
|
1073
1086
|
providerName: route.providerName,
|
|
1074
1087
|
modelId: route.modelId,
|
|
1088
|
+
onPhysicalDispatch: body => args.onPhysicalSend?.(request, body),
|
|
1075
1089
|
preOutputRefusalHold: args.preOutputRefusalHold,
|
|
1076
1090
|
accountAutoPause: (name, provider, headers) => captureAccountAutoPauseAttempt(name, provider, { config, codex: retryAuthCtx }, headers),
|
|
1077
1091
|
onCodexWsQuota: codexWsQuotaObserver(retryAuthCtx, route.provider, route.modelId),
|
|
@@ -8,6 +8,7 @@ import {
|
|
|
8
8
|
codexAccountModelRefusalHardStopCode,
|
|
9
9
|
isMalformedResponseFormatRequest,
|
|
10
10
|
isOpenRouterOpaque400Envelope,
|
|
11
|
+
isProviderModerationRefusal,
|
|
11
12
|
upstreamEnvelopeRootCode,
|
|
12
13
|
type CodexAccountModelRefusal,
|
|
13
14
|
} from "../../combos/failover";
|
|
@@ -66,6 +67,7 @@ export async function consumeComboFailure(
|
|
|
66
67
|
let codexModelRefusal: CodexAccountModelRefusal | undefined;
|
|
67
68
|
let malformedResponseFormat: boolean | undefined;
|
|
68
69
|
let openRouterOpaque400: boolean | undefined;
|
|
70
|
+
let providerModerationRefusal: boolean | undefined;
|
|
69
71
|
let usage: OcxUsage | undefined;
|
|
70
72
|
let upstreamCode: string | undefined;
|
|
71
73
|
let upstreamRootCode: string | undefined;
|
|
@@ -107,6 +109,11 @@ export async function consumeComboFailure(
|
|
|
107
109
|
malformedResponseFormat = isMalformedResponseFormatRequest(response.status, body.text);
|
|
108
110
|
openRouterOpaque400 = isOpenRouterOpaque400Envelope(body.text);
|
|
109
111
|
}
|
|
112
|
+
// Judged on the whole body: the classification text below is cut at 500 characters, and a
|
|
113
|
+
// hard refusal after the cut must still veto a moderation hop.
|
|
114
|
+
if (response.status === 400 || response.status === 422) {
|
|
115
|
+
providerModerationRefusal = isProviderModerationRefusal(response.status, body.text, undefined, true);
|
|
116
|
+
}
|
|
110
117
|
// Status-independent: the nested record is what normalization selects, so a root verdict
|
|
111
118
|
// beside it has to be captured here or the conflict rule never sees it.
|
|
112
119
|
upstreamRootCode = upstreamEnvelopeRootCode(body.text);
|
|
@@ -189,6 +196,7 @@ export async function consumeComboFailure(
|
|
|
189
196
|
...(codexModelRefusal !== undefined ? { codexModelRefusal } : {}),
|
|
190
197
|
...(malformedResponseFormat !== undefined ? { malformedResponseFormat } : {}),
|
|
191
198
|
...(openRouterOpaque400 !== undefined ? { openRouterOpaque400 } : {}),
|
|
199
|
+
...(providerModerationRefusal !== undefined ? { providerModerationRefusal } : {}),
|
|
192
200
|
...(normalizedUpstreamCode !== undefined ? { upstreamCode: normalizedUpstreamCode } : {}),
|
|
193
201
|
// A rewritten identity (policy, replay refusal) is the whole verdict; the root's own code
|
|
194
202
|
// would only re-open a decision that rewrite already settled.
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { responseReplayOwnerKey } from "../../responses/state/replay-owner";
|
|
2
|
+
import { isPlaintextV2AgentMessagesEnabled } from "../../config/multi-agent-surface";
|
|
1
3
|
import { comboLogLabel, comboTargetLogLabel } from "../../combos/resolve";
|
|
2
4
|
import { clientFacingModelLabel, clientFacingModelText } from "../../lib/error-destination";
|
|
3
5
|
import { projectLocalModelRefusalLog } from "../request-log-failure-detail";
|
|
@@ -21,6 +23,7 @@ import {
|
|
|
21
23
|
} from "../../reasoning-effort";
|
|
22
24
|
import { admissionMayUseMeteredComboTargets, resolveAdmissionModelScope, routeAllowedByScope } from "../admission-model-scope";
|
|
23
25
|
import { recordAttemptRequestedEffort } from "../request-log";
|
|
26
|
+
import { failLinkTurnExpansion, markLinkTurnMissing, observeLinkTurnExpansion } from "../link-turn";
|
|
24
27
|
import {
|
|
25
28
|
CODEX_TEXT_GUARDED_BUDGET_POLICY,
|
|
26
29
|
deriveRequestExecutionBudget,
|
|
@@ -62,10 +65,12 @@ import { formatErrorResponse } from "../../bridge";
|
|
|
62
65
|
import { SEND_BUDGET_EXHAUSTED_CODE } from "../../lib/errors";
|
|
63
66
|
import {
|
|
64
67
|
expandPreviousResponseInput,
|
|
68
|
+
previousResponseRestoredPrefixLength,
|
|
65
69
|
previousResponseReplayFailure,
|
|
66
70
|
previousResponseProviderState,
|
|
67
71
|
} from "../../responses/state";
|
|
68
72
|
import { hasUnreadableEncryptedAgentTask } from "./encrypted-payload";
|
|
73
|
+
import { eagerCodexToolCatalogSurface, warnEagerCodexToolCatalog } from "./codex-tool-catalog";
|
|
69
74
|
import { captureRouteStaticPolicy, routeConcreteModel, comboRouteDecisionTrace } from "../../router";
|
|
70
75
|
import { memoryModelRouteReason } from "./memory-models";
|
|
71
76
|
import { baseProviderLabel, poolAccountProviderLabel } from "../../providers/label";
|
|
@@ -443,13 +448,17 @@ export async function executeComboResponses(
|
|
|
443
448
|
// continuation that only references prior images still fails closed when
|
|
444
449
|
// imageInput is disabled (and so targets see the full replayed input).
|
|
445
450
|
const inboundClientThreadId = req.headers.get("x-codex-parent-thread-id")?.trim() || undefined;
|
|
446
|
-
const
|
|
451
|
+
const inboundOwnThreadId = req.headers.get("thread-id")?.trim() || undefined;
|
|
452
|
+
const strictReplay = options.plaintextV2Decision ?? isPlaintextV2AgentMessagesEnabled(config);
|
|
453
|
+
const replayOwnerKey = strictReplay ? responseReplayOwnerKey(replayPrincipal.clientPrincipalId, inboundOwnThreadId) : undefined;
|
|
454
|
+
const body = expandPreviousResponseInput(rawBody, strictReplay ? inboundOwnThreadId : inboundClientThreadId, replayOwnerKey);
|
|
447
455
|
const replayFailure = previousResponseReplayFailure(body);
|
|
448
456
|
if (replayFailure?.reason === "scope_mismatch") {
|
|
449
457
|
console.warn("[opencodex] refusing continuation because the client task scope does not match replay state");
|
|
450
458
|
}
|
|
451
459
|
// Local replay failures require full client replay.
|
|
452
460
|
if (replayFailure) {
|
|
461
|
+
failLinkTurnExpansion(options.linkTurn, req, logCtx, body, replayFailure.reason);
|
|
453
462
|
return formatErrorResponse(
|
|
454
463
|
400,
|
|
455
464
|
"previous_response_not_found",
|
|
@@ -462,10 +471,15 @@ export async function executeComboResponses(
|
|
|
462
471
|
// object (still carrying previous_response_id) and must not be treated as
|
|
463
472
|
// unresolved — text-only stored continuations remain allowed.
|
|
464
473
|
const requestedPreviousId = typeof (rawBody as { previous_response_id?: unknown } | null)?.previous_response_id === "string"
|
|
465
|
-
? (rawBody as { previous_response_id: string }).previous_response_id
|
|
474
|
+
? (rawBody as { previous_response_id: string }).previous_response_id
|
|
466
475
|
: "";
|
|
467
|
-
const unresolvedPrevious = requestedPreviousId.length > 0 && body === rawBody;
|
|
476
|
+
const unresolvedPrevious = requestedPreviousId.trim().length > 0 && body === rawBody;
|
|
477
|
+
// Remote Link (design T4 5 and 9.1): the combo's own expansion is the request's one capture point; its
|
|
478
|
+
// children replay a snapshot and skip theirs.
|
|
479
|
+
observeLinkTurnExpansion(options.linkTurn, req, logCtx, body,
|
|
480
|
+
requestedPreviousId.trim().length > 0 ? (unresolvedPrevious ? "unexpanded" : "chained") : "none");
|
|
468
481
|
if (combo.imageInput === "disabled" && unresolvedPrevious) {
|
|
482
|
+
markLinkTurnMissing(logCtx);
|
|
469
483
|
return formatErrorResponse(
|
|
470
484
|
400,
|
|
471
485
|
"previous_response_not_found",
|
|
@@ -475,6 +489,16 @@ export async function executeComboResponses(
|
|
|
475
489
|
if (combo.imageInput === "disabled" && comboRequestHasImageInput(body)) {
|
|
476
490
|
return formatErrorResponse(400, "invalid_request_error", "This combo does not accept image input");
|
|
477
491
|
}
|
|
492
|
+
// The combo ladder owns the whole logical request, so the catalog diagnostic is counted here for
|
|
493
|
+
// combo-routed turns; children run as concrete selections and would otherwise never report it.
|
|
494
|
+
// Counting after the replay expansion keeps restored history out of the tally.
|
|
495
|
+
if ((options.inboundWire ?? "responses") === "responses") {
|
|
496
|
+
warnEagerCodexToolCatalog(body, req.headers, {
|
|
497
|
+
surface: eagerCodexToolCatalogSurface(body, options.compactionRecoveryKind),
|
|
498
|
+
replayPrefixLength: previousResponseRestoredPrefixLength(body),
|
|
499
|
+
logicalRequest: logCtx,
|
|
500
|
+
});
|
|
501
|
+
}
|
|
478
502
|
const comboReplaySnapshot = {
|
|
479
503
|
sourceBody: body,
|
|
480
504
|
previousResponseInputExpanded: body !== rawBody
|
|
@@ -1065,7 +1089,8 @@ export async function executeComboResponses(
|
|
|
1065
1089
|
const childLog: RequestLogContext = {
|
|
1066
1090
|
model: pick.target.model,
|
|
1067
1091
|
provider: pick.target.provider,
|
|
1068
|
-
...(logCtx.conversationId ? { conversationId: logCtx.conversationId } : {}),
|
|
1092
|
+
...(logCtx.conversationId ? { conversationId: logCtx.conversationId, conversationIdIsHermesFallback: logCtx.conversationIdIsHermesFallback } : {}),
|
|
1093
|
+
...(logCtx.affinityLane ? { affinityLane: logCtx.affinityLane } : {}),
|
|
1069
1094
|
...(logCtx.surface ? { surface: logCtx.surface } : {}),
|
|
1070
1095
|
};
|
|
1071
1096
|
const targetReasoningEfforts = supportedLadderFor({
|
|
@@ -1227,6 +1252,7 @@ export async function executeComboResponses(
|
|
|
1227
1252
|
},
|
|
1228
1253
|
}) : await requestDispatchers.handleResponses(childRequest, config, childLog, {
|
|
1229
1254
|
...options,
|
|
1255
|
+
plaintextV2Decision: strictReplay,
|
|
1230
1256
|
replayPrincipal,
|
|
1231
1257
|
// A bridge child is a concrete route; the native source belongs to this loop only.
|
|
1232
1258
|
...(options.protocolSource ? { protocolSource: undefined } : {}),
|
|
@@ -1437,6 +1463,7 @@ export async function executeComboResponses(
|
|
|
1437
1463
|
verifiedPlanRefusal: failure.verifiedPlanRefusal,
|
|
1438
1464
|
malformedResponseFormat: failure.malformedResponseFormat,
|
|
1439
1465
|
openRouterOpaque400: failure.openRouterOpaque400,
|
|
1466
|
+
providerModerationRefusal: failure.providerModerationRefusal,
|
|
1440
1467
|
// The adapter the failed leg actually resolved: a configured `kiro` provider can route a
|
|
1441
1468
|
// model through another wire via `modelAdapters`, and an unresolved leg grants no hop.
|
|
1442
1469
|
failedAdapter: childLog.providerAdapter,
|
|
@@ -1515,6 +1542,7 @@ export async function executeComboResponses(
|
|
|
1515
1542
|
code: failure.upstreamCode,
|
|
1516
1543
|
malformedResponseFormat: failure.malformedResponseFormat,
|
|
1517
1544
|
openRouterOpaque400: failure.openRouterOpaque400,
|
|
1545
|
+
providerModerationRefusal: failure.providerModerationRefusal,
|
|
1518
1546
|
});
|
|
1519
1547
|
const failedTargetKey = targetKey(pick.target);
|
|
1520
1548
|
let failedTargetCooldownRecorded = false;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { ComboExclusionReasons } from "../../combos/resolve";
|
|
2
2
|
import { markProxyError } from "../../lib/client-error-body";
|
|
3
|
-
import { formatClientRetryAfter } from "../../lib/client-retry-after";
|
|
3
|
+
import { appendClientRetryIn, formatClientRetryAfter } from "../../lib/client-retry-after";
|
|
4
4
|
import { readBoundedResponseBody } from "../../lib/bounded-body";
|
|
5
5
|
import { redactSecretString } from "../../lib/redact";
|
|
6
6
|
import { isCyberPolicyMessage, isCyberPolicyCode } from "../../lib/errors";
|
|
@@ -110,9 +110,12 @@ export function comboUnavailableResponse(
|
|
|
110
110
|
// Advice leaves in this proxy's format, whatever form the earliest cooldown was recorded in.
|
|
111
111
|
const advice = formatClientRetryAfter(options?.retryAfter);
|
|
112
112
|
if (advice !== undefined) headers.set("Retry-After", advice);
|
|
113
|
+
// Name the earliest recovery in the body too: a client that drops the header still
|
|
114
|
+
// shows the user how long the combo stays cooled.
|
|
113
115
|
return markProxyError(new Response(
|
|
114
116
|
JSON.stringify({
|
|
115
|
-
|
|
117
|
+
// Built from the header value itself, so an HTTP-date cannot make the body and header disagree.
|
|
118
|
+
error: { message: appendClientRetryIn(message, advice), type: "server_error", code: "combo_unavailable" },
|
|
116
119
|
}),
|
|
117
120
|
{ status: 503, headers },
|
|
118
121
|
), options?.presentation);
|
|
@@ -3,6 +3,7 @@ import type { TranslatorBudget } from "../../lib/translator-budget";
|
|
|
3
3
|
import { carryResponseToolOwnership } from "./response-tool-ownership";
|
|
4
4
|
import { carryPolicyCandidateRefusal } from "./policy-request-scope";
|
|
5
5
|
import { finalizeTranslatorBudgetResponse } from "../../lib/translator-budget";
|
|
6
|
+
import { carryPacedStream, pacedQueuingStrategy } from "../../lib/paced-stream";
|
|
6
7
|
import { carryReplayRefusal, isNonReplayableResponse, markResponseNonReplayable } from "../../lib/upstream-retry";
|
|
7
8
|
import { isVerifiedModelNotInPlanResponse, markVerifiedModelNotInPlanResponse } from "../../lib/errors";
|
|
8
9
|
import { carryCodexAccountCooldownResponse } from "../../codex/account-cooldown-response";
|
|
@@ -68,7 +69,7 @@ export function finalizeAccountLease(response: Response, release: () => void, on
|
|
|
68
69
|
const reader = response.body.getReader();
|
|
69
70
|
let done = false;
|
|
70
71
|
const finish = () => { if (!done) { done = true; release(); } };
|
|
71
|
-
const body = new ReadableStream<Uint8Array>({
|
|
72
|
+
const body = carryPacedStream(response.body, new ReadableStream<Uint8Array>({
|
|
72
73
|
async pull(controller) {
|
|
73
74
|
try {
|
|
74
75
|
const next = await reader.read();
|
|
@@ -77,7 +78,7 @@ export function finalizeAccountLease(response: Response, release: () => void, on
|
|
|
77
78
|
} catch (error) { finish(); controller.error(error); }
|
|
78
79
|
},
|
|
79
80
|
async cancel(reason) { onCancel?.(); try { await reader.cancel(reason); } finally { finish(); } },
|
|
80
|
-
});
|
|
81
|
+
}, pacedQueuingStrategy(response.body)));
|
|
81
82
|
const wrapped = new Response(body, { status: response.status, statusText: response.statusText, headers: response.headers });
|
|
82
83
|
carryProxyError(response, wrapped);
|
|
83
84
|
if (isNonReplayableResponse(response)) markResponseNonReplayable(wrapped);
|
|
@@ -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) {
|
|
@@ -37,6 +37,8 @@ export interface ConsumedComboFailure {
|
|
|
37
37
|
malformedResponseFormat?: boolean;
|
|
38
38
|
/** Complete bounded-envelope OpenRouter opaque-400 verdict captured before display truncation. */
|
|
39
39
|
openRouterOpaque400?: boolean;
|
|
40
|
+
/** Complete bounded-envelope provider moderation verdict captured before display truncation. */
|
|
41
|
+
providerModerationRefusal?: boolean;
|
|
40
42
|
/** Structured upstream `error.code` when present in the failure body. */
|
|
41
43
|
upstreamCode?: string;
|
|
42
44
|
/**
|
|
@@ -159,6 +161,8 @@ export interface HandleResponsesOptions {
|
|
|
159
161
|
* holder with no principal preserves keyless replay; never populate it from client data.
|
|
160
162
|
*/
|
|
161
163
|
replayPrincipal?: Readonly<{ clientPrincipalId: string | undefined }>;
|
|
164
|
+
/** Captured for the logical request and inherited by retries and combo children. */
|
|
165
|
+
readonly plaintextV2Decision?: boolean;
|
|
162
166
|
/** Called at most once after the complete client body is read and accepted for dispatch. */
|
|
163
167
|
onRequestBodyRead?: () => void;
|
|
164
168
|
/** Internal handoff for retry wrappers that must reuse the already-accounted request body. */
|
|
@@ -166,6 +170,8 @@ export interface HandleResponsesOptions {
|
|
|
166
170
|
forceEmptyResponseId?: boolean;
|
|
167
171
|
/** Internal, connection-owned control channel; never reconstructed from headers. */
|
|
168
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;
|
|
169
175
|
abortSignal?: AbortSignal;
|
|
170
176
|
/** One-shot TTFT callback: first non-empty model output observed (WP4). */
|
|
171
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
|
+
}
|