@dmsdc-ai/aigentry-telepty 0.4.0 → 0.4.2

package/CHANGELOG.md

@@ -2,6 +2,64 @@
 
 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
+
+- **#25** — Windows PATHEXT resolution for `telepty allow`. npm-global CLIs
+  (`claude`, `codex`, `gemini`) now spawn correctly with bare names on
+  Windows. Previously `telepty allow … claude` failed with
+  `Cannot create process, error code: 2` (ERROR_FILE_NOT_FOUND) because
+  node-pty's `CreateProcessW` does not walk `%PATHEXT%` the way `cmd.exe`
+  does, so the npm-global `claude.cmd` shim was unreachable from the bare
+  name. New: `src/win-resolve-executable.js` resolver (Windows-only branch
+  walks `PATH` × `PATHEXT`; POSIX no-op) + 14 unit tests. macOS/Linux
+  behavior unchanged.
+
+### Notes
+
+- **Snyk SAST scan on changed files** — `src/win-resolve-executable.js`
+  + `test/win-resolve-executable.test.js` = **0 findings** (At-Inception
+  clean). `cli.js` shows **5 pre-existing findings** (2 Medium Command
+  Injection at `execSync` L469 + `pty.spawn` L1075, 3 Low Path Traversal
+  at L2287/L2289/L2598) verified identical fingerprint vs HEAD~1 — out
+  of #25 surgical scope. Tracked in **dmsdc-ai/aigentry-telepty#26** for
+  follow-up PR.
+
 ## [0.4.0] — 2026-05-15
 
 ### Added — Phase 1 sidecar supervisor spike (M1–M5)

package/cli.js

@@ -17,6 +17,7 @@ const { getRuntimeInfo } = require('./runtime-info');
 const { formatHostLabel, groupSessionsByHost, pickSessionTarget } = require('./session-routing');
 const { buildSharedContextPrompt, createSharedContextDescriptor, ensureSharedContextFile } = require('./shared-context');
 const { runInteractiveSkillInstaller } = require('./skill-installer');
+const { resolveWindowsExecutable } = require('./src/win-resolve-executable');
 const crossMachine = require('./cross-machine');
 const { parseHostSpec, buildDaemonUrl, buildDaemonWsUrl } = require('./host-spec');
 const { FileMailbox } = require('./src/mailbox/index');
@@ -541,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 = {}) {
@@ -1068,7 +1090,10 @@ async function main() {
     }
 
     function spawnChild() {
-      child = pty.spawn(command, cmdArgs, {
+      // Windows: walk %PATHEXT% so bare names (`claude`, `codex`, `gemini`)
+      // resolve to their npm-global `.cmd`/`.ps1` shims. POSIX: no-op. (#25)
+      const resolvedCommand = resolveWindowsExecutable(command, process.env);
+      child = pty.spawn(resolvedCommand, cmdArgs, {
         name: 'xterm-256color',
         cols: process.stdout.columns || 80,
         rows: process.stdout.rows || 30,

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.0",
+  "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 && 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: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 && 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 };
   }
 

package/src/win-resolve-executable.js

@@ -0,0 +1,87 @@
+// src/win-resolve-executable.js — Windows PATHEXT-aware executable resolver
+//
+// Fixes #25: `telepty allow ... <bare-command>` on Windows fails with
+// `ERROR_FILE_NOT_FOUND` because node-pty's `CreateProcessW` does not walk
+// `%PATHEXT%` the way cmd.exe shell does. npm-global CLIs install as
+// `<cmd>.cmd` / `<cmd>.ps1`, so the bare name `claude` resolves to nothing.
+//
+// On POSIX this resolver is a no-op (execve handles PATH lookup natively).
+//
+// Exports:
+//   resolveWindowsExecutable(command, env = process.env, opts = {})
+//     → resolved absolute path on Windows when bare command is found via
+//       PATH × PATHEXT walk, the original `command` on POSIX, or throws.
+//
+// Constraints honored:
+//   - Constitution §1 lightweight: ≤80 lines, fs + path + process only.
+//   - Constitution §2 cross-platform: POSIX behavior unchanged.
+//   - Constitution §17 무의존: no new dependencies.
+
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+
+const DEFAULT_PATHEXT = '.COM;.EXE;.BAT;.CMD;.VBS;.JS';
+
+function resolveWindowsExecutable(command, env, opts) {
+  if (typeof command !== 'string' || command.length === 0) {
+    throw new Error('telepty: resolveWindowsExecutable requires a non-empty command');
+  }
+  const e = env || process.env;
+  const o = opts || {};
+  const platform = o.platform || process.platform;
+  const existsSync = o.existsSync || fs.existsSync;
+
+  if (platform !== 'win32') return command;
+
+  // Always use win32 path semantics in the Windows branch so behavior is
+  // identical when the resolver runs on a Windows host AND when tests mock
+  // `platform: 'win32'` on a POSIX host.
+  const p = path.win32;
+
+  // Already extension-bearing absolute path → trust if it exists.
+  if (p.isAbsolute(command)) {
+    return existsSync(command) ? command : tryWithExt(command, e, existsSync, command);
+  }
+
+  // Contains a separator → resolve relative to cwd, then try with extensions.
+  if (command.includes('\\') || command.includes('/')) {
+    const abs = p.resolve(command);
+    return existsSync(abs) ? abs : tryWithExt(abs, e, existsSync, command);
+  }
+
+  // Bare name → walk PATH × PATHEXT.
+  const exts = parseExts(e.PATHEXT || DEFAULT_PATHEXT);
+  const dirs = (e.PATH || '').split(';').filter(Boolean);
+  for (const dir of dirs) {
+    for (const ext of exts) {
+      const candidate = p.join(dir, command + ext);
+      if (existsSync(candidate)) return candidate;
+    }
+  }
+  throw new Error(
+    `telepty: cannot find executable "${command}" on PATH (Windows PATHEXT walk failed)`
+  );
+}
+
+function tryWithExt(absPath, env, existsSync, originalCommand) {
+  const exts = parseExts(env.PATHEXT || DEFAULT_PATHEXT);
+  for (const ext of exts) {
+    if (ext === '') continue;
+    const candidate = absPath + ext;
+    if (existsSync(candidate)) return candidate;
+  }
+  throw new Error(
+    `telepty: cannot find executable "${originalCommand}" (Windows PATHEXT walk failed)`
+  );
+}
+
+function parseExts(pathext) {
+  // Always include empty string first so an already-extension-bearing command
+  // matches before the PATHEXT-suffixed candidates.
+  const list = pathext.split(';').map((s) => s.trim()).filter(Boolean);
+  return ['', ...list];
+}
+
+module.exports = { resolveWindowsExecutable };