@openscout/scout 0.2.92 → 0.2.94

package/dist/runtime/base-daemon.mjs

@@ -1827,6 +1827,39 @@ import {
 } from "fs";
 import { homedir as homedir3, hostname as osHostname } from "os";
 import { dirname, join as join3 } from "path";
+
+// packages/runtime/src/node-identity.ts
+var NODE_CARD_TTL_MS = 24 * 60 * 60 * 1000;
+var stableNodeQualifierCache = new Map;
+function stripBonjourCollisionSuffix(value) {
+  if (!value || typeof value !== "string")
+    return "";
+  let trimmed = value.trim();
+  const isDotLocal = /\.local\.?$/i.test(trimmed);
+  if (isDotLocal) {
+    trimmed = trimmed.replace(/\.local\.?$/i, "");
+  }
+  const isHyphenLocalOpenscout = /-local-openscout$/i.test(trimmed);
+  const isHyphenLocal = !isHyphenLocalOpenscout && /-local$/i.test(trimmed);
+  if (isHyphenLocalOpenscout) {
+    trimmed = trimmed.replace(/-local-openscout$/i, "");
+  } else if (isHyphenLocal) {
+    trimmed = trimmed.replace(/-local$/i, "");
+  }
+  if (!isDotLocal && !isHyphenLocalOpenscout && !isHyphenLocal) {
+    return trimmed;
+  }
+  trimmed = trimmed.replace(/(?<=[a-zA-Z].*?)(?:-\d+)+$/, "");
+  if (isDotLocal)
+    return `${trimmed}.local`;
+  if (isHyphenLocalOpenscout)
+    return `${trimmed}-local-openscout`;
+  if (isHyphenLocal)
+    return `${trimmed}-local`;
+  return trimmed;
+}
+
+// packages/runtime/src/local-config.ts
 var LOCAL_CONFIG_VERSION = 1;
 var DEFAULT_SCOUT_WEB_PORTAL_HOST = "scout.local";
 var DEFAULT_SCOUT_WEB_DEV_HOST = `dev.${DEFAULT_SCOUT_WEB_PORTAL_HOST}`;
@@ -1852,12 +1885,14 @@ var DEFAULT_LOCAL_CONFIG = {
   }
 };
 function normalizeLocalHostnameLabel(value) {
-  const firstLabel = value?.trim().replace(/\.local\.?$/i, "").split(".").find((part) => part.trim().length > 0)?.trim();
+  const stripped = value ? stripBonjourCollisionSuffix(value) : value;
+  const firstLabel = stripped?.trim().replace(/\.local\.?$/i, "").split(".").find((part) => part.trim().length > 0)?.trim();
   const normalized = firstLabel?.toLowerCase().replace(/[^a-z0-9-]+/g, "-").replace(/^-+|-+$/g, "").replace(/-{2,}/g, "-");
   return normalized || "localhost";
 }
 function normalizeLocalHostname(value) {
-  const trimmed = value?.trim().replace(/\.$/, "").toLowerCase();
+  const stripped = value ? stripBonjourCollisionSuffix(value) : value;
+  const trimmed = stripped?.trim().replace(/\.$/, "").toLowerCase();
   const labels = trimmed?.split(".").map((label) => label.trim().replace(/[^a-z0-9-]+/g, "-").replace(/^-+|-+$/g, "").replace(/-{2,}/g, "-")).filter(Boolean);
   return labels && labels.length > 0 ? labels.join(".") : "localhost";
 }
@@ -2918,8 +2953,6 @@ if (process.argv[1] && fileURLToPath(import.meta.url) === process.argv[1] && !pr
 }
 
 // packages/runtime/src/pairing-supervisor.ts
-import { execFileSync as execFileSync2 } from "child_process";
-import { randomUUID } from "crypto";
 import {
   existsSync as existsSync6,
   mkdirSync as mkdirSync3,
@@ -2932,9 +2965,7 @@ import { homedir as homedir6 } from "os";
 import { dirname as dirname4, join as join6 } from "path";
 var SCOUT_PAIRING_SUPERVISOR_INTENT_FILE = "supervisor.json";
 var SCOUT_PAIRING_RUNTIME_PID_FILE = "runtime.pid";
-var SCOUT_PAIRING_RUNTIME_OWNER_FILE = "runtime-owner.json";
 var SCOUT_PAIRING_SUPERVISOR_PID_FILE = "supervisor.pid";
-var SCOUT_PAIRING_RUNTIME_PROCESS_MARKER = "pairing-runtime-controller";
 function resolveScoutPairingSupervisorPaths(env = process.env) {
   const configuredRoot = env.OPENSCOUT_PAIRING_HOME?.trim() || env.SCOUT_PAIRING_HOME?.trim();
   const rootDir = configuredRoot || join6(homedir6(), ".scout", "pairing");
@@ -2942,7 +2973,6 @@ function resolveScoutPairingSupervisorPaths(env = process.env) {
     rootDir,
     intentPath: join6(rootDir, SCOUT_PAIRING_SUPERVISOR_INTENT_FILE),
     runtimePidPath: join6(rootDir, SCOUT_PAIRING_RUNTIME_PID_FILE),
-    runtimeOwnerPath: join6(rootDir, SCOUT_PAIRING_RUNTIME_OWNER_FILE),
     supervisorPidPath: join6(rootDir, SCOUT_PAIRING_SUPERVISOR_PID_FILE)
   };
 }
@@ -2982,84 +3012,6 @@ function isScoutPairingProcessRunning(pid) {
     return error.code === "EPERM";
   }
 }
-function isScoutPairingRuntimeOwnerPidRunning(owner, expectedPid, options = {}) {
-  if (!owner || expectedPid === null || owner.pid !== expectedPid)
-    return false;
-  return (options.isRunning ?? isScoutPairingProcessRunning)(expectedPid);
-}
-function inspectScoutPairingProcess(pid) {
-  if (!Number.isInteger(pid) || pid <= 0)
-    return null;
-  try {
-    const output = execFileSync2("ps", ["-p", String(pid), "-o", "lstart=", "-o", "command="], {
-      encoding: "utf8",
-      stdio: ["ignore", "pipe", "ignore"]
-    }).trim();
-    const startedAt = output.slice(0, 24).trim().replace(/\s+/g, " ");
-    const command = output.slice(24).trim();
-    return startedAt && command ? { pid, startedAt, command } : null;
-  } catch {
-    return null;
-  }
-}
-function readScoutPairingRuntimeOwner(ownerPath = resolveScoutPairingSupervisorPaths().runtimeOwnerPath) {
-  if (!existsSync6(ownerPath))
-    return null;
-  try {
-    const value = JSON.parse(readFileSync5(ownerPath, "utf8"));
-    return value.version === 1 && Number.isInteger(value.pid) && (value.pid ?? 0) > 0 && typeof value.token === "string" && value.token.length >= 16 && typeof value.startedAt === "string" && value.startedAt.length > 0 && typeof value.command === "string" && value.command.includes(SCOUT_PAIRING_RUNTIME_PROCESS_MARKER) && typeof value.claimedAt === "number" && Number.isFinite(value.claimedAt) ? value : null;
-  } catch {
-    return null;
-  }
-}
-function isScoutPairingRuntimeOwnerLive(owner, options = {}) {
-  if (!owner || options.expectedToken && owner.token !== options.expectedToken)
-    return false;
-  const current = (options.inspect ?? inspectScoutPairingProcess)(owner.pid);
-  return current !== null && current.startedAt === owner.startedAt && current.command === owner.command && current.command.includes(SCOUT_PAIRING_RUNTIME_PROCESS_MARKER);
-}
-function readLiveScoutPairingRuntimeOwner(ownerPath = resolveScoutPairingSupervisorPaths().runtimeOwnerPath, options = {}) {
-  const owner = readScoutPairingRuntimeOwner(ownerPath);
-  return isScoutPairingRuntimeOwnerLive(owner, options) ? owner : null;
-}
-function claimScoutPairingRuntimeOwnership(options = {}) {
-  const pid = options.pid ?? process.pid;
-  const ownerPath = options.ownerPath ?? resolveScoutPairingSupervisorPaths().runtimeOwnerPath;
-  const inspect = options.inspect ?? inspectScoutPairingProcess;
-  const existing = readLiveScoutPairingRuntimeOwner(ownerPath, { inspect });
-  if (existing && existing.pid !== pid) {
-    throw new Error(`Scout pairing runtime is already owned by pid ${existing.pid}.`);
-  }
-  const identity = inspect(pid);
-  if (!identity || !identity.command.includes(SCOUT_PAIRING_RUNTIME_PROCESS_MARKER)) {
-    throw new Error(`Cannot prove Scout pairing runtime ownership for pid ${pid}.`);
-  }
-  const owner = {
-    version: 1,
-    ...identity,
-    token: options.token?.trim() || randomUUID(),
-    claimedAt: options.now ?? Date.now()
-  };
-  mkdirSync3(dirname4(ownerPath), { recursive: true });
-  writeFileAtomically(ownerPath, `${JSON.stringify(owner, null, 2)}
-`);
-  return owner;
-}
-function signalScoutPairingRuntimeOwner(owner, signal, options = {}) {
-  const ownerPath = options.ownerPath ?? resolveScoutPairingSupervisorPaths().runtimeOwnerPath;
-  const current = readLiveScoutPairingRuntimeOwner(ownerPath, {
-    expectedToken: owner.token,
-    inspect: options.inspect
-  });
-  if (!current || current.pid !== owner.pid)
-    return false;
-  try {
-    (options.kill ?? ((pid, nextSignal) => process.kill(pid, nextSignal)))(owner.pid, signal);
-    return true;
-  } catch {
-    return false;
-  }
-}
 function readLiveScoutPairingSupervisorPid(supervisorPidPath = resolveScoutPairingSupervisorPaths().supervisorPidPath) {
   const pid = readScoutPairingProcessPid(supervisorPidPath);
   return isScoutPairingProcessRunning(pid) ? pid : null;
@@ -4143,18 +4095,14 @@ function resolvePairingControllerCommand() {
   const bun = resolveBunExecutable();
   return bun ? { command: bun.path, args: [entrypoint], cwd: setupCwd } : null;
 }
-async function waitForPairingProcessExit(owner) {
+async function waitForPairingProcessExit(pid) {
   const deadline = Date.now() + PAIRING_STOP_TIMEOUT_MS;
   while (Date.now() < deadline) {
-    if (!readLiveScoutPairingRuntimeOwner(pairingPaths.runtimeOwnerPath, {
-      expectedToken: owner.token
-    }))
+    if (!isScoutPairingProcessRunning(pid))
       return true;
     await sleep(100);
   }
-  return !readLiveScoutPairingRuntimeOwner(pairingPaths.runtimeOwnerPath, {
-    expectedToken: owner.token
-  });
+  return !isScoutPairingProcessRunning(pid);
 }
 async function stopPairingController() {
   const ownedChild = pairingProcess;
@@ -4164,27 +4112,21 @@ async function stopPairingController() {
     return;
   }
   const runtimePid = readScoutPairingProcessPid(pairingPaths.runtimePidPath);
-  const runtimeOwner = readLiveScoutPairingRuntimeOwner(pairingPaths.runtimeOwnerPath);
-  if (!runtimePid || !runtimeOwner || runtimeOwner.pid !== runtimePid) {
-    if (isScoutPairingProcessRunning(runtimePid)) {
-      warn("refusing to signal unverified pairing runtime pid", { pid: runtimePid });
-    }
+  if (!isScoutPairingProcessRunning(runtimePid)) {
     pairingProcess = null;
     return;
   }
-  if (!signalScoutPairingRuntimeOwner(runtimeOwner, "SIGTERM", {
-    ownerPath: pairingPaths.runtimeOwnerPath
-  })) {
+  try {
+    process.kill(runtimePid, "SIGTERM");
+  } catch {
     pairingProcess = null;
     return;
   }
-  if (!await waitForPairingProcessExit(runtimeOwner)) {
+  if (!await waitForPairingProcessExit(runtimePid)) {
     warn("pairing controller did not exit after SIGTERM; forcing shutdown", { pid: runtimePid });
-    if (!signalScoutPairingRuntimeOwner(runtimeOwner, "SIGKILL", {
-      ownerPath: pairingPaths.runtimeOwnerPath
-    })) {
-      warn("pairing controller ownership changed before SIGKILL; refusing escalation", { pid: runtimePid });
-    }
+    try {
+      process.kill(runtimePid, "SIGKILL");
+    } catch {}
   }
   pairingProcess = null;
 }
@@ -4240,19 +4182,7 @@ async function reconcilePairingController() {
   try {
     let intent = readScoutPairingSupervisorIntent(pairingPaths.intentPath);
     const runtimePid = readScoutPairingProcessPid(pairingPaths.runtimePidPath);
-    let runtimeOwner = readScoutPairingRuntimeOwner(pairingPaths.runtimeOwnerPath);
-    if (!runtimeOwner && runtimePid) {
-      try {
-        runtimeOwner = claimScoutPairingRuntimeOwnership({
-          pid: runtimePid,
-          ownerPath: pairingPaths.runtimeOwnerPath
-        });
-        log("adopted legacy pairing runtime ownership", { pid: runtimePid });
-      } catch {
-        runtimeOwner = null;
-      }
-    }
-    const runtimeRunning = isScoutPairingRuntimeOwnerPidRunning(runtimeOwner, runtimePid);
+    const runtimeRunning = isScoutPairingProcessRunning(runtimePid);
     if (intent.desiredState === null) {
       intent = updateScoutPairingSupervisorIntent("start", pairingPaths.intentPath);
       log(runtimeRunning ? "adopted live pairing runtime as desired running state" : "initialized pairing desired state as running", runtimeRunning ? { pid: runtimePid } : {});
@@ -4273,8 +4203,6 @@ async function reconcilePairingController() {
       return;
     }
     if (restartRequested) {
-      pairingNextStartAt = 0;
-      pairingRestartDelayMs = RESTART_MIN_DELAY_MS;
       await stopPairingController();
     } else if (pairingProcess && !isChildExited(pairingProcess) && runtimeRunning && runtimePid === pairingProcess.pid) {
       pairingRestartDelayMs = RESTART_MIN_DELAY_MS;