@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
|
@@ -32,7 +32,14 @@ import { join } from "node:path";
|
|
|
32
32
|
import { getConfigDir } from "../config/paths";
|
|
33
33
|
import { resolveEnvValue } from "../config/proxy-env";
|
|
34
34
|
import { isKeychainReference, providerKeyResolutionGeneration, resolveProviderApiKeyQuietly } from "../providers/api-key-resolve";
|
|
35
|
-
import {
|
|
35
|
+
import {
|
|
36
|
+
MAX_CREDENTIAL_EXCERPT_WINDOWS,
|
|
37
|
+
containsExcerptWindow,
|
|
38
|
+
credentialComponents,
|
|
39
|
+
credentialExcerptWindows,
|
|
40
|
+
credentialSetMatches,
|
|
41
|
+
credentialContainmentIndex,
|
|
42
|
+
} from "../lib/outbound-credential-registry";
|
|
36
43
|
import { SENSITIVE_KEY_PATTERN } from "../lib/redact";
|
|
37
44
|
|
|
38
45
|
const CREDENTIAL_FIELD = /(?:key|token|secret|password|passwd|credential|cookie|authorization)$/i;
|
|
@@ -47,6 +54,8 @@ export interface ConfiguredCredentials {
|
|
|
47
54
|
interface Snapshot {
|
|
48
55
|
/** The only object handed out: cache metadata (including env values) stays private here. */
|
|
49
56
|
readonly view: ConfiguredCredentials;
|
|
57
|
+
/** Excerpt windows of configured credential keys and tokens (see containsConfiguredCredentialExcerpt). */
|
|
58
|
+
readonly excerptWindows: ReadonlySet<string>;
|
|
50
59
|
readonly signature: string;
|
|
51
60
|
readonly envNames: readonly string[];
|
|
52
61
|
readonly envFingerprint: string;
|
|
@@ -105,10 +114,22 @@ function envReference(raw: string): string | undefined {
|
|
|
105
114
|
|
|
106
115
|
function build(configRead: StoreRead, authRead: StoreRead, signature: string, now: number): Snapshot {
|
|
107
116
|
const values = new Set<string>();
|
|
117
|
+
// Excerpt windows of credential-field values (keys, tokens): copy that repeats 8+ characters of a
|
|
118
|
+
// configured credential is refused like the whole value. Provider header values are matched whole
|
|
119
|
+
// only: they are often ordinary text (titles, referrer URLs) whose words would refuse common copy.
|
|
120
|
+
const windows = new Set<string>();
|
|
121
|
+
let producedWindows = 0;
|
|
108
122
|
const envNames = new Set<string>();
|
|
109
123
|
let complete = true;
|
|
110
|
-
const add = (raw: string | undefined) => {
|
|
111
|
-
if (raw)
|
|
124
|
+
const add = (raw: string | undefined, credential = true) => {
|
|
125
|
+
if (!raw) return;
|
|
126
|
+
for (const part of credentialComponents(raw)) values.add(part);
|
|
127
|
+
if (!credential || producedWindows > MAX_CREDENTIAL_EXCERPT_WINDOWS) return;
|
|
128
|
+
const produced = credentialExcerptWindows(raw, MAX_CREDENTIAL_EXCERPT_WINDOWS - producedWindows);
|
|
129
|
+
producedWindows += produced.length;
|
|
130
|
+
// Unbounded excerpt coverage would be unbounded work: past the cap the set fails closed.
|
|
131
|
+
if (producedWindows > MAX_CREDENTIAL_EXCERPT_WINDOWS) complete = false;
|
|
132
|
+
else for (const window of produced) windows.add(window);
|
|
112
133
|
};
|
|
113
134
|
const noteEnv = (raw: string) => {
|
|
114
135
|
const name = envReference(raw);
|
|
@@ -131,7 +152,7 @@ function build(configRead: StoreRead, authRead: StoreRead, signature: string, no
|
|
|
131
152
|
for (const header of Object.values(value)) {
|
|
132
153
|
if (typeof header !== "string") continue;
|
|
133
154
|
noteEnv(header);
|
|
134
|
-
add(resolveEnvValue(header) ?? header);
|
|
155
|
+
add(resolveEnvValue(header) ?? header, false);
|
|
135
156
|
}
|
|
136
157
|
} else if (typeof value === "string") {
|
|
137
158
|
if (isCredentialField(field)) addReference(value);
|
|
@@ -171,12 +192,14 @@ function build(configRead: StoreRead, authRead: StoreRead, signature: string, no
|
|
|
171
192
|
if (isRecord(auth.value)) walkAuth(auth.value, 0);
|
|
172
193
|
|
|
173
194
|
const names = [...envNames].sort();
|
|
195
|
+
const containment = credentialContainmentIndex(values);
|
|
174
196
|
const view: ConfiguredCredentials = Object.freeze({
|
|
175
197
|
complete,
|
|
176
|
-
matches: (value: string) => credentialSetMatches(values, candidate => values.has(candidate), value),
|
|
198
|
+
matches: (value: string) => credentialSetMatches(values, candidate => values.has(candidate), value, 1, containment),
|
|
177
199
|
});
|
|
178
200
|
return {
|
|
179
201
|
view,
|
|
202
|
+
excerptWindows: windows,
|
|
180
203
|
signature,
|
|
181
204
|
envNames: names,
|
|
182
205
|
envFingerprint: envFingerprint(names),
|
|
@@ -197,3 +220,12 @@ export function configuredCredentials(now = Date.now()): ConfiguredCredentials {
|
|
|
197
220
|
if (stale) cached = build(configRead, authRead, signature, now);
|
|
198
221
|
return cached!.view;
|
|
199
222
|
}
|
|
223
|
+
|
|
224
|
+
/**
|
|
225
|
+
* Whether value holds an 8+ character excerpt of a configured credential key or token, against the
|
|
226
|
+
* same fresh snapshot {@link configuredCredentials} serves. Whole-value matching stays in the view.
|
|
227
|
+
*/
|
|
228
|
+
export function containsConfiguredCredentialExcerpt(value: string, now = Date.now()): boolean {
|
|
229
|
+
configuredCredentials(now);
|
|
230
|
+
return cached !== undefined && containsExcerptWindow(value, cached.excerptWindows);
|
|
231
|
+
}
|
|
@@ -18,6 +18,25 @@ function abortReason(signal: AbortSignal): Error {
|
|
|
18
18
|
return error;
|
|
19
19
|
}
|
|
20
20
|
|
|
21
|
+
const connectPhaseTimeouts = new WeakSet<object>();
|
|
22
|
+
|
|
23
|
+
/**
|
|
24
|
+
* Whether a direct request timed out before its TCP connect completed (#8318). Only such a timeout
|
|
25
|
+
* says nothing accepted the connection; one after the connect is a slow or silent listener. The
|
|
26
|
+
* caller's own abort reason is never marked, because one signal can cover several requests.
|
|
27
|
+
*/
|
|
28
|
+
export function isConnectPhaseTimeout(error: unknown): boolean {
|
|
29
|
+
return typeof error === "object" && error !== null && connectPhaseTimeouts.has(error);
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
function connectPhaseTimeout(error: Error): Error {
|
|
33
|
+
if (error.name !== "TimeoutError") return error;
|
|
34
|
+
const marked = new Error(error.message, { cause: error });
|
|
35
|
+
marked.name = "TimeoutError";
|
|
36
|
+
connectPhaseTimeouts.add(marked);
|
|
37
|
+
return marked;
|
|
38
|
+
}
|
|
39
|
+
|
|
21
40
|
function headerBoundary(bytes: Buffer): number {
|
|
22
41
|
return bytes.indexOf("\r\n\r\n");
|
|
23
42
|
}
|
|
@@ -274,6 +293,7 @@ export async function directLocalHttpFetch(
|
|
|
274
293
|
return await new Promise<Response>((resolve, reject) => {
|
|
275
294
|
let socket: Socket | undefined;
|
|
276
295
|
let settled = false;
|
|
296
|
+
let connected = false;
|
|
277
297
|
let closed = false;
|
|
278
298
|
let completed = false;
|
|
279
299
|
let outcomeError: Error | undefined;
|
|
@@ -312,14 +332,16 @@ export async function directLocalHttpFetch(
|
|
|
312
332
|
settleAfterClose();
|
|
313
333
|
};
|
|
314
334
|
const onAbort = () => {
|
|
315
|
-
const
|
|
335
|
+
const reason = signal ? abortReason(signal) : new Error("direct local HTTP request aborted");
|
|
336
|
+
const error = connected ? reason : connectPhaseTimeout(reason);
|
|
316
337
|
if (settled) outcomeError ??= error;
|
|
317
338
|
else finish(error);
|
|
318
339
|
if (error.name === "TimeoutError") settleAfterClose(error);
|
|
319
340
|
};
|
|
320
341
|
const onDeadline = () => {
|
|
321
|
-
const
|
|
322
|
-
|
|
342
|
+
const timeout = new Error("direct local HTTP request timed out");
|
|
343
|
+
timeout.name = "TimeoutError";
|
|
344
|
+
const error = connected ? timeout : connectPhaseTimeout(timeout);
|
|
323
345
|
finish(error);
|
|
324
346
|
settleAfterClose(error);
|
|
325
347
|
};
|
|
@@ -332,6 +354,7 @@ export async function directLocalHttpFetch(
|
|
|
332
354
|
socket.setTimeout(timeoutMs, onDeadline);
|
|
333
355
|
socket.on("connect", () => {
|
|
334
356
|
if (settled) return;
|
|
357
|
+
connected = true;
|
|
335
358
|
try { socket?.write(requestBytes); } catch (error) {
|
|
336
359
|
finish(error instanceof Error ? error : new Error(String(error)));
|
|
337
360
|
}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
import { createHash } from "node:crypto";
|
|
2
|
+
import { desktopGuiBinding, desktopGuiOrigin, hasDesktopForwardingHeaders } from "../lib/desktop-gui-origin";
|
|
3
|
+
import type { OcxConfig } from "../types";
|
|
4
|
+
import { managementRequestOrigin } from "./auth-cors";
|
|
5
|
+
import type { GuiSessionRecord, GuiSessionState } from "./gui-session";
|
|
6
|
+
|
|
7
|
+
export const DESKTOP_AUTHORIZATION_PATH = "/api/codex/desktop-compatibility/authorization";
|
|
8
|
+
const TTL = 5 * 60_000;
|
|
9
|
+
const authorities = new WeakMap<GuiSessionRecord, { expiresAt: number; binding: string }>();
|
|
10
|
+
|
|
11
|
+
/** A scope on the existing record: neither pairing issuance nor data-key disclosure changes. */
|
|
12
|
+
export function authorizeDesktopSession(req: Request, config: OcxConfig, state: GuiSessionState, session: GuiSessionRecord, grant: string): boolean {
|
|
13
|
+
if (!/^ocx_pair_[A-Za-z0-9_-]{43}$/.test(grant) || req.method !== "POST"
|
|
14
|
+
|| new URL(req.url).pathname !== DESKTOP_AUTHORIZATION_PATH || new URL(req.url).search
|
|
15
|
+
|| hasDesktopForwardingHeaders(req) || desktopGuiOrigin(config, session.serverOrigin) !== session.serverOrigin
|
|
16
|
+
|| session.browserOrigin !== session.serverOrigin || req.headers.get("Origin") !== session.serverOrigin
|
|
17
|
+
|| managementRequestOrigin(req, config) !== session.serverOrigin
|
|
18
|
+
|| !(session.issuance === "loopback" || session.issuance === "pairing" && session.localPairing)) return false;
|
|
19
|
+
const digest = createHash("sha256").update(grant).digest("base64url");
|
|
20
|
+
const record = state.pairingGrants.get(digest), now = Date.now();
|
|
21
|
+
if (!record?.desktopPurpose || record.desktopBinding !== desktopGuiBinding(config) || record.expiresAt <= now || record.serverOrigin !== session.serverOrigin
|
|
22
|
+
|| record.browserOrigin !== session.browserOrigin) return false;
|
|
23
|
+
state.pairingGrants.delete(digest);
|
|
24
|
+
authorities.set(session, { expiresAt: Math.min(now + TTL, session.expiresAt), binding: desktopGuiBinding(config) });
|
|
25
|
+
return true;
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
export function desktopSessionAuthorized(req: Request, config: OcxConfig, session: GuiSessionRecord): boolean {
|
|
29
|
+
const authority = authorities.get(session);
|
|
30
|
+
if (!authority) return false;
|
|
31
|
+
if (authority.expiresAt <= Date.now() || authority.binding !== desktopGuiBinding(config)
|
|
32
|
+
|| desktopGuiOrigin(config, session.serverOrigin) !== session.serverOrigin) {
|
|
33
|
+
authorities.delete(session); return false;
|
|
34
|
+
}
|
|
35
|
+
return !hasDesktopForwardingHeaders(req);
|
|
36
|
+
}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { OcxConfig } from "../types";
|
|
2
|
-
import { GUI_PAIR_BROWSER_ORIGIN_HEADER, GUI_PAIR_CAPABILITY_HEADER, standaloneGuiPairingOrigin } from "../lib/gui-pair-capability";
|
|
2
|
+
import { DESKTOP_GUI_PAIR_PATH, GUI_PAIR_BROWSER_ORIGIN_HEADER, GUI_PAIR_CAPABILITY_HEADER, standaloneGuiPairingOrigin } from "../lib/gui-pair-capability";
|
|
3
|
+
import { desktopGuiOrigin, hasDesktopForwardingHeaders } from "../lib/desktop-gui-origin";
|
|
3
4
|
import { consumeGuiPairIntent, GUI_PAIR_INTENT_HEADER } from "../lib/gui-pair-intent";
|
|
4
5
|
import { createGuiPairingGrant, type GuiSessionState } from "./gui-session";
|
|
5
6
|
|
|
@@ -13,11 +14,13 @@ export class GuiPairingIntentRequiredError extends Error {
|
|
|
13
14
|
/** The serving route must authenticate the existing process-bound capability first. */
|
|
14
15
|
export function deliverGuiPairingGrant(req: Request, config: OcxConfig, state: GuiSessionState) {
|
|
15
16
|
const origin = req.headers.get(GUI_PAIR_BROWSER_ORIGIN_HEADER) ?? "";
|
|
17
|
+
const desktop = new URL(req.url).pathname === DESKTOP_GUI_PAIR_PATH;
|
|
18
|
+
if (desktop && (hasDesktopForwardingHeaders(req) || desktopGuiOrigin(config, origin) !== origin)) throw new GuiPairingIntentRequiredError();
|
|
16
19
|
if (config.runtimeRole !== "hub") {
|
|
17
|
-
if (standaloneGuiPairingOrigin(config) !== origin
|
|
20
|
+
if ((desktop ? desktopGuiOrigin(config, origin) : standaloneGuiPairingOrigin(config)) !== origin
|
|
18
21
|
|| !consumeGuiPairIntent(req.headers.get(GUI_PAIR_CAPABILITY_HEADER), req.headers.get(GUI_PAIR_INTENT_HEADER))) {
|
|
19
22
|
throw new GuiPairingIntentRequiredError();
|
|
20
23
|
}
|
|
21
24
|
}
|
|
22
|
-
return createGuiPairingGrant(origin, config, state);
|
|
25
|
+
return createGuiPairingGrant(origin, config, state, Date.now(), desktop);
|
|
23
26
|
}
|
|
@@ -2,6 +2,7 @@ import { createHash, randomBytes, timingSafeEqual } from "node:crypto";
|
|
|
2
2
|
import type { OcxConfig } from "../types";
|
|
3
3
|
import { canonicalGuiBrowserOrigin, standaloneGuiPairingOrigin } from "../lib/gui-pair-capability";
|
|
4
4
|
import { authorizationCredential } from "../lib/authorization-scheme";
|
|
5
|
+
import { desktopGuiBinding, desktopGuiOrigin } from "../lib/desktop-gui-origin";
|
|
5
6
|
import {
|
|
6
7
|
isAllowedManagementOrigin,
|
|
7
8
|
isApiAuthRequired,
|
|
@@ -38,6 +39,9 @@ export interface GuiPairingGrantRecord {
|
|
|
38
39
|
expiresAt: number;
|
|
39
40
|
failedAttempts?: number;
|
|
40
41
|
localPairing?: true;
|
|
42
|
+
/** Only the signed Desktop route may create this process-local purpose. */
|
|
43
|
+
desktopPurpose?: true;
|
|
44
|
+
desktopBinding?: string;
|
|
41
45
|
}
|
|
42
46
|
|
|
43
47
|
export interface PairingAttemptContext {
|
|
@@ -265,9 +269,10 @@ export function createGuiPairingGrant(
|
|
|
265
269
|
config: OcxConfig,
|
|
266
270
|
state: GuiSessionState,
|
|
267
271
|
now = Date.now(),
|
|
272
|
+
desktopPurpose = false,
|
|
268
273
|
): { grant: string; browserOrigin: string; serverOrigin: string; expiresAt: number } {
|
|
269
274
|
const canonicalBrowserOrigin = canonicalGuiBrowserOrigin(browserOrigin);
|
|
270
|
-
const localOrigin = standaloneGuiPairingOrigin(config);
|
|
275
|
+
const localOrigin = desktopPurpose ? desktopGuiOrigin(config, browserOrigin) : standaloneGuiPairingOrigin(config);
|
|
271
276
|
const localPairing = localOrigin !== null && canonicalBrowserOrigin === localOrigin;
|
|
272
277
|
const serverOrigin = config.runtimeRole === "hub"
|
|
273
278
|
? canonicalHttpOrigin(config.hub?.managementPublicOrigin) : localOrigin;
|
|
@@ -275,6 +280,7 @@ export function createGuiPairingGrant(
|
|
|
275
280
|
!canonicalBrowserOrigin
|
|
276
281
|
|| canonicalBrowserOrigin !== browserOrigin
|
|
277
282
|
|| !serverOrigin
|
|
283
|
+
|| (desktopPurpose && !localPairing)
|
|
278
284
|
|| (config.runtimeRole === "hub"
|
|
279
285
|
? !isRemoteGuiBrowserOriginAllowed(canonicalBrowserOrigin, config) : !localPairing)
|
|
280
286
|
) throw new TypeError("remote GUI origin is not allowed");
|
|
@@ -289,6 +295,7 @@ export function createGuiPairingGrant(
|
|
|
289
295
|
} while (state.pairingGrants.has(digest));
|
|
290
296
|
const expiresAt = now + GUI_PAIRING_GRANT_TTL_MS;
|
|
291
297
|
state.pairingGrants.set(digest, { browserOrigin: canonicalBrowserOrigin, serverOrigin, expiresAt,
|
|
298
|
+
...(desktopPurpose ? { desktopPurpose: true as const, desktopBinding: desktopGuiBinding(config) } : {}),
|
|
292
299
|
...(localPairing ? { localPairing: true as const } : {}) });
|
|
293
300
|
return { grant, browserOrigin: canonicalBrowserOrigin, serverOrigin, expiresAt };
|
|
294
301
|
}
|
|
@@ -368,6 +375,8 @@ export function consumeGuiPairingGrant(
|
|
|
368
375
|
return attemptContext && !source.allowed ? source : null;
|
|
369
376
|
}
|
|
370
377
|
const [digest, record] = found;
|
|
378
|
+
// A Desktop grant adds only its own scope to an existing session, never ordinary pairing.
|
|
379
|
+
if (record.desktopPurpose) return null;
|
|
371
380
|
// A live role/config change must not turn a hub grant into local operator consent, or vice versa.
|
|
372
381
|
if (record.localPairing ? !localOrigin || record.serverOrigin !== localOrigin
|
|
373
382
|
: config.runtimeRole !== "hub") return null;
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import {
|
|
2
|
+
compressedBodyDecodeLimit,
|
|
2
3
|
MAX_DECOMPRESSED_BODY_BYTES,
|
|
3
4
|
resolveInboundBodyLimitBytes,
|
|
4
5
|
} from "./request-decompress";
|
|
@@ -133,9 +134,19 @@ function retainUntilResponseSettles(response: Response, signal: AbortSignal, rel
|
|
|
133
134
|
return wrapped;
|
|
134
135
|
}
|
|
135
136
|
|
|
137
|
+
/** A body that will be decoded: any Content-Encoding other than identity. */
|
|
138
|
+
function encodedBody(req: Request): boolean {
|
|
139
|
+
const encoding = req.headers.get("content-encoding")?.trim().toLowerCase();
|
|
140
|
+
return encoding !== undefined && encoding !== "" && encoding !== "identity";
|
|
141
|
+
}
|
|
142
|
+
|
|
136
143
|
/**
|
|
137
|
-
* Own one raised-limit HTTP request from before body reading through response
|
|
138
|
-
* EOF/error or settled cancellation.
|
|
144
|
+
* Own one raised-limit or encoded HTTP request from before body reading through response
|
|
145
|
+
* EOF/error or settled cancellation. An encoded body joins the shared budget at every limit
|
|
146
|
+
* (#3023): it reserves what it may decode to (`compressedBodyDecodeLimit` of its declared wire
|
|
147
|
+
* bytes, or the whole limit without a declaration) before a byte is read, and the reader shrinks
|
|
148
|
+
* that to the measured size, so the decoded bodies held at once stay within the budget however
|
|
149
|
+
* small their wire bytes are. An identity body at the default limit is not gated, as before. Call only at the admitted HTTP boundary,
|
|
139
150
|
* after auth/origin checks, not from readers or internal combo/translation hops.
|
|
140
151
|
* pathname is the same canonical pathname used by the server's dispatcher.
|
|
141
152
|
* The optional budget/wait override isolates lifecycle tests from the process-wide owner.
|
|
@@ -151,8 +162,9 @@ export async function withRaisedInboundBodyAdmission(
|
|
|
151
162
|
const maxBytes = resolveInboundBodyLimitBytes(configuredLimit);
|
|
152
163
|
// Native Ollama generation routes are served only on the authenticated listener, so they sit in
|
|
153
164
|
// their own set: the loopback oracle checks CONFIGURABLE_JSON_BODY_ROUTES against that allowlist.
|
|
165
|
+
const raised = maxBytes > MAX_DECOMPRESSED_BODY_BYTES;
|
|
154
166
|
if (req.method !== "POST" || !(CONFIGURABLE_JSON_BODY_ROUTES.has(pathname) || OLLAMA_JSON_BODY_ROUTES.has(pathname))
|
|
155
|
-
||
|
|
167
|
+
|| !(raised || encodedBody(req)) || req.signal.aborted) {
|
|
156
168
|
return work();
|
|
157
169
|
}
|
|
158
170
|
const declared = req.headers.get("content-length");
|
|
@@ -162,9 +174,10 @@ export async function withRaisedInboundBodyAdmission(
|
|
|
162
174
|
// protocol-specific 413 win over temporary capacity refusal, unchanged.
|
|
163
175
|
return work();
|
|
164
176
|
}
|
|
177
|
+
const reservation = raised || !Number.isFinite(declaredBytes) ? maxBytes : compressedBodyDecodeLimit(declaredBytes, maxBytes);
|
|
165
178
|
let lease;
|
|
166
179
|
try {
|
|
167
|
-
lease = await (options?.budget ?? inboundBodyBudget).acquire(
|
|
180
|
+
lease = await (options?.budget ?? inboundBodyBudget).acquire(reservation, req.signal, options?.maxWaitMs);
|
|
168
181
|
} catch (error) {
|
|
169
182
|
cancelUnreadBody(req, error);
|
|
170
183
|
if (options?.onAdmissionError) return options.onAdmissionError(error);
|
|
@@ -1,7 +1,20 @@
|
|
|
1
1
|
import { createLinkRelaySessions, type LinkCatalogServed } from "./link-relay-sessions";
|
|
2
2
|
import { createLinkPeerObservations, type LinkPeerEntry } from "../../link/peer-report";
|
|
3
3
|
import { createLinkActivity, type LinkActivitySnapshot } from "../../link/child-activity";
|
|
4
|
-
import type { Server } from "bun";
|
|
4
|
+
import type { Server, WebSocketHandler } from "bun";
|
|
5
|
+
import type { RequestPolicyView } from "../auth-cors";
|
|
6
|
+
import type { WsData } from "../ws-bridge";
|
|
7
|
+
import { createLinkWebsocketGate, linkLogRefs, marksResent, upstreamCompleted, type LinkWebsocketGateDeps } from "./link-websocket";
|
|
8
|
+
import type { StoredMark } from "../../link/ws-activity-holds";
|
|
9
|
+
import { LINK_TURN_HEADER, registerLinkTurnToken, releaseLinkTurnToken } from "../link-turn";
|
|
10
|
+
import { LINK_WS_LIMITS, linkWebsocketTransportReady } from "./link-websocket-limits";
|
|
11
|
+
import { createActivityHolds, type ClearHoldsResult, type LinkHoldsSummary } from "../../link/ws-activity-holds";
|
|
12
|
+
import type { LinkWsCounters } from "../../link/status-projection";
|
|
13
|
+
import { resultKeysOf } from "../../codex/websocket-activity";
|
|
14
|
+
import { dirname } from "node:path";
|
|
15
|
+
import { createLinkTrafficBook, type LinkTrafficCounters } from "../../link/traffic";
|
|
16
|
+
import { buildPeerFeatures } from "../../remote/features";
|
|
17
|
+
import { decodeRequestBody } from "../request-decompress";
|
|
5
18
|
import {
|
|
6
19
|
emptyLinkStore,
|
|
7
20
|
readLinkStore,
|
|
@@ -12,6 +25,7 @@ import { linkStorePath } from "../../link/paths";
|
|
|
12
25
|
import { linkRouteAllowed } from "../../link/routes";
|
|
13
26
|
import { withConfigMutationLockSync } from "../../config/mutation-lock";
|
|
14
27
|
import { registerFallbackLinkResolver } from "../../routing/fallback-policy";
|
|
28
|
+
import { captureChildRouteDefaults } from "../../routing/home-route-intent";
|
|
15
29
|
|
|
16
30
|
export const LINK_INGRESS_HOSTNAME = "opencodex-link.invalid";
|
|
17
31
|
|
|
@@ -29,6 +43,16 @@ export interface LinkListenerStartContext<T> {
|
|
|
29
43
|
keyFingerprints?: (apiKeyId: string) => readonly string[];
|
|
30
44
|
/** The Home supervisor's current tunnel connection for a link (relay-auth.ts). */
|
|
31
45
|
connectionGeneration?: (linkId: string) => string | undefined;
|
|
46
|
+
/** The Responses WebSocket over the link (link-websocket.ts); route fakes omit it. */
|
|
47
|
+
responsesWebsocket?: {
|
|
48
|
+
/** The shared Responses handler the public listener uses; link sockets wrap it. */
|
|
49
|
+
handler: WebSocketHandler<WsData>;
|
|
50
|
+
/** linkResponsesWebsocketEnabled on the live config. */
|
|
51
|
+
enabled(): boolean;
|
|
52
|
+
policy(): RequestPolicyView;
|
|
53
|
+
};
|
|
54
|
+
/** The features named on every relay-auth answer; this build's served features when absent. */
|
|
55
|
+
homeFeatures?: () => readonly string[];
|
|
32
56
|
}
|
|
33
57
|
|
|
34
58
|
export interface LinkListenerDeps {
|
|
@@ -37,6 +61,12 @@ export interface LinkListenerDeps {
|
|
|
37
61
|
writeStore?: (path: string, store: LinkStore) => void;
|
|
38
62
|
serve?: (options: Parameters<typeof Bun.serve>[0]) => Server<unknown>;
|
|
39
63
|
warn?: (message: string) => void;
|
|
64
|
+
/** Freezes every default Children inherit (native switches and file ownership) before this listener can serve route intent. */
|
|
65
|
+
captureRouteDefaults?: () => void;
|
|
66
|
+
/** Delay before retry `attempt` (0-based) of a failed capture; tests shorten it. */
|
|
67
|
+
captureRetryDelayMs?: (attempt: number) => number;
|
|
68
|
+
/** Test seams for the link WebSocket gate: limits, timers, socket reservation, drain state. */
|
|
69
|
+
websocket?: Pick<LinkWebsocketGateDeps, "limits" | "timers" | "reserveSocket" | "draining">;
|
|
40
70
|
}
|
|
41
71
|
|
|
42
72
|
export type LinkListenerStatus = {
|
|
@@ -54,12 +84,25 @@ export interface LinkListenerLifecycle<T> {
|
|
|
54
84
|
start(ctx: LinkListenerStartContext<T>): void;
|
|
55
85
|
ensureStarted(): Promise<void>;
|
|
56
86
|
linkAdmissionKeyIds(): ReadonlySet<string>;
|
|
57
|
-
|
|
58
|
-
|
|
87
|
+
/** A key-admitted catalog request; routeProofId is a multi-route readiness proof it carried (src/link/route-proof.ts). */
|
|
88
|
+
onAuthenticatedCatalog(listener: (apiKeyId: string, routeProofId?: string) => void): () => void;
|
|
89
|
+
notifyAuthenticatedCatalog(apiKeyId: string, routeProofId?: string): void;
|
|
59
90
|
/** What this Home last learned of a Child over the link; empty until it relays a request. */
|
|
60
91
|
peerObservation(linkId: string): LinkPeerEntry;
|
|
61
92
|
/** Relayed model traffic for one link (D5); legacy key admissions count against every link. */
|
|
62
93
|
linkActivity(linkId: string, now: number): LinkActivitySnapshot;
|
|
94
|
+
/** The Home's own revoke path closes this link's WebSockets (4401) in the same task. */
|
|
95
|
+
closeLinkSockets(linkId: string): number;
|
|
96
|
+
/** Design 9.3: the link's live WebSocket counters (display only, reset at restart). */
|
|
97
|
+
linkTransport(linkId: string): LinkWsCounters;
|
|
98
|
+
/** The link's WebSocket activity holds and their reasons; null when nothing holds it (D8). */
|
|
99
|
+
linkHolds(linkId: string): LinkHoldsSummary | null;
|
|
100
|
+
/** The operator's clear of one link's activity holds (D8); never called automatically. */
|
|
101
|
+
clearLinkHolds(linkId: string): ClearHoldsResult;
|
|
102
|
+
/** Resolves once relayed requests already seen have been checked against activity holds. */
|
|
103
|
+
activityHoldsSettled(): Promise<void>;
|
|
104
|
+
/** Body bytes each link carried since this lifecycle started (#3023); zeros before any traffic. */
|
|
105
|
+
linkTraffic(linkId: string): LinkTrafficCounters;
|
|
63
106
|
/** A Child read a whole 200 `GET /v1/catalog` body through the relay. */
|
|
64
107
|
onCatalogServed(listener: (served: LinkCatalogServed) => void): () => void;
|
|
65
108
|
status(): LinkListenerStatus;
|
|
@@ -85,12 +128,24 @@ export function createLinkListenerLifecycle<T>(deps: LinkListenerDeps = {}): Lin
|
|
|
85
128
|
let ensureFlight: Promise<void> | undefined;
|
|
86
129
|
let closeFlight: Promise<void> | undefined;
|
|
87
130
|
let stopped = false;
|
|
88
|
-
const authenticatedCatalogListeners = new Set<(apiKeyId: string) => void>();
|
|
131
|
+
const authenticatedCatalogListeners = new Set<(apiKeyId: string, routeProofId?: string) => void>();
|
|
89
132
|
const catalogServedListeners = new Set<(served: LinkCatalogServed) => void>();
|
|
90
133
|
let lifecycleStatus: LinkListenerStatus = { state: "off", port: null, reason: null };
|
|
91
134
|
const peers = createLinkPeerObservations();
|
|
92
135
|
// Lifecycle-owned so a rebind keeps the book.
|
|
93
|
-
|
|
136
|
+
// Durable link WebSocket holds (design T4 section 5) live beside links.json. Nothing is read or
|
|
137
|
+
// written unless a crash fence exists or a link upgrade arms one.
|
|
138
|
+
const holds = createActivityHolds({
|
|
139
|
+
dir: dirname(storePath),
|
|
140
|
+
limits: LINK_WS_LIMITS,
|
|
141
|
+
// null, not []: an unreadable store must not let crash evidence be cleaned without its links.
|
|
142
|
+
linkIds: () => { try { return readStore(storePath).links.map(link => link.id); } catch { return null; } },
|
|
143
|
+
});
|
|
144
|
+
holds.start();
|
|
145
|
+
const activity = createLinkActivity({ held: linkId => holds.count(linkId) });
|
|
146
|
+
// Relayed requests being checked against holds; tests and shutdown can wait for them.
|
|
147
|
+
const holdObservations = new Set<Promise<void>>();
|
|
148
|
+
const traffic = createLinkTrafficBook("content-length");
|
|
94
149
|
|
|
95
150
|
const setStatus = (state: LinkListenerStatus["state"], port: number | null, reason: string | null): void => {
|
|
96
151
|
lifecycleStatus = { state, port, reason };
|
|
@@ -104,10 +159,55 @@ export function createLinkListenerLifecycle<T>(deps: LinkListenerDeps = {}): Lin
|
|
|
104
159
|
const readStoreForAdmission = (): LinkStore => {
|
|
105
160
|
try { return readStore(storePath); } catch { return emptyLinkStore(); }
|
|
106
161
|
};
|
|
162
|
+
// The one fingerprint predicate: relay-auth verification, session consumption, and the link
|
|
163
|
+
// WebSocket's per-frame authorization check all read links.json uncached through it.
|
|
164
|
+
const fingerprintsFor = (keyId: string, linkId: string): readonly string[] => {
|
|
165
|
+
if (!readStoreForAdmission().links.some(link => link.id === linkId && link.apiKeyId === keyId)) return [];
|
|
166
|
+
return startContext?.keyFingerprints?.(keyId) ?? [];
|
|
167
|
+
};
|
|
168
|
+
// The release gate comes first: until the bounded pump lands, the switch admits nothing.
|
|
169
|
+
const websocketEnabled = (): boolean => linkWebsocketTransportReady() && startContext?.responsesWebsocket?.enabled() === true;
|
|
170
|
+
const websocketGate = createLinkWebsocketGate({
|
|
171
|
+
...deps.websocket,
|
|
172
|
+
// The same lifecycle-owned book relayed HTTP turns count in, so restart gates see link sockets.
|
|
173
|
+
activity,
|
|
174
|
+
holds,
|
|
175
|
+
// The same per-link traffic book as the relayed HTTP requests: a link socket is one request in it.
|
|
176
|
+
traffic,
|
|
177
|
+
enabled: websocketEnabled,
|
|
178
|
+
policy: () => startContext!.responsesWebsocket!.policy(),
|
|
179
|
+
authorized: identity => fingerprintsFor(identity.keyId, identity.linkId).includes(identity.fingerprint),
|
|
180
|
+
});
|
|
107
181
|
// OCX-11: the fallback policy resolves a link data key to its link id through this slot.
|
|
108
182
|
const releaseFallbackLinkResolver = registerFallbackLinkResolver(keyId =>
|
|
109
183
|
readStoreForAdmission().links.find(link => link.apiKeyId === keyId)?.id);
|
|
110
184
|
|
|
185
|
+
// Children read route intent through this listener, and that read is pure: it never captures.
|
|
186
|
+
// So a failed capture (a busy config lock, a damaged route-intent.json, unresolved Aside
|
|
187
|
+
// ownership) is owed and retried with backoff until it succeeds, the listener closes or stops,
|
|
188
|
+
// and again on every ensureStarted. Meanwhile every Home-only writer still captures first.
|
|
189
|
+
let routeDefaultsOwed = false;
|
|
190
|
+
let captureAttempt = 0;
|
|
191
|
+
let captureRetry: ReturnType<typeof setTimeout> | undefined;
|
|
192
|
+
const retryDelay = deps.captureRetryDelayMs ?? (attempt => Math.min(1_000 * 2 ** attempt, 300_000));
|
|
193
|
+
const captureRouteDefaults = (): void => {
|
|
194
|
+
if (captureRetry) { clearTimeout(captureRetry); captureRetry = undefined; }
|
|
195
|
+
try {
|
|
196
|
+
(deps.captureRouteDefaults ?? captureChildRouteDefaults)();
|
|
197
|
+
routeDefaultsOwed = false;
|
|
198
|
+
captureAttempt = 0;
|
|
199
|
+
} catch (error) {
|
|
200
|
+
if (!routeDefaultsOwed) warn(`⚠ Child route defaults were not captured; retrying: ${error instanceof Error ? error.message : String(error)}`);
|
|
201
|
+
routeDefaultsOwed = true;
|
|
202
|
+
if (stopped) return;
|
|
203
|
+
captureRetry = setTimeout(() => {
|
|
204
|
+
captureRetry = undefined;
|
|
205
|
+
if (!stopped && routeDefaultsOwed) captureRouteDefaults();
|
|
206
|
+
}, retryDelay(captureAttempt++));
|
|
207
|
+
(captureRetry as { unref?: () => void }).unref?.();
|
|
208
|
+
}
|
|
209
|
+
};
|
|
210
|
+
|
|
111
211
|
const bindIfNeeded = (): void => {
|
|
112
212
|
if (stopped || listener || !startContext) return;
|
|
113
213
|
let store: LinkStore;
|
|
@@ -121,12 +221,75 @@ export function createLinkListenerLifecycle<T>(deps: LinkListenerDeps = {}): Lin
|
|
|
121
221
|
setStatus("off", null, null);
|
|
122
222
|
return;
|
|
123
223
|
}
|
|
224
|
+
// Capture the Children's defaults from the Home's switches and integrations as they stand at
|
|
225
|
+
// startup, before any Home-only command can move one. A failure leaves the listener up and is
|
|
226
|
+
// retried (see above).
|
|
227
|
+
captureRouteDefaults();
|
|
124
228
|
const requestedPort = store.listenerPort ?? 0;
|
|
125
|
-
const
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
229
|
+
const linkWebsocket = startContext.responsesWebsocket;
|
|
230
|
+
// The resolved inbound limit (index.ts resolves maxInboundBodyBytes), fixed at bind like the public listener's. The
|
|
231
|
+
// handler re-resolves the live config per request, so after a live raise without a restart a coded body between the
|
|
232
|
+
// two limits is accepted but releases no hold until the next bind: the safe direction (the link stays in flight).
|
|
233
|
+
const inboundLimit = startContext.maxRequestBodySize;
|
|
234
|
+
const sessions = createLinkRelaySessions({ peers, activity, traffic, homeFeatures: () => startContext?.homeFeatures?.() ?? buildPeerFeatures(), connectionGeneration: linkId => startContext?.connectionGeneration?.(linkId),
|
|
235
|
+
catalogServed: served => { for (const listener of catalogServedListeners) listener(served); }, fingerprints: fingerprintsFor,
|
|
236
|
+
...(linkWebsocket ? { upgrade: websocketGate.upgrade, websocketAdvertised: websocketEnabled } : {}),
|
|
237
|
+
observeResponsesRequest: (linkId, req) => {
|
|
238
|
+
const header = req.headers.get("thread-id");
|
|
239
|
+
const threadHashOf = (body: unknown): string | null => {
|
|
240
|
+
const record = body && typeof body === "object" ? body as Record<string, unknown> : {};
|
|
241
|
+
const metadata = record.client_metadata as Record<string, unknown> | undefined;
|
|
242
|
+
const threadId = header || (metadata && typeof metadata.thread_id === "string" ? metadata.thread_id : "");
|
|
243
|
+
try { return threadId ? holds.threadHash(threadId) : null; } catch { return null; }
|
|
244
|
+
};
|
|
245
|
+
// Every relayed turn reads its upstream only as its client drains (#8601, owner decision 2026-11-16), so a stalled
|
|
246
|
+
// Child reader holds about one upstream chunk on this Home whether or not the link WebSocket feature is on. Running
|
|
247
|
+
// marks, and while the feature is on the request-log fields of design 9.1, ride the same observer: the pipeline
|
|
248
|
+
// reports this request's expanded input and its terminal (src/server/link-turn.ts), through a token header it
|
|
249
|
+
// removes before anything is forwarded. With the feature off and no marks the observer only asks for paced reads.
|
|
250
|
+
let token: string | null = null;
|
|
251
|
+
const logging = websocketEnabled();
|
|
252
|
+
const tracksMarks = logging || holds.hasMarks(linkId);
|
|
253
|
+
let resent: StoredMark[] = [];
|
|
254
|
+
let threadHash: string | null = null;
|
|
255
|
+
token = registerLinkTurnToken({
|
|
256
|
+
pacedReads: true,
|
|
257
|
+
expanded(body, chain) {
|
|
258
|
+
if (!tracksMarks) return;
|
|
259
|
+
threadHash = threadHashOf(body);
|
|
260
|
+
resent = chain === "unexpanded" ? [] : marksResent(holds, linkId, threadHash, body);
|
|
261
|
+
},
|
|
262
|
+
expansionFailed() { resent = []; },
|
|
263
|
+
terminal(status, source) { if (resent.length && threadHash && upstreamCompleted(status, source)) holds.releaseMarks(linkId, threadHash, resent); },
|
|
264
|
+
...(logging ? { logFields: (body: unknown) => ({ transport: "http" as const, first: false, ...linkLogRefs(holds, linkId, header?.trim() ?? "", body) }) } : {}),
|
|
265
|
+
});
|
|
266
|
+
try { req.headers.set(LINK_TURN_HEADER, token); } catch { releaseLinkTurnToken(token); token = null; }
|
|
267
|
+
// Pending result keys: only a link with a releasable hold pays for reading a copy of the body. The
|
|
268
|
+
// request settles only holds that exist now, as it begins (a later hold may reuse an id).
|
|
269
|
+
let decide: ((accepted: boolean) => void) | undefined;
|
|
270
|
+
const beganAt = holds.sequence();
|
|
271
|
+
if (holds.releasable(linkId)) {
|
|
272
|
+
const decision = new Promise<boolean>(resolve => { decide = resolve; });
|
|
273
|
+
// The copy is read and decoded only after the handler accepted the request; a refusal, the inbound budget's 503
|
|
274
|
+
// included, cancels it unread (#8608). A Child may send the body coded (#8594); the copy is decoded through the
|
|
275
|
+
// handlers' bounded reader under the same resolved inbound limit, and a body that does not decode releases nothing.
|
|
276
|
+
const encoding = req.headers.get("content-encoding");
|
|
277
|
+
const copy = req.clone();
|
|
278
|
+
const observation = decision.then(async accepted => {
|
|
279
|
+
// Never awaited: a tee's cancel waits for the other half, which a refusal may leave unread.
|
|
280
|
+
if (!accepted) { void copy.body?.cancel().catch(() => {}); return; }
|
|
281
|
+
const raw = new Uint8Array(await copy.arrayBuffer());
|
|
282
|
+
const body = JSON.parse(new TextDecoder().decode(decodeRequestBody(raw, encoding, inboundLimit))) as unknown;
|
|
283
|
+
if (!body || typeof body !== "object") return;
|
|
284
|
+
holds.observe(linkId, threadHashOf(body), resultKeysOf((body as Record<string, unknown>).input), beganAt);
|
|
285
|
+
}).catch(() => {}).finally(() => { holdObservations.delete(observation); });
|
|
286
|
+
holdObservations.add(observation);
|
|
287
|
+
}
|
|
288
|
+
if (token === null && !decide) return;
|
|
289
|
+
// Preparation claimed the token before the handler answered; dropping it again is a no-op,
|
|
290
|
+
// and it keeps a request that never reached preparation from leaving one behind.
|
|
291
|
+
return (accepted: boolean) => { if (token !== null) releaseLinkTurnToken(token); decide?.(accepted); };
|
|
292
|
+
} });
|
|
130
293
|
let bound: Server<unknown>;
|
|
131
294
|
try {
|
|
132
295
|
bound = serve({
|
|
@@ -137,6 +300,8 @@ export function createLinkListenerLifecycle<T>(deps: LinkListenerDeps = {}): Lin
|
|
|
137
300
|
idleTimeout: 255,
|
|
138
301
|
maxRequestBodySize: startContext.maxRequestBodySize,
|
|
139
302
|
fetch: (req: Request, server: Server<unknown>) => sessions.dispatch(req, server as Server<T>, startContext!.dispatch),
|
|
303
|
+
// Only a verified link upgrade with the feature on ever reaches server.upgrade (link-websocket.ts).
|
|
304
|
+
...(linkWebsocket ? { websocket: websocketGate.handler(linkWebsocket.handler) } : {}),
|
|
140
305
|
} as Parameters<typeof Bun.serve>[0]);
|
|
141
306
|
} catch (error) {
|
|
142
307
|
reportFailure("bind", error, "bind");
|
|
@@ -176,6 +341,7 @@ export function createLinkListenerLifecycle<T>(deps: LinkListenerDeps = {}): Lin
|
|
|
176
341
|
}
|
|
177
342
|
listener = bound as Server<T>;
|
|
178
343
|
relaySessions = sessions;
|
|
344
|
+
websocketGate.accept();
|
|
179
345
|
setStatus("listening", bound.port ?? (requestedPort > 0 ? requestedPort : null), null);
|
|
180
346
|
};
|
|
181
347
|
|
|
@@ -185,6 +351,8 @@ export function createLinkListenerLifecycle<T>(deps: LinkListenerDeps = {}): Lin
|
|
|
185
351
|
const flight = (async () => {
|
|
186
352
|
if (closeFlight) await closeFlight;
|
|
187
353
|
if (stopped) return;
|
|
354
|
+
// An unbound listener captures in bindIfNeeded; a bound one retries an owed capture here.
|
|
355
|
+
if (routeDefaultsOwed && listener) captureRouteDefaults();
|
|
188
356
|
bindIfNeeded();
|
|
189
357
|
})();
|
|
190
358
|
ensureFlight = flight.finally(() => {
|
|
@@ -196,12 +364,17 @@ export function createLinkListenerLifecycle<T>(deps: LinkListenerDeps = {}): Lin
|
|
|
196
364
|
|
|
197
365
|
const close = (): Promise<void> => {
|
|
198
366
|
if (closeFlight) return closeFlight;
|
|
367
|
+
// No link is left to protect: an owed capture is retried at the next bind, not on a timer.
|
|
368
|
+
if (captureRetry) { clearTimeout(captureRetry); captureRetry = undefined; }
|
|
369
|
+
captureAttempt = 0;
|
|
199
370
|
const flight = (async () => {
|
|
200
371
|
if (ensureFlight) await ensureFlight;
|
|
201
372
|
const current = listener;
|
|
202
373
|
// Retain the bound port AND ingress ownership while an authenticated connection is
|
|
203
374
|
// reserved or a dispatched response is still being consumed. No new proofs are issued.
|
|
204
375
|
if (current) {
|
|
376
|
+
// A link WebSocket holds its session lease until its close callback; close them first.
|
|
377
|
+
websocketGate.closeAll();
|
|
205
378
|
await relaySessions?.drain();
|
|
206
379
|
await current.stop(false);
|
|
207
380
|
}
|
|
@@ -230,11 +403,18 @@ export function createLinkListenerLifecycle<T>(deps: LinkListenerDeps = {}): Lin
|
|
|
230
403
|
authenticatedCatalogListeners.add(listener);
|
|
231
404
|
return () => { authenticatedCatalogListeners.delete(listener); };
|
|
232
405
|
},
|
|
233
|
-
notifyAuthenticatedCatalog(apiKeyId) {
|
|
234
|
-
for (const listener of authenticatedCatalogListeners) listener(apiKeyId);
|
|
406
|
+
notifyAuthenticatedCatalog(apiKeyId, routeProofId) {
|
|
407
|
+
for (const listener of authenticatedCatalogListeners) listener(apiKeyId, routeProofId);
|
|
235
408
|
},
|
|
236
409
|
peerObservation: linkId => peers.get(linkId),
|
|
237
410
|
linkActivity: (linkId, now) => activity.snapshot(linkId, now),
|
|
411
|
+
// Only the Home's link removal calls this: the link's sockets close and its holds go with it.
|
|
412
|
+
closeLinkSockets: linkId => { const closed = websocketGate.closeLink(linkId); holds.removeLink(linkId); websocketGate.forgetTransport(linkId); return closed; },
|
|
413
|
+
linkTransport: linkId => websocketGate.transport(linkId),
|
|
414
|
+
linkHolds: linkId => holds.summary(linkId),
|
|
415
|
+
clearLinkHolds: linkId => holds.clear(linkId),
|
|
416
|
+
async activityHoldsSettled() { await Promise.all([...holdObservations]); },
|
|
417
|
+
linkTraffic: linkId => traffic.snapshot(linkId),
|
|
238
418
|
onCatalogServed(listener) {
|
|
239
419
|
catalogServedListeners.add(listener);
|
|
240
420
|
return () => { catalogServedListeners.delete(listener); };
|
|
@@ -245,12 +425,16 @@ export function createLinkListenerLifecycle<T>(deps: LinkListenerDeps = {}): Lin
|
|
|
245
425
|
close,
|
|
246
426
|
async stop() {
|
|
247
427
|
stopped = true;
|
|
428
|
+
if (captureRetry) { clearTimeout(captureRetry); captureRetry = undefined; }
|
|
248
429
|
releaseFallbackLinkResolver();
|
|
249
430
|
// Process shutdown is deliberately forceful, unlike last-link removal. Every
|
|
250
431
|
// authenticated socket is closed, and the client transport cannot reconnect it.
|
|
251
432
|
relaySessions?.abortReservations();
|
|
252
433
|
if (listener) await listener.stop(true);
|
|
253
434
|
await close();
|
|
435
|
+
websocketGate.dispose();
|
|
436
|
+
// Sockets are closed and their holds recorded; persist them, then mark the fence clean.
|
|
437
|
+
holds.stop();
|
|
254
438
|
startContext = undefined;
|
|
255
439
|
setStatus("off", null, null);
|
|
256
440
|
},
|