@openscout/scout 0.2.57 → 0.2.58

package/dist/main.mjs

@@ -2277,6 +2277,7 @@ function createBuiltInHarnessCatalog() {
       anyOf: entry.readiness.anyOf ? [...entry.readiness.anyOf] : undefined
     } : undefined,
     launch: entry.launch ? { ...entry.launch, args: [...entry.launch.args] } : undefined,
+    resume: entry.resume ? { ...entry.resume } : undefined,
     resolveEnv: entry.resolveEnv ? [...entry.resolveEnv] : undefined,
     capabilities: [...entry.capabilities],
     metadata: entry.metadata ? { ...entry.metadata } : undefined
@@ -2294,6 +2295,7 @@ function mergeHarnessCatalogEntries(baseEntries, overrides = {}) {
       install: mergeInstall(entry.install, override.install),
       readiness: mergeReadiness(entry.readiness, override.readiness),
       launch: mergeLaunch(entry.launch, override.launch),
+      resume: override.resume && entry.resume ? { ...entry.resume, ...override.resume } : entry.resume,
       tags: override.tags ? [...override.tags] : entry.tags,
       capabilities: override.capabilities ? [...override.capabilities] : entry.capabilities,
       resolveEnv: override.resolveEnv ? [...override.resolveEnv] : entry.resolveEnv,
@@ -2322,6 +2324,7 @@ function mergeHarnessCatalogEntries(baseEntries, overrides = {}) {
       install: mergeInstall(undefined, override.install),
       readiness: mergeReadiness(undefined, override.readiness),
       launch: mergeLaunch(undefined, override.launch),
+      resume: override.resume?.command && override.resume?.sessionFlag ? { command: override.resume.command, sessionFlag: override.resume.sessionFlag, cwdFlag: override.resume.cwdFlag } : undefined,
       resolveEnv: override.resolveEnv ? [...override.resolveEnv] : undefined,
       capabilities: [...override.capabilities],
       metadata: override.metadata ? { ...override.metadata } : undefined
@@ -2474,6 +2477,11 @@ var init_harness_catalog = __esm(() => {
         loginCommand: "claude login",
         notReadyMessage: "Claude is installed but not authenticated yet."
       },
+      resume: {
+        command: "claude",
+        sessionFlag: "--resume",
+        cwdFlag: "--cwd"
+      },
       capabilities: ["chat", "invoke", "deliver", "summarize", "review"]
     },
     {
@@ -2505,6 +2513,11 @@ var init_harness_catalog = __esm(() => {
         loginCommand: "codex login",
         notReadyMessage: "Codex is installed but not authenticated yet."
       },
+      resume: {
+        command: "codex",
+        sessionFlag: "--thread",
+        cwdFlag: "--cwd"
+      },
       capabilities: ["chat", "invoke", "deliver", "review", "execute"]
     }
   ];
@@ -4684,7 +4697,8 @@ function buildManagedAgentShellExports(options) {
 // ../runtime/src/claude-stream-json.ts
 import { randomUUID } from "crypto";
 import { spawn } from "child_process";
-import { appendFile, mkdir as mkdir3, readFile as readFile4, rm as rm2, writeFile as writeFile3 } from "fs/promises";
+import { appendFile, mkdir as mkdir3, readFile as readFile4, writeFile as writeFile3 } from "fs/promises";
+import { existsSync as existsSync4, readFileSync as readFileSync2 } from "fs";
 import { join as join5 } from "path";
 function resolveClaudeStreamJsonOutput(result, fallbackParts) {
   const trimmedResult = result?.trim();
@@ -4699,19 +4713,57 @@ function sessionKey(options) {
 function errorMessage(error) {
   return error instanceof Error ? error.message : String(error);
 }
-async function readOptionalFile(filePath) {
+function readSessionCatalogSync(runtimeDirectory) {
+  const catalogPath = join5(runtimeDirectory, SESSION_CATALOG_FILENAME);
   try {
-    const raw = await readFile4(filePath, "utf8");
-    const trimmed = raw.trim();
-    return trimmed || null;
+    if (!existsSync4(catalogPath)) {
+      const legacyPath = join5(runtimeDirectory, "claude-session-id.txt");
+      if (existsSync4(legacyPath)) {
+        const legacyId = readFileSync2(legacyPath, "utf8").trim();
+        if (legacyId) {
+          return {
+            activeSessionId: legacyId,
+            sessions: [{ id: legacyId, startedAt: Date.now(), cwd: "" }]
+          };
+        }
+      }
+      return { activeSessionId: null, sessions: [] };
+    }
+    const raw = readFileSync2(catalogPath, "utf8").trim();
+    if (!raw)
+      return { activeSessionId: null, sessions: [] };
+    const parsed = JSON.parse(raw);
+    return {
+      activeSessionId: parsed.activeSessionId ?? null,
+      sessions: Array.isArray(parsed.sessions) ? parsed.sessions : []
+    };
   } catch {
-    return null;
+    return { activeSessionId: null, sessions: [] };
   }
 }
+async function readSessionCatalog(runtimeDirectory) {
+  return readSessionCatalogSync(runtimeDirectory);
+}
+async function writeSessionCatalog(runtimeDirectory, catalog) {
+  const catalogPath = join5(runtimeDirectory, SESSION_CATALOG_FILENAME);
+  await writeFile3(catalogPath, JSON.stringify(catalog, null, 2) + `
+`);
+}
+function catalogRecordSession(catalog, sessionId, cwd) {
+  const now = Date.now();
+  const sessions = catalog.sessions.map((s) => s.id === catalog.activeSessionId && !s.endedAt ? { ...s, endedAt: now } : s);
+  if (!sessions.some((s) => s.id === sessionId)) {
+    sessions.push({ id: sessionId, startedAt: now, cwd });
+  }
+  while (sessions.length > SESSION_CATALOG_MAX_ENTRIES) {
+    sessions.shift();
+  }
+  return { activeSessionId: sessionId, sessions };
+}
 
 class ClaudeStreamJsonSession {
   options;
-  sessionStatePath;
+  catalogDirectory;
   stdoutLogPath;
   stderrLogPath;
   process = null;
@@ -4722,7 +4774,7 @@ class ClaudeStreamJsonSession {
   lastConfigSignature;
   constructor(options) {
     this.options = options;
-    this.sessionStatePath = join5(options.runtimeDirectory, "claude-session-id.txt");
+    this.catalogDirectory = options.runtimeDirectory;
     this.stdoutLogPath = join5(options.logsDirectory, "stdout.log");
     this.stderrLogPath = join5(options.logsDirectory, "stderr.log");
     this.lastConfigSignature = this.configSignature(options);
@@ -4828,7 +4880,9 @@ class ClaudeStreamJsonSession {
     }
     if (options.resetSession) {
       this.claudeSessionId = null;
-      await rm2(this.sessionStatePath, { force: true });
+      const catalog = await readSessionCatalog(this.catalogDirectory);
+      catalog.activeSessionId = null;
+      await writeSessionCatalog(this.catalogDirectory, catalog);
     }
   }
   configSignature(options) {
@@ -4857,7 +4911,8 @@ class ClaudeStreamJsonSession {
     await mkdir3(this.options.runtimeDirectory, { recursive: true });
     await mkdir3(this.options.logsDirectory, { recursive: true });
     await writeFile3(join5(this.options.runtimeDirectory, "prompt.txt"), this.options.systemPrompt);
-    this.claudeSessionId = await readOptionalFile(this.sessionStatePath);
+    const catalog = await readSessionCatalog(this.catalogDirectory);
+    this.claudeSessionId = catalog.activeSessionId;
     const args = [
       "--verbose",
       "--print",
@@ -4936,8 +4991,11 @@ class ClaudeStreamJsonSession {
       const nextSessionId = event.session_id ?? event.sessionId ?? null;
       if (nextSessionId && nextSessionId !== this.claudeSessionId) {
         this.claudeSessionId = nextSessionId;
-        writeFile3(this.sessionStatePath, `${nextSessionId}
-`);
+        (async () => {
+          const catalog = await readSessionCatalog(this.catalogDirectory);
+          const updated = catalogRecordSession(catalog, nextSessionId, this.options.cwd);
+          await writeSessionCatalog(this.catalogDirectory, updated);
+        })();
       }
       return;
     }
@@ -5000,14 +5058,16 @@ async function shutdownClaudeStreamJsonAgent(options, shutdownOptions = {}) {
   const session = sessions.get(key);
   if (!session) {
     if (shutdownOptions.resetSession) {
-      await rm2(join5(options.runtimeDirectory, "claude-session-id.txt"), { force: true });
+      const catalog = await readSessionCatalog(options.runtimeDirectory);
+      catalog.activeSessionId = null;
+      await writeSessionCatalog(options.runtimeDirectory, catalog);
     }
     return;
   }
   sessions.delete(key);
   await session.shutdown(shutdownOptions);
 }
-var sessions;
+var SESSION_CATALOG_FILENAME = "session-catalog.json", SESSION_CATALOG_MAX_ENTRIES = 64, sessions;
 var init_claude_stream_json = __esm(() => {
   sessions = new Map;
 });
@@ -6184,7 +6244,7 @@ class ClaudeCodeHistoryParser {
 var init_history = () => {};
 
 // ../agent-sessions/src/adapters/claude-code.ts
-import { existsSync as existsSync4, readdirSync, statSync as statSync2 } from "fs";
+import { existsSync as existsSync5, readdirSync, statSync as statSync2 } from "fs";
 import { homedir as homedir4 } from "os";
 import { join as join6 } from "path";
 function resolveClaudeResumeContext(config) {
@@ -6194,7 +6254,7 @@ function resolveClaudeResumeContext(config) {
     return null;
   }
   const projectsRoot = join6(homedir4(), ".claude", "projects");
-  if (!existsSync4(projectsRoot)) {
+  if (!existsSync5(projectsRoot)) {
     return null;
   }
   let projectSlugs;
@@ -6205,7 +6265,7 @@ function resolveClaudeResumeContext(config) {
   }
   for (const slug of projectSlugs) {
     const sessionPath = join6(projectsRoot, slug, `${resumeId}.jsonl`);
-    if (!existsSync4(sessionPath)) {
+    if (!existsSync5(sessionPath)) {
       continue;
     }
     const cwd = decodeClaudeProjectsSlug2(slug);
@@ -6746,7 +6806,7 @@ Referenced files: ${prompt.files.join(", ")}` });
 });
 
 // ../agent-sessions/src/codex-launch-config.ts
-import { accessSync, constants, existsSync as existsSync5 } from "fs";
+import { accessSync, constants, existsSync as existsSync6 } from "fs";
 import { homedir as homedir5 } from "os";
 import { basename as basename2, delimiter, dirname as dirname4, join as join7, resolve as resolve5 } from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
@@ -6830,7 +6890,7 @@ function resolveRepoScoutScript(currentDirectory) {
   for (const start of starts) {
     for (const candidate of ancestorChain(start)) {
       const scriptPath = join7(candidate, "apps", "desktop", "bin", "scout.ts");
-      if (existsSync5(scriptPath)) {
+      if (existsSync6(scriptPath)) {
         return scriptPath;
       }
     }
@@ -6920,7 +6980,7 @@ function errorMessage2(error) {
   }
   return String(error);
 }
-async function readOptionalFile2(filePath) {
+async function readOptionalFile(filePath) {
   try {
     const raw = await readFile5(filePath, "utf8");
     const trimmed = raw.trim();
@@ -7267,7 +7327,7 @@ var init_codex = __esm(() => {
     async resumeOrStartThread() {
       const options = this.codexOptions;
       const requestedThreadId = options.threadId?.trim() || null;
-      const storedThreadId = requestedThreadId ?? await readOptionalFile2(this.threadIdPath);
+      const storedThreadId = requestedThreadId ?? await readOptionalFile(this.threadIdPath);
       if (storedThreadId) {
         try {
           const resumed = await this.request("thread/resume", {
@@ -9483,7 +9543,7 @@ function isServerRequest2(message) {
 function isNotification2(message) {
   return Boolean(message && typeof message === "object" && "method" in message && !("id" in message));
 }
-async function readOptionalFile3(filePath) {
+async function readOptionalFile2(filePath) {
   try {
     const raw = await readFile6(filePath, "utf8");
     const trimmed = raw.trim();
@@ -9760,7 +9820,7 @@ class CodexAppServerSession {
   }
   async resumeOrStartThread() {
     const requestedThreadId = this.options.threadId?.trim() || null;
-    const storedThreadId = requestedThreadId ?? await readOptionalFile3(this.threadIdPath);
+    const storedThreadId = requestedThreadId ?? await readOptionalFile2(this.threadIdPath);
     if (storedThreadId) {
       try {
         const resumed = await this.request("thread/resume", {
@@ -10191,7 +10251,7 @@ function buildCollaborationContractPrompt(agentId) {
 
 // ../runtime/src/broker-service.ts
 import { spawnSync } from "child_process";
-import { existsSync as existsSync6, mkdirSync as mkdirSync2, readFileSync as readFileSync2, rmSync as rmSync2, writeFileSync as writeFileSync2 } from "fs";
+import { existsSync as existsSync7, mkdirSync as mkdirSync2, readFileSync as readFileSync3, rmSync as rmSync2, writeFileSync as writeFileSync2 } from "fs";
 import { homedir as homedir7 } from "os";
 import { basename as basename3, dirname as dirname5, join as join10, resolve as resolve6 } from "path";
 import { fileURLToPath as fileURLToPath4 } from "url";
@@ -10230,7 +10290,7 @@ function runtimePackageDir() {
   return resolve6(moduleDir, "..");
 }
 function isInstalledRuntimePackageDir(candidate) {
-  return existsSync6(join10(candidate, "package.json")) && existsSync6(join10(candidate, "bin", "openscout-runtime.mjs"));
+  return existsSync7(join10(candidate, "package.json")) && existsSync7(join10(candidate, "bin", "openscout-runtime.mjs"));
 }
 function findGlobalRuntimeDir() {
   const candidates = [
@@ -10261,7 +10321,7 @@ function findWorkspaceRuntimeDir(startDir) {
   let current = resolve6(startDir);
   while (true) {
     const candidate = join10(current, "packages", "runtime");
-    if (existsSync6(join10(candidate, "package.json")) && existsSync6(join10(candidate, "src"))) {
+    if (existsSync7(join10(candidate, "package.json")) && existsSync7(join10(candidate, "src"))) {
       return candidate;
     }
     const parent = dirname5(current);
@@ -10275,18 +10335,18 @@ function resolveBunExecutable2() {
   if (explicit && explicit.trim().length > 0) {
     return explicit;
   }
-  if (basename3(process.execPath).startsWith("bun") && existsSync6(process.execPath)) {
+  if (basename3(process.execPath).startsWith("bun") && existsSync7(process.execPath)) {
     return process.execPath;
   }
   const pathEntries = (process.env.PATH ?? "").split(":").filter(Boolean);
   for (const entry of pathEntries) {
     const candidate = join10(entry, "bun");
-    if (existsSync6(candidate)) {
+    if (existsSync7(candidate)) {
       return candidate;
     }
   }
   const homeBun = join10(homedir7(), ".bun", "bin", "bun");
-  if (existsSync6(homeBun)) {
+  if (existsSync7(homeBun)) {
     return homeBun;
   }
   return "bun";
@@ -10476,10 +10536,10 @@ function launchctlPath() {
   return "/bin/launchctl";
 }
 function readLogLines(path) {
-  if (!existsSync6(path)) {
+  if (!existsSync7(path)) {
     return [];
   }
-  return readFileSync2(path, "utf8").split(`
+  return readFileSync3(path, "utf8").split(`
 `).map((line) => line.trim()).filter(Boolean);
 }
 function isPackageScriptBanner(line) {
@@ -10576,7 +10636,7 @@ async function brokerServiceStatus(config = resolveBrokerServiceConfig()) {
   ensureServiceDirectories(config);
   const launchctl = inspectLaunchctl(config);
   const health = await fetchHealthSnapshot(config);
-  const installed = existsSync6(config.launchAgentPath);
+  const installed = existsSync7(config.launchAgentPath);
   const lastLogLine = health.reachable ? readLastLogLine([config.stdoutLogPath, config.stderrLogPath]) : readLastLogLine([config.stderrLogPath, config.stdoutLogPath]);
   return {
     label: config.label,
@@ -10638,7 +10698,7 @@ async function restartBrokerService(config = resolveBrokerServiceConfig()) {
 }
 async function uninstallBrokerService(config = resolveBrokerServiceConfig()) {
   await stopBrokerService(config);
-  if (existsSync6(config.launchAgentPath)) {
+  if (existsSync7(config.launchAgentPath)) {
     rmSync2(config.launchAgentPath, { force: true });
   }
   return brokerServiceStatus(config);
@@ -10717,7 +10777,7 @@ var init_local_agent_template = __esm(() => {
 
 // ../runtime/src/local-agents.ts
 import { execFileSync as execFileSync3, execSync } from "child_process";
-import { existsSync as existsSync7, readFileSync as readFileSync3 } from "fs";
+import { existsSync as existsSync8, readFileSync as readFileSync4 } from "fs";
 import { mkdir as mkdir6, rm as rm5, stat as stat3, writeFile as writeFile6 } from "fs/promises";
 import { basename as basename4, dirname as dirname6, join as join11, resolve as resolve7 } from "path";
 import { fileURLToPath as fileURLToPath5 } from "url";
@@ -10730,10 +10790,10 @@ function resolveProjectsRoot(projectPath) {
   }
   try {
     const supportPaths = resolveOpenScoutSupportPaths();
-    if (!existsSync7(supportPaths.settingsPath)) {
+    if (!existsSync8(supportPaths.settingsPath)) {
       return dirname6(projectPath);
     }
-    const raw = JSON.parse(readFileSync3(supportPaths.settingsPath, "utf8"));
+    const raw = JSON.parse(readFileSync4(supportPaths.settingsPath, "utf8"));
     const workspaceRoot = raw.discovery?.workspaceRoots?.find((entry) => typeof entry === "string" && entry.trim().length > 0);
     return workspaceRoot ? resolve7(workspaceRoot) : dirname6(projectPath);
   } catch {
@@ -10746,8 +10806,14 @@ function resolveBrokerUrl() {
 function nowSeconds2() {
   return Math.floor(Date.now() / 1000);
 }
+function scoutCliPath() {
+  return join11(OPENSCOUT_REPO_ROOT, "packages", "cli", "bin", "scout.mjs");
+}
+function legacyNodeBrokerRelayCommand() {
+  return `node ${JSON.stringify(scoutCliPath())}`;
+}
 function brokerRelayCommand() {
-  return `node ${JSON.stringify(join11(OPENSCOUT_REPO_ROOT, "packages", "cli", "bin", "scout.mjs"))}`;
+  return `bun ${JSON.stringify(scoutCliPath())}`;
 }
 function titleCaseLocalAgentName(value) {
   return value.split(/[-_.\s]+/).filter(Boolean).map((segment) => segment.charAt(0).toUpperCase() + segment.slice(1)).join(" ");
@@ -10760,7 +10826,7 @@ function resolveScoutSkillPath() {
     join11(process.env.HOME ?? "", ".agents", "skills", "relay-agent-comms", "SKILL.md")
   ];
   for (const path of candidatePaths) {
-    if (existsSync7(path)) {
+    if (existsSync8(path)) {
       return path;
     }
   }
@@ -10956,7 +11022,7 @@ function buildLegacyBrokerBackedRelayPrompt(agentId, projectName, projectPath, r
 function legacyLocalAgentSystemPromptCandidates(agentId, projectName, projectPath) {
   const relayHub = resolveRelayHub();
   const brokerUrl = resolveBrokerUrl();
-  const relayCommandBases = ["openscout relay", brokerRelayCommand()];
+  const relayCommandBases = ["openscout relay", brokerRelayCommand(), legacyNodeBrokerRelayCommand()];
   const projectPathCandidates = projectPath.endsWith("/") ? [projectPath, projectPath.slice(0, -1)] : [projectPath, `${projectPath}/`];
   const candidates = new Set;
   for (const pathCandidate of projectPathCandidates) {
@@ -10967,12 +11033,28 @@ function legacyLocalAgentSystemPromptCandidates(agentId, projectName, projectPat
   }
   return Array.from(candidates);
 }
+function generatedLocalAgentSystemPromptCandidates(agentId, projectName, projectPath) {
+  const baseContext = buildLocalAgentTemplateContext(agentId, projectName, projectPath);
+  const relayCommands = [brokerRelayCommand(), legacyNodeBrokerRelayCommand()];
+  const transportModes = [undefined, "codex_app_server", "claude_stream_json"];
+  const candidates = new Set;
+  for (const relayCommand of relayCommands) {
+    const context = {
+      ...baseContext,
+      relayCommand
+    };
+    for (const transport of transportModes) {
+      candidates.add(renderLocalAgentSystemPromptTemplate(buildLocalAgentSystemPromptTemplate(), context, transport ? { transport } : {}));
+    }
+  }
+  return Array.from(candidates);
+}
 function normalizeLocalAgentSystemPrompt(agentId, projectName, projectPath, systemPrompt) {
   const trimmed = systemPrompt?.trim();
   if (!trimmed) {
     return;
   }
-  if (legacyLocalAgentSystemPromptCandidates(agentId, projectName, projectPath).includes(trimmed)) {
+  if (legacyLocalAgentSystemPromptCandidates(agentId, projectName, projectPath).includes(trimmed) || generatedLocalAgentSystemPromptCandidates(agentId, projectName, projectPath).includes(trimmed)) {
     return;
   }
   return trimmed;
@@ -11460,7 +11542,7 @@ async function ensureLocalAgentOnline(agentName, record) {
     await new Promise((resolve8) => setTimeout(resolve8, 100));
   }
   if (!isLocalAgentSessionAlive(normalizedRecord.tmuxSession)) {
-    const stderrTail = existsSync7(stderrLogFile) ? readFileSync3(stderrLogFile, "utf8").trim().split(/\r?\n/).slice(-10).join(`
+    const stderrTail = existsSync8(stderrLogFile) ? readFileSync4(stderrLogFile, "utf8").trim().split(/\r?\n/).slice(-10).join(`
 `).trim() : "";
     throw new Error(stderrTail ? `Relay agent ${agentName} failed to stay online:
 ${stderrTail}` : `Relay agent ${agentName} failed to stay online.`);
@@ -11828,6 +11910,29 @@ async function restartAllLocalAgents(options = {}) {
   }));
   return restarted.filter((agent) => Boolean(agent));
 }
+function readPersistedClaudeSessionId(agentName) {
+  try {
+    const runtimeDir = relayAgentRuntimeDirectory(agentName);
+    const catalogPath = join11(runtimeDir, "session-catalog.json");
+    if (existsSync8(catalogPath)) {
+      const raw = readFileSync4(catalogPath, "utf8").trim();
+      if (raw) {
+        const catalog = JSON.parse(raw);
+        if (typeof catalog.activeSessionId === "string" && catalog.activeSessionId.trim()) {
+          return catalog.activeSessionId.trim();
+        }
+      }
+    }
+    const legacyPath = join11(runtimeDir, "claude-session-id.txt");
+    if (existsSync8(legacyPath)) {
+      const value = readFileSync4(legacyPath, "utf8").trim();
+      return value || null;
+    }
+    return null;
+  } catch {
+    return null;
+  }
+}
 function buildLocalAgentBinding(agentId, record, alive, nodeId, source) {
   const normalizedRecord = normalizeLocalAgentRecord(agentId, record);
   const definitionId = normalizedRecord.definitionId ?? agentId;
@@ -11835,6 +11940,7 @@ function buildLocalAgentBinding(agentId, record, alive, nodeId, source) {
   const projectRoot = normalizedRecord.projectRoot ?? normalizedRecord.cwd;
   const instance = buildRelayAgentInstance(definitionId, projectRoot);
   const actorId = instance.id;
+  const externalSessionId = normalizedRecord.transport === "claude_stream_json" ? readPersistedClaudeSessionId(definitionId) : null;
   return {
     actor: {
       id: actorId,
@@ -11912,7 +12018,8 @@ function buildLocalAgentBinding(agentId, record, alive, nodeId, source) {
         selector: instance.selector,
         nodeQualifier: instance.nodeQualifier,
         workspaceQualifier: instance.workspaceQualifier,
-        branch: instance.branch
+        branch: instance.branch,
+        ...externalSessionId ? { externalSessionId } : {}
       }
     }
   };
@@ -12008,7 +12115,7 @@ var init_local_agents = __esm(async () => {
 });
 
 // ../runtime/src/user-config.ts
-import { existsSync as existsSync8, readFileSync as readFileSync4, writeFileSync as writeFileSync3, mkdirSync as mkdirSync3 } from "fs";
+import { existsSync as existsSync9, readFileSync as readFileSync5, writeFileSync as writeFileSync3, mkdirSync as mkdirSync3 } from "fs";
 import { homedir as homedir8 } from "os";
 import { dirname as dirname7, join as join12 } from "path";
 function userConfigPath() {
@@ -12016,10 +12123,10 @@ function userConfigPath() {
 }
 function loadUserConfig() {
   const configPath = userConfigPath();
-  if (!existsSync8(configPath))
+  if (!existsSync9(configPath))
     return {};
   try {
-    return JSON.parse(readFileSync4(configPath, "utf8"));
+    return JSON.parse(readFileSync5(configPath, "utf8"));
   } catch {
     return {};
   }
@@ -43090,7 +43197,7 @@ var init_down = __esm(async () => {
 // ../../apps/desktop/src/app/host/runtime-service-client.ts
 import { spawn as spawn4 } from "child_process";
 import { basename as basename6, dirname as dirname8, join as join14 } from "path";
-import { existsSync as existsSync9 } from "fs";
+import { existsSync as existsSync10 } from "fs";
 import { fileURLToPath as fileURLToPath6 } from "url";
 import { homedir as homedir9 } from "os";
 function tryWhich(executableName) {
@@ -43100,13 +43207,13 @@ function tryWhich(executableName) {
     if (!dir)
       continue;
     const candidate = join14(dir, executableName);
-    if (existsSync9(candidate)) {
+    if (existsSync10(candidate)) {
       return candidate;
     }
     if (process.platform === "win32") {
       for (const ext of [".cmd", ".exe", ".bat"]) {
         const withExt = candidate + ext;
-        if (existsSync9(withExt))
+        if (existsSync10(withExt))
           return withExt;
       }
     }
@@ -43118,7 +43225,7 @@ function findNodeModulesRuntimeBin() {
   let dir = dirname8(fileURLToPath6(import.meta.url));
   for (let i = 0;i < 24; i++) {
     const candidate = join14(dir, runtimeBinRel);
-    if (existsSync9(candidate))
+    if (existsSync10(candidate))
       return candidate;
     const parent = dirname8(dir);
     if (parent === dir)
@@ -43126,7 +43233,7 @@ function findNodeModulesRuntimeBin() {
     dir = parent;
   }
   const bunGlobal = join14(homedir9(), ".bun", "install", "global", "node_modules", "@openscout", "runtime", "bin", "openscout-runtime.mjs");
-  if (existsSync9(bunGlobal))
+  if (existsSync10(bunGlobal))
     return bunGlobal;
   return null;
 }
@@ -43134,7 +43241,7 @@ function findMonorepoOpenscoutRuntimeBin() {
   let dir = process.cwd();
   for (let i = 0;i < 24; i++) {
     const candidate = join14(dir, "packages", "runtime", "bin", "openscout-runtime.mjs");
-    if (existsSync9(candidate)) {
+    if (existsSync10(candidate)) {
       return candidate;
     }
     const parent = dirname8(dir);
@@ -43147,7 +43254,7 @@ function findMonorepoOpenscoutRuntimeBin() {
 function resolveJavaScriptRuntimeExecutable() {
   const explicit = process.env.OPENSCOUT_RUNTIME_NODE_BIN?.trim();
   if (explicit) {
-    if (existsSync9(explicit)) {
+    if (existsSync10(explicit)) {
       return explicit;
     }
     const found = tryWhich(explicit);
@@ -43173,7 +43280,7 @@ function resolveJavaScriptRuntimeExecutable() {
 function resolveRuntimeServiceEntrypoint() {
   const explicit = process.env.OPENSCOUT_RUNTIME_BIN?.trim();
   if (explicit) {
-    if (existsSync9(explicit)) {
+    if (existsSync10(explicit)) {
       return explicit;
     }
     const found = tryWhich(explicit);
@@ -43450,16 +43557,16 @@ var init_service3 = __esm(() => {
 });
 
 // ../../apps/desktop/src/shared/paths.ts
-import { existsSync as existsSync10, readFileSync as readFileSync5 } from "fs";
+import { existsSync as existsSync11, readFileSync as readFileSync6 } from "fs";
 import { dirname as dirname10, join as join16, resolve as resolve10 } from "path";
 import { fileURLToPath as fileURLToPath7 } from "url";
 function looksLikeWorkspaceRoot(candidate) {
   const packageJsonPath = join16(candidate, "package.json");
-  if (!existsSync10(packageJsonPath)) {
+  if (!existsSync11(packageJsonPath)) {
     return false;
   }
   try {
-    const parsed = JSON.parse(readFileSync5(packageJsonPath, "utf8"));
+    const parsed = JSON.parse(readFileSync6(packageJsonPath, "utf8"));
     return Array.isArray(parsed.workspaces);
   } catch {
     return false;
@@ -43467,18 +43574,18 @@ function looksLikeWorkspaceRoot(candidate) {
 }
 function looksLikePackagedAppRoot(candidate) {
   const packageJsonPath = join16(candidate, "package.json");
-  if (!existsSync10(packageJsonPath)) {
+  if (!existsSync11(packageJsonPath)) {
     return false;
   }
   try {
-    const parsed = JSON.parse(readFileSync5(packageJsonPath, "utf8"));
+    const parsed = JSON.parse(readFileSync6(packageJsonPath, "utf8"));
     return parsed.name === "@openscout/scout" || parsed.name === "@openscout/cli";
   } catch {
     return false;
   }
 }
 function looksLikeSourceAppRoot(candidate) {
-  return existsSync10(join16(candidate, "bin", "scout.ts"));
+  return existsSync11(join16(candidate, "bin", "scout.ts"));
 }
 function findMatchingAncestor(startDirectory, predicate) {
   let current = resolve10(startDirectory);
@@ -43798,7 +43905,7 @@ var exports_env = {};
 __export(exports_env, {
   runEnvCommand: () => runEnvCommand
 });
-import { existsSync as existsSync11 } from "fs";
+import { existsSync as existsSync12 } from "fs";
 import { join as join17 } from "path";
 function resolveCommandOnPath(command, env) {
   const pathValue = env.PATH ?? "";
@@ -43808,7 +43915,7 @@ function resolveCommandOnPath(command, env) {
       continue;
     }
     const candidate = join17(trimmed, command);
-    if (existsSync11(candidate)) {
+    if (existsSync12(candidate)) {
       return candidate;
     }
   }
@@ -43820,7 +43927,7 @@ function resolveScoutBinPath(appRoot) {
     join17(appRoot, "bin", "scout.mjs")
   ];
   for (const candidate of candidates) {
-    if (existsSync11(candidate)) {
+    if (existsSync12(candidate)) {
       return candidate;
     }
   }
@@ -43895,9 +44002,9 @@ var init_env = __esm(async () => {
 
 // ../runtime/src/local-config.ts
 import {
-  existsSync as existsSync12,
+  existsSync as existsSync13,
   mkdirSync as mkdirSync4,
-  readFileSync as readFileSync6,
+  readFileSync as readFileSync7,
   renameSync,
   writeFileSync as writeFileSync4
 } from "fs";
@@ -43911,10 +44018,10 @@ function localConfigPath() {
 }
 function loadLocalConfig() {
   const configPath = localConfigPath();
-  if (!existsSync12(configPath))
+  if (!existsSync13(configPath))
     return { version: LOCAL_CONFIG_VERSION };
   try {
-    return validateLocalConfig(JSON.parse(readFileSync6(configPath, "utf8")));
+    return validateLocalConfig(JSON.parse(readFileSync7(configPath, "utf8")));
   } catch {
     return { version: LOCAL_CONFIG_VERSION };
   }
@@ -43954,7 +44061,7 @@ function writeLocalConfig(config2) {
   renameSync(tmp, configPath);
 }
 function localConfigExists() {
-  return existsSync12(localConfigPath());
+  return existsSync13(localConfigPath());
 }
 var LOCAL_CONFIG_VERSION = 1, DEFAULT_LOCAL_CONFIG;
 var init_local_config = __esm(() => {
@@ -46011,7 +46118,7 @@ __export(exports_menu, {
   parseMenuCommand: () => parseMenuCommand
 });
 import { spawnSync as spawnSync2 } from "child_process";
-import { existsSync as existsSync13 } from "fs";
+import { existsSync as existsSync14 } from "fs";
 import { homedir as homedir11 } from "os";
 import { dirname as dirname12, join as join19, resolve as resolve12 } from "path";
 import { fileURLToPath as fileURLToPath8 } from "url";
@@ -46100,7 +46207,7 @@ function findRepoMenuHelper(startDirectory) {
   let current = resolve12(startDirectory);
   while (true) {
     const candidate = join19(current, "apps", "macos", "bin", "openscout-menu.ts");
-    if (existsSync13(candidate)) {
+    if (existsSync14(candidate)) {
       return candidate;
     }
     const parent = dirname12(current);
@@ -46110,7 +46217,7 @@ function findRepoMenuHelper(startDirectory) {
     current = parent;
   }
   const sourceRelativeCandidate = fileURLToPath8(new URL("../../../../macos/bin/openscout-menu.ts", import.meta.url));
-  return existsSync13(sourceRelativeCandidate) ? sourceRelativeCandidate : null;
+  return existsSync14(sourceRelativeCandidate) ? sourceRelativeCandidate : null;
 }
 function resolveRepoBundlePath(helperPath) {
   return resolve12(dirname12(helperPath), "..", "dist", MENU_BUNDLE_NAME);
@@ -46129,7 +46236,7 @@ function resolveInstalledMenuBundlePath(env) {
     return indexedPath;
   }
   for (const candidate of COMMON_MENU_BUNDLE_PATHS) {
-    if (existsSync13(candidate)) {
+    if (existsSync14(candidate)) {
       return candidate;
     }
   }
@@ -46198,7 +46305,7 @@ function runWithRepoHelper(context, helperPath, command) {
   });
   const bundlePath = resolveRepoBundlePath(helperPath);
   const running = command.action === "quit" ? false : isMenuRunning(context.env);
-  const installed = existsSync13(bundlePath) || running;
+  const installed = existsSync14(bundlePath) || running;
   return {
     action: command.action,
     mode: "repo-helper",
@@ -46290,6 +46397,26 @@ function parsePeers(status) {
     tags: peer.Tags ?? []
   }));
 }
+function parseSelf(status) {
+  const self2 = status.Self;
+  if (!self2) {
+    return null;
+  }
+  return {
+    id: self2.ID ?? self2.DNSName ?? self2.HostName ?? "self",
+    name: self2.HostName ?? self2.DNSName ?? "self",
+    dnsName: self2.DNSName,
+    addresses: self2.TailscaleIPs ?? [],
+    online: self2.Online ?? true,
+    hostName: self2.HostName,
+    os: self2.OS,
+    tailnetName: status.CurrentTailnet?.Name,
+    magicDnsSuffix: status.CurrentTailnet?.MagicDNSSuffix
+  };
+}
+function isBackendRunning(status) {
+  return (status.BackendState ?? "").trim().toLowerCase() === "running";
+}
 async function readStatusJsonFromFile(filePath) {
   const raw = await readFile9(filePath, "utf8");
   return parseStatusJson(raw);
@@ -46308,11 +46435,24 @@ async function readStatusJson() {
   }
 }
 async function readTailscalePeers() {
+  const summary = await readTailscaleStatusSummary();
+  if (!summary) {
+    return [];
+  }
+  return summary.peers;
+}
+async function readTailscaleStatusSummary() {
   const status = await readStatusJson();
   if (!status) {
-    return [];
+    return null;
   }
-  return parsePeers(status);
+  return {
+    backendState: status.BackendState ?? null,
+    running: isBackendRunning(status),
+    health: status.Health ?? [],
+    peers: parsePeers(status),
+    self: parseSelf(status)
+  };
 }
 var execFileAsync;
 var init_tailscale = __esm(() => {
@@ -46342,9 +46482,13 @@ function readMeshEnvVars() {
   };
 }
 async function readTailscaleStatus() {
-  const peers = await readTailscalePeers();
+  const summary = await readTailscaleStatusSummary();
+  const peers = summary?.peers ?? [];
   return {
-    available: peers.length > 0,
+    available: summary !== null,
+    running: summary?.running ?? false,
+    backendState: summary?.backendState ?? null,
+    health: summary?.health ?? [],
     peers,
     onlineCount: peers.filter((p) => p.online).length
   };
@@ -46360,6 +46504,9 @@ function computeWarnings(health, localNode, nodes, tailscale) {
   } else if (localNode?.advertiseScope === "mesh" && localNode.brokerUrl && isLoopbackBrokerUrl(localNode.brokerUrl)) {
     warnings.push("Broker advertises mesh scope but is bound to loopback \u2014 peers cannot reach it. " + "Unset OPENSCOUT_BROKER_HOST (mesh default is 0.0.0.0) or use your Tailscale IP.");
   }
+  if (tailscale.available && !tailscale.running) {
+    warnings.push("Tailscale is installed but currently stopped on this machine. " + "Cached peers may appear, but the broker cannot reach them until Tailscale is running.");
+  }
   const remoteNodes = Object.values(nodes).filter((n) => n.id !== localNode?.id);
   if (!tailscale.available && remoteNodes.length === 0) {
     warnings.push("No Tailscale peers found and no mesh seeds configured. " + "Install Tailscale or set OPENSCOUT_MESH_SEEDS.");
@@ -46525,7 +46672,7 @@ function renderMeshStatus(report) {
   }
   lines.push(`  Broker: ${report.brokerUrl}`);
   lines.push(`  Scope: ${report.localNode?.advertiseScope === "mesh" ? "mesh-reachable" : "local-only"}`);
-  const tsLabel = report.tailscale.available ? `available (${report.tailscale.onlineCount} peer${report.tailscale.onlineCount === 1 ? "" : "s"} online)` : "not available";
+  const tsLabel = !report.tailscale.available ? "not available" : report.tailscale.running ? `running (${report.tailscale.onlineCount} peer${report.tailscale.onlineCount === 1 ? "" : "s"} online)` : `not running (${report.tailscale.backendState ?? "unknown"})`;
   lines.push(`  Tailscale: ${tsLabel}`);
   const allNodes = Object.values(report.nodes);
   const remoteNodes = allNodes.filter((n) => n.id !== report.localNode?.id);
@@ -46559,7 +46706,8 @@ function renderMeshDoctor(report) {
     lines.push(`  ID: ${report.localNode.id}`);
     lines.push(`  Name: ${report.localNode.name}`);
     lines.push(`  Mesh: ${report.localNode.meshId}`);
-    lines.push(`  Broker URL: ${report.brokerUrl}`);
+    lines.push(`  Control URL: ${report.brokerUrl}`);
+    lines.push(`  Announced URL: ${report.localNode.brokerUrl ?? report.brokerUrl}`);
     lines.push(`  Advertise scope: ${report.localNode.advertiseScope}`);
     if (report.localNode.hostName) {
       lines.push(`  Hostname: ${report.localNode.hostName}`);
@@ -46570,7 +46718,11 @@ function renderMeshDoctor(report) {
   lines.push("");
   lines.push("Tailscale:");
   if (report.tailscale.available) {
-    lines.push(`  Status: available (${report.tailscale.peers.length} peer${report.tailscale.peers.length === 1 ? "" : "s"})`);
+    const state = report.tailscale.backendState ?? "unknown";
+    lines.push(`  Status: ${report.tailscale.running ? `running (${state})` : `not running (${state})`} (${report.tailscale.peers.length} peer${report.tailscale.peers.length === 1 ? "" : "s"})`);
+    for (const detail of report.tailscale.health) {
+      lines.push(`  ! ${detail}`);
+    }
     for (const peer of report.tailscale.peers) {
       const ips = peer.addresses.join(", ");
       const status = peer.online ? "online" : "offline";
@@ -46598,7 +46750,7 @@ function renderMeshDoctor(report) {
     }
   }
   lines.push("");
-  lines.push("Configuration:");
+  lines.push("Client environment (this shell):");
   const env = report.envVars;
   lines.push(`  OPENSCOUT_MESH_ID: ${env.meshId ?? "(default: openscout)"}`);
   lines.push(`  OPENSCOUT_MESH_SEEDS: ${env.meshSeeds || "(not set)"}`);
@@ -46741,7 +46893,7 @@ var init_mesh2 = __esm(async () => {
 });
 
 // ../../apps/desktop/src/core/pairing/runtime/config.ts
-import { existsSync as existsSync14, mkdirSync as mkdirSync5, readFileSync as readFileSync7, writeFileSync as writeFileSync5 } from "fs";
+import { existsSync as existsSync15, mkdirSync as mkdirSync5, readFileSync as readFileSync8, writeFileSync as writeFileSync5 } from "fs";
 import { homedir as homedir12 } from "os";
 import path from "path";
 function pairingPaths() {
@@ -46758,11 +46910,11 @@ function pairingPaths() {
 }
 function loadPairingConfig() {
   const { configPath } = pairingPaths();
-  if (!existsSync14(configPath)) {
+  if (!existsSync15(configPath)) {
     return {};
   }
   try {
-    const payload = JSON.parse(readFileSync7(configPath, "utf8"));
+    const payload = JSON.parse(readFileSync8(configPath, "utf8"));
     return typeof payload === "object" && payload ? payload : {};
   } catch {
     return {};
@@ -48845,17 +48997,17 @@ var init_noise = __esm(() => {
 });
 
 // ../../apps/desktop/src/core/pairing/runtime/security/identity.ts
-import { existsSync as existsSync15, mkdirSync as mkdirSync6, readFileSync as readFileSync8, writeFileSync as writeFileSync6 } from "fs";
+import { existsSync as existsSync16, mkdirSync as mkdirSync6, readFileSync as readFileSync9, writeFileSync as writeFileSync6 } from "fs";
 import { join as join20 } from "path";
 import { homedir as homedir13 } from "os";
 function loadOrCreateIdentity() {
-  if (existsSync15(IDENTITY_FILE)) {
+  if (existsSync16(IDENTITY_FILE)) {
     return loadIdentity();
   }
   return createAndSaveIdentity();
 }
 function loadIdentity() {
-  const data = JSON.parse(readFileSync8(IDENTITY_FILE, "utf8"));
+  const data = JSON.parse(readFileSync9(IDENTITY_FILE, "utf8"));
   return {
     publicKey: hexToBytes2(data.publicKey),
     privateKey: hexToBytes2(data.privateKey)
@@ -48873,9 +49025,9 @@ function createAndSaveIdentity() {
   return keyPair;
 }
 function loadTrustedPeers() {
-  if (!existsSync15(TRUSTED_PEERS_FILE))
+  if (!existsSync16(TRUSTED_PEERS_FILE))
     return new Map;
-  const data = JSON.parse(readFileSync8(TRUSTED_PEERS_FILE, "utf8"));
+  const data = JSON.parse(readFileSync9(TRUSTED_PEERS_FILE, "utf8"));
   return new Map(data.map((p) => [p.publicKey, p]));
 }
 function saveTrustedPeer(peer) {
@@ -49056,14 +49208,14 @@ var init_security2 = __esm(() => {
 });
 
 // ../../apps/desktop/src/core/pairing/runtime/runtime-state.ts
-import { existsSync as existsSync16, mkdirSync as mkdirSync7, readFileSync as readFileSync9, renameSync as renameSync2, unlinkSync, writeFileSync as writeFileSync7 } from "fs";
+import { existsSync as existsSync17, mkdirSync as mkdirSync7, readFileSync as readFileSync10, renameSync as renameSync2, unlinkSync, writeFileSync as writeFileSync7 } from "fs";
 function readPairingRuntimeSnapshot() {
   const { runtimeStatePath } = pairingPaths();
-  if (!existsSync16(runtimeStatePath)) {
+  if (!existsSync17(runtimeStatePath)) {
     return null;
   }
   try {
-    const parsed = JSON.parse(readFileSync9(runtimeStatePath, "utf8"));
+    const parsed = JSON.parse(readFileSync10(runtimeStatePath, "utf8"));
     return parsed?.version === 1 ? parsed : null;
   } catch {
     return null;
@@ -49181,15 +49333,15 @@ var init_bridge = __esm(() => {
 });
 
 // ../../apps/desktop/src/core/pairing/runtime/bridge/config.ts
-import { existsSync as existsSync17, readFileSync as readFileSync10 } from "fs";
+import { existsSync as existsSync18, readFileSync as readFileSync11 } from "fs";
 import { join as join22 } from "path";
 import { homedir as homedir15 } from "os";
 function loadConfigFile() {
-  if (!existsSync17(CONFIG_FILE)) {
+  if (!existsSync18(CONFIG_FILE)) {
     return {};
   }
   try {
-    const raw = readFileSync10(CONFIG_FILE, "utf8");
+    const raw = readFileSync11(CONFIG_FILE, "utf8");
     const parsed = JSON.parse(raw);
     return parsed;
   } catch (err) {
@@ -50102,7 +50254,7 @@ async function deriveNewAgentName(projectName, branch, harness) {
 async function createGitWorktree(projectRoot, agentName) {
   const { execSync: execSync2 } = await import("child_process");
   const { join: join24 } = await import("path");
-  const { mkdirSync: mkdirSync9, existsSync: existsSync18 } = await import("fs");
+  const { mkdirSync: mkdirSync9, existsSync: existsSync19 } = await import("fs");
   try {
     execSync2("git rev-parse --git-dir", { cwd: projectRoot, stdio: "pipe" });
   } catch {
@@ -50111,7 +50263,7 @@ async function createGitWorktree(projectRoot, agentName) {
   const branchName = `scout/${agentName}`;
   const worktreeDir = join24(projectRoot, ".scout-worktrees");
   const worktreePath = join24(worktreeDir, agentName);
-  if (existsSync18(worktreePath)) {
+  if (existsSync19(worktreePath)) {
     return { path: worktreePath, branch: branchName };
   }
   mkdirSync9(worktreeDir, { recursive: true });
@@ -50154,7 +50306,7 @@ var init_service5 = __esm(async () => {
 });
 
 // ../../apps/desktop/src/core/pairing/runtime/bridge/server.ts
-import { readdirSync as readdirSync2, readFileSync as readFileSync11, realpathSync, statSync as statSync3 } from "fs";
+import { readdirSync as readdirSync2, readFileSync as readFileSync12, realpathSync, statSync as statSync3 } from "fs";
 import { execSync as execSync2 } from "child_process";
 import { basename as basename9, isAbsolute as isAbsolute3, join as join24, relative as relative2 } from "path";
 import { homedir as homedir18 } from "os";
@@ -50493,7 +50645,7 @@ async function handleRPCInner(bridge, req, deviceId) {
           return { id: req.id, error: { code: -32000, message: "Only .jsonl files can be read" } };
         }
         try {
-          const content = readFileSync11(p.path, "utf-8");
+          const content = readFileSync12(p.path, "utf-8");
           const lines = content.split(`
 `).filter((l) => l.trim().length > 0);
           const trimmed = lines.length > 500 ? lines.slice(-500) : lines;
@@ -54747,7 +54899,7 @@ var init_thread_events2 = __esm(() => {
 
 // ../runtime/src/mobile-push.ts
 import { Database as Database2 } from "bun:sqlite";
-import { mkdirSync as mkdirSync9, readFileSync as readFileSync12 } from "fs";
+import { mkdirSync as mkdirSync9, readFileSync as readFileSync13 } from "fs";
 import { connect as connectHttp2 } from "http2";
 import { createPrivateKey, sign as signWithKey } from "crypto";
 import { dirname as dirname13, join as join25 } from "path";
@@ -54918,7 +55070,7 @@ function loadApnsCredentials() {
     privateKeyPem = Buffer.from(inlineBase64, "base64").toString("utf8");
   }
   if (!privateKeyPem && path2) {
-    privateKeyPem = readFileSync12(path2, "utf8");
+    privateKeyPem = readFileSync13(path2, "utf8");
   }
   if (!teamId || !keyId || !privateKeyPem) {
     return null;
@@ -55142,7 +55294,7 @@ var init_src2 = __esm(async () => {
 });
 
 // ../../apps/desktop/src/core/pairing/runtime/bridge/router.ts
-import { readFileSync as readFileSync13, readdirSync as readdirSync3, realpathSync as realpathSync2, statSync as statSync4 } from "fs";
+import { readFileSync as readFileSync14, readdirSync as readdirSync3, realpathSync as realpathSync2, statSync as statSync4 } from "fs";
 import { execSync as execSync3 } from "child_process";
 import { basename as basename10, isAbsolute as isAbsolute4, join as join26, relative as relative3 } from "path";
 import { homedir as homedir19 } from "os";
@@ -55822,7 +55974,7 @@ var init_router = __esm(async () => {
         });
       }
       try {
-        const content = readFileSync13(input.path, "utf-8");
+        const content = readFileSync14(input.path, "utf-8");
         const lines = content.split(`
 `).filter((l) => l.trim().length > 0);
         const trimmed = lines.length > 500 ? lines.slice(-500) : lines;
@@ -60775,11 +60927,11 @@ var BRIDGE_ABSENCE_GRACE_MS = 30000, ROOM_IDLE_TIMEOUT_MS = 60000;
 
 // ../../apps/desktop/src/core/pairing/runtime/relay-runtime.ts
 import { execSync as execSync4 } from "child_process";
-import { existsSync as existsSync18, mkdirSync as mkdirSync11, readdirSync as readdirSync4 } from "fs";
+import { existsSync as existsSync19, mkdirSync as mkdirSync11, readdirSync as readdirSync4 } from "fs";
 import { homedir as homedir22 } from "os";
 import { join as join27 } from "path";
 function findStoredCerts() {
-  if (!existsSync18(PAIRING_DIR2)) {
+  if (!existsSync19(PAIRING_DIR2)) {
     return null;
   }
   try {
@@ -61835,7 +61987,7 @@ __export(exports_server, {
   normalizeServerOpenPath: () => normalizeServerOpenPath
 });
 import { spawn as spawn5 } from "child_process";
-import { existsSync as existsSync19 } from "fs";
+import { existsSync as existsSync20 } from "fs";
 import { dirname as dirname14, join as join28, resolve as resolve14 } from "path";
 import { fileURLToPath as fileURLToPath9 } from "url";
 function renderServerCommandHelp() {
@@ -61845,6 +61997,7 @@ function renderServerCommandHelp() {
     "Usage:",
     "  scout server start [options]",
     "  scout server open [options]",
+    "  scout server control-plane open [options]  # legacy alias",
     "",
     "Subcommands:",
     "  start              Start the Scout web UI server.",
@@ -61868,14 +62021,18 @@ function resolveScoutWebServerEntry() {
 function resolveScoutControlPlaneWebServerEntry() {
   const mainDir = dirname14(fileURLToPath9(import.meta.url));
   const bundled = join28(mainDir, "scout-control-plane-web.mjs");
-  if (existsSync19(bundled)) {
+  if (existsSync20(bundled)) {
     return bundled;
   }
-  const source = fileURLToPath9(new URL("../../server/control-plane-index.ts", import.meta.url));
-  if (existsSync19(source)) {
+  const source = fileURLToPath9(new URL("../../../../../packages/web/server/index.ts", import.meta.url).href);
+  if (existsSync20(source)) {
     return source;
   }
-  throw new ScoutCliError("Could not find Scout control-plane web server entry. Rebuild @openscout/scout or run from the OpenScout repository.");
+  const legacySource = fileURLToPath9(new URL("../../server/control-plane-index.ts", import.meta.url).href);
+  if (existsSync20(legacySource)) {
+    return legacySource;
+  }
+  throw new ScoutCliError("Could not find Scout web server entry. Rebuild @openscout/scout or run from the OpenScout repository.");
 }
 function parseServerFlags(args) {
   const env = {};
@@ -61949,7 +62106,7 @@ function resolveBundledStaticClientRoot(entry, _mode) {
   const entryDir = dirname14(entry);
   const clientDirectory = join28(entryDir, "client");
   const indexPath = join28(clientDirectory, "index.html");
-  return existsSync19(indexPath) ? clientDirectory : null;
+  return existsSync20(indexPath) ? clientDirectory : null;
 }
 function buildMergedServerEnv(entry, mode, flagEnv) {
   const bundledStaticClientRoot = resolveBundledStaticClientRoot(entry, mode);
@@ -61975,7 +62132,7 @@ function parseServerSelection(args) {
       action: "start",
       flagArgs: args.slice(1),
       entry: resolveScoutControlPlaneWebServerEntry(),
-      mode: "full"
+      mode: "openscout-web"
     };
   }
   if (args[0] === "open") {
@@ -61983,7 +62140,7 @@ function parseServerSelection(args) {
       action: "open",
       flagArgs: args.slice(1),
       entry: resolveScoutControlPlaneWebServerEntry(),
-      mode: "full"
+      mode: "openscout-web"
     };
   }
   if (args[0] === "control-plane") {
@@ -61992,7 +62149,7 @@ function parseServerSelection(args) {
       action: sub,
       flagArgs: args.slice(2),
       entry: resolveScoutControlPlaneWebServerEntry(),
-      mode: "control-plane"
+      mode: "openscout-web"
     };
   }
   throw new ScoutCliError(`unknown subcommand: ${args[0]} (try: scout server open)`);
@@ -62028,7 +62185,7 @@ function resolveExpectedCurrentDirectory(env) {
   return resolve14(env.OPENSCOUT_SETUP_CWD?.trim() || process.cwd());
 }
 function renderModeLabel(mode) {
-  return mode === "control-plane" ? "Scout control plane" : "Scout";
+  return "Scout web";
 }
 function renderSurfaceLabel(surface) {
   switch (surface) {
@@ -62036,14 +62193,13 @@ function renderSurfaceLabel(surface) {
       return "control-plane";
     case "openscout-web":
       return "@openscout/web";
-    case "full":
-    default:
-      return "full";
   }
 }
 function renderServerOpenResult(result) {
-  const prefix = result.mode === "control-plane" ? "Opened Scout control plane" : "Opened Scout";
-  return `${prefix} at ${result.url}${result.reusedExistingServer ? "" : " (started server)"}`;
+  return `Opened Scout web at ${result.url}${result.reusedExistingServer ? "" : " (started server)"}`;
+}
+function isCurrentScoutWebSurface(surface) {
+  return surface === "openscout-web" || surface === "control-plane";
 }
 function healthUrlForPort(port) {
   return new URL(`/api/health`, `http://127.0.0.1:${port}`);
@@ -62071,7 +62227,7 @@ async function probeScoutServer(port) {
         statusCode: response.status
       };
     }
-    if (body.ok === true && (body.surface === "full" || body.surface === "control-plane" || body.surface === "openscout-web") && typeof body.currentDirectory === "string") {
+    if (body.ok === true && (body.surface === "control-plane" || body.surface === "openscout-web") && typeof body.currentDirectory === "string") {
       return {
         status: "healthy",
         health: {
@@ -62150,7 +62306,7 @@ async function waitForScoutServer(port, mode, expectedCurrentDirectory) {
     const probe = await probeScoutServer(port);
     if (probe.status === "healthy") {
       const actualCurrentDirectory = resolve14(probe.health.currentDirectory);
-      if (probe.health.surface !== mode) {
+      if (!isCurrentScoutWebSurface(probe.health.surface)) {
         throw new ScoutCliError(`port ${port} is serving Scout ${renderSurfaceLabel(probe.health.surface)}, not ${renderModeLabel(mode)}.`);
       }
       if (actualCurrentDirectory !== expectedCurrentDirectory) {
@@ -62172,7 +62328,7 @@ async function openScoutServer(options) {
   const probe = await probeScoutServer(port);
   if (probe.status === "healthy") {
     const actualCurrentDirectory = resolve14(probe.health.currentDirectory);
-    if (probe.health.surface !== options.mode) {
+    if (!isCurrentScoutWebSurface(probe.health.surface)) {
       throw new ScoutCliError(`port ${port} is already serving Scout ${renderSurfaceLabel(probe.health.surface)}, not ${renderModeLabel(options.mode)}.`);
     }
     if (actualCurrentDirectory !== expectedCurrentDirectory) {
@@ -62370,7 +62526,7 @@ import { EventEmitter as EventEmitter2 } from "events";
 import { resolve as resolve15, dirname as dirname15 } from "path";
 import { fileURLToPath as fileURLToPath10 } from "url";
 import { resolve as resolve22, isAbsolute as isAbsolute5, parse as parse7 } from "path";
-import { existsSync as existsSync20 } from "fs";
+import { existsSync as existsSync21 } from "fs";
 import { basename as basename11, join as join29 } from "path";
 import os from "os";
 import path2 from "path";
@@ -76584,7 +76740,7 @@ var init_index_vy1rm1x3 = __esm(async () => {
         worker_path = this.options.workerPath;
       } else {
         worker_path = new URL("./parser.worker.js", import.meta.url).href;
-        if (!existsSync20(resolve22(import.meta.dirname, "parser.worker.js"))) {
+        if (!existsSync21(resolve22(import.meta.dirname, "parser.worker.js"))) {
           worker_path = new URL("./parser.worker.ts", import.meta.url).href;
         }
       }
@@ -123658,7 +123814,7 @@ var exports_up = {};
 __export(exports_up, {
   runUpCommand: () => runUpCommand
 });
-import { existsSync as existsSync21 } from "fs";
+import { existsSync as existsSync23 } from "fs";
 import { resolve as resolve17 } from "path";
 function looksLikePath(value) {
   return value.includes("/") || value.startsWith(".") || value.startsWith("~");
@@ -123707,7 +123863,7 @@ async function runUpCommand(context, args) {
     throw new ScoutCliError("usage: scout up <name|path> [--name <alias>] [--harness <claude|codex>]");
   }
   let projectPath;
-  if (looksLikePath(target) || existsSync21(resolve17(target))) {
+  if (looksLikePath(target) || existsSync23(resolve17(target))) {
     projectPath = resolve17(target);
   } else {
     const resolved = await resolveLocalAgentByName(target);
@@ -123827,7 +123983,7 @@ var init_whoami = __esm(async () => {
 });
 
 // ../../apps/desktop/src/cli/main.ts
-import { existsSync as existsSync23, readFileSync as readFileSync14, writeFileSync as writeFileSync9, statSync as statSync5, mkdirSync as mkdirSync12 } from "fs";
+import { existsSync as existsSync25, readFileSync as readFileSync15, writeFileSync as writeFileSync9, statSync as statSync5, mkdirSync as mkdirSync12 } from "fs";
 import { join as join32 } from "path";
 import { spawnSync as spawnSync3 } from "child_process";
 import { homedir as homedir23 } from "os";
@@ -124091,7 +124247,7 @@ function getScoutBinPath() {
   if (_scoutBinPath)
     return _scoutBinPath;
   _scoutBinPath = join32(homedir23(), ".bun", "bin", "scout");
-  if (!existsSync23(_scoutBinPath)) {
+  if (!existsSync25(_scoutBinPath)) {
     _scoutBinPath = spawnSync3("which", ["scout"], { encoding: "utf8" }).stdout.trim();
   }
   return _scoutBinPath;
@@ -124101,7 +124257,7 @@ async function ensureBrokerUptodate() {
     const mtime = statSync5(getScoutBinPath()).mtimeMs;
     const checkpointDir = join32(homedir23(), ".scout");
     const mtimePath = join32(checkpointDir, "cli-mtime");
-    const lastMtime = existsSync23(mtimePath) ? Number(readFileSync14(mtimePath, "utf8").trim()) : 0;
+    const lastMtime = existsSync25(mtimePath) ? Number(readFileSync15(mtimePath, "utf8").trim()) : 0;
     if (mtime > lastMtime) {
       const uid = process.getuid();
       const plistPath = join32(homedir23(), "Library", "LaunchAgents", "dev.openscout.broker.plist");
@@ -124110,7 +124266,7 @@ async function ensureBrokerUptodate() {
       spawnSync3("launchctl", ["bootstrap", `gui/${uid}`, plistPath], { stdio: "ignore" });
       await new Promise((resolve18) => setTimeout(resolve18, 2000));
     }
-    if (!existsSync23(checkpointDir)) {
+    if (!existsSync25(checkpointDir)) {
       mkdirSync12(checkpointDir, { recursive: true });
     }
     writeFileSync9(mtimePath, String(Math.floor(mtime)), { encoding: "utf8", flag: "w" });