@dmsdc-ai/aigentry-telepty 0.6.14 → 0.6.15

package/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 All notable changes to `@dmsdc-ai/aigentry-telepty` are documented here.
 
+## 0.6.15 — 2026-07-12
+
+### Fixed
+- **#724** Cross-host `telepty attach <sid>@<host>` failed with `Unexpected server response: 200` while local attach worked. On the AUTO_TAILNET path the daemon opens two sockets on the API port (loopback primary + additive tailnet IP), but the WS `upgrade` handler was bound to the loopback listener only — a cross-host handshake hit the tailnet socket, fell through to Express `GET /api/sessions/:id`, and got HTTP 200 instead of 101. The shared upgrade handler is now attached to both listeners. Auth unchanged (`isAllowedPeer || token || jwt`, identical to inject/read-screen); a new regression test asserts both listeners upgrade to 101 and an unauthorized cross-host upgrade still rejects (401).
+- **#720** Bridge mailbox flush now drops stale parked injects (TTL, default 600s, env `TELEPTY_BRIDGE_INJECT_TTL_SECS`) and collapses consecutive duplicate payloads before delivery, with `[BRIDGE] dropped <reason>` logs. Previously every parked inject flushed on gate-open regardless of age or repetition.
+
+### Rollout
+- Both daemon-side. #724 requires a daemon restart on the **owning** node (the one hosting the session being attached); the requesting node needs no change.
+
 ## 0.6.14 — 2026-07-12
 
 ### Fixed

package/README.md

@@ -305,7 +305,7 @@ telepty runs **standalone** — it needs none of the other aigentry modules and
 
 | Module | Package | Version | Role | Maturity |
 | --- | --- | --- | --- | --- |
-| **telepty** | `@dmsdc-ai/aigentry-telepty` | 0.6.14 | Cross-terminal / cross-machine prompt transport (PTY daemon) | Shipping |
+| **telepty** | `@dmsdc-ai/aigentry-telepty` | 0.6.15 | Cross-terminal / cross-machine prompt transport (PTY daemon) | Shipping |
 | **brain** | `@dmsdc-ai/aigentry-brain` | 0.2.8 | Persistent cross-session memory (MCP server) | Early |
 | **deliberation** | `@dmsdc-ai/aigentry-deliberation` | 0.0.47 | Multi-AI structured debate + synthesis (MCP server) | Early |
 | **devkit** | `@dmsdc-ai/aigentry-devkit` | 0.0.22 | Installer/scaffold for the AI dev environment | Early |

package/cli.js

@@ -38,6 +38,7 @@ const { decideVersionAction } = require('./src/version-handshake');
 const crossMachine = require('./cross-machine');
 const { parseHostSpec, buildDaemonUrl, buildDaemonWsUrl } = require('./host-spec');
 const { FileMailbox } = require('./src/mailbox/index');
+const { filterBridgeBatch, bridgeInjectTtlSecs } = require('./src/mailbox/bridge-flush-filter');
 const readyRegistry = require('./src/prompt-symbol-registry');
 const lifecycle = require('./src/lifecycle');
 const args = process.argv.slice(2);
@@ -1797,7 +1798,19 @@ async function main() {
         batch.push(msg);
       }
       if (batch.length === 0) { bridgePendingCount = 0; return; }
-      for (const msg of batch) {
+      // #720: drop stale-parked and consecutive-duplicate injects before writing,
+      // so a long-closed gate does not deliver the same question N times or replay
+      // an inject that went stale while parked.
+      const nowSecs = Math.floor(Date.now() / 1000);
+      const { deliver, dropped } = filterBridgeBatch(batch, {
+        ttlSecs: bridgeInjectTtlSecs(process.env), nowSecs,
+      });
+      for (const { msg, reason } of dropped) {
+        // Ack so the dropped inject clears in_flight instead of lingering; never write it.
+        try { bridgeMailbox.ack(bridgeTarget, msg.msg_id); } catch {}
+        console.warn(`\x1b[33m[BRIDGE] dropped ${reason} inject ${msg.msg_id} (age=${nowSecs - msg.created_at}s)\x1b[0m`);
+      }
+      for (const msg of deliver) {
         const text = msg.payload;
         const msgId = msg.msg_id;
         setTimeout(() => {

package/daemon.js

@@ -4185,6 +4185,7 @@ function startNodeBrokerClient(deps = {}) {
 // cli.js, never this module — hence the explicit AIGENTRY_TELEPTY_DAEMON_MAIN signal. Guarding on
 // require.main ALONE (0.5.0 regression) meant app.listen never ran in production → daemon exited 0.
 let server;
+let tailnetServer; // additive tailnet listener (AUTO_TAILNET path); needs the WS upgrade handler too
 let nodeBrokerClient = null;
 if (require.main === module || process.env.AIGENTRY_TELEPTY_DAEMON_MAIN === '1') {
   if (brokerServer) {
@@ -4222,7 +4223,7 @@ if (require.main === module || process.env.AIGENTRY_TELEPTY_DAEMON_MAIN === '1')
     // socket on the same app. ponytail: fixed-PORT production shares one port on both
     // listeners; a PORT=0 ephemeral run would split ports, but the auto path is never
     // taken under PORT=0 in the suite (TELEPTY_NO_TAILNET_AUTO=1 default in setup-env.js).
-    const tailnetServer = app.listen(Number(PORT), TAILNET_IP);
+    tailnetServer = app.listen(Number(PORT), TAILNET_IP);
     tailnetServer.on('error', (e) => {
       console.warn(`[BIND] tailnet listener ${TAILNET_IP}:${Number(PORT)} unavailable (staying loopback-only): ${e && e.message}`);
     });
@@ -4544,6 +4545,7 @@ const busClients = new Set();
 
 installWebSocketTransport({
   server,
+  tailnetServer,
   sessions,
   busClients,
   expectedToken: EXPECTED_TOKEN,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dmsdc-ai/aigentry-telepty",
-  "version": "0.6.14",
+  "version": "0.6.15",
   "main": "daemon.js",
   "bin": {
     "aigentry-telepty": "install.js",
@@ -38,9 +38,9 @@
     "prepublishOnly": "node scripts/gen-readme.mjs",
     "postinstall": "node scripts/postinstall.js",
     "preuninstall": "node scripts/preuninstall.js",
-    "test": "node --require ./test-support/setup-env.js --test test/auth.test.js test/http-auth.test.js test/tailnet-autobind.test.js test/win-firewall.test.js test/broker-protocol.test.js test/broker-auth.test.js test/broker-server.test.js test/broker-client.test.js test/daemon-broker-wiring.test.js test/broker-cli.test.js test/broker-integration.test.js test/daemon.test.js test/read-screen-ansi-715.test.js test/daemon-singleton.test.js test/daemon-harness-port.test.js test/daemon-bind-default.test.js test/integration/daemon-launch.test.js test/cli.test.js test/subcommand-help.test.js test/telepty-kill.test.js test/dupid-flap-kill-stick-56.test.js test/idle-ttl.test.js test/telepty-clean-older-than.test.js test/lifecycle-transport-agnostic.test.js test/skill-installer.test.js test/interactive-terminal.test.js test/runtime-info.test.js test/session-routing.test.js test/session-state.test.js test/session-store-persistence.test.js test/mailbox-lock.test.js test/report-enforcement.test.js test/enforce-report.test.js test/peer-inject-validator.test.js test/enforce-submit-gate.test.js test/submit-gate.test.js test/submit-via-pty.test.js test/submit-render-gate.test.js test/submit-gate-restore-register-678.test.js test/submit-busy-dispatch-694.test.js test/prompt-symbol-registry.test.js test/inject-submit-flags.test.js test/inject-submit-force-env.test.js test/inject-bracketed-paste-716.test.js test/inject-consumption-evidence.test.js test/host-spec.test.js test/cross-host-inject.test.js test/cross-machine-ssh-routing.test.js test/init.test.js test/install-service-generation.test.js test/install-broker-service.test.js test/uninstall.test.js test/win-resolve-executable.test.js test/version-handshake.test.js test/ensure-daemon-running.test.js test/daemon-restart-fallback-15.test.js test/win-kill-process.test.js test/daemon-control-port-owner.test.js test/daemon-lifecycle-55.test.js test/banner-stderr-jq-safety.test.js test/bridge-supervisor-ipc.test.js test/bridge-j3-shim.test.js test/bridge-e2e.test.js test/release-0.4.5-bugfixes.test.js test/idle-unconfirmed-settle.test.js test/idle-unconfirmed-consumption.test.js test/idle-unconfirmed-decayed-619.test.js test/inject-redeliver.test.js test/provenance.test.js test/inject-audit-broker-seam.test.js test/inject-provenance-daemon.test.js test/inject-audit-log.test.js test/inject-audit-daemon.test.js test/inject-audit-cli.test.js test/inject-notfound-teardown-691.test.js && git diff --exit-code tests/snippet-protocol/v1/",
-    "test:watch": "node --require ./test-support/setup-env.js --test --watch test/auth.test.js test/http-auth.test.js test/tailnet-autobind.test.js test/win-firewall.test.js test/broker-protocol.test.js test/broker-auth.test.js test/broker-server.test.js test/broker-client.test.js test/daemon-broker-wiring.test.js test/broker-cli.test.js test/broker-integration.test.js test/daemon.test.js test/read-screen-ansi-715.test.js test/daemon-singleton.test.js test/daemon-harness-port.test.js test/daemon-bind-default.test.js test/integration/daemon-launch.test.js test/cli.test.js test/subcommand-help.test.js test/telepty-kill.test.js test/dupid-flap-kill-stick-56.test.js test/idle-ttl.test.js test/telepty-clean-older-than.test.js test/lifecycle-transport-agnostic.test.js test/skill-installer.test.js test/interactive-terminal.test.js test/runtime-info.test.js test/session-routing.test.js test/session-state.test.js test/session-store-persistence.test.js test/mailbox-lock.test.js test/report-enforcement.test.js test/enforce-report.test.js test/peer-inject-validator.test.js test/enforce-submit-gate.test.js test/submit-gate.test.js test/submit-via-pty.test.js test/submit-render-gate.test.js test/submit-gate-restore-register-678.test.js test/submit-busy-dispatch-694.test.js test/prompt-symbol-registry.test.js test/inject-submit-flags.test.js test/inject-submit-force-env.test.js test/inject-bracketed-paste-716.test.js test/inject-consumption-evidence.test.js test/host-spec.test.js test/cross-host-inject.test.js test/cross-machine-ssh-routing.test.js test/init.test.js test/install-service-generation.test.js test/install-broker-service.test.js test/uninstall.test.js test/win-resolve-executable.test.js test/version-handshake.test.js test/ensure-daemon-running.test.js test/daemon-restart-fallback-15.test.js test/win-kill-process.test.js test/daemon-control-port-owner.test.js test/daemon-lifecycle-55.test.js test/banner-stderr-jq-safety.test.js test/bridge-supervisor-ipc.test.js test/bridge-j3-shim.test.js test/bridge-e2e.test.js test/release-0.4.5-bugfixes.test.js test/idle-unconfirmed-settle.test.js test/idle-unconfirmed-consumption.test.js test/idle-unconfirmed-decayed-619.test.js test/inject-redeliver.test.js test/provenance.test.js test/inject-audit-broker-seam.test.js test/inject-provenance-daemon.test.js test/inject-audit-log.test.js test/inject-audit-daemon.test.js test/inject-audit-cli.test.js test/inject-notfound-teardown-691.test.js",
-    "test:ci": "node --require ./test-support/setup-env.js --test --test-reporter=spec test/auth.test.js test/http-auth.test.js test/tailnet-autobind.test.js test/win-firewall.test.js test/broker-protocol.test.js test/broker-auth.test.js test/broker-server.test.js test/broker-client.test.js test/daemon-broker-wiring.test.js test/broker-cli.test.js test/broker-integration.test.js test/daemon.test.js test/read-screen-ansi-715.test.js test/daemon-singleton.test.js test/daemon-harness-port.test.js test/daemon-bind-default.test.js test/integration/daemon-launch.test.js test/cli.test.js test/subcommand-help.test.js test/telepty-kill.test.js test/dupid-flap-kill-stick-56.test.js test/idle-ttl.test.js test/telepty-clean-older-than.test.js test/lifecycle-transport-agnostic.test.js test/skill-installer.test.js test/interactive-terminal.test.js test/runtime-info.test.js test/session-routing.test.js test/session-state.test.js test/session-store-persistence.test.js test/mailbox-lock.test.js test/report-enforcement.test.js test/enforce-report.test.js test/peer-inject-validator.test.js test/enforce-submit-gate.test.js test/submit-gate.test.js test/submit-via-pty.test.js test/submit-render-gate.test.js test/submit-gate-restore-register-678.test.js test/submit-busy-dispatch-694.test.js test/prompt-symbol-registry.test.js test/inject-submit-flags.test.js test/inject-submit-force-env.test.js test/inject-bracketed-paste-716.test.js test/inject-consumption-evidence.test.js test/host-spec.test.js test/cross-host-inject.test.js test/cross-machine-ssh-routing.test.js test/init.test.js test/install-service-generation.test.js test/install-broker-service.test.js test/uninstall.test.js test/win-resolve-executable.test.js test/version-handshake.test.js test/ensure-daemon-running.test.js test/daemon-restart-fallback-15.test.js test/win-kill-process.test.js test/daemon-control-port-owner.test.js test/daemon-lifecycle-55.test.js test/banner-stderr-jq-safety.test.js test/bridge-supervisor-ipc.test.js test/bridge-j3-shim.test.js test/bridge-e2e.test.js test/release-0.4.5-bugfixes.test.js test/idle-unconfirmed-settle.test.js test/idle-unconfirmed-consumption.test.js test/idle-unconfirmed-decayed-619.test.js test/inject-redeliver.test.js test/provenance.test.js test/inject-audit-broker-seam.test.js test/inject-provenance-daemon.test.js test/inject-audit-log.test.js test/inject-audit-daemon.test.js test/inject-audit-cli.test.js test/inject-notfound-teardown-691.test.js && git diff --exit-code tests/snippet-protocol/v1/",
+    "test": "node --require ./test-support/setup-env.js --test test/auth.test.js test/http-auth.test.js test/tailnet-autobind.test.js test/win-firewall.test.js test/broker-protocol.test.js test/broker-auth.test.js test/broker-server.test.js test/broker-client.test.js test/daemon-broker-wiring.test.js test/broker-cli.test.js test/broker-integration.test.js test/daemon.test.js test/read-screen-ansi-715.test.js test/daemon-singleton.test.js test/daemon-harness-port.test.js test/daemon-bind-default.test.js test/integration/daemon-launch.test.js test/cli.test.js test/subcommand-help.test.js test/telepty-kill.test.js test/dupid-flap-kill-stick-56.test.js test/idle-ttl.test.js test/telepty-clean-older-than.test.js test/lifecycle-transport-agnostic.test.js test/attach-crosshost-upgrade.test.js test/skill-installer.test.js test/interactive-terminal.test.js test/runtime-info.test.js test/session-routing.test.js test/session-state.test.js test/session-store-persistence.test.js test/mailbox-lock.test.js test/report-enforcement.test.js test/enforce-report.test.js test/peer-inject-validator.test.js test/enforce-submit-gate.test.js test/submit-gate.test.js test/submit-via-pty.test.js test/submit-render-gate.test.js test/submit-gate-restore-register-678.test.js test/submit-busy-dispatch-694.test.js test/prompt-symbol-registry.test.js test/inject-submit-flags.test.js test/inject-submit-force-env.test.js test/inject-bracketed-paste-716.test.js test/inject-consumption-evidence.test.js test/host-spec.test.js test/cross-host-inject.test.js test/cross-machine-ssh-routing.test.js test/init.test.js test/install-service-generation.test.js test/install-broker-service.test.js test/uninstall.test.js test/win-resolve-executable.test.js test/version-handshake.test.js test/ensure-daemon-running.test.js test/daemon-restart-fallback-15.test.js test/win-kill-process.test.js test/daemon-control-port-owner.test.js test/daemon-lifecycle-55.test.js test/banner-stderr-jq-safety.test.js test/bridge-supervisor-ipc.test.js test/bridge-j3-shim.test.js test/bridge-e2e.test.js test/release-0.4.5-bugfixes.test.js test/idle-unconfirmed-settle.test.js test/idle-unconfirmed-consumption.test.js test/idle-unconfirmed-decayed-619.test.js test/inject-redeliver.test.js test/provenance.test.js test/inject-audit-broker-seam.test.js test/inject-provenance-daemon.test.js test/inject-audit-log.test.js test/inject-audit-daemon.test.js test/inject-audit-cli.test.js test/inject-notfound-teardown-691.test.js && git diff --exit-code tests/snippet-protocol/v1/",
+    "test:watch": "node --require ./test-support/setup-env.js --test --watch test/auth.test.js test/http-auth.test.js test/tailnet-autobind.test.js test/win-firewall.test.js test/broker-protocol.test.js test/broker-auth.test.js test/broker-server.test.js test/broker-client.test.js test/daemon-broker-wiring.test.js test/broker-cli.test.js test/broker-integration.test.js test/daemon.test.js test/read-screen-ansi-715.test.js test/daemon-singleton.test.js test/daemon-harness-port.test.js test/daemon-bind-default.test.js test/integration/daemon-launch.test.js test/cli.test.js test/subcommand-help.test.js test/telepty-kill.test.js test/dupid-flap-kill-stick-56.test.js test/idle-ttl.test.js test/telepty-clean-older-than.test.js test/lifecycle-transport-agnostic.test.js test/attach-crosshost-upgrade.test.js test/skill-installer.test.js test/interactive-terminal.test.js test/runtime-info.test.js test/session-routing.test.js test/session-state.test.js test/session-store-persistence.test.js test/mailbox-lock.test.js test/report-enforcement.test.js test/enforce-report.test.js test/peer-inject-validator.test.js test/enforce-submit-gate.test.js test/submit-gate.test.js test/submit-via-pty.test.js test/submit-render-gate.test.js test/submit-gate-restore-register-678.test.js test/submit-busy-dispatch-694.test.js test/prompt-symbol-registry.test.js test/inject-submit-flags.test.js test/inject-submit-force-env.test.js test/inject-bracketed-paste-716.test.js test/inject-consumption-evidence.test.js test/host-spec.test.js test/cross-host-inject.test.js test/cross-machine-ssh-routing.test.js test/init.test.js test/install-service-generation.test.js test/install-broker-service.test.js test/uninstall.test.js test/win-resolve-executable.test.js test/version-handshake.test.js test/ensure-daemon-running.test.js test/daemon-restart-fallback-15.test.js test/win-kill-process.test.js test/daemon-control-port-owner.test.js test/daemon-lifecycle-55.test.js test/banner-stderr-jq-safety.test.js test/bridge-supervisor-ipc.test.js test/bridge-j3-shim.test.js test/bridge-e2e.test.js test/release-0.4.5-bugfixes.test.js test/idle-unconfirmed-settle.test.js test/idle-unconfirmed-consumption.test.js test/idle-unconfirmed-decayed-619.test.js test/inject-redeliver.test.js test/provenance.test.js test/inject-audit-broker-seam.test.js test/inject-provenance-daemon.test.js test/inject-audit-log.test.js test/inject-audit-daemon.test.js test/inject-audit-cli.test.js test/inject-notfound-teardown-691.test.js",
+    "test:ci": "node --require ./test-support/setup-env.js --test --test-reporter=spec test/auth.test.js test/http-auth.test.js test/tailnet-autobind.test.js test/win-firewall.test.js test/broker-protocol.test.js test/broker-auth.test.js test/broker-server.test.js test/broker-client.test.js test/daemon-broker-wiring.test.js test/broker-cli.test.js test/broker-integration.test.js test/daemon.test.js test/read-screen-ansi-715.test.js test/daemon-singleton.test.js test/daemon-harness-port.test.js test/daemon-bind-default.test.js test/integration/daemon-launch.test.js test/cli.test.js test/subcommand-help.test.js test/telepty-kill.test.js test/dupid-flap-kill-stick-56.test.js test/idle-ttl.test.js test/telepty-clean-older-than.test.js test/lifecycle-transport-agnostic.test.js test/attach-crosshost-upgrade.test.js test/skill-installer.test.js test/interactive-terminal.test.js test/runtime-info.test.js test/session-routing.test.js test/session-state.test.js test/session-store-persistence.test.js test/mailbox-lock.test.js test/report-enforcement.test.js test/enforce-report.test.js test/peer-inject-validator.test.js test/enforce-submit-gate.test.js test/submit-gate.test.js test/submit-via-pty.test.js test/submit-render-gate.test.js test/submit-gate-restore-register-678.test.js test/submit-busy-dispatch-694.test.js test/prompt-symbol-registry.test.js test/inject-submit-flags.test.js test/inject-submit-force-env.test.js test/inject-bracketed-paste-716.test.js test/inject-consumption-evidence.test.js test/host-spec.test.js test/cross-host-inject.test.js test/cross-machine-ssh-routing.test.js test/init.test.js test/install-service-generation.test.js test/install-broker-service.test.js test/uninstall.test.js test/win-resolve-executable.test.js test/version-handshake.test.js test/ensure-daemon-running.test.js test/daemon-restart-fallback-15.test.js test/win-kill-process.test.js test/daemon-control-port-owner.test.js test/daemon-lifecycle-55.test.js test/banner-stderr-jq-safety.test.js test/bridge-supervisor-ipc.test.js test/bridge-j3-shim.test.js test/bridge-e2e.test.js test/release-0.4.5-bugfixes.test.js test/idle-unconfirmed-settle.test.js test/idle-unconfirmed-consumption.test.js test/idle-unconfirmed-decayed-619.test.js test/inject-redeliver.test.js test/provenance.test.js test/inject-audit-broker-seam.test.js test/inject-provenance-daemon.test.js test/inject-audit-log.test.js test/inject-audit-daemon.test.js test/inject-audit-cli.test.js test/inject-notfound-teardown-691.test.js && git diff --exit-code tests/snippet-protocol/v1/",
     "typecheck": "tsc --noEmit",
     "regen-fixtures": "node scripts/regen-snippet-fixtures.js"
   },

package/src/mailbox/bridge-flush-filter.js

@@ -0,0 +1,59 @@
+'use strict';
+
+// #720 — bridge mailbox flush-path protections.
+//
+// When the bridge promptReady gate stays closed for a long window, every inject
+// PARKS in the bridge mailbox with a UNIQUE msg_id, so the mailbox's own msg_id
+// dedup can't collapse identical content. On gate-open, flushBridgeMailbox
+// dequeues the whole batch — without these filters it delivers stale copies and
+// every consecutive duplicate (observed live: same question answered 3×).
+//
+// Pure functions (no I/O) so the flush logic is unit-testable in isolation.
+
+const DEFAULT_TTL_SECS = 600; // 10 min
+
+/**
+ * Resolve the bridge-flush inject TTL (seconds) from env.
+ * Distinct from the mailbox's 24h ttlSecs (daemon delivery) — this is a
+ * bridge-flush-local staleness bound. Invalid / non-positive → default.
+ */
+function bridgeInjectTtlSecs(env = process.env) {
+  const raw = env.TELEPTY_BRIDGE_INJECT_TTL_SECS;
+  const n = Number.parseInt(raw, 10);
+  return Number.isFinite(n) && n > 0 ? n : DEFAULT_TTL_SECS;
+}
+
+/**
+ * Filter a dequeued bridge batch (oldest-first) into what to deliver vs drop.
+ *
+ * Single ordered pass:
+ *   1. TTL — nowSecs - created_at > ttlSecs → drop, reason 'stale'.
+ *   2. Dedup — payload identical to the last DELIVERED payload → drop, reason
+ *      'duplicate'. Consecutive-only: a re-ask after a different message
+ *      (Q,R,Q) survives, and a stale drop does not reset the anchor so
+ *      Q,Q(stale),Q still collapses the trailing duplicate.
+ *
+ * @returns {{ deliver: object[], dropped: {msg: object, reason: string}[] }}
+ */
+function filterBridgeBatch(batch, { ttlSecs, nowSecs }) {
+  const deliver = [];
+  const dropped = [];
+  let lastDeliveredPayload;
+  let haveDelivered = false;
+  for (const msg of batch) {
+    if (nowSecs - msg.created_at > ttlSecs) {
+      dropped.push({ msg, reason: 'stale' });
+      continue;
+    }
+    if (haveDelivered && msg.payload === lastDeliveredPayload) {
+      dropped.push({ msg, reason: 'duplicate' });
+      continue;
+    }
+    deliver.push(msg);
+    lastDeliveredPayload = msg.payload;
+    haveDelivered = true;
+  }
+  return { deliver, dropped };
+}
+
+module.exports = { filterBridgeBatch, bridgeInjectTtlSecs, DEFAULT_TTL_SECS };

package/src/transport/websocket.js

@@ -10,6 +10,7 @@ function isOpenWebSocket(ws) {
 function installWebSocketTransport(deps) {
   const {
     server,
+    tailnetServer,
     sessions,
     busClients,
     expectedToken,
@@ -281,7 +282,12 @@ function installWebSocketTransport(deps) {
     });
   });
 
-  if (server) server.on('upgrade', (req, socket, head) => {
+  // Shared upgrade handler. Attached to every provided listener so a cross-host attach reaching
+  // the additive tailnet socket (daemon.js:4225) upgrades exactly like loopback — the auth check
+  // (isAllowedPeer || token || jwt) is identical to the inject/read-screen HTTP path, so attach
+  // gains no reach those already lack. Was bound to loopback only → tailnet WS fell through to
+  // Express GET /api/sessions/:id → HTTP 200 ("Unexpected server response: 200").
+  function handleUpgrade(req, socket, head) {
     const url = new URL(req.url, 'http://' + req.headers.host);
     const token = url.searchParams.get('token');
 
@@ -304,9 +310,13 @@ function installWebSocketTransport(deps) {
     } else {
       socket.destroy();
     }
-  });
+  }
+
+  for (const listener of [server, tailnetServer]) {
+    if (listener) listener.on('upgrade', handleUpgrade);
+  }
 
-  return { wss, busWss };
+  return { wss, busWss, handleUpgrade };
 }
 
 module.exports = {