@openscout/scout 0.2.84 → 0.2.86

package/dist/main.mjs

@@ -146,7 +146,8 @@ function canonicalizeIdentity(input) {
   const definitionId = normalizeAgentIdentitySegment(input.definitionId);
   const workspaceQualifier = input.workspaceQualifier ? normalizeAgentIdentitySegment(input.workspaceQualifier) : undefined;
   const profile = input.profile ? normalizeAgentIdentitySegment(input.profile) : undefined;
-  const harness = input.harness ? normalizeAgentIdentitySegment(input.harness) : undefined;
+  const rawHarness = input.harness ? normalizeAgentIdentitySegment(input.harness) : undefined;
+  const harness = rawHarness === "oc" ? "opencode" : rawHarness;
   const model = input.model ? normalizeAgentIdentitySegment(input.model) : undefined;
   const nodeQualifier = input.nodeQualifier ? normalizeAgentIdentitySegment(input.nodeQualifier) : undefined;
   if (!definitionId) {
@@ -1116,6 +1117,20 @@ var init_agent_runs = () => {};
 // ../protocol/src/budget.ts
 var init_budget = () => {};
 
+// ../protocol/src/presence.ts
+function presenceLifecycle(beat, now, options = {}) {
+  if (now < beat.staleAt)
+    return "fresh";
+  const goneAfterStaleMs = options.goneAfterStaleMs ?? PRESENCE_GONE_AFTER_STALE_MS;
+  if (now < beat.staleAt + goneAfterStaleMs)
+    return "stale";
+  return "gone";
+}
+function isPresenceGone(beat, now, options = {}) {
+  return presenceLifecycle(beat, now, options) === "gone";
+}
+var PRESENCE_STALE_AFTER_MS = 45000, PRESENCE_GONE_AFTER_STALE_MS = 60000;
+
 // ../protocol/src/host-integrations.ts
 var init_host_integrations = () => {};
 
@@ -1559,7 +1574,8 @@ function parseScoutRuntimeSpec(input) {
       error: "runtime must be <harness>[/<model>[/<effort>]]"
     };
   }
-  const harness = parts[0].trim().toLowerCase();
+  const rawHarness = parts[0].trim().toLowerCase();
+  const harness = rawHarness === "oc" ? "opencode" : rawHarness;
   if (!isScoutLaunchableHarness(harness)) {
     return {
       ok: false,
@@ -1589,14 +1605,18 @@ function parseScoutRuntimeSpec(input) {
   };
 }
 function isScoutLaunchableHarness(value) {
-  return Boolean(value) && SCOUT_LAUNCHABLE_HARNESSES.includes(value.trim().toLowerCase());
+  if (!value)
+    return false;
+  const normalized = value.trim().toLowerCase();
+  return normalized === "oc" || SCOUT_LAUNCHABLE_HARNESSES.includes(normalized);
 }
 function normalizeScoutReasoningEffort(value) {
   const normalized = value?.trim().toLowerCase();
   return normalized && SCOUT_REASONING_EFFORTS.includes(normalized) ? normalized : null;
 }
 function validateScoutRuntimeTuple(input, catalog) {
-  const harness = input.harness?.trim().toLowerCase();
+  const rawHarness = input.harness?.trim().toLowerCase();
+  const harness = rawHarness === "oc" ? "opencode" : rawHarness;
   const model = input.model?.trim();
   const effortRaw = input.reasoningEffort?.trim();
   const issues = [];
@@ -1633,7 +1653,7 @@ function validateScoutRuntimeTuple(input, catalog) {
       });
     }
   }
-  const modelSelectableHarness = harness === "claude" || harness === "codex" || harness === "grok" || harness === "grok-acp";
+  const modelSelectableHarness = harness === "claude" || harness === "codex" || harness === "grok" || harness === "grok-acp" || harness === "opencode";
   if (model && harness && !modelSelectableHarness) {
     issues.push({
       code: "unsupported_model_dimension",
@@ -1693,7 +1713,9 @@ var init_runtime_profiles = __esm(() => {
     "fable",
     "kimi",
     "grok",
-    "opus"
+    "opus",
+    "oc",
+    "opencode"
   ];
 });
 
@@ -1994,6 +2016,14 @@ var init_inbox = __esm(() => {
   ];
 });
 
+// ../protocol/src/events.ts
+var EPHEMERAL_CONTROL_EVENT_KINDS;
+var init_events = __esm(() => {
+  EPHEMERAL_CONTROL_EVENT_KINDS = new Set([
+    "presence.updated"
+  ]);
+});
+
 // ../protocol/src/cursor-transport.ts
 var init_cursor_transport = () => {};
 
@@ -2137,6 +2167,7 @@ var init_src = __esm(() => {
   init_reserved_vocabulary();
   init_scout_composer();
   init_inbox();
+  init_events();
   init_permission_policy();
   init_cursor_transport();
   init_terminal_surface_id();
@@ -2320,7 +2351,7 @@ function mergeRuntimeProfileReasoningEffort(flagEffort, naturalEffort) {
   return naturalEffort ?? flagEffort;
 }
 function rejectUnsupportedRuntimeProfileEffort(profile, reasoningEffort) {
-  if (reasoningEffort && (profile === "grok" || profile === "kimi")) {
+  if (reasoningEffort && (profile === "grok" || profile === "kimi" || profile === "oc" || profile === "opencode")) {
     throw new ScoutCliError(`reasoning_effort_harness_mismatch: ${profile} runtime profile does not support reasoning effort through its ACP transport`);
   }
 }
@@ -2458,7 +2489,7 @@ function parseSetupCommandOptions(args, defaultCurrentDirectory) {
     }
     if (current === "--default-harness" || current.startsWith("--default-harness=")) {
       const value = parseFlagValue(parsed.args, index, "--default-harness");
-      if (!["claude", "codex", "cursor", "grok", "pi"].includes(value.value)) {
+      if (!["claude", "codex", "cursor", "grok", "pi", "opencode"].includes(value.value)) {
         throw new ScoutCliError(`invalid default harness: ${value.value}`);
       }
       defaultHarness = value.value;
@@ -4972,12 +5003,18 @@ var init_auth = __esm(() => {
 import { existsSync, mkdirSync, rmSync, writeFileSync } from "fs";
 import { homedir } from "os";
 import { join as join2 } from "path";
+function isTestRunnerProcess() {
+  if (false)
+    ;
+  const entry = typeof Bun !== "undefined" ? Bun.main : process.argv[1] ?? "";
+  return /[._](test|spec)\.[cm]?[jt]sx?$/.test(entry);
+}
 function assertTestIsolatedUserData(operation, isolationEnvKey) {
-  if (true)
+  if (!isTestRunnerProcess())
     return;
   if (process.env[isolationEnvKey]?.trim())
     return;
-  throw new Error(`Refusing to ${operation} while NODE_ENV=test without ${isolationEnvKey} set. ` + "Tests must isolate OpenScout user data in a temp directory (see prepareHome in onboarding.test.ts).");
+  throw new Error(`Refusing to ${operation} under a test runner without ${isolationEnvKey} set. ` + "Tests must isolate OpenScout user data in a temp directory (see prepareHome in onboarding.test.ts).");
 }
 function resolveOpenScoutSupportPaths() {
   const home = homedir();
@@ -5208,11 +5245,13 @@ function shellQuoteArg(value) {
 function findHarnessEntry(harness) {
   if (!harness)
     return null;
-  return BUILT_IN_HARNESS_CATALOG.find((e) => e.harness === harness || e.name === harness) ?? null;
+  const lower = harness.trim().toLowerCase();
+  return BUILT_IN_HARNESS_CATALOG.find((e) => e.harness === lower || e.name === lower || e.aliases?.includes(lower)) ?? null;
 }
 function createBuiltInHarnessCatalog() {
   return BUILT_IN_HARNESS_CATALOG.map((entry) => ({
     ...entry,
+    aliases: entry.aliases ? [...entry.aliases] : undefined,
     tags: [...entry.tags],
     support: { ...entry.support },
     install: entry.install ? { ...entry.install, requires: [...entry.install.requires ?? []] } : undefined,
@@ -5581,6 +5620,7 @@ var init_harness_catalog = __esm(() => {
     {
       name: "opencode",
       harness: "opencode",
+      aliases: ["oc", "opencode2"],
       label: "OpenCode",
       description: "OpenCode's coding agent over ACP, fronting many model vendors via OpenCode Zen",
       homepage: "https://opencode.ai/docs/",
@@ -5928,6 +5968,7 @@ async function readManagedInstallsFile(path = resolveOpenScoutSupportPaths().man
   }
 }
 async function writeManagedInstallsFile(file, path = resolveOpenScoutSupportPaths().managedInstallsPath) {
+  assertTestIsolatedUserData("write the managed-installs registry", "OPENSCOUT_SUPPORT_DIRECTORY");
   await mkdir3(dirname3(path), { recursive: true });
   await writeFile3(path, JSON.stringify(file, null, 2) + `
 `, "utf8");
@@ -5977,6 +6018,38 @@ import {
   writeFileSync as writeFileSync2
 } from "fs";
 import { dirname as dirname4, join as join5 } from "path";
+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 join5(dir, NODE_IDENTITY_FILE);
@@ -6013,7 +6086,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 && normalizeNodeQualifier(parsed.nodeQualifier) !== parsed.nodeQualifier) {
+  if (parsed.nodeQualifier !== undefined && normalizePersistedNodeQualifier(parsed.nodeQualifier) !== parsed.nodeQualifier) {
     throw new Error(`Corrupt node identity at ${path}; remove it to generate a fresh one.`);
   }
   try {
@@ -6026,9 +6099,12 @@ function readAndValidateNodeIdentity(path) {
   }
   return parsed;
 }
-function normalizeNodeQualifier(value) {
+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));
+}
 function createNodeIdentity(supportDirectory) {
   if (!supportDirectory) {
     assertTestIsolatedUserData("write the node identity", "OPENSCOUT_SUPPORT_DIRECTORY");
@@ -6661,6 +6737,9 @@ function normalizeManagedHarness(value, fallback) {
   if (value === "pi") {
     return "pi";
   }
+  if (value === "opencode") {
+    return "opencode";
+  }
   return fallback;
 }
 function titleCase(value) {
@@ -7403,7 +7482,8 @@ async function detectHarnessMarkers(projectRoot) {
     grok: [],
     "grok-acp": [],
     kimi: [],
-    pi: []
+    pi: [],
+    opencode: []
   };
   for (const harness of MANAGED_AGENT_HARNESSES) {
     for (const marker of PROJECT_HARNESS_MARKERS[harness]) {
@@ -7584,6 +7664,7 @@ async function readOpenScoutSettings(options = {}) {
 async function writeOpenScoutSettings(settings, options = {}) {
   assertTestIsolatedUserData("write OpenScout settings", "OPENSCOUT_SUPPORT_DIRECTORY");
   ensureOpenScoutCleanSlateSync();
+  const settingsPath = resolveOpenScoutSupportPaths().settingsPath;
   const current = await readOpenScoutSettings(options);
   const merged = {
     ...current,
@@ -7637,7 +7718,11 @@ async function writeOpenScoutSettings(settings, options = {}) {
   const normalized = await normalizeSettingsRecord(merged, {
     currentDirectory: options.currentDirectory
   });
-  await writeJsonFile(resolveOpenScoutSupportPaths().settingsPath, normalized);
+  const settingsPathNow = resolveOpenScoutSupportPaths().settingsPath;
+  if (settingsPathNow !== settingsPath) {
+    throw new Error(`Refusing to write OpenScout settings: target moved from ${settingsPath} to ${settingsPathNow} mid-write (test teardown?).`);
+  }
+  await writeJsonFile(settingsPath, normalized);
   return normalized;
 }
 function scoutSkillInstallTargets(home = homedir4()) {
@@ -7890,6 +7975,8 @@ async function readRelayAgentOverrides() {
   }));
 }
 async function writeRelayAgentOverrides(overrides) {
+  assertTestIsolatedUserData("write the relay-agents registry", "OPENSCOUT_SUPPORT_DIRECTORY");
+  const registryPath = resolveOpenScoutSupportPaths().relayAgentsRegistryPath;
   const normalizedAgents = Object.fromEntries(Object.entries(overrides).map(([agentId, record]) => {
     const definitionId = normalizeAgentId(record.definitionId || record.agentId || agentId);
     const projectRoot = normalizePath(record.projectRoot);
@@ -7923,7 +8010,11 @@ async function writeRelayAgentOverrides(overrides) {
       }
     ];
   }));
-  await writeJsonFile(resolveOpenScoutSupportPaths().relayAgentsRegistryPath, {
+  const registryPathNow = resolveOpenScoutSupportPaths().relayAgentsRegistryPath;
+  if (registryPathNow !== registryPath) {
+    throw new Error(`Refusing to write the relay-agents registry: target moved from ${registryPath} to ${registryPathNow} mid-write (test teardown?).`);
+  }
+  await writeJsonFile(registryPath, {
     version: 1,
     agents: normalizedAgents
   });
@@ -8658,7 +8749,7 @@ var init_setup = __esm(() => {
   init_open_scout_network();
   init_support_paths();
   init_user_project_hints();
-  MANAGED_AGENT_HARNESSES = ["claude", "codex", "cursor", "grok", "grok-acp", "kimi", "pi"];
+  MANAGED_AGENT_HARNESSES = ["claude", "codex", "cursor", "grok", "grok-acp", "kimi", "pi", "opencode"];
   DEFAULT_OPERATOR_NAME = guessedOperatorName();
   DEFAULT_CAPABILITIES = ["chat", "invoke", "deliver"];
   PROJECT_SCAN_SKIP_DIRECTORIES = new Set([
@@ -8761,6 +8852,10 @@ var init_setup = __esm(() => {
     pi: [
       "PI.md",
       ".pi"
+    ],
+    opencode: [
+      "OPENCODE.md",
+      ".opencode"
     ]
   };
   PROJECT_STRONG_MARKERS_FLAT_NESTED = partitionFlatAndNestedMarkers(PROJECT_STRONG_MARKERS);
@@ -11128,12 +11223,14 @@ import {
 import { homedir as homedir6, hostname as osHostname } from "os";
 import { dirname as dirname7, join as join9 } from "path";
 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";
 }
@@ -11262,6 +11359,7 @@ function localConfigExists() {
 var LOCAL_CONFIG_VERSION = 1, DEFAULT_SCOUT_WEB_PORTAL_HOST = "scout.local", DEFAULT_SCOUT_WEB_DEV_HOST, DEFAULT_SCOUT_WEB_VITE_HMR_PATH = "/ws/hmr", OPENSCOUT_PORTS, DEFAULT_LOCAL_CONFIG;
 var init_local_config = __esm(() => {
   init_support_paths();
+  init_node_identity();
   DEFAULT_SCOUT_WEB_DEV_HOST = `dev.${DEFAULT_SCOUT_WEB_PORTAL_HOST}`;
   OPENSCOUT_PORTS = {
     broker: 43110,
@@ -11656,13 +11754,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);
 }
@@ -18156,9 +18254,15 @@ async function recordCodexSessionCatalog(runtimeDirectory, threadId, input) {
   });
 }
 async function closeCodexSessionCatalog(runtimeDirectory, threadId) {
+  if (!threadId) {
+    return;
+  }
   const catalog = await readCodexSessionCatalog(runtimeDirectory);
+  if (catalog.activeSessionId !== threadId) {
+    return;
+  }
+  const activeSessionId = threadId;
   const now = Date.now();
-  const activeSessionId = threadId ?? catalog.activeSessionId;
   const sessions2 = catalog.sessions.map((session) => session.id === activeSessionId && !session.endedAt ? { ...session, endedAt: now } : session);
   await writeCodexSessionCatalog(runtimeDirectory, {
     activeSessionId: null,
@@ -18181,8 +18285,10 @@ class CodexAppServerTransport {
   nextRequestId = 1;
   pendingRequests = new Map;
   starting = null;
+  threadPersistence = Promise.resolve();
   threadId = null;
   threadPath = null;
+  durableThreadId = null;
   proactiveShutdown = null;
   lastConfigSignature;
   notificationListeners = new Set;
@@ -18250,7 +18356,7 @@ class CodexAppServerTransport {
       cwd: this.options.cwd,
       input: this.textInput(prompt)
     });
-    await this.persistState();
+    await this.persistThreadId();
     return response;
   }
   async steerTurn(prompt, expectedTurnId) {
@@ -18300,10 +18406,12 @@ class CodexAppServerTransport {
         child.kill("SIGKILL");
       }
     }
+    await this.threadPersistence;
     if (options.resetThread) {
-      await closeCodexSessionCatalog(this.options.runtimeDirectory, this.threadId);
+      await closeCodexSessionCatalog(this.options.runtimeDirectory, this.durableThreadId);
       this.threadId = null;
       this.threadPath = null;
+      this.durableThreadId = null;
       await rm2(this.threadIdPath, { force: true });
     }
     await this.persistState();
@@ -18426,6 +18534,7 @@ class CodexAppServerTransport {
     const requestedThreadId = this.options.threadId?.trim() || null;
     const storedThreadId = requestedThreadId ?? await readOptionalFile(this.threadIdPath);
     if (storedThreadId) {
+      const threadOrigin = requestedThreadId ? "requested" : "stored";
       try {
         const resumed = await this.request("thread/resume", {
           threadId: storedThreadId,
@@ -18437,11 +18546,10 @@ class CodexAppServerTransport {
         });
         this.threadId = resumed.thread.id;
         this.threadPath = resumed.thread.path ?? null;
-        await this.persistThreadId();
-        await recordCodexSessionCatalog(this.options.runtimeDirectory, this.threadId, this.catalogRuntimeMeta());
+        await this.persistThreadId({ confirmed: true });
         return;
       } catch (error) {
-        await appendFile2(this.stderrLogPath, `[openscout] failed to resume stored Codex thread ${storedThreadId}: ${errorMessage3(error)}
+        await appendFile2(this.stderrLogPath, `[openscout] failed to resume ${threadOrigin} Codex thread ${storedThreadId}: ${errorMessage3(error)}
 `).catch(() => {
           return;
         });
@@ -18449,9 +18557,11 @@ class CodexAppServerTransport {
           await rm2(this.threadIdPath, { force: true }).catch(() => {
             return;
           });
+          await closeCodexSessionCatalog(this.options.runtimeDirectory, storedThreadId);
+          await this.persistState();
         }
         if (requestedThreadId || this.options.requireExistingThread) {
-          throw new Error(`Failed to resume requested Codex thread ${storedThreadId}: ${errorMessage3(error)}`);
+          throw new Error(`Failed to resume ${threadOrigin} Codex thread ${storedThreadId}: ${errorMessage3(error)}`);
         }
       }
     }
@@ -18470,8 +18580,10 @@ class CodexAppServerTransport {
     });
     this.threadId = started.thread.id;
     this.threadPath = started.thread.path ?? null;
+    if (this.durableThreadId !== this.threadId) {
+      this.durableThreadId = null;
+    }
     await this.persistThreadId();
-    await recordCodexSessionCatalog(this.options.runtimeDirectory, this.threadId, this.catalogRuntimeMeta());
   }
   catalogRuntimeMeta() {
     return {
@@ -18541,12 +18653,17 @@ class CodexAppServerTransport {
     if (method === "thread/started" || method === "thread/name/updated") {
       const thread = params.thread;
       if (thread?.id) {
+        if (thread.id !== this.threadId) {
+          this.durableThreadId = null;
+        }
         this.threadId = thread.id;
       }
       if ("path" in (thread ?? {})) {
         this.threadPath = thread?.path ?? null;
       }
       this.persistThreadId();
+    } else if (this.threadId && !this.durableThreadId) {
+      this.persistThreadId();
     }
     this.emitNotification(message);
   }
@@ -18598,16 +18715,46 @@ class CodexAppServerTransport {
     });
     this.persistState();
   }
-  async persistThreadId() {
-    if (!this.threadId) {
+  persistThreadId(options = {}) {
+    const persistence = this.threadPersistence.then(() => this.persistThreadIdNow(options));
+    this.threadPersistence = persistence.catch(() => {
+      return;
+    });
+    return persistence;
+  }
+  async persistThreadIdNow(options) {
+    const threadId = this.threadId;
+    if (!threadId) {
+      this.durableThreadId = null;
       await rm2(this.threadIdPath, { force: true });
+      await this.persistState();
       return;
     }
-    await writeFile6(this.threadIdPath, `${this.threadId}
+    let rolloutExists = false;
+    if (this.threadPath) {
+      try {
+        rolloutExists = (await stat4(this.threadPath)).isFile();
+      } catch {
+        rolloutExists = false;
+      }
+    }
+    if (!options.confirmed && !rolloutExists && this.durableThreadId !== threadId) {
+      this.durableThreadId = null;
+      await rm2(this.threadIdPath, { force: true });
+      await this.persistState();
+      return;
+    }
+    const becameDurable = this.durableThreadId !== threadId;
+    await writeFile6(this.threadIdPath, `${threadId}
 `);
+    this.durableThreadId = threadId;
     await this.persistState();
+    if (becameDurable) {
+      await recordCodexSessionCatalog(this.options.runtimeDirectory, threadId, this.catalogRuntimeMeta());
+    }
   }
   async persistState() {
+    const durableThreadPath = this.durableThreadId === this.threadId ? this.threadPath : null;
     await mkdir6(this.options.runtimeDirectory, { recursive: true });
     await writeFile6(this.statePath, JSON.stringify({
       agentId: this.options.agentName,
@@ -18615,8 +18762,8 @@ class CodexAppServerTransport {
       sessionId: this.options.sessionId,
       projectRoot: this.options.cwd,
       cwd: this.options.cwd,
-      threadId: this.threadId,
-      threadPath: this.threadPath,
+      threadId: this.durableThreadId,
+      threadPath: durableThreadPath,
       requestedThreadId: this.options.threadId ?? null,
       requireExistingThread: this.options.requireExistingThread === true,
       pid: this.process?.pid ?? null,
@@ -29611,6 +29758,7 @@ function loadUserConfig() {
   }
 }
 function saveUserConfig(config) {
+  assertTestIsolatedUserData("write the OpenScout user config", "OPENSCOUT_HOME");
   const configPath = userConfigPath();
   mkdirSync6(dirname16(configPath), { recursive: true });
   writeFileSync6(configPath, JSON.stringify(config, null, 2) + `
@@ -32306,7 +32454,7 @@ var init_local_agents = __esm(() => {
   OPENSCOUT_REPO_ROOT = resolve13(MODULE_DIRECTORY, "..", "..", "..");
   DEFAULT_LOCAL_AGENT_CAPABILITIES = ["chat", "invoke", "deliver"];
   DEFAULT_ONE_TIME_LOCAL_AGENT_CARD_TTL_MS = 24 * 60 * 60 * 1000;
-  SUPPORTED_LOCAL_AGENT_HARNESSES = ["claude", "codex", "grok", "grok-acp", "kimi", "pi", "cursor"];
+  SUPPORTED_LOCAL_AGENT_HARNESSES = ["claude", "codex", "grok", "grok-acp", "kimi", "pi", "cursor", "opencode"];
   SUPPORTED_SCOUT_HARNESSES = [...SCOUT_LAUNCHABLE_HARNESSES];
   DEFAULT_CLAUDE_SCOUT_ALLOWED_TOOLS = [
     "mcp__scout__current_reply_context",
@@ -39222,6 +39370,10 @@ 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);
+}
 function configureControlPlaneDatabase(database) {
   database.exec("PRAGMA busy_timeout = 5000;");
   database.exec("PRAGMA journal_mode = WAL;");
@@ -39383,6 +39535,7 @@ var init_control_plane_migrations = __esm(() => {
   init_migrator();
   init_schema();
   init_support_paths();
+  init_node_identity();
   CONTROL_PLANE_SCHEMA_MIGRATIONS = [
     {
       id: "runtime-session-mapping-read-model",
@@ -39561,6 +39714,46 @@ 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);
+          }
+        }
+      }
     }
   ];
   LEGACY_ROLE_MIGRATION_HASHES = [
@@ -40426,6 +40619,93 @@ class SQLiteControlPlaneStore {
       sessionsDeleted: sessionsResult.changes ?? 0
     };
   }
+  compactAndPruneMeshNodes(options = {}) {
+    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;
+    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 canonical = canonicalMeshNodeId(peer.node_id);
+          if (canonical && canonical !== peer.node_id) {
+            this.db.query("UPDATE trusted_peers SET node_id = ?1 WHERE key_id = ?2").run(canonical, peer.key_id);
+          }
+        }
+      }
+      const remainingNodes = this.db.query("SELECT * FROM nodes").all();
+      for (const row of remainingNodes) {
+        if (row.id === options.localNodeId)
+          continue;
+        const lastActive = row.last_seen_at ?? row.registered_at;
+        if (lastActive > staleCutoff)
+          continue;
+        const isTrusted = peerRows.some((p) => p.node_id === row.id);
+        if (isTrusted)
+          continue;
+        try {
+          const delRes = this.db.query("DELETE FROM nodes WHERE id = ?1").run(row.id);
+          if ((delRes.changes ?? 0) > 0) {
+            prunedNodeCount++;
+          }
+        } catch {}
+      }
+    })();
+    return {
+      rehomedNodeCount,
+      prunedNodeCount,
+      rehomedMappings
+    };
+  }
   close() {
     this.flushPendingEvents();
     if (this.flushPendingEventsTimer) {
@@ -42276,6 +42556,7 @@ class SQLiteControlPlaneStore {
 var RUNTIME_SESSION_RETENTION_MS, RUNTIME_SESSION_ALIAS_METADATA_KEYS;
 var init_sqlite_store = __esm(() => {
   init_drizzle_orm();
+  init_node_identity();
   init_src();
   init_registry3();
   init_drizzle_client();
@@ -57946,10 +58227,75 @@ var init_iroh_bridge = __esm(() => {
   init_support_paths();
 });
 
+// ../runtime/src/mesh-dial-order.ts
+function meshDialRank(url) {
+  let hostname2;
+  try {
+    hostname2 = new URL(url).hostname.replace(/^\[|\]$/g, "").toLowerCase();
+  } catch {
+    return 2;
+  }
+  if (isTailscaleIPv42(hostname2) || TAILSCALE_MAGIC_DNS.test(hostname2)) {
+    return 1;
+  }
+  if (isPrivateLanIPv4(hostname2) || hostname2.endsWith(".local")) {
+    return 0;
+  }
+  return 2;
+}
+function orderMeshDialUrls(urls) {
+  const seen = new Set;
+  const unique3 = [];
+  for (const url of urls) {
+    const trimmed = url.trim();
+    if (!trimmed || seen.has(trimmed))
+      continue;
+    seen.add(trimmed);
+    unique3.push(trimmed);
+  }
+  return unique3.map((url, index2) => ({ url, index: index2, rank: meshDialRank(url) })).sort((left, right) => left.rank - right.rank || left.index - right.index).map((entry) => entry.url);
+}
+function httpMeshUrlsForNode(node) {
+  const urls = [];
+  if (node.brokerUrl)
+    urls.push(node.brokerUrl);
+  for (const entrypoint of node.meshEntrypoints ?? []) {
+    if (entrypoint.kind === "http" && entrypoint.url) {
+      urls.push(entrypoint.url);
+    }
+  }
+  return orderMeshDialUrls(urls);
+}
+function isPrivateLanIPv4(address) {
+  const octets = parseIPv42(address);
+  if (!octets)
+    return false;
+  const [first, second] = octets;
+  return first === 10 || first === 172 && second >= 16 && second <= 31 || first === 192 && second === 168;
+}
+function isTailscaleIPv42(address) {
+  const octets = parseIPv42(address);
+  return Boolean(octets && octets[0] === 100 && octets[1] >= 64 && octets[1] <= 127);
+}
+function parseIPv42(address) {
+  const octets = address.split(".");
+  if (octets.length !== 4)
+    return null;
+  const numbers = octets.map((octet) => Number(octet));
+  if (numbers.some((value) => !Number.isInteger(value) || value < 0 || value > 255))
+    return null;
+  return numbers;
+}
+var TAILSCALE_MAGIC_DNS;
+var init_mesh_dial_order = __esm(() => {
+  TAILSCALE_MAGIC_DNS = /\.(ts\.net|tailscale\.net)$/i;
+});
+
 // ../runtime/src/mesh-forwarding.ts
 var init_mesh_forwarding = __esm(() => {
   init_iroh_bridge();
   init_mesh_peer_client();
+  init_mesh_dial_order();
 });
 
 // ../runtime/src/mesh-rendezvous.ts
@@ -57972,6 +58318,7 @@ var init_mesh_mdns_service = __esm(() => {
 // ../runtime/src/mesh-bind-controller.ts
 var init_mesh_bind_controller = __esm(() => {
   init_broker_process_manager();
+  init_mesh_dial_order();
   init_broker_server_lifecycle();
   init_mesh_mdns_service();
   init_node_tls_identity();
@@ -59818,14 +60165,14 @@ class BrokerRendezvousService {
       }
       return consumedResponse(activeMatch, input.participantId);
     }
-    const presence = this.presences.get(key);
-    if (presence && presence.participantId !== input.participantId) {
+    const presence2 = this.presences.get(key);
+    if (presence2 && presence2.participantId !== input.participantId) {
       const match = {
         id: this.createMatchId(),
-        projectRoot: presence.projectRoot,
-        codename: presence.codename,
-        normalizedCodename: presence.normalizedCodename,
-        participantIds: [presence.participantId, input.participantId],
+        projectRoot: presence2.projectRoot,
+        codename: presence2.codename,
+        normalizedCodename: presence2.normalizedCodename,
+        participantIds: [presence2.participantId, input.participantId],
         createdAt: now,
         expiresAt: now + this.matchTtlMs
       };
@@ -59834,7 +60181,7 @@ class BrokerRendezvousService {
       this.resolveMatchedWaiters(key, match);
       return matchedResponse(match, input.participantId);
     }
-    if (!presence) {
+    if (!presence2) {
       const expiredInvite = this.expiredInvites.get(key);
       if (expiredInvite) {
         return expiredResponse(expiredInvite, input.participantId);
@@ -59851,9 +60198,9 @@ class BrokerRendezvousService {
       };
     }
     if (input.waitMs === 0) {
-      return waitingResponse(presence);
+      return waitingResponse(presence2);
     }
-    return await this.waitForMatch(key, presence, input.waitMs);
+    return await this.waitForMatch(key, presence2, input.waitMs);
   }
   create(projectRoot, participantId, requestedCodename) {
     const now = this.now();
@@ -59875,15 +60222,15 @@ class BrokerRendezvousService {
           suggestion: "choose_another_codename"
         };
       }
-      const presence = this.presences.get(key);
-      if (presence) {
+      const presence2 = this.presences.get(key);
+      if (presence2) {
         return {
           status: "codename_busy",
-          codename: presence.codename,
+          codename: presence2.codename,
           projectRoot,
           participantId,
           participantCount: 1,
-          expiresAt: presence.expiresAt,
+          expiresAt: presence2.expiresAt,
           suggestion: "choose_another_codename"
         };
       }
@@ -59901,7 +60248,7 @@ class BrokerRendezvousService {
     throw new Error("could not allocate a unique match codename");
   }
   createPresence(projectRoot, participantId, codename, normalizedCodename, now) {
-    const presence = {
+    const presence2 = {
       participantId,
       projectRoot,
       codename,
@@ -59909,14 +60256,14 @@ class BrokerRendezvousService {
       joinedAt: now,
       expiresAt: now + this.presenceTtlMs
     };
-    this.presences.set(rendezvousKey(projectRoot, normalizedCodename), presence);
+    this.presences.set(rendezvousKey(projectRoot, normalizedCodename), presence2);
     return {
       status: "created",
       codename,
       projectRoot,
       participantId,
       createdAt: now,
-      expiresAt: presence.expiresAt
+      expiresAt: presence2.expiresAt
     };
   }
   hasCodenameInAnotherProject(projectRoot, normalizedCodename) {
@@ -59928,11 +60275,11 @@ class BrokerRendezvousService {
   }
   cleanupExpired() {
     const now = this.now();
-    for (const [key, presence] of this.presences) {
-      if (presence.expiresAt > now)
+    for (const [key, presence2] of this.presences) {
+      if (presence2.expiresAt > now)
         continue;
       this.presences.delete(key);
-      const expiredInvite = this.recordExpiredInvite(presence);
+      const expiredInvite = this.recordExpiredInvite(presence2);
       this.resolveExpiredWaiters(key, expiredInvite);
     }
     for (const [key, match] of this.matches) {
@@ -59950,18 +60297,18 @@ class BrokerRendezvousService {
     if (this.cleanupTimer) {
       clearInterval(this.cleanupTimer);
     }
-    for (const [key, presence] of this.presences) {
-      this.resolveExpiredWaiters(key, this.recordExpiredInvite(presence));
+    for (const [key, presence2] of this.presences) {
+      this.resolveExpiredWaiters(key, this.recordExpiredInvite(presence2));
     }
     this.presences.clear();
     this.matches.clear();
     this.expiredInvites.clear();
   }
-  waitForMatch(key, presence, waitMs) {
+  waitForMatch(key, presence2, waitMs) {
     return new Promise((resolveWait) => {
-      const waitDuration = Math.min(waitMs, Math.max(0, presence.expiresAt - this.now()));
+      const waitDuration = Math.min(waitMs, Math.max(0, presence2.expiresAt - this.now()));
       const waiter = {
-        participantId: presence.participantId,
+        participantId: presence2.participantId,
         resolve: resolveWait,
         timer: setTimeout(() => {
           this.removeWaiter(key, waiter);
@@ -59982,7 +60329,7 @@ class BrokerRendezvousService {
             resolveWait(expiredResponse(expiredInvite, waiter.participantId));
             return;
           }
-          resolveWait(notFoundResponse(presence, waiter.participantId));
+          resolveWait(notFoundResponse(presence2, waiter.participantId));
         }, waitDuration)
       };
       waiter.timer.unref?.();
@@ -60011,15 +60358,15 @@ class BrokerRendezvousService {
       waiter.resolve(expiredResponse(expiredInvite, waiter.participantId));
     }
   }
-  recordExpiredInvite(presence) {
+  recordExpiredInvite(presence2) {
     const expiredInvite = {
-      projectRoot: presence.projectRoot,
-      codename: presence.codename,
-      normalizedCodename: presence.normalizedCodename,
-      inviteExpiresAt: presence.expiresAt,
+      projectRoot: presence2.projectRoot,
+      codename: presence2.codename,
+      normalizedCodename: presence2.normalizedCodename,
+      inviteExpiresAt: presence2.expiresAt,
       retainUntil: this.now() + this.matchTtlMs
     };
-    this.expiredInvites.set(rendezvousKey(presence.projectRoot, presence.normalizedCodename), expiredInvite);
+    this.expiredInvites.set(rendezvousKey(presence2.projectRoot, presence2.normalizedCodename), expiredInvite);
     return expiredInvite;
   }
   removeWaiter(key, waiter) {
@@ -60098,14 +60445,14 @@ function createRandomInviteCodename() {
 function rendezvousKey(projectRoot, normalizedCodename) {
   return `${projectRoot}\x00${normalizedCodename}`;
 }
-function waitingResponse(presence) {
+function waitingResponse(presence2) {
   return {
     status: "waiting",
-    codename: presence.codename,
-    projectRoot: presence.projectRoot,
-    participantId: presence.participantId,
-    joinedAt: presence.joinedAt,
-    expiresAt: presence.expiresAt
+    codename: presence2.codename,
+    projectRoot: presence2.projectRoot,
+    participantId: presence2.participantId,
+    joinedAt: presence2.joinedAt,
+    expiresAt: presence2.expiresAt
   };
 }
 function matchedResponse(match, participantId) {
@@ -60150,11 +60497,11 @@ function projectMismatchResponse(input) {
     suggestion: "run_in_invitation_project"
   };
 }
-function notFoundResponse(presence, participantId) {
+function notFoundResponse(presence2, participantId) {
   return {
     status: "not_found",
-    codename: presence.codename,
-    projectRoot: presence.projectRoot,
+    codename: presence2.codename,
+    projectRoot: presence2.projectRoot,
     participantId,
     suggestion: "check_codename_or_create"
   };
@@ -61112,10 +61459,8 @@ async function loadOpenScoutOnboardingState(options = {}) {
   const operatorNameSource = explicitUserName ? "user-config" : envOperatorName ? "env" : settingsOperatorName || answeredSettingsOperatorName ? "settings" : "default";
   const contextRoot = settings.discovery.contextRoot ?? null;
   const project = await resolveProjectConfig({ currentDirectory, contextRoot });
-  const [broker, catalog] = await Promise.all([
-    options.broker ?? brokerServiceStatus().catch(() => null),
-    options.catalog ?? loadHarnessCatalogSnapshot().catch(() => null)
-  ]);
+  const broker = options.broker ?? await brokerServiceStatus().catch(() => null);
+  const catalog = options.catalog ?? await loadHarnessCatalogSnapshot().catch(() => null);
   const readyRuntimeCount = catalog?.entries.filter((entry) => entry.readinessReport.ready).length ?? 0;
   const hasReadyRuntime = readyRuntimeCount > 0;
   const hasLocalConfig = localConfigExists();
@@ -61182,11 +61527,7 @@ async function ensureOpenScoutOnboardingLocalConfig(options = {}) {
   }, {
     currentDirectory: options.currentDirectory
   });
-  return loadOpenScoutOnboardingState({
-    currentDirectory: options.currentDirectory,
-    broker: options.broker,
-    catalog: options.catalog
-  });
+  return loadOpenScoutOnboardingState({ currentDirectory: options.currentDirectory });
 }
 async function saveOpenScoutOnboardingIdentity(input) {
   const name2 = input.name.trim();
@@ -61206,11 +61547,7 @@ async function saveOpenScoutOnboardingIdentity(input) {
   }, {
     currentDirectory: input.currentDirectory
   });
-  return loadOpenScoutOnboardingState({
-    currentDirectory: input.currentDirectory,
-    broker: input.broker,
-    catalog: input.catalog
-  });
+  return loadOpenScoutOnboardingState({ currentDirectory: input.currentDirectory });
 }
 async function saveOpenScoutOnboardingProject(input) {
   const contextRoot = normalizePath2(input.contextRoot);
@@ -61238,11 +61575,7 @@ async function saveOpenScoutOnboardingProject(input) {
   }, {
     currentDirectory: input.currentDirectory ?? contextRoot
   });
-  return loadOpenScoutOnboardingState({
-    currentDirectory: contextRoot,
-    broker: input.broker,
-    catalog: input.catalog
-  });
+  return loadOpenScoutOnboardingState({ currentDirectory: contextRoot });
 }
 async function triggerMeshDiscovery(broker) {
   if (!broker.reachable || !broker.brokerUrl)
@@ -62513,8 +62846,137 @@ var init_mobile_push = __esm(() => {
 
 // ../runtime/src/agent-run-registry.ts
 var init_agent_run_registry = () => {};
+
+// ../runtime/src/observed-status-projection.ts
+var init_observed_status_projection = () => {};
+
 // ../runtime/src/activity-projection.ts
-var init_activity_projection = () => {};
+var init_activity_projection = __esm(() => {
+  init_observed_status_projection();
+});
+
+// ../runtime/src/activity-transitions.ts
+class ActivityTransitionTracker {
+  transitions = new Map;
+  record(agentId, activity2, observedAt2, now) {
+    const previous = this.transitions.get(agentId);
+    if (previous && previous.activity === activity2) {
+      return previous.transitionAt;
+    }
+    const transitionAt = Number.isFinite(observedAt2) ? Math.min(observedAt2, now) : now;
+    this.transitions.set(agentId, { activity: activity2, transitionAt });
+    return transitionAt;
+  }
+  peek(agentId) {
+    const transition = this.transitions.get(agentId);
+    return transition ? { ...transition } : undefined;
+  }
+  forget(agentId) {
+    this.transitions.delete(agentId);
+  }
+  clear() {
+    this.transitions.clear();
+  }
+  size() {
+    return this.transitions.size;
+  }
+}
+
+// ../runtime/src/presence-map.ts
+class BrokerPresenceMap {
+  beats = new Map;
+  lastDetailChangeAt = new Map;
+  staleAfterMs;
+  goneAfterStaleMs;
+  detailDebounceMs;
+  transitions;
+  constructor(options = {}) {
+    this.staleAfterMs = options.staleAfterMs ?? PRESENCE_STALE_AFTER_MS;
+    this.goneAfterStaleMs = options.goneAfterStaleMs ?? PRESENCE_GONE_AFTER_STALE_MS;
+    this.detailDebounceMs = options.detailDebounceMs ?? DEFAULT_DETAIL_DEBOUNCE_MS;
+    this.transitions = options.transitions ?? new ActivityTransitionTracker;
+  }
+  observe(observation, now) {
+    const agentId = observation.agentId ?? observation.status.agentId ?? observation.status.subjectId;
+    if (!agentId)
+      return;
+    const status = observation.status;
+    if (isTransportInferredStall(status))
+      return;
+    const updatedAt = Math.min(status.updatedAt, now);
+    const staleAt = Math.max(status.staleAt ?? 0, updatedAt + this.staleAfterMs);
+    if (isPresenceGone({ staleAt }, now, { goneAfterStaleMs: this.goneAfterStaleMs })) {
+      this.forget(agentId);
+      return;
+    }
+    const previous = this.beats.get(agentId);
+    const detail = status.detail?.title ?? undefined;
+    const transitionAt = this.transitions.record(agentId, status.activity, status.transitionAt ?? status.updatedAt, now);
+    const activityChanged = previous?.activity !== status.activity;
+    const detailChanged = previous !== undefined && previous.detail !== detail;
+    const debounceElapsed = now - (this.lastDetailChangeAt.get(agentId) ?? 0) >= this.detailDebounceMs;
+    const transitioned = previous === undefined || activityChanged || detailChanged && debounceElapsed;
+    if (activityChanged || detailChanged && debounceElapsed) {
+      this.lastDetailChangeAt.set(agentId, now);
+    }
+    const beat = {
+      agentId,
+      displayName: observation.displayName ?? previous?.displayName,
+      activity: status.activity,
+      phase: status.phase,
+      detail,
+      transitionAt,
+      updatedAt,
+      staleAt,
+      confidence: status.confidence,
+      needRef: observation.needRef,
+      boundConversationId: observation.boundConversationId
+    };
+    this.beats.set(agentId, beat);
+    return { beat, transitioned, previousActivity: previous?.activity };
+  }
+  snapshot(now) {
+    this.prune(now);
+    return { at: now, beats: [...this.beats.values()] };
+  }
+  get(agentId) {
+    return this.beats.get(agentId);
+  }
+  prune(now) {
+    const dropped = [];
+    for (const [agentId, beat] of this.beats) {
+      if (!isPresenceGone(beat, now, { goneAfterStaleMs: this.goneAfterStaleMs }))
+        continue;
+      this.beats.delete(agentId);
+      this.lastDetailChangeAt.delete(agentId);
+      this.transitions.forget(agentId);
+      dropped.push(agentId);
+    }
+    return dropped;
+  }
+  forget(agentId) {
+    this.beats.delete(agentId);
+    this.lastDetailChangeAt.delete(agentId);
+    this.transitions.forget(agentId);
+  }
+  clear() {
+    this.beats.clear();
+    this.lastDetailChangeAt.clear();
+    this.transitions.clear();
+  }
+  size() {
+    return this.beats.size;
+  }
+}
+function isTransportInferredStall(status) {
+  if (status.activity !== "stalled")
+    return false;
+  return status.provenance.some((entry) => entry.source === "staleness_inference");
+}
+var DEFAULT_DETAIL_DEBOUNCE_MS = 5000;
+var init_presence_map = __esm(() => {
+  init_src();
+});
 
 // ../runtime/src/session-attention.ts
 function sessionApprovalAttentionId(sessionId, turnId, blockId, version2) {
@@ -64984,7 +65446,9 @@ var init_src3 = __esm(() => {
   init_mobile_push();
   init_permission_policy2();
   init_agent_run_registry();
+  init_observed_status_projection();
   init_activity_projection();
+  init_presence_map();
   init_session_display_projection();
   init_issue_runner();
   init_issue_runner_service();
@@ -69105,10 +69569,10 @@ function bootstrapLaunchdJob(plistPath, uid) {
   return { ok, detail };
 }
 function chooseLaunchdStartMethod(input) {
-  if (input.loaded)
-    return "kickstart";
   if (input.scoutdPath)
     return "scoutd";
+  if (input.loaded)
+    return "kickstart";
   return input.plistExists ? "bootstrap" : "unavailable";
 }
 function startLaunchdJob(label, uid, home, options = {}) {
@@ -69180,14 +69644,9 @@ function verifyTree(tree) {
   ownedBy(web, broker2, "web");
   const app = single("app");
   const menu = single("menu");
-  for (const controller of tree.layers.pairing) {
-    if (menu && controller.ppid !== menu.pid) {
-      problems.push({
-        layer: "pairing",
-        message: `pairing controller pid ${controller.pid} is not owned by ScoutMenu pid ${menu.pid}`
-      });
-    }
-  }
+  const pairing = single("pairing");
+  const pairingOwner = tree.layers.base[0] ?? menu;
+  ownedBy(pairing, pairingOwner, "pairing");
   for (const stray of detachedExpectedProcesses(tree)) {
     problems.push({
       layer: stray.layer,
@@ -69216,8 +69675,8 @@ var SUPERVISED_LAYERS, LAUNCH_SERVICES_LAYERS, SCOUT_LAUNCHD_LABEL = "app.opensc
   pairing: []
 });
 var init_app_lifecycle = __esm(() => {
-  SUPERVISED_LAYERS = ["web", "edge", "broker", "probes", "base", "scoutd"];
-  LAUNCH_SERVICES_LAYERS = ["pairing", "menu", "app"];
+  SUPERVISED_LAYERS = ["pairing", "web", "edge", "broker", "probes", "base", "scoutd"];
+  LAUNCH_SERVICES_LAYERS = ["menu", "app"];
 });
 
 // ../../apps/desktop/src/cli/commands/app.ts
@@ -69256,8 +69715,8 @@ function renderAppCommandHelp() {
     "  start = up",
     "",
     "Ownership:",
-    "  launchd        -> scoutd -> base/probes -> broker/edge -> web",
-    "  LaunchServices -> Scout  -> embedded ScoutMenu -> pairing runtime",
+    "  launchd        -> scoutd -> base/probes -> pairing/broker/edge -> web",
+    "  LaunchServices -> Scout  -> embedded ScoutMenu",
     "",
     "Behavior:",
     "  Stop walks the tree leaf-first. The LaunchServices apps are signalled",
@@ -70470,7 +70929,7 @@ function renderAliasCommandHelp() {
     "Bare native agent names keep precedence; use alias:<name> for explicit alias routing.",
     "",
     "Examples:",
-    "  scout alias set review --to scope.main.dev-mac-mini-local",
+    "  scout alias set review --to scope.main.arts-mac-mini-local",
     "  scout alias set patch --to session:019eff52-9347-7470-ba5c-6bfe99d8dd83",
     "  scout alias repoint patch --to session:<new-id> --if-revision 4",
     '  scout ask --to alias:review "take a fresh pass"'
@@ -99489,7 +99948,7 @@ var init_stdio2 = __esm(() => {
 // ../../apps/desktop/src/shared/product.ts
 var SCOUT_APP_VERSION;
 var init_product = __esm(() => {
-  SCOUT_APP_VERSION = process.env.SCOUT_APP_VERSION?.trim() || "0.2.84";
+  SCOUT_APP_VERSION = process.env.SCOUT_APP_VERSION?.trim() || "0.2.86";
 });
 
 // ../../apps/desktop/src/core/mcp/stdio-server-lifecycle.ts
@@ -103835,7 +104294,7 @@ async function runInstallCommand(context, args) {
     message: `${verb} OpenScout ${installedAfter} \u2192 ${APP_PATH}${relaunchNote}`
   }, renderInstallResult);
 }
-var GITHUB_OWNER = "oscout", GITHUB_REPO = "scout", APP_NAME = "OpenScout.app", APP_PATH, INFO_PLIST_PATH, APP_BUNDLE_ID = "app.openscout.scout", APP_PROCESS_NAME = "Scout", USER_AGENT = "scout-cli", HELP_FLAGS9;
+var GITHUB_OWNER = "arach", GITHUB_REPO = "openscout", APP_NAME = "OpenScout.app", APP_PATH, INFO_PLIST_PATH, APP_BUNDLE_ID = "app.openscout.scout", APP_PROCESS_NAME = "Scout", USER_AGENT = "scout-cli", HELP_FLAGS9;
 var init_install = __esm(() => {
   init_errors();
   APP_PATH = `/Applications/${APP_NAME}`;
@@ -112873,63 +113332,65 @@ async function runMeshPing(target2) {
   const brokerUrl = resolveScoutBrokerUrl();
   const context = await loadScoutBrokerContext(brokerUrl);
   const localMeshId = context?.node.meshId ?? null;
-  let probeUrl;
-  if (target2.startsWith("http://") || target2.startsWith("https://")) {
-    probeUrl = target2;
-  } else {
-    const nodes = context?.snapshot.nodes ?? {};
-    const matchedNode = Object.values(nodes).find((n) => n.id === target2 || n.name === target2 || n.hostName === target2);
-    if (matchedNode?.brokerUrl) {
-      probeUrl = matchedNode.brokerUrl;
-    } else {
-      probeUrl = `http://${target2}:43110`;
-    }
-  }
+  const probeUrls = resolveMeshPingUrls(target2, context?.snapshot.nodes ?? {});
   const start = performance.now();
-  try {
-    const controller = new AbortController;
-    const timeout = setTimeout(() => controller.abort(), 3000);
-    const response = await meshPeerFetch(probeUrl, "/v1/node", {
-      signal: controller.signal,
-      headers: { accept: "application/json" }
-    });
-    clearTimeout(timeout);
-    const latencyMs = Math.round(performance.now() - start);
-    if (!response.ok) {
+  let lastError = null;
+  let lastUrl = probeUrls[0] ?? `http://${target2}:43110`;
+  for (const probeUrl of probeUrls) {
+    lastUrl = probeUrl;
+    try {
+      const controller = new AbortController;
+      const timeout = setTimeout(() => controller.abort(), 3000);
+      const response = await meshPeerFetch(probeUrl, "/v1/node", {
+        signal: controller.signal,
+        headers: { accept: "application/json" }
+      });
+      clearTimeout(timeout);
+      const latencyMs = Math.round(performance.now() - start);
+      if (!response.ok) {
+        lastError = `HTTP ${response.status}`;
+        continue;
+      }
+      const node = await response.json();
       return {
         target: target2,
         url: probeUrl,
-        reachable: false,
+        reachable: true,
         latencyMs,
-        node: null,
-        meshIdMatch: false,
+        node,
+        meshIdMatch: localMeshId !== null && node.meshId === localMeshId,
         localMeshId,
-        error: `HTTP ${response.status}`
+        error: null
       };
+    } catch (error48) {
+      lastError = error48 instanceof Error ? error48.message : String(error48);
     }
-    const node = await response.json();
-    return {
-      target: target2,
-      url: probeUrl,
-      reachable: true,
-      latencyMs,
-      node,
-      meshIdMatch: localMeshId !== null && node.meshId === localMeshId,
-      localMeshId,
-      error: null
-    };
-  } catch (error48) {
-    return {
-      target: target2,
-      url: probeUrl,
-      reachable: false,
-      latencyMs: Math.round(performance.now() - start),
-      node: null,
-      meshIdMatch: false,
-      localMeshId,
-      error: error48 instanceof Error ? error48.message : String(error48)
-    };
   }
+  return {
+    target: target2,
+    url: lastUrl,
+    reachable: false,
+    latencyMs: Math.round(performance.now() - start),
+    node: null,
+    meshIdMatch: false,
+    localMeshId,
+    error: lastError
+  };
+}
+function resolveMeshPingUrls(target2, nodes) {
+  if (target2.startsWith("http://") || target2.startsWith("https://")) {
+    return [target2];
+  }
+  const matchedNode = Object.values(nodes).find((n) => n.id === target2 || n.name === target2 || n.hostName === target2);
+  if (matchedNode) {
+    const urls = httpMeshUrlsForNode(matchedNode);
+    if (urls.length > 0)
+      return urls;
+  }
+  return orderMeshDialUrls([
+    `https://${target2}:43110`,
+    `http://${target2}:43110`
+  ]);
 }
 async function loadMeshNodes() {
   const brokerUrl = resolveScoutBrokerUrl();
@@ -112942,6 +113403,7 @@ async function loadMeshNodes() {
 }
 var init_service7 = __esm(() => {
   init_src3();
+  init_mesh_dial_order();
   init_system_probes();
   init_service3();
   init_trust_service();
@@ -125258,7 +125720,7 @@ function findLocalNetworkAddress() {
       if (entry.internal || entry.family !== "IPv4") {
         continue;
       }
-      if (!isPrivateIPv42(entry.address) || isLinkLocalIPv42(entry.address) || isTailscaleIPv42(entry.address)) {
+      if (!isPrivateIPv42(entry.address) || isLinkLocalIPv42(entry.address) || isTailscaleIPv43(entry.address)) {
         continue;
       }
       candidates.push({ name: name2, address: entry.address });
@@ -125284,7 +125746,7 @@ function localInterfaceScore(name2) {
   return 1;
 }
 function isPrivateIPv42(address) {
-  const octets = parseIPv42(address);
+  const octets = parseIPv43(address);
   if (!octets) {
     return false;
   }
@@ -125292,14 +125754,14 @@ function isPrivateIPv42(address) {
   return first === 10 || first === 172 && second >= 16 && second <= 31 || first === 192 && second === 168;
 }
 function isLinkLocalIPv42(address) {
-  const octets = parseIPv42(address);
+  const octets = parseIPv43(address);
   return Boolean(octets && octets[0] === 169 && octets[1] === 254);
 }
-function isTailscaleIPv42(address) {
-  const octets = parseIPv42(address);
+function isTailscaleIPv43(address) {
+  const octets = parseIPv43(address);
   return Boolean(octets && octets[0] === 100 && octets[1] >= 64 && octets[1] <= 127);
 }
-function parseIPv42(address) {
+function parseIPv43(address) {
   const octets = address.split(".");
   if (octets.length !== 4) {
     return null;