@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
|
@@ -0,0 +1,100 @@
|
|
|
1
|
+
import { LINK_RELAY_WS_STATE_HEADER, LINK_RELAY_WS_STATE_PROOF_HEADER, linkRelayProofMatches, linkWebsocketStateProof } from "../link/relay-auth";
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* Whether each Home advertises the Responses WebSocket over its link, as this Child last learned it
|
|
5
|
+
* from ordinary relay traffic (design T4 3.2, "advertisedSeen").
|
|
6
|
+
*
|
|
7
|
+
* Every relay-auth preflight takes a number from one process counter when it starts. A verified answer
|
|
8
|
+
* is applied only when its preflight's number is higher than the number of the last answer applied for
|
|
9
|
+
* that link, so a reply to a request sent before the last applied one is ignored, whoever produced it
|
|
10
|
+
* and however late it arrives: an earlier Home's delayed reply, a reply from before a relink, a restart
|
|
11
|
+
* or a downgrade. A verified answer without the state pair, or whose pair does not verify, applies as
|
|
12
|
+
* off. The state lives in memory only, so a Child restart starts from unknown (no entry); a relink changes the
|
|
13
|
+
* link id, which starts a new entry. At most 256 links are kept. Evicting a link keeps its ordering: its last
|
|
14
|
+
* applied number stays as a watermark (at most 1,024 of them), and an answer for that link applies only
|
|
15
|
+
* above it, so an answer still in flight when its link was evicted can never land as the newest. Only
|
|
16
|
+
* when a watermark itself is dropped does it raise a floor that answers for links without an entry or
|
|
17
|
+
* a watermark must pass: conservative, and reached only after more than 1,280 distinct links.
|
|
18
|
+
*
|
|
19
|
+
* The cached state only decides whether an upgrade may try the Home at all: a cached off does not try,
|
|
20
|
+
* on and unknown do (linkWebsocketAdvertisement). The upgrade's own preflight answer decides whether it
|
|
21
|
+
* proceeds (linkWebsocketAnswer on that answer), and is applied here like any other.
|
|
22
|
+
*/
|
|
23
|
+
const MAX_LINKS = 256;
|
|
24
|
+
const MAX_WATERMARKS = 1_024;
|
|
25
|
+
let sequence = 0;
|
|
26
|
+
const links = new Map<string, { applied: number; on: boolean }>();
|
|
27
|
+
/** Evicted links: the number of the last answer each had applied. */
|
|
28
|
+
const watermarks = new Map<string, number>();
|
|
29
|
+
/** The highest watermark ever dropped. */
|
|
30
|
+
let floor = 0;
|
|
31
|
+
|
|
32
|
+
export type LinkWebsocketAnswer = "on" | "off";
|
|
33
|
+
|
|
34
|
+
/** The number a preflight takes when it starts. */
|
|
35
|
+
export function nextLinkPreflightSequence(): number {
|
|
36
|
+
sequence += 1;
|
|
37
|
+
return sequence;
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
type HeaderSource = Record<string, string | string[] | undefined>;
|
|
41
|
+
|
|
42
|
+
function single(headers: HeaderSource, name: string): string | null {
|
|
43
|
+
const value = headers[name];
|
|
44
|
+
return typeof value === "string" ? value : null;
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
/**
|
|
48
|
+
* The state one verified relay-auth answer names, bound to its nonce and both identities by its own
|
|
49
|
+
* proof. Anything but a verified "on" is off.
|
|
50
|
+
*/
|
|
51
|
+
export function linkWebsocketAnswer(
|
|
52
|
+
headers: HeaderSource, identity: { fingerprint: string; keyId: string; linkId: string; nonce: string },
|
|
53
|
+
): LinkWebsocketAnswer {
|
|
54
|
+
if (single(headers, LINK_RELAY_WS_STATE_HEADER) !== "on") return "off";
|
|
55
|
+
const expected = linkWebsocketStateProof(identity.fingerprint, identity.keyId, identity.linkId, identity.nonce, "on");
|
|
56
|
+
return linkRelayProofMatches(single(headers, LINK_RELAY_WS_STATE_PROOF_HEADER), expected) ? "on" : "off";
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
/** Apply a verified answer under the ordering rule. Returns whether it was applied. */
|
|
60
|
+
export function applyLinkWebsocketAnswer(linkId: string, preflight: number, answer: LinkWebsocketAnswer): boolean {
|
|
61
|
+
const entry = links.get(linkId);
|
|
62
|
+
if (preflight <= (entry ? entry.applied : watermarks.get(linkId) ?? floor)) return false;
|
|
63
|
+
links.delete(linkId);
|
|
64
|
+
watermarks.delete(linkId);
|
|
65
|
+
links.set(linkId, { applied: preflight, on: answer === "on" });
|
|
66
|
+
if (links.size > MAX_LINKS) {
|
|
67
|
+
const [oldest, evicted] = links.entries().next().value!;
|
|
68
|
+
links.delete(oldest);
|
|
69
|
+
watermarks.set(oldest, evicted.applied);
|
|
70
|
+
if (watermarks.size > MAX_WATERMARKS) {
|
|
71
|
+
const [dropped, mark] = watermarks.entries().next().value!;
|
|
72
|
+
watermarks.delete(dropped);
|
|
73
|
+
floor = Math.max(floor, mark);
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
return true;
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
/** advertisedSeen: "on" in the last answer applied for this link. */
|
|
80
|
+
export function linkWebsocketAdvertised(linkId: string | undefined): boolean {
|
|
81
|
+
return linkId !== undefined && links.get(linkId)?.on === true;
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
/**
|
|
85
|
+
* The cached state for a link: "on" or "off" from the last answer applied for it, or "unknown" when this process has
|
|
86
|
+
* no applied answer for that link (a Child just started, a new link, or an entry evicted past the 256 kept). An
|
|
87
|
+
* undefined link id is "off": nothing could be relayed for it.
|
|
88
|
+
*/
|
|
89
|
+
export function linkWebsocketAdvertisement(linkId: string | undefined): "on" | "off" | "unknown" {
|
|
90
|
+
if (linkId === undefined) return "off";
|
|
91
|
+
const entry = links.get(linkId);
|
|
92
|
+
if (!entry) return "unknown";
|
|
93
|
+
return entry.on ? "on" : "off";
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
export function forgetLinkWebsocketAdvertisementsForTests(): void {
|
|
97
|
+
links.clear();
|
|
98
|
+
watermarks.clear();
|
|
99
|
+
floor = 0;
|
|
100
|
+
}
|
|
@@ -0,0 +1,241 @@
|
|
|
1
|
+
import { randomBytes } from "node:crypto";
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* The client side of RFC 6455 framing for the Home leg of a link WebSocket (design T4 3.3). The Home
|
|
5
|
+
* leg runs on the socket the relay-auth preflight authenticated, so no WebSocket client that opens its
|
|
6
|
+
* own connection can be used, and Bun's built-in `ws` module exposes no framer. This file implements the
|
|
7
|
+
* full client state machine the design requires instead:
|
|
8
|
+
*
|
|
9
|
+
* - RSV bits zero; opcodes 0, 1, 2, 8, 9 and 10 only;
|
|
10
|
+
* - control frames of at most 125 bytes and never fragmented;
|
|
11
|
+
* - continuation frames only inside a message, and a new data frame only outside one;
|
|
12
|
+
* - minimal length encoding, with the top bit of a 64-bit length zero;
|
|
13
|
+
* - UTF-8 validation of complete text messages and close reasons;
|
|
14
|
+
* - close codes 1000-1003, 1007-1014 and 3000-4999 only (1012-1014 are registered: service restart, try
|
|
15
|
+
* again later, bad gateway);
|
|
16
|
+
* - client frames masked, server frames refused when masked;
|
|
17
|
+
* - at most the maximum message plus 14 header bytes held (plus one control frame of at most 125 bytes
|
|
18
|
+
* between fragments): an unfragmented message gets its own buffer,
|
|
19
|
+
* and the fragments of a fragmented one are written into one reassembly buffer of the maximum size,
|
|
20
|
+
* dropped once that message is complete, so the two never coexist; at most a bounded number of fragments.
|
|
21
|
+
*
|
|
22
|
+
* A violation throws LinkWsProtocolError with the close code to send. The reader never interprets a
|
|
23
|
+
* message: text is passed on as it arrived.
|
|
24
|
+
*/
|
|
25
|
+
|
|
26
|
+
export type LinkWsFrameEvent =
|
|
27
|
+
| { type: "text"; data: string; bytes: number }
|
|
28
|
+
| { type: "binary"; bytes: number }
|
|
29
|
+
| { type: "ping"; payload: Buffer }
|
|
30
|
+
| { type: "pong"; payload: Buffer }
|
|
31
|
+
| { type: "close"; code: number | null; reason: string };
|
|
32
|
+
|
|
33
|
+
export type LinkWsProtocolFault = "protocol" | "utf8" | "too_large";
|
|
34
|
+
|
|
35
|
+
const CLOSE_FOR: Record<LinkWsProtocolFault, 1002 | 1007 | 1009> = { protocol: 1002, utf8: 1007, too_large: 1009 };
|
|
36
|
+
|
|
37
|
+
export class LinkWsProtocolError extends Error {
|
|
38
|
+
readonly closeCode: 1002 | 1007 | 1009;
|
|
39
|
+
constructor(readonly fault: LinkWsProtocolFault) {
|
|
40
|
+
super("link websocket " + fault + " error");
|
|
41
|
+
this.name = "LinkWsProtocolError";
|
|
42
|
+
this.closeCode = CLOSE_FOR[fault];
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
/** A close code that may appear in a close frame on the wire (1004, 1005, 1006 and 1015 never may). */
|
|
47
|
+
export function isWireCloseCode(code: number): boolean {
|
|
48
|
+
return Number.isInteger(code) && ((code >= 1000 && code <= 1003) || (code >= 1007 && code <= 1014) || (code >= 3000 && code <= 4999));
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
// ignoreBOM: a leading U+FEFF is part of the text and is passed on unchanged.
|
|
52
|
+
const utf8 = new TextDecoder("utf-8", { fatal: true, ignoreBOM: true });
|
|
53
|
+
|
|
54
|
+
function decodeUtf8(bytes: Uint8Array): string {
|
|
55
|
+
try { return utf8.decode(bytes); } catch { throw new LinkWsProtocolError("utf8"); }
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
interface Frame { fin: boolean; opcode: number; payload: Buffer; filled: number; fragment: boolean }
|
|
59
|
+
|
|
60
|
+
export class LinkWsFrameReader {
|
|
61
|
+
private readonly header = Buffer.alloc(14);
|
|
62
|
+
private headerLength = 0;
|
|
63
|
+
private headerNeeded = 2;
|
|
64
|
+
private frame: Frame | null = null;
|
|
65
|
+
/** Reassembly buffer for fragmented messages, allocated once at the maximum message size. */
|
|
66
|
+
private assembly: Buffer | null = null;
|
|
67
|
+
private fragmentCount = 0;
|
|
68
|
+
private fragmentBytes = 0;
|
|
69
|
+
/** Opcode of the message in progress (1 or 2), or 0 outside a message. */
|
|
70
|
+
private messageOpcode = 0;
|
|
71
|
+
private done = false;
|
|
72
|
+
|
|
73
|
+
constructor(private readonly limits: { maxMessageBytes: number; maxFragments: number }) {}
|
|
74
|
+
|
|
75
|
+
/** True once a close frame was read or a protocol error was thrown; later bytes are ignored. */
|
|
76
|
+
get closed(): boolean { return this.done; }
|
|
77
|
+
|
|
78
|
+
/** Payload bytes this reader holds references to right now (the bound is the maximum message plus 14). */
|
|
79
|
+
heldBytes(): number {
|
|
80
|
+
const own = this.frame && !this.frame.fragment ? this.frame.payload.length : 0;
|
|
81
|
+
return (this.assembly?.length ?? 0) + own + this.headerLength;
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
/**
|
|
85
|
+
* Feed bytes off the socket; returns every event they complete, in order. Events are appended to
|
|
86
|
+
* `events` as they complete, so a caller that passes its own array still has the events completed
|
|
87
|
+
* before a protocol error when push throws.
|
|
88
|
+
*/
|
|
89
|
+
push(chunk: Uint8Array, events: LinkWsFrameEvent[] = []): LinkWsFrameEvent[] {
|
|
90
|
+
let offset = 0;
|
|
91
|
+
try {
|
|
92
|
+
while (offset < chunk.length && !this.done) {
|
|
93
|
+
if (!this.frame) {
|
|
94
|
+
const take = Math.min(this.headerNeeded - this.headerLength, chunk.length - offset);
|
|
95
|
+
this.header.set(chunk.subarray(offset, offset + take), this.headerLength);
|
|
96
|
+
this.headerLength += take;
|
|
97
|
+
offset += take;
|
|
98
|
+
if (this.headerLength < this.headerNeeded) continue;
|
|
99
|
+
if (this.headerNeeded === 2) {
|
|
100
|
+
this.headerNeeded = this.firstTwo();
|
|
101
|
+
if (this.headerLength < this.headerNeeded) continue;
|
|
102
|
+
}
|
|
103
|
+
this.startFrame(events);
|
|
104
|
+
continue;
|
|
105
|
+
}
|
|
106
|
+
const frame = this.frame;
|
|
107
|
+
const take = Math.min(frame.payload.length - frame.filled, chunk.length - offset);
|
|
108
|
+
frame.payload.set(chunk.subarray(offset, offset + take), frame.filled);
|
|
109
|
+
frame.filled += take;
|
|
110
|
+
offset += take;
|
|
111
|
+
if (frame.filled === frame.payload.length) this.endFrame(frame, events);
|
|
112
|
+
}
|
|
113
|
+
} catch (error) {
|
|
114
|
+
this.done = true;
|
|
115
|
+
this.assembly = null;
|
|
116
|
+
this.frame = null;
|
|
117
|
+
throw error;
|
|
118
|
+
}
|
|
119
|
+
return events;
|
|
120
|
+
}
|
|
121
|
+
|
|
122
|
+
/** Validate the first two header bytes; returns the full header length. */
|
|
123
|
+
private firstTwo(): number {
|
|
124
|
+
const b0 = this.header[0]!, b1 = this.header[1]!;
|
|
125
|
+
const fin = (b0 & 0x80) !== 0, opcode = b0 & 0x0f, length7 = b1 & 0x7f;
|
|
126
|
+
if ((b0 & 0x70) !== 0) throw new LinkWsProtocolError("protocol");
|
|
127
|
+
if (![0, 1, 2, 8, 9, 10].includes(opcode)) throw new LinkWsProtocolError("protocol");
|
|
128
|
+
if ((b1 & 0x80) !== 0) throw new LinkWsProtocolError("protocol");
|
|
129
|
+
if (opcode >= 8 && (!fin || length7 > 125)) throw new LinkWsProtocolError("protocol");
|
|
130
|
+
if (opcode === 0 && this.messageOpcode === 0) throw new LinkWsProtocolError("protocol");
|
|
131
|
+
if ((opcode === 1 || opcode === 2) && this.messageOpcode !== 0) throw new LinkWsProtocolError("protocol");
|
|
132
|
+
return 2 + (length7 === 126 ? 2 : length7 === 127 ? 8 : 0);
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
private startFrame(events: LinkWsFrameEvent[]): void {
|
|
136
|
+
const b0 = this.header[0]!, length7 = this.header[1]! & 0x7f;
|
|
137
|
+
const opcode = b0 & 0x0f;
|
|
138
|
+
let length = length7;
|
|
139
|
+
if (length7 === 126) {
|
|
140
|
+
length = this.header.readUInt16BE(2);
|
|
141
|
+
if (length < 126) throw new LinkWsProtocolError("protocol");
|
|
142
|
+
} else if (length7 === 127) {
|
|
143
|
+
const high = this.header.readUInt32BE(2), low = this.header.readUInt32BE(6);
|
|
144
|
+
if ((high & 0x80000000) !== 0) throw new LinkWsProtocolError("protocol");
|
|
145
|
+
length = high * 2 ** 32 + low;
|
|
146
|
+
if (length <= 0xffff) throw new LinkWsProtocolError("protocol");
|
|
147
|
+
}
|
|
148
|
+
if (opcode < 8) {
|
|
149
|
+
if (this.fragmentCount + 1 > this.limits.maxFragments) throw new LinkWsProtocolError("too_large");
|
|
150
|
+
if (this.fragmentBytes + length > this.limits.maxMessageBytes) throw new LinkWsProtocolError("too_large");
|
|
151
|
+
}
|
|
152
|
+
this.headerLength = 0;
|
|
153
|
+
this.headerNeeded = 2;
|
|
154
|
+
const fin = (b0 & 0x80) !== 0;
|
|
155
|
+
// A data frame that is part of a fragmented message lands in the reassembly buffer, after the earlier fragments.
|
|
156
|
+
const fragment = opcode < 8 && (opcode === 0 || !fin);
|
|
157
|
+
let payload: Buffer;
|
|
158
|
+
if (fragment) {
|
|
159
|
+
this.assembly ??= Buffer.allocUnsafe(this.limits.maxMessageBytes);
|
|
160
|
+
payload = this.assembly.subarray(this.fragmentBytes, this.fragmentBytes + length);
|
|
161
|
+
} else payload = Buffer.allocUnsafe(length);
|
|
162
|
+
const frame: Frame = { fin, opcode, payload, filled: 0, fragment };
|
|
163
|
+
this.frame = frame;
|
|
164
|
+
if (length === 0) this.endFrame(frame, events);
|
|
165
|
+
}
|
|
166
|
+
|
|
167
|
+
private endFrame(frame: Frame, events: LinkWsFrameEvent[]): void {
|
|
168
|
+
this.frame = null;
|
|
169
|
+
const { opcode, payload } = frame;
|
|
170
|
+
if (opcode === 9) { events.push({ type: "ping", payload }); return; }
|
|
171
|
+
if (opcode === 10) { events.push({ type: "pong", payload }); return; }
|
|
172
|
+
if (opcode === 8) {
|
|
173
|
+
this.done = true;
|
|
174
|
+
if (payload.length === 0) { events.push({ type: "close", code: null, reason: "" }); return; }
|
|
175
|
+
if (payload.length === 1) throw new LinkWsProtocolError("protocol");
|
|
176
|
+
const code = payload.readUInt16BE(0);
|
|
177
|
+
if (!isWireCloseCode(code)) throw new LinkWsProtocolError("protocol");
|
|
178
|
+
events.push({ type: "close", code, reason: decodeUtf8(payload.subarray(2)) });
|
|
179
|
+
return;
|
|
180
|
+
}
|
|
181
|
+
if (opcode !== 0) this.messageOpcode = opcode;
|
|
182
|
+
this.fragmentCount += 1;
|
|
183
|
+
if (frame.fragment) this.fragmentBytes += payload.length;
|
|
184
|
+
if (!frame.fin) return;
|
|
185
|
+
const message = frame.fragment ? this.assembly!.subarray(0, this.fragmentBytes) : payload;
|
|
186
|
+
const messageOpcode = this.messageOpcode;
|
|
187
|
+
// The reassembly buffer goes with its message; `message` keeps it only until it is decoded below.
|
|
188
|
+
if (frame.fragment) this.assembly = null;
|
|
189
|
+
this.fragmentCount = 0;
|
|
190
|
+
this.fragmentBytes = 0;
|
|
191
|
+
this.messageOpcode = 0;
|
|
192
|
+
if (messageOpcode === 1) events.push({ type: "text", data: decodeUtf8(message), bytes: message.length });
|
|
193
|
+
else events.push({ type: "binary", bytes: message.length });
|
|
194
|
+
}
|
|
195
|
+
}
|
|
196
|
+
|
|
197
|
+
/** One masked client frame. The mask is fresh per frame unless a test supplies one. */
|
|
198
|
+
export function encodeClientFrame(opcode: number, payload: Uint8Array, mask: Uint8Array = randomBytes(4)): Buffer {
|
|
199
|
+
const length = payload.length;
|
|
200
|
+
const extended = length < 126 ? 0 : length <= 0xffff ? 2 : 8;
|
|
201
|
+
const headerLength = 2 + extended + 4;
|
|
202
|
+
const out = Buffer.allocUnsafe(headerLength + length);
|
|
203
|
+
out[0] = 0x80 | opcode;
|
|
204
|
+
if (extended === 0) out[1] = 0x80 | length;
|
|
205
|
+
else if (extended === 2) { out[1] = 0x80 | 126; out.writeUInt16BE(length, 2); }
|
|
206
|
+
else { out[1] = 0x80 | 127; out.writeUInt32BE(Math.floor(length / 2 ** 32), 2); out.writeUInt32BE(length >>> 0, 6); }
|
|
207
|
+
out.set(mask.subarray(0, 4), headerLength - 4);
|
|
208
|
+
const m0 = mask[0]!, m1 = mask[1]!, m2 = mask[2]!, m3 = mask[3]!;
|
|
209
|
+
let i = 0;
|
|
210
|
+
for (; i + 3 < length; i += 4) {
|
|
211
|
+
out[headerLength + i] = payload[i]! ^ m0;
|
|
212
|
+
out[headerLength + i + 1] = payload[i + 1]! ^ m1;
|
|
213
|
+
out[headerLength + i + 2] = payload[i + 2]! ^ m2;
|
|
214
|
+
out[headerLength + i + 3] = payload[i + 3]! ^ m3;
|
|
215
|
+
}
|
|
216
|
+
for (; i < length; i += 1) out[headerLength + i] = payload[i]! ^ mask[i & 3]!;
|
|
217
|
+
return out;
|
|
218
|
+
}
|
|
219
|
+
|
|
220
|
+
export function encodeClientText(text: string): Buffer {
|
|
221
|
+
return encodeClientFrame(1, Buffer.from(text, "utf8"));
|
|
222
|
+
}
|
|
223
|
+
|
|
224
|
+
/** A close frame; a code that may not appear on the wire is sent without one. The reason is cut to 123 bytes on a character boundary. */
|
|
225
|
+
export function encodeClientClose(code?: number, reason = ""): Buffer {
|
|
226
|
+
if (code === undefined || !isWireCloseCode(code)) return encodeClientFrame(8, Buffer.alloc(0));
|
|
227
|
+
let bytes = Buffer.from(reason, "utf8");
|
|
228
|
+
if (bytes.length > 123) {
|
|
229
|
+
let end = 123;
|
|
230
|
+
while (end > 0 && (bytes[end]! & 0xc0) === 0x80) end -= 1;
|
|
231
|
+
bytes = bytes.subarray(0, end);
|
|
232
|
+
}
|
|
233
|
+
const payload = Buffer.allocUnsafe(2 + bytes.length);
|
|
234
|
+
payload.writeUInt16BE(code, 0);
|
|
235
|
+
payload.set(bytes, 2);
|
|
236
|
+
return encodeClientFrame(8, payload);
|
|
237
|
+
}
|
|
238
|
+
|
|
239
|
+
export function encodeClientPong(payload: Uint8Array): Buffer {
|
|
240
|
+
return encodeClientFrame(10, payload.subarray(0, 125));
|
|
241
|
+
}
|
|
@@ -0,0 +1,177 @@
|
|
|
1
|
+
import { request, type IncomingMessage } from "node:http";
|
|
2
|
+
import type { Socket } from "node:net";
|
|
3
|
+
import { createHash, randomBytes } from "node:crypto";
|
|
4
|
+
import { clearableDeadline } from "../lib/abort";
|
|
5
|
+
import { LINK_RELAY_SESSION_HEADER, linkRelayProofMatches } from "../link/relay-auth";
|
|
6
|
+
import {
|
|
7
|
+
noteHomeConnection, relayChallenge, requestOnConnection, SingleConnectionAgent, type BoundLinkRelayTarget,
|
|
8
|
+
} from "./link-relay-transport";
|
|
9
|
+
import { LINK_CHILD_WS_LIMITS, linkWebsocketChildReady } from "./link-websocket-limits";
|
|
10
|
+
|
|
11
|
+
/**
|
|
12
|
+
* The Home leg of a link WebSocket, design T4 3.2 steps 6 to 9: one relay-auth preflight and the
|
|
13
|
+
* upgrade, on one physical connection, never a second.
|
|
14
|
+
*
|
|
15
|
+
* - The preflight is the same credential-free challenge every relayed request starts with. Its own
|
|
16
|
+
* verified answer decides: a Home that does not name the WebSocket as on (no state pair, a pair whose
|
|
17
|
+
* proof does not verify, or off) gets no upgrade, and its answer still updates the cached state under
|
|
18
|
+
* the ordering rule.
|
|
19
|
+
* - The upgrade carries the session nonce and the link key as a Bearer on that same socket, with a fresh
|
|
20
|
+
* Sec-WebSocket-Key and without Origin, Sec-WebSocket-Extensions or Sec-WebSocket-Protocol.
|
|
21
|
+
* - The 101 must be on the authenticated socket and complete: Upgrade websocket, Connection upgrade, the
|
|
22
|
+
* right Sec-WebSocket-Accept, no extension and no subprotocol. Anything else destroys the socket.
|
|
23
|
+
*
|
|
24
|
+
* Every failure is a closed word the caller maps to 426; nothing here retries or writes a frame.
|
|
25
|
+
*/
|
|
26
|
+
|
|
27
|
+
export type LinkWebsocketSetupFailure = "disabled" | "credential" | "preflight" | "not_advertised" | "home_refused" | "handshake" | "timeout" | "aborted";
|
|
28
|
+
|
|
29
|
+
export type LinkWebsocketSetup =
|
|
30
|
+
| { ok: true; socket: Socket; head: Buffer }
|
|
31
|
+
| { ok: false; reason: LinkWebsocketSetupFailure; status?: number };
|
|
32
|
+
|
|
33
|
+
const WEBSOCKET_GUID = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
|
|
34
|
+
|
|
35
|
+
/** Headers of the caller's request that never travel on the Home leg's upgrade. */
|
|
36
|
+
const UPGRADE_OMITTED = ["origin", "sec-websocket-extensions", "sec-websocket-protocol", "sec-websocket-key", "sec-websocket-version",
|
|
37
|
+
"connection", "upgrade", "host", "content-length", "transfer-encoding", LINK_RELAY_SESSION_HEADER];
|
|
38
|
+
|
|
39
|
+
export function websocketAcceptFor(key: string): string {
|
|
40
|
+
return createHash("sha1").update(key + WEBSOCKET_GUID).digest("base64");
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
function single(value: string | string[] | undefined): string | null {
|
|
44
|
+
return typeof value === "string" ? value : null;
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
/** A 101 that completes this upgrade and nothing more (design 3.2 step 8). */
|
|
48
|
+
export function validLinkUpgradeAnswer(response: Pick<IncomingMessage, "statusCode" | "headers">, key: string): boolean {
|
|
49
|
+
const headers = response.headers;
|
|
50
|
+
if (response.statusCode !== 101) return false;
|
|
51
|
+
if (single(headers.upgrade)?.trim().toLowerCase() !== "websocket") return false;
|
|
52
|
+
if (!(single(headers.connection) ?? "").toLowerCase().split(",").some(token => token.trim() === "upgrade")) return false;
|
|
53
|
+
if (single(headers["sec-websocket-accept"]) !== websocketAcceptFor(key)) return false;
|
|
54
|
+
return headers["sec-websocket-extensions"] === undefined && headers["sec-websocket-protocol"] === undefined;
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
function upgradeOnConnection(
|
|
58
|
+
url: URL, headers: Headers, agent: SingleConnectionAgent, socket: Socket, key: string, signal: AbortSignal,
|
|
59
|
+
): Promise<LinkWebsocketSetup> {
|
|
60
|
+
return new Promise(resolve => {
|
|
61
|
+
let settled = false;
|
|
62
|
+
// The signal is watched here, never handed to the request: once the socket is ours, nothing may destroy it.
|
|
63
|
+
const onAbort = () => { if (!settled) outgoing.destroy(); };
|
|
64
|
+
const settle = (result: LinkWebsocketSetup): void => {
|
|
65
|
+
if (settled) return;
|
|
66
|
+
settled = true;
|
|
67
|
+
signal.removeEventListener("abort", onAbort);
|
|
68
|
+
resolve(result);
|
|
69
|
+
};
|
|
70
|
+
const failed = (): LinkWebsocketSetup => ({ ok: false, reason: signal.aborted ? "aborted" : "handshake" });
|
|
71
|
+
const outgoing = request(url, { method: "GET", headers: Object.fromEntries(headers), agent });
|
|
72
|
+
signal.addEventListener("abort", onAbort, { once: true });
|
|
73
|
+
outgoing.on("socket", assigned => { if (assigned !== socket) outgoing.destroy(); });
|
|
74
|
+
outgoing.on("upgrade", (response: IncomingMessage, upgraded: Socket, head: Buffer) => {
|
|
75
|
+
if (settled || signal.aborted || upgraded !== socket || !validLinkUpgradeAnswer(response, key)) {
|
|
76
|
+
upgraded.destroy();
|
|
77
|
+
settle(failed());
|
|
78
|
+
return;
|
|
79
|
+
}
|
|
80
|
+
settle({ ok: true, socket: upgraded, head: Buffer.from(head) });
|
|
81
|
+
});
|
|
82
|
+
outgoing.on("response", (response: IncomingMessage) => {
|
|
83
|
+
response.resume();
|
|
84
|
+
// A 101 that the HTTP parser did not take as an upgrade (no Upgrade header) is a broken handshake, not a refusal.
|
|
85
|
+
if (response.statusCode === 101) { socket.destroy(); settle(failed()); return; }
|
|
86
|
+
settle({ ok: false, reason: signal.aborted ? "aborted" : "home_refused", status: response.statusCode });
|
|
87
|
+
});
|
|
88
|
+
outgoing.on("error", () => settle(failed()));
|
|
89
|
+
outgoing.on("close", () => settle(failed()));
|
|
90
|
+
if (signal.aborted) onAbort();
|
|
91
|
+
outgoing.end();
|
|
92
|
+
});
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
export interface LinkWebsocketSetupTimers {
|
|
96
|
+
setTimeout(callback: () => void, ms: number): unknown;
|
|
97
|
+
clearTimeout(handle: unknown): void;
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
const realTimers: LinkWebsocketSetupTimers = {
|
|
101
|
+
setTimeout(callback, ms) { const handle = setTimeout(callback, ms); (handle as { unref?: () => void }).unref?.(); return handle; },
|
|
102
|
+
clearTimeout(handle) { clearTimeout(handle as ReturnType<typeof setTimeout>); },
|
|
103
|
+
};
|
|
104
|
+
|
|
105
|
+
/**
|
|
106
|
+
* Open the Home leg. `headers` are the caller's forwarded headers with the link key already set as
|
|
107
|
+
* the Bearer (the relay builds them); `signal` is the caller's abort. The Child's release gate is
|
|
108
|
+
* checked here, before any I/O, and the upgrade has its own bound (the setup budget), so neither
|
|
109
|
+
* depends on the caller.
|
|
110
|
+
*/
|
|
111
|
+
export async function openLinkWebsocket(
|
|
112
|
+
target: BoundLinkRelayTarget, headers: Headers,
|
|
113
|
+
options: { signal: AbortSignal; preflightMs?: number; upgradeMs?: number; timers?: LinkWebsocketSetupTimers; ready?: () => boolean },
|
|
114
|
+
): Promise<LinkWebsocketSetup> {
|
|
115
|
+
const { signal } = options;
|
|
116
|
+
if (!(options.ready ?? linkWebsocketChildReady)()) return { ok: false, reason: "disabled" };
|
|
117
|
+
if (!target.linkId || !target.apiKeyId) return { ok: false, reason: "credential" };
|
|
118
|
+
const origin = new URL("http://127.0.0.1:" + target.tunnelPort);
|
|
119
|
+
let challenge: ReturnType<typeof relayChallenge>;
|
|
120
|
+
try { challenge = relayChallenge(target, origin); } catch { return { ok: false, reason: "credential" }; }
|
|
121
|
+
const agent = new SingleConnectionAgent({ keepAlive: true, maxSockets: 1, maxFreeSockets: 1 });
|
|
122
|
+
const deadline = clearableDeadline(options.preflightMs ?? LINK_CHILD_WS_LIMITS.preflightMs, signal);
|
|
123
|
+
let handedOff = false;
|
|
124
|
+
try {
|
|
125
|
+
let answer: IncomingMessage;
|
|
126
|
+
try {
|
|
127
|
+
answer = await requestOnConnection(challenge.probe, { method: "GET", signal: deadline.signal, headers: challenge.headers }, agent);
|
|
128
|
+
} catch {
|
|
129
|
+
return { ok: false, reason: signal.aborted ? "aborted" : "preflight" };
|
|
130
|
+
}
|
|
131
|
+
const proof = answer.headers["x-opencodex-link-proof"];
|
|
132
|
+
if (answer.statusCode !== 204 || typeof proof !== "string" || !linkRelayProofMatches(proof, challenge.challenge.expected)) {
|
|
133
|
+
return { ok: false, reason: "preflight", status: answer.statusCode };
|
|
134
|
+
}
|
|
135
|
+
const { websocket } = noteHomeConnection(target, challenge.challenge.nonce, answer.headers, challenge.preflight);
|
|
136
|
+
try {
|
|
137
|
+
for await (const chunk of answer) if ((chunk as Buffer).length) return { ok: false, reason: "preflight" };
|
|
138
|
+
} catch {
|
|
139
|
+
return { ok: false, reason: signal.aborted ? "aborted" : "preflight" };
|
|
140
|
+
}
|
|
141
|
+
deadline.clear();
|
|
142
|
+
if (websocket !== "on") return { ok: false, reason: "not_advertised" };
|
|
143
|
+
if (signal.aborted) return { ok: false, reason: "aborted" };
|
|
144
|
+
const socket = agent.socket;
|
|
145
|
+
if (!socket || socket.destroyed) return { ok: false, reason: "preflight" };
|
|
146
|
+
const key = randomBytes(16).toString("base64");
|
|
147
|
+
const upgradeHeaders = new Headers(headers);
|
|
148
|
+
for (const name of UPGRADE_OMITTED) upgradeHeaders.delete(name);
|
|
149
|
+
upgradeHeaders.set("connection", "Upgrade");
|
|
150
|
+
upgradeHeaders.set("upgrade", "websocket");
|
|
151
|
+
upgradeHeaders.set("sec-websocket-version", "13");
|
|
152
|
+
upgradeHeaders.set("sec-websocket-key", key);
|
|
153
|
+
upgradeHeaders.set(LINK_RELAY_SESSION_HEADER, challenge.challenge.nonce);
|
|
154
|
+
// The upgrade's own bound: a Home that proved itself and then never answers cannot hold the connection.
|
|
155
|
+
const timers = options.timers ?? realTimers;
|
|
156
|
+
const upgradeDeadline = new AbortController();
|
|
157
|
+
const timer = timers.setTimeout(() => upgradeDeadline.abort(new DOMException("link websocket upgrade deadline", "TimeoutError")),
|
|
158
|
+
options.upgradeMs ?? LINK_CHILD_WS_LIMITS.setupBudgetMs);
|
|
159
|
+
let result: LinkWebsocketSetup;
|
|
160
|
+
try {
|
|
161
|
+
result = await upgradeOnConnection(new URL("/v1/responses", origin), upgradeHeaders, agent, socket, key, AbortSignal.any([signal, upgradeDeadline.signal]));
|
|
162
|
+
} finally { timers.clearTimeout(timer); }
|
|
163
|
+
if (!result.ok && result.reason === "aborted" && !signal.aborted && upgradeDeadline.signal.aborted) result = { ok: false, reason: "timeout" };
|
|
164
|
+
if (result.ok) {
|
|
165
|
+
handedOff = true;
|
|
166
|
+
// Node drops its own error listener on upgrade: until the caller adds one, an error is recorded, never unhandled.
|
|
167
|
+
const upgraded = result.socket as Socket & { linkError?: unknown };
|
|
168
|
+
upgraded.on("error", error => { upgraded.linkError ??= error; });
|
|
169
|
+
result.socket.setTimeout(0);
|
|
170
|
+
result.socket.setNoDelay(true);
|
|
171
|
+
}
|
|
172
|
+
return result;
|
|
173
|
+
} finally {
|
|
174
|
+
deadline.clear();
|
|
175
|
+
if (!handedOff) await agent.close();
|
|
176
|
+
}
|
|
177
|
+
}
|
|
@@ -4,7 +4,7 @@ import { readManagementJsonBody } from "../server/management/body";
|
|
|
4
4
|
import type { OcxClientConnectionConfig } from "../types";
|
|
5
5
|
import { disconnectClient, syncConnectedClient } from "./connect";
|
|
6
6
|
import { linkHomeName } from "./link-home";
|
|
7
|
-
import { isLinkConnection } from "./state";
|
|
7
|
+
import { isLinkConnection, readClientConnectionState, sameClientConnectionOwner, type ClientConnectionState } from "./state";
|
|
8
8
|
|
|
9
9
|
export type HubReachability = "unknown" | "online" | "offline" | "unauthorized";
|
|
10
10
|
|
|
@@ -34,6 +34,8 @@ export interface MachineApiDeps {
|
|
|
34
34
|
setHubReachability?: (value: HubReachability) => void;
|
|
35
35
|
/** Link mode: the Home's name as this listener knows it (sidecar alias or recorded host name). */
|
|
36
36
|
linkHomeName?: () => string | null;
|
|
37
|
+
/** The saved connection; a scheduled route-intent sync can change its selection while this runs. */
|
|
38
|
+
readConnection?: () => ClientConnectionState;
|
|
37
39
|
}
|
|
38
40
|
|
|
39
41
|
const defaultDeps: MachineApiDeps = {
|
|
@@ -95,8 +97,13 @@ export async function handleMachineApi(
|
|
|
95
97
|
return Response.json(statusPayload(req, state, deps), { headers: { "Cache-Control": "no-store" } });
|
|
96
98
|
}
|
|
97
99
|
if (url.pathname === "/api/machine/clients" && readMethod) {
|
|
100
|
+
// A Link Child's route-intent tick rewrites the saved selection after this listener started.
|
|
101
|
+
// Report the saved one while it still belongs to the connection this listener serves.
|
|
102
|
+
const current = (deps.readConnection ?? readClientConnectionState)();
|
|
103
|
+
const selected = current.kind === "connected" && sameClientConnectionOwner(current.value, state)
|
|
104
|
+
? current.value.selectedClients : state.selectedClients;
|
|
98
105
|
return Response.json({
|
|
99
|
-
selectedClients: [...
|
|
106
|
+
selectedClients: [...selected],
|
|
100
107
|
journalOwner: journalOwner(),
|
|
101
108
|
shim: diagnoseCodexShim(),
|
|
102
109
|
}, { headers: { "Cache-Control": "no-store" } });
|
|
@@ -115,6 +122,10 @@ export async function handleMachineApi(
|
|
|
115
122
|
input.restartCodex === undefined ? {} : { restartCodex: input.restartCodex },
|
|
116
123
|
);
|
|
117
124
|
deps.setHubReachability?.("online");
|
|
125
|
+
// A sync whose journal handover failed is not complete: a supervised restart could undo it.
|
|
126
|
+
if (result.journalHandoverFailed) {
|
|
127
|
+
return Response.json({ success: false, ...result, error: "Codex routing was applied, but the Codex journal could not be handed to this connection; sync again, and if it repeats, sync once more after the next OpenCodex restart." }, { status: 409 });
|
|
128
|
+
}
|
|
118
129
|
return Response.json({ success: true, ...result });
|
|
119
130
|
} catch (error) {
|
|
120
131
|
const message = error instanceof Error ? error.message : "client sync failed";
|