@openscout/scout 0.2.97 → 0.2.102

package/dist/openscout-terminal-relay.mjs

@@ -3,7 +3,7 @@ import { createServer } from "node:http";
 import { mkdir, writeFile } from "node:fs/promises";
 import { randomUUID } from "node:crypto";
 import { join as join7 } from "node:path";
-import { createRequire as createRequire2 } from "node:module";
+import { createRequire as createRequire3 } from "node:module";
 
 // packages/web/server/relay.ts
 import { basename, join } from "node:path";
@@ -31,7 +31,7 @@ function startProcessParentWatchdog(expectedParentPidRaw, options = {}) {
 }
 
 // packages/web/server/terminal-relay-session.ts
-import { createRequire } from "module";
+import { createRequire as createRequire2 } from "module";
 
 // packages/runtime/dist/system-probes/registry.js
 var DEFAULT_MIN_MAX_STALE_MS = 2 * 60000;
@@ -1056,12 +1056,14 @@ class ProbeCommandError extends Error {
   code;
   exitCode;
   signal;
+  stderr;
   constructor(message, options) {
     super(message);
     this.name = "ProbeCommandError";
     this.code = options.code;
     this.exitCode = options.exitCode;
     this.signal = options.signal;
+    this.stderr = options.stderr;
   }
 }
 var DEFAULT_STDOUT_CAP_BYTES = 1024 * 1024;
@@ -1182,7 +1184,7 @@ async function execProbeFile(ctx, file, args, options = {}) {
         resolve({ stdout, stderr, exitCode });
         return;
       }
-      reject(new ProbeCommandError(`${file} exited with ${exitCode ?? signal ?? "unknown status"}`, { code: "exit", exitCode, signal }));
+      reject(new ProbeCommandError(`${file} exited with ${exitCode ?? signal ?? "unknown status"}`, { code: "exit", exitCode, signal, stderr }));
     });
   });
 }
@@ -2807,6 +2809,42 @@ async function readZellijSessionExists(sessionName, options = {}) {
 }
 // packages/runtime/dist/system-probes/herdr.js
 import { homedir as homedir3 } from "node:os";
+
+// packages/protocol/dist/machines.js
+var MACHINE_LAN_SERVICE_TYPES = [
+  "_openscout._tcp",
+  "_oscout-pair._tcp",
+  "_ssh._tcp",
+  "_workstation._tcp",
+  "_rfb._tcp",
+  "_smb._tcp"
+];
+var NON_IDENTIFYING_HOST_NAMES = new Set(["localhost", "ip6-localhost", "unknown", "android"]);
+function normalizeMacAddress(value) {
+  const raw = (value ?? "").trim().toLowerCase();
+  if (!raw)
+    return "";
+  const groups = raw.split(/[:-]/);
+  const octets = groups.length === 6 ? groups.map((group) => /^[0-9a-f]{1,2}$/.test(group) ? group.padStart(2, "0") : "") : raw.replace(/[^0-9a-f]/g, "").match(/.{2}/g) ?? [];
+  if (octets.length !== 6 || octets.some((octet) => !/^[0-9a-f]{2}$/.test(octet)))
+    return "";
+  const joined = octets.join(":");
+  if (joined === "00:00:00:00:00:00")
+    return "";
+  if ((Number.parseInt(octets[0] ?? "0", 16) & 1) === 1)
+    return "";
+  return joined;
+}
+function normalizeMachineAddress(value) {
+  const raw = (value ?? "").trim().toLowerCase();
+  if (!raw)
+    return "";
+  return raw.replace(/^\[/, "").replace(/\]$/, "").replace(/%.*$/, "");
+}
+var MACHINE_ONLINE_WINDOW_MS = 2 * 60000;
+var MACHINE_RECENT_WINDOW_MS = 60 * 60000;
+
+// packages/runtime/dist/system-probes/herdr.js
 var HERDR_TTL_MS = 5000;
 var HERDR_TIMEOUT_MS = 2000;
 function herdrBin(env = process.env) {
@@ -3179,6 +3217,333 @@ var certStatusProbe = defineProbeFamily({
     };
   }
 });
+// packages/runtime/dist/system-probes/lan-scan.js
+import { spawn as spawn2 } from "node:child_process";
+import { createRequire } from "node:module";
+var require2 = createRequire(import.meta.url);
+var DEFAULT_BROWSE_MS = 2500;
+var LAN_SCAN_TTL_MS = 60000;
+var LAN_SCAN_TIMEOUT_MS = 1e4;
+var EMPTY_LAN_SCAN = {
+  services: [],
+  neighbors: [],
+  browsedTypes: [],
+  mdnsEnabled: false,
+  scannedAt: 0
+};
+var OUI_VENDORS = {
+  "00:03:93": "Apple",
+  "00:05:02": "Apple",
+  "00:0a:27": "Apple",
+  "00:0a:95": "Apple",
+  "00:17:f2": "Apple",
+  "00:1b:63": "Apple",
+  "00:1e:c2": "Apple",
+  "00:25:00": "Apple",
+  "00:26:bb": "Apple",
+  "3c:22:fb": "Apple",
+  "40:6c:8f": "Apple",
+  "5c:f9:38": "Apple",
+  "6c:40:08": "Apple",
+  "7c:d1:c3": "Apple",
+  "88:66:5a": "Apple",
+  "a4:83:e7": "Apple",
+  "ac:de:48": "Apple",
+  "b8:e8:56": "Apple",
+  "f0:18:98": "Apple",
+  "f4:d4:88": "Apple",
+  "b8:27:eb": "Raspberry Pi",
+  "dc:a6:32": "Raspberry Pi",
+  "e4:5f:01": "Raspberry Pi",
+  "d8:3a:dd": "Raspberry Pi",
+  "00:1b:21": "Intel",
+  "00:1e:67": "Intel",
+  "3c:fd:fe": "Intel",
+  "a0:36:9f": "Intel",
+  "24:0a:c4": "Espressif",
+  "7c:9e:bd": "Espressif",
+  "24:5a:4c": "Ubiquiti",
+  "78:8a:20": "Ubiquiti",
+  "fc:ec:da": "Ubiquiti",
+  "00:11:32": "Synology",
+  "00:1d:0f": "TP-Link",
+  "00:50:56": "VMware",
+  "08:00:27": "VirtualBox",
+  "52:54:00": "QEMU/KVM",
+  "00:16:3e": "Xen"
+};
+function lookupOuiVendor(macAddress) {
+  const normalized = normalizeMacAddress(macAddress);
+  if (!normalized)
+    return null;
+  return OUI_VENDORS[normalized.slice(0, 8)] ?? null;
+}
+function parseArpTable(stdout) {
+  const neighbors = [];
+  const seen = new Set;
+  for (const line of stdout.split(`
+`)) {
+    const match = line.match(/\(([^)]+)\)\s+at\s+([^\s]+)/);
+    if (!match)
+      continue;
+    const address = normalizeMachineAddress(match[1]);
+    const macAddress = normalizeMacAddress(match[2]);
+    if (!address || !macAddress)
+      continue;
+    const key = `${address}|${macAddress}`;
+    if (seen.has(key))
+      continue;
+    seen.add(key);
+    const interfaceMatch = line.match(/\bon\s+([a-z0-9._-]+)/i);
+    neighbors.push({
+      address,
+      macAddress,
+      interfaceName: interfaceMatch?.[1] ?? null,
+      vendor: lookupOuiVendor(macAddress)
+    });
+  }
+  return neighbors;
+}
+function arpBin(env = process.env) {
+  return env.OPENSCOUT_ARP_BIN?.trim() || "arp";
+}
+function isUnavailable7(error) {
+  return error instanceof ProbeCommandError && (error.code === "ENOENT" || error.code === "spawn" || error.code === "exit");
+}
+async function readArpNeighbors(ctx, env) {
+  try {
+    const { stdout } = await execProbeFile(ctx, arpBin(env), ["-an"], {
+      maxStdoutBytes: 512 * 1024,
+      maxStderrBytes: 32 * 1024
+    });
+    return parseArpTable(stdout);
+  } catch (error) {
+    if (isUnavailable7(error))
+      return [];
+    throw error;
+  }
+}
+var DNS_SD_BIN = "/usr/bin/dns-sd";
+function unescapeDnsSdLabel(value) {
+  return value.replace(/\\(\d{3}|.)/g, (_match, escape) => /^\d{3}$/.test(escape) ? String.fromCharCode(Number.parseInt(escape, 10)) : escape);
+}
+function parseDnsSdZoneDump(stdout, serviceType) {
+  const suffix = `.${serviceType.replace(/^_?/, "_")}`;
+  const byInstance = new Map;
+  const advertFor = (rawName) => {
+    if (!rawName.endsWith(suffix))
+      return null;
+    const instanceName = unescapeDnsSdLabel(rawName.slice(0, -suffix.length));
+    if (!instanceName)
+      return null;
+    const existing = byInstance.get(instanceName);
+    if (existing)
+      return existing;
+    const created = {
+      serviceType,
+      instanceName,
+      host: null,
+      addresses: [],
+      port: null,
+      txt: {}
+    };
+    byInstance.set(instanceName, created);
+    return created;
+  };
+  for (const line of stdout.split(`
+`)) {
+    const match = line.match(/^(\S+)\s+(SRV|TXT)\s+(.*)$/);
+    if (!match)
+      continue;
+    const advert = advertFor(match[1] ?? "");
+    if (!advert)
+      continue;
+    if (match[2] === "SRV") {
+      const parts = (match[3] ?? "").split(";")[0].trim().split(/\s+/);
+      const port = Number.parseInt(parts[2] ?? "", 10);
+      const target = (parts[3] ?? "").replace(/\.$/, "");
+      if (Number.isFinite(port) && port > 0)
+        advert.port = port;
+      if (target)
+        advert.host = target;
+      continue;
+    }
+    for (const pair of (match[3] ?? "").matchAll(/"([^"]*)"/g)) {
+      const entry = pair[1] ?? "";
+      const equals = entry.indexOf("=");
+      if (equals <= 0)
+        continue;
+      advert.txt[entry.slice(0, equals)] = entry.slice(equals + 1);
+    }
+  }
+  return [...byInstance.values()];
+}
+function runBoundedBrowse(file, args, windowMs, signal) {
+  return new Promise((resolve4, reject) => {
+    let child;
+    try {
+      child = spawn2(file, [...args], { stdio: ["ignore", "pipe", "ignore"], windowsHide: true });
+    } catch (error) {
+      reject(error);
+      return;
+    }
+    let stdout = "";
+    let settled = false;
+    const finish = () => {
+      if (settled)
+        return;
+      settled = true;
+      clearTimeout(timer);
+      signal?.removeEventListener("abort", finish);
+      if (!child.killed)
+        child.kill("SIGTERM");
+      resolve4(stdout);
+    };
+    const timer = setTimeout(finish, windowMs);
+    signal?.addEventListener("abort", finish, { once: true });
+    child.stdout?.on("data", (chunk) => {
+      stdout = `${stdout}${chunk}`;
+      if (stdout.length > 512 * 1024)
+        finish();
+    });
+    child.once("error", (error) => {
+      if (settled)
+        return;
+      settled = true;
+      clearTimeout(timer);
+      signal?.removeEventListener("abort", finish);
+      reject(error);
+    });
+    child.once("exit", finish);
+  });
+}
+async function browseLanServicesViaDnsSd(options = {}) {
+  const serviceTypes = options.serviceTypes ?? MACHINE_LAN_SERVICE_TYPES;
+  const browseMs = options.browseMs ?? DEFAULT_BROWSE_MS;
+  const bin = options.bin ?? DNS_SD_BIN;
+  const dumps = await Promise.all(serviceTypes.map((serviceType) => runBoundedBrowse(bin, ["-Z", serviceType, "local"], browseMs, options.signal).then((stdout) => parseDnsSdZoneDump(stdout, serviceType)).catch(() => [])));
+  return dumps.flat();
+}
+function normalizeServiceAdvert(serviceType, advertisement) {
+  const txt = {};
+  for (const [key, value] of Object.entries(advertisement.txt ?? {})) {
+    if (typeof value === "string")
+      txt[key] = value;
+    else if (typeof value === "number" || typeof value === "boolean")
+      txt[key] = String(value);
+    else if (value instanceof Uint8Array)
+      txt[key] = Buffer.from(value).toString("utf8");
+  }
+  const addresses = [];
+  for (const address of advertisement.addresses ?? []) {
+    const normalized = normalizeMachineAddress(address);
+    if (normalized && !normalized.startsWith("fe80:") && !addresses.includes(normalized)) {
+      addresses.push(normalized);
+    }
+  }
+  return {
+    serviceType,
+    instanceName: advertisement.name ?? "",
+    host: advertisement.host ?? null,
+    addresses,
+    port: typeof advertisement.port === "number" ? advertisement.port : null,
+    txt
+  };
+}
+function defaultResponderFactory() {
+  const Bonjour = require2("bonjour-service");
+  return new Bonjour;
+}
+async function browseLanServices(options = {}) {
+  const serviceTypes = options.serviceTypes ?? MACHINE_LAN_SERVICE_TYPES;
+  const browseMs = options.browseMs ?? DEFAULT_BROWSE_MS;
+  const responder = (options.responderFactory ?? defaultResponderFactory)();
+  const found = new Map;
+  const browsers = [];
+  try {
+    for (const serviceType of serviceTypes) {
+      const parsed = serviceType.match(/^_?([^.]+)\._(tcp|udp)$/);
+      if (!parsed)
+        continue;
+      const browser = responder.find({ type: parsed[1], protocol: parsed[2] }, (advertisement) => {
+        const advert = normalizeServiceAdvert(serviceType, advertisement);
+        const key = `${serviceType}|${advert.instanceName}|${advert.host ?? ""}`;
+        const existing = found.get(key);
+        if (!existing || advert.addresses.length >= existing.addresses.length) {
+          found.set(key, advert);
+        }
+      });
+      browsers.push(browser);
+    }
+    await new Promise((resolve4) => {
+      const timer = setTimeout(finish, browseMs);
+      function finish() {
+        clearTimeout(timer);
+        options.signal?.removeEventListener("abort", finish);
+        resolve4();
+      }
+      options.signal?.addEventListener("abort", finish, { once: true });
+    });
+  } finally {
+    for (const browser of browsers) {
+      try {
+        browser.stop();
+      } catch {}
+    }
+    try {
+      responder.destroy();
+    } catch {}
+  }
+  return [...found.values()].sort((a, b) => a.serviceType.localeCompare(b.serviceType) || a.instanceName.localeCompare(b.instanceName));
+}
+function isOff(value) {
+  const raw = (value ?? "").trim().toLowerCase();
+  return raw === "0" || raw === "false" || raw === "off";
+}
+function lanScanEnabled(env = process.env) {
+  return !isOff(env.OPENSCOUT_LAN_SCAN_ENABLED);
+}
+function lanMdnsBrowseEnabled(env = process.env) {
+  return !isOff(env.OPENSCOUT_MDNS_ENABLED);
+}
+function browseLanServicesForPlatform(platform, options = {}) {
+  if (platform === "darwin" && !options.responderFactory) {
+    return browseLanServicesViaDnsSd({
+      ...options.serviceTypes ? { serviceTypes: options.serviceTypes } : {},
+      ...options.browseMs !== undefined ? { browseMs: options.browseMs } : {},
+      ...options.signal ? { signal: options.signal } : {}
+    });
+  }
+  return browseLanServices(options);
+}
+async function readLanScan(ctx, env = process.env, responderFactory, platform = process.platform) {
+  if (!lanScanEnabled(env)) {
+    return { ...EMPTY_LAN_SCAN, scannedAt: Date.now() };
+  }
+  const mdnsOn = lanMdnsBrowseEnabled(env);
+  const browseMs = Number.parseInt(env.OPENSCOUT_LAN_SCAN_BROWSE_MS ?? "", 10);
+  const [neighbors, services] = await Promise.all([
+    readArpNeighbors(ctx, env),
+    mdnsOn ? browseLanServicesForPlatform(platform, {
+      browseMs: Number.isFinite(browseMs) && browseMs > 0 ? browseMs : DEFAULT_BROWSE_MS,
+      responderFactory,
+      signal: ctx.signal
+    }).catch(() => []) : Promise.resolve([])
+  ]);
+  return {
+    services,
+    neighbors,
+    browsedTypes: mdnsOn ? [...MACHINE_LAN_SERVICE_TYPES] : [],
+    mdnsEnabled: mdnsOn,
+    scannedAt: Date.now()
+  };
+}
+var lanScanProbe = defineProbe({
+  id: "lan.scan",
+  ttlMs: LAN_SCAN_TTL_MS,
+  timeoutMs: LAN_SCAN_TIMEOUT_MS,
+  run: (ctx) => readLanScan(ctx)
+});
 // packages/runtime/dist/terminal-environment.js
 var INHERITED_CLAUDE_SESSION_ENV_KEYS = [
   "CLAUDECODE",
@@ -3189,6 +3554,23 @@ var INHERITED_CLAUDE_SESSION_ENV_KEYS = [
   "CLAUDE_CODE_REMOTE_SESSION_ID",
   "CLAUDE_PID"
 ];
+var INHERITED_MULTIPLEXER_PANE_ENV_KEYS = [
+  "HERDR_ENV",
+  "HERDR_PANE_ID",
+  "HERDR_TAB_ID",
+  "HERDR_WORKSPACE_ID",
+  "HERDR_SOCKET_PATH",
+  "HERDR_STARTUP_CWD",
+  "TMUX",
+  "TMUX_PANE",
+  "ZELLIJ",
+  "ZELLIJ_SESSION_NAME",
+  "ZELLIJ_PANE_ID"
+];
+var INHERITED_TERMINAL_IDENTITY_ENV_KEYS = [
+  ...INHERITED_CLAUDE_SESSION_ENV_KEYS,
+  ...INHERITED_MULTIPLEXER_PANE_ENV_KEYS
+];
 function buildInteractiveTerminalEnvironment(base = process.env, overrides = {}) {
   const env = {
     ...base,
@@ -3197,7 +3579,7 @@ function buildInteractiveTerminalEnvironment(base = process.env, overrides = {})
     FORCE_COLOR: overrides.FORCE_COLOR || base.FORCE_COLOR || "1"
   };
   delete env.NO_COLOR;
-  for (const key of INHERITED_CLAUDE_SESSION_ENV_KEYS) {
+  for (const key of INHERITED_TERMINAL_IDENTITY_ENV_KEYS) {
     delete env[key];
   }
   return env;
@@ -3530,12 +3912,12 @@ function resolveCodexExecutableInventory(env = process.env) {
 }
 
 // packages/web/server/terminal-relay-session.ts
-var require2 = createRequire(import.meta.url);
+var require3 = createRequire2(import.meta.url);
 var pty = (() => {
   try {
-    return require2("@lydell/node-pty");
+    return require3("@lydell/node-pty");
   } catch {
-    return require2("node-pty");
+    return require3("node-pty");
   }
 })();
 var DEFAULT_ORPHAN_TTL_MS = 30 * 60 * 1000;
@@ -4240,8 +4622,8 @@ function markMuxSessionDetached(backend, name, now = Date.now()) {
 
 // packages/web/server/terminal-relay-node.ts
 process.title = "scout-relay";
-var require3 = createRequire2(import.meta.url);
-var { WebSocketServer } = require3("ws");
+var require4 = createRequire3(import.meta.url);
+var { WebSocketServer } = require4("ws");
 var hostname = process.env.OPENSCOUT_WEB_TERMINAL_RELAY_HOST?.trim() || "127.0.0.1";
 var port = Number.parseInt(process.env.OPENSCOUT_WEB_TERMINAL_RELAY_PORT?.trim() || "3201", 10);
 var parentWatchdog = startProcessParentWatchdog(process.env.OPENSCOUT_WEB_RELAY_PARENT_PID);