@bitkyc08/opencodex 2.100.1 → 2.100.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/bin/ocx.mjs +32 -18
- package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
- package/gui/dist/assets/App-Dnb6VMsP.js +59 -0
- package/gui/dist/assets/Tray-BV4ms9U9.js +1 -0
- package/gui/dist/assets/{brand-mark-nr3ziR-T.js → brand-mark-XOLJbomA.js} +1 -1
- package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
- package/gui/dist/assets/index-DQtCRNAw.css +2 -0
- package/gui/dist/assets/{segment-thumb-features-DKCVUUTi.js → segment-thumb-features-DXSidY6D.js} +1 -1
- package/gui/dist/classic/assets/App-DA-scMPq.js +58 -0
- package/gui/dist/classic/assets/{Tray-BedmOsE7.js → Tray-BrHaVRAq.js} +1 -1
- package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
- package/gui/dist/classic/assets/quota-summary-Dy5_wfTT.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.toml +9 -0
- package/native/ocx-child/src/cli.rs +402 -20
- package/native/ocx-child/src/codex_home.rs +98 -14
- package/native/ocx-child/src/daemon.rs +2 -1
- package/native/ocx-child/src/lib.rs +3 -0
- package/native/ocx-child/src/link_ws.rs +2598 -0
- package/native/ocx-child/src/link_ws_advert.rs +346 -0
- package/native/ocx-child/src/link_ws_frame.rs +749 -0
- package/native/ocx-child/src/parity.rs +5 -1
- package/native/ocx-child/src/platform.rs +152 -6
- package/native/ocx-child/src/relay.rs +150 -19
- package/package.json +3 -3
- package/src/adapters/anthropic/advisor-tool.ts +176 -0
- package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
- package/src/adapters/anthropic/client-identity.ts +3 -1
- package/src/adapters/anthropic/passthrough.ts +9 -3
- package/src/adapters/anthropic.ts +31 -14
- package/src/adapters/client-fingerprint.ts +6 -4
- package/src/adapters/cursor/discovery.ts +17 -0
- package/src/adapters/cursor/native-exec-desktop.ts +2 -1
- package/src/adapters/cursor/native-exec-shell.ts +2 -1
- package/src/adapters/cursor/native-exec.ts +3 -2
- package/src/adapters/cursor/protobuf-request.ts +8 -8
- package/src/adapters/cursor/tool-guidance.ts +3 -3
- package/src/adapters/cursor/tool-wording.ts +10 -1
- package/src/adapters/cursor.ts +7 -6
- package/src/adapters/devin/cloud-direct/tool-schema.ts +20 -2
- package/src/adapters/google-antigravity-wire.ts +15 -6
- package/src/adapters/google-truncation.ts +4 -2
- package/src/adapters/google-wire-compiler.ts +2 -2
- package/src/adapters/google.ts +17 -4
- package/src/adapters/kiro/payload.ts +7 -4
- package/src/adapters/kiro/reasoning.ts +44 -1
- package/src/adapters/kiro/structured-output.ts +10 -8
- package/src/adapters/kiro-tools.ts +61 -15
- package/src/adapters/openai-chat/destination-policy.ts +16 -0
- package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
- package/src/adapters/openai-chat/tool-schema.ts +9 -0
- package/src/adapters/openai-responses/tool-schema.ts +18 -4
- package/src/adapters/run-turn-queue.ts +139 -5
- package/src/adapters/upstream-http-error.ts +4 -2
- package/src/adapters/zed.ts +3 -0
- package/src/advisor/consult.ts +15 -4
- package/src/advisor/context.ts +12 -3
- package/src/advisor/runtime.ts +35 -5
- package/src/advisor/settings.ts +8 -0
- package/src/advisor/synthetic-tool.ts +21 -8
- package/src/bridge/response-json.ts +11 -2
- package/src/bridge/sse.ts +51 -9
- package/src/claude/auth-detect.ts +21 -33
- package/src/claude/chat-tool-dispatch.ts +233 -0
- package/src/claude/desktop-3p.ts +11 -5
- package/src/claude/desktop-gateway-state.ts +2 -0
- package/src/claude/desktop-remote-store-artifact.ts +14 -3
- package/src/claude/desktop-remote-store.ts +24 -4
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/inbound-tool-loading.ts +42 -17
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +23 -1
- package/src/cli/account-auth.ts +54 -21
- package/src/cli/account-extended.ts +60 -6
- package/src/cli/account-key-quota.ts +56 -7
- package/src/cli/account.ts +5 -3
- package/src/cli/advisor.ts +7 -4
- package/src/cli/alias.ts +38 -1
- package/src/cli/capabilities-access-remote.ts +137 -2
- package/src/cli/capabilities-accounts.ts +3 -3
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +43 -18
- package/src/cli/capabilities-integrations.ts +2 -2
- package/src/cli/capabilities-provider-models.ts +18 -2
- package/src/cli/capabilities-route-to.ts +43 -0
- package/src/cli/capabilities.ts +2 -0
- package/src/cli/capability-contracts.ts +1 -1
- package/src/cli/claude-desktop.ts +30 -11
- package/src/cli/claude.ts +36 -17
- package/src/cli/codex-launcher.ts +3 -1
- package/src/cli/codex-shim-autorestore.ts +5 -42
- package/src/cli/config-command.ts +38 -2
- package/src/cli/config-root-startup.ts +34 -0
- package/src/cli/connect.ts +124 -19
- package/src/cli/desktop-runtime-guidance.ts +1 -1
- package/src/cli/disconnect-runtime.ts +168 -0
- package/src/cli/dispatch.ts +54 -12
- package/src/cli/export-command.ts +1 -1
- package/src/cli/gui-pair-client.ts +29 -5
- package/src/cli/gui.ts +10 -5
- package/src/cli/help-catalog.ts +11 -0
- package/src/cli/help.ts +5 -4
- package/src/cli/hub.ts +18 -1
- package/src/cli/index.ts +83 -92
- package/src/cli/inspect.ts +11 -2
- package/src/cli/integrations.ts +26 -1
- package/src/cli/link-capture.ts +64 -0
- package/src/cli/link-child-ops.ts +314 -0
- package/src/cli/link-cleanup.ts +8 -5
- package/src/cli/link-diagnostics.ts +67 -0
- package/src/cli/link-enrollment.ts +158 -12
- package/src/cli/link-operations.ts +52 -0
- package/src/cli/link-recover.ts +152 -0
- package/src/cli/link-routes.ts +87 -0
- package/src/cli/link-status-child.ts +137 -0
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +327 -37
- package/src/cli/message-command.ts +1 -1
- package/src/cli/message-mcp-command.ts +23 -10
- package/src/cli/models-runtime.ts +3 -3
- package/src/cli/opencode.ts +3 -1
- package/src/cli/pi-sync.ts +35 -0
- package/src/cli/preflight-exemptions.ts +46 -0
- package/src/cli/registry.ts +29 -12
- package/src/cli/restart-failure.ts +5 -2
- package/src/cli/root.ts +5 -1
- package/src/cli/route-to.ts +172 -0
- package/src/cli/runtime-api.ts +5 -8
- package/src/cli/status.ts +3 -1
- package/src/cli/stop-approval.ts +66 -19
- package/src/cli/stop-report.ts +23 -0
- package/src/cli/stop-windows-checked.ts +304 -0
- package/src/cli/sync-command.ts +70 -13
- package/src/cli/sync-fanout.ts +81 -99
- package/src/cli/sync-flags.ts +40 -3
- package/src/cli/sync-link-status.ts +18 -2
- package/src/cli/sync-update-guard.ts +7 -2
- package/src/cli/system-restart-client.ts +3 -2
- package/src/cli/uninstall-plan.ts +77 -5
- package/src/cli/uninstall-stop.ts +152 -0
- package/src/cli/v2-input.ts +10 -6
- package/src/cli/v2-local-output.ts +3 -2
- package/src/cli/v2-runtime.ts +10 -3
- package/src/cli/v2.ts +22 -7
- package/src/client/connect.ts +321 -34
- package/src/client/link-home-features.ts +27 -0
- package/src/client/link-home.ts +92 -4
- package/src/client/link-ingress.ts +21 -3
- package/src/client/link-join.ts +12 -2
- package/src/client/link-parity-reporter.ts +60 -6
- package/src/client/link-readiness.ts +16 -6
- package/src/client/link-relay-transport.ts +161 -36
- package/src/client/link-relay.ts +150 -6
- package/src/client/link-request-compression.ts +84 -0
- package/src/client/link-state.ts +11 -5
- package/src/client/link-status.ts +39 -1
- package/src/client/link-teardown.ts +1 -0
- package/src/client/link-tunnel-status.ts +76 -0
- package/src/client/link-tunnel.ts +56 -5
- package/src/client/link-websocket-limits.ts +89 -0
- package/src/client/link-websocket.ts +586 -0
- package/src/client/link-ws-advertisement.ts +100 -0
- package/src/client/link-ws-framer.ts +241 -0
- package/src/client/link-ws-transport.ts +177 -0
- package/src/client/machine-api.ts +13 -2
- package/src/client/machine-listener.ts +48 -7
- package/src/client/route-intent-apply.ts +293 -0
- package/src/client/route-intent-file-originals.ts +97 -0
- package/src/client/route-intent-native-originals.ts +201 -0
- package/src/client/route-intent-watch.ts +141 -0
- package/src/client/runtime-restart.ts +127 -5
- package/src/client/runtime.ts +61 -15
- package/src/client/state.ts +30 -0
- package/src/client/sync-expectation.ts +36 -2
- package/src/client/sync-runtime.ts +7 -0
- package/src/clients/config-export/alias-selectors.ts +63 -40
- package/src/clients/config-export/contracts.ts +2 -0
- package/src/clients/config-export/nested-selectors.ts +42 -0
- package/src/clients/config-export.ts +36 -4
- package/src/codex/account-resume-health.ts +41 -0
- package/src/codex/account-store.ts +12 -3
- package/src/codex/account-usability.ts +13 -0
- package/src/codex/auth-api/account-list.ts +29 -3
- package/src/codex/auth-api/login-flow.ts +6 -0
- package/src/codex/auth-api/routes.ts +35 -2
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +21 -6
- package/src/codex/catalog/gather-capture.ts +10 -2
- package/src/codex/catalog/parsing.ts +7 -3
- package/src/codex/catalog/provider-models.ts +67 -23
- package/src/codex/catalog/retained-sync.ts +2 -1
- package/src/codex/catalog/routed-gather.ts +1 -1
- package/src/codex/catalog-auto-refresh.ts +11 -0
- package/src/codex/cli-update-job.ts +35 -13
- package/src/codex/convergence-types.ts +2 -0
- package/src/codex/convergence.ts +2 -2
- package/src/codex/desktop-compatibility/native-identity.ts +4 -8
- package/src/codex/features.ts +2 -2
- package/src/codex/history-provider.ts +31 -0
- package/src/codex/inject/multi-agent-v2.ts +9 -3
- package/src/codex/inject/paginated-openai-compat.ts +54 -1
- package/src/codex/inject/plan.ts +20 -2
- package/src/codex/inject.ts +2 -0
- package/src/codex/journal-config-restore.ts +217 -0
- package/src/codex/journal.ts +75 -6
- package/src/codex/main-account.ts +23 -30
- package/src/codex/native-main-auth-file.ts +104 -0
- package/src/codex/native-profile-manager.ts +4 -3
- package/src/codex/native-profile-store.ts +3 -61
- package/src/codex/orca-import.ts +10 -1
- package/src/codex/quota-history.ts +13 -0
- package/src/codex/quota-window-conflict.ts +103 -0
- package/src/codex/quota.ts +134 -7
- package/src/codex/subagent-model-fallback.ts +3 -1
- package/src/codex/websocket-activity.ts +171 -16
- package/src/codex/websocket-registry.ts +11 -4
- package/src/combos/cooldown-store.ts +228 -0
- package/src/combos/failover.ts +760 -35
- package/src/config/dashboard-trusted-proxy.ts +83 -0
- package/src/config/diagnostics.ts +28 -0
- package/src/config/feature-flags.ts +9 -0
- package/src/config/live-reconcile.ts +10 -1
- package/src/config/load-degrade.ts +12 -1
- package/src/config/multi-agent-surface.ts +28 -5
- package/src/config/pending-teardown.ts +60 -3
- package/src/config/process-state.ts +175 -4
- package/src/config/provider-validation.ts +4 -4
- package/src/config/salvage.ts +1 -0
- package/src/config/schema/config-schema.ts +12 -3
- package/src/config/schema/leaf-validators.ts +43 -14
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/generated/compatibility-version.json +1077 -429
- package/src/generated/model-metadata.ts +1 -1
- package/src/images/loop.ts +3 -0
- package/src/integrations/model-name-guard.ts +25 -0
- package/src/integrations/route-intent-catalog.ts +26 -0
- package/src/integrations/route-intent-connected.ts +262 -0
- package/src/integrations/route-intent-contract.ts +55 -0
- package/src/integrations/route-intent-disconnect.ts +109 -0
- package/src/integrations/route-intent-initial.ts +64 -0
- package/src/integrations/route-intent-state.ts +117 -0
- package/src/integrations/route-intent-tick.ts +65 -0
- package/src/integrations/route-intent.ts +212 -0
- package/src/integrations/writer.ts +44 -11
- package/src/lib/catalog-etag.ts +10 -0
- package/src/lib/client-error-body.ts +15 -0
- package/src/lib/client-retry-after.ts +29 -0
- package/src/lib/config-ownership.ts +13 -0
- package/src/lib/context-overflow-verdict.ts +266 -9
- package/src/lib/desktop-gui-origin.ts +28 -0
- package/src/lib/errors.ts +1 -1
- package/src/lib/failure-detail.ts +72 -3
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/hard-refusal.ts +259 -0
- package/src/lib/messages-error-body.ts +4 -1
- package/src/lib/outbound-credential-registry.ts +362 -4
- package/src/lib/paced-stream.ts +34 -0
- package/src/lib/passive-key-fetch-proof.ts +30 -0
- package/src/lib/passive-read.ts +5 -0
- package/src/lib/process-control.ts +76 -12
- package/src/lib/redact.ts +84 -8
- package/src/lib/state-store-registrations.ts +11 -0
- package/src/lib/state-store-sweeper.ts +4 -0
- package/src/lib/supervisor-markers.ts +18 -0
- package/src/lib/terminal-safe-text.ts +58 -0
- package/src/lib/translator-budget.ts +3 -2
- package/src/lib/upstream-retry.ts +14 -4
- package/src/link/alias-lock.ts +119 -0
- package/src/link/child-activity.ts +83 -0
- package/src/link/child-binary-cache-fill.d.mts +50 -0
- package/src/link/child-binary-cache-fill.mjs +494 -0
- package/src/link/child-binary-cache-start.ts +73 -0
- package/src/link/child-binary-source.ts +12 -5
- package/src/link/child-catalog-freshness.ts +149 -0
- package/src/link/child-gated-ocx.ts +135 -0
- package/src/link/child-observations.ts +206 -0
- package/src/link/child-observe.ts +121 -0
- package/src/link/child-ops-engine.ts +230 -0
- package/src/link/child-ops-host.ts +138 -0
- package/src/link/child-ops-runners.ts +319 -0
- package/src/link/child-ops-scheduler.ts +207 -0
- package/src/link/child-ops-types.ts +89 -0
- package/src/link/child-parity.ts +23 -4
- package/src/link/child-policy.ts +93 -0
- package/src/link/child-update-contract.ts +174 -0
- package/src/link/codex-settings.ts +1 -1
- package/src/link/compatibility.ts +18 -1
- package/src/link/diagnostics-read.ts +163 -0
- package/src/link/diagnostics.ts +20 -7
- package/src/link/explicit-route.ts +209 -0
- package/src/link/link-recover.ts +113 -0
- package/src/link/management-routes.ts +3 -1
- package/src/link/operation-recovery-slot.ts +44 -0
- package/src/link/operations-journal.ts +408 -0
- package/src/link/paths.ts +5 -0
- package/src/link/peer-report.ts +1 -1
- package/src/link/relay-auth.ts +14 -0
- package/src/link/remote-plant.ts +152 -14
- package/src/link/remote-platform.ts +21 -10
- package/src/link/remote-probe.ts +11 -3
- package/src/link/remote-windows.ts +88 -12
- package/src/link/request-compression.ts +30 -0
- package/src/link/residual-recovery.ts +54 -0
- package/src/link/retirement.ts +128 -0
- package/src/link/route-intent-watch.ts +41 -0
- package/src/link/route-intent.ts +209 -0
- package/src/link/route-proof.ts +82 -0
- package/src/link/route-rounds.ts +579 -0
- package/src/link/route-select.ts +95 -0
- package/src/link/route-trust.ts +96 -0
- package/src/link/ssh-argv.ts +285 -43
- package/src/link/ssh-capture-redact.ts +253 -0
- package/src/link/ssh-capture.ts +497 -0
- package/src/link/ssh-runner.ts +141 -14
- package/src/link/status-projection.ts +160 -0
- package/src/link/store.ts +54 -1
- package/src/link/supervisor.ts +543 -55
- package/src/link/sync-fanout-classify.ts +114 -0
- package/src/link/sync-then-restart.ts +65 -0
- package/src/link/tombstones.ts +209 -0
- package/src/link/traffic.ts +178 -0
- package/src/link/tunnel-state.ts +10 -4
- package/src/link/ws-activity-holds.ts +474 -0
- package/src/local-credentials/publication-fence.ts +20 -1
- package/src/messaging/mcp-queue-rpc.ts +3 -2
- package/src/messaging/mcp-queue-server.ts +21 -1
- package/src/messaging/mcp-reply-tools.ts +24 -9
- package/src/messaging/mcp-reply-wait.ts +70 -0
- package/src/messaging/mcp-resume-tools.ts +25 -0
- package/src/messaging/remote-enrollment.ts +3 -3
- package/src/messaging/remote-tunnels.ts +2 -2
- package/src/messaging/resume-permissions.ts +27 -0
- package/src/messaging/rpc.ts +46 -2
- package/src/oauth/account-resume-health.ts +60 -0
- package/src/oauth/anthropic-continuity.ts +23 -7
- package/src/oauth/anthropic-routing.ts +5 -2
- package/src/oauth/anthropic.ts +22 -2
- package/src/oauth/claude-keychain-read.ts +78 -68
- package/src/oauth/index.ts +25 -6
- package/src/oauth/local-token-detect.ts +8 -29
- package/src/oauth/login-cli-errors.ts +5 -1
- package/src/oauth/login-cli.ts +33 -18
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- package/src/oauth/store.ts +51 -1
- package/src/oauth/xai.ts +248 -14
- package/src/protocols/contract.ts +4 -0
- package/src/protocols/encoders/messages.ts +1 -0
- package/src/providers/alias-template.ts +48 -0
- package/src/providers/anthropic-billing-ownership.ts +2 -0
- package/src/providers/anthropic-output-caps.ts +46 -0
- package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
- package/src/providers/antigravity-effort-families.ts +11 -3
- package/src/providers/antigravity-models.ts +32 -9
- package/src/providers/antigravity-wire-snapshot.ts +3 -2
- package/src/providers/api-key-pause-state.ts +23 -0
- package/src/providers/api-key-pause.ts +71 -10
- package/src/providers/api-key-resolve.ts +49 -7
- package/src/providers/api-key-response-ownership.ts +2 -0
- package/src/providers/api-key-selection-capture.ts +3 -1
- package/src/providers/api-key-selection.ts +54 -11
- package/src/providers/api-keys.ts +24 -7
- package/src/providers/cache-affinity-identity.ts +73 -0
- package/src/providers/cache-affinity.ts +256 -0
- package/src/providers/claude-cli-usage-state.ts +11 -6
- package/src/providers/claude-cli-usage.ts +27 -9
- package/src/providers/codex-capacity.ts +11 -2
- package/src/providers/default-aliases.ts +98 -20
- package/src/providers/google-vertex-model-discovery.ts +510 -0
- package/src/providers/key-failover.ts +136 -14
- package/src/providers/key-store.ts +3 -3
- package/src/providers/kiro-models.ts +3 -5
- package/src/providers/label.ts +31 -5
- package/src/providers/mistral-transport.ts +17 -4
- package/src/providers/model-discovery-config.ts +31 -0
- package/src/providers/model-discovery-diagnostic.ts +34 -3
- package/src/providers/model-discovery.ts +43 -7
- package/src/providers/model-rename-fields.ts +5 -0
- package/src/providers/muse-key-quota.ts +14 -6
- package/src/providers/new-model-policy-runtime.ts +17 -4
- package/src/providers/new-model-policy.ts +30 -4
- package/src/providers/openai-sidecar.ts +15 -2
- package/src/providers/passive-key-observation.ts +252 -0
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/account-cache.ts +53 -34
- package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
- package/src/providers/quota/anthropic-usage-windows.ts +19 -9
- package/src/providers/quota/passive-key-limits.ts +272 -0
- package/src/providers/quota/passive-wire-model.ts +126 -0
- package/src/providers/quota/report-cache.ts +112 -5
- package/src/providers/quota/vendor-probes-key.ts +73 -0
- package/src/providers/quota/vendor-probes-oauth.ts +57 -3
- package/src/providers/quota-key-accounts.ts +22 -10
- package/src/providers/quota-mistral-budget.ts +18 -0
- package/src/providers/quota-types.ts +43 -0
- package/src/providers/quota.ts +31 -32
- package/src/providers/reasoning-metadata.ts +1051 -12
- package/src/providers/registry/entries-core.ts +34 -16
- package/src/providers/registry/entries-extended.ts +32 -0
- package/src/providers/registry/model-seeds.ts +35 -0
- package/src/providers/resolved-model-policy.ts +7 -0
- package/src/providers/routed-config.ts +8 -3
- package/src/providers/xai-transport.ts +3 -0
- package/src/quota/reset-observer.ts +4 -2
- package/src/quota/reset-seen-store.ts +9 -0
- package/src/quota/window-mapping.ts +1 -0
- package/src/quota-pool/assemble.ts +4 -1
- package/src/remote/features.ts +17 -0
- package/src/responses/anthropic-progress.ts +10 -4
- package/src/responses/citation-markers.ts +231 -0
- package/src/responses/hosted-tool-policy.ts +56 -12
- package/src/responses/spill-store.ts +5 -1
- package/src/responses/state/replay-input.ts +50 -0
- package/src/responses/state/replay-owner.ts +24 -0
- package/src/responses/state/snapshot-codec.ts +9 -0
- package/src/responses/state/spill-queue.ts +1 -0
- package/src/responses/state.ts +42 -60
- package/src/router.ts +4 -2
- package/src/routing/home-route-capture.ts +123 -0
- package/src/routing/home-route-intent.ts +200 -0
- package/src/routing/route-intent-state.ts +178 -0
- package/src/routing/route-to-live-settings.ts +35 -0
- package/src/routing/route-to-local.ts +145 -0
- package/src/routing/route-to-status.ts +94 -0
- package/src/routing/route-to-sync-child.ts +32 -0
- package/src/server/adapter-resolve.ts +21 -1
- package/src/server/admitted-http-turn.ts +3 -0
- package/src/server/auth-cors.ts +109 -8
- package/src/server/bare-upstream-error.ts +220 -0
- package/src/server/catalog-download.ts +3 -5
- package/src/server/chat-native.ts +25 -7
- package/src/server/claude-messages.ts +8 -5
- package/src/server/codex-model-list.ts +2 -1
- package/src/server/configured-credentials.ts +37 -5
- package/src/server/gui-desktop-authorization.ts +36 -0
- package/src/server/gui-pair-delivery.ts +6 -3
- package/src/server/gui-session.ts +10 -1
- package/src/server/images.ts +41 -13
- package/src/server/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +203 -11
- package/src/server/index/link-management.ts +15 -1
- package/src/server/index/link-relay-sessions.ts +128 -8
- package/src/server/index/link-websocket-limits.ts +136 -0
- package/src/server/index/link-websocket.ts +692 -0
- package/src/server/index/optional-listeners.ts +115 -7
- package/src/server/index/route-intent-watch.ts +47 -0
- package/src/server/index/serve-contract.ts +86 -0
- package/src/server/index/serve-options.ts +35 -86
- package/src/server/index/startup-warnings.ts +8 -2
- package/src/server/index/websocket-handler.ts +26 -4
- package/src/server/index.ts +12 -2
- package/src/server/inference/client-encoder-delivery.ts +2 -0
- package/src/server/inspection-tee.ts +39 -2
- package/src/server/lifecycle.ts +2 -0
- package/src/server/link-turn.ts +137 -0
- package/src/server/management/advisor-routes.ts +10 -2
- package/src/server/management/agent-settings-routes.ts +50 -16
- package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
- package/src/server/management/config-routes.ts +7 -1
- package/src/server/management/context.ts +9 -2
- package/src/server/management/desktop-authorization.ts +41 -0
- package/src/server/management/desktop-compatibility-routes.ts +9 -8
- package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
- package/src/server/management/home-integration-decision.ts +89 -0
- package/src/server/management/integration-routes.ts +208 -81
- package/src/server/management/link-child-ops-routes.ts +218 -0
- package/src/server/management/link-child-preflight.ts +31 -0
- package/src/server/management/link-diagnostics-route.ts +29 -0
- package/src/server/management/link-enrollment.ts +199 -47
- package/src/server/management/link-operation.ts +609 -0
- package/src/server/management/link-recover-route.ts +103 -0
- package/src/server/management/link-route-edit.ts +173 -0
- package/src/server/management/link-route-request.ts +62 -0
- package/src/server/management/link-route-state.ts +92 -6
- package/src/server/management/link-routes.ts +563 -51
- package/src/server/management/link-traffic-status.ts +13 -0
- package/src/server/management/model-routes.ts +122 -36
- package/src/server/management/model-rows.ts +2 -1
- package/src/server/management/native-integration-routes.ts +176 -70
- package/src/server/management/oauth-account-routes.ts +69 -17
- package/src/server/management/protocol-routes.ts +7 -0
- package/src/server/management/provider-completion-test.ts +4 -4
- package/src/server/management/provider-overwrite-carry.ts +39 -3
- package/src/server/management/provider-routes.ts +80 -72
- package/src/server/management/provider-routing-quota.ts +45 -0
- package/src/server/management/route-registry.ts +25 -3
- package/src/server/management/route-to-routes.ts +257 -0
- package/src/server/management/system-restart.ts +4 -2
- package/src/server/management/usage-aggregate-cache.ts +101 -66
- package/src/server/management-api.ts +17 -3
- package/src/server/management-auth.ts +13 -1
- package/src/server/messages-native-preflight.ts +27 -4
- package/src/server/messages-native.ts +22 -5
- package/src/server/persistent-gui-session.ts +6 -3
- package/src/server/proxy-liveness.ts +33 -6
- package/src/server/relay-eager.ts +36 -12
- package/src/server/relay.ts +183 -116
- package/src/server/request-body-facts.ts +48 -0
- package/src/server/request-decompress.ts +65 -2
- package/src/server/request-log-account-rotation.ts +6 -0
- package/src/server/request-log-attempt-usage.ts +69 -0
- package/src/server/request-log-cache-affinity.ts +60 -0
- package/src/server/request-log-conversation.ts +45 -2
- package/src/server/request-log-failure-detail.ts +59 -1
- package/src/server/request-log-terminal-status.ts +210 -24
- package/src/server/request-log.ts +71 -79
- package/src/server/responses/adapter-continuation.ts +2 -1
- package/src/server/responses/adapter-delivery.ts +2 -0
- package/src/server/responses/adapter-dispatch.ts +40 -51
- package/src/server/responses/advisor-plan-slot.ts +33 -1
- package/src/server/responses/advisor-question.ts +21 -0
- package/src/server/responses/advisor-slot.ts +10 -3
- package/src/server/responses/bare-namespace-aliases.ts +18 -0
- package/src/server/responses/buffered-sse-json.ts +9 -3
- package/src/server/responses/code-mode-collab-surface.ts +11 -0
- package/src/server/responses/codex-tool-catalog.ts +156 -0
- package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
- package/src/server/responses/combo-stream-preflight.ts +701 -81
- package/src/server/responses/compact.ts +47 -12
- package/src/server/responses/context-overflow.ts +58 -2
- package/src/server/responses/core-codex-account.ts +17 -3
- package/src/server/responses/core-combo-failure.ts +37 -4
- package/src/server/responses/core-combo-native.ts +3 -1
- package/src/server/responses/core-combo.ts +62 -7
- package/src/server/responses/core-errors.ts +8 -3
- package/src/server/responses/core-lifetime.ts +3 -2
- package/src/server/responses/core-normalize.ts +3 -1
- package/src/server/responses/core-opaque-recovery.ts +45 -2
- package/src/server/responses/core-options.ts +18 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +15 -10
- package/src/server/responses/native-replay-guard.ts +57 -0
- package/src/server/responses/opengateway-completion-guard.ts +10 -4
- package/src/server/responses/outbound-request-body.ts +29 -0
- package/src/server/responses/passthrough-completion.ts +105 -8
- package/src/server/responses/passthrough-delivery.ts +31 -11
- package/src/server/responses/passthrough-dispatch.ts +99 -106
- package/src/server/responses/policy-fallback.ts +13 -1
- package/src/server/responses/request-prepare.ts +50 -6
- package/src/server/responses/request-transport.ts +53 -17
- package/src/server/responses/reset-replay.ts +104 -4
- package/src/server/responses/run-turn-execution.ts +58 -30
- package/src/server/responses/sidecar-execution.ts +14 -0
- package/src/server/responses/terminal-error-redaction.ts +222 -25
- package/src/server/responses/ws-upstream.ts +2 -2
- package/src/server/sse-payload-rewrite.ts +3 -2
- package/src/server/stop-service-route.ts +85 -0
- package/src/server/system-env-shell.ts +12 -1
- package/src/server/system-env.ts +5 -3
- package/src/server/windows-tcp-drop.ts +21 -4
- package/src/server/workflow-refusal.ts +8 -0
- package/src/server/ws-bridge.ts +191 -12
- package/src/service/cli-windows-stop.ts +189 -0
- package/src/service/cli.ts +41 -12
- package/src/service/disconnected-client-restart.ts +60 -0
- package/src/service/guarded-manager-target.ts +18 -1
- package/src/service/health.ts +99 -6
- package/src/service/launchd.ts +84 -31
- package/src/service/orchestration.ts +418 -91
- package/src/service/repair.ts +223 -6
- package/src/service/restart-proxy-stop.ts +79 -0
- package/src/service/service-child-ownership.ts +6 -2
- package/src/service/windows-checked-stop-live.ts +467 -0
- package/src/service/windows-checked-stop.ts +435 -0
- package/src/service/windows-command-line-token.ts +23 -0
- package/src/service/windows-guarded-manager.ts +77 -34
- package/src/service/windows-ops.ts +38 -56
- package/src/service/windows-process-evidence.ts +292 -0
- package/src/service/windows-process-native.ts +262 -0
- package/src/service/windows-service-stop.ts +321 -0
- package/src/service/windows-stop-binding.ts +187 -0
- package/src/service/windows-stop-budget.ts +123 -0
- package/src/service/windows-stop-confirm.ts +158 -0
- package/src/service/windows-stop-deadline.ts +56 -0
- package/src/service.ts +2 -2
- package/src/types/claude-tool-loading.ts +48 -0
- package/src/types/config.ts +47 -53
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +68 -2
- package/src/types/request.ts +4 -0
- package/src/types.ts +4 -0
- package/src/update/guarded-runtime-ops.ts +5 -7
- package/src/update/index.ts +25 -10
- package/src/update/install-detection.mjs +3 -1
- package/src/update/job-pinned-start.ts +2 -0
- package/src/update/job-windows-restart.ts +19 -32
- package/src/update/job.ts +12 -5
- package/src/update/npm-install.d.mts +11 -0
- package/src/update/npm-install.mjs +44 -7
- package/src/update/orchestrated-entry.ts +1 -1
- package/src/update/orchestrated-node-driver.mjs +3 -2
- package/src/update/orchestrated-pnpm.d.mts +4 -0
- package/src/update/orchestrated-pnpm.mjs +50 -6
- package/src/update/orchestrated-session.d.mts +3 -1
- package/src/update/orchestrated-session.mjs +21 -6
- package/src/update/pnpm-global-install.d.mts +21 -3
- package/src/update/pnpm-global-install.mjs +322 -19
- package/src/update/pnpm-store-layout.mjs +46 -0
- package/src/update/sync-update-mutex.d.mts +3 -2
- package/src/update/sync-update-mutex.mjs +57 -8
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +545 -12
- package/src/update/windows-installer-marker.d.mts +1 -0
- package/src/update/windows-installer-marker.mjs +44 -0
- package/src/usage/expected-prices.ts +8 -0
- package/src/usage/filter-index.ts +326 -77
- package/src/usage/ledger-scanner.ts +15 -0
- package/src/usage/link-log-fields.ts +48 -0
- package/src/usage/log.ts +43 -2
- package/src/usage/request-body.ts +37 -0
- package/src/web-search/loop.ts +3 -0
- package/src/web-search/parse.ts +21 -2
- package/gui/dist/assets/App-g3Cm2xhZ.js +0 -59
- package/gui/dist/assets/Tray-BMDkAiXy.js +0 -1
- package/gui/dist/assets/index-Bziu8gTy.css +0 -2
- package/gui/dist/assets/index-OYzhQUNP.js +0 -94
- package/gui/dist/classic/assets/App-CgPBKUP-.js +0 -58
- package/gui/dist/classic/assets/index-BR-HhNrp.js +0 -94
- package/gui/dist/classic/assets/quota-summary-CXKhvSmQ.js +0 -1
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
|
@@ -1,6 +1,20 @@
|
|
|
1
|
-
import { createLinkRelaySessions } from "./link-relay-sessions";
|
|
1
|
+
import { createLinkRelaySessions, type LinkCatalogServed } from "./link-relay-sessions";
|
|
2
2
|
import { createLinkPeerObservations, type LinkPeerEntry } from "../../link/peer-report";
|
|
3
|
-
import type
|
|
3
|
+
import { createLinkActivity, type LinkActivitySnapshot } from "../../link/child-activity";
|
|
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";
|
|
4
18
|
import {
|
|
5
19
|
emptyLinkStore,
|
|
6
20
|
readLinkStore,
|
|
@@ -11,6 +25,7 @@ import { linkStorePath } from "../../link/paths";
|
|
|
11
25
|
import { linkRouteAllowed } from "../../link/routes";
|
|
12
26
|
import { withConfigMutationLockSync } from "../../config/mutation-lock";
|
|
13
27
|
import { registerFallbackLinkResolver } from "../../routing/fallback-policy";
|
|
28
|
+
import { captureChildRouteDefaults } from "../../routing/home-route-intent";
|
|
14
29
|
|
|
15
30
|
export const LINK_INGRESS_HOSTNAME = "opencodex-link.invalid";
|
|
16
31
|
|
|
@@ -28,6 +43,16 @@ export interface LinkListenerStartContext<T> {
|
|
|
28
43
|
keyFingerprints?: (apiKeyId: string) => readonly string[];
|
|
29
44
|
/** The Home supervisor's current tunnel connection for a link (relay-auth.ts). */
|
|
30
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[];
|
|
31
56
|
}
|
|
32
57
|
|
|
33
58
|
export interface LinkListenerDeps {
|
|
@@ -36,6 +61,12 @@ export interface LinkListenerDeps {
|
|
|
36
61
|
writeStore?: (path: string, store: LinkStore) => void;
|
|
37
62
|
serve?: (options: Parameters<typeof Bun.serve>[0]) => Server<unknown>;
|
|
38
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">;
|
|
39
70
|
}
|
|
40
71
|
|
|
41
72
|
export type LinkListenerStatus = {
|
|
@@ -53,10 +84,27 @@ export interface LinkListenerLifecycle<T> {
|
|
|
53
84
|
start(ctx: LinkListenerStartContext<T>): void;
|
|
54
85
|
ensureStarted(): Promise<void>;
|
|
55
86
|
linkAdmissionKeyIds(): ReadonlySet<string>;
|
|
56
|
-
|
|
57
|
-
|
|
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;
|
|
58
90
|
/** What this Home last learned of a Child over the link; empty until it relays a request. */
|
|
59
91
|
peerObservation(linkId: string): LinkPeerEntry;
|
|
92
|
+
/** Relayed model traffic for one link (D5); legacy key admissions count against every link. */
|
|
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;
|
|
106
|
+
/** A Child read a whole 200 `GET /v1/catalog` body through the relay. */
|
|
107
|
+
onCatalogServed(listener: (served: LinkCatalogServed) => void): () => void;
|
|
60
108
|
status(): LinkListenerStatus;
|
|
61
109
|
close(): Promise<void>;
|
|
62
110
|
stop(): Promise<void>;
|
|
@@ -80,9 +128,24 @@ export function createLinkListenerLifecycle<T>(deps: LinkListenerDeps = {}): Lin
|
|
|
80
128
|
let ensureFlight: Promise<void> | undefined;
|
|
81
129
|
let closeFlight: Promise<void> | undefined;
|
|
82
130
|
let stopped = false;
|
|
83
|
-
const authenticatedCatalogListeners = new Set<(apiKeyId: string) => void>();
|
|
131
|
+
const authenticatedCatalogListeners = new Set<(apiKeyId: string, routeProofId?: string) => void>();
|
|
132
|
+
const catalogServedListeners = new Set<(served: LinkCatalogServed) => void>();
|
|
84
133
|
let lifecycleStatus: LinkListenerStatus = { state: "off", port: null, reason: null };
|
|
85
134
|
const peers = createLinkPeerObservations();
|
|
135
|
+
// Lifecycle-owned so a rebind keeps the book.
|
|
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");
|
|
86
149
|
|
|
87
150
|
const setStatus = (state: LinkListenerStatus["state"], port: number | null, reason: string | null): void => {
|
|
88
151
|
lifecycleStatus = { state, port, reason };
|
|
@@ -96,10 +159,55 @@ export function createLinkListenerLifecycle<T>(deps: LinkListenerDeps = {}): Lin
|
|
|
96
159
|
const readStoreForAdmission = (): LinkStore => {
|
|
97
160
|
try { return readStore(storePath); } catch { return emptyLinkStore(); }
|
|
98
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
|
+
});
|
|
99
181
|
// OCX-11: the fallback policy resolves a link data key to its link id through this slot.
|
|
100
182
|
const releaseFallbackLinkResolver = registerFallbackLinkResolver(keyId =>
|
|
101
183
|
readStoreForAdmission().links.find(link => link.apiKeyId === keyId)?.id);
|
|
102
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
|
+
|
|
103
211
|
const bindIfNeeded = (): void => {
|
|
104
212
|
if (stopped || listener || !startContext) return;
|
|
105
213
|
let store: LinkStore;
|
|
@@ -113,11 +221,69 @@ export function createLinkListenerLifecycle<T>(deps: LinkListenerDeps = {}): Lin
|
|
|
113
221
|
setStatus("off", null, null);
|
|
114
222
|
return;
|
|
115
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();
|
|
116
228
|
const requestedPort = store.listenerPort ?? 0;
|
|
117
|
-
const
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
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
|
+
// Running marks, and while the feature is on the request-log fields of design 9.1: the pipeline reports this
|
|
246
|
+
// request's expanded input and its terminal (src/server/link-turn.ts), through a token header it removes before
|
|
247
|
+
// anything is forwarded. With the feature off and no marks, no token is set and the request is unchanged.
|
|
248
|
+
let token: string | null = null;
|
|
249
|
+
const logging = websocketEnabled();
|
|
250
|
+
if (logging || holds.hasMarks(linkId)) {
|
|
251
|
+
let resent: StoredMark[] = [];
|
|
252
|
+
let threadHash: string | null = null;
|
|
253
|
+
token = registerLinkTurnToken({
|
|
254
|
+
expanded(body, chain) { threadHash = threadHashOf(body); resent = chain === "unexpanded" ? [] : marksResent(holds, linkId, threadHash, body); },
|
|
255
|
+
expansionFailed() { resent = []; },
|
|
256
|
+
terminal(status, source) { if (resent.length && threadHash && upstreamCompleted(status, source)) holds.releaseMarks(linkId, threadHash, resent); },
|
|
257
|
+
...(logging ? { pacedReads: true, logFields: (body: unknown) => ({ transport: "http" as const, first: false, ...linkLogRefs(holds, linkId, header?.trim() ?? "", body) }) } : {}),
|
|
258
|
+
});
|
|
259
|
+
try { req.headers.set(LINK_TURN_HEADER, token); } catch { releaseLinkTurnToken(token); token = null; }
|
|
260
|
+
}
|
|
261
|
+
// Pending result keys: only a link with a releasable hold pays for reading a copy of the body. The
|
|
262
|
+
// request settles only holds that exist now, as it begins (a later hold may reuse an id).
|
|
263
|
+
let decide: ((accepted: boolean) => void) | undefined;
|
|
264
|
+
const beganAt = holds.sequence();
|
|
265
|
+
if (holds.releasable(linkId)) {
|
|
266
|
+
const decision = new Promise<boolean>(resolve => { decide = resolve; });
|
|
267
|
+
// The copy is read and decoded only after the handler accepted the request; a refusal, the inbound budget's 503
|
|
268
|
+
// included, cancels it unread (#8608). A Child may send the body coded (#8594); the copy is decoded through the
|
|
269
|
+
// handlers' bounded reader under the same resolved inbound limit, and a body that does not decode releases nothing.
|
|
270
|
+
const encoding = req.headers.get("content-encoding");
|
|
271
|
+
const copy = req.clone();
|
|
272
|
+
const observation = decision.then(async accepted => {
|
|
273
|
+
// Never awaited: a tee's cancel waits for the other half, which a refusal may leave unread.
|
|
274
|
+
if (!accepted) { void copy.body?.cancel().catch(() => {}); return; }
|
|
275
|
+
const raw = new Uint8Array(await copy.arrayBuffer());
|
|
276
|
+
const body = JSON.parse(new TextDecoder().decode(decodeRequestBody(raw, encoding, inboundLimit))) as unknown;
|
|
277
|
+
if (!body || typeof body !== "object") return;
|
|
278
|
+
holds.observe(linkId, threadHashOf(body), resultKeysOf((body as Record<string, unknown>).input), beganAt);
|
|
279
|
+
}).catch(() => {}).finally(() => { holdObservations.delete(observation); });
|
|
280
|
+
holdObservations.add(observation);
|
|
281
|
+
}
|
|
282
|
+
if (token === null && !decide) return;
|
|
283
|
+
// Preparation claimed the token before the handler answered; dropping it again is a no-op,
|
|
284
|
+
// and it keeps a request that never reached preparation from leaving one behind.
|
|
285
|
+
return (accepted: boolean) => { if (token !== null) releaseLinkTurnToken(token); decide?.(accepted); };
|
|
286
|
+
} });
|
|
121
287
|
let bound: Server<unknown>;
|
|
122
288
|
try {
|
|
123
289
|
bound = serve({
|
|
@@ -128,6 +294,8 @@ export function createLinkListenerLifecycle<T>(deps: LinkListenerDeps = {}): Lin
|
|
|
128
294
|
idleTimeout: 255,
|
|
129
295
|
maxRequestBodySize: startContext.maxRequestBodySize,
|
|
130
296
|
fetch: (req: Request, server: Server<unknown>) => sessions.dispatch(req, server as Server<T>, startContext!.dispatch),
|
|
297
|
+
// Only a verified link upgrade with the feature on ever reaches server.upgrade (link-websocket.ts).
|
|
298
|
+
...(linkWebsocket ? { websocket: websocketGate.handler(linkWebsocket.handler) } : {}),
|
|
131
299
|
} as Parameters<typeof Bun.serve>[0]);
|
|
132
300
|
} catch (error) {
|
|
133
301
|
reportFailure("bind", error, "bind");
|
|
@@ -167,6 +335,7 @@ export function createLinkListenerLifecycle<T>(deps: LinkListenerDeps = {}): Lin
|
|
|
167
335
|
}
|
|
168
336
|
listener = bound as Server<T>;
|
|
169
337
|
relaySessions = sessions;
|
|
338
|
+
websocketGate.accept();
|
|
170
339
|
setStatus("listening", bound.port ?? (requestedPort > 0 ? requestedPort : null), null);
|
|
171
340
|
};
|
|
172
341
|
|
|
@@ -176,6 +345,8 @@ export function createLinkListenerLifecycle<T>(deps: LinkListenerDeps = {}): Lin
|
|
|
176
345
|
const flight = (async () => {
|
|
177
346
|
if (closeFlight) await closeFlight;
|
|
178
347
|
if (stopped) return;
|
|
348
|
+
// An unbound listener captures in bindIfNeeded; a bound one retries an owed capture here.
|
|
349
|
+
if (routeDefaultsOwed && listener) captureRouteDefaults();
|
|
179
350
|
bindIfNeeded();
|
|
180
351
|
})();
|
|
181
352
|
ensureFlight = flight.finally(() => {
|
|
@@ -187,12 +358,17 @@ export function createLinkListenerLifecycle<T>(deps: LinkListenerDeps = {}): Lin
|
|
|
187
358
|
|
|
188
359
|
const close = (): Promise<void> => {
|
|
189
360
|
if (closeFlight) return closeFlight;
|
|
361
|
+
// No link is left to protect: an owed capture is retried at the next bind, not on a timer.
|
|
362
|
+
if (captureRetry) { clearTimeout(captureRetry); captureRetry = undefined; }
|
|
363
|
+
captureAttempt = 0;
|
|
190
364
|
const flight = (async () => {
|
|
191
365
|
if (ensureFlight) await ensureFlight;
|
|
192
366
|
const current = listener;
|
|
193
367
|
// Retain the bound port AND ingress ownership while an authenticated connection is
|
|
194
368
|
// reserved or a dispatched response is still being consumed. No new proofs are issued.
|
|
195
369
|
if (current) {
|
|
370
|
+
// A link WebSocket holds its session lease until its close callback; close them first.
|
|
371
|
+
websocketGate.closeAll();
|
|
196
372
|
await relaySessions?.drain();
|
|
197
373
|
await current.stop(false);
|
|
198
374
|
}
|
|
@@ -221,22 +397,38 @@ export function createLinkListenerLifecycle<T>(deps: LinkListenerDeps = {}): Lin
|
|
|
221
397
|
authenticatedCatalogListeners.add(listener);
|
|
222
398
|
return () => { authenticatedCatalogListeners.delete(listener); };
|
|
223
399
|
},
|
|
224
|
-
notifyAuthenticatedCatalog(apiKeyId) {
|
|
225
|
-
for (const listener of authenticatedCatalogListeners) listener(apiKeyId);
|
|
400
|
+
notifyAuthenticatedCatalog(apiKeyId, routeProofId) {
|
|
401
|
+
for (const listener of authenticatedCatalogListeners) listener(apiKeyId, routeProofId);
|
|
226
402
|
},
|
|
227
403
|
peerObservation: linkId => peers.get(linkId),
|
|
404
|
+
linkActivity: (linkId, now) => activity.snapshot(linkId, now),
|
|
405
|
+
// Only the Home's link removal calls this: the link's sockets close and its holds go with it.
|
|
406
|
+
closeLinkSockets: linkId => { const closed = websocketGate.closeLink(linkId); holds.removeLink(linkId); websocketGate.forgetTransport(linkId); return closed; },
|
|
407
|
+
linkTransport: linkId => websocketGate.transport(linkId),
|
|
408
|
+
linkHolds: linkId => holds.summary(linkId),
|
|
409
|
+
clearLinkHolds: linkId => holds.clear(linkId),
|
|
410
|
+
async activityHoldsSettled() { await Promise.all([...holdObservations]); },
|
|
411
|
+
linkTraffic: linkId => traffic.snapshot(linkId),
|
|
412
|
+
onCatalogServed(listener) {
|
|
413
|
+
catalogServedListeners.add(listener);
|
|
414
|
+
return () => { catalogServedListeners.delete(listener); };
|
|
415
|
+
},
|
|
228
416
|
status() {
|
|
229
417
|
return { ...lifecycleStatus };
|
|
230
418
|
},
|
|
231
419
|
close,
|
|
232
420
|
async stop() {
|
|
233
421
|
stopped = true;
|
|
422
|
+
if (captureRetry) { clearTimeout(captureRetry); captureRetry = undefined; }
|
|
234
423
|
releaseFallbackLinkResolver();
|
|
235
424
|
// Process shutdown is deliberately forceful, unlike last-link removal. Every
|
|
236
425
|
// authenticated socket is closed, and the client transport cannot reconnect it.
|
|
237
426
|
relaySessions?.abortReservations();
|
|
238
427
|
if (listener) await listener.stop(true);
|
|
239
428
|
await close();
|
|
429
|
+
websocketGate.dispose();
|
|
430
|
+
// Sockets are closed and their holds recorded; persist them, then mark the fence clean.
|
|
431
|
+
holds.stop();
|
|
240
432
|
startContext = undefined;
|
|
241
433
|
setStatus("off", null, null);
|
|
242
434
|
},
|
|
@@ -12,7 +12,9 @@ import type { OcxConfig } from "../../types";
|
|
|
12
12
|
import { handleManagementAPI, type ManagementApiDeps } from "../management-api";
|
|
13
13
|
import type { ManagementSessionControl } from "../management-auth";
|
|
14
14
|
import { runPassiveRead } from "../../lib/passive-read";
|
|
15
|
-
import { LINK_CODEX_SETTINGS_PATH, linkManagementRouteAllowed, linkManagementTarget } from "../../link/management-routes";
|
|
15
|
+
import { LINK_CODEX_SETTINGS_PATH, LINK_ROUTE_INTENT_PATH, LINK_ROUTE_CATALOG_PATH, linkManagementRouteAllowed, linkManagementTarget } from "../../link/management-routes";
|
|
16
|
+
import { projectRouteCatalogFacts } from "../../integrations/route-intent-catalog";
|
|
17
|
+
import { readLinkRouteIntent } from "./route-intent-watch";
|
|
16
18
|
import { projectHomeCodexSettings } from "../../link/codex-settings";
|
|
17
19
|
import { homeLinkChildParity, LINK_CHILD_PARITY_MAX_BYTES, LINK_CHILD_PARITY_PATH, parseLinkChildParityReport } from "../../link/child-parity";
|
|
18
20
|
import { linkStorePath } from "../../link/paths";
|
|
@@ -76,9 +78,21 @@ export async function handleLinkManagementRequest(
|
|
|
76
78
|
deps: ManagementApiDeps,
|
|
77
79
|
sessionControl?: ManagementSessionControl,
|
|
78
80
|
admittedKeyId?: string,
|
|
81
|
+
/** Repeats link-key admission for a request that waited; see readLinkRouteIntent. */
|
|
82
|
+
readmit?: () => string | undefined,
|
|
79
83
|
): Promise<Response> {
|
|
80
84
|
if (url.pathname === LINK_CHILD_PARITY_PATH) return handleChildParityReport(req, url, admittedKeyId);
|
|
81
85
|
if (!linkManagementRouteAllowed(url, req)) return notFound();
|
|
86
|
+
if (url.pathname === LINK_ROUTE_CATALOG_PATH) {
|
|
87
|
+
if (!admittedKeyId) return refused(403, "link_key_required");
|
|
88
|
+
try {
|
|
89
|
+
if (readLinkStore(linkStorePath()).links.filter(link => link.apiKeyId === admittedKeyId).length !== 1) return refused(403, "link_mismatch");
|
|
90
|
+
return Response.json(projectRouteCatalogFacts(config), { headers: { "cache-control": "no-store" } });
|
|
91
|
+
} catch { return refused(503, "route_catalog_unavailable"); }
|
|
92
|
+
}
|
|
93
|
+
if (url.pathname === LINK_ROUTE_INTENT_PATH) {
|
|
94
|
+
return readLinkRouteIntent(req, config, VERSION, admittedKeyId, readmit);
|
|
95
|
+
}
|
|
82
96
|
if (url.pathname === LINK_CODEX_SETTINGS_PATH) {
|
|
83
97
|
return Response.json(projectHomeCodexSettings(config, VERSION), { headers: { "cache-control": "no-store" } });
|
|
84
98
|
}
|
|
@@ -1,10 +1,19 @@
|
|
|
1
1
|
import type { Server } from "bun";
|
|
2
|
+
import { createHash } from "node:crypto";
|
|
2
3
|
import {
|
|
3
4
|
LINK_RELAY_AUTH_PATH, LINK_RELAY_AUTH_TIMEOUT_MS, LINK_RELAY_AUTH_VERSION, LINK_RELAY_CONNECTION_HEADER,
|
|
4
5
|
LINK_RELAY_CONNECTION_PROOF_HEADER, LINK_RELAY_PROBE_HEADER, LINK_RELAY_SESSION_HEADER, linkConnectionProof,
|
|
5
|
-
linkRelayProof, linkRelayProofMatches,
|
|
6
|
+
linkRelayProof, linkRelayProofMatches, LINK_RELAY_WS_STATE_HEADER, LINK_RELAY_WS_STATE_PROOF_HEADER, linkWebsocketStateProof,
|
|
6
7
|
} from "../../link/relay-auth";
|
|
7
8
|
import { parseLinkPeerReport, type LinkPeerObservations } from "../../link/peer-report";
|
|
9
|
+
import { linkActivityCounts, type LinkActivity } from "../../link/child-activity";
|
|
10
|
+
import type { LinkSessionGrant, LinkUpgradeOutcome } from "./link-websocket";
|
|
11
|
+
import type { LinkTrafficBook } from "../../link/traffic";
|
|
12
|
+
import { LINK_HOME_FEATURES_HEADER } from "../../link/request-compression";
|
|
13
|
+
import { linkRelayWaitObserver } from "./link-websocket-limits";
|
|
14
|
+
|
|
15
|
+
/** A 200 `GET /v1/catalog` whose body the Child read to the end (wp2 catalog freshness). */
|
|
16
|
+
export interface LinkCatalogServed { linkId: string | null; keyId: string | null; etag: string }
|
|
8
17
|
|
|
9
18
|
interface Session {
|
|
10
19
|
peer: string;
|
|
@@ -24,6 +33,41 @@ export interface LinkRelaySessionOptions {
|
|
|
24
33
|
peers?: LinkPeerObservations;
|
|
25
34
|
/** The current tunnel connection of a Home-initiated link, announced with each proof. */
|
|
26
35
|
connectionGeneration?: (linkId: string) => string | undefined;
|
|
36
|
+
/** Per-link model-traffic book owned by the listener lifecycle (D5); survives rebinds. */
|
|
37
|
+
activity?: LinkActivity;
|
|
38
|
+
/**
|
|
39
|
+
* Called after a 200 `GET /v1/catalog` body was read to the end and the stream closed. linkId comes from the relay
|
|
40
|
+
* session; a legacy key admission gives null and the response's `x-opencodex-key-id`. The etag is the sha256 of the
|
|
41
|
+
* bytes served, the same value as `catalogEtag(body)`. Cancel, abort, a read error and HEAD report nothing.
|
|
42
|
+
*/
|
|
43
|
+
catalogServed?: (served: LinkCatalogServed) => void;
|
|
44
|
+
/**
|
|
45
|
+
* The Responses WebSocket over the link (link-websocket.ts). Called only for a request with an
|
|
46
|
+
* Upgrade header on a session this book has just consumed and verified; it owns the session's
|
|
47
|
+
* lease when it handles the request. Absent, or answering handled: false, the request keeps
|
|
48
|
+
* today's path.
|
|
49
|
+
*/
|
|
50
|
+
upgrade?: (req: Request, server: Server<unknown>, grant: LinkSessionGrant) => LinkUpgradeOutcome;
|
|
51
|
+
/** Whether verified answers advertise the link WebSocket; the header pair is sent only while on. */
|
|
52
|
+
websocketAdvertised?: () => boolean;
|
|
53
|
+
/**
|
|
54
|
+
* A relayed POST /v1/responses on a verified session, before dispatch: it may return results a
|
|
55
|
+
* closed link WebSocket of the same link and own thread was waiting for (link-websocket.ts holds).
|
|
56
|
+
* Must not consume the request body. The returned decision is called once with true only when the
|
|
57
|
+
* handler answered below 400, so a request refused before or after reading its body releases nothing.
|
|
58
|
+
*/
|
|
59
|
+
observeResponsesRequest?: (linkId: string, req: Request) => ((accepted: boolean) => void) | void;
|
|
60
|
+
/**
|
|
61
|
+
* Per-link body bytes of verified relay-session requests (#3023), owned by the listener lifecycle.
|
|
62
|
+
* The response side is counted as it streams; the request side is its declared Content-Length,
|
|
63
|
+
* because wrapping the native request would lose the identity Bun's requestIP/timeout need.
|
|
64
|
+
*/
|
|
65
|
+
traffic?: LinkTrafficBook;
|
|
66
|
+
/**
|
|
67
|
+
* This Home's served peer features, named on every relay-auth answer (#3023) so a Child learns on
|
|
68
|
+
* the very connection that will carry its body whether it may send it zstd. Absent = not named.
|
|
69
|
+
*/
|
|
70
|
+
homeFeatures?: () => readonly string[];
|
|
27
71
|
}
|
|
28
72
|
|
|
29
73
|
/** One book per bound listener. A pending proof reserves the bind before the data request arrives. */
|
|
@@ -87,10 +131,16 @@ export function createLinkRelaySessions(options: LinkRelaySessionOptions) {
|
|
|
87
131
|
let generation: string | undefined;
|
|
88
132
|
try { generation = options.connectionGeneration?.(linkId); } catch { generation = undefined; }
|
|
89
133
|
const connectionProof = generation === undefined ? null : linkConnectionProof(fingerprint, keyId, linkId, nonce, generation);
|
|
134
|
+
let advertised = false;
|
|
135
|
+
try { advertised = options.websocketAdvertised?.() === true; } catch { advertised = false; }
|
|
136
|
+
const websocketProof = advertised ? linkWebsocketStateProof(fingerprint, keyId, linkId, nonce, "on") : null;
|
|
137
|
+
const features = options.homeFeatures?.() ?? [];
|
|
90
138
|
const answer = () => new Response(null, { status: 204, headers: {
|
|
91
139
|
"x-opencodex-link-proof": linkRelayProof(fingerprint, "listener", keyId, linkId, nonce)!,
|
|
92
140
|
"cache-control": "no-store",
|
|
141
|
+
...(features.length > 0 ? { [LINK_HOME_FEATURES_HEADER]: features.join(",") } : {}),
|
|
93
142
|
...(connectionProof ? { [LINK_RELAY_CONNECTION_HEADER]: generation!, [LINK_RELAY_CONNECTION_PROOF_HEADER]: connectionProof } : {}),
|
|
143
|
+
...(websocketProof ? { [LINK_RELAY_WS_STATE_HEADER]: "on", [LINK_RELAY_WS_STATE_PROOF_HEADER]: websocketProof } : {}),
|
|
94
144
|
} });
|
|
95
145
|
// A readiness probe closes after this answer and sends no data request, so it reserves
|
|
96
146
|
// nothing: no session to consume, no capacity and no drain lease held until expiry.
|
|
@@ -102,40 +152,102 @@ export function createLinkRelaySessions(options: LinkRelaySessionOptions) {
|
|
|
102
152
|
}
|
|
103
153
|
const nonce = req.headers.get(LINK_RELAY_SESSION_HEADER);
|
|
104
154
|
let release: () => void;
|
|
155
|
+
let sessionLink: string | null = null;
|
|
105
156
|
if (nonce !== null) {
|
|
106
157
|
// A proof received on one HTTP socket never authorizes another socket, even on the same port.
|
|
107
158
|
const session = consume(nonce);
|
|
108
159
|
if (!session) return refuse();
|
|
109
160
|
release = session.release;
|
|
161
|
+
sessionLink = session.linkId;
|
|
110
162
|
if (session.peer !== peerOf(req, server as Server<unknown>) || Date.now() >= session.expiresAt
|
|
111
163
|
|| !options.fingerprints(session.keyId, session.linkId).includes(session.fingerprint)) {
|
|
112
164
|
release(); return refuse();
|
|
113
165
|
}
|
|
114
166
|
// Keep the native Request identity: Bun's requestIP/timeout APIs need the original request.
|
|
115
|
-
|
|
167
|
+
// The link turn header is ours alone (src/server/link-turn.ts): never accepted from a peer.
|
|
168
|
+
try { req.headers.delete(LINK_RELAY_SESSION_HEADER); req.headers.delete("x-opencodex-link-turn"); } catch { release(); return refuse(); }
|
|
169
|
+
if (options.upgrade && req.headers.has("upgrade")) {
|
|
170
|
+
const outcome = options.upgrade(req, server as Server<unknown>, { keyId: session.keyId, linkId: session.linkId, fingerprint: session.fingerprint, release });
|
|
171
|
+
if (outcome.handled) return outcome.response as Response;
|
|
172
|
+
}
|
|
116
173
|
} else {
|
|
117
174
|
if (closing) return new Response(null, { status: 503 });
|
|
118
175
|
// Older peers may still use the ordinary key admission. Its response also owns a drain lease.
|
|
119
176
|
release = acquire();
|
|
120
177
|
}
|
|
178
|
+
// Activity wraps the release every path below calls (body end, cancel, abort, HEAD, dispatch throw); both halves
|
|
179
|
+
// are idempotent. A relay-session request counts from session validation, so a refused proof never counts. A
|
|
180
|
+
// legacy key admission counts only once its response status is known and below 400: until then the key has not
|
|
181
|
+
// been accepted, so an unauthenticated or refused request never touches inFlight or lastDataEndAt.
|
|
182
|
+
const countsActivity = options.activity !== undefined && linkActivityCounts(url, req);
|
|
183
|
+
const beginActivity = (): void => {
|
|
184
|
+
const lease = release;
|
|
185
|
+
const end = options.activity!.begin(sessionLink);
|
|
186
|
+
release = () => { end(); lease(); };
|
|
187
|
+
};
|
|
188
|
+
if (countsActivity && sessionLink !== null) beginActivity();
|
|
189
|
+
let decideObservation: ((accepted: boolean) => void) | undefined;
|
|
190
|
+
if (sessionLink !== null && req.method === "POST" && url.pathname === "/v1/responses") {
|
|
191
|
+
try { decideObservation = options.observeResponsesRequest?.(sessionLink, req) ?? undefined; } catch { /* observation never blocks the request */ }
|
|
192
|
+
}
|
|
193
|
+
let flow: ReturnType<LinkTrafficBook["begin"]> | undefined;
|
|
194
|
+
// Accounting never keeps a lease: every path ends its flow through here and goes on to release.
|
|
195
|
+
const endFlow = (complete: boolean): void => { try { flow?.end(complete); } catch { /* the request's own outcome is the one reported */ } };
|
|
196
|
+
try {
|
|
197
|
+
flow = sessionLink !== null ? options.traffic?.begin(sessionLink) : undefined;
|
|
198
|
+
if (flow) {
|
|
199
|
+
const declared = req.headers.get("content-length");
|
|
200
|
+
if (declared !== null && /^\d+$/.test(declared.trim())) flow.toHome(Number(declared.trim()));
|
|
201
|
+
else if (req.body !== null) flow.uncounted();
|
|
202
|
+
}
|
|
203
|
+
} catch (error) {
|
|
204
|
+
// Accounting that fails before dispatch still decides a pending body observation and returns the lease.
|
|
205
|
+
decideObservation?.(false);
|
|
206
|
+
endFlow(false); release();
|
|
207
|
+
throw error;
|
|
208
|
+
}
|
|
121
209
|
// Socket cancellation before headers is terminal too; an upstream handler that is
|
|
122
210
|
// settling its own cleanup cannot keep a dead transport's listener lease forever.
|
|
123
|
-
|
|
211
|
+
// An abort before headers also decides a pending body observation (not accepted) and drops its unclaimed turn token.
|
|
212
|
+
const beforeHeadersAbort = () => { decideObservation?.(false); endFlow(false); release(); };
|
|
124
213
|
req.signal.addEventListener("abort", beforeHeadersAbort, { once: true });
|
|
125
214
|
if (req.signal.aborted) beforeHeadersAbort();
|
|
126
215
|
try {
|
|
127
216
|
const response = await dispatch(req, server);
|
|
217
|
+
decideObservation?.(response.status < 400 && !req.signal.aborted);
|
|
128
218
|
req.signal.removeEventListener("abort", beforeHeadersAbort);
|
|
129
|
-
if (
|
|
219
|
+
if (countsActivity && sessionLink === null && response.status < 400 && !req.signal.aborted) beginActivity();
|
|
220
|
+
if (!response.body || req.method === "HEAD") { endFlow(true); release(); return response; }
|
|
130
221
|
const reader = response.body.getReader();
|
|
222
|
+
const catalogHash = options.catalogServed && req.method === "GET" && url.pathname === "/v1/catalog" && url.search === ""
|
|
223
|
+
&& response.status === 200 ? createHash("sha256") : null;
|
|
224
|
+
const catalogKeyId = sessionLink === null ? response.headers.get("x-opencodex-key-id") : null;
|
|
225
|
+
const reportCatalog = (): void => {
|
|
226
|
+
if (!catalogHash) return;
|
|
227
|
+
try {
|
|
228
|
+
options.catalogServed!({ linkId: sessionLink, keyId: catalogKeyId, etag: `"${catalogHash.digest("hex")}"` });
|
|
229
|
+
} catch (error) {
|
|
230
|
+
console.warn(`[link] catalog pull record failed: ${error instanceof Error ? error.name : "unknown"}`);
|
|
231
|
+
}
|
|
232
|
+
};
|
|
131
233
|
let ended = false;
|
|
234
|
+
// A cancel resolves a pending read as done; that end is not a completed body.
|
|
235
|
+
let cancelled = false;
|
|
236
|
+
// Test-only stall signal (link-websocket-limits.ts): set from each chunk handed over until the reader asks again.
|
|
237
|
+
const waitObserver = sessionLink !== null ? linkRelayWaitObserver() : null;
|
|
238
|
+
let waiting = false;
|
|
239
|
+
const tellWaiting = (value: boolean): void => { try { waitObserver?.(value); } catch { /* a test observer never breaks the relay */ } };
|
|
240
|
+
const stopWaiting = (): void => { if (waiting) { waiting = false; tellWaiting(false); } };
|
|
132
241
|
const finish = () => {
|
|
133
242
|
if (ended) return;
|
|
134
243
|
ended = true;
|
|
244
|
+
stopWaiting();
|
|
135
245
|
req.signal.removeEventListener("abort", aborted);
|
|
136
246
|
release();
|
|
137
247
|
};
|
|
138
248
|
const cancel = async (reason?: unknown) => {
|
|
249
|
+
cancelled = true;
|
|
250
|
+
endFlow(false);
|
|
139
251
|
try { await reader.cancel(reason); } finally { finish(); }
|
|
140
252
|
};
|
|
141
253
|
const aborted = () => { void cancel(req.signal.reason).catch(() => {}); };
|
|
@@ -143,16 +255,24 @@ export function createLinkRelaySessions(options: LinkRelaySessionOptions) {
|
|
|
143
255
|
if (req.signal.aborted) aborted();
|
|
144
256
|
const body = new ReadableStream<Uint8Array>({
|
|
145
257
|
async pull(controller) {
|
|
258
|
+
stopWaiting();
|
|
146
259
|
try {
|
|
147
260
|
const next = await reader.read();
|
|
148
|
-
if (next.done) { finish(); controller.close(); }
|
|
149
|
-
else
|
|
150
|
-
|
|
261
|
+
if (next.done) { endFlow(!cancelled); finish(); controller.close(); if (!cancelled) reportCatalog(); }
|
|
262
|
+
else {
|
|
263
|
+
catalogHash?.update(next.value); flow?.fromHome(next.value.byteLength); controller.enqueue(next.value);
|
|
264
|
+
if (waitObserver && !ended) { waiting = true; tellWaiting(true); }
|
|
265
|
+
}
|
|
266
|
+
} catch (error) { endFlow(false); finish(); controller.error(error); }
|
|
151
267
|
},
|
|
152
268
|
cancel,
|
|
153
269
|
}, { highWaterMark: 0 });
|
|
154
270
|
return new Response(body, { status: response.status, statusText: response.statusText, headers: response.headers });
|
|
155
|
-
} catch (error) {
|
|
271
|
+
} catch (error) {
|
|
272
|
+
decideObservation?.(false); req.signal.removeEventListener("abort", beforeHeadersAbort);
|
|
273
|
+
endFlow(false); release();
|
|
274
|
+
throw error;
|
|
275
|
+
}
|
|
156
276
|
},
|
|
157
277
|
};
|
|
158
278
|
}
|