@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
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { clientFacingModelText } from "../../lib/error-destination";
|
|
2
|
+
import { providerAffinityGenerationIsCurrent } from "../../providers/api-key-selection";
|
|
2
3
|
import { markProxyError } from "../../lib/client-error-body";
|
|
3
4
|
import { CodexInstallationIdUnavailableError } from "../../codex/installation-id";
|
|
4
5
|
import { passthroughBuildErrorResponse } from "./passthrough-build-error";
|
|
@@ -26,7 +27,7 @@ import { renewMainQuotaDispatchForAttempt } from "../../codex/main-account-cache
|
|
|
26
27
|
import { isCanonicalOpenAiForwardProvider } from "../../providers/openai-tiers";
|
|
27
28
|
import { isLocalUpstream } from "../../lib/local-upstream";
|
|
28
29
|
import { resolveConnectTimeoutMs } from "../../stall-timeout";
|
|
29
|
-
import { codexSafetyBufferingFilterOptions,
|
|
30
|
+
import { codexSafetyBufferingFilterOptions, createTerminalStatusTracker } from "../relay";
|
|
30
31
|
import { imageGenToolCallAliases } from "../responses-image-gen-repair";
|
|
31
32
|
import { rememberResponseState, isBodyNonPersistable } from "../../responses/state";
|
|
32
33
|
import {
|
|
@@ -62,7 +63,8 @@ import {
|
|
|
62
63
|
collectFunctionCallRepairSchemas,
|
|
63
64
|
repairFunctionCallsInJson,
|
|
64
65
|
} from "../../responses/function-call-compat";
|
|
65
|
-
import
|
|
66
|
+
import { authorizedBareNamespaceToolAliases as authorizedBareNamespaceAliases } from "./bare-namespace-aliases";
|
|
67
|
+
import { outboundToolScope } from "./outbound-request-body";
|
|
66
68
|
import { hasResponsesSnapshotRepair, repairResponsesSnapshotJson } from "../responses-snapshot-repair";
|
|
67
69
|
import { backfillResponsesFieldsJson } from "./responses-field-backfill";
|
|
68
70
|
import type { AdapterRequest } from "../../adapters/base";
|
|
@@ -165,18 +167,20 @@ import {
|
|
|
165
167
|
resetStreamedOpaqueBlobLogContext,
|
|
166
168
|
consoleGoUploadRejectionBody,
|
|
167
169
|
CONSOLE_GO_UPLOAD_RETRY_DELAY_MS,
|
|
168
|
-
|
|
170
|
+
refusedReasoningEffortDowngrade, withRawBodyReasoningEffort,
|
|
169
171
|
} from "./core-opaque-recovery";
|
|
170
172
|
import type { RequestLogContext } from "../request-log";
|
|
171
|
-
import {
|
|
172
|
-
import {
|
|
173
|
-
import {
|
|
173
|
+
import { preflightComboStreamResponse } from "./combo-stream-preflight";
|
|
174
|
+
import type { RequestFailureStage } from "../../lib/request-failure-model";
|
|
175
|
+
import {
|
|
176
|
+
ambiguousResendAllowanceFor, ambiguousResendAuthorizer, UnsafePhysicalReplacement,
|
|
177
|
+
} from "./reset-replay";
|
|
178
|
+
import { createNativeReplayGuard } from "./native-replay-guard";
|
|
174
179
|
import { upstreamErrorMessageFromPayload, ENCRYPTED_FUNCTION_OUTPUT_REJECTION } from "../../lib/errors";
|
|
175
180
|
import { isTransientConsoleGoUploadRejection } from "../../providers/opencode-zen-rate-limit";
|
|
176
|
-
import { planReasoningEffortDowngrade } from "../../providers/reasoning-metadata";
|
|
177
181
|
import { unboundPoolSpendRefusalResponse } from "../workflow-refusal";
|
|
178
182
|
import { createNativeContinuationDispatch } from "./native-continuation-send";
|
|
179
|
-
import { guardPassthroughCompletion, parseOutboundRequestBody } from "./passthrough-completion";
|
|
183
|
+
import { guardPassthroughCompletion, isResetReplacementStream, parseOutboundRequestBody, selectPassthroughResetResponse } from "./passthrough-completion";
|
|
180
184
|
|
|
181
185
|
/** Transfer an uncommitted Copilot exchange to the existing translated pipeline without new admission. */
|
|
182
186
|
export interface PassthroughAdapterHandoff { kind: "adapter-handoff" }
|
|
@@ -428,7 +432,8 @@ export async function preparePassthroughExchange(
|
|
|
428
432
|
// `{model, input, stream}` with no tools and Copilot answers with a `custom_tool_call` for
|
|
429
433
|
// `apply_patch`. Policing an absent catalog truncates that turn. An unreadable body lands there
|
|
430
434
|
// too because the proxy cannot establish the caller's declared authorization boundary.
|
|
431
|
-
|
|
435
|
+
// #8601: only the outbound body's tool scope (outbound-request-body.ts) stays with the turn, never a parsed copy of it.
|
|
436
|
+
let outboundRequestScope: Record<string, unknown> | undefined;
|
|
432
437
|
const declaredWireToolNames = new Set<string>();
|
|
433
438
|
const declaredBareWireToolNames = new Set<string>();
|
|
434
439
|
const declaredNamelessClientCallTypes = new Set<string>();
|
|
@@ -439,22 +444,12 @@ export async function preparePassthroughExchange(
|
|
|
439
444
|
// checks. `exec` uses separate handling: its bridge alias is copied into the declared set only
|
|
440
445
|
// when the client itself declared bare `exec`, because otherwise code-mode normalization could
|
|
441
446
|
// authorize the unrelated code-mode helper names.
|
|
442
|
-
const authorizedBareNamespaceToolAliases
|
|
443
|
-
[...toolBridgeMaps.toolNsMap].flatMap(([alias, identity]) =>
|
|
444
|
-
alias === identity.name
|
|
445
|
-
? [[alias, {
|
|
446
|
-
namespace: identity.namespace,
|
|
447
|
-
name: identity.name,
|
|
448
|
-
kind: identity.freeform ? "custom" as const : "function" as const,
|
|
449
|
-
}] as const]
|
|
450
|
-
: []
|
|
451
|
-
),
|
|
452
|
-
);
|
|
447
|
+
const authorizedBareNamespaceToolAliases = authorizedBareNamespaceAliases(toolBridgeMaps.toolNsMap);
|
|
453
448
|
const restoreAuthorizedBareNamespaceToolCalls = (value: unknown): unknown =>
|
|
454
449
|
restoreRoutedNamespaceCalls(value, authorizedBareNamespaceToolAliases).value;
|
|
455
450
|
const normalizeFunctionCompletionJson = (text: string): string => {
|
|
456
451
|
const snapshot = hasResponsesSnapshotRepair(route.provider.responsesSnapshotRepair)
|
|
457
|
-
? repairResponsesSnapshotJson(text,
|
|
452
|
+
? repairResponsesSnapshotJson(text, outboundRequestScope)
|
|
458
453
|
: text;
|
|
459
454
|
// Sparse gateways need completion status inferred before schema repair can
|
|
460
455
|
// distinguish completed arguments from in-progress placeholders.
|
|
@@ -462,7 +457,8 @@ export async function preparePassthroughExchange(
|
|
|
462
457
|
};
|
|
463
458
|
let undeclaredToolGuardActive = false;
|
|
464
459
|
const refreshUndeclaredToolGuard = (builtRequest: AdapterRequest): void => {
|
|
465
|
-
outboundRequestBody = parseOutboundRequestBody(builtRequest.body);
|
|
460
|
+
const outboundRequestBody = parseOutboundRequestBody(builtRequest.body);
|
|
461
|
+
outboundRequestScope = outboundToolScope(outboundRequestBody);
|
|
466
462
|
providerExecutedCallTypes.clear();
|
|
467
463
|
if (isXaiResponsesDestination(route.provider)) {
|
|
468
464
|
// Preserve the caller-declared authorization recognized by the original classifier, then
|
|
@@ -547,7 +543,6 @@ export async function preparePassthroughExchange(
|
|
|
547
543
|
// untouched upstream stream, so it can still observe a `response.completed` the client never
|
|
548
544
|
// received; checking the payload itself rather than a flag shared with the client relay keeps
|
|
549
545
|
// this free of tee ordering races.
|
|
550
|
-
//
|
|
551
546
|
// Checking only the terminal snapshot is not enough. An upstream can announce the undeclared
|
|
552
547
|
// call in `response.output_item.added`, which trips the client guard, and then close with a
|
|
553
548
|
// `response.completed` whose `output` is empty. The client gets `response.failed`, the terminal
|
|
@@ -557,12 +552,13 @@ export async function preparePassthroughExchange(
|
|
|
557
552
|
let inspectedTerminal: ResponsesTerminalStatus | null = null;
|
|
558
553
|
let inspectedCompletionSeen = false;
|
|
559
554
|
let firstTerminalAllowsRecall = false;
|
|
555
|
+
const inspectedTerminalStatus = createTerminalStatusTracker();
|
|
560
556
|
const passiveQuotaObserved = hasPassiveAccountQuota(route.providerName)
|
|
561
557
|
&& route.provider.authMode === "oauth";
|
|
562
558
|
const noteInspectedPayload = (payload: unknown) => {
|
|
563
559
|
// First terminal stays authoritative even in metadata-only inspection, which
|
|
564
560
|
// intentionally continues parsing after a failed/incomplete terminal.
|
|
565
|
-
const terminal =
|
|
561
|
+
const terminal = inspectedTerminalStatus(payload);
|
|
566
562
|
if (inspectedTerminal === null && terminal !== null) {
|
|
567
563
|
inspectedTerminal = terminal;
|
|
568
564
|
// The client boundary accepts a terminal by event type, even without a
|
|
@@ -765,16 +761,15 @@ export async function preparePassthroughExchange(
|
|
|
765
761
|
);
|
|
766
762
|
const configuredTransientSendBudgetExhausted = (): boolean =>
|
|
767
763
|
transientSendPolicy() !== null && transientSendAttempts() === 0;
|
|
768
|
-
|
|
769
|
-
|
|
770
|
-
|
|
771
|
-
|
|
772
|
-
|
|
773
|
-
|
|
774
|
-
|
|
775
|
-
|
|
776
|
-
const
|
|
777
|
-
selfContainedJudgment ??= selfContainedResponsesBody(parsed._rawBody);
|
|
764
|
+
// Judged once on the inbound body and once per send on the body that physically leaves; the
|
|
765
|
+
// split and its reasons live in the sibling module.
|
|
766
|
+
const replayGuard = createNativeReplayGuard({
|
|
767
|
+
providerExecuted: () => isXaiResponsesDestination(route.provider)
|
|
768
|
+
&& collectProviderExecutedCallTypes(clientToolAuthorizationBody).size > 0,
|
|
769
|
+
parsed,
|
|
770
|
+
currentRequest: () => request,
|
|
771
|
+
});
|
|
772
|
+
const recordPhysicalSend = replayGuard.sendHandler;
|
|
778
773
|
/**
|
|
779
774
|
* The operator's replacement grant for THIS logical request.
|
|
780
775
|
*
|
|
@@ -784,7 +779,8 @@ export async function preparePassthroughExchange(
|
|
|
784
779
|
* child shares, so every ambiguous stage of this request draws on the same grant.
|
|
785
780
|
*/
|
|
786
781
|
const ambiguousResend = () =>
|
|
787
|
-
ambiguousResendAllowanceFor(route.provider,
|
|
782
|
+
ambiguousResendAllowanceFor(route.provider, replayGuard.isSelfContained, claimAmbiguousResend);
|
|
783
|
+
const authorizeAmbiguousResend = ambiguousResendAuthorizer(ambiguousResend, () => safeHostLabel(request.url));
|
|
788
784
|
/**
|
|
789
785
|
* The pre-header row of the stage table, asked through the one gate.
|
|
790
786
|
*
|
|
@@ -792,8 +788,12 @@ export async function preparePassthroughExchange(
|
|
|
792
788
|
* the server tree; routing the answer through `authorizeResendForRecovery` here is what
|
|
793
789
|
* keeps the decision derived from the table rather than restated as a boolean.
|
|
794
790
|
*/
|
|
795
|
-
const
|
|
796
|
-
|
|
791
|
+
const claimRecoveryResend = (stage: RequestFailureStage): boolean => {
|
|
792
|
+
const allowed = authorizeAmbiguousResend(stage);
|
|
793
|
+
if (allowed) replayGuard.authorize();
|
|
794
|
+
return allowed;
|
|
795
|
+
};
|
|
796
|
+
const claimPreHeaderResend = (): boolean => claimRecoveryResend("pre-header");
|
|
797
797
|
/**
|
|
798
798
|
* The one replacement send the ambiguous rows at the end of the recovery loop may buy: an SSE
|
|
799
799
|
* body that died before any output, and a Codex WebSocket that died under its create frame
|
|
@@ -829,7 +829,12 @@ export async function preparePassthroughExchange(
|
|
|
829
829
|
providerName: route.providerName,
|
|
830
830
|
modelId: route.modelId,
|
|
831
831
|
dispatchOverride: oauthDispatch(request, parsed, "passthrough"),
|
|
832
|
-
onPhysicalDispatch:
|
|
832
|
+
onPhysicalDispatch: recordPhysicalSend(() => {
|
|
833
|
+
transportState.noteRoutedAttemptSend(passthroughEstimate, "connection-reset");
|
|
834
|
+
if (accounting.onPhysicalDispatch) accounting.onPhysicalDispatch();
|
|
835
|
+
else if (report.beforeSend?.() === false) throw new SendBudgetExhaustedError(errorDestinationLabel(request.url));
|
|
836
|
+
started = true;
|
|
837
|
+
}),
|
|
833
838
|
beforeDispatch: headers => {
|
|
834
839
|
if (signal.aborted) throw signal.reason;
|
|
835
840
|
if (!transportState.selectionIsCurrent(transportState.requestBindings.get(request))) {
|
|
@@ -844,16 +849,6 @@ export async function preparePassthroughExchange(
|
|
|
844
849
|
options.visionDescribeTerminal === true,
|
|
845
850
|
)?.(headers);
|
|
846
851
|
}
|
|
847
|
-
// Recorded with the kind the gate derived its cause from, at the moment the
|
|
848
|
-
// send actually leaves. One authorisation, one recorded reason, one send.
|
|
849
|
-
transportState.noteRoutedAttemptSend(passthroughEstimate, "connection-reset");
|
|
850
|
-
// Charged to the SAME request counter every other send goes through. The
|
|
851
|
-
// replacement is bought here rather than by a nested retry helper, so there is
|
|
852
|
-
// one charge for one send and no per-layer counter to reconcile.
|
|
853
|
-
if (!accounting.onPhysicalDispatch) {
|
|
854
|
-
if (report.beforeSend?.() === false) throw new SendBudgetExhaustedError(errorDestinationLabel(request.url));
|
|
855
|
-
started = true;
|
|
856
|
-
}
|
|
857
852
|
},
|
|
858
853
|
}),
|
|
859
854
|
route.provider.authMode === "forward",
|
|
@@ -914,10 +909,9 @@ export async function preparePassthroughExchange(
|
|
|
914
909
|
return clientCancelledResponse();
|
|
915
910
|
}
|
|
916
911
|
if (lastDistributedResponse) recordDistributedResponseFailure(lastDistributedResponse, config, route.providerName, options.abortSignal);
|
|
917
|
-
// A budget refusal is a
|
|
918
|
-
// 502 upstream_error would blame the provider for a limit this process applied, and
|
|
919
|
-
// would record a fake reachability failure against the account's health.
|
|
912
|
+
// A budget refusal is local; a 502 would falsely record an account reachability failure.
|
|
920
913
|
if (err instanceof SendBudgetExhaustedError) {
|
|
914
|
+
logCtx.terminalSource = "synthetic";
|
|
921
915
|
releaseUpstreamHostAdmission(nativeHostState.lease);
|
|
922
916
|
nativeHostState.lease = null;
|
|
923
917
|
releaseCodexAuthContextProbeLease(admissionState.authCtx);
|
|
@@ -929,12 +923,13 @@ export async function preparePassthroughExchange(
|
|
|
929
923
|
bindRefreshedAdapter(refusal.adapter);
|
|
930
924
|
return handoffToChat(refusal.adapter);
|
|
931
925
|
}
|
|
932
|
-
const
|
|
933
|
-
if (
|
|
934
|
-
|
|
935
|
-
|
|
926
|
+
const pacingRefusal = requestPacingOverloadResponse(refusal);
|
|
927
|
+
if (pacingRefusal) logCtx.terminalSource = "synthetic";
|
|
928
|
+
const localDispatchRefusal = pacingRefusal ?? copilotRefusalResponse(refusal);
|
|
929
|
+
if (localDispatchRefusal) {
|
|
930
|
+
releaseUpstreamHostAdmission(nativeHostState.lease); nativeHostState.lease = null;
|
|
936
931
|
releaseCodexAuthContextProbeLease(admissionState.authCtx);
|
|
937
|
-
return
|
|
932
|
+
return localDispatchRefusal;
|
|
938
933
|
}
|
|
939
934
|
// Pacing may outlive the selected account's admission. No fetch occurred, so do
|
|
940
935
|
// not turn an operator pause into a 502 or charge it to host/account health.
|
|
@@ -1033,7 +1028,7 @@ export async function preparePassthroughExchange(
|
|
|
1033
1028
|
dispatchOverride: oauthDispatch(request, parsed, "passthrough"),
|
|
1034
1029
|
providerName: route.providerName,
|
|
1035
1030
|
modelId: route.modelId,
|
|
1036
|
-
onPhysicalDispatch: receiptMode ? sendBudgetState.noteInitialDispatch : initialAccounting.onPhysicalDispatch,
|
|
1031
|
+
onPhysicalDispatch: recordPhysicalSend(receiptMode ? sendBudgetState.noteInitialDispatch : initialAccounting.onPhysicalDispatch),
|
|
1037
1032
|
onContinuationDispatch,
|
|
1038
1033
|
accountAutoPause: (name, provider, headers) => captureAccountAutoPauseAttempt(name, provider, { config, codex: admissionState.authCtx }, headers),
|
|
1039
1034
|
onCodexWsQuota: codexWsQuotaObserver(admissionState.authCtx, route.provider, route.modelId),
|
|
@@ -1063,7 +1058,8 @@ export async function preparePassthroughExchange(
|
|
|
1063
1058
|
}
|
|
1064
1059
|
|
|
1065
1060
|
const opaqueBlobRecoveryGuard: OpaqueBlobRecoveryGuard = { attempted: false };
|
|
1066
|
-
//
|
|
1061
|
+
// Direct requests get one reasoning-effort downgrade. Combo candidates may walk down the
|
|
1062
|
+
// published ladder one refused rung at a time; the request send budget bounds those retries.
|
|
1067
1063
|
const reasoningEffortDowngradeGuard: { attempted: boolean } = { attempted: false };
|
|
1068
1064
|
/** Rebind the refreshed wire before transferring this request to the Chat pipeline. */
|
|
1069
1065
|
function bindRefreshedAdapter(refreshedAdapter: typeof transportState.adapter) {
|
|
@@ -1097,6 +1093,7 @@ export async function preparePassthroughExchange(
|
|
|
1097
1093
|
let rateLimitRetries = 0;
|
|
1098
1094
|
const rebuildAndRefetch = async (
|
|
1099
1095
|
recovery: AttemptRecoveryKind,
|
|
1096
|
+
preserveFailureResponse?: Response,
|
|
1100
1097
|
): Promise<Response | { failed: Response | PassthroughAdapterHandoff }> => {
|
|
1101
1098
|
const retryAdapter = resolveSelectionAdapter(
|
|
1102
1099
|
resolveWireProtocolOverride(route.providerName, route.modelId, route.provider, inboundWire, route.staticPolicy),
|
|
@@ -1147,6 +1144,8 @@ export async function preparePassthroughExchange(
|
|
|
1147
1144
|
{ allowFinalRecoveryReserve: transientSendPolicy() === null },
|
|
1148
1145
|
);
|
|
1149
1146
|
if (recovery === "empty-completion") allowance.attempts = Math.min(1, allowance.attempts);
|
|
1147
|
+
// An unfunded combo rung keeps the upstream refusal for combo failover instead of a budget 429.
|
|
1148
|
+
if (preserveFailureResponse && allowance.attempts < 1) { request.releaseBodyObservation?.(); return { failed: preserveFailureResponse }; }
|
|
1150
1149
|
const recoveryAccounting = copilotSendAccounting(allowance.permit);
|
|
1151
1150
|
try {
|
|
1152
1151
|
return await fetchWithTransientRetry(
|
|
@@ -1168,7 +1167,7 @@ export async function preparePassthroughExchange(
|
|
|
1168
1167
|
&& responseEffects.plaintextV2AgentMessageToolNames.size === 0
|
|
1169
1168
|
? options.nativeControl : undefined,
|
|
1170
1169
|
dispatchOverride: oauthDispatch(request, parsed, "passthrough"),
|
|
1171
|
-
onPhysicalDispatch: recoveryAccounting.onPhysicalDispatch,
|
|
1170
|
+
onPhysicalDispatch: recordPhysicalSend(recoveryAccounting.onPhysicalDispatch),
|
|
1172
1171
|
providerName: route.providerName,
|
|
1173
1172
|
modelId: route.modelId,
|
|
1174
1173
|
onContinuationDispatch,
|
|
@@ -1206,7 +1205,6 @@ export async function preparePassthroughExchange(
|
|
|
1206
1205
|
upstreamResponse = recovered; continue passthroughRecovery;
|
|
1207
1206
|
}
|
|
1208
1207
|
|
|
1209
|
-
|
|
1210
1208
|
if (
|
|
1211
1209
|
upstreamResponse.status === 401 && !wasPermanentAccountRefusal(upstreamResponse)
|
|
1212
1210
|
&& (admissionState.authCtx.kind === "main-pool" || admissionState.authCtx.kind === "pool")
|
|
@@ -1289,6 +1287,7 @@ export async function preparePassthroughExchange(
|
|
|
1289
1287
|
&& responseEffects.plaintextV2AgentMessageToolNames.size === 0
|
|
1290
1288
|
? options.nativeControl : undefined,
|
|
1291
1289
|
dispatchOverride: oauthDispatch(request, parsed, "passthrough"),
|
|
1290
|
+
onPhysicalDispatch: recordPhysicalSend(),
|
|
1292
1291
|
providerName: route.providerName,
|
|
1293
1292
|
modelId: route.modelId,
|
|
1294
1293
|
onContinuationDispatch,
|
|
@@ -1438,7 +1437,7 @@ export async function preparePassthroughExchange(
|
|
|
1438
1437
|
&& responseEffects.plaintextV2AgentMessageToolNames.size === 0
|
|
1439
1438
|
? options.nativeControl : undefined,
|
|
1440
1439
|
dispatchOverride: oauthDispatch(request, parsed, "passthrough"),
|
|
1441
|
-
onPhysicalDispatch: oauthReplayAccounting.onPhysicalDispatch,
|
|
1440
|
+
onPhysicalDispatch: recordPhysicalSend(oauthReplayAccounting.onPhysicalDispatch),
|
|
1442
1441
|
providerName: route.providerName,
|
|
1443
1442
|
modelId: route.modelId,
|
|
1444
1443
|
onContinuationDispatch,
|
|
@@ -1542,7 +1541,7 @@ export async function preparePassthroughExchange(
|
|
|
1542
1541
|
while (
|
|
1543
1542
|
upstreamResponse.status === 429
|
|
1544
1543
|
&& !isNonReplayableResponse(upstreamResponse)
|
|
1545
|
-
&& rateLimitPolicy !== null
|
|
1544
|
+
&& rateLimitPolicy !== null && providerAffinityGenerationIsCurrent(config, route.providerName, route.provider)
|
|
1546
1545
|
&& rateLimitRetries < rateLimitPolicy.attempts
|
|
1547
1546
|
// Checked here rather than inside the helper: prepareSameTarget429Wait releases the 429
|
|
1548
1547
|
// body, so a refusal discovered after the wait can no longer return the real rate-limit
|
|
@@ -1588,7 +1587,7 @@ export async function preparePassthroughExchange(
|
|
|
1588
1587
|
&& responseEffects.plaintextV2AgentMessageToolNames.size === 0
|
|
1589
1588
|
? options.nativeControl : undefined,
|
|
1590
1589
|
dispatchOverride: oauthDispatch(request, parsed, "passthrough"),
|
|
1591
|
-
onPhysicalDispatch: failoverAccounting.onPhysicalDispatch,
|
|
1590
|
+
onPhysicalDispatch: recordPhysicalSend(failoverAccounting.onPhysicalDispatch),
|
|
1592
1591
|
providerName: route.providerName,
|
|
1593
1592
|
modelId: route.modelId,
|
|
1594
1593
|
onContinuationDispatch,
|
|
@@ -1696,6 +1695,7 @@ export async function preparePassthroughExchange(
|
|
|
1696
1695
|
stream: upstreamRequestsStream,
|
|
1697
1696
|
httpOnly: canonicalBufferedJson,
|
|
1698
1697
|
preOutputRefusalHold: preOutputRefusalHold(),
|
|
1698
|
+
onPhysicalSend: replayGuard.record,
|
|
1699
1699
|
onResponse: (response, retryAuthCtx, retryRequest) => {
|
|
1700
1700
|
adoptCodexWsStage(response, logCtx);
|
|
1701
1701
|
captureAffinityResponse(
|
|
@@ -1827,34 +1827,24 @@ export async function preparePassthroughExchange(
|
|
|
1827
1827
|
continue passthroughRecovery;
|
|
1828
1828
|
}
|
|
1829
1829
|
}
|
|
1830
|
-
//
|
|
1831
|
-
//
|
|
1832
|
-
//
|
|
1833
|
-
//
|
|
1834
|
-
|
|
1835
|
-
|
|
1836
|
-
|
|
1837
|
-
|
|
1838
|
-
|
|
1839
|
-
|
|
1840
|
-
|
|
1841
|
-
const
|
|
1842
|
-
|
|
1843
|
-
|
|
1844
|
-
|
|
1845
|
-
|
|
1846
|
-
|
|
1847
|
-
|
|
1848
|
-
});
|
|
1849
|
-
if (downgrade && !configuredTransientSendBudgetExhausted()) {
|
|
1850
|
-
reasoningEffortDowngradeGuard.attempted = true;
|
|
1851
|
-
parsed.options.reasoning = downgrade.effort;
|
|
1852
|
-
try { void upstreamResponse.body?.cancel().catch(() => {}); } catch { /* already consumed/closed */ }
|
|
1853
|
-
const result = await rebuildAndRefetch("reasoning-effort-downgrade");
|
|
1854
|
-
if ("failed" in result) return result.failed;
|
|
1855
|
-
upstreamResponse = result;
|
|
1856
|
-
continue passthroughRecovery;
|
|
1857
|
-
}
|
|
1830
|
+
// A rung the catalog advertises can still be refused upstream -- metadata describes the
|
|
1831
|
+
// model's ladder, not this account's entitlement. Learn each refusal so later turns clamp
|
|
1832
|
+
// before dispatch. Direct requests repair once; combo candidates may retry the next lower
|
|
1833
|
+
// published rung until it works, the ladder ends, or the send budget is spent.
|
|
1834
|
+
const downgrade = await refusedReasoningEffortDowngrade(upstreamResponse, upstream.signal, reasoningEffortDowngradeGuard,
|
|
1835
|
+
options.comboAttempt, { provider: route.provider, modelId: parsed.modelId, requested: parsed.options.reasoning });
|
|
1836
|
+
if (downgrade && !configuredTransientSendBudgetExhausted()) {
|
|
1837
|
+
reasoningEffortDowngradeGuard.attempted = true;
|
|
1838
|
+
parsed.options.reasoning = downgrade.effort;
|
|
1839
|
+
parsed._rawBody = withRawBodyReasoningEffort(parsed._rawBody, downgrade.effort);
|
|
1840
|
+
// A combo keeps the refusal, so an unfunded rung still reaches combo failover as the original 400.
|
|
1841
|
+
const refusal = options.comboAttempt ? upstreamResponse : undefined;
|
|
1842
|
+
if (!refusal) try { void upstreamResponse.body?.cancel().catch(() => {}); } catch { /* already consumed/closed */ }
|
|
1843
|
+
const result = await rebuildAndRefetch("reasoning-effort-downgrade", refusal);
|
|
1844
|
+
if ("failed" in result) return result.failed;
|
|
1845
|
+
if (refusal) try { void refusal.body?.cancel().catch(() => {}); } catch { /* already consumed/closed */ }
|
|
1846
|
+
upstreamResponse = result;
|
|
1847
|
+
continue passthroughRecovery;
|
|
1858
1848
|
}
|
|
1859
1849
|
|
|
1860
1850
|
// The WebSocket row of the same table (#4191). A Codex socket that closed or failed under its
|
|
@@ -1870,17 +1860,18 @@ export async function preparePassthroughExchange(
|
|
|
1870
1860
|
// Asked before the gate, which claims last: a replacement the budget cannot fund must not
|
|
1871
1861
|
// spend the request's one grant.
|
|
1872
1862
|
&& remainingTransientSendBudget(transientSendAttempts()) > 0
|
|
1873
|
-
&&
|
|
1863
|
+
&& claimRecoveryResend(socketDeathStage)
|
|
1874
1864
|
) {
|
|
1875
|
-
try { void upstreamResponse.body?.cancel().catch(() => {}); } catch { /* already consumed/closed */ }
|
|
1876
1865
|
console.warn(`[upstream-retry] codex websocket died before any Responses event (${safeHostLabel(request.url)}); `
|
|
1877
1866
|
+ "using one replacement over HTTP");
|
|
1878
1867
|
let replacement: Response | undefined;
|
|
1868
|
+
let unsafeReplacement = false;
|
|
1879
1869
|
while (!replacement) {
|
|
1880
1870
|
try {
|
|
1881
1871
|
replacement = await sendAmbiguousReplacement().then(adoptObservedResponse);
|
|
1882
1872
|
} catch (err) {
|
|
1883
1873
|
if (upstream.signal.aborted) return transportFailureResponse(err);
|
|
1874
|
+
if (err instanceof UnsafePhysicalReplacement) { unsafeReplacement = true; break; }
|
|
1884
1875
|
// A replacement that reset before its head is the pre-header row again: a configured
|
|
1885
1876
|
// second grant (and a send the budget can still fund) may buy one more send. The gate
|
|
1886
1877
|
// claims from the request's finite allowance, so this loop is bounded by it.
|
|
@@ -1894,6 +1885,8 @@ export async function preparePassthroughExchange(
|
|
|
1894
1885
|
}
|
|
1895
1886
|
// The first send may already have run the turn, so a replacement that failed settles as
|
|
1896
1887
|
// the refusal rather than as a transport error the client would retry.
|
|
1888
|
+
if (unsafeReplacement) break passthroughRecovery;
|
|
1889
|
+
try { void upstreamResponse.body?.cancel().catch(() => {}); } catch { /* already consumed/closed */ }
|
|
1897
1890
|
upstreamResponse = replacement ? settleOperatorReplacement(replacement) : replayRefusalResponse();
|
|
1898
1891
|
continue passthroughRecovery;
|
|
1899
1892
|
}
|
|
@@ -1913,32 +1906,32 @@ export async function preparePassthroughExchange(
|
|
|
1913
1906
|
// This preflight retains that event until output commits, so the two contracts cannot
|
|
1914
1907
|
// share one body owner.
|
|
1915
1908
|
&& !(options.nativeControl && options.inboundTransport === "websocket")
|
|
1916
|
-
|
|
1909
|
+
// Only a self-contained request can be replaced; any other preflight only delays its head.
|
|
1910
|
+
&& ambiguousResend()?.selfContained === true
|
|
1917
1911
|
&& remainingTransientSendBudget(transientSendAttempts()) > 0
|
|
1918
1912
|
&& (streamRecoveryContentType.includes("text/event-stream") || (!streamRecoveryContentType && upstreamRequestsStream));
|
|
1919
1913
|
if (protocolRecoveryCandidate) {
|
|
1920
|
-
|
|
1921
|
-
|
|
1914
|
+
// Selection may publish the replacement's own head until one is committed; see the helper.
|
|
1915
|
+
upstreamResponse = await selectPassthroughResetResponse(
|
|
1916
|
+
upstreamResponse, admissionState,
|
|
1922
1917
|
{ model: logCtx.model, provider: logCtx.provider },
|
|
1923
|
-
(error, stage) => refetchAfterProtocolSafeReset(
|
|
1918
|
+
(error, stage, signal, accepts) => refetchAfterProtocolSafeReset(
|
|
1924
1919
|
(signal = upstream.signal) => sendAmbiguousReplacement(signal).then(adoptObservedResponse),
|
|
1925
1920
|
error,
|
|
1926
1921
|
{
|
|
1927
|
-
abortSignal: upstream.signal,
|
|
1922
|
+
abortSignal: AbortSignal.any([upstream.signal, signal]),
|
|
1928
1923
|
label: safeHostLabel(request.url), destination: errorDestinationLabel(request.url),
|
|
1929
1924
|
attempts: remainingTransientSendBudget(transientSendAttempts()),
|
|
1930
1925
|
// The whole decision, including the stage the preflight observed and the grant the
|
|
1931
1926
|
// pre-header helper shares. A committed stage refuses here without touching the
|
|
1932
1927
|
// allowance, which is what keeps a turn that already emitted output from draining
|
|
1933
1928
|
// the replacement a later ambiguous reset would have been entitled to.
|
|
1934
|
-
authorize: () =>
|
|
1935
|
-
acceptResponse: candidate =>
|
|
1936
|
-
const type = candidate.headers.get("content-type")?.toLowerCase() ?? "";
|
|
1937
|
-
return type.includes("text/event-stream") || (!type && upstreamRequestsStream);
|
|
1938
|
-
},
|
|
1929
|
+
authorize: () => claimRecoveryResend(stage),
|
|
1930
|
+
acceptResponse: candidate => accepts(candidate) && isResetReplacementStream(candidate, upstreamRequestsStream),
|
|
1939
1931
|
},
|
|
1940
1932
|
),
|
|
1941
|
-
{ allowMissingContentType: !streamRecoveryContentType && upstreamRequestsStream
|
|
1933
|
+
{ request, config, signal: upstream.signal, allowMissingContentType: !streamRecoveryContentType && upstreamRequestsStream,
|
|
1934
|
+
delivery: canonicalBufferedJson ? "buffered-json" : options.comboAttempt ? "combo-child" : "direct-stream" },
|
|
1942
1935
|
);
|
|
1943
1936
|
}
|
|
1944
1937
|
break;
|
|
@@ -1969,10 +1962,10 @@ export async function preparePassthroughExchange(
|
|
|
1969
1962
|
},
|
|
1970
1963
|
functionRepairSchemas,
|
|
1971
1964
|
get outboundRequestBody(): Record<string, unknown> | undefined {
|
|
1972
|
-
return
|
|
1965
|
+
return outboundRequestScope;
|
|
1973
1966
|
},
|
|
1974
1967
|
set outboundRequestBody(value: Record<string, unknown> | undefined) {
|
|
1975
|
-
|
|
1968
|
+
outboundRequestScope = outboundToolScope(value);
|
|
1976
1969
|
},
|
|
1977
1970
|
declaredWireToolNames,
|
|
1978
1971
|
declaredBareWireToolNames,
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { comboFailureDecision } from "../../combos/failover";
|
|
1
|
+
import { comboFailureDecision, isProviderModerationRefusal } from "../../combos/failover";
|
|
2
2
|
import { readBoundedResponseBody } from "../../lib/bounded-body";
|
|
3
3
|
import { isVerifiedModelNotInPlanResponse } from "../../lib/errors";
|
|
4
4
|
import { isShadowSourceModel } from "../../lib/shadow-call";
|
|
@@ -138,6 +138,9 @@ async function shouldHopPolicyCandidate(response: Response, signal?: AbortSignal
|
|
|
138
138
|
code: upstreamCodeForComboFailure(response, errorCodeFromText(text)),
|
|
139
139
|
// A passthrough candidate returns its upstream body unchanged, so the code is not provenance.
|
|
140
140
|
verifiedPlanRefusal: isVerifiedModelNotInPlanResponse(response),
|
|
141
|
+
// The text is the whole bounded body, judged as the combo reader judges it.
|
|
142
|
+
...(text && (response.status === 400 || response.status === 422)
|
|
143
|
+
? { providerModerationRefusal: isProviderModerationRefusal(response.status, text, undefined, true) } : {}),
|
|
141
144
|
}) === "hop";
|
|
142
145
|
} catch {
|
|
143
146
|
return false;
|
|
@@ -161,8 +164,17 @@ function finishFailedPolicyAttempt(logCtx: RequestLogContext, status: number): v
|
|
|
161
164
|
delete logCtx.usageFromBridge;
|
|
162
165
|
delete logCtx.upstreamError;
|
|
163
166
|
delete logCtx.terminalHttpStatus;
|
|
167
|
+
delete logCtx.observedTerminalStatus;
|
|
164
168
|
delete logCtx.terminalErrorCode;
|
|
165
169
|
delete logCtx.terminalIncompleteReason;
|
|
170
|
+
delete logCtx.cacheAffinity;
|
|
171
|
+
delete logCtx.cacheAffinityReason;
|
|
172
|
+
delete logCtx.affinityKeptEntryId;
|
|
173
|
+
delete logCtx.affinityKeyEntryId;
|
|
174
|
+
delete logCtx.affinityProviderName;
|
|
175
|
+
delete logCtx.affinityModel;
|
|
176
|
+
delete logCtx.cacheAffinityApplicable;
|
|
177
|
+
delete logCtx.terminalSource;
|
|
166
178
|
}
|
|
167
179
|
|
|
168
180
|
/**
|