@openscout/scout 0.2.37 → 0.2.40

package/dist/pair-supervisor.mjs

@@ -2272,27 +2272,38 @@ function agentIdentityMatches(identity, candidate) {
   return true;
 }
 function resolveAgentIdentity(identity, candidates) {
+  const diagnosis = diagnoseAgentIdentity(identity, candidates);
+  return diagnosis.kind === "resolved" ? diagnosis.match : null;
+}
+function diagnoseAgentIdentity(identity, candidates) {
   const aliasKeys = identityAliasKeys(identity);
   const exactAliasMatches = candidates.filter((candidate) => {
     const candidateAliasKeys = explicitCandidateAliases(candidate).map(canonicalizeAliasValue);
     return aliasKeys.some((key) => candidateAliasKeys.includes(key));
   });
   if (exactAliasMatches.length === 1) {
-    return exactAliasMatches[0];
+    return { kind: "resolved", match: exactAliasMatches[0] };
   }
   if (exactAliasMatches.length > 1) {
-    return null;
+    return { kind: "ambiguous", candidates: exactAliasMatches };
   }
   const matches = candidates.filter((candidate) => agentIdentityMatches(identity, candidate));
   if (matches.length === 1) {
-    return matches[0];
+    return { kind: "resolved", match: matches[0] };
+  }
+  if (matches.length === 0) {
+    return { kind: "unknown" };
   }
   if (!identity.nodeQualifier && !identity.workspaceQualifier && !identity.profile && !identity.harness) {
-    return matches.find((candidate) => normalizeAgentIdentitySegment(candidate.agentId) === identity.definitionId) ?? matches[0] ?? null;
+    const exactIdMatch = matches.find((candidate) => normalizeAgentIdentitySegment(candidate.agentId) === identity.definitionId);
+    if (exactIdMatch) {
+      return { kind: "resolved", match: exactIdMatch };
+    }
+    return { kind: "ambiguous", candidates: matches };
   }
-  return null;
+  return { kind: "ambiguous", candidates: matches };
 }
-var DIMENSION_ALIASES, normalizeAgentSelectorSegment, parseAgentSelector, formatAgentSelector, resolveAgentSelector;
+var DIMENSION_ALIASES, normalizeAgentSelectorSegment, SCOUT_DISPATCHER_AGENT_ID = "scout", BUILT_IN_AGENT_DEFINITION_IDS, RESERVED_AGENT_DEFINITION_IDS, parseAgentSelector, formatAgentSelector, resolveAgentSelector;
 var init_agent_identity = __esm(() => {
   DIMENSION_ALIASES = {
     workspace: "workspace",
@@ -2306,6 +2317,15 @@ var init_agent_identity = __esm(() => {
     host: "node"
   };
   normalizeAgentSelectorSegment = normalizeAgentIdentitySegment;
+  BUILT_IN_AGENT_DEFINITION_IDS = new Set([
+    SCOUT_DISPATCHER_AGENT_ID,
+    "builder",
+    "reviewer",
+    "research"
+  ]);
+  RESERVED_AGENT_DEFINITION_IDS = new Set([
+    SCOUT_DISPATCHER_AGENT_ID
+  ]);
   parseAgentSelector = parseAgentIdentity;
   formatAgentSelector = formatAgentIdentity;
   resolveAgentSelector = resolveAgentIdentity;
@@ -3602,7 +3622,7 @@ async function readRelayAgentOverrides() {
   return Object.fromEntries(Object.entries(agents).map(([agentId, record]) => {
     const definitionId = normalizeAgentId(record.definitionId || record.agentId || agentId);
     const projectRoot = normalizePath(record.projectRoot);
-    const concreteAgentId = BUILT_IN_AGENT_IDS.has(definitionId) ? definitionId : buildRelayAgentInstance(definitionId, projectRoot).id;
+    const concreteAgentId = buildRelayAgentInstance(definitionId, projectRoot).id;
     const defaultHarness = normalizeManagedHarness(typeof record.defaultHarness === "string" ? record.defaultHarness : record.runtime?.harness, "claude");
     const harnessProfiles = buildHarnessProfiles({
       projectRoot,
@@ -3637,7 +3657,7 @@ async function writeRelayAgentOverrides(overrides) {
   const normalizedAgents = Object.fromEntries(Object.entries(overrides).map(([agentId, record]) => {
     const definitionId = normalizeAgentId(record.definitionId || record.agentId || agentId);
     const projectRoot = normalizePath(record.projectRoot);
-    const concreteAgentId = BUILT_IN_AGENT_IDS.has(definitionId) ? definitionId : buildRelayAgentInstance(definitionId, projectRoot).id;
+    const concreteAgentId = buildRelayAgentInstance(definitionId, projectRoot).id;
     const defaultHarness = normalizeManagedHarness(typeof record.defaultHarness === "string" ? record.defaultHarness : record.runtime?.harness, "claude");
     const harnessProfiles = buildHarnessProfiles({
       projectRoot,
@@ -4215,14 +4235,14 @@ async function loadResolvedRelayAgents(options = {}) {
     const manifest = await readProjectConfig(projectRoot);
     const override = overrideByRoot.get(projectRoot);
     const resolvedAgent = manifest ? await resolveManifestBackedAgent(projectRoot, manifest, settings, override) : await resolveInferredAgent(projectRoot, settings, override);
-    if (!resolvedAgent.agentId || BUILT_IN_AGENT_IDS.has(resolvedAgent.agentId)) {
+    if (!resolvedAgent.agentId || BUILT_IN_AGENT_DEFINITION_IDS.has(resolvedAgent.definitionId)) {
       continue;
     }
     resolvedAgents.push(resolvedAgent);
   }
   const dedupedResolvedAgents = await dedupeResolvedAgentsByCanonicalProjectRoot(resolvedAgents);
   const configuredAgents = dedupedResolvedAgents.filter((agent) => agent.registrationKind === "configured");
-  const builtInOverrides = Object.fromEntries(Object.entries(overrides).filter(([agentId]) => BUILT_IN_AGENT_IDS.has(agentId)));
+  const builtInOverrides = Object.fromEntries(Object.entries(overrides).filter(([, record]) => record.definitionId ? BUILT_IN_AGENT_DEFINITION_IDS.has(record.definitionId) : false));
   const nextOverrides = {
     ...builtInOverrides,
     ...Object.fromEntries(configuredAgents.map((agent) => [
@@ -4311,7 +4331,7 @@ async function ensureRelayAgentConfigured(value, options = {}) {
     registrationKind: "configured"
   };
 }
-var SCOUT_AGENT_ID = "scout", SCOUT_PRIMARY_CONVERSATION_ID = "dm.scout.primary", MANAGED_AGENT_HARNESSES, DEFAULT_OPERATOR_NAME, DEFAULT_CAPABILITIES, DEFAULT_TRANSPORT = "claude_stream_json", DEFAULT_TELEGRAM_MODE = "polling", LEGACY_DEFAULT_TELEGRAM_CONVERSATION_ID = "channel.shared", DEFAULT_TELEGRAM_CONVERSATION_ID, SETTINGS_VERSION = 1, PROJECT_CONFIG_VERSION = 1, BUILT_IN_AGENT_IDS, PROJECT_SCAN_SKIP_DIRECTORIES, PROJECT_STRONG_MARKERS, PROJECT_WEAK_MARKERS, PROJECT_HARNESS_MARKERS, PROJECT_STRONG_MARKERS_FLAT_NESTED, PROJECT_WEAK_MARKERS_FLAT_NESTED, GIT_BRANCH_CACHE_TTL_MS = 15000, gitBranchCache, SCOUT_SKILL_FILE_NAME = "SKILL.md", SETUP_MODULE_DIRECTORY, SCOUT_SKILL_REPO_ROOT, SCOUT_SKILL_INSTALL_PATHS, PROJECT_SCAN_MAX_DEPTH = 64;
+var SCOUT_AGENT_ID = "scout", SCOUT_PRIMARY_CONVERSATION_ID = "dm.scout.primary", MANAGED_AGENT_HARNESSES, DEFAULT_OPERATOR_NAME, DEFAULT_CAPABILITIES, DEFAULT_TRANSPORT = "claude_stream_json", DEFAULT_TELEGRAM_MODE = "polling", LEGACY_DEFAULT_TELEGRAM_CONVERSATION_ID = "channel.shared", DEFAULT_TELEGRAM_CONVERSATION_ID, SETTINGS_VERSION = 1, PROJECT_CONFIG_VERSION = 1, PROJECT_SCAN_SKIP_DIRECTORIES, PROJECT_STRONG_MARKERS, PROJECT_WEAK_MARKERS, PROJECT_HARNESS_MARKERS, PROJECT_STRONG_MARKERS_FLAT_NESTED, PROJECT_WEAK_MARKERS_FLAT_NESTED, GIT_BRANCH_CACHE_TTL_MS = 15000, gitBranchCache, SCOUT_SKILL_FILE_NAME = "SKILL.md", SETUP_MODULE_DIRECTORY, SCOUT_SKILL_REPO_ROOT, SCOUT_SKILL_INSTALL_PATHS, PROJECT_SCAN_MAX_DEPTH = 64;
 var init_setup = __esm(() => {
   init_dist();
   init_src();
@@ -4322,7 +4342,6 @@ var init_setup = __esm(() => {
   DEFAULT_OPERATOR_NAME = guessedOperatorName();
   DEFAULT_CAPABILITIES = ["chat", "invoke", "deliver"];
   DEFAULT_TELEGRAM_CONVERSATION_ID = SCOUT_PRIMARY_CONVERSATION_ID;
-  BUILT_IN_AGENT_IDS = new Set(["scout", "builder", "reviewer", "research"]);
   PROJECT_SCAN_SKIP_DIRECTORIES = new Set([
     ".git",
     ".hg",
@@ -4751,6 +4770,24 @@ import { existsSync as existsSync9, mkdirSync as mkdirSync8, readFileSync as rea
 import { homedir as homedir11 } from "os";
 import { basename as basename2, dirname as dirname4, join as join12, resolve as resolve3 } from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
+function isTmpPath(p) {
+  return /^\/(?:private\/)?tmp\//.test(p);
+}
+function resolveAdvertiseScope() {
+  const raw = (process.env.OPENSCOUT_ADVERTISE_SCOPE ?? "").trim().toLowerCase();
+  if (raw === "mesh")
+    return "mesh";
+  if (raw === "local")
+    return "local";
+  return DEFAULT_ADVERTISE_SCOPE;
+}
+function resolveBrokerHost(scope = resolveAdvertiseScope()) {
+  const explicit = process.env.OPENSCOUT_BROKER_HOST;
+  if (typeof explicit === "string" && explicit.trim().length > 0) {
+    return explicit;
+  }
+  return scope === "mesh" ? DEFAULT_BROKER_HOST_MESH : DEFAULT_BROKER_HOST;
+}
 function buildDefaultBrokerUrl(host = DEFAULT_BROKER_HOST, port = DEFAULT_BROKER_PORT) {
   return `http://${host}:${port}`;
 }
@@ -4771,15 +4808,28 @@ function isInstalledRuntimePackageDir(candidate) {
   return existsSync9(join12(candidate, "package.json")) && existsSync9(join12(candidate, "bin", "openscout-runtime.mjs"));
 }
 function findGlobalRuntimeDir() {
-  const bunCandidate = join12(homedir11(), ".bun", "node_modules", "@openscout", "runtime");
-  if (isInstalledRuntimePackageDir(bunCandidate))
-    return bunCandidate;
-  const bunGlobalCandidate = join12(homedir11(), ".bun", "install", "global", "node_modules", "@openscout", "runtime");
-  if (isInstalledRuntimePackageDir(bunGlobalCandidate))
-    return bunGlobalCandidate;
-  const bunScoutNested = join12(homedir11(), ".bun", "install", "global", "node_modules", "@openscout", "scout", "node_modules", "@openscout", "runtime");
-  if (isInstalledRuntimePackageDir(bunScoutNested))
-    return bunScoutNested;
+  const candidates = [
+    join12(homedir11(), ".bun", "node_modules", "@openscout", "runtime"),
+    join12(homedir11(), ".bun", "install", "global", "node_modules", "@openscout", "runtime"),
+    join12(homedir11(), ".bun", "install", "global", "node_modules", "@openscout", "scout", "node_modules", "@openscout", "runtime")
+  ];
+  for (const c of candidates) {
+    if (isInstalledRuntimePackageDir(c))
+      return c;
+  }
+  try {
+    const result = spawnSync("which", ["scout"], { encoding: "utf8", timeout: 3000 });
+    const scoutBin = result.stdout?.trim();
+    if (scoutBin) {
+      const scoutPkg = resolve3(scoutBin, "..", "..");
+      const nested = join12(scoutPkg, "node_modules", "@openscout", "runtime");
+      if (isInstalledRuntimePackageDir(nested))
+        return nested;
+      const sibling = resolve3(scoutPkg, "..", "runtime");
+      if (isInstalledRuntimePackageDir(sibling))
+        return sibling;
+    }
+  } catch {}
   return null;
 }
 function findWorkspaceRuntimeDir(startDir) {
@@ -4853,11 +4903,12 @@ function resolveBrokerServiceConfig() {
   const label = resolveBrokerServiceLabel(mode);
   const uid = typeof process.getuid === "function" ? process.getuid() : Number.parseInt(process.env.UID ?? "0", 10);
   const supportPaths = resolveOpenScoutSupportPaths();
-  const supportDirectory = supportPaths.supportDirectory;
-  const logsDirectory = supportPaths.brokerLogsDirectory;
-  const rawControlHome = supportPaths.controlHome;
-  const controlHome = /^\/(?:private\/)?tmp\//.test(rawControlHome) ? join12(homedir11(), ".openscout", "control-plane") : rawControlHome;
-  const brokerHost = process.env.OPENSCOUT_BROKER_HOST ?? DEFAULT_BROKER_HOST;
+  const defaultSupportDir = join12(homedir11(), "Library", "Application Support", "OpenScout");
+  const supportDirectory = isTmpPath(supportPaths.supportDirectory) ? defaultSupportDir : supportPaths.supportDirectory;
+  const logsDirectory = join12(supportDirectory, "logs", "broker");
+  const controlHome = isTmpPath(supportPaths.controlHome) ? join12(homedir11(), ".openscout", "control-plane") : supportPaths.controlHome;
+  const advertiseScope = resolveAdvertiseScope();
+  const brokerHost = resolveBrokerHost(advertiseScope);
   const brokerPort = Number.parseInt(process.env.OPENSCOUT_BROKER_PORT ?? String(DEFAULT_BROKER_PORT), 10);
   const brokerUrl = process.env.OPENSCOUT_BROKER_URL ?? buildDefaultBrokerUrl(brokerHost, brokerPort);
   const launchAgentPath = join12(homedir11(), "Library", "LaunchAgents", `${label}.plist`);
@@ -4877,7 +4928,8 @@ function resolveBrokerServiceConfig() {
     bunExecutable: resolveBunExecutable(),
     brokerHost,
     brokerPort,
-    brokerUrl
+    brokerUrl,
+    advertiseScope
   };
 }
 function renderLaunchAgentPlist(config) {
@@ -4889,6 +4941,7 @@ function renderLaunchAgentPlist(config) {
     OPENSCOUT_CONTROL_HOME: config.controlHome,
     OPENSCOUT_BROKER_SERVICE_MODE: config.mode,
     OPENSCOUT_BROKER_SERVICE_LABEL: config.label,
+    OPENSCOUT_ADVERTISE_SCOPE: config.advertiseScope,
     HOME: homedir11(),
     PATH: launchPath,
     ...collectOptionalEnvVars([
@@ -4959,7 +5012,7 @@ function resolveLaunchAgentPATH() {
     "/usr/sbin",
     "/sbin"
   ];
-  return Array.from(new Set(entries)).join(":");
+  return Array.from(new Set(entries)).filter((e) => !isTmpPath(e)).join(":");
 }
 function xmlEscape(value) {
   return value.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll('"', "&quot;").replaceAll("'", "&apos;");
@@ -5218,7 +5271,7 @@ function formatBrokerServiceStatus(status) {
   return lines.join(`
 `);
 }
-var DEFAULT_BROKER_HOST = "127.0.0.1", DEFAULT_BROKER_PORT = 65535, BROKER_SERVICE_POLL_INTERVAL_MS = 100, DEFAULT_BROKER_START_TIMEOUT_MS = 15000, DEFAULT_BROKER_URL;
+var DEFAULT_BROKER_HOST = "127.0.0.1", DEFAULT_BROKER_HOST_MESH = "0.0.0.0", DEFAULT_BROKER_PORT = 65535, DEFAULT_ADVERTISE_SCOPE = "local", BROKER_SERVICE_POLL_INTERVAL_MS = 100, DEFAULT_BROKER_START_TIMEOUT_MS = 15000, DEFAULT_BROKER_URL;
 var init_broker_service = __esm(async () => {
   init_support_paths();
   DEFAULT_BROKER_URL = buildDefaultBrokerUrl();
@@ -6032,7 +6085,7 @@ async function startLocalAgent(input) {
   const findMatchForRoot = (root) => {
     let fallback = null;
     for (const [id, override] of Object.entries(overrides)) {
-      if (BUILT_IN_LOCAL_AGENT_IDS.has(id))
+      if (BUILT_IN_AGENT_DEFINITION_IDS.has(id))
         continue;
       if (!override.projectRoot)
         continue;
@@ -6311,7 +6364,7 @@ async function loadRegisteredLocalAgentBindings(nodeId, options = {}) {
   return results;
 }
 async function inferLocalAgentBinding(agentId, nodeId) {
-  if (!agentId || BUILT_IN_LOCAL_AGENT_IDS.has(agentId)) {
+  if (!agentId || BUILT_IN_AGENT_DEFINITION_IDS.has(agentId)) {
     return null;
   }
   const overrides = await readRelayAgentOverrides();
@@ -6334,7 +6387,7 @@ async function ensureLocalAgentBindingOnline(agentId, nodeId, options = {}) {
   if (registeredBinding) {
     return registeredBinding;
   }
-  if (BUILT_IN_LOCAL_AGENT_IDS.has(agentId)) {
+  if (BUILT_IN_AGENT_DEFINITION_IDS.has(agentId)) {
     return null;
   }
   if (options.includeDiscovered) {
@@ -6357,7 +6410,7 @@ async function ensureLocalAgentBindingOnline(agentId, nodeId, options = {}) {
   const onlineRecord = await ensureLocalAgentOnline(agentId, recordForHarness(localAgentRecordFromRelayAgentOverride(agentId, override), options.harness));
   return buildLocalAgentBinding(agentId, onlineRecord, isLocalAgentRecordOnline(agentId, onlineRecord), nodeId, "relay-agent-registry");
 }
-var BUILT_IN_LOCAL_AGENT_IDS, MODULE_DIRECTORY, OPENSCOUT_REPO_ROOT, DEFAULT_LOCAL_AGENT_CAPABILITIES, DEFAULT_LOCAL_AGENT_HARNESS = "claude";
+var MODULE_DIRECTORY, OPENSCOUT_REPO_ROOT, DEFAULT_LOCAL_AGENT_CAPABILITIES, DEFAULT_LOCAL_AGENT_HARNESS = "claude";
 var init_local_agents = __esm(async () => {
   init_src();
   init_claude_stream_json();
@@ -6366,7 +6419,6 @@ var init_local_agents = __esm(async () => {
   init_support_paths();
   init_local_agent_template();
   await init_broker_service();
-  BUILT_IN_LOCAL_AGENT_IDS = new Set(["scout", "builder", "reviewer", "research"]);
   MODULE_DIRECTORY = dirname5(fileURLToPath4(import.meta.url));
   OPENSCOUT_REPO_ROOT = resolve4(MODULE_DIRECTORY, "..", "..", "..");
   DEFAULT_LOCAL_AGENT_CAPABILITIES = ["chat", "invoke", "deliver"];
@@ -12093,7 +12145,6 @@ var BROKER_SHARED_CHANNEL_ID = "channel.shared";
 var OPERATOR_ID = "operator";
 var DEFAULT_BROKER_HOST2 = "127.0.0.1";
 var DEFAULT_BROKER_PORT2 = 65535;
-var BUILT_IN_SCOUT_AGENT_IDS = new Set([SCOUT_AGENT_ID, "builder", "reviewer", "research"]);
 function buildScoutBrokerUrlFromEnv() {
   const host = process.env.OPENSCOUT_BROKER_HOST ?? DEFAULT_BROKER_HOST2;
   const port = Number.parseInt(process.env.OPENSCOUT_BROKER_PORT ?? String(DEFAULT_BROKER_PORT2), 10);

package/dist/scout-control-plane-web.mjs

@@ -1201,27 +1201,38 @@ function agentIdentityMatches(identity, candidate) {
   return true;
 }
 function resolveAgentIdentity(identity, candidates) {
+  const diagnosis = diagnoseAgentIdentity(identity, candidates);
+  return diagnosis.kind === "resolved" ? diagnosis.match : null;
+}
+function diagnoseAgentIdentity(identity, candidates) {
   const aliasKeys = identityAliasKeys(identity);
   const exactAliasMatches = candidates.filter((candidate) => {
     const candidateAliasKeys = explicitCandidateAliases(candidate).map(canonicalizeAliasValue);
     return aliasKeys.some((key) => candidateAliasKeys.includes(key));
   });
   if (exactAliasMatches.length === 1) {
-    return exactAliasMatches[0];
+    return { kind: "resolved", match: exactAliasMatches[0] };
   }
   if (exactAliasMatches.length > 1) {
-    return null;
+    return { kind: "ambiguous", candidates: exactAliasMatches };
   }
   const matches = candidates.filter((candidate) => agentIdentityMatches(identity, candidate));
   if (matches.length === 1) {
-    return matches[0];
+    return { kind: "resolved", match: matches[0] };
+  }
+  if (matches.length === 0) {
+    return { kind: "unknown" };
   }
   if (!identity.nodeQualifier && !identity.workspaceQualifier && !identity.profile && !identity.harness) {
-    return matches.find((candidate) => normalizeAgentIdentitySegment(candidate.agentId) === identity.definitionId) ?? matches[0] ?? null;
+    const exactIdMatch = matches.find((candidate) => normalizeAgentIdentitySegment(candidate.agentId) === identity.definitionId);
+    if (exactIdMatch) {
+      return { kind: "resolved", match: exactIdMatch };
+    }
+    return { kind: "ambiguous", candidates: matches };
   }
-  return null;
+  return { kind: "ambiguous", candidates: matches };
 }
-var DIMENSION_ALIASES, normalizeAgentSelectorSegment, parseAgentSelector, formatAgentSelector, extractAgentSelectors, resolveAgentSelector;
+var DIMENSION_ALIASES, normalizeAgentSelectorSegment, SCOUT_DISPATCHER_AGENT_ID = "scout", BUILT_IN_AGENT_DEFINITION_IDS, RESERVED_AGENT_DEFINITION_IDS, parseAgentSelector, formatAgentSelector, extractAgentSelectors, resolveAgentSelector;
 var init_agent_identity = __esm(() => {
   DIMENSION_ALIASES = {
     workspace: "workspace",
@@ -1235,6 +1246,15 @@ var init_agent_identity = __esm(() => {
     host: "node"
   };
   normalizeAgentSelectorSegment = normalizeAgentIdentitySegment;
+  BUILT_IN_AGENT_DEFINITION_IDS = new Set([
+    SCOUT_DISPATCHER_AGENT_ID,
+    "builder",
+    "reviewer",
+    "research"
+  ]);
+  RESERVED_AGENT_DEFINITION_IDS = new Set([
+    SCOUT_DISPATCHER_AGENT_ID
+  ]);
   parseAgentSelector = parseAgentIdentity;
   formatAgentSelector = formatAgentIdentity;
   extractAgentSelectors = extractAgentIdentities;
@@ -2679,7 +2699,7 @@ async function readRelayAgentOverrides() {
   return Object.fromEntries(Object.entries(agents).map(([agentId, record]) => {
     const definitionId = normalizeAgentId(record.definitionId || record.agentId || agentId);
     const projectRoot = normalizePath(record.projectRoot);
-    const concreteAgentId = BUILT_IN_AGENT_IDS.has(definitionId) ? definitionId : buildRelayAgentInstance(definitionId, projectRoot).id;
+    const concreteAgentId = buildRelayAgentInstance(definitionId, projectRoot).id;
     const defaultHarness = normalizeManagedHarness(typeof record.defaultHarness === "string" ? record.defaultHarness : record.runtime?.harness, "claude");
     const harnessProfiles = buildHarnessProfiles({
       projectRoot,
@@ -2714,7 +2734,7 @@ async function writeRelayAgentOverrides(overrides) {
   const normalizedAgents = Object.fromEntries(Object.entries(overrides).map(([agentId, record]) => {
     const definitionId = normalizeAgentId(record.definitionId || record.agentId || agentId);
     const projectRoot = normalizePath(record.projectRoot);
-    const concreteAgentId = BUILT_IN_AGENT_IDS.has(definitionId) ? definitionId : buildRelayAgentInstance(definitionId, projectRoot).id;
+    const concreteAgentId = buildRelayAgentInstance(definitionId, projectRoot).id;
     const defaultHarness = normalizeManagedHarness(typeof record.defaultHarness === "string" ? record.defaultHarness : record.runtime?.harness, "claude");
     const harnessProfiles = buildHarnessProfiles({
       projectRoot,
@@ -3292,14 +3312,14 @@ async function loadResolvedRelayAgents(options = {}) {
     const manifest = await readProjectConfig(projectRoot);
     const override = overrideByRoot.get(projectRoot);
     const resolvedAgent = manifest ? await resolveManifestBackedAgent(projectRoot, manifest, settings, override) : await resolveInferredAgent(projectRoot, settings, override);
-    if (!resolvedAgent.agentId || BUILT_IN_AGENT_IDS.has(resolvedAgent.agentId)) {
+    if (!resolvedAgent.agentId || BUILT_IN_AGENT_DEFINITION_IDS.has(resolvedAgent.definitionId)) {
       continue;
     }
     resolvedAgents.push(resolvedAgent);
   }
   const dedupedResolvedAgents = await dedupeResolvedAgentsByCanonicalProjectRoot(resolvedAgents);
   const configuredAgents = dedupedResolvedAgents.filter((agent) => agent.registrationKind === "configured");
-  const builtInOverrides = Object.fromEntries(Object.entries(overrides).filter(([agentId]) => BUILT_IN_AGENT_IDS.has(agentId)));
+  const builtInOverrides = Object.fromEntries(Object.entries(overrides).filter(([, record]) => record.definitionId ? BUILT_IN_AGENT_DEFINITION_IDS.has(record.definitionId) : false));
   const nextOverrides = {
     ...builtInOverrides,
     ...Object.fromEntries(configuredAgents.map((agent) => [
@@ -3388,7 +3408,7 @@ async function ensureRelayAgentConfigured(value, options = {}) {
     registrationKind: "configured"
   };
 }
-var SCOUT_AGENT_ID = "scout", SCOUT_PRIMARY_CONVERSATION_ID = "dm.scout.primary", MANAGED_AGENT_HARNESSES, DEFAULT_OPERATOR_NAME, DEFAULT_CAPABILITIES, DEFAULT_TRANSPORT = "claude_stream_json", DEFAULT_TELEGRAM_MODE = "polling", LEGACY_DEFAULT_TELEGRAM_CONVERSATION_ID = "channel.shared", DEFAULT_TELEGRAM_CONVERSATION_ID, SETTINGS_VERSION = 1, PROJECT_CONFIG_VERSION = 1, BUILT_IN_AGENT_IDS, PROJECT_SCAN_SKIP_DIRECTORIES, PROJECT_STRONG_MARKERS, PROJECT_WEAK_MARKERS, PROJECT_HARNESS_MARKERS, PROJECT_STRONG_MARKERS_FLAT_NESTED, PROJECT_WEAK_MARKERS_FLAT_NESTED, GIT_BRANCH_CACHE_TTL_MS = 15000, gitBranchCache, SCOUT_SKILL_FILE_NAME = "SKILL.md", SETUP_MODULE_DIRECTORY, SCOUT_SKILL_REPO_ROOT, SCOUT_SKILL_INSTALL_PATHS, PROJECT_SCAN_MAX_DEPTH = 64;
+var SCOUT_AGENT_ID = "scout", SCOUT_PRIMARY_CONVERSATION_ID = "dm.scout.primary", MANAGED_AGENT_HARNESSES, DEFAULT_OPERATOR_NAME, DEFAULT_CAPABILITIES, DEFAULT_TRANSPORT = "claude_stream_json", DEFAULT_TELEGRAM_MODE = "polling", LEGACY_DEFAULT_TELEGRAM_CONVERSATION_ID = "channel.shared", DEFAULT_TELEGRAM_CONVERSATION_ID, SETTINGS_VERSION = 1, PROJECT_CONFIG_VERSION = 1, PROJECT_SCAN_SKIP_DIRECTORIES, PROJECT_STRONG_MARKERS, PROJECT_WEAK_MARKERS, PROJECT_HARNESS_MARKERS, PROJECT_STRONG_MARKERS_FLAT_NESTED, PROJECT_WEAK_MARKERS_FLAT_NESTED, GIT_BRANCH_CACHE_TTL_MS = 15000, gitBranchCache, SCOUT_SKILL_FILE_NAME = "SKILL.md", SETUP_MODULE_DIRECTORY, SCOUT_SKILL_REPO_ROOT, SCOUT_SKILL_INSTALL_PATHS, PROJECT_SCAN_MAX_DEPTH = 64;
 var init_setup = __esm(() => {
   init_dist();
   init_src();
@@ -3399,7 +3419,6 @@ var init_setup = __esm(() => {
   DEFAULT_OPERATOR_NAME = guessedOperatorName();
   DEFAULT_CAPABILITIES = ["chat", "invoke", "deliver"];
   DEFAULT_TELEGRAM_CONVERSATION_ID = SCOUT_PRIMARY_CONVERSATION_ID;
-  BUILT_IN_AGENT_IDS = new Set(["scout", "builder", "reviewer", "research"]);
   PROJECT_SCAN_SKIP_DIRECTORIES = new Set([
     ".git",
     ".hg",
@@ -4163,6 +4182,24 @@ import { existsSync as existsSync6, mkdirSync as mkdirSync3, readFileSync as rea
 import { homedir as homedir5 } from "os";
 import { basename as basename2, dirname as dirname5, join as join8, resolve as resolve4 } from "path";
 import { fileURLToPath as fileURLToPath4 } from "url";
+function isTmpPath(p) {
+  return /^\/(?:private\/)?tmp\//.test(p);
+}
+function resolveAdvertiseScope() {
+  const raw2 = (process.env.OPENSCOUT_ADVERTISE_SCOPE ?? "").trim().toLowerCase();
+  if (raw2 === "mesh")
+    return "mesh";
+  if (raw2 === "local")
+    return "local";
+  return DEFAULT_ADVERTISE_SCOPE;
+}
+function resolveBrokerHost(scope = resolveAdvertiseScope()) {
+  const explicit = process.env.OPENSCOUT_BROKER_HOST;
+  if (typeof explicit === "string" && explicit.trim().length > 0) {
+    return explicit;
+  }
+  return scope === "mesh" ? DEFAULT_BROKER_HOST_MESH : DEFAULT_BROKER_HOST;
+}
 function buildDefaultBrokerUrl(host = DEFAULT_BROKER_HOST, port = DEFAULT_BROKER_PORT) {
   return `http://${host}:${port}`;
 }
@@ -4183,15 +4220,28 @@ function isInstalledRuntimePackageDir(candidate) {
   return existsSync6(join8(candidate, "package.json")) && existsSync6(join8(candidate, "bin", "openscout-runtime.mjs"));
 }
 function findGlobalRuntimeDir() {
-  const bunCandidate = join8(homedir5(), ".bun", "node_modules", "@openscout", "runtime");
-  if (isInstalledRuntimePackageDir(bunCandidate))
-    return bunCandidate;
-  const bunGlobalCandidate = join8(homedir5(), ".bun", "install", "global", "node_modules", "@openscout", "runtime");
-  if (isInstalledRuntimePackageDir(bunGlobalCandidate))
-    return bunGlobalCandidate;
-  const bunScoutNested = join8(homedir5(), ".bun", "install", "global", "node_modules", "@openscout", "scout", "node_modules", "@openscout", "runtime");
-  if (isInstalledRuntimePackageDir(bunScoutNested))
-    return bunScoutNested;
+  const candidates = [
+    join8(homedir5(), ".bun", "node_modules", "@openscout", "runtime"),
+    join8(homedir5(), ".bun", "install", "global", "node_modules", "@openscout", "runtime"),
+    join8(homedir5(), ".bun", "install", "global", "node_modules", "@openscout", "scout", "node_modules", "@openscout", "runtime")
+  ];
+  for (const c of candidates) {
+    if (isInstalledRuntimePackageDir(c))
+      return c;
+  }
+  try {
+    const result = spawnSync("which", ["scout"], { encoding: "utf8", timeout: 3000 });
+    const scoutBin = result.stdout?.trim();
+    if (scoutBin) {
+      const scoutPkg = resolve4(scoutBin, "..", "..");
+      const nested = join8(scoutPkg, "node_modules", "@openscout", "runtime");
+      if (isInstalledRuntimePackageDir(nested))
+        return nested;
+      const sibling = resolve4(scoutPkg, "..", "runtime");
+      if (isInstalledRuntimePackageDir(sibling))
+        return sibling;
+    }
+  } catch {}
   return null;
 }
 function findWorkspaceRuntimeDir(startDir) {
@@ -4265,11 +4315,12 @@ function resolveBrokerServiceConfig() {
   const label = resolveBrokerServiceLabel(mode);
   const uid = typeof process.getuid === "function" ? process.getuid() : Number.parseInt(process.env.UID ?? "0", 10);
   const supportPaths = resolveOpenScoutSupportPaths();
-  const supportDirectory = supportPaths.supportDirectory;
-  const logsDirectory = supportPaths.brokerLogsDirectory;
-  const rawControlHome = supportPaths.controlHome;
-  const controlHome = /^\/(?:private\/)?tmp\//.test(rawControlHome) ? join8(homedir5(), ".openscout", "control-plane") : rawControlHome;
-  const brokerHost = process.env.OPENSCOUT_BROKER_HOST ?? DEFAULT_BROKER_HOST;
+  const defaultSupportDir = join8(homedir5(), "Library", "Application Support", "OpenScout");
+  const supportDirectory = isTmpPath(supportPaths.supportDirectory) ? defaultSupportDir : supportPaths.supportDirectory;
+  const logsDirectory = join8(supportDirectory, "logs", "broker");
+  const controlHome = isTmpPath(supportPaths.controlHome) ? join8(homedir5(), ".openscout", "control-plane") : supportPaths.controlHome;
+  const advertiseScope = resolveAdvertiseScope();
+  const brokerHost = resolveBrokerHost(advertiseScope);
   const brokerPort = Number.parseInt(process.env.OPENSCOUT_BROKER_PORT ?? String(DEFAULT_BROKER_PORT), 10);
   const brokerUrl = process.env.OPENSCOUT_BROKER_URL ?? buildDefaultBrokerUrl(brokerHost, brokerPort);
   const launchAgentPath = join8(homedir5(), "Library", "LaunchAgents", `${label}.plist`);
@@ -4289,7 +4340,8 @@ function resolveBrokerServiceConfig() {
     bunExecutable: resolveBunExecutable(),
     brokerHost,
     brokerPort,
-    brokerUrl
+    brokerUrl,
+    advertiseScope
   };
 }
 function renderLaunchAgentPlist(config) {
@@ -4301,6 +4353,7 @@ function renderLaunchAgentPlist(config) {
     OPENSCOUT_CONTROL_HOME: config.controlHome,
     OPENSCOUT_BROKER_SERVICE_MODE: config.mode,
     OPENSCOUT_BROKER_SERVICE_LABEL: config.label,
+    OPENSCOUT_ADVERTISE_SCOPE: config.advertiseScope,
     HOME: homedir5(),
     PATH: launchPath,
     ...collectOptionalEnvVars([
@@ -4371,7 +4424,7 @@ function resolveLaunchAgentPATH() {
     "/usr/sbin",
     "/sbin"
   ];
-  return Array.from(new Set(entries)).join(":");
+  return Array.from(new Set(entries)).filter((e) => !isTmpPath(e)).join(":");
 }
 function xmlEscape(value) {
   return value.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll('"', "&quot;").replaceAll("'", "&apos;");
@@ -4630,7 +4683,7 @@ function formatBrokerServiceStatus(status) {
   return lines.join(`
 `);
 }
-var DEFAULT_BROKER_HOST = "127.0.0.1", DEFAULT_BROKER_PORT = 65535, BROKER_SERVICE_POLL_INTERVAL_MS = 100, DEFAULT_BROKER_START_TIMEOUT_MS = 15000, DEFAULT_BROKER_URL;
+var DEFAULT_BROKER_HOST = "127.0.0.1", DEFAULT_BROKER_HOST_MESH = "0.0.0.0", DEFAULT_BROKER_PORT = 65535, DEFAULT_ADVERTISE_SCOPE = "local", BROKER_SERVICE_POLL_INTERVAL_MS = 100, DEFAULT_BROKER_START_TIMEOUT_MS = 15000, DEFAULT_BROKER_URL;
 var init_broker_service = __esm(async () => {
   init_support_paths();
   DEFAULT_BROKER_URL = buildDefaultBrokerUrl();
@@ -5187,7 +5240,7 @@ function buildLocalAgentBinding(agentId, record, alive, nodeId, source) {
   };
 }
 async function inferLocalAgentBinding(agentId, nodeId) {
-  if (!agentId || BUILT_IN_LOCAL_AGENT_IDS.has(agentId)) {
+  if (!agentId || BUILT_IN_AGENT_DEFINITION_IDS.has(agentId)) {
     return null;
   }
   const overrides = await readRelayAgentOverrides();
@@ -5198,7 +5251,7 @@ async function inferLocalAgentBinding(agentId, nodeId) {
   const record = localAgentRecordFromRelayAgentOverride(agentId, override);
   return buildLocalAgentBinding(agentId, record, isLocalAgentRecordOnline(agentId, record), nodeId, "relay-agent-registry");
 }
-var BUILT_IN_LOCAL_AGENT_IDS, MODULE_DIRECTORY, OPENSCOUT_REPO_ROOT, DEFAULT_LOCAL_AGENT_CAPABILITIES, DEFAULT_LOCAL_AGENT_HARNESS = "claude";
+var MODULE_DIRECTORY, OPENSCOUT_REPO_ROOT, DEFAULT_LOCAL_AGENT_CAPABILITIES, DEFAULT_LOCAL_AGENT_HARNESS = "claude";
 var init_local_agents = __esm(async () => {
   init_src();
   init_claude_stream_json();
@@ -5207,7 +5260,6 @@ var init_local_agents = __esm(async () => {
   init_support_paths();
   init_local_agent_template();
   await init_broker_service();
-  BUILT_IN_LOCAL_AGENT_IDS = new Set(["scout", "builder", "reviewer", "research"]);
   MODULE_DIRECTORY = dirname6(fileURLToPath5(import.meta.url));
   OPENSCOUT_REPO_ROOT = resolve5(MODULE_DIRECTORY, "..", "..", "..");
   DEFAULT_LOCAL_AGENT_CAPABILITIES = ["chat", "invoke", "deliver"];
@@ -7515,6 +7567,7 @@ async function controlScoutDesktopPairingService(action, currentDirectory) {
 }
 
 // apps/desktop/src/app/desktop/shell.ts
+init_src();
 init_setup();
 import { readFile as readFile5, readdir as readdir3, stat as stat3 } from "fs/promises";
 import { performance } from "perf_hooks";
@@ -7551,7 +7604,6 @@ var BROKER_SYSTEM_CHANNEL_ID = "channel.system";
 var OPERATOR_ID = "operator";
 var DEFAULT_BROKER_HOST2 = "127.0.0.1";
 var DEFAULT_BROKER_PORT2 = 65535;
-var BUILT_IN_SCOUT_AGENT_IDS = new Set([SCOUT_AGENT_ID, "builder", "reviewer", "research"]);
 function buildScoutBrokerUrlFromEnv() {
   const host = process.env.OPENSCOUT_BROKER_HOST ?? DEFAULT_BROKER_HOST2;
   const port = Number.parseInt(process.env.OPENSCOUT_BROKER_PORT ?? String(DEFAULT_BROKER_PORT2), 10);
@@ -8297,7 +8349,6 @@ function readProjectGitActivity(projectRoot) {
 
 // apps/desktop/src/app/desktop/shell.ts
 var OPERATOR_ID2 = "operator";
-var BUILT_IN_ROLE_AGENT_IDS = new Set(["scout", "builder", "reviewer", "research"]);
 var RECENT_AGENT_ACTIVITY_WINDOW_SECONDS = 60 * 60 * 24 * 30;
 var RECONCILE_OFFLINE_WAIT_SECONDS = 60 * 3;
 var RECONCILE_NO_FOLLOW_UP_SECONDS = 60 * 10;
@@ -8508,7 +8559,7 @@ function interAgentThreadKey(participantIds) {
 function visibleRelayAgentIds(snapshot, configuredAgentIds, messagesByConversation, directActivity) {
   const visible = new Set([
     ...configuredAgentIds,
-    ...Array.from(BUILT_IN_ROLE_AGENT_IDS)
+    ...Array.from(BUILT_IN_AGENT_DEFINITION_IDS)
   ]);
   const cutoff = Math.floor(Date.now() / 1000) - RECENT_AGENT_ACTIVITY_WINDOW_SECONDS;
   for (const [agentId, activity] of directActivity.entries()) {