@openscout/scout 0.2.84 → 0.2.86

package/dist/runtime/base-daemon.mjs

@@ -3,9 +3,9 @@ import "reflect-metadata";
 
 // packages/runtime/src/base-daemon.ts
 import { spawn as spawn3 } from "child_process";
-import { existsSync as existsSync6, mkdirSync as mkdirSync3, openSync, writeFileSync as writeFileSync3 } from "fs";
-import { homedir as homedir6 } from "os";
-import { dirname as dirname4, join as join6, resolve as resolve3 } from "path";
+import { existsSync as existsSync7, mkdirSync as mkdirSync4, openSync, writeFileSync as writeFileSync4 } from "fs";
+import { homedir as homedir7 } from "os";
+import { dirname as dirname5, join as join7, resolve as resolve3 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 
 // packages/runtime/src/broker-process-manager.ts
@@ -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";
 }
@@ -2042,6 +2077,28 @@ function resolveBunExecutable(env = process.env) {
     names: ["bun"]
   });
 }
+function resolveOpenScoutRepoRoot(options = {}) {
+  const starts = options.startDirectories?.map((entry) => entry?.trim()).filter((entry) => Boolean(entry));
+  if (!starts || starts.length === 0) {
+    return null;
+  }
+  for (const start of starts) {
+    let current = resolve(start);
+    while (true) {
+      const scoutEntry = join4(current, "apps", "desktop", "bin", "scout.ts");
+      const runtimeEntry = join4(current, "packages", "runtime", "bin", "openscout-runtime.mjs");
+      if (existsSync4(scoutEntry) && existsSync4(runtimeEntry)) {
+        return current;
+      }
+      const parent = dirname2(current);
+      if (parent === current) {
+        break;
+      }
+      current = parent;
+    }
+  }
+  return null;
+}
 function findExecutableOnSearchPath(name, env) {
   const searchDirectories = dedupeDirectories([
     ...splitPathEntries(env),
@@ -2126,13 +2183,13 @@ function resolveBrokerUrl(host, port, scope, env = process.env, lanHost = findLa
     return explicit;
   }
   if (scope === "mesh") {
+    if (lanHost) {
+      return buildDefaultBrokerHttpsUrl(lanHost, port);
+    }
     const tailnetHost = readTailscaleSelfWebHostsSync(env)[0];
     if (tailnetHost) {
       return buildDefaultBrokerHttpsUrl(tailnetHost, port);
     }
-    if (lanHost) {
-      return buildDefaultBrokerHttpsUrl(lanHost, port);
-    }
   }
   return buildDefaultBrokerUrl(host, port);
 }
@@ -2895,6 +2952,119 @@ if (process.argv[1] && fileURLToPath(import.meta.url) === process.argv[1] && !pr
   });
 }
 
+// packages/runtime/src/pairing-supervisor.ts
+import {
+  existsSync as existsSync6,
+  mkdirSync as mkdirSync3,
+  readFileSync as readFileSync5,
+  renameSync as renameSync3,
+  rmSync,
+  writeFileSync as writeFileSync3
+} from "fs";
+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_SUPERVISOR_PID_FILE = "supervisor.pid";
+function resolveScoutPairingSupervisorPaths(env = process.env) {
+  const configuredRoot = env.OPENSCOUT_PAIRING_HOME?.trim() || env.SCOUT_PAIRING_HOME?.trim();
+  const rootDir = configuredRoot || join6(homedir6(), ".scout", "pairing");
+  return {
+    rootDir,
+    intentPath: join6(rootDir, SCOUT_PAIRING_SUPERVISOR_INTENT_FILE),
+    runtimePidPath: join6(rootDir, SCOUT_PAIRING_RUNTIME_PID_FILE),
+    supervisorPidPath: join6(rootDir, SCOUT_PAIRING_SUPERVISOR_PID_FILE)
+  };
+}
+function readScoutPairingSupervisorIntent(intentPath = resolveScoutPairingSupervisorPaths().intentPath) {
+  const intent = readPairingIntent(intentPath);
+  return {
+    desiredState: intent.desiredState === "running" || intent.desiredState === "stopped" ? intent.desiredState : null,
+    restartGeneration: validRestartGeneration(intent.restartGeneration)
+  };
+}
+function updateScoutPairingSupervisorIntent(action, intentPath = resolveScoutPairingSupervisorPaths().intentPath) {
+  const intent = readPairingIntent(intentPath);
+  intent.desiredState = action === "stop" ? "stopped" : "running";
+  if (action === "restart") {
+    intent.restartGeneration = Math.max(Date.now(), validRestartGeneration(intent.restartGeneration) + 1);
+  }
+  writePairingIntent(intentPath, intent);
+  return readScoutPairingSupervisorIntent(intentPath);
+}
+function readScoutPairingProcessPid(path) {
+  if (!existsSync6(path))
+    return null;
+  try {
+    const pid = Number.parseInt(readFileSync5(path, "utf8").trim(), 10);
+    return Number.isInteger(pid) && pid > 0 ? pid : null;
+  } catch {
+    return null;
+  }
+}
+function isScoutPairingProcessRunning(pid) {
+  if (!pid || pid <= 0)
+    return false;
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (error) {
+    return error.code === "EPERM";
+  }
+}
+function readLiveScoutPairingSupervisorPid(supervisorPidPath = resolveScoutPairingSupervisorPaths().supervisorPidPath) {
+  const pid = readScoutPairingProcessPid(supervisorPidPath);
+  return isScoutPairingProcessRunning(pid) ? pid : null;
+}
+function claimScoutPairingSupervision(pid = process.pid, supervisorPidPath = resolveScoutPairingSupervisorPaths().supervisorPidPath) {
+  const currentPid = readLiveScoutPairingSupervisorPid(supervisorPidPath);
+  if (currentPid && currentPid !== pid) {
+    throw new Error(`Scout pairing is already supervised by pid ${currentPid}.`);
+  }
+  mkdirSync3(dirname4(supervisorPidPath), { recursive: true });
+  writeFileAtomically(supervisorPidPath, `${pid}
+`);
+}
+function releaseScoutPairingSupervision(pid = process.pid, supervisorPidPath = resolveScoutPairingSupervisorPaths().supervisorPidPath) {
+  if (readScoutPairingProcessPid(supervisorPidPath) !== pid)
+    return;
+  rmSync(supervisorPidPath, { force: true });
+}
+function readPairingIntent(intentPath) {
+  if (!existsSync6(intentPath))
+    return {};
+  try {
+    const parsed = JSON.parse(readFileSync5(intentPath, "utf8"));
+    if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+      return { desiredState: "stopped" };
+    }
+    const intent = parsed;
+    if (intent.desiredState !== "running" && intent.desiredState !== "stopped") {
+      intent.desiredState = "stopped";
+    }
+    return intent;
+  } catch {
+    return { desiredState: "stopped" };
+  }
+}
+function writePairingIntent(intentPath, intent) {
+  mkdirSync3(dirname4(intentPath), { recursive: true });
+  writeFileAtomically(intentPath, `${JSON.stringify(intent, null, 2)}
+`);
+}
+function writeFileAtomically(path, contents) {
+  const temporaryPath = `${path}.${process.pid}.${Date.now()}.tmp`;
+  try {
+    writeFileSync3(temporaryPath, contents);
+    renameSync3(temporaryPath, path);
+  } finally {
+    rmSync(temporaryPath, { force: true });
+  }
+}
+function validRestartGeneration(value) {
+  return typeof value === "number" && Number.isSafeInteger(value) && value >= 0 ? value : 0;
+}
+
 // packages/runtime/src/scout-ascii-mark.ts
 var ORB_COLS = 60;
 var ORB_ROWS = 47;
@@ -3528,6 +3698,8 @@ var BROKER_HEALTH_TIMEOUT_MS = 30000;
 var BROKER_HEALTH_POLL_MS = 250;
 var CHILD_SHUTDOWN_TIMEOUT_MS = 15000;
 var WEB_START_RETRY_MS = 5000;
+var PAIRING_RECONCILE_INTERVAL_MS = 500;
+var PAIRING_STOP_TIMEOUT_MS = 5000;
 var MENU_BUNDLE_ID = "app.openscout.scout.menu";
 var PROCESS_NAME = "scout-base";
 var BROKER_PROCESS_NAME = "scout-broker";
@@ -3544,9 +3716,17 @@ var baseKeepAlive = null;
 var webStartRetryTimer = null;
 var webStartInFlight = false;
 var parentWatcher = null;
+var pairingProcess = null;
+var pairingReconcileTimer = null;
+var pairingReconcileInFlight = false;
+var pairingRestartGeneration = null;
+var pairingRestartDelayMs = RESTART_MIN_DELAY_MS;
+var pairingNextStartAt = 0;
+var pairingSupervisionClaimed = false;
 var parentPid = Number.parseInt(process.env.OPENSCOUT_PARENT_PID ?? "0", 10);
 var config = resolveBrokerServiceConfig();
 var brokerControlUrl = buildLocalBrokerControlUrl(config.brokerHost, config.brokerPort);
+var pairingPaths = resolveScoutPairingSupervisorPaths();
 function log(message, details) {
   if (details === undefined) {
     console.log(`[openscout-base] ${message}`);
@@ -3584,15 +3764,15 @@ function resolveWebTrustedHostsEnv() {
   return appendCsvValues(process.env.OPENSCOUT_WEB_TRUSTED_HOSTS, resolveTailnetWebHosts());
 }
 function ensureDirectory(path) {
-  mkdirSync3(path, { recursive: true });
+  mkdirSync4(path, { recursive: true });
 }
 function logFile(name) {
-  const dir = join6(config.supportDirectory, "logs", "base");
+  const dir = join7(config.supportDirectory, "logs", "base");
   ensureDirectory(dir);
-  return openSync(join6(dir, name), "a");
+  return openSync(join7(dir, name), "a");
 }
 function runtimeEntrypoint(config2) {
-  return join6(config2.runtimePackageDir, "bin", "openscout-runtime.mjs");
+  return join7(config2.runtimePackageDir, "bin", "openscout-runtime.mjs");
 }
 function spawnBroker() {
   if (shuttingDown || brokerProcess) {
@@ -3696,9 +3876,9 @@ function resolveEdgeConfig() {
   });
 }
 function resolveLocalEdgeCaddyfilePath() {
-  const dir = join6(homedir6(), ".scout", "local-edge");
+  const dir = join7(homedir7(), ".scout", "local-edge");
   ensureDirectory(dir);
-  return join6(dir, "Caddyfile");
+  return join7(dir, "Caddyfile");
 }
 function resolveCaddyExecutable() {
   return process.env.OPENSCOUT_CADDY_BIN?.trim() || "caddy";
@@ -3740,7 +3920,7 @@ function startLocalEdge() {
   const edgeConfig = resolveEdgeConfig();
   const schemes = edgeConfig.scheme === "both" ? ["http", "https"] : [edgeConfig.scheme];
   const caddyfilePath = resolveLocalEdgeCaddyfilePath();
-  writeFileSync3(caddyfilePath, renderOpenScoutCaddyfile(edgeConfig), "utf8");
+  writeFileSync4(caddyfilePath, renderOpenScoutCaddyfile(edgeConfig), "utf8");
   mdnsProcesses = schemes.flatMap((scheme) => {
     const edgePort = scheme === "https" ? 443 : 80;
     const suffix = scheme.toUpperCase();
@@ -3850,7 +4030,7 @@ function scheduleWebStartRetry() {
   webStartRetryTimer.unref();
 }
 function findRepoMenuBundle() {
-  let current = dirname4(fileURLToPath2(import.meta.url));
+  let current = dirname5(fileURLToPath2(import.meta.url));
   while (true) {
     const distRoot = resolve3(current, "apps", "macos", "dist");
     const candidates = [
@@ -3858,10 +4038,10 @@ function findRepoMenuBundle() {
       resolve3(distRoot, "ScoutMenu.app")
     ];
     for (const candidate of candidates) {
-      if (existsSync6(candidate))
+      if (existsSync7(candidate))
         return candidate;
     }
-    const parent = dirname4(current);
+    const parent = dirname5(current);
     if (parent === current) {
       return null;
     }
@@ -3873,7 +4053,7 @@ function startMenuBarApp() {
     return;
   }
   const explicitBundle = process.env.OPENSCOUT_MENU_BUNDLE_PATH?.trim();
-  const repoBundle = explicitBundle && existsSync6(explicitBundle) ? explicitBundle : findRepoMenuBundle();
+  const repoBundle = explicitBundle && existsSync7(explicitBundle) ? explicitBundle : findRepoMenuBundle();
   const args = repoBundle ? [repoBundle] : ["-b", MENU_BUNDLE_ID];
   const child = spawn3("open", args, {
     stdio: ["ignore", logFile("menu.stdout.log"), logFile("menu.stderr.log")]
@@ -3886,6 +4066,177 @@ function startMenuBarApp() {
     warn("menu bar app launch failed", { target: repoBundle ?? MENU_BUNDLE_ID, code });
   });
 }
+function resolvePairingControllerCommand() {
+  const moduleDirectory = dirname5(fileURLToPath2(import.meta.url));
+  const repoRoot = resolveOpenScoutRepoRoot({
+    startDirectories: [
+      process.env.OPENSCOUT_SETUP_CWD,
+      process.cwd(),
+      moduleDirectory
+    ]
+  });
+  const setupCwd = process.env.OPENSCOUT_SETUP_CWD?.trim() || repoRoot || process.cwd();
+  const explicit = process.env.OPENSCOUT_PAIRING_RUNTIME_CONTROLLER_BIN?.trim();
+  const candidates = [
+    explicit,
+    repoRoot ? join7(repoRoot, "packages", "cli", "dist", "pairing-runtime-controller.mjs") : null,
+    repoRoot ? join7(repoRoot, "packages", "web", "dist", "pairing-runtime-controller.mjs") : null,
+    repoRoot ? join7(repoRoot, "packages", "web", "server", "pairing-runtime-controller.ts") : null,
+    resolve3(moduleDirectory, "..", "pairing-runtime-controller.mjs"),
+    join7(homedir7(), ".bun", "install", "global", "node_modules", "@openscout", "scout", "dist", "pairing-runtime-controller.mjs"),
+    join7(homedir7(), ".bun", "node_modules", "@openscout", "scout", "dist", "pairing-runtime-controller.mjs")
+  ].filter((candidate) => Boolean(candidate));
+  const entrypoint = candidates.find((candidate) => existsSync7(candidate));
+  if (!entrypoint)
+    return null;
+  if (explicit === entrypoint && !/\.(?:[cm]?js|ts)$/.test(entrypoint)) {
+    return { command: entrypoint, args: [], cwd: setupCwd };
+  }
+  const bun = resolveBunExecutable();
+  return bun ? { command: bun.path, args: [entrypoint], cwd: setupCwd } : null;
+}
+async function waitForPairingProcessExit(pid) {
+  const deadline = Date.now() + PAIRING_STOP_TIMEOUT_MS;
+  while (Date.now() < deadline) {
+    if (!isScoutPairingProcessRunning(pid))
+      return true;
+    await sleep(100);
+  }
+  return !isScoutPairingProcessRunning(pid);
+}
+async function stopPairingController() {
+  const ownedChild = pairingProcess;
+  if (ownedChild && !isChildExited(ownedChild)) {
+    pairingProcess = null;
+    await terminateChildProcess(ownedChild, "pairing controller", PAIRING_STOP_TIMEOUT_MS);
+    return;
+  }
+  const runtimePid = readScoutPairingProcessPid(pairingPaths.runtimePidPath);
+  if (!isScoutPairingProcessRunning(runtimePid)) {
+    pairingProcess = null;
+    return;
+  }
+  try {
+    process.kill(runtimePid, "SIGTERM");
+  } catch {
+    pairingProcess = null;
+    return;
+  }
+  if (!await waitForPairingProcessExit(runtimePid)) {
+    warn("pairing controller did not exit after SIGTERM; forcing shutdown", { pid: runtimePid });
+    try {
+      process.kill(runtimePid, "SIGKILL");
+    } catch {}
+  }
+  pairingProcess = null;
+}
+function spawnPairingController() {
+  if (shuttingDown || pairingProcess)
+    return;
+  const descriptor = resolvePairingControllerCommand();
+  if (!descriptor) {
+    warn("pairing controller entrypoint or Bun executable could not be resolved");
+    pairingNextStartAt = Date.now() + pairingRestartDelayMs;
+    pairingRestartDelayMs = Math.min(pairingRestartDelayMs * 2, RESTART_MAX_DELAY_MS);
+    return;
+  }
+  const child = spawn3(descriptor.command, descriptor.args, {
+    cwd: descriptor.cwd,
+    env: {
+      ...process.env,
+      OPENSCOUT_PARENT_PID: String(process.pid)
+    },
+    stdio: [
+      "ignore",
+      logFile("pairing.stdout.log"),
+      logFile("pairing.stderr.log")
+    ]
+  });
+  pairingProcess = child;
+  log("pairing controller started", { pid: child.pid, entrypoint: descriptor.args[0] ?? descriptor.command });
+  child.once("error", (error) => {
+    warn("pairing controller failed to start", error.message);
+    if (pairingProcess !== child)
+      return;
+    pairingProcess = null;
+    pairingNextStartAt = Date.now() + pairingRestartDelayMs;
+    pairingRestartDelayMs = Math.min(pairingRestartDelayMs * 2, RESTART_MAX_DELAY_MS);
+    reconcilePairingController();
+  });
+  child.once("exit", (code, signal) => {
+    if (pairingProcess !== child)
+      return;
+    pairingProcess = null;
+    if (shuttingDown)
+      return;
+    warn("pairing controller exited", { code, signal });
+    pairingNextStartAt = Date.now() + pairingRestartDelayMs;
+    pairingRestartDelayMs = Math.min(pairingRestartDelayMs * 2, RESTART_MAX_DELAY_MS);
+    reconcilePairingController();
+  });
+}
+async function reconcilePairingController() {
+  if (shuttingDown || !pairingSupervisionClaimed || pairingReconcileInFlight)
+    return;
+  pairingReconcileInFlight = true;
+  try {
+    let intent = readScoutPairingSupervisorIntent(pairingPaths.intentPath);
+    const runtimePid = readScoutPairingProcessPid(pairingPaths.runtimePidPath);
+    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 } : {});
+    }
+    if (pairingRestartGeneration === null) {
+      pairingRestartGeneration = intent.restartGeneration;
+    }
+    const restartRequested = pairingRestartGeneration !== intent.restartGeneration;
+    if (restartRequested) {
+      pairingRestartGeneration = intent.restartGeneration;
+    }
+    if (intent.desiredState !== "running") {
+      pairingNextStartAt = 0;
+      pairingRestartDelayMs = RESTART_MIN_DELAY_MS;
+      if (runtimeRunning || pairingProcess) {
+        await stopPairingController();
+      }
+      return;
+    }
+    if (restartRequested) {
+      await stopPairingController();
+    } else if (pairingProcess && !isChildExited(pairingProcess) && runtimeRunning && runtimePid === pairingProcess.pid) {
+      pairingRestartDelayMs = RESTART_MIN_DELAY_MS;
+      return;
+    } else if (runtimeRunning) {
+      await stopPairingController();
+    } else if (pairingProcess && !isChildExited(pairingProcess)) {
+      return;
+    } else {
+      pairingProcess = null;
+    }
+    if (Date.now() >= pairingNextStartAt) {
+      spawnPairingController();
+    }
+  } catch (error) {
+    warn("pairing supervisor reconciliation failed", error instanceof Error ? error.message : String(error));
+  } finally {
+    pairingReconcileInFlight = false;
+  }
+}
+function startPairingSupervision() {
+  try {
+    claimScoutPairingSupervision(process.pid, pairingPaths.supervisorPidPath);
+  } catch (error) {
+    warn("pairing supervision is owned by another live process", error instanceof Error ? error.message : String(error));
+    return;
+  }
+  pairingSupervisionClaimed = true;
+  pairingReconcileTimer = setInterval(() => {
+    reconcilePairingController();
+  }, PAIRING_RECONCILE_INTERVAL_MS);
+  pairingReconcileTimer.unref();
+  reconcilePairingController();
+}
 function isChildExited(child) {
   return child.exitCode !== null || child.signalCode !== null;
 }
@@ -3941,10 +4292,21 @@ async function shutdown(exitCode = 0) {
     clearTimeout(webStartRetryTimer);
     webStartRetryTimer = null;
   }
+  if (pairingReconcileTimer) {
+    clearInterval(pairingReconcileTimer);
+    pairingReconcileTimer = null;
+  }
   const activeCaddyProcess = caddyProcess;
   stopEdgeProcesses();
-  await terminateChildProcess(brokerProcess, "broker");
-  await terminateChildProcess(activeCaddyProcess, "local edge", 2000);
+  await Promise.all([
+    stopPairingController(),
+    terminateChildProcess(brokerProcess, "broker"),
+    terminateChildProcess(activeCaddyProcess, "local edge", 2000)
+  ]);
+  if (pairingSupervisionClaimed) {
+    releaseScoutPairingSupervision(process.pid, pairingPaths.supervisorPidPath);
+    pairingSupervisionClaimed = false;
+  }
   process.exit(exitCode);
 }
 function sleep(ms) {
@@ -3988,5 +4350,6 @@ log("starting Scout base service", {
 anchorBaseDaemonLifetime();
 spawnBroker();
 startLocalEdge();
+startPairingSupervision();
 startMenuBarApp();
 startWebWhenBrokerIsReady();