@openscout/scout 0.2.86 → 0.2.90

package/dist/runtime/base-daemon.mjs

@@ -1827,39 +1827,6 @@ 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}`;
@@ -1885,14 +1852,12 @@ var DEFAULT_LOCAL_CONFIG = {
   }
 };
 function normalizeLocalHostnameLabel(value) {
-  const stripped = value ? stripBonjourCollisionSuffix(value) : value;
-  const firstLabel = stripped?.trim().replace(/\.local\.?$/i, "").split(".").find((part) => part.trim().length > 0)?.trim();
+  const firstLabel = value?.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 stripped = value ? stripBonjourCollisionSuffix(value) : value;
-  const trimmed = stripped?.trim().replace(/\.$/, "").toLowerCase();
+  const trimmed = value?.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";
 }
@@ -2953,6 +2918,8 @@ 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,
@@ -2965,7 +2932,9 @@ 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");
@@ -2973,6 +2942,7 @@ 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)
   };
 }
@@ -3012,6 +2982,84 @@ 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;
@@ -4095,14 +4143,18 @@ function resolvePairingControllerCommand() {
   const bun = resolveBunExecutable();
   return bun ? { command: bun.path, args: [entrypoint], cwd: setupCwd } : null;
 }
-async function waitForPairingProcessExit(pid) {
+async function waitForPairingProcessExit(owner) {
   const deadline = Date.now() + PAIRING_STOP_TIMEOUT_MS;
   while (Date.now() < deadline) {
-    if (!isScoutPairingProcessRunning(pid))
+    if (!readLiveScoutPairingRuntimeOwner(pairingPaths.runtimeOwnerPath, {
+      expectedToken: owner.token
+    }))
       return true;
     await sleep(100);
   }
-  return !isScoutPairingProcessRunning(pid);
+  return !readLiveScoutPairingRuntimeOwner(pairingPaths.runtimeOwnerPath, {
+    expectedToken: owner.token
+  });
 }
 async function stopPairingController() {
   const ownedChild = pairingProcess;
@@ -4112,21 +4164,27 @@ async function stopPairingController() {
     return;
   }
   const runtimePid = readScoutPairingProcessPid(pairingPaths.runtimePidPath);
-  if (!isScoutPairingProcessRunning(runtimePid)) {
+  const runtimeOwner = readLiveScoutPairingRuntimeOwner(pairingPaths.runtimeOwnerPath);
+  if (!runtimePid || !runtimeOwner || runtimeOwner.pid !== runtimePid) {
+    if (isScoutPairingProcessRunning(runtimePid)) {
+      warn("refusing to signal unverified pairing runtime pid", { pid: runtimePid });
+    }
     pairingProcess = null;
     return;
   }
-  try {
-    process.kill(runtimePid, "SIGTERM");
-  } catch {
+  if (!signalScoutPairingRuntimeOwner(runtimeOwner, "SIGTERM", {
+    ownerPath: pairingPaths.runtimeOwnerPath
+  })) {
     pairingProcess = null;
     return;
   }
-  if (!await waitForPairingProcessExit(runtimePid)) {
+  if (!await waitForPairingProcessExit(runtimeOwner)) {
     warn("pairing controller did not exit after SIGTERM; forcing shutdown", { pid: runtimePid });
-    try {
-      process.kill(runtimePid, "SIGKILL");
-    } catch {}
+    if (!signalScoutPairingRuntimeOwner(runtimeOwner, "SIGKILL", {
+      ownerPath: pairingPaths.runtimeOwnerPath
+    })) {
+      warn("pairing controller ownership changed before SIGKILL; refusing escalation", { pid: runtimePid });
+    }
   }
   pairingProcess = null;
 }
@@ -4182,7 +4240,19 @@ async function reconcilePairingController() {
   try {
     let intent = readScoutPairingSupervisorIntent(pairingPaths.intentPath);
     const runtimePid = readScoutPairingProcessPid(pairingPaths.runtimePidPath);
-    const runtimeRunning = isScoutPairingProcessRunning(runtimePid);
+    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);
     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 } : {});
@@ -4203,6 +4273,8 @@ 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;

package/dist/runtime/broker-daemon.mjs

@@ -39809,7 +39809,7 @@ function finalize(ctx, schema) {
     result.$schema = "http://json-schema.org/draft-07/schema#";
   } else if (ctx.target === "draft-04") {
     result.$schema = "http://json-schema.org/draft-04/schema#";
-  } else if (ctx.target === "openapi-3.0") {}
+  } else if (ctx.target === "openapi-3.0") {} else {}
   if (ctx.external?.uri) {
     const id = ctx.external.registry.get(schema)?.id;
     if (!id)
@@ -40057,7 +40057,7 @@ var literalProcessor = (schema, ctx, json, _params) => {
     if (val === undefined) {
       if (ctx.unrepresentable === "throw") {
         throw new Error("Literal `undefined` cannot be represented in JSON Schema");
-      }
+      } else {}
     } else if (typeof val === "bigint") {
       if (ctx.unrepresentable === "throw") {
         throw new Error("BigInt literals cannot be represented in JSON Schema");
@@ -43866,6 +43866,7 @@ function formatScoutPermissionProfiles() {
 
 // packages/protocol/src/presence.ts
 var PRESENCE_STALE_AFTER_MS = 45000;
+var PRESENCE_REFRESH_INTERVAL_MS = 30000;
 var PRESENCE_GONE_AFTER_STALE_MS = 60000;
 function presenceLifecycle(beat, now, options = {}) {
   if (now < beat.staleAt)
@@ -44659,7 +44660,7 @@ function isScoutLaunchableHarness(value) {
   if (!value)
     return false;
   const normalized = value.trim().toLowerCase();
-  return normalized === "oc" || SCOUT_LAUNCHABLE_HARNESSES.includes(normalized);
+  return SCOUT_LAUNCHABLE_HARNESSES.includes(normalized);
 }
 function normalizeScoutReasoningEffort(value) {
   const normalized = value?.trim().toLowerCase();
@@ -53366,28 +53367,41 @@ var controlRouter = t.router({
   events: t.procedure.input(controlEventsInput).subscription(async function* ({ input, signal }) {
     const kinds = input?.kinds;
     const filter = kinds && kinds.length > 0 ? new Set(kinds) : null;
-    const backlog = snapshotRecentControlEvents(CONTROL_BACKLOG_LIMIT);
-    let startIdx = 0;
-    if (input?.since) {
-      const idx = backlog.findIndex((event) => event.id === input.since);
-      if (idx >= 0)
-        startIdx = idx + 1;
-    }
-    for (let i = startIdx;i < backlog.length; i++) {
-      const event = backlog[i];
-      if (!event)
-        continue;
-      if (filter && !filter.has(event.kind))
-        continue;
-      yield tracked(event.id, event);
-    }
-    for (const event of snapshotPresenceControlEvents()) {
-      if (filter && !filter.has(event.kind))
-        continue;
-      yield tracked(event.id, event);
-    }
-    for await (const event of controlEventIterable(kinds, signal)) {
-      yield tracked(event.id, event);
+    const liveIterator = controlEventIterable(kinds, signal)[Symbol.asyncIterator]();
+    const replayedIds = new Set;
+    try {
+      const backlog = snapshotRecentControlEvents(CONTROL_BACKLOG_LIMIT);
+      let startIdx = 0;
+      if (input?.since) {
+        const idx = backlog.findIndex((event) => event.id === input.since);
+        if (idx >= 0)
+          startIdx = idx + 1;
+      }
+      for (let i = startIdx;i < backlog.length; i++) {
+        const event = backlog[i];
+        if (!event)
+          continue;
+        if (filter && !filter.has(event.kind))
+          continue;
+        replayedIds.add(event.id);
+        yield tracked(event.id, event);
+      }
+      for (const event of snapshotPresenceControlEvents()) {
+        if (filter && !filter.has(event.kind))
+          continue;
+        replayedIds.add(event.id);
+        yield tracked(event.id, event);
+      }
+      while (true) {
+        const next = await liveIterator.next();
+        if (next.done)
+          return;
+        if (replayedIds.delete(next.value.id))
+          continue;
+        yield tracked(next.value.id, next.value);
+      }
+    } finally {
+      await liveIterator.return?.();
     }
   })
 });
@@ -54830,9 +54844,12 @@ function isTransportInferredStall(status) {
 class BrokerPresenceService {
   deps;
   presence;
+  lastPublished = new Map;
+  refreshIntervalMs;
   constructor(deps) {
     this.deps = deps;
     this.presence = new BrokerPresenceMap(deps.map);
+    this.refreshIntervalMs = Math.max(1, deps.refreshIntervalMs ?? PRESENCE_REFRESH_INTERVAL_MS);
   }
   snapshot(now = this.now()) {
     return this.presence.snapshot(now);
@@ -54856,16 +54873,23 @@ class BrokerPresenceService {
         needRef: needRefForStatus(status),
         boundConversationId: boundConversationIdForStatus(status, snapshot)
       }, now);
-      if (!result?.transitioned)
+      if (!result)
         continue;
-      this.deps.publish(this.presenceEvent(result.beat, result.previousActivity, now));
+      const lastPublished = this.lastPublished.get(agentId);
+      const refreshDue = !result.transitioned && lastPublished !== undefined && result.beat.updatedAt > lastPublished.updatedAt && now - lastPublished.at >= this.refreshIntervalMs;
+      if (!result.transitioned && !refreshDue)
+        continue;
+      this.deps.publish(this.presenceEvent(result.beat, result.transitioned ? result.previousActivity : undefined, now));
+      this.lastPublished.set(agentId, { at: now, updatedAt: result.beat.updatedAt });
       published += 1;
     }
-    this.presence.prune(now);
+    this.forgetPublished(this.presence.prune(now));
     return published;
   }
   sweep(now = this.now()) {
-    return this.presence.prune(now);
+    const dropped = this.presence.prune(now);
+    this.forgetPublished(dropped);
+    return dropped;
   }
   presenceEvent(beat, previousActivity, now) {
     return {
@@ -54880,6 +54904,10 @@ class BrokerPresenceService {
   now() {
     return this.deps.now?.() ?? Date.now();
   }
+  forgetPublished(agentIds) {
+    for (const agentId of agentIds)
+      this.lastPublished.delete(agentId);
+  }
 }
 function needRefForStatus(status) {
   if (status.subjectKind !== "question")
@@ -68726,38 +68754,6 @@ var NODE_IDENTITY_FILE = "node-identity.json";
 var NODE_FINGERPRINT_PREFIX = "osc1";
 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;
-}
-function canonicalMeshNodeId(nodeId) {
-  if (!nodeId || typeof nodeId !== "string")
-    return "";
-  return stripBonjourCollisionSuffix(nodeId);
-}
 function nodeIdentityPath(supportDirectory) {
   const dir = supportDirectory ?? resolveOpenScoutSupportPaths().supportDirectory;
   return join30(dir, NODE_IDENTITY_FILE);
@@ -68778,12 +68774,6 @@ function loadOrCreateStableNodeQualifier(fallbackName, supportDirectory) {
   const identity2 = loadOrCreateNodeIdentity(supportDirectory);
   const existing = normalizeNodeQualifier(identity2.nodeQualifier);
   if (existing) {
-    if (identity2.nodeQualifier !== existing) {
-      persistNodeIdentity(path, {
-        ...identity2,
-        nodeQualifier: existing
-      });
-    }
     stableNodeQualifierCache.set(path, existing);
     return existing;
   }
@@ -68829,7 +68819,7 @@ function readAndValidateNodeIdentity(path) {
   if (parsed.version !== 1 || !parsed.publicKey || !parsed.privateKey) {
     throw new Error(`Corrupt node identity at ${path}; remove it to generate a fresh one.`);
   }
-  if (parsed.nodeQualifier !== undefined && normalizePersistedNodeQualifier(parsed.nodeQualifier) !== parsed.nodeQualifier) {
+  if (parsed.nodeQualifier !== undefined && normalizeNodeQualifier(parsed.nodeQualifier) !== parsed.nodeQualifier) {
     throw new Error(`Corrupt node identity at ${path}; remove it to generate a fresh one.`);
   }
   try {
@@ -68842,11 +68832,8 @@ function readAndValidateNodeIdentity(path) {
   }
   return parsed;
 }
-function normalizePersistedNodeQualifier(value) {
-  return typeof value === "string" ? value.trim().toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/-+/g, "-").replace(/^-+|-+$/g, "") : "";
-}
 function normalizeNodeQualifier(value) {
-  return stripBonjourCollisionSuffix(normalizePersistedNodeQualifier(value));
+  return typeof value === "string" ? value.trim().toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/-+/g, "-").replace(/^-+|-+$/g, "") : "";
 }
 function persistNodeIdentity(path, identity2) {
   const tempPath = `${path}.${process.pid}.${randomBytes(6).toString("hex")}.tmp`;
@@ -101789,10 +101776,6 @@ function hasColumn(database, tableName, columnName) {
   const rows = database.query(`SELECT name FROM pragma_table_info('${escapedTableName}')`).all();
   return rows.some((row) => row.name === columnName);
 }
-function hasTable(database, tableName) {
-  const row = database.query("SELECT name FROM sqlite_master WHERE type = 'table' AND name = ?1").get(tableName);
-  return Boolean(row);
-}
 var CONTROL_PLANE_SCHEMA_MIGRATIONS = [
   {
     id: "runtime-session-mapping-read-model",
@@ -101971,46 +101954,6 @@ WHERE latest.invocation_id = inv.id
         database.exec("ALTER TABLE trusted_peers ADD COLUMN tls_spki_fingerprint TEXT");
       }
     }
-  },
-  {
-    id: "canonicalize-mesh-nodes-and-rehome",
-    description: "Re-homes foreign key references on Bonjour collision-suffixed ghost nodes to canonical stable node IDs and prunes ghost nodes.",
-    apply(database) {
-      if (!hasTable(database, "nodes"))
-        return;
-      const nodeRows = database.query("SELECT * FROM nodes").all();
-      for (const row of nodeRows) {
-        const canonicalId = canonicalMeshNodeId(row.id);
-        if (canonicalId && canonicalId !== row.id) {
-          const existing = nodeRows.find((r) => r.id === canonicalId);
-          if (!existing) {
-            database.query(`INSERT INTO nodes (
-                id, mesh_id, name, host_name, advertise_scope, broker_url, tailnet_name,
-                capabilities_json, labels_json, metadata_json, last_seen_at, registered_at
-              ) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12)
-              ON CONFLICT(id) DO UPDATE SET
-                last_seen_at = MAX(COALESCE(nodes.last_seen_at, 0), COALESCE(excluded.last_seen_at, 0)),
-                broker_url = COALESCE(excluded.broker_url, nodes.broker_url),
-                tailnet_name = COALESCE(excluded.tailnet_name, nodes.tailnet_name)`).run(canonicalId, row.mesh_id, stripBonjourCollisionSuffix(row.name) || row.name, stripBonjourCollisionSuffix(row.host_name ?? "") || (row.host_name ?? null), row.advertise_scope, row.broker_url ?? null, row.tailnet_name ?? null, row.capabilities_json ?? null, row.labels_json ?? null, row.metadata_json ?? null, row.last_seen_at ?? null, row.registered_at);
-          }
-          database.query("UPDATE agents SET home_node_id = ?1 WHERE home_node_id = ?2").run(canonicalId, row.id);
-          database.query("UPDATE agents SET authority_node_id = ?1 WHERE authority_node_id = ?2").run(canonicalId, row.id);
-          database.query("UPDATE agent_endpoints SET node_id = ?1 WHERE node_id = ?2").run(canonicalId, row.id);
-          database.query("UPDATE runtime_sessions SET node_id = ?1 WHERE node_id = ?2").run(canonicalId, row.id);
-          database.query("UPDATE runtime_session_aliases SET node_id = ?1 WHERE node_id = ?2").run(canonicalId, row.id);
-          database.query("UPDATE conversations SET authority_node_id = ?1 WHERE authority_node_id = ?2").run(canonicalId, row.id);
-          database.query("UPDATE conversation_read_cursors SET reader_node_id = ?1 WHERE reader_node_id = ?2").run(canonicalId, row.id);
-          database.query("UPDATE messages SET origin_node_id = ?1 WHERE origin_node_id = ?2").run(canonicalId, row.id);
-          database.query("UPDATE deliveries SET target_node_id = ?1 WHERE target_node_id = ?2").run(canonicalId, row.id);
-          database.query("UPDATE invocations SET requester_node_id = ?1 WHERE requester_node_id = ?2").run(canonicalId, row.id);
-          database.query("UPDATE invocations SET target_node_id = ?1 WHERE target_node_id = ?2").run(canonicalId, row.id);
-          database.query("UPDATE thread_events SET authority_node_id = ?1 WHERE authority_node_id = ?2").run(canonicalId, row.id);
-          database.query("UPDATE thread_cursors SET authority_node_id = ?1 WHERE authority_node_id = ?2").run(canonicalId, row.id);
-          database.query("UPDATE trusted_peers SET node_id = ?1 WHERE node_id = ?2").run(canonicalId, row.id);
-          database.query("DELETE FROM nodes WHERE id = ?1").run(row.id);
-        }
-      }
-    }
   }
 ];
 function configureControlPlaneDatabase(database) {
@@ -103037,65 +102980,11 @@ class SQLiteControlPlaneStore {
     const now = options.now ?? currentTimestampMs();
     const maxStaleAgeMs = options.maxStaleAgeMs ?? 7 * 24 * 60 * 60 * 1000;
     const staleCutoff = now - maxStaleAgeMs;
-    const nodeRows = this.db.query("SELECT * FROM nodes").all();
     const peerRows = this.db.query("SELECT * FROM trusted_peers").all();
     const rehomedMappings = [];
-    const rehomeMap = new Map;
-    for (const row of nodeRows) {
-      const canonicalId = canonicalMeshNodeId(row.id);
-      if (canonicalId && canonicalId !== row.id) {
-        rehomeMap.set(row.id, { to: canonicalId, candidateRow: row });
-      }
-    }
-    let rehomedNodeCount = 0;
+    const rehomedNodeCount = 0;
     let prunedNodeCount = 0;
     this.db.transaction(() => {
-      for (const [staleId, { to: canonicalId, candidateRow }] of rehomeMap.entries()) {
-        const existingCanonical = nodeRows.find((r) => r.id === canonicalId);
-        if (!existingCanonical) {
-          this.db.query(`INSERT INTO nodes (
-              id, mesh_id, name, host_name, advertise_scope, broker_url, tailnet_name,
-              capabilities_json, labels_json, metadata_json, last_seen_at, registered_at
-            ) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12)
-            ON CONFLICT(id) DO UPDATE SET
-              last_seen_at = MAX(COALESCE(nodes.last_seen_at, 0), COALESCE(excluded.last_seen_at, 0)),
-              broker_url = COALESCE(excluded.broker_url, nodes.broker_url),
-              tailnet_name = COALESCE(excluded.tailnet_name, nodes.tailnet_name)`).run(canonicalId, candidateRow.mesh_id, stripBonjourCollisionSuffix(candidateRow.name) || candidateRow.name, stripBonjourCollisionSuffix(candidateRow.host_name ?? "") || (candidateRow.host_name ?? null), candidateRow.advertise_scope, candidateRow.broker_url ?? null, candidateRow.tailnet_name ?? null, candidateRow.capabilities_json ?? null, candidateRow.labels_json ?? null, candidateRow.metadata_json ?? null, candidateRow.last_seen_at ?? null, candidateRow.registered_at);
-        } else {
-          this.db.query(`UPDATE nodes SET
-              last_seen_at = MAX(COALESCE(last_seen_at, 0), COALESCE(?1, 0)),
-              broker_url = COALESCE(?2, broker_url)
-             WHERE id = ?3`).run(candidateRow.last_seen_at ?? null, candidateRow.broker_url ?? null, canonicalId);
-        }
-        this.db.query("UPDATE agents SET home_node_id = ?1 WHERE home_node_id = ?2").run(canonicalId, staleId);
-        this.db.query("UPDATE agents SET authority_node_id = ?1 WHERE authority_node_id = ?2").run(canonicalId, staleId);
-        this.db.query("UPDATE agent_endpoints SET node_id = ?1 WHERE node_id = ?2").run(canonicalId, staleId);
-        this.db.query("UPDATE runtime_sessions SET node_id = ?1 WHERE node_id = ?2").run(canonicalId, staleId);
-        this.db.query("UPDATE runtime_session_aliases SET node_id = ?1 WHERE node_id = ?2").run(canonicalId, staleId);
-        this.db.query("UPDATE conversations SET authority_node_id = ?1 WHERE authority_node_id = ?2").run(canonicalId, staleId);
-        this.db.query("UPDATE conversation_read_cursors SET reader_node_id = ?1 WHERE reader_node_id = ?2").run(canonicalId, staleId);
-        this.db.query("UPDATE messages SET origin_node_id = ?1 WHERE origin_node_id = ?2").run(canonicalId, staleId);
-        this.db.query("UPDATE deliveries SET target_node_id = ?1 WHERE target_node_id = ?2").run(canonicalId, staleId);
-        this.db.query("UPDATE invocations SET requester_node_id = ?1 WHERE requester_node_id = ?2").run(canonicalId, staleId);
-        this.db.query("UPDATE invocations SET target_node_id = ?1 WHERE target_node_id = ?2").run(canonicalId, staleId);
-        this.db.query("UPDATE thread_events SET authority_node_id = ?1 WHERE authority_node_id = ?2").run(canonicalId, staleId);
-        this.db.query("UPDATE thread_cursors SET authority_node_id = ?1 WHERE authority_node_id = ?2").run(canonicalId, staleId);
-        this.db.query("UPDATE trusted_peers SET node_id = ?1 WHERE node_id = ?2").run(canonicalId, staleId);
-        const delRes = this.db.query("DELETE FROM nodes WHERE id = ?1").run(staleId);
-        if ((delRes.changes ?? 0) > 0) {
-          prunedNodeCount++;
-          rehomedNodeCount++;
-          rehomedMappings.push({ from: staleId, to: canonicalId });
-        }
-      }
-      for (const peer of peerRows) {
-        if (peer.node_id) {
-          const canonical2 = canonicalMeshNodeId(peer.node_id);
-          if (canonical2 && canonical2 !== peer.node_id) {
-            this.db.query("UPDATE trusted_peers SET node_id = ?1 WHERE key_id = ?2").run(canonical2, peer.key_id);
-          }
-        }
-      }
       const remainingNodes = this.db.query("SELECT * FROM nodes").all();
       for (const row of remainingNodes) {
         if (row.id === options.localNodeId)

package/dist/runtime/broker-process-manager.mjs

@@ -1803,12 +1803,6 @@ 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;
-
-// 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}`;

package/dist/runtime/mesh-discover.mjs

@@ -1803,12 +1803,6 @@ 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;
-
-// 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}`;