@bitkyc08/opencodex 2.100.2 → 2.100.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/AGENTS_INSTALL.md +23 -1
- package/README.md +1 -1
- package/bin/ocx.mjs +40 -19
- package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
- package/gui/dist/assets/App-DcpyI78f.js +60 -0
- package/gui/dist/assets/{Tray-BcaI-VCr.js → Tray-CzjPJprT.js} +1 -1
- package/gui/dist/assets/brand-mark-BTIi7e69.js +1 -0
- package/gui/dist/assets/index-DJxM-imn.css +2 -0
- package/gui/dist/assets/index-DVgU6S3y.js +138 -0
- package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.js → segment-thumb-features-Bn6Y-g3R.js} +1 -1
- package/gui/dist/classic/assets/App-eYJAyNHM.js +59 -0
- package/gui/dist/classic/assets/{Tray-DT146AhS.js → Tray-xHMYxLkV.js} +1 -1
- package/gui/dist/classic/assets/index-DSaVRW4F.js +138 -0
- package/gui/dist/classic/assets/quota-summary-DyzHlkFl.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.toml +9 -0
- package/native/ocx-child/src/cli.rs +404 -20
- package/native/ocx-child/src/codex_home.rs +99 -14
- package/native/ocx-child/src/daemon.rs +2 -1
- package/native/ocx-child/src/lib.rs +3 -0
- package/native/ocx-child/src/link_ws.rs +2598 -0
- package/native/ocx-child/src/link_ws_advert.rs +346 -0
- package/native/ocx-child/src/link_ws_frame.rs +749 -0
- package/native/ocx-child/src/parity.rs +5 -1
- package/native/ocx-child/src/platform.rs +152 -6
- package/native/ocx-child/src/relay.rs +150 -19
- package/package.json +3 -3
- package/src/adapters/anthropic/advisor-tool.ts +176 -0
- package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
- package/src/adapters/anthropic/client-identity.ts +3 -1
- package/src/adapters/anthropic/passthrough.ts +9 -3
- package/src/adapters/anthropic/per-message-effort.ts +296 -0
- package/src/adapters/anthropic.ts +34 -14
- package/src/adapters/claude-cli/adapter.ts +1 -0
- package/src/adapters/client-fingerprint.ts +3 -3
- package/src/adapters/cursor/discovery.ts +17 -0
- package/src/adapters/cursor/native-exec-desktop.ts +2 -1
- package/src/adapters/cursor/native-exec-shell.ts +2 -1
- package/src/adapters/cursor/protobuf-request.ts +8 -8
- package/src/adapters/cursor.ts +7 -6
- package/src/adapters/devin/cloud-direct/chat.ts +71 -14
- package/src/adapters/google-antigravity-wire.ts +7 -5
- package/src/adapters/google-errors.ts +14 -2
- package/src/adapters/google-wire-compiler.ts +2 -2
- package/src/adapters/google.ts +9 -2
- package/src/adapters/kiro/payload.ts +7 -4
- package/src/adapters/kiro/reasoning.ts +44 -1
- package/src/adapters/kiro/structured-output.ts +10 -8
- package/src/adapters/kiro-tools.ts +61 -15
- package/src/adapters/openai-chat/destination-policy.ts +16 -0
- package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
- package/src/adapters/qoder/adapter.ts +9 -1
- package/src/adapters/zed.ts +7 -2
- package/src/advisor/consult.ts +15 -4
- package/src/advisor/context.ts +12 -3
- package/src/advisor/runtime.ts +35 -5
- package/src/advisor/settings.ts +8 -0
- package/src/advisor/synthetic-tool.ts +21 -8
- package/src/bridge/response-json.ts +11 -2
- package/src/bridge/sse.ts +43 -8
- package/src/claude/auth-detect.ts +21 -33
- package/src/claude/desktop-3p.ts +11 -5
- package/src/claude/desktop-gateway-state.ts +2 -0
- package/src/claude/desktop-remote-store-artifact.ts +14 -3
- package/src/claude/desktop-remote-store.ts +82 -12
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +21 -1
- package/src/cli/account-auth.ts +83 -22
- package/src/cli/account-extended.ts +33 -2
- package/src/cli/account-key-quota.ts +34 -5
- package/src/cli/account.ts +4 -2
- package/src/cli/advisor.ts +7 -4
- package/src/cli/alias.ts +38 -1
- package/src/cli/capabilities-access-remote.ts +128 -3
- package/src/cli/capabilities-accounts.ts +6 -6
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +49 -19
- package/src/cli/capabilities-integrations.ts +2 -2
- package/src/cli/capabilities-observe-system.ts +2 -2
- package/src/cli/capabilities-provider-models.ts +18 -2
- package/src/cli/capabilities-route-to.ts +43 -0
- package/src/cli/capabilities.ts +2 -0
- package/src/cli/capability-contracts.ts +1 -1
- package/src/cli/claude-desktop.ts +30 -11
- package/src/cli/claude.ts +17 -3
- package/src/cli/codex-launcher.ts +3 -1
- package/src/cli/codex-shim-autorestore.ts +5 -42
- package/src/cli/config-command.ts +14 -1
- package/src/cli/config-root-startup.ts +34 -0
- package/src/cli/connect.ts +88 -16
- package/src/cli/desktop-runtime-guidance.ts +1 -1
- package/src/cli/disconnect-runtime.ts +178 -0
- package/src/cli/dispatch.ts +61 -13
- package/src/cli/export-command.ts +1 -1
- package/src/cli/gui-pair-client.ts +6 -3
- package/src/cli/gui.ts +10 -5
- package/src/cli/help-catalog.ts +11 -0
- package/src/cli/help.ts +4 -3
- package/src/cli/index.ts +85 -94
- package/src/cli/inspect.ts +11 -2
- package/src/cli/integrations.ts +26 -1
- package/src/cli/link-apply-restart.ts +4 -2
- package/src/cli/link-capture.ts +64 -0
- package/src/cli/link-child-ops.ts +218 -40
- package/src/cli/link-cleanup.ts +8 -5
- package/src/cli/link-diagnostics.ts +67 -0
- package/src/cli/link-enrollment.ts +158 -12
- package/src/cli/link-operations.ts +52 -0
- package/src/cli/link-recover.ts +152 -0
- package/src/cli/link-routes.ts +90 -0
- package/src/cli/link-status-child.ts +44 -1
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +315 -37
- package/src/cli/message-command.ts +1 -1
- package/src/cli/message-mcp-command.ts +23 -10
- package/src/cli/models-runtime.ts +3 -3
- package/src/cli/opencode.ts +3 -1
- package/src/cli/pi-sync.ts +35 -0
- package/src/cli/preflight-exemptions.ts +49 -0
- package/src/cli/registry.ts +33 -14
- package/src/cli/resolve.ts +23 -8
- package/src/cli/restart-failure.ts +15 -2
- package/src/cli/root.ts +5 -1
- package/src/cli/route-to.ts +172 -0
- package/src/cli/runtime-api.ts +9 -8
- package/src/cli/status.ts +7 -2
- package/src/cli/stop-approval.ts +66 -19
- package/src/cli/stop-report.ts +23 -0
- package/src/cli/stop-windows-checked.ts +304 -0
- package/src/cli/sync-command.ts +70 -15
- package/src/cli/sync-fanout.ts +74 -19
- package/src/cli/sync-flags.ts +40 -3
- package/src/cli/sync-link-status.ts +18 -2
- package/src/cli/sync-update-guard.ts +7 -2
- package/src/cli/system-command.ts +1 -1
- package/src/cli/system-restart-client.ts +10 -3
- package/src/cli/system-settings-parity.ts +2 -1
- package/src/cli/uninstall-plan.ts +77 -5
- package/src/cli/uninstall-stop.ts +152 -0
- package/src/cli/v2-input.ts +10 -6
- package/src/cli/v2-local-output.ts +3 -2
- package/src/cli/v2-runtime.ts +10 -3
- package/src/cli/v2.ts +22 -7
- package/src/client/connect.ts +376 -35
- package/src/client/desktop-refusal.ts +38 -0
- package/src/client/lifecycle-lock.ts +29 -4
- package/src/client/link-home-features.ts +27 -0
- package/src/client/link-home.ts +92 -4
- package/src/client/link-ingress.ts +21 -3
- package/src/client/link-join.ts +12 -2
- package/src/client/link-parity-reporter.ts +60 -6
- package/src/client/link-relay-transport.ts +161 -36
- package/src/client/link-relay.ts +150 -6
- package/src/client/link-request-compression.ts +84 -0
- package/src/client/link-state.ts +11 -5
- package/src/client/link-status.ts +39 -1
- package/src/client/link-teardown.ts +1 -0
- package/src/client/link-tunnel.ts +56 -5
- package/src/client/link-websocket-limits.ts +89 -0
- package/src/client/link-websocket.ts +586 -0
- package/src/client/link-ws-advertisement.ts +100 -0
- package/src/client/link-ws-framer.ts +241 -0
- package/src/client/link-ws-transport.ts +177 -0
- package/src/client/machine-api.ts +13 -2
- package/src/client/machine-listener.ts +48 -7
- package/src/client/route-intent-apply.ts +293 -0
- package/src/client/route-intent-file-originals.ts +97 -0
- package/src/client/route-intent-native-originals.ts +201 -0
- package/src/client/route-intent-watch.ts +141 -0
- package/src/client/runtime-restart.ts +141 -7
- package/src/client/runtime.ts +63 -15
- package/src/client/state.ts +44 -0
- package/src/client/sync-expectation.ts +36 -2
- package/src/client/sync-runtime.ts +7 -0
- package/src/clients/config-export/alias-selectors.ts +63 -40
- package/src/clients/config-export/contracts.ts +2 -0
- package/src/clients/config-export/nested-selectors.ts +42 -0
- package/src/clients/config-export.ts +22 -3
- package/src/codex/account-pause.ts +4 -0
- package/src/codex/account-runtime-state.ts +4 -0
- package/src/codex/account-store.ts +12 -3
- package/src/codex/account-usability.ts +13 -0
- package/src/codex/auth-api/account-list.ts +29 -3
- package/src/codex/auth-api/main-account-probe.ts +3 -1
- package/src/codex/auth-api/main-hard-lock-refusal-read.ts +172 -0
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +61 -8
- package/src/codex/catalog/build-entries.ts +10 -0
- package/src/codex/catalog/derive-entry.ts +7 -0
- package/src/codex/catalog/gather-capture.ts +8 -2
- package/src/codex/catalog/parsing.ts +7 -3
- package/src/codex/catalog/provider-models.ts +54 -15
- package/src/codex/catalog/reserve-warn.ts +7 -5
- package/src/codex/catalog/reserve.ts +4 -3
- package/src/codex/catalog/retained-sync.ts +4 -1
- package/src/codex/catalog/routed-defaults.ts +35 -0
- package/src/codex/catalog/routed-gather.ts +1 -1
- package/src/codex/catalog-auto-refresh.ts +11 -0
- package/src/codex/cli-update-job.ts +35 -13
- package/src/codex/convergence.ts +4 -2
- package/src/codex/desktop-compatibility/native-identity.ts +4 -8
- package/src/codex/features.ts +2 -2
- package/src/codex/history-provider.ts +31 -0
- package/src/codex/inject/multi-agent-v2.ts +9 -3
- package/src/codex/inject/paginated-openai-compat.ts +54 -1
- package/src/codex/inject/plan.ts +20 -2
- package/src/codex/inject.ts +2 -0
- package/src/codex/journal-config-restore.ts +217 -0
- package/src/codex/journal.ts +75 -6
- package/src/codex/loopback-target.ts +22 -8
- package/src/codex/main-account.ts +109 -57
- package/src/codex/native-main-auth-file.ts +118 -0
- package/src/codex/native-main-credentials.ts +270 -0
- package/src/codex/native-main-owner.ts +3 -0
- package/src/codex/native-main-refresh-mode.ts +14 -1
- package/src/codex/native-profile-manager.ts +4 -3
- package/src/codex/native-profile-store.ts +3 -61
- package/src/codex/orca-import.ts +10 -1
- package/src/codex/quota-history.ts +13 -0
- package/src/codex/quota-window-conflict.ts +103 -0
- package/src/codex/quota.ts +86 -15
- package/src/codex/subagent-model-fallback.ts +3 -1
- package/src/codex/websocket-activity.ts +171 -16
- package/src/codex/websocket-registry.ts +11 -4
- package/src/combos/cooldown-store.ts +25 -5
- package/src/combos/failover.ts +342 -3
- package/src/combos/index.ts +5 -0
- package/src/combos/resolve.ts +115 -19
- package/src/config/dashboard-trusted-proxy.ts +83 -0
- package/src/config/diagnostics.ts +31 -0
- package/src/config/feature-flags.ts +9 -0
- package/src/config/live-reconcile.ts +16 -4
- package/src/config/load-degrade.ts +14 -1
- package/src/config/multi-agent-surface.ts +28 -5
- package/src/config/pending-teardown.ts +60 -3
- package/src/config/persisted-mutation.ts +2 -2
- package/src/config/persisted-projections.ts +18 -0
- package/src/config/process-state.ts +176 -4
- package/src/config/provider-validation.ts +4 -4
- package/src/config/reserve-capability.ts +96 -0
- package/src/config/schema/config-schema.ts +12 -0
- package/src/config/schema/leaf-validators.ts +11 -2
- package/src/config/schema/routed-catalog-defaults.ts +49 -0
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/config.ts +7 -7
- package/src/desktop-update/acquire.ts +202 -0
- package/src/desktop-update/cli.ts +168 -0
- package/src/desktop-update/drain.ts +40 -0
- package/src/desktop-update/headless.ts +285 -0
- package/src/desktop-update/image.ts +85 -0
- package/src/desktop-update/install.ts +53 -0
- package/src/desktop-update/msi.ts +72 -0
- package/src/desktop-update/release.ts +128 -0
- package/src/desktop-update/runtime.ts +155 -0
- package/src/desktop-update/staging.ts +118 -0
- package/src/desktop-update/trust.ts +45 -0
- package/src/generated/compatibility-version.json +1114 -442
- package/src/generated/model-metadata.ts +1 -1
- package/src/images/fulfill-video.ts +3 -3
- package/src/images/loop.ts +9 -2
- package/src/images/plan.ts +147 -11
- package/src/images/types.ts +13 -4
- package/src/images/xai-video-client.ts +72 -10
- package/src/integrations/model-name-guard.ts +25 -0
- package/src/integrations/route-intent-catalog.ts +26 -0
- package/src/integrations/route-intent-connected.ts +262 -0
- package/src/integrations/route-intent-contract.ts +55 -0
- package/src/integrations/route-intent-disconnect.ts +109 -0
- package/src/integrations/route-intent-initial.ts +64 -0
- package/src/integrations/route-intent-state.ts +117 -0
- package/src/integrations/route-intent-tick.ts +65 -0
- package/src/integrations/route-intent.ts +212 -0
- package/src/integrations/writer.ts +44 -11
- package/src/lib/client-retry-after.ts +29 -0
- package/src/lib/config-ownership.ts +13 -0
- package/src/lib/desktop-gui-origin.ts +28 -0
- package/src/lib/errors.ts +1 -1
- package/src/lib/gcp-adc.ts +48 -4
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/messages-error-body.ts +4 -1
- package/src/lib/offline-resend.ts +150 -0
- package/src/lib/outbound-credential-registry.ts +362 -4
- package/src/lib/paced-stream.ts +34 -0
- package/src/lib/passive-key-fetch-proof.ts +30 -0
- package/src/lib/passive-read.ts +5 -0
- package/src/lib/process-control.ts +76 -12
- package/src/lib/provider-outbound.ts +17 -6
- package/src/lib/redact.ts +84 -8
- package/src/lib/request-failure-model.ts +2 -0
- package/src/lib/response-body-inactivity.ts +23 -1
- package/src/lib/state-store-registrations.ts +11 -0
- package/src/lib/state-store-sweeper.ts +4 -0
- package/src/lib/supervisor-markers.ts +18 -0
- package/src/lib/terminal-safe-text.ts +58 -0
- package/src/lib/translator-budget.ts +3 -2
- package/src/lib/upstream-retry.ts +52 -9
- package/src/link/alias-lock.ts +119 -0
- package/src/link/child-activity.ts +28 -2
- package/src/link/child-binary-cache-fill.d.mts +50 -0
- package/src/link/child-binary-cache-fill.mjs +494 -0
- package/src/link/child-binary-cache-start.ts +73 -0
- package/src/link/child-binary-source.ts +12 -5
- package/src/link/child-gated-ocx.ts +29 -11
- package/src/link/child-observations.ts +2 -1
- package/src/link/child-observe.ts +2 -2
- package/src/link/child-ops-engine.ts +159 -91
- package/src/link/child-ops-host.ts +138 -0
- package/src/link/child-ops-runners.ts +319 -0
- package/src/link/child-ops-scheduler.ts +207 -0
- package/src/link/child-ops-types.ts +89 -0
- package/src/link/child-parity.ts +23 -4
- package/src/link/child-policy.ts +93 -0
- package/src/link/child-update-contract.ts +12 -3
- package/src/link/codex-settings.ts +1 -1
- package/src/link/compatibility.ts +18 -1
- package/src/link/diagnostics-read.ts +163 -0
- package/src/link/diagnostics.ts +20 -7
- package/src/link/explicit-route.ts +209 -0
- package/src/link/link-recover.ts +113 -0
- package/src/link/management-routes.ts +3 -1
- package/src/link/operation-recovery-slot.ts +44 -0
- package/src/link/operations-journal.ts +408 -0
- package/src/link/peer-report.ts +1 -1
- package/src/link/relay-auth.ts +14 -0
- package/src/link/remote-plant.ts +152 -14
- package/src/link/remote-platform.ts +21 -10
- package/src/link/remote-probe.ts +11 -3
- package/src/link/remote-windows.ts +124 -36
- package/src/link/request-compression.ts +30 -0
- package/src/link/residual-recovery.ts +66 -0
- package/src/link/retirement.ts +128 -0
- package/src/link/route-intent-watch.ts +41 -0
- package/src/link/route-intent.ts +209 -0
- package/src/link/route-proof.ts +82 -0
- package/src/link/route-rounds.ts +579 -0
- package/src/link/route-select.ts +95 -0
- package/src/link/route-trust.ts +96 -0
- package/src/link/ssh-argv.ts +172 -24
- package/src/link/ssh-capture-redact.ts +253 -0
- package/src/link/ssh-capture.ts +497 -0
- package/src/link/ssh-runner.ts +141 -14
- package/src/link/status-projection.ts +87 -0
- package/src/link/store.ts +54 -1
- package/src/link/supervisor.ts +543 -55
- package/src/link/sync-fanout-classify.ts +16 -0
- package/src/link/sync-then-restart.ts +65 -0
- package/src/link/tombstones.ts +209 -0
- package/src/link/traffic.ts +178 -0
- package/src/link/ws-activity-holds.ts +474 -0
- package/src/local-credentials/publication-fence.ts +20 -1
- package/src/messaging/budget.ts +23 -5
- package/src/messaging/mcp-queue-rpc.ts +1 -1
- package/src/messaging/mcp-queue-server.ts +16 -1
- package/src/messaging/mcp-resume-tools.ts +25 -0
- package/src/messaging/remote-enrollment.ts +3 -3
- package/src/messaging/remote-tunnels.ts +2 -2
- package/src/messaging/resume-permissions.ts +27 -0
- package/src/messaging/rpc.ts +50 -6
- package/src/oauth/anthropic-continuity.ts +23 -7
- package/src/oauth/anthropic-routing.ts +5 -2
- package/src/oauth/anthropic.ts +22 -2
- package/src/oauth/antigravity-risk.ts +126 -0
- package/src/oauth/claude-keychain-read.ts +78 -68
- package/src/oauth/generic-account-failover.ts +89 -18
- package/src/oauth/generic-session-affinity.ts +10 -3
- package/src/oauth/index.ts +24 -6
- package/src/oauth/local-token-detect.ts +8 -29
- package/src/oauth/login-cli-errors.ts +5 -1
- package/src/oauth/login-cli.ts +68 -19
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- package/src/oauth/pool-kernel.ts +3 -3
- package/src/oauth/store.ts +7 -0
- package/src/oauth/xai.ts +248 -14
- package/src/protocols/contract.ts +4 -0
- package/src/protocols/encoders/messages.ts +1 -0
- package/src/providers/alias-template.ts +48 -0
- package/src/providers/anthropic-billing-ownership.ts +2 -0
- package/src/providers/anthropic-billing-refusal.ts +27 -3
- package/src/providers/anthropic-output-caps.ts +46 -0
- package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
- package/src/providers/antigravity-effort-families.ts +11 -3
- package/src/providers/antigravity-models.ts +32 -9
- package/src/providers/antigravity-wire-snapshot.ts +3 -2
- package/src/providers/api-key-pause.ts +3 -0
- package/src/providers/api-key-resolve.ts +49 -7
- package/src/providers/api-key-response-ownership.ts +2 -0
- package/src/providers/api-key-selection.ts +51 -9
- package/src/providers/api-keys.ts +6 -2
- package/src/providers/cache-affinity-identity.ts +73 -0
- package/src/providers/cache-affinity.ts +256 -0
- package/src/providers/default-aliases.ts +98 -20
- package/src/providers/google-vertex-model-discovery.ts +515 -0
- package/src/providers/key-failover.ts +123 -8
- package/src/providers/key-store.ts +3 -3
- package/src/providers/kiro-models.ts +3 -5
- package/src/providers/label.ts +31 -5
- package/src/providers/mistral-transport.ts +17 -4
- package/src/providers/model-rename-fields.ts +5 -0
- package/src/providers/muse-key-quota.ts +14 -6
- package/src/providers/new-model-policy-runtime.ts +17 -4
- package/src/providers/new-model-policy.ts +30 -4
- package/src/providers/passive-key-observation.ts +252 -0
- package/src/providers/quota/account-cache.ts +2 -1
- package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
- package/src/providers/quota/passive-key-limits.ts +272 -0
- package/src/providers/quota/passive-wire-model.ts +126 -0
- package/src/providers/quota/report-cache.ts +61 -2
- package/src/providers/quota/workbuddy.ts +6 -2
- package/src/providers/quota-key-accounts.ts +11 -6
- package/src/providers/quota-types.ts +18 -0
- package/src/providers/quota.ts +11 -12
- package/src/providers/registry/entries-core.ts +34 -16
- package/src/providers/registry/entries-extended.ts +32 -0
- package/src/providers/registry/model-seeds.ts +35 -0
- package/src/providers/resolved-model-policy.ts +7 -0
- package/src/providers/routed-config.ts +8 -3
- package/src/providers/workbuddy-credit-balance.ts +125 -16
- package/src/providers/xai-transport.ts +3 -0
- package/src/remote/features.ts +17 -0
- package/src/responses/anthropic-progress.ts +10 -4
- package/src/responses/citation-markers.ts +231 -0
- package/src/responses/effort-history.ts +732 -0
- package/src/responses/spill-store.ts +5 -1
- package/src/responses/state/replay-input.ts +50 -0
- package/src/responses/state/replay-owner.ts +24 -0
- package/src/responses/state/snapshot-codec.ts +9 -0
- package/src/responses/state/spill-queue.ts +1 -0
- package/src/responses/state.ts +42 -60
- package/src/router.ts +2 -2
- package/src/routing/history/integrity.ts +41 -4
- package/src/routing/home-route-capture.ts +123 -0
- package/src/routing/home-route-intent.ts +200 -0
- package/src/routing/route-intent-state.ts +178 -0
- package/src/routing/route-to-live-settings.ts +35 -0
- package/src/routing/route-to-local.ts +145 -0
- package/src/routing/route-to-status.ts +94 -0
- package/src/routing/route-to-sync-child.ts +32 -0
- package/src/server/adapter-resolve.ts +21 -1
- package/src/server/admitted-http-turn.ts +3 -0
- package/src/server/auth-cors.ts +111 -3
- package/src/server/bare-upstream-error.ts +220 -0
- package/src/server/chat-native.ts +14 -5
- package/src/server/claude-messages.ts +6 -4
- package/src/server/codex-model-list.ts +4 -2
- package/src/server/configured-credentials.ts +37 -5
- package/src/server/direct-local-http.ts +26 -3
- package/src/server/gui-desktop-authorization.ts +36 -0
- package/src/server/gui-pair-delivery.ts +6 -3
- package/src/server/gui-session.ts +10 -1
- package/src/server/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +196 -12
- package/src/server/index/link-management.ts +15 -1
- package/src/server/index/link-relay-sessions.ts +87 -8
- package/src/server/index/link-websocket-limits.ts +136 -0
- package/src/server/index/link-websocket.ts +692 -0
- package/src/server/index/optional-listeners.ts +97 -7
- package/src/server/index/route-intent-watch.ts +47 -0
- package/src/server/index/serve-contract.ts +86 -0
- package/src/server/index/serve-options.ts +36 -86
- package/src/server/index/startup-warnings.ts +8 -2
- package/src/server/index/websocket-handler.ts +26 -4
- package/src/server/index.ts +15 -4
- package/src/server/inference/client-encoder-delivery.ts +2 -0
- package/src/server/inspection-tee.ts +39 -2
- package/src/server/lifecycle.ts +2 -0
- package/src/server/link-turn.ts +149 -0
- package/src/server/management/advisor-routes.ts +10 -2
- package/src/server/management/agent-settings-routes.ts +50 -16
- package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
- package/src/server/management/config-routes.ts +39 -3
- package/src/server/management/context.ts +9 -2
- package/src/server/management/desktop-authorization.ts +41 -0
- package/src/server/management/desktop-compatibility-routes.ts +9 -8
- package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
- package/src/server/management/home-integration-decision.ts +89 -0
- package/src/server/management/integration-routes.ts +208 -81
- package/src/server/management/link-child-ops-routes.ts +145 -43
- package/src/server/management/link-child-preflight.ts +31 -0
- package/src/server/management/link-diagnostics-route.ts +29 -0
- package/src/server/management/link-enrollment.ts +199 -47
- package/src/server/management/link-operation.ts +609 -0
- package/src/server/management/link-recover-route.ts +103 -0
- package/src/server/management/link-route-edit.ts +192 -0
- package/src/server/management/link-route-request.ts +62 -0
- package/src/server/management/link-route-state.ts +83 -7
- package/src/server/management/link-routes.ts +553 -51
- package/src/server/management/link-traffic-status.ts +13 -0
- package/src/server/management/model-routes.ts +122 -36
- package/src/server/management/model-rows.ts +2 -1
- package/src/server/management/native-integration-routes.ts +176 -70
- package/src/server/management/oauth-account-routes.ts +58 -18
- package/src/server/management/protocol-routes.ts +7 -0
- package/src/server/management/provider-completion-test.ts +4 -4
- package/src/server/management/provider-overwrite-carry.ts +14 -0
- package/src/server/management/provider-routes.ts +68 -65
- package/src/server/management/provider-routing-quota.ts +45 -0
- package/src/server/management/route-registry.ts +22 -3
- package/src/server/management/route-to-routes.ts +257 -0
- package/src/server/management/static-catalog-probe.ts +33 -0
- package/src/server/management/system-restart.ts +4 -2
- package/src/server/management/usage-aggregate-cache.ts +101 -66
- package/src/server/management-api.ts +17 -3
- package/src/server/management-auth.ts +13 -1
- package/src/server/messages-native-preflight.ts +27 -4
- package/src/server/messages-native.ts +17 -5
- package/src/server/persistent-gui-session.ts +6 -3
- package/src/server/proxy-liveness.ts +87 -15
- package/src/server/relay-eager.ts +36 -12
- package/src/server/relay.ts +189 -117
- package/src/server/request-body-facts.ts +48 -0
- package/src/server/request-decompress.ts +65 -2
- package/src/server/request-log-account-rotation.ts +6 -0
- package/src/server/request-log-attempt-usage.ts +69 -0
- package/src/server/request-log-cache-affinity.ts +60 -0
- package/src/server/request-log-conversation.ts +45 -2
- package/src/server/request-log-terminal-status.ts +210 -24
- package/src/server/request-log.ts +76 -80
- package/src/server/reserve-capability-startup.ts +32 -0
- package/src/server/responses/adapter-continuation.ts +2 -1
- package/src/server/responses/adapter-delivery.ts +4 -0
- package/src/server/responses/adapter-dispatch.ts +36 -17
- package/src/server/responses/advisor-plan-slot.ts +33 -1
- package/src/server/responses/advisor-question.ts +21 -0
- package/src/server/responses/advisor-slot.ts +10 -3
- package/src/server/responses/antigravity-fault-rotation.ts +24 -0
- package/src/server/responses/antigravity-validation-refusal.ts +43 -6
- package/src/server/responses/bare-namespace-aliases.ts +18 -0
- package/src/server/responses/buffered-sse-json.ts +9 -3
- package/src/server/responses/code-mode-collab-surface.ts +11 -0
- package/src/server/responses/codex-tool-catalog.ts +156 -0
- package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
- package/src/server/responses/combo-selection-keepalive.ts +254 -0
- package/src/server/responses/combo-stream-preflight.ts +557 -54
- package/src/server/responses/compact.ts +32 -8
- package/src/server/responses/core-codex-account.ts +17 -3
- package/src/server/responses/core-combo-failure.ts +8 -0
- package/src/server/responses/core-combo.ts +55 -12
- package/src/server/responses/core-errors.ts +13 -7
- package/src/server/responses/core-lifetime.ts +3 -2
- package/src/server/responses/core-normalize.ts +3 -1
- package/src/server/responses/core-options.ts +14 -0
- package/src/server/responses/core.ts +23 -0
- package/src/server/responses/estimated-usage.ts +115 -0
- package/src/server/responses/fetch-helpers.ts +15 -10
- package/src/server/responses/jev-model-invoke.ts +7 -2
- package/src/server/responses/native-replay-guard.ts +57 -0
- package/src/server/responses/opengateway-completion-guard.ts +10 -4
- package/src/server/responses/outbound-request-body.ts +29 -0
- package/src/server/responses/passthrough-completion.ts +109 -9
- package/src/server/responses/passthrough-delivery.ts +77 -18
- package/src/server/responses/passthrough-dispatch.ts +77 -73
- package/src/server/responses/policy-fallback.ts +13 -1
- package/src/server/responses/request-prepare.ts +59 -11
- package/src/server/responses/request-transport.ts +10 -3
- package/src/server/responses/reset-replay.ts +46 -2
- package/src/server/responses/run-turn-execution.ts +2 -0
- package/src/server/responses/sidecar-execution.ts +19 -0
- package/src/server/responses/terminal-error-redaction.ts +222 -25
- package/src/server/responses/ws-upstream.ts +2 -2
- package/src/server/sse-payload-rewrite.ts +3 -2
- package/src/server/stop-service-route.ts +85 -0
- package/src/server/system-env-shell.ts +12 -1
- package/src/server/system-env.ts +5 -3
- package/src/server/windows-tcp-drop.ts +21 -4
- package/src/server/workflow-refusal.ts +8 -0
- package/src/server/ws-bridge.ts +191 -12
- package/src/service/cli-windows-stop.ts +189 -0
- package/src/service/cli.ts +41 -12
- package/src/service/desktop-supervision.d.mts +2 -0
- package/src/service/desktop-supervision.mjs +5 -0
- package/src/service/disconnected-client-restart.ts +60 -0
- package/src/service/guarded-manager-target.ts +18 -1
- package/src/service/health.ts +99 -6
- package/src/service/launchd.ts +84 -31
- package/src/service/orchestration.ts +418 -91
- package/src/service/repair.ts +223 -6
- package/src/service/restart-proxy-stop.ts +79 -0
- package/src/service/service-child-ownership.ts +6 -2
- package/src/service/windows-checked-stop-live.ts +467 -0
- package/src/service/windows-checked-stop.ts +435 -0
- package/src/service/windows-command-line-token.ts +23 -0
- package/src/service/windows-guarded-manager.ts +77 -34
- package/src/service/windows-ops.ts +38 -56
- package/src/service/windows-process-evidence.ts +292 -0
- package/src/service/windows-process-native.ts +262 -0
- package/src/service/windows-service-stop.ts +321 -0
- package/src/service/windows-stop-binding.ts +187 -0
- package/src/service/windows-stop-budget.ts +123 -0
- package/src/service/windows-stop-confirm.ts +158 -0
- package/src/service/windows-stop-deadline.ts +56 -0
- package/src/service.ts +2 -2
- package/src/stall-timeout.ts +11 -0
- package/src/types/config.ts +57 -110
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +60 -2
- package/src/types/request.ts +23 -0
- package/src/types/routed-catalog-defaults.ts +17 -0
- package/src/types/routing-profile.ts +90 -0
- package/src/types.ts +4 -0
- package/src/update/guarded-runtime-ops.ts +5 -7
- package/src/update/index.ts +26 -11
- package/src/update/install-detection.mjs +3 -1
- package/src/update/job-pinned-start.ts +2 -0
- package/src/update/job-windows-restart.ts +19 -32
- package/src/update/job.ts +12 -5
- package/src/update/npm-install.d.mts +11 -0
- package/src/update/npm-install.mjs +44 -7
- package/src/update/orchestrated-entry.ts +1 -1
- package/src/update/orchestrated-node-driver.mjs +3 -2
- package/src/update/orchestrated-pnpm.d.mts +4 -0
- package/src/update/orchestrated-pnpm.mjs +50 -6
- package/src/update/orchestrated-session.d.mts +3 -1
- package/src/update/orchestrated-session.mjs +21 -6
- package/src/update/pnpm-global-install.d.mts +21 -3
- package/src/update/pnpm-global-install.mjs +322 -19
- package/src/update/pnpm-store-layout.mjs +46 -0
- package/src/update/sync-update-mutex.d.mts +3 -2
- package/src/update/sync-update-mutex.mjs +57 -8
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +545 -12
- package/src/update/windows-installer-marker.d.mts +1 -0
- package/src/update/windows-installer-marker.mjs +44 -0
- package/src/usage/expected-prices.ts +8 -0
- package/src/usage/filter-index.ts +326 -77
- package/src/usage/ledger-scanner.ts +15 -0
- package/src/usage/link-log-fields.ts +48 -0
- package/src/usage/log.ts +57 -6
- package/src/usage/request-body.ts +37 -0
- package/src/usage/telemetry-contract.ts +1 -0
- package/src/web-search/loop.ts +3 -0
- package/src/web-search/passthrough-bridge.ts +7 -0
- package/gui/dist/assets/App-BpJOzw4F.js +0 -59
- package/gui/dist/assets/brand-mark-DU-0Vdkr.js +0 -1
- package/gui/dist/assets/index-Bbor_y80.js +0 -94
- package/gui/dist/assets/index-DJEkIDAi.css +0 -2
- package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
- package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
- package/gui/dist/classic/assets/quota-summary-CakPe9Ni.js +0 -1
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
|
@@ -61,6 +61,46 @@ export interface GracefulStopIo {
|
|
|
61
61
|
* endpoint the stop never contacted — and recovery probes exactly that endpoint.
|
|
62
62
|
*/
|
|
63
63
|
runtimeEndpoint?: { hostname: string; port: number };
|
|
64
|
+
/**
|
|
65
|
+
* Send the stop only to `runtimeEndpoint`: without one, no request is sent and the runtime
|
|
66
|
+
* record is not read again. A caller whose deferral receipt names the endpoint it resolved sets
|
|
67
|
+
* this, so a record published in between cannot direct the request, and the receipt, elsewhere.
|
|
68
|
+
*/
|
|
69
|
+
runtimeEndpointOnly?: boolean;
|
|
70
|
+
/**
|
|
71
|
+
* Asked again immediately before the forced-stop fallback signals `pid`; false refuses the
|
|
72
|
+
* signal (killProxy throws). A caller that proved which process it may stop rechecks that here,
|
|
73
|
+
* so a pid reused after the graceful attempt is never signalled.
|
|
74
|
+
*/
|
|
75
|
+
mayTerminate?: () => boolean;
|
|
76
|
+
/**
|
|
77
|
+
* Windows checked stop (#7771): Part B confirms the port after this stop returns and
|
|
78
|
+
* owns the wait, so the 15 s waitForStoppedPort here is skipped (030 "Time budget").
|
|
79
|
+
*/
|
|
80
|
+
skipPortWait?: boolean;
|
|
81
|
+
/**
|
|
82
|
+
* Whether a graceful stop that did not confirm may fall back to the platform kill ladder.
|
|
83
|
+
*
|
|
84
|
+
* `ocx uninstall` sets this false when its Part A did not end stopped/absent: a manager
|
|
85
|
+
* that would not stop can respawn the proxy, and `taskkill /T /F` under it is exactly the
|
|
86
|
+
* forced stop the checked Windows stop exists to prevent. A 409 refusal never reaches the
|
|
87
|
+
* fallback either way. Defaults to true, which is every other caller's behaviour.
|
|
88
|
+
*/
|
|
89
|
+
allowForcedFallback?: boolean;
|
|
90
|
+
/**
|
|
91
|
+
* The forced ladder, injectable so the rule above can be proven without signalling a
|
|
92
|
+
* process. Production callers omit it and get {@link killProxy}.
|
|
93
|
+
*/
|
|
94
|
+
forceKill?: (pid: number) => void;
|
|
95
|
+
/**
|
|
96
|
+
* The post-stop port wait, injectable so a test can present a verified listener without
|
|
97
|
+
* starting one. Production callers omit it and get `reclaimListenPort`.
|
|
98
|
+
*/
|
|
99
|
+
reclaimPort?: (
|
|
100
|
+
port: number,
|
|
101
|
+
hostname: string,
|
|
102
|
+
opts: { timeoutMs?: number; intervalMs?: number; scanIntervalMs?: number; killOcxHolders?: boolean; onlyKillPids?: number[] },
|
|
103
|
+
) => Promise<boolean>;
|
|
64
104
|
}
|
|
65
105
|
|
|
66
106
|
/**
|
|
@@ -235,7 +275,7 @@ async function stopProxyGracefullyDetailed(
|
|
|
235
275
|
const done = (result: GracefulStopResult): { result: GracefulStopResult; refusal: StopRefusal } =>
|
|
236
276
|
({ result, refusal });
|
|
237
277
|
const readRuntime = io.readRuntime ?? readRuntimePort;
|
|
238
|
-
const runtime = io.runtimeEndpoint ?? readRuntime(pid);
|
|
278
|
+
const runtime = io.runtimeEndpoint ?? (io.runtimeEndpointOnly ? null : readRuntime(pid));
|
|
239
279
|
if (!runtime?.port) return done(false);
|
|
240
280
|
const env = io.env ?? process.env;
|
|
241
281
|
const headers: Record<string, string> = {};
|
|
@@ -319,7 +359,7 @@ function drainDeadlineMs(): number {
|
|
|
319
359
|
/** Graceful-first stop: management-API drain, then the platform kill ladder. */
|
|
320
360
|
export async function stopProxy(pid: number, io: GracefulStopIo = {}): Promise<boolean> {
|
|
321
361
|
if (!isProcessAlive(pid)) return false;
|
|
322
|
-
const runtime = io.runtimeEndpoint ?? readRuntimePort(pid);
|
|
362
|
+
const runtime = io.skipPortWait ? null : io.runtimeEndpoint ?? (io.runtimeEndpointOnly ? null : readRuntimePort(pid));
|
|
323
363
|
const { result: graceful, refusal } = await stopProxyGracefullyDetailed(pid, io);
|
|
324
364
|
if (graceful === "refused") {
|
|
325
365
|
// The proxy refused on purpose. Forcing would strip shared config while whatever owns
|
|
@@ -334,39 +374,62 @@ export async function stopProxy(pid: number, io: GracefulStopIo = {}): Promise<b
|
|
|
334
374
|
if (graceful === "teardown-unconfirmed") {
|
|
335
375
|
// Exit was observed, so do not enter the forced-stop fallback. Returning false keeps
|
|
336
376
|
// shared restoration with `ocx stop` instead of claiming that the proxy completed it.
|
|
337
|
-
await waitForStoppedPort(runtime, pid);
|
|
377
|
+
await waitForStoppedPort(runtime, pid, io);
|
|
338
378
|
return false;
|
|
339
379
|
}
|
|
340
380
|
if (graceful) {
|
|
341
|
-
await waitForStoppedPort(runtime, pid);
|
|
381
|
+
await waitForStoppedPort(runtime, pid, io);
|
|
342
382
|
return true;
|
|
343
383
|
}
|
|
344
|
-
|
|
345
|
-
|
|
384
|
+
if (io.allowForcedFallback === false) {
|
|
385
|
+
// The caller forbade the forced ladder (a manager that would not stop may respawn the
|
|
386
|
+
// proxy). Report the unconfirmed stop; the caller keeps its failure recorded.
|
|
387
|
+
await waitForStoppedPort(runtime, pid, io);
|
|
388
|
+
return false;
|
|
389
|
+
}
|
|
390
|
+
// Written as a literal killProxy(pid, ...) call so the refusal-before-kill ordering stays
|
|
391
|
+
// checkable in source (tests/providers/xai/grok-lifecycle.test.ts); the seam only swaps it.
|
|
392
|
+
if (io.forceKill) io.forceKill(pid);
|
|
393
|
+
else killProxy(pid, io.mayTerminate);
|
|
394
|
+
await waitForStoppedPort(runtime, pid, io);
|
|
346
395
|
return false;
|
|
347
396
|
}
|
|
348
397
|
|
|
349
|
-
/**
|
|
398
|
+
/**
|
|
399
|
+
* After stop/kill, wait for the former listen port to become bindable (Windows drain).
|
|
400
|
+
*
|
|
401
|
+
* The wait is OBSERVATIONAL whenever the caller forbade the forced ladder
|
|
402
|
+
* (`allowForcedFallback === false`). Reclaiming with `killOcxHolders` would terminate a
|
|
403
|
+
* verified listener through `killProxy`, which is the forced stop that refusal exists to
|
|
404
|
+
* prevent: a manager that would not stop may respawn the proxy, so a survivor must be
|
|
405
|
+
* reported rather than killed. The wait still runs and still returns; it only stops being
|
|
406
|
+
* allowed to change anything.
|
|
407
|
+
*/
|
|
350
408
|
async function waitForStoppedPort(
|
|
351
409
|
runtime: { port: number; hostname?: string } | null | undefined,
|
|
352
410
|
stoppedPid?: number,
|
|
411
|
+
io: GracefulStopIo = {},
|
|
353
412
|
): Promise<void> {
|
|
354
413
|
if (!runtime?.port) return;
|
|
414
|
+
const mayKill = io.allowForcedFallback !== false;
|
|
355
415
|
try {
|
|
356
|
-
const
|
|
357
|
-
await
|
|
416
|
+
const reclaim = io.reclaimPort ?? (await import("../server/port-reclaim")).reclaimListenPort;
|
|
417
|
+
await reclaim(runtime.port, runtime.hostname ?? "127.0.0.1", {
|
|
358
418
|
timeoutMs: 15_000,
|
|
359
419
|
intervalMs: 100,
|
|
360
420
|
scanIntervalMs: 500,
|
|
361
421
|
// Only the process we just stopped — never kill a newly started twin proxy.
|
|
362
|
-
killOcxHolders: !!(stoppedPid && stoppedPid > 0),
|
|
363
|
-
onlyKillPids: stoppedPid && stoppedPid > 0 ? [stoppedPid] : [],
|
|
422
|
+
killOcxHolders: mayKill && !!(stoppedPid && stoppedPid > 0),
|
|
423
|
+
onlyKillPids: mayKill && stoppedPid && stoppedPid > 0 ? [stoppedPid] : [],
|
|
364
424
|
});
|
|
365
425
|
} catch {
|
|
366
426
|
/* best-effort — callers that need a hard guarantee reclaim again before bind */
|
|
367
427
|
}
|
|
368
428
|
}
|
|
369
429
|
|
|
430
|
+
/** taskkill in the forced fallback; it had no timeout before #7771. */
|
|
431
|
+
export const FORCED_TASKKILL_TIMEOUT_MS = 5_000;
|
|
432
|
+
|
|
370
433
|
export function killProxy(pid: number, mayTerminate?: () => boolean): void {
|
|
371
434
|
if (!isProcessAlive(pid)) return;
|
|
372
435
|
const authorize = () => {
|
|
@@ -381,7 +444,8 @@ export function killProxy(pid: number, mayTerminate?: () => boolean): void {
|
|
|
381
444
|
const args = ["/PID", String(pid), "/T", "/F"];
|
|
382
445
|
authorize();
|
|
383
446
|
try {
|
|
384
|
-
|
|
447
|
+
// Capped (#7771): the checked stop's budget counts the forced kill at 5 s.
|
|
448
|
+
execFileSync(taskkill, args, { stdio: "pipe", windowsHide: true, timeout: FORCED_TASKKILL_TIMEOUT_MS });
|
|
385
449
|
} catch (err) {
|
|
386
450
|
if (isProcessAlive(pid)) throw err;
|
|
387
451
|
}
|
|
@@ -32,7 +32,8 @@ export interface ProviderOutboundDependencies {
|
|
|
32
32
|
/** Recheck caller-owned credential authority after DNS and immediately before transport. */
|
|
33
33
|
beforeSend?: () => boolean;
|
|
34
34
|
/**
|
|
35
|
-
* Caller opt-in for a cleartext `http:` POST
|
|
35
|
+
* Caller opt-in for a cleartext `http:` POST (or credentialed GET, see `cleartextPolicy`) to a
|
|
36
|
+
* self-hosted service. Honoured only when the
|
|
36
37
|
* URL host is exactly `localhost` or an address literal in the narrow local allowlist
|
|
37
38
|
* (`localCleartextAddressAllowed`) AND the provider row itself sets `allowPrivateNetwork: true`
|
|
38
39
|
* (a registry default does not count). Every resolved answer must stay inside the same
|
|
@@ -40,6 +41,13 @@ export interface ProviderOutboundDependencies {
|
|
|
40
41
|
* LAN. Every other destination keeps the HTTPS-only POST gate. Defaults to refusing.
|
|
41
42
|
*/
|
|
42
43
|
allowLocalCleartextPost?: boolean;
|
|
44
|
+
/**
|
|
45
|
+
* Which requests the cleartext rules above bind. A POST always obeys them. `"credentialed"`
|
|
46
|
+
* also holds a GET to them, for a caller whose GET carries the same credential as its POST (the
|
|
47
|
+
* video poll): HTTPS, or the local cleartext opt-in with its allowlisted answers and direct
|
|
48
|
+
* route. Without it a GET keeps the discovery behaviour, which admits `http:`.
|
|
49
|
+
*/
|
|
50
|
+
cleartextPolicy?: "credentialed";
|
|
43
51
|
}
|
|
44
52
|
|
|
45
53
|
function ipv4Octets(address: string): number[] | null {
|
|
@@ -234,10 +242,13 @@ async function providerOutboundRequest(
|
|
|
234
242
|
const assertSendAllowed = () => {
|
|
235
243
|
if (dependencies.beforeSend?.() === false) throw new ProviderOutboundSendCancelledError("provider credential changed before send");
|
|
236
244
|
};
|
|
237
|
-
|
|
245
|
+
// A POST, and a GET whose caller declared it carries the POST's credential, must not cross the
|
|
246
|
+
// network in cleartext. The messages name a GET explicitly so a refusal says which call failed.
|
|
247
|
+
const label = method === "POST" ? "POST" : "credentialed GET";
|
|
248
|
+
const postUrl = method === "POST" || dependencies.cleartextPolicy === "credentialed" ? new URL(url) : undefined;
|
|
238
249
|
if (postUrl?.protocol !== undefined && postUrl.protocol !== "https:"
|
|
239
250
|
&& !localCleartextPostAllowed(provider, postUrl, dependencies)) {
|
|
240
|
-
throw new ProviderOutboundPolicyError(
|
|
251
|
+
throw new ProviderOutboundPolicyError(`provider ${label} URL must use HTTPS`);
|
|
241
252
|
}
|
|
242
253
|
// Only reachable after the narrow opt-in above admitted it.
|
|
243
254
|
const localCleartextPost = postUrl?.protocol === "http:";
|
|
@@ -248,7 +259,7 @@ async function providerOutboundRequest(
|
|
|
248
259
|
if (typeof provider.fetch === "function") {
|
|
249
260
|
// An executor resolves names itself, so a cleartext POST through one must name an address.
|
|
250
261
|
if (localCleartextPost && !isIP(unbracketedHostname(postUrl!))) {
|
|
251
|
-
throw new ProviderOutboundPolicyError(
|
|
262
|
+
throw new ProviderOutboundPolicyError(`a cleartext provider ${label} through a caller-supplied executor must use an address literal`);
|
|
252
263
|
}
|
|
253
264
|
// A caller-owned executor decides its own transport, so a provider egress route cannot be
|
|
254
265
|
// applied to it. Refusing is the only honest answer: running the executor anyway would send
|
|
@@ -310,7 +321,7 @@ async function providerOutboundRequest(
|
|
|
310
321
|
// the DNS-failure proxy degradation below, which needs one) would carry it off-host unencrypted.
|
|
311
322
|
if (localCleartextPost && proxyApplies) {
|
|
312
323
|
throw new ProviderOutboundPolicyError(
|
|
313
|
-
`a cleartext provider
|
|
324
|
+
`a cleartext provider ${label} cannot use an outbound proxy; add ${normalizeProxyHostname(parsed.hostname)} to NO_PROXY`,
|
|
314
325
|
);
|
|
315
326
|
}
|
|
316
327
|
const isCanonicalUrl = dependencies.isCanonicalUrl ?? (() => false);
|
|
@@ -390,7 +401,7 @@ async function providerOutboundRequest(
|
|
|
390
401
|
}
|
|
391
402
|
if (localCleartextPost
|
|
392
403
|
&& !resolved.addresses.every(answer => localCleartextAddressAllowed(answer.address))) {
|
|
393
|
-
throw new ProviderOutboundPolicyError(
|
|
404
|
+
throw new ProviderOutboundPolicyError(`a cleartext provider ${label} resolved outside the local address allowlist`);
|
|
394
405
|
}
|
|
395
406
|
const requestOptions = {
|
|
396
407
|
headers: init.headers,
|
package/src/lib/redact.ts
CHANGED
|
@@ -108,11 +108,13 @@ const OTHER_FRAMED_CREDENTIALS: Array<[RegExp, string]> = [
|
|
|
108
108
|
// attacker-controlled text, so a body line starting `--not-the-boundary`
|
|
109
109
|
// ended the mask and exposed everything after it. Consuming the remainder
|
|
110
110
|
// costs trailing context in one framing and closes the bypass.
|
|
111
|
+
//
|
|
112
|
+
// Only the part-header name is a regex; the rest of the grammar
|
|
113
|
+
// (`[^\r\n]*\r?\n(?:\r?\n)?` then a non-empty body) is applied by
|
|
114
|
+
// maskMultipartOnce in one pass. As a single regex every candidate on a line
|
|
115
|
+
// without a terminator rescanned that line, quadratic in the input.
|
|
111
116
|
[
|
|
112
|
-
new RegExp(
|
|
113
|
-
`(name=["']?(?:${CREDENTIAL_HEADER_LABEL})["']?[^\\r\\n]*\\r?\\n(?:\\r?\\n)?)([\\s\\S]+)`,
|
|
114
|
-
"gi",
|
|
115
|
-
),
|
|
117
|
+
new RegExp(`name=["']?(?:${CREDENTIAL_HEADER_LABEL})["']?`, "gi"),
|
|
116
118
|
"multipart",
|
|
117
119
|
],
|
|
118
120
|
];
|
|
@@ -188,6 +190,10 @@ function maskXmlIdentifyingAttribute(value: string, decodeEscapes: boolean): str
|
|
|
188
190
|
function maskOtherFramingsOnce(value: string, decodeEscapes: boolean): string {
|
|
189
191
|
let current = value;
|
|
190
192
|
for (const [pattern, kind] of OTHER_FRAMED_CREDENTIALS) {
|
|
193
|
+
if (kind === "multipart") {
|
|
194
|
+
current = maskMultipartOnce(current, decodeEscapes, pattern);
|
|
195
|
+
continue;
|
|
196
|
+
}
|
|
191
197
|
const { folded, map } = foldForMatching(current, decodeEscapes);
|
|
192
198
|
pattern.lastIndex = 0;
|
|
193
199
|
let out = "";
|
|
@@ -218,6 +224,40 @@ function maskOtherFramingsOnce(value: string, decodeEscapes: boolean): string {
|
|
|
218
224
|
return current;
|
|
219
225
|
}
|
|
220
226
|
|
|
227
|
+
/**
|
|
228
|
+
* The multipart rule: a credential-named part header, the rest of its line, its line break, an
|
|
229
|
+
* optional blank line, then a non-empty body masked to the end of the input. Equivalent to the
|
|
230
|
+
* regex `(name=["']?(?:LABEL)["']?[^\r\n]*\r?\n(?:\r?\n)?)([\s\S]+)`, but linear: when one
|
|
231
|
+
* candidate's line has no usable terminator, every later candidate on that line fails the same way,
|
|
232
|
+
* so the search resumes past the line instead of rescanning it from each candidate.
|
|
233
|
+
*/
|
|
234
|
+
function maskMultipartOnce(current: string, decodeEscapes: boolean, partHeader: RegExp): string {
|
|
235
|
+
const { folded, map } = foldForMatching(current, decodeEscapes);
|
|
236
|
+
partHeader.lastIndex = 0;
|
|
237
|
+
let lineEnd = -1;
|
|
238
|
+
for (let match = partHeader.exec(folded); match !== null; match = partHeader.exec(folded)) {
|
|
239
|
+
const nameEnd = match.index + match[0].length;
|
|
240
|
+
if (nameEnd > lineEnd) {
|
|
241
|
+
lineEnd = nameEnd;
|
|
242
|
+
while (lineEnd < folded.length && folded[lineEnd] !== "\r" && folded[lineEnd] !== "\n") lineEnd++;
|
|
243
|
+
}
|
|
244
|
+
let headEnd = folded[lineEnd] === "\n" ? lineEnd + 1
|
|
245
|
+
: folded[lineEnd] === "\r" && folded[lineEnd + 1] === "\n" ? lineEnd + 2 : -1;
|
|
246
|
+
if (headEnd < 0 || headEnd >= folded.length) {
|
|
247
|
+
partHeader.lastIndex = lineEnd + 1;
|
|
248
|
+
continue;
|
|
249
|
+
}
|
|
250
|
+
const blank = folded[headEnd] === "\n" ? 1 : folded[headEnd] === "\r" && folded[headEnd + 1] === "\n" ? 2 : 0;
|
|
251
|
+
if (headEnd + blank < folded.length) headEnd += blank;
|
|
252
|
+
const start = map[match.index] ?? current.length;
|
|
253
|
+
const end = map[folded.length] ?? current.length;
|
|
254
|
+
const head = current.slice(start, map[headEnd] ?? end);
|
|
255
|
+
if (!current.slice(start + head.length, end).trim()) return current;
|
|
256
|
+
return current.slice(0, start) + head + REDACTED_SECRET;
|
|
257
|
+
}
|
|
258
|
+
return current;
|
|
259
|
+
}
|
|
260
|
+
|
|
221
261
|
|
|
222
262
|
/**
|
|
223
263
|
* Run the header rule over BOTH matching views and take the union.
|
|
@@ -282,7 +322,7 @@ function maskCredentialHeadersOnce(value: string, decodeEscapes: boolean): strin
|
|
|
282
322
|
return out + value.slice(cursor);
|
|
283
323
|
}
|
|
284
324
|
|
|
285
|
-
const SECRET_VALUE_PATTERNS: Array<[RegExp, string]> = [
|
|
325
|
+
const SECRET_VALUE_PATTERNS: Array<[RegExp, string] | ((value: string) => string)> = [
|
|
286
326
|
// A Bearer token outside a labelled header (prose, JSON fragments, logs).
|
|
287
327
|
// Horizontal whitespace only: `\s+` crossed line boundaries and masked the
|
|
288
328
|
// first word of the NEXT line when a header was quoted with a trailing break.
|
|
@@ -304,10 +344,46 @@ const SECRET_VALUE_PATTERNS: Array<[RegExp, string]> = [
|
|
|
304
344
|
// a quoted proto field does not have. `eyJ` is the base64url of `{"`, so the
|
|
305
345
|
// JWT rule needs a real three-segment shape and does not match ordinary prose.
|
|
306
346
|
[/\bdevin-session-token\$[A-Za-z0-9._~+/=-]{8,}/g, REDACTED_SECRET],
|
|
307
|
-
|
|
347
|
+
maskJwts,
|
|
308
348
|
[/\b(arn:aws:[A-Za-z0-9_-]+:[A-Za-z0-9-]*:\d{12}:[A-Za-z0-9_/:+=,.@-]+)\b/g, REDACTED_SECRET],
|
|
309
349
|
];
|
|
310
350
|
|
|
351
|
+
/**
|
|
352
|
+
* The JWT rule `\beyJ[A-Za-z0-9_-]{8,}\.[A-Za-z0-9_-]{8,}\.[A-Za-z0-9_-]*` applied in one pass. Each
|
|
353
|
+
* segment class excludes the dot, so a segment always runs to the end of its run of token
|
|
354
|
+
* characters and the dot must follow that run. As a regex, every `eyJ` inside one long run without a
|
|
355
|
+
* dot after it rescanned the rest of the run: quadratic. Here a candidate that fails skips past the
|
|
356
|
+
* run, because every later candidate in it ends the same run and fails the same way.
|
|
357
|
+
*/
|
|
358
|
+
function maskJwts(value: string): string {
|
|
359
|
+
if (!value.includes("eyJ")) return value;
|
|
360
|
+
const start = /\beyJ/g;
|
|
361
|
+
const runEnd = (from: number): number => {
|
|
362
|
+
let at = from;
|
|
363
|
+
while (at < value.length && JWT_SEGMENT_CHAR.test(value[at]!)) at++;
|
|
364
|
+
return at;
|
|
365
|
+
};
|
|
366
|
+
let out = "";
|
|
367
|
+
let cursor = 0;
|
|
368
|
+
for (let match = start.exec(value); match !== null; match = start.exec(value)) {
|
|
369
|
+
const first = match.index + 3;
|
|
370
|
+
const firstEnd = runEnd(first);
|
|
371
|
+
const second = firstEnd + 1;
|
|
372
|
+
const secondEnd = value[firstEnd] === "." && firstEnd - first >= 8 ? runEnd(second) : -1;
|
|
373
|
+
if (secondEnd < 0 || secondEnd - second < 8 || value[secondEnd] !== ".") {
|
|
374
|
+
start.lastIndex = Math.max(firstEnd, secondEnd);
|
|
375
|
+
continue;
|
|
376
|
+
}
|
|
377
|
+
const end = runEnd(secondEnd + 1);
|
|
378
|
+
out += value.slice(cursor, match.index) + REDACTED_SECRET;
|
|
379
|
+
cursor = end;
|
|
380
|
+
start.lastIndex = end;
|
|
381
|
+
}
|
|
382
|
+
return cursor === 0 ? value : out + value.slice(cursor);
|
|
383
|
+
}
|
|
384
|
+
|
|
385
|
+
const JWT_SEGMENT_CHAR = /[A-Za-z0-9_-]/;
|
|
386
|
+
|
|
311
387
|
type HeaderRecord = Record<string, string | string[] | undefined>;
|
|
312
388
|
|
|
313
389
|
function isPlainObject(value: unknown): value is Record<string, unknown> {
|
|
@@ -322,8 +398,8 @@ function isSensitiveKey(key: string): boolean {
|
|
|
322
398
|
|
|
323
399
|
export function redactSecretString(value: string): string {
|
|
324
400
|
let redacted = maskOtherFramings(maskCredentialHeaders(value));
|
|
325
|
-
for (const
|
|
326
|
-
redacted = redacted.replace(
|
|
401
|
+
for (const rule of SECRET_VALUE_PATTERNS) {
|
|
402
|
+
redacted = typeof rule === "function" ? rule(redacted) : redacted.replace(rule[0], rule[1]);
|
|
327
403
|
}
|
|
328
404
|
return redacted;
|
|
329
405
|
}
|
|
@@ -216,6 +216,8 @@ const RECOVERY_KIND_CAUSE = {
|
|
|
216
216
|
// turn. One kind cannot say both, so it says the weaker thing.
|
|
217
217
|
"transient-5xx": "upstream-fault",
|
|
218
218
|
"connection-reset": "transport-ambiguous",
|
|
219
|
+
// The send it replaced failed DNS resolution, so those bytes provably never left (#7958).
|
|
220
|
+
"offline-resend": "transport-unsent",
|
|
219
221
|
"oauth-401": "credential-rejected",
|
|
220
222
|
"oauth-account-403": "credential-rejected",
|
|
221
223
|
"key-401": "credential-rejected",
|
|
@@ -11,6 +11,25 @@ export class ResponseBodyInactivityError extends DOMException {
|
|
|
11
11
|
}
|
|
12
12
|
}
|
|
13
13
|
|
|
14
|
+
/**
|
|
15
|
+
* The same expiry from a guard armed by the operator's explicit `stallTimeoutSec` (#8206). Only this
|
|
16
|
+
* one reaches clients as `upstream_stall_timeout`; a guard on a default budget keeps its old terminal.
|
|
17
|
+
*/
|
|
18
|
+
export class ExplicitBodyStallError extends ResponseBodyInactivityError {}
|
|
19
|
+
|
|
20
|
+
// Published responses whose upstream reads already run under a positive inactivity guard.
|
|
21
|
+
const guardedResponses = new WeakSet<Response>();
|
|
22
|
+
|
|
23
|
+
/** Record that `response` relays bytes from guarded upstream reads, so no second clock is armed. */
|
|
24
|
+
export function markResponseBodyInactivityGuarded(response: Response): Response {
|
|
25
|
+
guardedResponses.add(response);
|
|
26
|
+
return response;
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
export function isResponseBodyInactivityGuarded(response: Response): boolean {
|
|
30
|
+
return guardedResponses.has(response);
|
|
31
|
+
}
|
|
32
|
+
|
|
14
33
|
/**
|
|
15
34
|
* Bound silence only while the consumer is waiting for upstream bytes.
|
|
16
35
|
*
|
|
@@ -23,13 +42,16 @@ export function guardResponseBodyInactivity(
|
|
|
23
42
|
response: Response,
|
|
24
43
|
signal: AbortSignal | undefined,
|
|
25
44
|
timeoutMs: number,
|
|
45
|
+
options: { explicitBudget?: boolean } = {},
|
|
26
46
|
): ResponseBodyInactivityGuard {
|
|
27
47
|
const source = response.body;
|
|
28
48
|
if (!source) return { response, dispose: () => {} };
|
|
29
49
|
|
|
30
50
|
const reader = source.getReader();
|
|
31
51
|
const timeoutEnabled = Number.isFinite(timeoutMs) && timeoutMs > 0;
|
|
32
|
-
const timeoutError =
|
|
52
|
+
const timeoutError = options.explicitBudget === true
|
|
53
|
+
? new ExplicitBodyStallError(timeoutMs)
|
|
54
|
+
: new ResponseBodyInactivityError(timeoutMs);
|
|
33
55
|
let output!: ReadableStreamDefaultController<Uint8Array>;
|
|
34
56
|
let settled = false;
|
|
35
57
|
let timer: ReturnType<typeof setTimeout> | undefined;
|
|
@@ -24,6 +24,7 @@ import {
|
|
|
24
24
|
import { reconcileComboWarningMemos } from "../combos/request";
|
|
25
25
|
import { reconcileComboRotationState } from "../combos/resolve";
|
|
26
26
|
import { reconcileComboRecall, sweepExpiredComboRecall } from "../server/responses/combo-session-recall";
|
|
27
|
+
import { reconcileProviderCacheAffinity, sweepExpiredProviderCacheAffinity } from "../providers/cache-affinity";
|
|
27
28
|
import { listLiveComboTargetKeys } from "../combos/types";
|
|
28
29
|
import {
|
|
29
30
|
listLiveConfigOwnershipRoots,
|
|
@@ -107,6 +108,11 @@ export function buildGenerationContext(): GenerationContext {
|
|
|
107
108
|
return {
|
|
108
109
|
generation: 0,
|
|
109
110
|
providerNames,
|
|
111
|
+
disabledProviderNames: new Set(Object.entries(liveServerConfig.providers)
|
|
112
|
+
.filter(([, provider]) => provider.disabled === true)
|
|
113
|
+
.map(([name]) => name)),
|
|
114
|
+
providerKeyEntryIds: new Map(Object.entries(liveServerConfig.providers)
|
|
115
|
+
.map(([name, provider]) => [name, new Set((provider.apiKeyPool ?? []).map(entry => entry.id))] as const)),
|
|
110
116
|
comboIds: new Set(Object.keys(liveServerConfig.combos ?? {})),
|
|
111
117
|
comboTargets: listLiveComboTargetKeys(liveServerConfig),
|
|
112
118
|
codexAccountIds: listLiveCodexAccountIds(liveServerConfig),
|
|
@@ -161,6 +167,11 @@ export const STATE_STORE_REGISTRATIONS = [
|
|
|
161
167
|
sweepExpired: sweepExpiredComboRecall,
|
|
162
168
|
reconcileGeneration: reconcileComboRecall,
|
|
163
169
|
},
|
|
170
|
+
{
|
|
171
|
+
name: "provider-cache-affinity",
|
|
172
|
+
sweepExpired: sweepExpiredProviderCacheAffinity,
|
|
173
|
+
reconcileGeneration: context => reconcileProviderCacheAffinity(context, liveServerConfig?.providers),
|
|
174
|
+
},
|
|
164
175
|
{ name: "guardian-backoff", reconcileGeneration: reconcileGuardianBackoff },
|
|
165
176
|
{ name: "codex-reauth", reconcileGeneration: reconcileCodexReauthState },
|
|
166
177
|
{ name: "oauth-reauth", reconcileGeneration: reconcileOAuthReauthState },
|
|
@@ -3,6 +3,10 @@ export const STATE_SWEEP_INTERVAL_MS = 60_000;
|
|
|
3
3
|
export interface GenerationContext {
|
|
4
4
|
generation: number;
|
|
5
5
|
providerNames: ReadonlySet<string>;
|
|
6
|
+
/** Providers disabled in the live configuration; stores keyed by provider may drop their rows. */
|
|
7
|
+
disabledProviderNames?: ReadonlySet<string>;
|
|
8
|
+
/** Live key-pool entry ids per provider, for stores that bind to one entry. */
|
|
9
|
+
providerKeyEntryIds?: ReadonlyMap<string, ReadonlySet<string>>;
|
|
6
10
|
comboIds: ReadonlySet<string>;
|
|
7
11
|
comboTargets: ReadonlySet<string>;
|
|
8
12
|
codexAccountIds: ReadonlySet<string>;
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The environment markers a supervisor writes for the one process it launches: the desktop app
|
|
3
|
+
* (OCX_DESKTOP_SUPERVISED), a service manager (OCX_SERVICE_MANAGED: launchd, systemd, WinSW) and the
|
|
4
|
+
* Windows Task Scheduler wrapper (OCX_WINDOWS_WRAPPER_PROTOCOL). A marker proves only that the
|
|
5
|
+
* process was started with it, so it must never reach a process that supervisor did not launch: a
|
|
6
|
+
* detached proxy, a replacement, or a shell handed to a tool. Every such launch removes them with
|
|
7
|
+
* {@link withoutSupervisorMarkers}. The values match DESKTOP_SUPERVISED_ENV
|
|
8
|
+
* (src/lib/system-restart-contract.ts), SERVICE_MANAGED_ENV (src/service/state.ts) and
|
|
9
|
+
* WINDOWS_WRAPPER_PROTOCOL_ENV (src/service/windows-wrapper-exit.ts); a test pins that.
|
|
10
|
+
*/
|
|
11
|
+
export const SUPERVISOR_MARKER_ENVS = ["OCX_DESKTOP_SUPERVISED", "OCX_SERVICE_MANAGED", "OCX_WINDOWS_WRAPPER_PROTOCOL"] as const;
|
|
12
|
+
|
|
13
|
+
/** A copy of `env` without any supervisor marker; `env` itself is not changed. */
|
|
14
|
+
export function withoutSupervisorMarkers<T extends Record<string, string | undefined>>(env: T): T {
|
|
15
|
+
const copy = { ...env };
|
|
16
|
+
for (const name of SUPERVISOR_MARKER_ENVS) delete copy[name];
|
|
17
|
+
return copy;
|
|
18
|
+
}
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Render untrusted provider- or hub-supplied text without letting it control the operator's
|
|
3
|
+
* terminal.
|
|
4
|
+
*
|
|
5
|
+
* The value is data. Escaping is a rendering decision at the moment a human reads it, so it
|
|
6
|
+
* happens here rather than at the point the value is stored or validated: structured output keeps
|
|
7
|
+
* the exact bytes, and only the printed line is neutralized.
|
|
8
|
+
*
|
|
9
|
+
* It lives in `src/lib/` because more than one surface prints an untrusted value: the CLI's
|
|
10
|
+
* diagnostic boundaries (`src/cli/runtime-api.ts`, which re-exports this) and the OAuth device
|
|
11
|
+
* login (`src/oauth/xai.ts`), whose provider-supplied user code and instructions reach the same
|
|
12
|
+
* tty. Importing the CLI module from the OAuth module would close an import cycle, so the
|
|
13
|
+
* primitive is shared from the leaf instead.
|
|
14
|
+
*/
|
|
15
|
+
|
|
16
|
+
/**
|
|
17
|
+
* Code points that can drive a terminal or hide what it shows, written as escapes so none of them
|
|
18
|
+
* sits literally in this source.
|
|
19
|
+
*
|
|
20
|
+
* The block is the terminal-safety set `src/link/ssh-runner.ts` and `src/link/ssh-capture-redact.ts`
|
|
21
|
+
* already strip from hint text — C0, DEL, C1, the zero-width/bidi formatting area, the BOM — plus
|
|
22
|
+
* the two line separators that end a printed line. C0/C1 alone leaves the rest of it reachable: a
|
|
23
|
+
* bidi override (`U+202E`), its terminator (`U+202C`), an isolate (`U+2066`–`U+2069`), a directional
|
|
24
|
+
* mark (`U+061C`, `U+200E`, `U+200F`) or a zero-width/BOM character can reorder or conceal the
|
|
25
|
+
* line around it while reading as nothing at all. Provider-supplied instructions and user codes
|
|
26
|
+
* are exactly that class of value, so the whole block is escaped rather than only the C0/C1 part.
|
|
27
|
+
*
|
|
28
|
+
* Two members of that area are deliberately left alone because they are text shaping, not
|
|
29
|
+
* disguise: ZWNJ (`U+200C`) and ZWJ (`U+200D`) join the glyphs of Indic and Persian words and the
|
|
30
|
+
* members of an emoji sequence, so escaping them would corrupt legitimate script and display the
|
|
31
|
+
* escape in its place. Variation selectors are legitimate emoji presentation for the same reason.
|
|
32
|
+
*
|
|
33
|
+
* The tag block (`U+E0000`–`U+E007F`) is included for a different reason: those characters render
|
|
34
|
+
* as nothing anywhere, so they carry text the operator cannot see. It is also how a subdivision
|
|
35
|
+
* flag is drawn, and escaping a flag's tags loses that flag's shape — accepted, because an
|
|
36
|
+
* unreadable channel through a security boundary costs more than one glyph. The range is outside
|
|
37
|
+
* the BMP, which is why the expression needs the `u` flag: without it `\u{e0000}` is a syntax
|
|
38
|
+
* error and a surrogate-pair spelling would match half a character at a time.
|
|
39
|
+
*/
|
|
40
|
+
const UNSAFE = /[\u0000-\u001f\u007f-\u009f\u061c\u200b\u200e\u200f\u202a-\u202e\u2028\u2029\u2060-\u206f\ufeff\u{e0000}-\u{e007f}]/gu;
|
|
41
|
+
|
|
42
|
+
/**
|
|
43
|
+
* Escape one character as the `\xNN` / `\uNNNN` / `\u{...}` literal a reader can see.
|
|
44
|
+
*
|
|
45
|
+
* `codePointAt` rather than `charCodeAt`: the tag block has no BMP spelling, so its characters are
|
|
46
|
+
* a surrogate pair in a JavaScript string, and reading one unit would print half of it as a lone
|
|
47
|
+
* surrogate. Escaping the code point keeps the pair whole and the escape recognizable.
|
|
48
|
+
*/
|
|
49
|
+
function escapeCharacter(character: string): string {
|
|
50
|
+
const code = character.codePointAt(0)!;
|
|
51
|
+
if (code <= 0x7f) return `\\x${code.toString(16).padStart(2, "0")}`;
|
|
52
|
+
if (code <= 0xffff) return `\\u${code.toString(16).padStart(4, "0")}`;
|
|
53
|
+
return `\\u{${code.toString(16)}}`;
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
export function terminalSafeText(value: string): string {
|
|
57
|
+
return value.replace(UNSAFE, escapeCharacter);
|
|
58
|
+
}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { carryReplayRefusal, isNonReplayableResponse, markResponseNonReplayable } from "./upstream-retry";
|
|
2
|
+
import { carryPacedStream, pacedQueuingStrategy } from "./paced-stream";
|
|
2
3
|
|
|
3
4
|
export const TRANSLATOR_MAX_CALL_ARGUMENT_BYTES = 2 * 1024 * 1024;
|
|
4
5
|
export const TRANSLATOR_MAX_TURN_BYTES = 32 * 1024 * 1024;
|
|
@@ -392,7 +393,7 @@ export function finalizeTranslatorBudgetResponse(response: Response, budget: Tra
|
|
|
392
393
|
};
|
|
393
394
|
// The transport owns cancellation and terminal precedence. Abort releases only
|
|
394
395
|
// accounting here, including when no consumer ever pulls or cancels this body.
|
|
395
|
-
const body = new ReadableStream<Uint8Array>({
|
|
396
|
+
const body = carryPacedStream(response.body, new ReadableStream<Uint8Array>({
|
|
396
397
|
async pull(controller) {
|
|
397
398
|
try {
|
|
398
399
|
const result = await reader.read();
|
|
@@ -409,7 +410,7 @@ export function finalizeTranslatorBudgetResponse(response: Response, budget: Tra
|
|
|
409
410
|
finalize();
|
|
410
411
|
await reader.cancel(reason);
|
|
411
412
|
},
|
|
412
|
-
});
|
|
413
|
+
}, pacedQueuingStrategy(response.body)));
|
|
413
414
|
if (signal?.aborted) finalize();
|
|
414
415
|
else signal?.addEventListener("abort", finalize, { once: true });
|
|
415
416
|
const finalizedResponse = new Response(body, { status: response.status, statusText: response.statusText, headers: response.headers });
|