@bitkyc08/opencodex 2.100.2 → 2.100.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/AGENTS_INSTALL.md +23 -1
- package/README.md +1 -1
- package/bin/ocx.mjs +40 -19
- package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
- package/gui/dist/assets/App-DcpyI78f.js +60 -0
- package/gui/dist/assets/{Tray-BcaI-VCr.js → Tray-CzjPJprT.js} +1 -1
- package/gui/dist/assets/brand-mark-BTIi7e69.js +1 -0
- package/gui/dist/assets/index-DJxM-imn.css +2 -0
- package/gui/dist/assets/index-DVgU6S3y.js +138 -0
- package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.js → segment-thumb-features-Bn6Y-g3R.js} +1 -1
- package/gui/dist/classic/assets/App-eYJAyNHM.js +59 -0
- package/gui/dist/classic/assets/{Tray-DT146AhS.js → Tray-xHMYxLkV.js} +1 -1
- package/gui/dist/classic/assets/index-DSaVRW4F.js +138 -0
- package/gui/dist/classic/assets/quota-summary-DyzHlkFl.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.toml +9 -0
- package/native/ocx-child/src/cli.rs +404 -20
- package/native/ocx-child/src/codex_home.rs +99 -14
- package/native/ocx-child/src/daemon.rs +2 -1
- package/native/ocx-child/src/lib.rs +3 -0
- package/native/ocx-child/src/link_ws.rs +2598 -0
- package/native/ocx-child/src/link_ws_advert.rs +346 -0
- package/native/ocx-child/src/link_ws_frame.rs +749 -0
- package/native/ocx-child/src/parity.rs +5 -1
- package/native/ocx-child/src/platform.rs +152 -6
- package/native/ocx-child/src/relay.rs +150 -19
- package/package.json +3 -3
- package/src/adapters/anthropic/advisor-tool.ts +176 -0
- package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
- package/src/adapters/anthropic/client-identity.ts +3 -1
- package/src/adapters/anthropic/passthrough.ts +9 -3
- package/src/adapters/anthropic/per-message-effort.ts +296 -0
- package/src/adapters/anthropic.ts +34 -14
- package/src/adapters/claude-cli/adapter.ts +1 -0
- package/src/adapters/client-fingerprint.ts +3 -3
- package/src/adapters/cursor/discovery.ts +17 -0
- package/src/adapters/cursor/native-exec-desktop.ts +2 -1
- package/src/adapters/cursor/native-exec-shell.ts +2 -1
- package/src/adapters/cursor/protobuf-request.ts +8 -8
- package/src/adapters/cursor.ts +7 -6
- package/src/adapters/devin/cloud-direct/chat.ts +71 -14
- package/src/adapters/google-antigravity-wire.ts +7 -5
- package/src/adapters/google-errors.ts +14 -2
- package/src/adapters/google-wire-compiler.ts +2 -2
- package/src/adapters/google.ts +9 -2
- package/src/adapters/kiro/payload.ts +7 -4
- package/src/adapters/kiro/reasoning.ts +44 -1
- package/src/adapters/kiro/structured-output.ts +10 -8
- package/src/adapters/kiro-tools.ts +61 -15
- package/src/adapters/openai-chat/destination-policy.ts +16 -0
- package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
- package/src/adapters/qoder/adapter.ts +9 -1
- package/src/adapters/zed.ts +7 -2
- package/src/advisor/consult.ts +15 -4
- package/src/advisor/context.ts +12 -3
- package/src/advisor/runtime.ts +35 -5
- package/src/advisor/settings.ts +8 -0
- package/src/advisor/synthetic-tool.ts +21 -8
- package/src/bridge/response-json.ts +11 -2
- package/src/bridge/sse.ts +43 -8
- package/src/claude/auth-detect.ts +21 -33
- package/src/claude/desktop-3p.ts +11 -5
- package/src/claude/desktop-gateway-state.ts +2 -0
- package/src/claude/desktop-remote-store-artifact.ts +14 -3
- package/src/claude/desktop-remote-store.ts +82 -12
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +21 -1
- package/src/cli/account-auth.ts +83 -22
- package/src/cli/account-extended.ts +33 -2
- package/src/cli/account-key-quota.ts +34 -5
- package/src/cli/account.ts +4 -2
- package/src/cli/advisor.ts +7 -4
- package/src/cli/alias.ts +38 -1
- package/src/cli/capabilities-access-remote.ts +128 -3
- package/src/cli/capabilities-accounts.ts +6 -6
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +49 -19
- package/src/cli/capabilities-integrations.ts +2 -2
- package/src/cli/capabilities-observe-system.ts +2 -2
- package/src/cli/capabilities-provider-models.ts +18 -2
- package/src/cli/capabilities-route-to.ts +43 -0
- package/src/cli/capabilities.ts +2 -0
- package/src/cli/capability-contracts.ts +1 -1
- package/src/cli/claude-desktop.ts +30 -11
- package/src/cli/claude.ts +17 -3
- package/src/cli/codex-launcher.ts +3 -1
- package/src/cli/codex-shim-autorestore.ts +5 -42
- package/src/cli/config-command.ts +14 -1
- package/src/cli/config-root-startup.ts +34 -0
- package/src/cli/connect.ts +88 -16
- package/src/cli/desktop-runtime-guidance.ts +1 -1
- package/src/cli/disconnect-runtime.ts +178 -0
- package/src/cli/dispatch.ts +61 -13
- package/src/cli/export-command.ts +1 -1
- package/src/cli/gui-pair-client.ts +6 -3
- package/src/cli/gui.ts +10 -5
- package/src/cli/help-catalog.ts +11 -0
- package/src/cli/help.ts +4 -3
- package/src/cli/index.ts +85 -94
- package/src/cli/inspect.ts +11 -2
- package/src/cli/integrations.ts +26 -1
- package/src/cli/link-apply-restart.ts +4 -2
- package/src/cli/link-capture.ts +64 -0
- package/src/cli/link-child-ops.ts +218 -40
- package/src/cli/link-cleanup.ts +8 -5
- package/src/cli/link-diagnostics.ts +67 -0
- package/src/cli/link-enrollment.ts +158 -12
- package/src/cli/link-operations.ts +52 -0
- package/src/cli/link-recover.ts +152 -0
- package/src/cli/link-routes.ts +90 -0
- package/src/cli/link-status-child.ts +44 -1
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +315 -37
- package/src/cli/message-command.ts +1 -1
- package/src/cli/message-mcp-command.ts +23 -10
- package/src/cli/models-runtime.ts +3 -3
- package/src/cli/opencode.ts +3 -1
- package/src/cli/pi-sync.ts +35 -0
- package/src/cli/preflight-exemptions.ts +49 -0
- package/src/cli/registry.ts +33 -14
- package/src/cli/resolve.ts +23 -8
- package/src/cli/restart-failure.ts +15 -2
- package/src/cli/root.ts +5 -1
- package/src/cli/route-to.ts +172 -0
- package/src/cli/runtime-api.ts +9 -8
- package/src/cli/status.ts +7 -2
- package/src/cli/stop-approval.ts +66 -19
- package/src/cli/stop-report.ts +23 -0
- package/src/cli/stop-windows-checked.ts +304 -0
- package/src/cli/sync-command.ts +70 -15
- package/src/cli/sync-fanout.ts +74 -19
- package/src/cli/sync-flags.ts +40 -3
- package/src/cli/sync-link-status.ts +18 -2
- package/src/cli/sync-update-guard.ts +7 -2
- package/src/cli/system-command.ts +1 -1
- package/src/cli/system-restart-client.ts +10 -3
- package/src/cli/system-settings-parity.ts +2 -1
- package/src/cli/uninstall-plan.ts +77 -5
- package/src/cli/uninstall-stop.ts +152 -0
- package/src/cli/v2-input.ts +10 -6
- package/src/cli/v2-local-output.ts +3 -2
- package/src/cli/v2-runtime.ts +10 -3
- package/src/cli/v2.ts +22 -7
- package/src/client/connect.ts +376 -35
- package/src/client/desktop-refusal.ts +38 -0
- package/src/client/lifecycle-lock.ts +29 -4
- package/src/client/link-home-features.ts +27 -0
- package/src/client/link-home.ts +92 -4
- package/src/client/link-ingress.ts +21 -3
- package/src/client/link-join.ts +12 -2
- package/src/client/link-parity-reporter.ts +60 -6
- package/src/client/link-relay-transport.ts +161 -36
- package/src/client/link-relay.ts +150 -6
- package/src/client/link-request-compression.ts +84 -0
- package/src/client/link-state.ts +11 -5
- package/src/client/link-status.ts +39 -1
- package/src/client/link-teardown.ts +1 -0
- package/src/client/link-tunnel.ts +56 -5
- package/src/client/link-websocket-limits.ts +89 -0
- package/src/client/link-websocket.ts +586 -0
- package/src/client/link-ws-advertisement.ts +100 -0
- package/src/client/link-ws-framer.ts +241 -0
- package/src/client/link-ws-transport.ts +177 -0
- package/src/client/machine-api.ts +13 -2
- package/src/client/machine-listener.ts +48 -7
- package/src/client/route-intent-apply.ts +293 -0
- package/src/client/route-intent-file-originals.ts +97 -0
- package/src/client/route-intent-native-originals.ts +201 -0
- package/src/client/route-intent-watch.ts +141 -0
- package/src/client/runtime-restart.ts +141 -7
- package/src/client/runtime.ts +63 -15
- package/src/client/state.ts +44 -0
- package/src/client/sync-expectation.ts +36 -2
- package/src/client/sync-runtime.ts +7 -0
- package/src/clients/config-export/alias-selectors.ts +63 -40
- package/src/clients/config-export/contracts.ts +2 -0
- package/src/clients/config-export/nested-selectors.ts +42 -0
- package/src/clients/config-export.ts +22 -3
- package/src/codex/account-pause.ts +4 -0
- package/src/codex/account-runtime-state.ts +4 -0
- package/src/codex/account-store.ts +12 -3
- package/src/codex/account-usability.ts +13 -0
- package/src/codex/auth-api/account-list.ts +29 -3
- package/src/codex/auth-api/main-account-probe.ts +3 -1
- package/src/codex/auth-api/main-hard-lock-refusal-read.ts +172 -0
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +61 -8
- package/src/codex/catalog/build-entries.ts +10 -0
- package/src/codex/catalog/derive-entry.ts +7 -0
- package/src/codex/catalog/gather-capture.ts +8 -2
- package/src/codex/catalog/parsing.ts +7 -3
- package/src/codex/catalog/provider-models.ts +54 -15
- package/src/codex/catalog/reserve-warn.ts +7 -5
- package/src/codex/catalog/reserve.ts +4 -3
- package/src/codex/catalog/retained-sync.ts +4 -1
- package/src/codex/catalog/routed-defaults.ts +35 -0
- package/src/codex/catalog/routed-gather.ts +1 -1
- package/src/codex/catalog-auto-refresh.ts +11 -0
- package/src/codex/cli-update-job.ts +35 -13
- package/src/codex/convergence.ts +4 -2
- package/src/codex/desktop-compatibility/native-identity.ts +4 -8
- package/src/codex/features.ts +2 -2
- package/src/codex/history-provider.ts +31 -0
- package/src/codex/inject/multi-agent-v2.ts +9 -3
- package/src/codex/inject/paginated-openai-compat.ts +54 -1
- package/src/codex/inject/plan.ts +20 -2
- package/src/codex/inject.ts +2 -0
- package/src/codex/journal-config-restore.ts +217 -0
- package/src/codex/journal.ts +75 -6
- package/src/codex/loopback-target.ts +22 -8
- package/src/codex/main-account.ts +109 -57
- package/src/codex/native-main-auth-file.ts +118 -0
- package/src/codex/native-main-credentials.ts +270 -0
- package/src/codex/native-main-owner.ts +3 -0
- package/src/codex/native-main-refresh-mode.ts +14 -1
- package/src/codex/native-profile-manager.ts +4 -3
- package/src/codex/native-profile-store.ts +3 -61
- package/src/codex/orca-import.ts +10 -1
- package/src/codex/quota-history.ts +13 -0
- package/src/codex/quota-window-conflict.ts +103 -0
- package/src/codex/quota.ts +86 -15
- package/src/codex/subagent-model-fallback.ts +3 -1
- package/src/codex/websocket-activity.ts +171 -16
- package/src/codex/websocket-registry.ts +11 -4
- package/src/combos/cooldown-store.ts +25 -5
- package/src/combos/failover.ts +342 -3
- package/src/combos/index.ts +5 -0
- package/src/combos/resolve.ts +115 -19
- package/src/config/dashboard-trusted-proxy.ts +83 -0
- package/src/config/diagnostics.ts +31 -0
- package/src/config/feature-flags.ts +9 -0
- package/src/config/live-reconcile.ts +16 -4
- package/src/config/load-degrade.ts +14 -1
- package/src/config/multi-agent-surface.ts +28 -5
- package/src/config/pending-teardown.ts +60 -3
- package/src/config/persisted-mutation.ts +2 -2
- package/src/config/persisted-projections.ts +18 -0
- package/src/config/process-state.ts +176 -4
- package/src/config/provider-validation.ts +4 -4
- package/src/config/reserve-capability.ts +96 -0
- package/src/config/schema/config-schema.ts +12 -0
- package/src/config/schema/leaf-validators.ts +11 -2
- package/src/config/schema/routed-catalog-defaults.ts +49 -0
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/config.ts +7 -7
- package/src/desktop-update/acquire.ts +202 -0
- package/src/desktop-update/cli.ts +168 -0
- package/src/desktop-update/drain.ts +40 -0
- package/src/desktop-update/headless.ts +285 -0
- package/src/desktop-update/image.ts +85 -0
- package/src/desktop-update/install.ts +53 -0
- package/src/desktop-update/msi.ts +72 -0
- package/src/desktop-update/release.ts +128 -0
- package/src/desktop-update/runtime.ts +155 -0
- package/src/desktop-update/staging.ts +118 -0
- package/src/desktop-update/trust.ts +45 -0
- package/src/generated/compatibility-version.json +1114 -442
- package/src/generated/model-metadata.ts +1 -1
- package/src/images/fulfill-video.ts +3 -3
- package/src/images/loop.ts +9 -2
- package/src/images/plan.ts +147 -11
- package/src/images/types.ts +13 -4
- package/src/images/xai-video-client.ts +72 -10
- package/src/integrations/model-name-guard.ts +25 -0
- package/src/integrations/route-intent-catalog.ts +26 -0
- package/src/integrations/route-intent-connected.ts +262 -0
- package/src/integrations/route-intent-contract.ts +55 -0
- package/src/integrations/route-intent-disconnect.ts +109 -0
- package/src/integrations/route-intent-initial.ts +64 -0
- package/src/integrations/route-intent-state.ts +117 -0
- package/src/integrations/route-intent-tick.ts +65 -0
- package/src/integrations/route-intent.ts +212 -0
- package/src/integrations/writer.ts +44 -11
- package/src/lib/client-retry-after.ts +29 -0
- package/src/lib/config-ownership.ts +13 -0
- package/src/lib/desktop-gui-origin.ts +28 -0
- package/src/lib/errors.ts +1 -1
- package/src/lib/gcp-adc.ts +48 -4
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/messages-error-body.ts +4 -1
- package/src/lib/offline-resend.ts +150 -0
- package/src/lib/outbound-credential-registry.ts +362 -4
- package/src/lib/paced-stream.ts +34 -0
- package/src/lib/passive-key-fetch-proof.ts +30 -0
- package/src/lib/passive-read.ts +5 -0
- package/src/lib/process-control.ts +76 -12
- package/src/lib/provider-outbound.ts +17 -6
- package/src/lib/redact.ts +84 -8
- package/src/lib/request-failure-model.ts +2 -0
- package/src/lib/response-body-inactivity.ts +23 -1
- package/src/lib/state-store-registrations.ts +11 -0
- package/src/lib/state-store-sweeper.ts +4 -0
- package/src/lib/supervisor-markers.ts +18 -0
- package/src/lib/terminal-safe-text.ts +58 -0
- package/src/lib/translator-budget.ts +3 -2
- package/src/lib/upstream-retry.ts +52 -9
- package/src/link/alias-lock.ts +119 -0
- package/src/link/child-activity.ts +28 -2
- package/src/link/child-binary-cache-fill.d.mts +50 -0
- package/src/link/child-binary-cache-fill.mjs +494 -0
- package/src/link/child-binary-cache-start.ts +73 -0
- package/src/link/child-binary-source.ts +12 -5
- package/src/link/child-gated-ocx.ts +29 -11
- package/src/link/child-observations.ts +2 -1
- package/src/link/child-observe.ts +2 -2
- package/src/link/child-ops-engine.ts +159 -91
- package/src/link/child-ops-host.ts +138 -0
- package/src/link/child-ops-runners.ts +319 -0
- package/src/link/child-ops-scheduler.ts +207 -0
- package/src/link/child-ops-types.ts +89 -0
- package/src/link/child-parity.ts +23 -4
- package/src/link/child-policy.ts +93 -0
- package/src/link/child-update-contract.ts +12 -3
- package/src/link/codex-settings.ts +1 -1
- package/src/link/compatibility.ts +18 -1
- package/src/link/diagnostics-read.ts +163 -0
- package/src/link/diagnostics.ts +20 -7
- package/src/link/explicit-route.ts +209 -0
- package/src/link/link-recover.ts +113 -0
- package/src/link/management-routes.ts +3 -1
- package/src/link/operation-recovery-slot.ts +44 -0
- package/src/link/operations-journal.ts +408 -0
- package/src/link/peer-report.ts +1 -1
- package/src/link/relay-auth.ts +14 -0
- package/src/link/remote-plant.ts +152 -14
- package/src/link/remote-platform.ts +21 -10
- package/src/link/remote-probe.ts +11 -3
- package/src/link/remote-windows.ts +124 -36
- package/src/link/request-compression.ts +30 -0
- package/src/link/residual-recovery.ts +66 -0
- package/src/link/retirement.ts +128 -0
- package/src/link/route-intent-watch.ts +41 -0
- package/src/link/route-intent.ts +209 -0
- package/src/link/route-proof.ts +82 -0
- package/src/link/route-rounds.ts +579 -0
- package/src/link/route-select.ts +95 -0
- package/src/link/route-trust.ts +96 -0
- package/src/link/ssh-argv.ts +172 -24
- package/src/link/ssh-capture-redact.ts +253 -0
- package/src/link/ssh-capture.ts +497 -0
- package/src/link/ssh-runner.ts +141 -14
- package/src/link/status-projection.ts +87 -0
- package/src/link/store.ts +54 -1
- package/src/link/supervisor.ts +543 -55
- package/src/link/sync-fanout-classify.ts +16 -0
- package/src/link/sync-then-restart.ts +65 -0
- package/src/link/tombstones.ts +209 -0
- package/src/link/traffic.ts +178 -0
- package/src/link/ws-activity-holds.ts +474 -0
- package/src/local-credentials/publication-fence.ts +20 -1
- package/src/messaging/budget.ts +23 -5
- package/src/messaging/mcp-queue-rpc.ts +1 -1
- package/src/messaging/mcp-queue-server.ts +16 -1
- package/src/messaging/mcp-resume-tools.ts +25 -0
- package/src/messaging/remote-enrollment.ts +3 -3
- package/src/messaging/remote-tunnels.ts +2 -2
- package/src/messaging/resume-permissions.ts +27 -0
- package/src/messaging/rpc.ts +50 -6
- package/src/oauth/anthropic-continuity.ts +23 -7
- package/src/oauth/anthropic-routing.ts +5 -2
- package/src/oauth/anthropic.ts +22 -2
- package/src/oauth/antigravity-risk.ts +126 -0
- package/src/oauth/claude-keychain-read.ts +78 -68
- package/src/oauth/generic-account-failover.ts +89 -18
- package/src/oauth/generic-session-affinity.ts +10 -3
- package/src/oauth/index.ts +24 -6
- package/src/oauth/local-token-detect.ts +8 -29
- package/src/oauth/login-cli-errors.ts +5 -1
- package/src/oauth/login-cli.ts +68 -19
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- package/src/oauth/pool-kernel.ts +3 -3
- package/src/oauth/store.ts +7 -0
- package/src/oauth/xai.ts +248 -14
- package/src/protocols/contract.ts +4 -0
- package/src/protocols/encoders/messages.ts +1 -0
- package/src/providers/alias-template.ts +48 -0
- package/src/providers/anthropic-billing-ownership.ts +2 -0
- package/src/providers/anthropic-billing-refusal.ts +27 -3
- package/src/providers/anthropic-output-caps.ts +46 -0
- package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
- package/src/providers/antigravity-effort-families.ts +11 -3
- package/src/providers/antigravity-models.ts +32 -9
- package/src/providers/antigravity-wire-snapshot.ts +3 -2
- package/src/providers/api-key-pause.ts +3 -0
- package/src/providers/api-key-resolve.ts +49 -7
- package/src/providers/api-key-response-ownership.ts +2 -0
- package/src/providers/api-key-selection.ts +51 -9
- package/src/providers/api-keys.ts +6 -2
- package/src/providers/cache-affinity-identity.ts +73 -0
- package/src/providers/cache-affinity.ts +256 -0
- package/src/providers/default-aliases.ts +98 -20
- package/src/providers/google-vertex-model-discovery.ts +515 -0
- package/src/providers/key-failover.ts +123 -8
- package/src/providers/key-store.ts +3 -3
- package/src/providers/kiro-models.ts +3 -5
- package/src/providers/label.ts +31 -5
- package/src/providers/mistral-transport.ts +17 -4
- package/src/providers/model-rename-fields.ts +5 -0
- package/src/providers/muse-key-quota.ts +14 -6
- package/src/providers/new-model-policy-runtime.ts +17 -4
- package/src/providers/new-model-policy.ts +30 -4
- package/src/providers/passive-key-observation.ts +252 -0
- package/src/providers/quota/account-cache.ts +2 -1
- package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
- package/src/providers/quota/passive-key-limits.ts +272 -0
- package/src/providers/quota/passive-wire-model.ts +126 -0
- package/src/providers/quota/report-cache.ts +61 -2
- package/src/providers/quota/workbuddy.ts +6 -2
- package/src/providers/quota-key-accounts.ts +11 -6
- package/src/providers/quota-types.ts +18 -0
- package/src/providers/quota.ts +11 -12
- package/src/providers/registry/entries-core.ts +34 -16
- package/src/providers/registry/entries-extended.ts +32 -0
- package/src/providers/registry/model-seeds.ts +35 -0
- package/src/providers/resolved-model-policy.ts +7 -0
- package/src/providers/routed-config.ts +8 -3
- package/src/providers/workbuddy-credit-balance.ts +125 -16
- package/src/providers/xai-transport.ts +3 -0
- package/src/remote/features.ts +17 -0
- package/src/responses/anthropic-progress.ts +10 -4
- package/src/responses/citation-markers.ts +231 -0
- package/src/responses/effort-history.ts +732 -0
- package/src/responses/spill-store.ts +5 -1
- package/src/responses/state/replay-input.ts +50 -0
- package/src/responses/state/replay-owner.ts +24 -0
- package/src/responses/state/snapshot-codec.ts +9 -0
- package/src/responses/state/spill-queue.ts +1 -0
- package/src/responses/state.ts +42 -60
- package/src/router.ts +2 -2
- package/src/routing/history/integrity.ts +41 -4
- package/src/routing/home-route-capture.ts +123 -0
- package/src/routing/home-route-intent.ts +200 -0
- package/src/routing/route-intent-state.ts +178 -0
- package/src/routing/route-to-live-settings.ts +35 -0
- package/src/routing/route-to-local.ts +145 -0
- package/src/routing/route-to-status.ts +94 -0
- package/src/routing/route-to-sync-child.ts +32 -0
- package/src/server/adapter-resolve.ts +21 -1
- package/src/server/admitted-http-turn.ts +3 -0
- package/src/server/auth-cors.ts +111 -3
- package/src/server/bare-upstream-error.ts +220 -0
- package/src/server/chat-native.ts +14 -5
- package/src/server/claude-messages.ts +6 -4
- package/src/server/codex-model-list.ts +4 -2
- package/src/server/configured-credentials.ts +37 -5
- package/src/server/direct-local-http.ts +26 -3
- package/src/server/gui-desktop-authorization.ts +36 -0
- package/src/server/gui-pair-delivery.ts +6 -3
- package/src/server/gui-session.ts +10 -1
- package/src/server/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +196 -12
- package/src/server/index/link-management.ts +15 -1
- package/src/server/index/link-relay-sessions.ts +87 -8
- package/src/server/index/link-websocket-limits.ts +136 -0
- package/src/server/index/link-websocket.ts +692 -0
- package/src/server/index/optional-listeners.ts +97 -7
- package/src/server/index/route-intent-watch.ts +47 -0
- package/src/server/index/serve-contract.ts +86 -0
- package/src/server/index/serve-options.ts +36 -86
- package/src/server/index/startup-warnings.ts +8 -2
- package/src/server/index/websocket-handler.ts +26 -4
- package/src/server/index.ts +15 -4
- package/src/server/inference/client-encoder-delivery.ts +2 -0
- package/src/server/inspection-tee.ts +39 -2
- package/src/server/lifecycle.ts +2 -0
- package/src/server/link-turn.ts +149 -0
- package/src/server/management/advisor-routes.ts +10 -2
- package/src/server/management/agent-settings-routes.ts +50 -16
- package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
- package/src/server/management/config-routes.ts +39 -3
- package/src/server/management/context.ts +9 -2
- package/src/server/management/desktop-authorization.ts +41 -0
- package/src/server/management/desktop-compatibility-routes.ts +9 -8
- package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
- package/src/server/management/home-integration-decision.ts +89 -0
- package/src/server/management/integration-routes.ts +208 -81
- package/src/server/management/link-child-ops-routes.ts +145 -43
- package/src/server/management/link-child-preflight.ts +31 -0
- package/src/server/management/link-diagnostics-route.ts +29 -0
- package/src/server/management/link-enrollment.ts +199 -47
- package/src/server/management/link-operation.ts +609 -0
- package/src/server/management/link-recover-route.ts +103 -0
- package/src/server/management/link-route-edit.ts +192 -0
- package/src/server/management/link-route-request.ts +62 -0
- package/src/server/management/link-route-state.ts +83 -7
- package/src/server/management/link-routes.ts +553 -51
- package/src/server/management/link-traffic-status.ts +13 -0
- package/src/server/management/model-routes.ts +122 -36
- package/src/server/management/model-rows.ts +2 -1
- package/src/server/management/native-integration-routes.ts +176 -70
- package/src/server/management/oauth-account-routes.ts +58 -18
- package/src/server/management/protocol-routes.ts +7 -0
- package/src/server/management/provider-completion-test.ts +4 -4
- package/src/server/management/provider-overwrite-carry.ts +14 -0
- package/src/server/management/provider-routes.ts +68 -65
- package/src/server/management/provider-routing-quota.ts +45 -0
- package/src/server/management/route-registry.ts +22 -3
- package/src/server/management/route-to-routes.ts +257 -0
- package/src/server/management/static-catalog-probe.ts +33 -0
- package/src/server/management/system-restart.ts +4 -2
- package/src/server/management/usage-aggregate-cache.ts +101 -66
- package/src/server/management-api.ts +17 -3
- package/src/server/management-auth.ts +13 -1
- package/src/server/messages-native-preflight.ts +27 -4
- package/src/server/messages-native.ts +17 -5
- package/src/server/persistent-gui-session.ts +6 -3
- package/src/server/proxy-liveness.ts +87 -15
- package/src/server/relay-eager.ts +36 -12
- package/src/server/relay.ts +189 -117
- package/src/server/request-body-facts.ts +48 -0
- package/src/server/request-decompress.ts +65 -2
- package/src/server/request-log-account-rotation.ts +6 -0
- package/src/server/request-log-attempt-usage.ts +69 -0
- package/src/server/request-log-cache-affinity.ts +60 -0
- package/src/server/request-log-conversation.ts +45 -2
- package/src/server/request-log-terminal-status.ts +210 -24
- package/src/server/request-log.ts +76 -80
- package/src/server/reserve-capability-startup.ts +32 -0
- package/src/server/responses/adapter-continuation.ts +2 -1
- package/src/server/responses/adapter-delivery.ts +4 -0
- package/src/server/responses/adapter-dispatch.ts +36 -17
- package/src/server/responses/advisor-plan-slot.ts +33 -1
- package/src/server/responses/advisor-question.ts +21 -0
- package/src/server/responses/advisor-slot.ts +10 -3
- package/src/server/responses/antigravity-fault-rotation.ts +24 -0
- package/src/server/responses/antigravity-validation-refusal.ts +43 -6
- package/src/server/responses/bare-namespace-aliases.ts +18 -0
- package/src/server/responses/buffered-sse-json.ts +9 -3
- package/src/server/responses/code-mode-collab-surface.ts +11 -0
- package/src/server/responses/codex-tool-catalog.ts +156 -0
- package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
- package/src/server/responses/combo-selection-keepalive.ts +254 -0
- package/src/server/responses/combo-stream-preflight.ts +557 -54
- package/src/server/responses/compact.ts +32 -8
- package/src/server/responses/core-codex-account.ts +17 -3
- package/src/server/responses/core-combo-failure.ts +8 -0
- package/src/server/responses/core-combo.ts +55 -12
- package/src/server/responses/core-errors.ts +13 -7
- package/src/server/responses/core-lifetime.ts +3 -2
- package/src/server/responses/core-normalize.ts +3 -1
- package/src/server/responses/core-options.ts +14 -0
- package/src/server/responses/core.ts +23 -0
- package/src/server/responses/estimated-usage.ts +115 -0
- package/src/server/responses/fetch-helpers.ts +15 -10
- package/src/server/responses/jev-model-invoke.ts +7 -2
- package/src/server/responses/native-replay-guard.ts +57 -0
- package/src/server/responses/opengateway-completion-guard.ts +10 -4
- package/src/server/responses/outbound-request-body.ts +29 -0
- package/src/server/responses/passthrough-completion.ts +109 -9
- package/src/server/responses/passthrough-delivery.ts +77 -18
- package/src/server/responses/passthrough-dispatch.ts +77 -73
- package/src/server/responses/policy-fallback.ts +13 -1
- package/src/server/responses/request-prepare.ts +59 -11
- package/src/server/responses/request-transport.ts +10 -3
- package/src/server/responses/reset-replay.ts +46 -2
- package/src/server/responses/run-turn-execution.ts +2 -0
- package/src/server/responses/sidecar-execution.ts +19 -0
- package/src/server/responses/terminal-error-redaction.ts +222 -25
- package/src/server/responses/ws-upstream.ts +2 -2
- package/src/server/sse-payload-rewrite.ts +3 -2
- package/src/server/stop-service-route.ts +85 -0
- package/src/server/system-env-shell.ts +12 -1
- package/src/server/system-env.ts +5 -3
- package/src/server/windows-tcp-drop.ts +21 -4
- package/src/server/workflow-refusal.ts +8 -0
- package/src/server/ws-bridge.ts +191 -12
- package/src/service/cli-windows-stop.ts +189 -0
- package/src/service/cli.ts +41 -12
- package/src/service/desktop-supervision.d.mts +2 -0
- package/src/service/desktop-supervision.mjs +5 -0
- package/src/service/disconnected-client-restart.ts +60 -0
- package/src/service/guarded-manager-target.ts +18 -1
- package/src/service/health.ts +99 -6
- package/src/service/launchd.ts +84 -31
- package/src/service/orchestration.ts +418 -91
- package/src/service/repair.ts +223 -6
- package/src/service/restart-proxy-stop.ts +79 -0
- package/src/service/service-child-ownership.ts +6 -2
- package/src/service/windows-checked-stop-live.ts +467 -0
- package/src/service/windows-checked-stop.ts +435 -0
- package/src/service/windows-command-line-token.ts +23 -0
- package/src/service/windows-guarded-manager.ts +77 -34
- package/src/service/windows-ops.ts +38 -56
- package/src/service/windows-process-evidence.ts +292 -0
- package/src/service/windows-process-native.ts +262 -0
- package/src/service/windows-service-stop.ts +321 -0
- package/src/service/windows-stop-binding.ts +187 -0
- package/src/service/windows-stop-budget.ts +123 -0
- package/src/service/windows-stop-confirm.ts +158 -0
- package/src/service/windows-stop-deadline.ts +56 -0
- package/src/service.ts +2 -2
- package/src/stall-timeout.ts +11 -0
- package/src/types/config.ts +57 -110
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +60 -2
- package/src/types/request.ts +23 -0
- package/src/types/routed-catalog-defaults.ts +17 -0
- package/src/types/routing-profile.ts +90 -0
- package/src/types.ts +4 -0
- package/src/update/guarded-runtime-ops.ts +5 -7
- package/src/update/index.ts +26 -11
- package/src/update/install-detection.mjs +3 -1
- package/src/update/job-pinned-start.ts +2 -0
- package/src/update/job-windows-restart.ts +19 -32
- package/src/update/job.ts +12 -5
- package/src/update/npm-install.d.mts +11 -0
- package/src/update/npm-install.mjs +44 -7
- package/src/update/orchestrated-entry.ts +1 -1
- package/src/update/orchestrated-node-driver.mjs +3 -2
- package/src/update/orchestrated-pnpm.d.mts +4 -0
- package/src/update/orchestrated-pnpm.mjs +50 -6
- package/src/update/orchestrated-session.d.mts +3 -1
- package/src/update/orchestrated-session.mjs +21 -6
- package/src/update/pnpm-global-install.d.mts +21 -3
- package/src/update/pnpm-global-install.mjs +322 -19
- package/src/update/pnpm-store-layout.mjs +46 -0
- package/src/update/sync-update-mutex.d.mts +3 -2
- package/src/update/sync-update-mutex.mjs +57 -8
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +545 -12
- package/src/update/windows-installer-marker.d.mts +1 -0
- package/src/update/windows-installer-marker.mjs +44 -0
- package/src/usage/expected-prices.ts +8 -0
- package/src/usage/filter-index.ts +326 -77
- package/src/usage/ledger-scanner.ts +15 -0
- package/src/usage/link-log-fields.ts +48 -0
- package/src/usage/log.ts +57 -6
- package/src/usage/request-body.ts +37 -0
- package/src/usage/telemetry-contract.ts +1 -0
- package/src/web-search/loop.ts +3 -0
- package/src/web-search/passthrough-bridge.ts +7 -0
- package/gui/dist/assets/App-BpJOzw4F.js +0 -59
- package/gui/dist/assets/brand-mark-DU-0Vdkr.js +0 -1
- package/gui/dist/assets/index-Bbor_y80.js +0 -94
- package/gui/dist/assets/index-DJEkIDAi.css +0 -2
- package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
- package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
- package/gui/dist/classic/assets/quota-summary-CakPe9Ni.js +0 -1
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
|
@@ -0,0 +1,150 @@
|
|
|
1
|
+
import { lookup } from "node:dns/promises";
|
|
2
|
+
import { isIP } from "node:net";
|
|
3
|
+
import type { OcxProviderConfig } from "../types";
|
|
4
|
+
import { isEgressTransparentExecutor, resolveProviderEgress } from "./provider-egress";
|
|
5
|
+
import { effectiveProxyFor, noProxyMatches } from "./proxy-env";
|
|
6
|
+
import { UpstreamRetryEvidenceError } from "./upstream-retry";
|
|
7
|
+
|
|
8
|
+
/** Longest configurable offline wait (#7958): five minutes, the span of a laptop sleep/Wi-Fi hop. */
|
|
9
|
+
export const MAX_OFFLINE_RESEND_WAIT_SEC = 300;
|
|
10
|
+
/** Interval between reachability probes while offline. */
|
|
11
|
+
export const OFFLINE_REACHABILITY_PROBE_INTERVAL_MS = 1_000;
|
|
12
|
+
|
|
13
|
+
/**
|
|
14
|
+
* Only a DNS resolution failure qualifies (#7958): DNS answering again is exactly the evidence that
|
|
15
|
+
* failure lacked. A refused or unreachable connection would resend into the same failure, and with
|
|
16
|
+
* an outbound proxy a direct reachability probe would not test the path the request takes.
|
|
17
|
+
*/
|
|
18
|
+
const DNS_FAILURE_CODES = new Set(["ENOTFOUND", "EAI_AGAIN"]);
|
|
19
|
+
const MAX_CAUSE_DEPTH = 3;
|
|
20
|
+
|
|
21
|
+
/** A DNS resolution failure, read from `code` through a bounded cause chain; never from message text. */
|
|
22
|
+
export function isDnsResolutionFailure(error: unknown): boolean {
|
|
23
|
+
let current: unknown = error instanceof UpstreamRetryEvidenceError ? undefined : error;
|
|
24
|
+
for (let depth = 0; depth < MAX_CAUSE_DEPTH && current instanceof Error; depth++) {
|
|
25
|
+
const code = (current as { code?: unknown }).code;
|
|
26
|
+
if (typeof code === "string" && DNS_FAILURE_CODES.has(code)) return true;
|
|
27
|
+
current = current.cause;
|
|
28
|
+
}
|
|
29
|
+
return false;
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
/**
|
|
33
|
+
* Decides, at most once per logical request, whether a pre-connect failure may be resent after
|
|
34
|
+
* the destination became reachable again. Returns false for every later call, and never rejects
|
|
35
|
+
* with the abort reason: a cancelled wait answers false so the caller keeps the original failure.
|
|
36
|
+
*/
|
|
37
|
+
export type OfflineResendWait = (error: unknown, signal?: AbortSignal) => Promise<boolean>;
|
|
38
|
+
|
|
39
|
+
export interface OfflineResendDependencies {
|
|
40
|
+
/** Resolves when the host resolves; rejects while it does not. */
|
|
41
|
+
resolveHost?: (hostname: string) => Promise<unknown>;
|
|
42
|
+
/** Abortable delay between probes. */
|
|
43
|
+
delay?: (ms: number, signal?: AbortSignal) => Promise<void>;
|
|
44
|
+
/** Abortable timer that ends a probe still pending when the wait runs out. */
|
|
45
|
+
expire?: (ms: number, signal?: AbortSignal) => Promise<void>;
|
|
46
|
+
now?: () => number;
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
let testDependencies: OfflineResendDependencies | undefined;
|
|
50
|
+
|
|
51
|
+
/** Test-only seam for the DNS probe, delay and clock; `undefined` restores the real ones. */
|
|
52
|
+
export function setOfflineResendDependenciesForTests(dependencies: OfflineResendDependencies | undefined): void {
|
|
53
|
+
testDependencies = dependencies;
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
/** The configured wait in milliseconds, or 0 when the opt-in is off or malformed. */
|
|
57
|
+
export function resolveOfflineResendWaitMs(configuredSec: unknown): number {
|
|
58
|
+
if (typeof configuredSec !== "number" || !Number.isFinite(configuredSec) || configuredSec <= 0) return 0;
|
|
59
|
+
return Math.ceil(Math.min(configuredSec, MAX_OFFLINE_RESEND_WAIT_SEC) * 1_000);
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
/**
|
|
63
|
+
* Opt-in offline wait for one request (#7958). After a send fails because the destination's name
|
|
64
|
+
* did not resolve (`isDnsResolutionFailure`), poll its DNS until it resolves or `maxWaitMs` passes,
|
|
65
|
+
* then allow one resend. An IP-literal destination never qualifies: DNS proves nothing about it.
|
|
66
|
+
* Nothing was delivered, so the resend cannot repeat an upstream effect; the caller's send budget
|
|
67
|
+
* still counts it. A rejection that is not pre-connect, a second failure, an exhausted wait or a
|
|
68
|
+
* client abort returns the original failure. A client abort answers false rather than throwing:
|
|
69
|
+
* the abort reason would replace the DNS error, and a Codex pool send would then classify a
|
|
70
|
+
* host-wide `connect_neutral` failure as account-attributed `connect_error`.
|
|
71
|
+
*/
|
|
72
|
+
export function createOfflineResendWait(url: string, maxWaitMs: number): OfflineResendWait | undefined {
|
|
73
|
+
if (!(maxWaitMs > 0)) return undefined;
|
|
74
|
+
let hostname: string;
|
|
75
|
+
try { hostname = new URL(url).hostname.replace(/^\[|\]$/g, ""); } catch { return undefined; }
|
|
76
|
+
if (isIP(hostname) !== 0) return undefined;
|
|
77
|
+
let claimed = false;
|
|
78
|
+
return async (error, signal) => {
|
|
79
|
+
if (claimed || !isDnsResolutionFailure(error)) return false;
|
|
80
|
+
claimed = true;
|
|
81
|
+
const deps = testDependencies ?? {};
|
|
82
|
+
const resolveHost = deps.resolveHost ?? ((host: string) => lookup(host));
|
|
83
|
+
const delay = deps.delay ?? abortableDelay;
|
|
84
|
+
const expire = deps.expire ?? abortableDelay;
|
|
85
|
+
const now = deps.now ?? Date.now;
|
|
86
|
+
const deadline = now() + maxWaitMs;
|
|
87
|
+
for (;;) {
|
|
88
|
+
if (signal?.aborted) return false;
|
|
89
|
+
let remaining = deadline - now();
|
|
90
|
+
if (remaining <= 0) return false;
|
|
91
|
+
// A stalled system resolver must not outlive the wait or the client: race each probe against
|
|
92
|
+
// the remaining budget and cancellation, and accept a success only inside the budget. An
|
|
93
|
+
// expiry that rejects (cancellation) ends the wait the same way as one that fires.
|
|
94
|
+
const settle = new AbortController();
|
|
95
|
+
const raceSignal = signal ? AbortSignal.any([signal, settle.signal]) : settle.signal;
|
|
96
|
+
const expiry = new Promise<void>(resolve => resolve(expire(remaining, raceSignal)))
|
|
97
|
+
.then(() => "expired" as const, () => "expired" as const);
|
|
98
|
+
const probe = new Promise(resolve => resolve(resolveHost(hostname))).then(() => true, () => false);
|
|
99
|
+
let outcome: boolean | "expired";
|
|
100
|
+
try { outcome = await Promise.race([probe, expiry]); } finally { settle.abort(); }
|
|
101
|
+
if (outcome === "expired" || signal?.aborted) return false;
|
|
102
|
+
if (outcome) return now() <= deadline;
|
|
103
|
+
remaining = deadline - now();
|
|
104
|
+
if (remaining <= 0) return false;
|
|
105
|
+
try { await delay(Math.min(OFFLINE_REACHABILITY_PROBE_INTERVAL_MS, remaining), signal); } catch { return false; }
|
|
106
|
+
}
|
|
107
|
+
};
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
function abortableDelay(ms: number, signal?: AbortSignal): Promise<void> {
|
|
111
|
+
if (signal?.aborted) return Promise.reject(signal.reason);
|
|
112
|
+
return new Promise<void>((resolve, reject) => {
|
|
113
|
+
const onAbort = () => { clearTimeout(timer); reject(signal?.reason); };
|
|
114
|
+
const timer = setTimeout(() => { signal?.removeEventListener("abort", onAbort); resolve(); }, ms);
|
|
115
|
+
signal?.addEventListener("abort", onAbort, { once: true });
|
|
116
|
+
});
|
|
117
|
+
}
|
|
118
|
+
|
|
119
|
+
/**
|
|
120
|
+
* The URL whose name the provider's send actually resolves, or `undefined` when that is unknown.
|
|
121
|
+
* A proxied send resolves the proxy's name, and its DNS failure is the proxy's, so the wait probes
|
|
122
|
+
* the proxy; probing the provider instead could resend into a proxy that still fails, or wait out
|
|
123
|
+
* a provider name only the proxy can resolve. The route follows `configuredOutboundFetch`: the
|
|
124
|
+
* provider's own `proxy`/`noProxy` first, then the global proxy unless `NO_PROXY` exempts the URL.
|
|
125
|
+
* A caller-supplied executor picks its own transport, so it gets no probe; OpenCodex's own wrappers
|
|
126
|
+
* (xAI, Mistral Chat) carry the egress-transparent mark because they send through that same route.
|
|
127
|
+
* A malformed route fails the send anyway.
|
|
128
|
+
*/
|
|
129
|
+
export function offlineResendProbeUrl(providerName: string, provider: OcxProviderConfig, url: string): string | undefined {
|
|
130
|
+
const executor = (provider as { fetch?: unknown }).fetch;
|
|
131
|
+
if (typeof executor === "function" && !isEgressTransparentExecutor(executor)) return undefined;
|
|
132
|
+
let target: URL;
|
|
133
|
+
try { target = new URL(url); } catch { return undefined; }
|
|
134
|
+
let egress: ReturnType<typeof resolveProviderEgress>;
|
|
135
|
+
try { egress = resolveProviderEgress({ providerName, provider, url: target }); } catch { return undefined; }
|
|
136
|
+
if (egress.kind === "proxy") return egress.proxyUrl;
|
|
137
|
+
if (egress.kind === "direct") return url;
|
|
138
|
+
const globalProxy = effectiveProxyFor(target);
|
|
139
|
+
return globalProxy !== null && !noProxyMatches(target) ? globalProxy : url;
|
|
140
|
+
}
|
|
141
|
+
|
|
142
|
+
/** The request's offline waiter (#7958), probing the name its send resolves; `undefined` when off. */
|
|
143
|
+
export function createProviderOfflineResendWait(
|
|
144
|
+
providerName: string, provider: OcxProviderConfig, url: string, configuredSec: unknown,
|
|
145
|
+
): OfflineResendWait | undefined {
|
|
146
|
+
const maxWaitMs = resolveOfflineResendWaitMs(configuredSec);
|
|
147
|
+
if (maxWaitMs <= 0) return undefined;
|
|
148
|
+
const probeUrl = offlineResendProbeUrl(providerName, provider, url);
|
|
149
|
+
return probeUrl === undefined ? undefined : createOfflineResendWait(probeUrl, maxWaitMs);
|
|
150
|
+
}
|
|
@@ -32,6 +32,335 @@ export function isCredentialName(name: string): boolean {
|
|
|
32
32
|
return SENSITIVE_KEY_PATTERN.test(name) || CREDENTIAL_HEADER_NAME.test(name);
|
|
33
33
|
}
|
|
34
34
|
|
|
35
|
+
/** True for a request-correlation header: an identifier, not a credential, and never recorded. */
|
|
36
|
+
export function isCorrelationHeaderName(name: string): boolean {
|
|
37
|
+
return CORRELATION_HEADER_NAME.test(name);
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
/** Characters of a text a sent-value guard reads: a caller emits no copy beyond them. */
|
|
41
|
+
export const SENT_VALUE_GUARD_SCAN_CHARS = 8_192;
|
|
42
|
+
/** Excerpt windows produced beyond this many (repeats included) make a credential set fail closed. */
|
|
43
|
+
export const MAX_CREDENTIAL_EXCERPT_WINDOWS = 65_536;
|
|
44
|
+
|
|
45
|
+
function spellings(part: string): string[] {
|
|
46
|
+
const escaped = JSON.stringify(part).slice(1, -1);
|
|
47
|
+
return escaped === part ? [part] : [part, escaped];
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
/**
|
|
51
|
+
* The 8-character excerpt windows of a credential value: every window of each token between
|
|
52
|
+
* separators (whitespace, commas, semicolons, "=", quotes, backslashes), auth scheme words left out.
|
|
53
|
+
* A window never spans a separator, so scheme or field-name text cannot form one, while an opaque
|
|
54
|
+
* value containing "=" still has every token of 8+ characters covered.
|
|
55
|
+
* Generation stops once `max` windows are produced (repeats count), so a caller that sees more than
|
|
56
|
+
* `max` back knows coverage would be unbounded and fails closed.
|
|
57
|
+
*/
|
|
58
|
+
export function credentialExcerptWindows(value: string, max = MAX_CREDENTIAL_EXCERPT_WINDOWS): string[] {
|
|
59
|
+
const windows: string[] = [];
|
|
60
|
+
for (const token of value.split(/[\s,;="\\]+/)) {
|
|
61
|
+
if (token.length < CREDENTIAL_SUBSTRING_MIN_LENGTH || AUTH_SCHEMES.has(token.toLowerCase())) continue;
|
|
62
|
+
for (let at = 0; at + CREDENTIAL_SUBSTRING_MIN_LENGTH <= token.length; at++) {
|
|
63
|
+
windows.push(token.slice(at, at + CREDENTIAL_SUBSTRING_MIN_LENGTH));
|
|
64
|
+
if (windows.length > max) return windows;
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
return windows;
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
/** Whether text holds any of the excerpt windows, reading at most the guard's scan window. */
|
|
71
|
+
export function containsExcerptWindow(text: string, windows: ReadonlySet<string>): boolean {
|
|
72
|
+
if (windows.size === 0) return false;
|
|
73
|
+
const head = text.length > SENT_VALUE_GUARD_SCAN_CHARS ? text.slice(0, SENT_VALUE_GUARD_SCAN_CHARS) : text;
|
|
74
|
+
for (let at = 0; at + CREDENTIAL_SUBSTRING_MIN_LENGTH <= head.length; at++) {
|
|
75
|
+
if (windows.has(head.slice(at, at + CREDENTIAL_SUBSTRING_MIN_LENGTH))) return true;
|
|
76
|
+
}
|
|
77
|
+
return false;
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
|
|
81
|
+
/**
|
|
82
|
+
* Whether text repeats a value these outbound headers carry, decided from this request's own
|
|
83
|
+
* headers so no global eviction can open it. A credential-named component is recognized whole at
|
|
84
|
+
* any length and by any excerpt of 8+ characters (its 8-character windows, capped: past the cap the
|
|
85
|
+
* guard fails closed); any other non-correlation component is recognized when 8+ characters of it
|
|
86
|
+
* occur whole. Only the first {@link SENT_VALUE_GUARD_SCAN_CHARS} characters are read, so work is
|
|
87
|
+
* bounded; callers emit nothing beyond them.
|
|
88
|
+
*/
|
|
89
|
+
interface SentValueIndex {
|
|
90
|
+
wholeCredential: Set<string>;
|
|
91
|
+
credentialWindows: Set<string>;
|
|
92
|
+
contained: string[];
|
|
93
|
+
overflow: boolean;
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
function indexSentValues(headers: Record<string, string>, credentialOnly = false): SentValueIndex {
|
|
97
|
+
const wholeCredential = new Set<string>();
|
|
98
|
+
const credentialWindows = new Set<string>();
|
|
99
|
+
const contained: string[] = [];
|
|
100
|
+
let overflow = false;
|
|
101
|
+
let produced = 0;
|
|
102
|
+
for (const [name, value] of Object.entries(headers)) {
|
|
103
|
+
const credentialNamed = isCredentialName(name);
|
|
104
|
+
if (!credentialNamed && CORRELATION_HEADER_NAME.test(name)) continue;
|
|
105
|
+
for (const part of credentialComponents(value)) {
|
|
106
|
+
if (!credentialNamed) {
|
|
107
|
+
if (!credentialOnly && part.length >= CREDENTIAL_SUBSTRING_MIN_LENGTH) contained.push(...spellings(part));
|
|
108
|
+
continue;
|
|
109
|
+
}
|
|
110
|
+
for (const spelling of spellings(part)) {
|
|
111
|
+
wholeCredential.add(spelling);
|
|
112
|
+
if (overflow) continue;
|
|
113
|
+
const windows = credentialExcerptWindows(spelling, MAX_CREDENTIAL_EXCERPT_WINDOWS - produced);
|
|
114
|
+
produced += windows.length;
|
|
115
|
+
if (produced > MAX_CREDENTIAL_EXCERPT_WINDOWS) overflow = true;
|
|
116
|
+
else for (const window of windows) credentialWindows.add(window);
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
return { wholeCredential, credentialWindows, contained, overflow };
|
|
121
|
+
}
|
|
122
|
+
|
|
123
|
+
function scanHead(text: string): string {
|
|
124
|
+
return text.length > SENT_VALUE_GUARD_SCAN_CHARS ? text.slice(0, SENT_VALUE_GUARD_SCAN_CHARS) : text;
|
|
125
|
+
}
|
|
126
|
+
|
|
127
|
+
export function createSentValueGuard(headers: Record<string, string>): (text: string) => boolean {
|
|
128
|
+
const { wholeCredential, credentialWindows, contained, overflow } = indexSentValues(headers);
|
|
129
|
+
const containedIndex = new SecretIndex(contained);
|
|
130
|
+
return (text) => {
|
|
131
|
+
if (overflow) return true;
|
|
132
|
+
const head = scanHead(text);
|
|
133
|
+
if (wholeCredential.has(head)) return true;
|
|
134
|
+
for (let at = 0; at + CREDENTIAL_SUBSTRING_MIN_LENGTH <= head.length; at++) {
|
|
135
|
+
if (credentialWindows.has(head.slice(at, at + CREDENTIAL_SUBSTRING_MIN_LENGTH))) return true;
|
|
136
|
+
}
|
|
137
|
+
return markSubstringSpans(head, containedIndex, undefined) !== undefined;
|
|
138
|
+
};
|
|
139
|
+
}
|
|
140
|
+
|
|
141
|
+
/**
|
|
142
|
+
* The span-masking form of {@link createSentValueGuard}: it returns the scanned head of text with
|
|
143
|
+
* only the characters that repeat a sent value replaced (every matching 8-character window of a
|
|
144
|
+
* credential token, every contained non-credential value), so the surrounding copy, such as refusal
|
|
145
|
+
* wording a reader classifies, survives. The whole head is replaced when it equals a credential, and
|
|
146
|
+
* everything is replaced past the window cap.
|
|
147
|
+
*/
|
|
148
|
+
export function createSentValueMask(
|
|
149
|
+
headers: Record<string, string>,
|
|
150
|
+
replacement: string,
|
|
151
|
+
options: { credentialOnly?: boolean; wholeText?: boolean } = {},
|
|
152
|
+
): (text: string) => string {
|
|
153
|
+
// `credentialOnly`: only credential-named values (whole and by excerpt), for copy where other
|
|
154
|
+
// header values (a content type, a user agent) are ordinary text that must stay readable.
|
|
155
|
+
// `wholeText`: read and return all of the text (linear work), for genuine Responses terminals whose
|
|
156
|
+
// output must not be cut; the default reads and returns only the guard's scan window.
|
|
157
|
+
const { wholeCredential, credentialWindows, contained, overflow } = indexSentValues(headers, options.credentialOnly);
|
|
158
|
+
const containedIndex = new SecretIndex(contained);
|
|
159
|
+
return (text) => {
|
|
160
|
+
if (overflow) return replacement;
|
|
161
|
+
const head = options.wholeText ? text : scanHead(text);
|
|
162
|
+
if (wholeCredential.has(head)) return replacement;
|
|
163
|
+
// Matching windows are marked in the same pass that finds them, so the work stays linear in the
|
|
164
|
+
// text length however many distinct windows match (a rescan per window would be quadratic).
|
|
165
|
+
let covered: Uint8Array | undefined;
|
|
166
|
+
for (let at = 0; at + CREDENTIAL_SUBSTRING_MIN_LENGTH <= head.length; at++) {
|
|
167
|
+
if (!credentialWindows.has(head.slice(at, at + CREDENTIAL_SUBSTRING_MIN_LENGTH))) continue;
|
|
168
|
+
covered ??= new Uint8Array(head.length);
|
|
169
|
+
covered.fill(1, at, at + CREDENTIAL_SUBSTRING_MIN_LENGTH);
|
|
170
|
+
}
|
|
171
|
+
covered = markSubstringSpans(head, containedIndex, covered);
|
|
172
|
+
return covered === undefined ? head : renderCoveredSpans(head, covered, replacement);
|
|
173
|
+
};
|
|
174
|
+
}
|
|
175
|
+
|
|
176
|
+
/**
|
|
177
|
+
* Replace every span of text a secret covers: the whole text when it equals a whole-only value, and
|
|
178
|
+
* every occurrence of each substring value. Coverage is marked on the original text before anything
|
|
179
|
+
* is replaced, so overlapping values are replaced as one union and no part of either survives
|
|
180
|
+
* between them. Pass a {@link SecretIndex} built once when the same secrets mask many strings: the
|
|
181
|
+
* work per call is then linear in that string, independent of how many secrets there are.
|
|
182
|
+
*/
|
|
183
|
+
export function maskSecretSpans(text: string, replacement: string, substrings: Iterable<string> | SecretIndex, wholeOnly: Iterable<string> = []): string {
|
|
184
|
+
for (const value of wholeOnly) if (value && text === value) return replacement;
|
|
185
|
+
const covered = markSubstringSpans(text, substrings instanceof SecretIndex ? substrings : new SecretIndex(substrings), undefined);
|
|
186
|
+
return covered === undefined ? text : renderCoveredSpans(text, covered, replacement);
|
|
187
|
+
}
|
|
188
|
+
|
|
189
|
+
/**
|
|
190
|
+
* Secrets prepared for {@link maskSecretSpans}: deduplicated, 8+ character secrets grouped by their
|
|
191
|
+
* first 8 characters with each group sorted by length, shorter ones grouped by length. Built once
|
|
192
|
+
* per request, so masking each string of a frame does not rebuild it. Border tables are computed
|
|
193
|
+
* lazily, at most once per secret, and charged to the call that needs them.
|
|
194
|
+
*/
|
|
195
|
+
export class SecretIndex {
|
|
196
|
+
readonly byPrefix = new Map<string, string[]>();
|
|
197
|
+
readonly shortByLength = new Map<number, Set<string>>();
|
|
198
|
+
readonly bordered = new Map<string, boolean>();
|
|
199
|
+
|
|
200
|
+
constructor(substrings: Iterable<string>) {
|
|
201
|
+
for (const secret of new Set(substrings)) {
|
|
202
|
+
if (!secret) continue;
|
|
203
|
+
if (secret.length >= CREDENTIAL_SUBSTRING_MIN_LENGTH) {
|
|
204
|
+
const prefix = secret.slice(0, CREDENTIAL_SUBSTRING_MIN_LENGTH);
|
|
205
|
+
const group = this.byPrefix.get(prefix);
|
|
206
|
+
if (group) group.push(secret);
|
|
207
|
+
else this.byPrefix.set(prefix, [secret]);
|
|
208
|
+
} else {
|
|
209
|
+
const group = this.shortByLength.get(secret.length) ?? new Set<string>();
|
|
210
|
+
group.add(secret);
|
|
211
|
+
this.shortByLength.set(secret.length, group);
|
|
212
|
+
}
|
|
213
|
+
}
|
|
214
|
+
for (const group of this.byPrefix.values()) group.sort((a, b) => a.length - b.length);
|
|
215
|
+
}
|
|
216
|
+
}
|
|
217
|
+
|
|
218
|
+
function markSubstringSpans(text: string, index: SecretIndex, initial: Uint8Array | undefined): Uint8Array | undefined {
|
|
219
|
+
// One pass over the text finds every secret, however many there are: secrets of 8+ characters are
|
|
220
|
+
// looked up by the 8 characters at each position, shorter ones by a slice of their own length (at
|
|
221
|
+
// most seven passes). A prefix group is walked shortest first and stops at the first secret that
|
|
222
|
+
// cannot fit in the text left, so only candidates that fit are visited, and each is charged:
|
|
223
|
+
// confirming it, building its border table, and the one scan of a confirmed self-overlapping
|
|
224
|
+
// secret. The budget is proportional to the text; past it the whole text is covered (fail closed),
|
|
225
|
+
// so neither the frame nor the secret set can make the work superlinear.
|
|
226
|
+
const n = text.length;
|
|
227
|
+
let covered = initial;
|
|
228
|
+
for (const [length, group] of index.shortByLength) {
|
|
229
|
+
for (let at = 0; at + length <= n; at++) {
|
|
230
|
+
if (!group.has(text.slice(at, at + length))) continue;
|
|
231
|
+
covered ??= new Uint8Array(n);
|
|
232
|
+
covered.fill(1, at, at + length);
|
|
233
|
+
}
|
|
234
|
+
}
|
|
235
|
+
if (index.byPrefix.size === 0) return covered;
|
|
236
|
+
const budget = { steps: MATCH_WORK_PER_CHAR * n + MATCH_WORK_FLOOR };
|
|
237
|
+
const scanned = new Set<string>();
|
|
238
|
+
for (let at = 0; at + CREDENTIAL_SUBSTRING_MIN_LENGTH <= n; at++) {
|
|
239
|
+
const group = index.byPrefix.get(text.slice(at, at + CREDENTIAL_SUBSTRING_MIN_LENGTH));
|
|
240
|
+
if (group === undefined) continue;
|
|
241
|
+
for (const secret of group) {
|
|
242
|
+
if (secret.length > n - at) break;
|
|
243
|
+
if (scanned.has(secret)) continue;
|
|
244
|
+
// Charged by the characters actually compared, so a prefix shared by absent secrets costs
|
|
245
|
+
// little while near-copies of a long secret at every position still exhaust the budget.
|
|
246
|
+
const matched = matchedLength(text, at, secret);
|
|
247
|
+
budget.steps -= matched + 1;
|
|
248
|
+
if (budget.steps < 0) return (covered ?? new Uint8Array(n)).fill(1);
|
|
249
|
+
if (matched < secret.length) continue;
|
|
250
|
+
covered ??= new Uint8Array(n);
|
|
251
|
+
let selfOverlapping = index.bordered.get(secret);
|
|
252
|
+
if (selfOverlapping === undefined) {
|
|
253
|
+
budget.steps -= secret.length;
|
|
254
|
+
if (budget.steps < 0) return covered.fill(1);
|
|
255
|
+
selfOverlapping = hasBorder(secret);
|
|
256
|
+
index.bordered.set(secret, selfOverlapping);
|
|
257
|
+
}
|
|
258
|
+
if (selfOverlapping) {
|
|
259
|
+
// A confirmed self-overlapping secret is found from here on by one Knuth-Morris-Pratt scan,
|
|
260
|
+
// so a prefix shared by many secrets that are absent never starts a scan.
|
|
261
|
+
scanned.add(secret);
|
|
262
|
+
budget.steps -= n - at;
|
|
263
|
+
if (budget.steps < 0) return covered.fill(1);
|
|
264
|
+
markOverlappingOccurrences(text, secret, at, covered);
|
|
265
|
+
continue;
|
|
266
|
+
}
|
|
267
|
+
covered.fill(1, at, at + secret.length);
|
|
268
|
+
}
|
|
269
|
+
}
|
|
270
|
+
return covered;
|
|
271
|
+
}
|
|
272
|
+
|
|
273
|
+
/** Confirmation and scan work one masking call may spend per text character before it fails closed. */
|
|
274
|
+
const MATCH_WORK_PER_CHAR = 8;
|
|
275
|
+
const MATCH_WORK_FLOOR = 256;
|
|
276
|
+
|
|
277
|
+
/**
|
|
278
|
+
* Whether text contains any indexed secret, in one pass over text with the same charged walk as
|
|
279
|
+
* {@link maskSecretSpans}: it stops at the first confirmed occurrence, and reports true once the
|
|
280
|
+
* budget runs out (fail closed), so a check of a long upstream message against many values is linear.
|
|
281
|
+
*/
|
|
282
|
+
export function containsIndexedSecret(text: string, index: SecretIndex): boolean {
|
|
283
|
+
const n = text.length;
|
|
284
|
+
for (const [length, group] of index.shortByLength) {
|
|
285
|
+
for (let at = 0; at + length <= n; at++) if (group.has(text.slice(at, at + length))) return true;
|
|
286
|
+
}
|
|
287
|
+
if (index.byPrefix.size === 0) return false;
|
|
288
|
+
let budget = MATCH_WORK_PER_CHAR * n + MATCH_WORK_FLOOR;
|
|
289
|
+
for (let at = 0; at + CREDENTIAL_SUBSTRING_MIN_LENGTH <= n; at++) {
|
|
290
|
+
const group = index.byPrefix.get(text.slice(at, at + CREDENTIAL_SUBSTRING_MIN_LENGTH));
|
|
291
|
+
if (group === undefined) continue;
|
|
292
|
+
for (const secret of group) {
|
|
293
|
+
if (secret.length > n - at) break;
|
|
294
|
+
const matched = matchedLength(text, at, secret);
|
|
295
|
+
budget -= matched + 1;
|
|
296
|
+
if (budget < 0) return true;
|
|
297
|
+
if (matched === secret.length) return true;
|
|
298
|
+
}
|
|
299
|
+
}
|
|
300
|
+
return false;
|
|
301
|
+
}
|
|
302
|
+
|
|
303
|
+
/**
|
|
304
|
+
* How many leading characters of secret match text at at (the index already matched the first 8):
|
|
305
|
+
* secret.length exactly when the whole secret occurs there. A candidate is charged this plus one,
|
|
306
|
+
* the comparison work it actually cost.
|
|
307
|
+
*/
|
|
308
|
+
function matchedLength(text: string, at: number, secret: string): number {
|
|
309
|
+
let i = CREDENTIAL_SUBSTRING_MIN_LENGTH;
|
|
310
|
+
while (i < secret.length && text.charCodeAt(at + i) === secret.charCodeAt(i)) i++;
|
|
311
|
+
return i;
|
|
312
|
+
}
|
|
313
|
+
|
|
314
|
+
/** Whether a proper prefix of the secret is also its suffix, so two occurrences can overlap. */
|
|
315
|
+
function hasBorder(secret: string): boolean {
|
|
316
|
+
return borderTable(secret)[secret.length - 1]! > 0;
|
|
317
|
+
}
|
|
318
|
+
|
|
319
|
+
function borderTable(secret: string): Int32Array {
|
|
320
|
+
const m = secret.length;
|
|
321
|
+
const fail = new Int32Array(m);
|
|
322
|
+
for (let i = 1, k = 0; i < m; i++) {
|
|
323
|
+
while (k > 0 && secret.charCodeAt(i) !== secret.charCodeAt(k)) k = fail[k - 1]!;
|
|
324
|
+
if (secret.charCodeAt(i) === secret.charCodeAt(k)) k++;
|
|
325
|
+
fail[i] = k;
|
|
326
|
+
}
|
|
327
|
+
return fail;
|
|
328
|
+
}
|
|
329
|
+
|
|
330
|
+
/**
|
|
331
|
+
* Mark every occurrence of secret at or after from, overlapping ones included, in one
|
|
332
|
+
* Knuth-Morris-Pratt pass: linear in the text even when a long repetitive secret overlaps itself at
|
|
333
|
+
* every position (restarting a search one character after each match would recheck it there).
|
|
334
|
+
*/
|
|
335
|
+
function markOverlappingOccurrences(text: string, secret: string, from: number, covered: Uint8Array): void {
|
|
336
|
+
const m = secret.length;
|
|
337
|
+
const fail = borderTable(secret);
|
|
338
|
+
let markedTo = 0;
|
|
339
|
+
for (let i = from, k = 0; i < text.length; i++) {
|
|
340
|
+
while (k > 0 && text.charCodeAt(i) !== secret.charCodeAt(k)) k = fail[k - 1]!;
|
|
341
|
+
if (text.charCodeAt(i) === secret.charCodeAt(k)) k++;
|
|
342
|
+
if (k === m) {
|
|
343
|
+
const end = i + 1;
|
|
344
|
+
covered.fill(1, Math.max(end - m, markedTo), end);
|
|
345
|
+
markedTo = end;
|
|
346
|
+
k = fail[m - 1]!;
|
|
347
|
+
}
|
|
348
|
+
}
|
|
349
|
+
}
|
|
350
|
+
|
|
351
|
+
function renderCoveredSpans(text: string, covered: Uint8Array, replacement: string): string {
|
|
352
|
+
let out = "";
|
|
353
|
+
let at = 0;
|
|
354
|
+
while (at < text.length) {
|
|
355
|
+
const run = covered[at];
|
|
356
|
+
let next = at + 1;
|
|
357
|
+
while (next < text.length && covered[next] === run) next++;
|
|
358
|
+
out += run ? replacement : text.slice(at, next);
|
|
359
|
+
at = next;
|
|
360
|
+
}
|
|
361
|
+
return out;
|
|
362
|
+
}
|
|
363
|
+
|
|
35
364
|
/**
|
|
36
365
|
* Values of RFC 9110 auth-params (token BWS "=" BWS ( token / quoted-string )), cookie pairs and
|
|
37
366
|
* other name=value pairs, in one linear pass: every character is visited a bounded number of times,
|
|
@@ -113,14 +442,30 @@ export function credentialComponents(value: string): string[] {
|
|
|
113
442
|
}
|
|
114
443
|
|
|
115
444
|
/** Exact equality at any length at or above minLength; containment for values of 8+ characters. */
|
|
116
|
-
export function credentialSetMatches(
|
|
445
|
+
export function credentialSetMatches(
|
|
446
|
+
values: Iterable<string>,
|
|
447
|
+
has: (value: string) => boolean,
|
|
448
|
+
value: string,
|
|
449
|
+
minLength = 1,
|
|
450
|
+
index?: SecretIndex,
|
|
451
|
+
): boolean {
|
|
117
452
|
if (value.length >= minLength && has(value)) return true;
|
|
453
|
+
// An index of the containment-eligible values makes the check one pass over value, however many
|
|
454
|
+
// values there are; it must hold exactly the values of max(minLength, 8)+ characters.
|
|
455
|
+
if (index !== undefined) return containsIndexedSecret(value, index);
|
|
118
456
|
for (const secret of values) {
|
|
119
457
|
if (secret.length >= Math.max(minLength, CREDENTIAL_SUBSTRING_MIN_LENGTH) && value.includes(secret)) return true;
|
|
120
458
|
}
|
|
121
459
|
return false;
|
|
122
460
|
}
|
|
123
461
|
|
|
462
|
+
/** The containment-eligible index {@link credentialSetMatches} takes for these values. */
|
|
463
|
+
export function credentialContainmentIndex(values: Iterable<string>, minLength = 1): SecretIndex {
|
|
464
|
+
const eligible: string[] = [];
|
|
465
|
+
for (const secret of values) if (secret.length >= Math.max(minLength, CREDENTIAL_SUBSTRING_MIN_LENGTH)) eligible.push(secret);
|
|
466
|
+
return new SecretIndex(eligible);
|
|
467
|
+
}
|
|
468
|
+
|
|
124
469
|
export interface OutboundCredentialRegistryOptions {
|
|
125
470
|
maxEntries?: number;
|
|
126
471
|
maxBytes?: number;
|
|
@@ -131,6 +476,7 @@ export interface OutboundCredentialRegistryOptions {
|
|
|
131
476
|
class BoundedValueSet {
|
|
132
477
|
readonly values = new Map<string, number>();
|
|
133
478
|
private totalBytes = 0;
|
|
479
|
+
private index: SecretIndex | undefined;
|
|
134
480
|
complete = true;
|
|
135
481
|
constructor(private readonly maxEntries: number, private readonly maxBytes: number, private readonly maxValueBytes: number) {}
|
|
136
482
|
|
|
@@ -148,6 +494,7 @@ class BoundedValueSet {
|
|
|
148
494
|
}
|
|
149
495
|
this.values.set(value, bytes);
|
|
150
496
|
this.totalBytes += bytes;
|
|
497
|
+
this.index = undefined;
|
|
151
498
|
while (this.values.size > this.maxEntries || this.totalBytes > this.maxBytes) {
|
|
152
499
|
const oldest = this.values.keys().next().value as string;
|
|
153
500
|
this.totalBytes -= this.values.get(oldest)!;
|
|
@@ -157,30 +504,41 @@ class BoundedValueSet {
|
|
|
157
504
|
}
|
|
158
505
|
|
|
159
506
|
matches(value: string, minLength: number): boolean {
|
|
160
|
-
|
|
507
|
+
// Each set is always matched with the same minLength; the index is rebuilt after the set changes.
|
|
508
|
+
this.index ??= credentialContainmentIndex(this.values.keys(), minLength);
|
|
509
|
+
return credentialSetMatches(this.values.keys(), candidate => this.values.has(candidate), value, minLength, this.index);
|
|
161
510
|
}
|
|
162
511
|
}
|
|
163
512
|
|
|
164
513
|
export class OutboundCredentialRegistry {
|
|
165
514
|
private readonly strict: BoundedValueSet;
|
|
166
515
|
private readonly observed: BoundedValueSet;
|
|
516
|
+
private readonly maxValueBytes: number;
|
|
167
517
|
|
|
168
518
|
constructor(options: OutboundCredentialRegistryOptions = {}) {
|
|
169
519
|
const entries = options.maxEntries ?? 4096;
|
|
170
520
|
const bytes = options.maxBytes ?? 1 << 20;
|
|
171
521
|
const valueBytes = options.maxValueBytes ?? 16_384;
|
|
522
|
+
this.maxValueBytes = valueBytes;
|
|
172
523
|
this.strict = new BoundedValueSet(entries, bytes, valueBytes);
|
|
173
524
|
this.observed = new BoundedValueSet(entries, bytes, valueBytes);
|
|
174
525
|
}
|
|
175
526
|
|
|
176
|
-
/**
|
|
527
|
+
/**
|
|
528
|
+
* Record the components of every value in headers that are about to be sent. A component too
|
|
529
|
+
* large to keep, credential-named or not, marks the registry incomplete: no bounded record can
|
|
530
|
+
* recognize every excerpt of it, so every caller fails closed instead.
|
|
531
|
+
*/
|
|
177
532
|
remember(headers: HeadersInit | Headers | undefined): void {
|
|
178
533
|
if (!headers) return;
|
|
179
534
|
new Headers(headers).forEach((value, name) => {
|
|
180
535
|
const strict = isCredentialName(name);
|
|
181
536
|
if (!strict && CORRELATION_HEADER_NAME.test(name)) return;
|
|
182
537
|
const tier = strict ? this.strict : this.observed;
|
|
183
|
-
for (const part of credentialComponents(value))
|
|
538
|
+
for (const part of credentialComponents(value)) {
|
|
539
|
+
tier.add(part);
|
|
540
|
+
if (Buffer.byteLength(part, "utf8") > this.maxValueBytes) this.strict.complete = false;
|
|
541
|
+
}
|
|
184
542
|
});
|
|
185
543
|
}
|
|
186
544
|
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Pacing that travels with a stream (#8601).
|
|
3
|
+
*
|
|
4
|
+
* Every relayed Remote Link turn reads its upstream body only as its client drains, with or without the link WebSocket
|
|
5
|
+
* feature. Each relay stage between the upstream and the client normally keeps one chunk queued ahead of its reader; a
|
|
6
|
+
* stage whose source is paced queues none instead and marks its own output, so the whole chain pulls on demand. Streams that were
|
|
7
|
+
* never marked keep their default queue: every other request is unchanged.
|
|
8
|
+
*/
|
|
9
|
+
const paced = new WeakSet<ReadableStream<Uint8Array>>();
|
|
10
|
+
|
|
11
|
+
/** How far a reader of a paced stream may get ahead of its own reader: one chunk, never a byte allowance. */
|
|
12
|
+
export const PACED_READ_AHEAD_BYTES = 1;
|
|
13
|
+
|
|
14
|
+
/** Mark a stream whose reads must follow its reader's demand. */
|
|
15
|
+
export function markPacedStream(stream: ReadableStream<Uint8Array>): ReadableStream<Uint8Array> {
|
|
16
|
+
paced.add(stream);
|
|
17
|
+
return stream;
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
/** Whether a stream was marked paced, or carries the mark of a paced source. */
|
|
21
|
+
export function isPacedStream(stream: ReadableStream<Uint8Array> | null | undefined): boolean {
|
|
22
|
+
return stream ? paced.has(stream) : false;
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
/** The queuing strategy for a stage reading `source`: none ahead when the source is paced, the default otherwise. */
|
|
26
|
+
export function pacedQueuingStrategy(source: ReadableStream<Uint8Array> | null | undefined): QueuingStrategy<Uint8Array> | undefined {
|
|
27
|
+
return source && paced.has(source) ? { highWaterMark: 0 } : undefined;
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
/** Carry a paced source's mark to the stage's output. */
|
|
31
|
+
export function carryPacedStream<T extends ReadableStream<Uint8Array>>(source: ReadableStream<Uint8Array> | null | undefined, output: T): T {
|
|
32
|
+
if (source && paced.has(source)) paced.add(output);
|
|
33
|
+
return output;
|
|
34
|
+
}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
/** Process-local proof that an executor preserves destination and credential headers. */
|
|
2
|
+
const proven = new WeakSet<typeof globalThis.fetch>();
|
|
3
|
+
const deferred = new WeakSet<typeof globalThis.fetch>();
|
|
4
|
+
|
|
5
|
+
/** A trusted transport calls this hook immediately before its physical executor. */
|
|
6
|
+
export const PASSIVE_KEY_SEND = Symbol("passive-key-send");
|
|
7
|
+
|
|
8
|
+
export function markPassiveKeyDeferred<T extends typeof globalThis.fetch>(fetcher: T): T {
|
|
9
|
+
deferred.add(fetcher);
|
|
10
|
+
return fetcher;
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
export function isPassiveKeyDeferred(fetcher: typeof globalThis.fetch): boolean {
|
|
14
|
+
return deferred.has(fetcher);
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
export function inheritPassiveKeyProof<T extends typeof globalThis.fetch>(wrapper: T, inner: typeof globalThis.fetch): T {
|
|
18
|
+
if (isPassiveKeyTransparent(inner)) markPassiveKeyTransparent(wrapper);
|
|
19
|
+
if (isPassiveKeyDeferred(inner)) markPassiveKeyDeferred(wrapper);
|
|
20
|
+
return wrapper;
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
export function markPassiveKeyTransparent<T extends typeof globalThis.fetch>(fetcher: T): T {
|
|
24
|
+
proven.add(fetcher);
|
|
25
|
+
return fetcher;
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
export function isPassiveKeyTransparent(fetcher: typeof globalThis.fetch): boolean {
|
|
29
|
+
return proven.has(fetcher);
|
|
30
|
+
}
|
package/src/lib/passive-read.ts
CHANGED
|
@@ -30,6 +30,11 @@ export function runPassiveRead<T>(run: () => Promise<T>, options: { onDiagnostic
|
|
|
30
30
|
return passive.run(options, run);
|
|
31
31
|
}
|
|
32
32
|
|
|
33
|
+
/** The same boundary for synchronous cache projections. */
|
|
34
|
+
export function runPassiveReadSync<T>(run: () => T): T {
|
|
35
|
+
return passive.run(passive.getStore() ?? {}, run);
|
|
36
|
+
}
|
|
37
|
+
|
|
33
38
|
export function isPassiveRead(): boolean {
|
|
34
39
|
return passive.getStore() !== undefined;
|
|
35
40
|
}
|