@dmsdc-ai/aigentry-telepty 0.4.1 → 0.4.2

package/CHANGELOG.md

@@ -2,6 +2,40 @@
 
 All notable changes to `@dmsdc-ai/aigentry-telepty` are documented here.
 
+## [0.4.2] - 2026-05-17
+
+### Fixed
+
+- **#28** — SSH-peer routing for `telepty inject` / `list` / `enter`
+  cross-machine: file-backed `peers.json` fallback resolves the prior
+  `fetch failed` against SSH peers in fresh CLI subprocesses. Previously
+  `cross-machine.js` consulted only the in-memory `activePeers` Map, which
+  is process-local and empty for every CLI subprocess spawned after
+  `telepty connect`. New: `listSshPeers` + `getSshPeerHandle` helpers
+  (`cross-machine.js`) make SSH-peer discovery/inject symmetric with the
+  existing HTTP-peer path; `pickSessionTarget` (`session-routing.js`)
+  matches `<id>@<peerName>` against the peer alias; `resolveSessionTarget`
+  (`cli.js`) enriches synthetic targets with `peerName` when the host
+  matches a known SSH peer. 7 new unit tests
+  (`test/cross-machine-ssh-routing.test.js`) + 1 new peer-alias test
+  (`test/session-routing.test.js`). Scope: `inject` / `list` / `enter`;
+  `attach` / `read-screen` / `rename` / `destroy` / `state` /
+  `session info` share the same gap but are deferred to v0.4.3+.
+
+### Notes
+
+- **Snyk SAST scan on changed files** — `cross-machine.js` +
+  `session-routing.js` + `test/cross-machine-ssh-routing.test.js` +
+  `test/session-routing.test.js` = **0 findings** (At-Inception clean).
+  `cli.js` shows **5 pre-existing findings** (2 Medium Command Injection
+  at `execSync` L469 + `pty.spawn` L1096, 3 Low Path Traversal at
+  L2308/L2310/L2619) with **identical fingerprints** vs HEAD~1 (5/5
+  verified). Line numbers for sinks below L543 shifted +21 from the
+  `resolveSessionTarget` enrichment block (cli.js L543–L566) — logical
+  source→sink unchanged; no new sink call sites added. Out of #28
+  surgical scope. Tracked in **dmsdc-ai/aigentry-telepty#26** for
+  follow-up PR.
+
 ## [0.4.1] - 2026-05-17
 
 ### Fixed

package/cli.js

@@ -542,7 +542,28 @@ function isRemoteSession(session) {
 
 async function resolveSessionTarget(sessionRef, options = {}) {
   const sessions = options.sessions || await discoverSessions({ silent: true });
-  return pickSessionTarget(sessionRef, sessions, REMOTE_HOST);
+  const target = pickSessionTarget(sessionRef, sessions, REMOTE_HOST);
+  // When <id>@<peerName> uses an SSH peer alias (e.g. `winserver`) and the
+  // session is not in `sessions` (discovery missed it, ControlMaster expired,
+  // or remote has no such session), pickSessionTarget returns a synthetic
+  // target with no peerName/remote flag. Detect SSH peer alias here so the
+  // caller routes through cross-machine.remoteInject (SSH path) rather than
+  // falling into the HTTP fetch path with `http://winserver:3848/...`. #411
+  if (
+    target &&
+    !target.peerName &&
+    target.host &&
+    target.host !== '127.0.0.1' &&
+    !target.host.includes(':') &&
+    !target.host.includes('@')
+  ) {
+    const sshPeer = crossMachine.getSshPeerHandle(target.host);
+    if (sshPeer) {
+      target.peerName = target.host;
+      target.remote = true;
+    }
+  }
+  return target;
 }
 
 async function ensureDaemonRunning(options = {}) {

package/cross-machine.js

@@ -37,6 +37,37 @@ function savePeers(data) {
 // In-memory active peers
 const activePeers = new Map(); // name -> { target, controlSocket, connectedAt, machineId }
 
+// File-backed SSH peer enumeration. Required because CLI subprocesses (fresh
+// node procs) start with an empty `activePeers` Map — only the process that
+// called connect() has it populated. peers.json is the cross-process source of
+// truth. controlPath(target) is deterministic, so any process can reuse the
+// ControlMaster socket established by an earlier connect() as long as
+// ControlPersist hasn't expired. See #411.
+function listSshPeers() {
+  const peers = loadPeers().peers || {};
+  return Object.entries(peers)
+    .filter(([, entry]) => getPeerTransport(entry) === 'ssh' && entry && entry.target)
+    .map(([name, entry]) => ({
+      name,
+      target: entry.target,
+      machineId: entry.machineId || name,
+      lastConnected: entry.lastConnected
+    }));
+}
+
+function getSshPeerHandle(name) {
+  if (activePeers.has(name)) return activePeers.get(name);
+  const peers = loadPeers().peers || {};
+  const entry = peers[name];
+  if (!entry || getPeerTransport(entry) !== 'ssh' || !entry.target) return null;
+  return {
+    target: entry.target,
+    controlSocket: controlPath(entry.target),
+    name,
+    machineId: entry.machineId || name
+  };
+}
+
 function shellQuote(value) {
   return `'${String(value).replace(/'/g, `'\\''`)}'`;
 }
@@ -175,14 +206,11 @@ function disconnectAll() {
  * @returns {Array} sessions with host info
  */
 function listRemoteSessions(name) {
-  const peer = activePeers.get(name);
+  const peer = getSshPeerHandle(name);
   if (!peer) return [];
 
   try {
-    const output = execSync(
-      `ssh -o ControlPath=${peer.controlSocket} ${peer.target} "telepty list --json"`,
-      { timeout: 10000, encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] }
-    );
+    const output = runRemoteCommand(peer, 'telepty list --json', { timeout: 10000 });
     const sessions = JSON.parse(output);
     return sessions.map(s => ({ ...s, host: peer.target, peerName: name, remote: true }));
   } catch {
@@ -191,13 +219,21 @@ function listRemoteSessions(name) {
 }
 
 /**
- * Discover sessions across all connected peers.
+ * Discover sessions across all connected peers, including SSH peers that are
+ * persisted in peers.json but not in this process's activePeers Map. Fresh
+ * CLI subprocesses depend on the file-backed path — #411.
  * @returns {Array} all remote sessions
  */
 function discoverAllRemoteSessions() {
   const allSessions = [];
+  const seen = new Set();
   for (const [name] of activePeers) {
     allSessions.push(...listRemoteSessions(name));
+    seen.add(name);
+  }
+  for (const peer of listSshPeers()) {
+    if (seen.has(peer.name)) continue;
+    allSessions.push(...listRemoteSessions(peer.name));
   }
   return allSessions;
 }
@@ -206,7 +242,7 @@ function discoverAllRemoteSessions() {
  * Inject text into a remote session via SSH.
  */
 function remoteInject(name, sessionId, prompt, options = {}) {
-  const peer = activePeers.get(name);
+  const peer = getSshPeerHandle(name);
   if (!peer) return { success: false, error: `Not connected to ${name}` };
 
   try {
@@ -227,7 +263,7 @@ function remoteInject(name, sessionId, prompt, options = {}) {
 }
 
 function remoteEnsureSharedContext(name, descriptor) {
-  const peer = activePeers.get(name);
+  const peer = getSshPeerHandle(name);
   if (!peer) return { success: false, error: `Not connected to ${name}` };
 
   try {
@@ -454,6 +490,9 @@ module.exports = {
   listHttpPeers,
   listHttpRemoteSessions,
   discoverHttpRemoteSessions,
+  // File-backed SSH peer enumeration (cross-process — #411)
+  listSshPeers,
+  getSshPeerHandle,
   getPeerTransport,
   PEERS_PATH
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dmsdc-ai/aigentry-telepty",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "main": "daemon.js",
   "bin": {
     "aigentry-telepty": "install.js",
@@ -33,9 +33,9 @@
     "CHANGELOG.md"
   ],
   "scripts": {
-    "test": "node --test test/auth.test.js test/daemon.test.js test/daemon-singleton.test.js test/cli.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/mailbox-lock.test.js test/report-enforcement.test.js test/enforce-report.test.js test/submit-gate.test.js test/prompt-symbol-registry.test.js test/inject-submit-flags.test.js test/host-spec.test.js test/cross-host-inject.test.js test/init.test.js test/win-resolve-executable.test.js && git diff --exit-code tests/snippet-protocol/v1/",
-    "test:watch": "node --test --watch test/auth.test.js test/daemon.test.js test/daemon-singleton.test.js test/cli.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/mailbox-lock.test.js test/report-enforcement.test.js test/enforce-report.test.js test/submit-gate.test.js test/prompt-symbol-registry.test.js test/inject-submit-flags.test.js test/host-spec.test.js test/cross-host-inject.test.js test/init.test.js test/win-resolve-executable.test.js",
-    "test:ci": "node --test --test-reporter=spec test/auth.test.js test/daemon.test.js test/daemon-singleton.test.js test/cli.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/mailbox-lock.test.js test/report-enforcement.test.js test/enforce-report.test.js test/submit-gate.test.js test/prompt-symbol-registry.test.js test/inject-submit-flags.test.js test/host-spec.test.js test/cross-host-inject.test.js test/init.test.js test/win-resolve-executable.test.js && git diff --exit-code tests/snippet-protocol/v1/",
+    "test": "node --test test/auth.test.js test/daemon.test.js test/daemon-singleton.test.js test/cli.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/mailbox-lock.test.js test/report-enforcement.test.js test/enforce-report.test.js test/submit-gate.test.js test/prompt-symbol-registry.test.js test/inject-submit-flags.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/win-resolve-executable.test.js && git diff --exit-code tests/snippet-protocol/v1/",
+    "test:watch": "node --test --watch test/auth.test.js test/daemon.test.js test/daemon-singleton.test.js test/cli.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/mailbox-lock.test.js test/report-enforcement.test.js test/enforce-report.test.js test/submit-gate.test.js test/prompt-symbol-registry.test.js test/inject-submit-flags.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/win-resolve-executable.test.js",
+    "test:ci": "node --test --test-reporter=spec test/auth.test.js test/daemon.test.js test/daemon-singleton.test.js test/cli.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/mailbox-lock.test.js test/report-enforcement.test.js test/enforce-report.test.js test/submit-gate.test.js test/prompt-symbol-registry.test.js test/inject-submit-flags.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/win-resolve-executable.test.js && git diff --exit-code tests/snippet-protocol/v1/",
     "regen-fixtures": "node scripts/regen-snippet-fixtures.js"
   },
   "keywords": [

package/session-routing.js

@@ -38,7 +38,12 @@ function pickSessionTarget(sessionRef, sessions, defaultHost = '127.0.0.1') {
   }
 
   if (parsed.host) {
-    const exactMatch = sessions.find((session) => session.id === parsed.id && session.host === parsed.host);
+    // Match by host or by peerName alias (e.g. `sid@winserver` where
+    // winserver is the SSH peer name and session.host is `user@FQDN`). #411
+    const exactMatch = sessions.find((session) =>
+      session.id === parsed.id &&
+      (session.host === parsed.host || session.peerName === parsed.host)
+    );
     return exactMatch || { id: parsed.id, host: parsed.host };
   }