@openscout/scout 0.2.57 → 0.2.60

package/dist/main.mjs

@@ -464,6 +464,7 @@ function parseCardCreateCommandOptions(args, defaultCurrentDirectory) {
   let agentName;
   let displayName;
   let harness;
+  let model;
   let requesterId = null;
   let noInput = false;
   for (let index = 0;index < parsed.args.length; index += 1) {
@@ -486,6 +487,12 @@ function parseCardCreateCommandOptions(args, defaultCurrentDirectory) {
       index = value.nextIndex;
       continue;
     }
+    if (current === "--model" || current.startsWith("--model=")) {
+      const value = parseFlagValue(parsed.args, index, "--model");
+      model = value.value;
+      index = value.nextIndex;
+      continue;
+    }
     if (current === "--as" || current.startsWith("--as=")) {
       const value = parseFlagValue(parsed.args, index, "--as");
       requesterId = value.value;
@@ -520,6 +527,7 @@ function parseCardCreateCommandOptions(args, defaultCurrentDirectory) {
     agentName,
     displayName,
     harness,
+    model,
     requesterId,
     noInput
   };
@@ -2277,6 +2285,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 +2303,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 +2332,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 +2485,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 +2521,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 +4705,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 +4721,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 +4782,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 +4888,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 +4919,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 +4999,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 +5066,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 +6252,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 +6262,7 @@ function resolveClaudeResumeContext(config) {
     return null;
   }
   const projectsRoot = join6(homedir4(), ".claude", "projects");
-  if (!existsSync4(projectsRoot)) {
+  if (!existsSync5(projectsRoot)) {
     return null;
   }
   let projectSlugs;
@@ -6205,7 +6273,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 +6814,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 +6898,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 +6988,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 +7335,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", {
@@ -9386,8 +9454,107 @@ var init_src = __esm(() => {
 
 // ../runtime/src/codex-app-server.ts
 import { spawn as spawn3 } from "child_process";
-import { access as access3, appendFile as appendFile3, constants as constants3, mkdir as mkdir5, readFile as readFile6, rm as rm4, writeFile as writeFile5 } from "fs/promises";
+import { constants as constants3 } from "fs";
+import { access as access3, appendFile as appendFile3, mkdir as mkdir5, readFile as readFile6, rm as rm4, writeFile as writeFile5 } from "fs/promises";
 import { delimiter as delimiter3, join as join9 } from "path";
+function normalizeCodexModelValue(value) {
+  const trimmed = value?.trim();
+  return trimmed ? trimmed : null;
+}
+function encodeCodexModelConfig(model) {
+  return `model=${JSON.stringify(model)}`;
+}
+function parseCodexModelConfig(value) {
+  const trimmed = value?.trim();
+  if (!trimmed) {
+    return null;
+  }
+  const separatorIndex = trimmed.indexOf("=");
+  if (separatorIndex <= 0) {
+    return null;
+  }
+  const key = trimmed.slice(0, separatorIndex).trim();
+  if (key !== "model") {
+    return null;
+  }
+  const rawValue = trimmed.slice(separatorIndex + 1).trim();
+  if (!rawValue) {
+    return null;
+  }
+  if (rawValue.startsWith('"') && rawValue.endsWith('"') || rawValue.startsWith("'") && rawValue.endsWith("'")) {
+    return rawValue.slice(1, -1) || null;
+  }
+  return rawValue;
+}
+function normalizeCodexAppServerLaunchArgs(launchArgs) {
+  const args = Array.isArray(launchArgs) ? launchArgs.map((entry) => String(entry).trim()).filter(Boolean) : [];
+  const normalized = [];
+  for (let index = 0;index < args.length; index += 1) {
+    const current = args[index] ?? "";
+    if (current === "--model" || current === "-m") {
+      const model = normalizeCodexModelValue(args[index + 1]);
+      if (model) {
+        normalized.push("-c", encodeCodexModelConfig(model));
+        index += 1;
+        continue;
+      }
+      normalized.push(current);
+      continue;
+    }
+    if (current.startsWith("--model=")) {
+      const model = normalizeCodexModelValue(current.slice("--model=".length));
+      if (model) {
+        normalized.push("-c", encodeCodexModelConfig(model));
+        continue;
+      }
+    }
+    if (current.startsWith("-m=")) {
+      const model = normalizeCodexModelValue(current.slice(3));
+      if (model) {
+        normalized.push("-c", encodeCodexModelConfig(model));
+        continue;
+      }
+    }
+    if (current === "-c" || current === "--config") {
+      const next = args[index + 1];
+      if (typeof next === "string") {
+        const model = parseCodexModelConfig(next);
+        normalized.push(current === "--config" ? "--config" : "-c", model ? encodeCodexModelConfig(model) : next);
+        index += 1;
+        continue;
+      }
+    }
+    if (current.startsWith("--config=")) {
+      const value = current.slice("--config=".length);
+      const model = parseCodexModelConfig(value);
+      normalized.push(model ? `--config=${encodeCodexModelConfig(model)}` : current);
+      continue;
+    }
+    normalized.push(current);
+  }
+  return normalized;
+}
+function readCodexAppServerModelFromLaunchArgs(launchArgs) {
+  const normalized = normalizeCodexAppServerLaunchArgs(launchArgs);
+  for (let index = 0;index < normalized.length; index += 1) {
+    const current = normalized[index] ?? "";
+    if (current === "-c" || current === "--config") {
+      const model = parseCodexModelConfig(normalized[index + 1]);
+      if (model) {
+        return model;
+      }
+      index += 1;
+      continue;
+    }
+    if (current.startsWith("--config=")) {
+      const model = parseCodexModelConfig(current.slice("--config=".length));
+      if (model) {
+        return model;
+      }
+    }
+  }
+  return null;
+}
 function sessionKey2(options) {
   return `${options.agentName}:${options.sessionId}`;
 }
@@ -9483,7 +9650,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();
@@ -9496,6 +9663,13 @@ function isMissingCodexRolloutError2(error) {
   const message = errorMessage3(error).toLowerCase();
   return message.includes("no rollout found for thread id");
 }
+function resolveCodexCompletionGraceMs() {
+  const parsed = Number.parseInt(process.env.OPENSCOUT_CODEX_COMPLETION_GRACE_MS ?? "", 10);
+  if (Number.isFinite(parsed) && parsed >= 0) {
+    return parsed;
+  }
+  return 60000;
+}
 
 class CodexAppServerSession {
   options;
@@ -9685,7 +9859,7 @@ class CodexAppServerSession {
       systemPrompt: options.systemPrompt,
       threadId: options.threadId ?? null,
       requireExistingThread: options.requireExistingThread === true,
-      launchArgs: Array.isArray(options.launchArgs) ? options.launchArgs : []
+      launchArgs: normalizeCodexAppServerLaunchArgs(options.launchArgs)
     });
   }
   async ensureStarted() {
@@ -9707,6 +9881,7 @@ class CodexAppServerSession {
     await mkdir5(this.options.logsDirectory, { recursive: true });
     await writeFile5(join9(this.options.runtimeDirectory, "prompt.txt"), this.options.systemPrompt);
     const codexExecutable = await resolveCodexExecutable2();
+    const launchArgs = normalizeCodexAppServerLaunchArgs(this.options.launchArgs);
     const env = buildManagedAgentEnvironment({
       agentName: this.options.agentName,
       currentDirectory: this.options.cwd,
@@ -9717,7 +9892,8 @@ class CodexAppServerSession {
       ...buildScoutMcpCodexLaunchArgs({
         currentDirectory: this.options.cwd,
         env
-      })
+      }),
+      ...launchArgs
     ], {
       cwd: this.options.cwd,
       env,
@@ -9760,7 +9936,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", {
@@ -9815,6 +9991,8 @@ class CodexAppServerSession {
       turnId: "",
       startedAt: Date.now(),
       timer: null,
+      graceTimer: null,
+      timedOutAt: null,
       messageOrder: [],
       messageByItemId: new Map,
       resolve: resolve6,
@@ -9822,20 +10000,43 @@ class CodexAppServerSession {
       watchers: []
     };
     turn.timer = setTimeout(() => {
-      this.interrupt().catch(() => {
-        return;
-      });
-      if (this.activeTurn === turn) {
-        this.activeTurn = null;
-      }
-      for (const watcher of this.drainTurnWatchers(turn)) {
-        watcher.reject(new Error(`Timed out after ${timeoutMs}ms waiting for ${this.options.agentName}.`));
-      }
-      reject(new Error(`Timed out after ${timeoutMs}ms waiting for ${this.options.agentName}.`));
+      this.scheduleTurnTimeout(turn, timeoutMs);
     }, timeoutMs);
     this.activeTurn = turn;
     return turn;
   }
+  buildTurnTimeoutError(timeoutMs) {
+    return new Error(`Timed out after ${timeoutMs}ms waiting for ${this.options.agentName}.`);
+  }
+  scheduleTurnTimeout(turn, timeoutMs) {
+    if (turn.timedOutAt !== null) {
+      return;
+    }
+    turn.timedOutAt = Date.now();
+    this.interrupt().catch(() => {
+      return;
+    });
+    const graceMs = resolveCodexCompletionGraceMs();
+    if (graceMs <= 0) {
+      this.rejectTimedOutTurn(turn, timeoutMs);
+      return;
+    }
+    turn.graceTimer = setTimeout(() => {
+      this.rejectTimedOutTurn(turn, timeoutMs);
+    }, graceMs);
+  }
+  rejectTimedOutTurn(turn, timeoutMs) {
+    if (this.activeTurn !== turn) {
+      this.clearActiveTurn(turn);
+      return;
+    }
+    this.clearActiveTurn(turn);
+    const error = this.buildTurnTimeoutError(timeoutMs);
+    for (const watcher of this.drainTurnWatchers(turn)) {
+      watcher.reject(error);
+    }
+    turn.reject(error);
+  }
   addTurnWatcher(turn, resolve6, reject, timeoutMs) {
     const watcher = {
       resolve: resolve6,
@@ -9869,6 +10070,9 @@ class CodexAppServerSession {
     if (turn.timer) {
       clearTimeout(turn.timer);
     }
+    if (turn.graceTimer) {
+      clearTimeout(turn.graceTimer);
+    }
     if (this.activeTurn === turn) {
       this.activeTurn = null;
     }
@@ -10191,7 +10395,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 +10434,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 +10465,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 +10479,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 +10680,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 +10780,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 +10842,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 +10921,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 +10934,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 +10950,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 +10970,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 +11166,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 +11177,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;
@@ -11052,6 +11278,128 @@ function normalizeLocalAgentCapabilities(value) {
 function normalizeLocalAgentLaunchArgs(value) {
   return Array.isArray(value) ? value.map((entry) => String(entry).trim()).filter(Boolean) : [];
 }
+function normalizeRequestedModel(value) {
+  const trimmed = value?.trim();
+  return trimmed ? trimmed : undefined;
+}
+function readClaudeLaunchModel(launchArgs) {
+  for (let index = 0;index < launchArgs.length; index += 1) {
+    const current = launchArgs[index] ?? "";
+    if (current === "--model") {
+      const next = launchArgs[index + 1]?.trim();
+      return next || undefined;
+    }
+    if (current.startsWith("--model=")) {
+      const next = current.slice("--model=".length).trim();
+      return next || undefined;
+    }
+  }
+  return;
+}
+function normalizeLaunchArgsForHarness(harness, value) {
+  const normalized = normalizeLocalAgentLaunchArgs(value);
+  if (harness === "codex") {
+    return normalizeCodexAppServerLaunchArgs(normalized);
+  }
+  return normalized;
+}
+function readLaunchModelForHarness(harness, launchArgs) {
+  if (harness === "codex") {
+    return readCodexAppServerModelFromLaunchArgs(launchArgs) ?? undefined;
+  }
+  if (harness === "claude") {
+    return readClaudeLaunchModel(launchArgs ?? []);
+  }
+  return;
+}
+function stripLaunchModelForHarness(harness, launchArgs) {
+  if (harness === "codex") {
+    const next = [];
+    const normalized = normalizeCodexAppServerLaunchArgs(launchArgs);
+    for (let index = 0;index < normalized.length; index += 1) {
+      const current = normalized[index] ?? "";
+      if (current === "-c" || current === "--config") {
+        const value = normalized[index + 1];
+        if (readCodexAppServerModelFromLaunchArgs(value ? [current, value] : [current])) {
+          index += 1;
+          continue;
+        }
+        next.push(current);
+        if (value) {
+          next.push(value);
+          index += 1;
+        }
+        continue;
+      }
+      if (current.startsWith("--config=")) {
+        if (readCodexAppServerModelFromLaunchArgs([current])) {
+          continue;
+        }
+      }
+      next.push(current);
+    }
+    return next;
+  }
+  if (harness === "claude") {
+    const next = [];
+    const normalized = normalizeLocalAgentLaunchArgs(launchArgs);
+    for (let index = 0;index < normalized.length; index += 1) {
+      const current = normalized[index] ?? "";
+      if (current === "--model") {
+        index += 1;
+        continue;
+      }
+      if (current.startsWith("--model=")) {
+        continue;
+      }
+      next.push(current);
+    }
+    return next;
+  }
+  return normalizeLocalAgentLaunchArgs(launchArgs);
+}
+function buildLaunchArgsForRequestedModel(harness, model) {
+  if (harness === "codex") {
+    return normalizeCodexAppServerLaunchArgs(["--model", model]);
+  }
+  if (harness === "claude") {
+    return ["--model", model];
+  }
+  return [];
+}
+function applyRequestedModelToLaunchArgs(harness, launchArgs, model) {
+  const normalized = normalizeLaunchArgsForHarness(harness, launchArgs);
+  const requestedModel = normalizeRequestedModel(model);
+  if (!requestedModel) {
+    return normalized;
+  }
+  return [
+    ...stripLaunchModelForHarness(harness, normalized),
+    ...buildLaunchArgsForRequestedModel(harness, requestedModel)
+  ];
+}
+function defaultHarnessForOverride(override, fallback = "claude") {
+  return normalizeManagedHarness2(override.defaultHarness ?? override.runtime?.harness, fallback);
+}
+function launchArgsForOverrideHarness(override, harness) {
+  const profileLaunchArgs = override.harnessProfiles?.[harness]?.launchArgs;
+  if (profileLaunchArgs) {
+    return normalizeLaunchArgsForHarness(harness, profileLaunchArgs);
+  }
+  if (harness === defaultHarnessForOverride(override, harness)) {
+    return normalizeLaunchArgsForHarness(harness, override.launchArgs);
+  }
+  return [];
+}
+function overrideHarnessProfile(override, harness) {
+  const profile = override.harnessProfiles?.[harness];
+  return {
+    cwd: normalizeProjectPath(profile?.cwd || override.runtime?.cwd || override.projectRoot || process.cwd()),
+    transport: normalizeLocalAgentTransport(profile?.transport ?? override.runtime?.transport, harness),
+    sessionId: normalizeTmuxSessionName2(profile?.sessionId, `${override.agentId}-${harness}`),
+    launchArgs: launchArgsForOverrideHarness(override, harness)
+  };
+}
 function normalizeManagedHarness2(value, fallback) {
   return value === "codex" ? "codex" : value === "claude" ? "claude" : fallback;
 }
@@ -11067,7 +11415,7 @@ function normalizeLocalHarnessProfiles(agentId, record) {
       cwd: normalizeProjectPath(profile.cwd || record.cwd || process.cwd()),
       transport: normalizeLocalAgentTransport(profile.transport, harness),
       sessionId: normalizeTmuxSessionName2(profile.sessionId, `${agentId}-${harness}`),
-      launchArgs: normalizeLocalAgentLaunchArgs(profile.launchArgs)
+      launchArgs: normalizeLaunchArgsForHarness(harness, profile.launchArgs)
     };
   }
   const runtimeHarness = normalizeManagedHarness2(record.harness, defaultHarness);
@@ -11076,7 +11424,7 @@ function normalizeLocalHarnessProfiles(agentId, record) {
       cwd: normalizeProjectPath(record.cwd || process.cwd()),
       transport: normalizeLocalAgentTransport(record.transport, runtimeHarness),
       sessionId: normalizeTmuxSessionName2(record.tmuxSession, `${agentId}-${runtimeHarness}`),
-      launchArgs: normalizeLocalAgentLaunchArgs(record.launchArgs)
+      launchArgs: normalizeLaunchArgsForHarness(runtimeHarness, record.launchArgs)
     };
   }
   if (!nextProfiles[defaultHarness]) {
@@ -11084,7 +11432,7 @@ function normalizeLocalHarnessProfiles(agentId, record) {
       cwd: normalizeProjectPath(record.cwd || process.cwd()),
       transport: normalizeLocalAgentTransport(record.transport, defaultHarness),
       sessionId: normalizeTmuxSessionName2(record.tmuxSession, `${agentId}-${defaultHarness}`),
-      launchArgs: normalizeLocalAgentLaunchArgs(record.launchArgs)
+      launchArgs: normalizeLaunchArgsForHarness(defaultHarness, record.launchArgs)
     };
   }
   for (const harness of ["claude", "codex"]) {
@@ -11096,7 +11444,7 @@ function normalizeLocalHarnessProfiles(agentId, record) {
       cwd: normalizeProjectPath(profile.cwd || record.cwd || process.cwd()),
       transport: normalizeLocalAgentTransport(profile.transport, harness),
       sessionId: normalizeTmuxSessionName2(profile.sessionId, `${agentId}-${harness}`),
-      launchArgs: normalizeLocalAgentLaunchArgs(profile.launchArgs)
+      launchArgs: normalizeLaunchArgsForHarness(harness, profile.launchArgs)
     };
   }
   return nextProfiles;
@@ -11120,14 +11468,14 @@ function recordForHarness(record, harnessOverride) {
       tmuxSession: fallbackSessionId,
       cwd: fallbackCwd,
       transport: fallbackTransport,
-      launchArgs: normalizeLocalAgentLaunchArgs(normalized.launchArgs),
+      launchArgs: normalizeLaunchArgsForHarness(selectedHarness, normalized.launchArgs),
       harnessProfiles: {
         ...normalized.harnessProfiles,
         [selectedHarness]: {
           cwd: fallbackCwd,
           transport: fallbackTransport,
           sessionId: fallbackSessionId,
-          launchArgs: normalizeLocalAgentLaunchArgs(normalized.launchArgs)
+          launchArgs: normalizeLaunchArgsForHarness(selectedHarness, normalized.launchArgs)
         }
       }
     };
@@ -11169,7 +11517,7 @@ function normalizeLocalAgentRecord(agentId, record) {
     harnessProfiles,
     transport: activeProfile?.transport ?? normalizeLocalAgentTransport(record.transport, harness),
     capabilities: normalizeLocalAgentCapabilities(record.capabilities),
-    launchArgs: activeProfile?.launchArgs ?? normalizeLocalAgentLaunchArgs(record.launchArgs)
+    launchArgs: activeProfile?.launchArgs ?? normalizeLaunchArgsForHarness(harness, record.launchArgs)
   };
 }
 function localAgentStatusFromRecord(agentId, record, source) {
@@ -11238,7 +11586,7 @@ function relayAgentOverrideFromLocalAgentRecord(agentId, record, existing) {
     source: existing?.source && existing.source !== "inferred" ? existing.source : "manual",
     startedAt: normalizedRecord.startedAt,
     systemPrompt: normalizedRecord.systemPrompt,
-    launchArgs: normalizeLocalAgentLaunchArgs(normalizedRecord.launchArgs),
+    launchArgs: normalizeLaunchArgsForHarness(normalizeLocalAgentHarness(normalizedRecord.harness), normalizedRecord.launchArgs),
     capabilities: normalizeLocalAgentCapabilities(normalizedRecord.capabilities),
     defaultHarness: normalizeManagedHarness2(normalizedRecord.defaultHarness, "claude"),
     harnessProfiles: normalizedRecord.harnessProfiles,
@@ -11259,7 +11607,7 @@ function buildCodexAgentSessionOptions(agentName, record, systemPrompt) {
     systemPrompt: systemPrompt ?? buildLocalAgentSystemPrompt(agentName, record.project, record.cwd, { transport: "codex_app_server" }),
     runtimeDirectory: relayAgentRuntimeDirectory(agentName),
     logsDirectory: relayAgentLogsDirectory(agentName),
-    launchArgs: normalizeLocalAgentLaunchArgs(record.launchArgs)
+    launchArgs: normalizeLaunchArgsForHarness("codex", record.launchArgs)
   };
 }
 function buildClaudeAgentSessionOptions(agentName, record, systemPrompt) {
@@ -11270,7 +11618,7 @@ function buildClaudeAgentSessionOptions(agentName, record, systemPrompt) {
     systemPrompt: systemPrompt ?? buildLocalAgentSystemPrompt(agentName, record.project, record.cwd, { transport: "claude_stream_json" }),
     runtimeDirectory: relayAgentRuntimeDirectory(agentName),
     logsDirectory: relayAgentLogsDirectory(agentName),
-    launchArgs: normalizeLocalAgentLaunchArgs(record.launchArgs)
+    launchArgs: normalizeLaunchArgsForHarness("claude", record.launchArgs)
   };
 }
 function isLocalAgentRecordOnline(agentName, record) {
@@ -11304,7 +11652,7 @@ function buildLocalAgentBootstrapPrompt(_harness, _systemPrompt, initialMessage)
   return initialMessage;
 }
 function buildLocalAgentLaunchCommand(agentName, record, projectPath, promptFile, workerScript) {
-  const extraArgs = shellQuoteArguments(normalizeLocalAgentLaunchArgs(record.launchArgs));
+  const extraArgs = shellQuoteArguments(normalizeLaunchArgsForHarness(normalizeLocalAgentHarness(record.harness), record.launchArgs));
   if (normalizeLocalAgentHarness(record.harness) === "codex") {
     return `exec bash ${JSON.stringify(workerScript ?? join11(relayAgentRuntimeDirectory(agentName), "codex-worker.sh"))}`;
   }
@@ -11460,7 +11808,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.`);
@@ -11676,6 +12024,7 @@ async function startLocalAgent(input) {
     const effectiveHarness = normalizeManagedHarness2(preferredHarness ?? configDefaultHarness, "claude");
     const transport = normalizeLocalAgentTransport(undefined, effectiveHarness);
     const sessionId = normalizeTmuxSessionName2(undefined, `${instance.id}-${effectiveHarness}`);
+    const launchArgs = applyRequestedModelToLaunchArgs(effectiveHarness, [], input.model);
     const existingForInstance = overrides[instance.id];
     if (existingForInstance && normalizeProjectPath(existingForInstance.projectRoot) !== projectRoot) {
       throw new Error(`Another agent is already registered as ${instance.id} at ${existingForInstance.projectRoot}. ` + `Two clones of the same project on the same branch cannot both register here; ` + `rename one of the checkouts or switch its branch before running scout up.`);
@@ -11689,13 +12038,14 @@ async function startLocalAgent(input) {
       projectConfigPath: coldProjectConfigPath,
       source: "manual",
       startedAt: nowSeconds2(),
+      launchArgs,
       defaultHarness: effectiveHarness,
       harnessProfiles: {
         [effectiveHarness]: {
           cwd: effectiveCwd ?? projectRoot,
           transport,
           sessionId,
-          launchArgs: []
+          launchArgs
         }
       },
       runtime: {
@@ -11716,6 +12066,9 @@ async function startLocalAgent(input) {
       throw new Error(`Another agent is already registered as ${instance.id} at ${existingForInstance.projectRoot}. ` + `Two clones of the same project on the same branch cannot both register here; ` + `rename one of the checkouts or switch its branch before running scout up.`);
     }
     const resolvedHarness = preferredHarness ?? matchingOverride.runtime?.harness;
+    const nextHarness = normalizeManagedHarness2(resolvedHarness, "claude");
+    const nextDefaultHarness = preferredHarness ? normalizeManagedHarness2(preferredHarness, "claude") : defaultHarnessForOverride(matchingOverride, "claude");
+    const nextLaunchArgs = applyRequestedModelToLaunchArgs(nextHarness, launchArgsForOverrideHarness(matchingOverride, nextHarness), input.model);
     overrides[instance.id] = {
       agentId: instance.id,
       definitionId: requestedDefinitionId,
@@ -11726,10 +12079,16 @@ async function startLocalAgent(input) {
       source: "manual",
       startedAt: matchingOverride.startedAt ?? nowSeconds2(),
       systemPrompt: matchingOverride.systemPrompt,
-      launchArgs: matchingOverride.launchArgs,
+      launchArgs: nextHarness === nextDefaultHarness ? nextLaunchArgs : matchingOverride.launchArgs,
       capabilities: matchingOverride.capabilities,
-      defaultHarness: normalizeManagedHarness2(preferredHarness ?? matchingOverride.defaultHarness, "claude"),
-      harnessProfiles: matchingOverride.harnessProfiles,
+      defaultHarness: nextDefaultHarness,
+      harnessProfiles: {
+        ...matchingOverride.harnessProfiles ?? {},
+        [nextHarness]: {
+          ...overrideHarnessProfile(matchingOverride, nextHarness),
+          launchArgs: nextLaunchArgs
+        }
+      },
       runtime: {
         cwd: effectiveCwd ?? matchingOverride.runtime?.cwd ?? matchingProjectRoot,
         harness: resolvedHarness,
@@ -11741,6 +12100,22 @@ async function startLocalAgent(input) {
     await writeRelayAgentOverrides(overrides);
     targetAgentId = instance.id;
   } else {
+    if (input.model) {
+      const existingHarness = normalizeManagedHarness2(preferredHarness ?? matchingOverride.defaultHarness ?? matchingOverride.runtime?.harness, "claude");
+      const nextLaunchArgs = applyRequestedModelToLaunchArgs(existingHarness, launchArgsForOverrideHarness(matchingOverride, existingHarness), input.model);
+      overrides[matchingAgentId] = {
+        ...matchingOverride,
+        launchArgs: existingHarness === defaultHarnessForOverride(matchingOverride, existingHarness) ? nextLaunchArgs : matchingOverride.launchArgs,
+        harnessProfiles: {
+          ...matchingOverride.harnessProfiles ?? {},
+          [existingHarness]: {
+            ...overrideHarnessProfile(matchingOverride, existingHarness),
+            launchArgs: nextLaunchArgs
+          }
+        }
+      };
+      await writeRelayAgentOverrides(overrides);
+    }
     targetAgentId = matchingAgentId;
   }
   await ensureLocalAgentBindingOnline(targetAgentId, process.env.OPENSCOUT_NODE_ID ?? "local", {
@@ -11828,13 +12203,38 @@ 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 configuredModel = readLaunchModelForHarness(normalizeLocalAgentHarness(normalizedRecord.harness), normalizedRecord.launchArgs);
   const definitionId = normalizedRecord.definitionId ?? agentId;
   const displayName = titleCaseLocalAgentName(definitionId);
   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,
@@ -11853,7 +12253,8 @@ function buildLocalAgentBinding(agentId, record, alive, nodeId, source) {
         defaultSelector: instance.defaultSelector,
         nodeQualifier: instance.nodeQualifier,
         workspaceQualifier: instance.workspaceQualifier,
-        branch: instance.branch
+        branch: instance.branch,
+        ...configuredModel ? { model: configuredModel } : {}
       }
     },
     agent: {
@@ -11880,7 +12281,8 @@ function buildLocalAgentBinding(agentId, record, alive, nodeId, source) {
         defaultSelector: instance.defaultSelector,
         nodeQualifier: instance.nodeQualifier,
         workspaceQualifier: instance.workspaceQualifier,
-        branch: instance.branch
+        branch: instance.branch,
+        ...configuredModel ? { model: configuredModel } : {}
       },
       agentClass: "general",
       capabilities: normalizeLocalAgentCapabilities(normalizedRecord.capabilities),
@@ -11912,7 +12314,9 @@ function buildLocalAgentBinding(agentId, record, alive, nodeId, source) {
         selector: instance.selector,
         nodeQualifier: instance.nodeQualifier,
         workspaceQualifier: instance.workspaceQualifier,
-        branch: instance.branch
+        branch: instance.branch,
+        ...configuredModel ? { model: configuredModel } : {},
+        ...externalSessionId ? { externalSessionId } : {}
       }
     }
   };
@@ -12008,7 +12412,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 +12420,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 {};
   }
@@ -13023,8 +13427,73 @@ async function sendScoutMessage(input) {
   }
   const currentDirectory = input.currentDirectory ?? process.cwd();
   const createdAtMs = input.createdAtMs ?? Date.now();
-  const mentionResolution = await resolveMentionTargets(broker.snapshot, input.body, currentDirectory);
   const senderId = await resolveConversationActorId(broker.baseUrl, broker.snapshot, broker.node.id, input.senderId, currentDirectory);
+  const requestedTargetLabel = input.targetLabel?.trim();
+  if (requestedTargetLabel) {
+    const targetResolution = await resolveSingleBrokerTarget(broker.snapshot, requestedTargetLabel, currentDirectory);
+    if (targetResolution.kind !== "resolved") {
+      return {
+        usedBroker: true,
+        invokedTargets: [],
+        unresolvedTargets: [requestedTargetLabel]
+      };
+    }
+    const target = targetResolution.target;
+    const targetReady = await ensureTargetRelayAgentRegistered(broker.baseUrl, broker.snapshot, broker.node.id, target.agentId, currentDirectory);
+    if (!targetReady || target.agentId === senderId) {
+      return {
+        usedBroker: true,
+        invokedTargets: [],
+        unresolvedTargets: [requestedTargetLabel]
+      };
+    }
+    let conversation2;
+    if (!input.channel) {
+      const dm = await ensureBrokerDirectConversationBetween(broker.baseUrl, broker.snapshot, broker.node.id, senderId, target.agentId);
+      conversation2 = dm.conversation;
+    } else {
+      conversation2 = await ensureBrokerConversation(broker.baseUrl, broker.snapshot, broker.node.id, input.channel, senderId, [target.agentId]);
+    }
+    const messageId2 = `m-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 6)}`;
+    const speechText2 = input.shouldSpeak ? stripScoutAgentSelectorLabels(input.body) : "";
+    const returnAddress2 = buildScoutReturnAddress2(broker.snapshot, senderId, {
+      conversationId: conversation2.id,
+      replyToMessageId: messageId2
+    });
+    await brokerPostJson(broker.baseUrl, scoutBrokerPaths.v1.messages, {
+      id: messageId2,
+      conversationId: conversation2.id,
+      actorId: senderId,
+      originNodeId: broker.node.id,
+      class: conversation2.kind === "system" ? "system" : "agent",
+      body: input.body,
+      mentions: [{ actorId: target.agentId, label: target.label }],
+      speech: speechText2 ? { text: speechText2 } : undefined,
+      audience: {
+        notify: [target.agentId],
+        reason: relayAudienceReason(conversation2)
+      },
+      visibility: conversation2.visibility,
+      policy: "durable",
+      createdAt: createdAtMs,
+      metadata: {
+        source: "scout-cli",
+        relayChannel: relayChannelMetadata(conversation2, input.channel),
+        relayTargetIds: [target.agentId],
+        relayMessageId: messageId2,
+        returnAddress: returnAddress2
+      }
+    });
+    return {
+      usedBroker: true,
+      conversationId: conversation2.id,
+      messageId: messageId2,
+      invokedTargets: [target.agentId],
+      unresolvedTargets: [],
+      routeKind: relayRouteKind(conversation2)
+    };
+  }
+  const mentionResolution = await resolveMentionTargets(broker.snapshot, input.body, currentDirectory);
   const availableTargets = (await Promise.all(mentionResolution.resolved.map(async (target) => await ensureTargetRelayAgentRegistered(broker.baseUrl, broker.snapshot, broker.node.id, target.agentId, currentDirectory) ? target : null))).filter((target) => Boolean(target));
   const validTargets = [
     ...new Set(availableTargets.map((target) => target.agentId).filter((target) => target !== senderId && Boolean(broker.snapshot.agents[target])))
@@ -14306,6 +14775,7 @@ function buildScoutAgentCard(binding, options = {}) {
   const selector = binding.agent.selector?.trim() || metadataString3(binding.agent.metadata, "selector");
   const defaultSelector = binding.agent.defaultSelector?.trim() || metadataString3(binding.agent.metadata, "defaultSelector");
   const branch = metadataString3(binding.agent.metadata, "branch") || metadataString3(binding.endpoint.metadata, "branch");
+  const model = metadataString3(binding.endpoint.metadata, "model") || metadataString3(binding.agent.metadata, "model");
   const description = metadataString3(binding.agent.metadata, "description");
   const version = metadataString3(binding.agent.metadata, "version");
   const documentationUrl = metadataString3(binding.agent.metadata, "documentationUrl") || metadataString3(binding.agent.metadata, "docsUrl");
@@ -14363,7 +14833,8 @@ function buildScoutAgentCard(binding, options = {}) {
     metadata: {
       actorId: binding.actor.id,
       endpointId: binding.endpoint.id,
-      wakePolicy: binding.agent.wakePolicy
+      wakePolicy: binding.agent.wakePolicy,
+      ...model ? { model } : {}
     }
   };
 }
@@ -14397,6 +14868,7 @@ async function createScoutAgentCard(input) {
     agentName: input.agentName,
     displayName: input.displayName,
     harness: input.harness,
+    model: input.model,
     currentDirectory: input.currentDirectory
   });
   const currentDirectory = input.currentDirectory ?? input.projectPath;
@@ -14481,7 +14953,7 @@ __export(exports_card, {
 import { createInterface } from "readline";
 function renderCardCommandHelp() {
   return [
-    "Usage: scout card create [path] [--name <alias>] [--display-name <name>] [--harness <claude|codex>] [--as <requester>] [--no-input] [--path <path>]",
+    "Usage: scout card create [path] [--name <alias>] [--display-name <name>] [--harness <claude|codex>] [--model <model>] [--as <requester>] [--no-input] [--path <path>]",
     "",
     "Create a dedicated Scout agent card with a reply-ready return address.",
     "",
@@ -14490,7 +14962,7 @@ function renderCardCommandHelp() {
     "",
     "Examples:",
     "  scout card create",
-    "  scout card create ~/dev/openscout-worktrees/shell-fix --name shellfix --harness claude"
+    "  scout card create ~/dev/openscout-worktrees/shell-fix --name shellfix --harness claude --model claude-sonnet-4-6"
   ].join(`
 `);
 }
@@ -14554,6 +15026,7 @@ async function runCardCommand(context, args) {
     agentName,
     displayName,
     harness: parseScoutHarness(options.harness),
+    model: options.model,
     currentDirectory: options.currentDirectory,
     createdById: resolveScoutAgentName(options.requesterId)
   });
@@ -43090,7 +43563,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 +43573,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 +43591,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 +43599,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 +43607,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 +43620,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 +43646,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 +43923,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 +43940,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 +44271,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 +44281,7 @@ function resolveCommandOnPath(command, env) {
       continue;
     }
     const candidate = join17(trimmed, command);
-    if (existsSync11(candidate)) {
+    if (existsSync12(candidate)) {
       return candidate;
     }
   }
@@ -43820,7 +44293,7 @@ function resolveScoutBinPath(appRoot) {
     join17(appRoot, "bin", "scout.mjs")
   ];
   for (const candidate of candidates) {
-    if (existsSync11(candidate)) {
+    if (existsSync12(candidate)) {
       return candidate;
     }
   }
@@ -43895,9 +44368,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 +44384,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 +44427,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(() => {
@@ -45284,6 +45757,7 @@ function defaultScoutMcpDependencies(env) {
       agentName,
       displayName,
       harness,
+      model,
       currentDirectory,
       createdById
     }) => createScoutAgentCard({
@@ -45291,12 +45765,21 @@ function defaultScoutMcpDependencies(env) {
       agentName,
       displayName,
       harness,
+      model,
       currentDirectory,
       createdById
     }),
-    sendMessage: ({ senderId, body, channel, shouldSpeak, currentDirectory }) => sendScoutMessage({
+    sendMessage: ({
       senderId,
       body,
+      targetLabel,
+      channel,
+      shouldSpeak,
+      currentDirectory
+    }) => sendScoutMessage({
+      senderId,
+      body,
+      targetLabel,
       channel,
       shouldSpeak,
       currentDirectory
@@ -45408,7 +45891,8 @@ function createScoutMcpServer(options) {
       senderId: string2().optional(),
       agentName: string2().optional(),
       displayName: string2().optional(),
-      harness: _enum2(LOCAL_AGENT_HARNESS_VALUES).optional()
+      harness: _enum2(LOCAL_AGENT_HARNESS_VALUES).optional(),
+      model: string2().optional()
     }),
     outputSchema: cardCreateResultSchema,
     annotations: {
@@ -45423,7 +45907,8 @@ function createScoutMcpServer(options) {
     senderId,
     agentName,
     displayName,
-    harness
+    harness,
+    model
   }) => {
     const resolvedCurrentDirectory = resolveToolCurrentDirectory(currentDirectory, options.defaultCurrentDirectory);
     const resolvedSenderId = await deps.resolveSenderId(senderId, resolvedCurrentDirectory, env);
@@ -45432,6 +45917,7 @@ function createScoutMcpServer(options) {
       agentName: agentName?.trim() || undefined,
       displayName: displayName?.trim() || undefined,
       harness,
+      model: model?.trim() || undefined,
       currentDirectory: resolvedCurrentDirectory,
       createdById: resolvedSenderId
     });
@@ -45511,11 +45997,12 @@ function createScoutMcpServer(options) {
   });
   server.registerTool("messages_send", {
     title: "Send Scout Message",
-    description: "Post a broker-backed Scout tell/update. Use this for heads-up, replies, and status. One explicit target without a channel becomes a DM. Group delivery requires an explicit channel. Use broadcast or channel='shared' for shared updates. For owned work or a reply lifecycle, use invocations_ask instead. Prefer mentionAgentIds for first-class targeting.",
+    description: "Post a broker-backed Scout tell/update. Use this for heads-up, replies, and status. One explicit target without a channel becomes a DM. Group delivery requires an explicit channel. Use broadcast or channel='shared' for shared updates. Pass targetLabel for the single-call broker-resolved path when you know who to contact but do not have an exact id. For owned work or a reply lifecycle, use invocations_ask instead. Prefer mentionAgentIds for first-class targeting when you already have exact ids.",
     inputSchema: object2({
       body: string2().min(1),
       currentDirectory: string2().optional(),
       senderId: string2().optional(),
+      targetLabel: string2().optional(),
       channel: string2().optional(),
       shouldSpeak: boolean2().optional(),
       mentionAgentIds: array(string2()).optional()
@@ -45531,6 +46018,7 @@ function createScoutMcpServer(options) {
     body,
     currentDirectory,
     senderId,
+    targetLabel,
     channel,
     shouldSpeak,
     mentionAgentIds
@@ -45567,6 +46055,32 @@ function createScoutMcpServer(options) {
         structuredContent: structuredContent2
       };
     }
+    if (targetLabel?.trim()) {
+      const result2 = await deps.sendMessage({
+        senderId: resolvedSenderId,
+        body,
+        targetLabel: targetLabel.trim(),
+        channel,
+        shouldSpeak,
+        currentDirectory: resolvedCurrentDirectory
+      });
+      const structuredContent2 = {
+        currentDirectory: resolvedCurrentDirectory,
+        senderId: resolvedSenderId,
+        mode: "target_label",
+        usedBroker: result2.usedBroker,
+        conversationId: result2.conversationId ?? null,
+        messageId: result2.messageId ?? null,
+        invokedTargetIds: result2.invokedTargets,
+        unresolvedTargetIds: result2.unresolvedTargets,
+        routeKind: result2.routeKind ?? null,
+        routingError: result2.routingError ?? null
+      };
+      return {
+        content: createTextContent(structuredContent2),
+        structuredContent: structuredContent2
+      };
+    }
     const result = await deps.sendMessage({
       senderId: resolvedSenderId,
       body,
@@ -45918,7 +46432,7 @@ var init_scout_mcp = __esm(async () => {
   sendResultSchema = object2({
     currentDirectory: string2(),
     senderId: string2(),
-    mode: _enum2(["body_mentions", "explicit_targets"]),
+    mode: _enum2(["body_mentions", "explicit_targets", "target_label"]),
     usedBroker: boolean2(),
     conversationId: string2().nullable(),
     messageId: string2().nullable(),
@@ -46011,7 +46525,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 +46614,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 +46624,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 +46643,7 @@ function resolveInstalledMenuBundlePath(env) {
     return indexedPath;
   }
   for (const candidate of COMMON_MENU_BUNDLE_PATHS) {
-    if (existsSync13(candidate)) {
+    if (existsSync14(candidate)) {
       return candidate;
     }
   }
@@ -46198,7 +46712,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 +46804,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 +46842,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 +46889,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 +46911,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 +47079,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 +47113,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 +47125,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 +47157,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 +47300,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 +47317,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 +49404,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 +49432,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 +49615,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 +49740,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) {
@@ -49250,9 +49809,74 @@ var init_config3 = __esm(() => {
   CONFIG_FILE = join22(CONFIG_DIR, "config.json");
 });
 
+// ../../apps/desktop/src/core/pairing/runtime/bridge/web-handoff.ts
+import { randomBytes as randomBytes2 } from "crypto";
+function pruneExpiredWebHandoffs(now = Date.now()) {
+  for (const [token, record3] of activeWebHandoffs) {
+    if (record3.expiresAt <= now) {
+      activeWebHandoffs.delete(token);
+    }
+  }
+}
+function scopesMatch(left, right) {
+  if (left.kind !== right.kind) {
+    return false;
+  }
+  if (left.sessionId !== right.sessionId) {
+    return false;
+  }
+  if (left.kind === "session") {
+    return true;
+  }
+  return left.turnId === right.turnId && left.blockId === right.blockId;
+}
+function pathForWebHandoffScope(scope) {
+  switch (scope.kind) {
+    case "session":
+      return `/handoff/session/${encodeURIComponent(scope.sessionId)}`;
+    case "file_change":
+      return `/handoff/file-change/${encodeURIComponent(scope.sessionId)}/${encodeURIComponent(scope.turnId)}/${encodeURIComponent(scope.blockId)}`;
+  }
+}
+function issueWebHandoff(scope, deviceId) {
+  pruneExpiredWebHandoffs();
+  const token = randomBytes2(24).toString("base64url");
+  const expiresAt = Date.now() + WEB_HANDOFF_TTL_MS;
+  activeWebHandoffs.set(token, {
+    token,
+    deviceId: deviceId?.trim() || null,
+    expiresAt,
+    scope
+  });
+  return { token, expiresAt, scope };
+}
+function readAuthorizedWebHandoff(token, scope) {
+  pruneExpiredWebHandoffs();
+  if (!token) {
+    return null;
+  }
+  const record3 = activeWebHandoffs.get(token);
+  if (!record3) {
+    return null;
+  }
+  if (!scopesMatch(record3.scope, scope)) {
+    return null;
+  }
+  return record3;
+}
+var SCOUT_WEB_HANDOFF_COOKIE = "scout_handoff", WEB_HANDOFF_TTL_MS, activeWebHandoffs;
+var init_web_handoff = __esm(() => {
+  WEB_HANDOFF_TTL_MS = 5 * 60 * 1000;
+  activeWebHandoffs = new Map;
+});
+
 // ../../apps/desktop/src/core/pairing/runtime/bridge/fileserver.ts
 import { isAbsolute as isAbsolute2 } from "path";
 import { homedir as homedir16 } from "os";
+function isTrustedLoopbackHostname(hostname5) {
+  const normalized = hostname5.trim().toLowerCase();
+  return normalized === "localhost" || normalized.endsWith(".localhost") || normalized === "::1" || LOOPBACK_IPV4_HOST_PATTERN.test(normalized);
+}
 function isAllowedPath(filePath) {
   if (!isAbsolute2(filePath))
     return false;
@@ -49263,7 +49887,7 @@ function isAllowedPath(filePath) {
   return ALLOWED_ROOTS.some((root) => filePath.startsWith(root));
 }
 function startFileServer(options) {
-  const { port } = options;
+  const { port, bridge } = options;
   let server = null;
   function start() {
     try {
@@ -49271,7 +49895,7 @@ function startFileServer(options) {
         port,
         fetch(req) {
           try {
-            return route(new URL(req.url));
+            return route(req, new URL(req.url), bridge);
           } catch (err) {
             console.error(`[fileserver] ${req.url} \u2192`, err.message);
             return new Response("Internal error", { status: 500 });
@@ -49294,12 +49918,19 @@ function startFileServer(options) {
   start();
   return { port, stop, restart };
 }
-function route(url2) {
+function route(req, url2, bridge) {
   const path2 = url2.pathname;
-  if (path2 === "/file")
+  if (path2 === "/file") {
+    if (!isTrustedLoopbackHostname(url2.hostname)) {
+      return new Response("Forbidden", { status: 403 });
+    }
     return serveFile(url2);
+  }
   if (path2 === "/health")
     return Response.json({ ok: true });
+  if (path2.startsWith("/handoff/")) {
+    return serveHandoffPage(req, url2, bridge);
+  }
   return new Response("Pairing file server", { status: 200 });
 }
 function serveFile(url2) {
@@ -49313,9 +49944,525 @@ function serveFile(url2) {
     return new Response("Not found", { status: 404 });
   return new Response(file2);
 }
-var ALLOWED_ROOTS;
+function serveHandoffPage(req, url2, bridge) {
+  if (!bridge) {
+    return new Response("Secure handoff unavailable", { status: 503 });
+  }
+  const scope = parseHandoffScope(url2);
+  if (!scope) {
+    return new Response("Not found", { status: 404 });
+  }
+  const token = readHandoffToken(req);
+  const authorized = readAuthorizedWebHandoff(token, scope);
+  if (!authorized) {
+    return unauthorizedHandoffResponse();
+  }
+  let html;
+  switch (scope.kind) {
+    case "session": {
+      const snapshot = bridge.getSessionSnapshot(scope.sessionId);
+      if (!snapshot) {
+        return new Response("Session handoff expired", { status: 404 });
+      }
+      html = renderSessionHandoffPage(snapshot);
+      break;
+    }
+    case "file_change": {
+      const snapshot = bridge.getSessionSnapshot(scope.sessionId);
+      if (!snapshot) {
+        return new Response("Session handoff expired", { status: 404 });
+      }
+      const target = findFileChangeBlock(snapshot, scope.turnId, scope.blockId);
+      if (!target) {
+        return new Response("File change handoff expired", { status: 404 });
+      }
+      html = renderFileChangeHandoffPage(snapshot, target.turn, target.block);
+      break;
+    }
+  }
+  const headers = new Headers({
+    "content-type": "text/html; charset=utf-8",
+    "cache-control": "no-store",
+    "x-content-type-options": "nosniff"
+  });
+  headers.set("set-cookie", `${SCOUT_WEB_HANDOFF_COOKIE}=${authorized.token}; Max-Age=300; Path=/handoff; HttpOnly; SameSite=Strict`);
+  return new Response(html, { status: 200, headers });
+}
+function unauthorizedHandoffResponse() {
+  return new Response("Secure handoff required", {
+    status: 401,
+    headers: {
+      "cache-control": "no-store",
+      "set-cookie": `${SCOUT_WEB_HANDOFF_COOKIE}=; Max-Age=0; Path=/handoff; HttpOnly; SameSite=Strict`
+    }
+  });
+}
+function parseHandoffScope(url2) {
+  const parts = url2.pathname.split("/").filter(Boolean).map((part) => decodeURIComponent(part));
+  if (parts[0] !== "handoff") {
+    return null;
+  }
+  if (parts[1] === "session" && parts[2]) {
+    return { kind: "session", sessionId: parts[2] };
+  }
+  if (parts[1] === "file-change" && parts[2] && parts[3] && parts[4]) {
+    return {
+      kind: "file_change",
+      sessionId: parts[2],
+      turnId: parts[3],
+      blockId: parts[4]
+    };
+  }
+  return null;
+}
+function readHandoffToken(req) {
+  const headerToken = req.headers.get("x-scout-handoff-token")?.trim();
+  if (headerToken) {
+    return headerToken;
+  }
+  const cookieHeader = req.headers.get("cookie");
+  if (!cookieHeader) {
+    return null;
+  }
+  for (const part of cookieHeader.split(";")) {
+    const [name, ...rest] = part.trim().split("=");
+    if (name === SCOUT_WEB_HANDOFF_COOKIE) {
+      const value = rest.join("=").trim();
+      return value || null;
+    }
+  }
+  return null;
+}
+function findFileChangeBlock(snapshot, turnId, blockId) {
+  const turn = snapshot.turns.find((candidate) => candidate.id === turnId);
+  if (!turn) {
+    return null;
+  }
+  const blockState = turn.blocks.find((candidate) => candidate.block.id === blockId);
+  const block = blockState?.block;
+  if (!block || block.type !== "action" || block.action.kind !== "file_change") {
+    return null;
+  }
+  return { turn, block };
+}
+function renderPage(title, body) {
+  return `<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <title>${escapeHtml(title)}</title>
+    <style>
+      :root {
+        color-scheme: dark;
+        --bg: #0b0f14;
+        --panel: rgba(19, 27, 39, 0.92);
+        --panel-strong: rgba(12, 18, 28, 0.96);
+        --line: rgba(148, 163, 184, 0.16);
+        --line-strong: rgba(148, 163, 184, 0.24);
+        --text: #e5ecf5;
+        --muted: #90a0b4;
+        --accent: #63d0ff;
+        --green: #54d38a;
+        --amber: #f8c36a;
+        --red: #ff7b72;
+        --surface-add: rgba(84, 211, 138, 0.08);
+        --surface-del: rgba(255, 123, 114, 0.08);
+      }
+      * { box-sizing: border-box; }
+      body {
+        margin: 0;
+        background:
+          radial-gradient(circle at top left, rgba(99, 208, 255, 0.12), transparent 32%),
+          linear-gradient(180deg, #090d12 0%, #0b0f14 55%, #111723 100%);
+        color: var(--text);
+        font: 14px/1.5 ui-sans-serif, -apple-system, BlinkMacSystemFont, "SF Pro Text", sans-serif;
+      }
+      .wrap {
+        width: min(980px, calc(100vw - 24px));
+        margin: 0 auto;
+        padding: 20px 0 40px;
+      }
+      .hero, .panel {
+        background: var(--panel);
+        border: 1px solid var(--line);
+        border-radius: 18px;
+        backdrop-filter: blur(18px);
+        box-shadow: 0 24px 64px rgba(0, 0, 0, 0.28);
+      }
+      .hero {
+        padding: 18px 18px 16px;
+        margin-bottom: 14px;
+      }
+      .eyebrow {
+        display: inline-flex;
+        align-items: center;
+        gap: 8px;
+        color: var(--muted);
+        font-size: 11px;
+        letter-spacing: 0.14em;
+        text-transform: uppercase;
+      }
+      .dot {
+        width: 8px;
+        height: 8px;
+        border-radius: 999px;
+        background: var(--accent);
+        box-shadow: 0 0 14px rgba(99, 208, 255, 0.65);
+      }
+      h1 {
+        margin: 12px 0 10px;
+        font-size: 24px;
+        line-height: 1.15;
+      }
+      .meta, .stack {
+        display: flex;
+        flex-wrap: wrap;
+        gap: 8px;
+      }
+      .pill {
+        display: inline-flex;
+        align-items: center;
+        gap: 6px;
+        padding: 5px 10px;
+        border-radius: 999px;
+        border: 1px solid var(--line-strong);
+        background: rgba(255, 255, 255, 0.03);
+        color: var(--muted);
+        font-size: 12px;
+      }
+      .pill strong {
+        color: var(--text);
+        font-weight: 600;
+      }
+      .stack { flex-direction: column; }
+      .panel {
+        margin-top: 12px;
+        overflow: hidden;
+      }
+      .panel-inner {
+        padding: 16px;
+      }
+      .turn {
+        border-top: 1px solid var(--line);
+      }
+      .turn:first-child {
+        border-top: none;
+      }
+      .turn-head {
+        padding: 14px 16px;
+        display: flex;
+        justify-content: space-between;
+        gap: 12px;
+        align-items: center;
+        background: rgba(255, 255, 255, 0.02);
+      }
+      .turn-title {
+        font-size: 13px;
+        font-weight: 600;
+        letter-spacing: 0.02em;
+      }
+      .turn-subtitle {
+        color: var(--muted);
+        font-size: 12px;
+        margin-top: 2px;
+      }
+      .blocks {
+        padding: 8px;
+      }
+      .block {
+        padding: 12px;
+        border-radius: 14px;
+        border: 1px solid var(--line);
+        background: var(--panel-strong);
+        margin: 8px;
+      }
+      .block-head {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        gap: 12px;
+        margin-bottom: 10px;
+      }
+      .block-type {
+        color: var(--muted);
+        text-transform: uppercase;
+        letter-spacing: 0.12em;
+        font-size: 11px;
+      }
+      .label {
+        color: var(--muted);
+        font-size: 12px;
+      }
+      .label strong {
+        color: var(--text);
+      }
+      pre {
+        margin: 0;
+        white-space: pre-wrap;
+        word-break: break-word;
+        overflow-wrap: anywhere;
+        font: 12.5px/1.6 ui-monospace, SFMono-Regular, Menlo, monospace;
+      }
+      .code {
+        padding: 12px;
+        border-radius: 12px;
+        border: 1px solid var(--line);
+        background: rgba(255, 255, 255, 0.02);
+      }
+      .diff-line-add { background: var(--surface-add); color: #8ef3b7; }
+      .diff-line-del { background: var(--surface-del); color: #ff9d96; }
+      .details {
+        margin-top: 10px;
+        border: 1px solid var(--line);
+        border-radius: 12px;
+        overflow: hidden;
+      }
+      details > summary {
+        list-style: none;
+        cursor: pointer;
+        padding: 10px 12px;
+        background: rgba(255, 255, 255, 0.03);
+        color: var(--muted);
+        font-size: 12px;
+        text-transform: uppercase;
+        letter-spacing: 0.1em;
+      }
+      details[open] > summary {
+        border-bottom: 1px solid var(--line);
+      }
+      .empty {
+        padding: 28px 18px;
+        color: var(--muted);
+      }
+      .grid {
+        display: grid;
+        gap: 10px;
+      }
+      .grid.two {
+        grid-template-columns: repeat(auto-fit, minmax(220px, 1fr));
+      }
+      a.inline {
+        color: var(--accent);
+        text-decoration: none;
+      }
+      .status-streaming { color: var(--amber); }
+      .status-completed { color: var(--green); }
+      .status-failed, .status-error { color: var(--red); }
+    </style>
+  </head>
+  <body>
+    <main class="wrap">
+      ${body}
+    </main>
+  </body>
+</html>`;
+}
+function renderSessionHandoffPage(snapshot) {
+  const title = snapshot.session.name || snapshot.session.id;
+  const hero = `
+    <section class="hero">
+      <div class="eyebrow"><span class="dot"></span> Secure Proxy Session Handoff</div>
+      <h1>${escapeHtml(title)}</h1>
+      <div class="meta">
+        <span class="pill"><strong>ID</strong> ${escapeHtml(snapshot.session.id)}</span>
+        <span class="pill"><strong>Adapter</strong> ${escapeHtml(snapshot.session.adapterType)}</span>
+        <span class="pill"><strong>Status</strong> ${escapeHtml(snapshot.session.status)}</span>
+        ${snapshot.session.model ? `<span class="pill"><strong>Model</strong> ${escapeHtml(snapshot.session.model)}</span>` : ""}
+        ${snapshot.session.cwd ? `<span class="pill"><strong>Workspace</strong> ${escapeHtml(snapshot.session.cwd)}</span>` : ""}
+      </div>
+    </section>
+  `;
+  const turns = snapshot.turns.length > 0 ? snapshot.turns.map((turn) => {
+    const turnBody = turn.blocks.length > 0 ? turn.blocks.map(({ block }) => renderBlock(block)).join("") : `<div class="empty">No blocks were captured for this turn.</div>`;
+    return `
+        <section class="turn">
+          <div class="turn-head">
+            <div>
+              <div class="turn-title">${escapeHtml(turn.id)}</div>
+              <div class="turn-subtitle">${formatTimestamp(turn.startedAt)}${turn.endedAt ? ` to ${formatTimestamp(turn.endedAt)}` : ""}</div>
+            </div>
+            <span class="pill"><strong>Turn</strong> <span class="status-${escapeHtml(turn.status)}">${escapeHtml(turn.status)}</span></span>
+          </div>
+          <div class="blocks">${turnBody}</div>
+        </section>
+      `;
+  }).join("") : `<div class="empty">This session has not produced any turns yet.</div>`;
+  return renderPage(title, `${hero}<section class="panel">${turns}</section>`);
+}
+function renderFileChangeHandoffPage(snapshot, turn, block) {
+  const action = block.action;
+  const title = action.path || snapshot.session.name || snapshot.session.id;
+  const hero = `
+    <section class="hero">
+      <div class="eyebrow"><span class="dot"></span> Secure Proxy File Change</div>
+      <h1>${escapeHtml(title)}</h1>
+      <div class="meta">
+        <span class="pill"><strong>Session</strong> ${escapeHtml(snapshot.session.name || snapshot.session.id)}</span>
+        <span class="pill"><strong>Turn</strong> ${escapeHtml(turn.id)}</span>
+        <span class="pill"><strong>Status</strong> ${escapeHtml(action.status)}</span>
+      </div>
+    </section>
+  `;
+  const body = `
+    <section class="panel">
+      <div class="panel-inner stack">
+        <div class="grid two">
+          <div class="pill"><strong>Path</strong> ${escapeHtml(action.path)}</div>
+          <div class="pill"><strong>Block</strong> ${escapeHtml(block.id)}</div>
+        </div>
+        ${action.diff ? renderDetailsSection("Diff", renderDiff(action.diff), true) : `<div class="empty">No diff was recorded for this action.</div>`}
+        ${action.output ? renderDetailsSection("Output", `<div class="code"><pre>${escapeHtml(action.output)}</pre></div>`) : ""}
+      </div>
+    </section>
+  `;
+  return renderPage(title, `${hero}${body}`);
+}
+function renderBlock(block) {
+  switch (block.type) {
+    case "text":
+      return renderTextLikeBlock("Text", block.text);
+    case "reasoning":
+      return renderTextLikeBlock("Reasoning", block.text);
+    case "error":
+      return `
+        <article class="block">
+          <div class="block-head">
+            <div class="block-type">Error</div>
+            <span class="pill status-error">${escapeHtml(block.status)}</span>
+          </div>
+          <div class="code"><pre>${escapeHtml(block.message)}</pre></div>
+        </article>
+      `;
+    case "file":
+      return `
+        <article class="block">
+          <div class="block-head">
+            <div class="block-type">File</div>
+            <span class="pill">${escapeHtml(block.status)}</span>
+          </div>
+          <div class="grid">
+            ${block.name ? `<div class="label"><strong>Name</strong> ${escapeHtml(block.name)}</div>` : ""}
+            <div class="label"><strong>MIME</strong> ${escapeHtml(block.mimeType)}</div>
+          </div>
+        </article>
+      `;
+    case "question":
+      return renderQuestionBlock(block);
+    case "action":
+      return renderActionBlock(block);
+  }
+}
+function renderTextLikeBlock(label, text) {
+  return `
+    <article class="block">
+      <div class="block-head">
+        <div class="block-type">${escapeHtml(label)}</div>
+      </div>
+      <div class="code"><pre>${escapeHtml(text)}</pre></div>
+    </article>
+  `;
+}
+function renderQuestionBlock(block) {
+  const answer = block.answer?.length ? block.answer.join(", ") : "Awaiting answer";
+  const options = block.options?.length ? `<div class="label"><strong>Options</strong> ${escapeHtml(block.options.map((option) => option.label).join(", "))}</div>` : "";
+  return `
+    <article class="block">
+      <div class="block-head">
+        <div class="block-type">Question</div>
+        <span class="pill">${escapeHtml(block.questionStatus)}</span>
+      </div>
+      ${block.header ? `<div class="label"><strong>${escapeHtml(block.header)}</strong></div>` : ""}
+      <div class="code"><pre>${escapeHtml(block.question)}</pre></div>
+      <div class="stack" style="margin-top: 10px;">
+        ${options}
+        <div class="label"><strong>Answer</strong> ${escapeHtml(answer)}</div>
+      </div>
+    </article>
+  `;
+}
+function renderActionBlock(block) {
+  const action = block.action;
+  const parts = [];
+  switch (action.kind) {
+    case "file_change":
+      parts.push(`<div class="label"><strong>Path</strong> ${escapeHtml(action.path)}</div>`);
+      if (action.diff) {
+        parts.push(renderDetailsSection("Diff", renderDiff(action.diff)));
+      }
+      break;
+    case "command":
+      parts.push(`<div class="label"><strong>Command</strong></div><div class="code"><pre>${escapeHtml(action.command)}</pre></div>`);
+      if (typeof action.exitCode === "number") {
+        parts.push(`<div class="label"><strong>Exit Code</strong> ${escapeHtml(String(action.exitCode))}</div>`);
+      }
+      break;
+    case "tool_call":
+      parts.push(`<div class="label"><strong>Tool</strong> ${escapeHtml(action.toolName)}</div>`);
+      if (action.toolCallId) {
+        parts.push(`<div class="label"><strong>Call ID</strong> ${escapeHtml(action.toolCallId)}</div>`);
+      }
+      break;
+    case "subagent":
+      parts.push(`<div class="label"><strong>Agent</strong> ${escapeHtml(action.agentName || action.agentId)}</div>`);
+      if (action.prompt) {
+        parts.push(`<div class="code"><pre>${escapeHtml(action.prompt)}</pre></div>`);
+      }
+      break;
+  }
+  if (action.approval) {
+    parts.push(`<div class="label"><strong>Approval</strong> ${escapeHtml(action.approval.risk || "medium")} risk${action.approval.description ? ` - ${escapeHtml(action.approval.description)}` : ""}</div>`);
+  }
+  if (action.output) {
+    parts.push(renderDetailsSection("Output", `<div class="code"><pre>${escapeHtml(action.output)}</pre></div>`));
+  }
+  return `
+    <article class="block">
+      <div class="block-head">
+        <div class="block-type">${escapeHtml(action.kind.replace("_", " "))}</div>
+        <span class="pill">${escapeHtml(action.status)}</span>
+      </div>
+      <div class="stack">${parts.join("")}</div>
+    </article>
+  `;
+}
+function renderDetailsSection(title, innerHtml, open2 = false) {
+  return `
+    <details class="details"${open2 ? " open" : ""}>
+      <summary>${escapeHtml(title)}</summary>
+      <div class="panel-inner">${innerHtml}</div>
+    </details>
+  `;
+}
+function renderDiff(diff) {
+  const lines = diff.split(`
+`).map((line) => {
+    const className = line.startsWith("+") ? "diff-line-add" : line.startsWith("-") ? "diff-line-del" : "";
+    return `<div class="${className}"><pre>${escapeHtml(line || " ")}</pre></div>`;
+  }).join("");
+  return `<div class="code">${lines}</div>`;
+}
+function escapeHtml(value) {
+  return value.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll('"', "&quot;").replaceAll("'", "&#39;");
+}
+function formatTimestamp(value) {
+  if (typeof value !== "number" || !Number.isFinite(value)) {
+    return "Unknown time";
+  }
+  try {
+    return new Intl.DateTimeFormat("en-US", {
+      dateStyle: "medium",
+      timeStyle: "short"
+    }).format(value);
+  } catch {
+    return new Date(value).toISOString();
+  }
+}
+var ALLOWED_ROOTS, LOOPBACK_IPV4_HOST_PATTERN;
 var init_fileserver = __esm(() => {
+  init_web_handoff();
   ALLOWED_ROOTS = [homedir16(), "/tmp"];
+  LOOPBACK_IPV4_HOST_PATTERN = /^127(?:\.\d{1,3}){3}$/;
 });
 
 // ../../apps/desktop/src/server/db-queries.ts
@@ -50102,7 +51249,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 +51258,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 +51301,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";
@@ -50167,6 +51314,20 @@ function readSyncStatus(bridge, sessionId) {
     oldestBufferedSeq: bridge.oldestBufferedSeq(sessionId)
   };
 }
+function resolveSyncSessionId(bridge, preferredSessionId) {
+  if (preferredSessionId) {
+    return preferredSessionId;
+  }
+  let latestSessionId = null;
+  let latestActivityAt = Number.NEGATIVE_INFINITY;
+  for (const session of bridge.getSessionSummaries()) {
+    if (session.lastActivityAt > latestActivityAt) {
+      latestActivityAt = session.lastActivityAt;
+      latestSessionId = session.sessionId;
+    }
+  }
+  return latestSessionId;
+}
 function sessionRegistryErrorResponse(reqId, error48) {
   if (!isSessionRegistryError(error48)) {
     return null;
@@ -50236,23 +51397,36 @@ async function handleRPCInner(bridge, req, deviceId) {
         return { id: req.id, result: { ok: true } };
       }
       case "sync/replay": {
-        const p = req.params;
-        if (!p.sessionId) {
-          return { id: req.id, error: { code: -32602, message: "sessionId is required" } };
+        const p = req.params ?? {};
+        if (typeof p.lastSeq !== "number") {
+          return { id: req.id, error: { code: -32602, message: "lastSeq is required" } };
+        }
+        const sessionId = resolveSyncSessionId(bridge, p.sessionId);
+        if (!sessionId) {
+          return { id: req.id, result: { events: [] } };
         }
-        const events2 = replaySyncEvents(bridge, p.sessionId, p.lastSeq);
+        const events2 = replaySyncEvents(bridge, sessionId, p.lastSeq);
         return { id: req.id, result: { events: events2 } };
       }
       case "sync/status": {
         const p = req.params ?? {};
-        if (!p.sessionId) {
-          return { id: req.id, error: { code: -32602, message: "sessionId is required" } };
+        const sessionCount = bridge.listSessions().length;
+        const sessionId = resolveSyncSessionId(bridge, p.sessionId);
+        if (!sessionId) {
+          return {
+            id: req.id,
+            result: {
+              currentSeq: 0,
+              oldestBufferedSeq: 0,
+              sessionCount
+            }
+          };
         }
         return {
           id: req.id,
           result: {
-            ...readSyncStatus(bridge, p.sessionId),
-            sessionCount: bridge.listSessions().length
+            ...readSyncStatus(bridge, sessionId),
+            sessionCount
           }
         };
       }
@@ -50493,7 +51667,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 +55921,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 +56092,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 +56316,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";
@@ -55432,6 +56606,20 @@ function readSyncStatus2(bridge, sessionId) {
     oldestBufferedSeq: bridge.oldestBufferedSeq(sessionId)
   };
 }
+function resolveSyncSessionId2(bridge, preferredSessionId) {
+  if (preferredSessionId) {
+    return preferredSessionId;
+  }
+  let latestSessionId = null;
+  let latestActivityAt = Number.NEGATIVE_INFINITY;
+  for (const session2 of bridge.getSessionSummaries()) {
+    if (session2.lastActivityAt > latestActivityAt) {
+      latestActivityAt = session2.lastActivityAt;
+      latestSessionId = session2.sessionId;
+    }
+  }
+  return latestSessionId;
+}
 var t, logged, procedure, MARKER_FILES2, sessionRouter, mobileRouter, workspaceRouter, historyRouter, promptRouter, syncRouter, bridgeRouter;
 var init_router = __esm(async () => {
   init_dist3();
@@ -55440,6 +56628,7 @@ var init_router = __esm(async () => {
   init_log();
   init_config3();
   init_db_queries();
+  init_web_handoff();
   await __promiseAll([
     init_service5(),
     init_src2(),
@@ -55647,6 +56836,64 @@ var init_router = __esm(async () => {
         limit: typeof input.limit === "number" ? input.limit : null
       }, resolveMobileCurrentDirectory2());
     }),
+    webHandoff: procedure.input(exports_external.object({
+      kind: exports_external.enum(["session", "file_change"]),
+      sessionId: exports_external.string(),
+      turnId: exports_external.string().optional(),
+      blockId: exports_external.string().optional()
+    })).mutation(({ input, ctx }) => {
+      if (!ctx.deviceId) {
+        throw new TRPCError({
+          code: "UNAUTHORIZED",
+          message: "Secure web handoff requires a paired mobile device"
+        });
+      }
+      const snapshot = ctx.bridge.getSessionSnapshot(input.sessionId);
+      if (!snapshot) {
+        throw new TRPCError({
+          code: "NOT_FOUND",
+          message: `No session: ${input.sessionId}`
+        });
+      }
+      let scope;
+      let title = snapshot.session.name || snapshot.session.id;
+      if (input.kind === "file_change") {
+        if (!input.turnId || !input.blockId) {
+          throw new TRPCError({
+            code: "BAD_REQUEST",
+            message: "turnId and blockId are required for file_change handoffs"
+          });
+        }
+        const turn = snapshot.turns.find((candidate) => candidate.id === input.turnId);
+        const block = turn?.blocks.find((candidate) => candidate.block.id === input.blockId)?.block;
+        if (!turn || !block || block.type !== "action" || block.action.kind !== "file_change") {
+          throw new TRPCError({
+            code: "NOT_FOUND",
+            message: "File change block not found"
+          });
+        }
+        scope = {
+          kind: "file_change",
+          sessionId: input.sessionId,
+          turnId: input.turnId,
+          blockId: input.blockId
+        };
+        title = block.action.path || title;
+      } else {
+        scope = {
+          kind: "session",
+          sessionId: input.sessionId
+        };
+      }
+      const issued = issueWebHandoff(scope, ctx.deviceId);
+      return {
+        kind: input.kind,
+        path: pathForWebHandoffScope(scope),
+        token: issued.token,
+        expiresAt: issued.expiresAt,
+        title
+      };
+    }),
     createSession: procedure.input(exports_external.object({
       workspaceId: exports_external.string(),
       harness: exports_external.string().optional(),
@@ -55822,7 +57069,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;
@@ -55852,14 +57099,27 @@ var init_router = __esm(async () => {
     })
   });
   syncRouter = t.router({
-    replay: procedure.input(exports_external.object({ lastSeq: exports_external.number(), sessionId: exports_external.string() })).query(({ input, ctx }) => {
-      const events2 = replaySyncEvents2(ctx.bridge, input.sessionId, input.lastSeq);
+    replay: procedure.input(exports_external.object({ lastSeq: exports_external.number(), sessionId: exports_external.string().optional() })).query(({ input, ctx }) => {
+      const sessionId = resolveSyncSessionId2(ctx.bridge, input.sessionId);
+      if (!sessionId) {
+        return { events: [] };
+      }
+      const events2 = replaySyncEvents2(ctx.bridge, sessionId, input.lastSeq);
       return { events: events2 };
     }),
-    status: procedure.input(exports_external.object({ sessionId: exports_external.string() })).query(({ input, ctx }) => {
+    status: procedure.input(exports_external.object({ sessionId: exports_external.string().optional() }).optional()).query(({ input, ctx }) => {
+      const sessionCount = ctx.bridge.listSessions().length;
+      const sessionId = resolveSyncSessionId2(ctx.bridge, input?.sessionId);
+      if (!sessionId) {
+        return {
+          currentSeq: 0,
+          oldestBufferedSeq: 0,
+          sessionCount
+        };
+      }
       return {
-        ...readSyncStatus2(ctx.bridge, input.sessionId),
-        sessionCount: ctx.bridge.listSessions().length
+        ...readSyncStatus2(ctx.bridge, sessionId),
+        sessionCount
       };
     })
   });
@@ -60468,7 +61728,7 @@ async function startPairingRuntime(options) {
     secure: config2.secure,
     identity: config2.secure ? identity2 : undefined
   });
-  const fileServer = startFileServer({ port: config2.port + 2 });
+  const fileServer = startFileServer({ port: config2.port + 2, bridge });
   const relayUrl = options?.relayUrl?.trim() || config2.relay || null;
   if (!relayUrl) {
     fileServer.stop();
@@ -60775,11 +62035,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 {
@@ -60800,19 +62060,58 @@ function findStoredCerts() {
     return null;
   }
 }
-function getTailscaleHostname() {
+function readTailscaleStatus2() {
   try {
     const output = execSync4("tailscale status --self=true --peers=false --json", {
       stdio: ["pipe", "pipe", "pipe"],
       timeout: 5000
     }).toString();
     const data = JSON.parse(output);
-    const dnsName = data?.Self?.DNSName ?? "";
-    return dnsName.replace(/\.$/, "") || null;
+    const dnsName = typeof data.Self?.DNSName === "string" ? data.Self.DNSName.replace(/\.$/, "") : "";
+    return {
+      backendState: typeof data.BackendState === "string" ? data.BackendState : null,
+      dnsName: dnsName || null,
+      online: data.Self?.Online !== false,
+      health: Array.isArray(data.Health) ? data.Health.filter((entry) => typeof entry === "string") : []
+    };
   } catch {
     return null;
   }
 }
+function resolveRelayEndpointForTailscaleStatus(port, tailscale2) {
+  const backendState = tailscale2?.backendState?.trim().toLowerCase() ?? "";
+  const hostname5 = tailscale2?.dnsName ?? null;
+  const tailscaleRunning = backendState === "running" && tailscale2?.online !== false && Boolean(hostname5);
+  const tls = resolveTls(tailscaleRunning ? hostname5 : null);
+  if (tailscaleRunning && hostname5 && tls) {
+    return {
+      relayUrl: `wss://${hostname5}:${port}`,
+      options: { tls }
+    };
+  }
+  if (tailscaleRunning && hostname5) {
+    pairingLog.warn("relay", "tailscale is running without TLS; falling back to insecure websocket relay", {
+      hostname: hostname5,
+      port
+    });
+    return {
+      relayUrl: `ws://${hostname5}:${port}`,
+      options: {}
+    };
+  }
+  if (hostname5 && backendState && backendState !== "running") {
+    pairingLog.warn("relay", "tailscale hostname detected but tailscale is not running; using local-only relay endpoint", {
+      hostname: hostname5,
+      backendState,
+      health: tailscale2?.health ?? [],
+      port
+    });
+  }
+  return {
+    relayUrl: `ws://127.0.0.1:${port}`,
+    options: {}
+  };
+}
 function generateTailscaleCerts(hostname5) {
   mkdirSync11(PAIRING_DIR2, { recursive: true });
   const certPath = join27(PAIRING_DIR2, `${hostname5}.crt`);
@@ -60858,28 +62157,7 @@ function resolveTls(hostname5) {
   return generateTailscaleCerts(hostname5);
 }
 function resolveRelayEndpoint(port) {
-  const hostname5 = getTailscaleHostname();
-  const tls = resolveTls(hostname5);
-  if (hostname5 && tls) {
-    return {
-      relayUrl: `wss://${hostname5}:${port}`,
-      options: { tls }
-    };
-  }
-  if (hostname5) {
-    pairingLog.warn("relay", "tailscale hostname detected without TLS; falling back to insecure websocket relay", {
-      hostname: hostname5,
-      port
-    });
-    return {
-      relayUrl: `ws://${hostname5}:${port}`,
-      options: {}
-    };
-  }
-  return {
-    relayUrl: `ws://127.0.0.1:${port}`,
-    options: {}
-  };
+  return resolveRelayEndpointForTailscaleStatus(port, readTailscaleStatus2());
 }
 function startManagedRelay(port = 7889) {
   const endpoint = resolveRelayEndpoint(port);
@@ -61831,11 +63109,13 @@ __export(exports_server, {
   runServerCommand: () => runServerCommand,
   resolveScoutWebServerEntry: () => resolveScoutWebServerEntry,
   resolveScoutControlPlaneWebServerEntry: () => resolveScoutControlPlaneWebServerEntry,
+  resolveBunExecutable: () => resolveBunExecutable3,
   renderServerCommandHelp: () => renderServerCommandHelp,
   normalizeServerOpenPath: () => normalizeServerOpenPath
 });
 import { spawn as spawn5 } from "child_process";
-import { existsSync as existsSync19 } from "fs";
+import { accessSync as accessSync2, constants as constants4, existsSync as existsSync20 } from "fs";
+import { homedir as homedir23 } from "os";
 import { dirname as dirname14, join as join28, resolve as resolve14 } from "path";
 import { fileURLToPath as fileURLToPath9 } from "url";
 function renderServerCommandHelp() {
@@ -61845,6 +63125,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 +63149,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 +63234,43 @@ 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 isExecutable4(filePath) {
+  if (!filePath) {
+    return false;
+  }
+  try {
+    accessSync2(filePath, constants4.X_OK);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function resolveBunExecutable3(env) {
+  const explicitPaths = [
+    env.SCOUT_BUN_BIN,
+    env.OPENSCOUT_BUN_BIN,
+    env.BUN_BIN
+  ].filter((candidate) => Boolean(candidate?.trim()));
+  for (const candidate of explicitPaths) {
+    if (isExecutable4(candidate)) {
+      return candidate;
+    }
+  }
+  const pathEntries = (env.PATH ?? "").split(":").filter(Boolean);
+  const commonDirectories = [
+    join28(homedir23(), ".bun", "bin"),
+    "/opt/homebrew/bin",
+    "/usr/local/bin"
+  ];
+  for (const directory of [...pathEntries, ...commonDirectories]) {
+    const candidate = join28(directory.replace(/^~(?=$|\/)/, homedir23()), "bun");
+    if (isExecutable4(candidate)) {
+      return candidate;
+    }
+  }
+  return "bun";
 }
 function buildMergedServerEnv(entry, mode, flagEnv) {
   const bundledStaticClientRoot = resolveBundledStaticClientRoot(entry, mode);
@@ -61975,7 +63296,7 @@ function parseServerSelection(args) {
       action: "start",
       flagArgs: args.slice(1),
       entry: resolveScoutControlPlaneWebServerEntry(),
-      mode: "full"
+      mode: "openscout-web"
     };
   }
   if (args[0] === "open") {
@@ -61983,7 +63304,7 @@ function parseServerSelection(args) {
       action: "open",
       flagArgs: args.slice(1),
       entry: resolveScoutControlPlaneWebServerEntry(),
-      mode: "full"
+      mode: "openscout-web"
     };
   }
   if (args[0] === "control-plane") {
@@ -61992,7 +63313,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 +63349,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 +63357,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 +63391,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: {
@@ -62124,8 +63444,9 @@ async function openBrowser(url2) {
   });
 }
 async function spawnDetachedServer(entry, env) {
+  const bunExecutable = resolveBunExecutable3(env);
   await new Promise((resolvePromise, rejectPromise) => {
-    const child = spawn5("bun", ["run", entry], {
+    const child = spawn5(bunExecutable, ["run", entry], {
       detached: true,
       stdio: "ignore",
       env,
@@ -62150,7 +63471,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 +63493,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) {
@@ -62217,8 +63538,9 @@ async function runServerCommand(context, args) {
     context.output.writeValue(result, renderServerOpenResult);
     return;
   }
+  const bunExecutable = resolveBunExecutable3(mergedEnv);
   await new Promise((resolvePromise, rejectPromise) => {
-    const child = spawn5("bun", ["run", selection.entry], {
+    const child = spawn5(bunExecutable, ["run", selection.entry], {
       stdio: "inherit",
       env: mergedEnv
     });
@@ -62370,7 +63692,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";
@@ -71416,7 +72738,7 @@ var __defProp3, __returnValue2 = (v) => v, __export2 = (target, all) => {
       configurable: true,
       set: __exportSetter2.bind(all, name)
     });
-}, exports_src, loadYoga, yoga_wasm_base64_esm_default, Align, BoxSizing, Dimension, Direction, Display, Edge, Errata, ExperimentalFeature, FlexDirection, Gutter, Justify, LogLevel, MeasureMode, NodeType, Overflow, PositionType, Unit, Wrap, constants4, YGEnums_default, Yoga, src_default, VALID_BORDER_STYLES, BorderChars, BorderCharArrays, KeyHandler, InternalKeyHandler, CSS_COLOR_NAMES, block_default, shade_default, slick_default, tiny_default, huge_default, grid_default, pallet_default, fonts, parsedFonts, TextAttributes, ATTRIBUTE_BASE_BITS = 8, ATTRIBUTE_BASE_MASK = 255, DebugOverlayCorner, TargetChannel, ATTRIBUTE_BASE_MASK2 = 255, LINK_ID_SHIFT = 8, LINK_ID_PAYLOAD_MASK = 16777215, BrandedStyledText, StyledText, black = (input) => applyStyle(input, { fg: "black" }), red = (input) => applyStyle(input, { fg: "red" }), green = (input) => applyStyle(input, { fg: "green" }), yellow = (input) => applyStyle(input, { fg: "yellow" }), blue = (input) => applyStyle(input, { fg: "blue" }), magenta = (input) => applyStyle(input, { fg: "magenta" }), cyan = (input) => applyStyle(input, { fg: "cyan" }), white = (input) => applyStyle(input, { fg: "white" }), brightBlack = (input) => applyStyle(input, { fg: "brightBlack" }), brightRed = (input) => applyStyle(input, { fg: "brightRed" }), brightGreen = (input) => applyStyle(input, { fg: "brightGreen" }), brightYellow = (input) => applyStyle(input, { fg: "brightYellow" }), brightBlue = (input) => applyStyle(input, { fg: "brightBlue" }), brightMagenta = (input) => applyStyle(input, { fg: "brightMagenta" }), brightCyan = (input) => applyStyle(input, { fg: "brightCyan" }), brightWhite = (input) => applyStyle(input, { fg: "brightWhite" }), bgBlack = (input) => applyStyle(input, { bg: "black" }), bgRed = (input) => applyStyle(input, { bg: "red" }), bgGreen = (input) => applyStyle(input, { bg: "green" }), bgYellow = (input) => applyStyle(input, { bg: "yellow" }), bgBlue = (input) => applyStyle(input, { bg: "blue" }), bgMagenta = (input) => applyStyle(input, { bg: "magenta" }), bgCyan = (input) => applyStyle(input, { bg: "cyan" }), bgWhite = (input) => applyStyle(input, { bg: "white" }), bold = (input) => applyStyle(input, { bold: true }), italic = (input) => applyStyle(input, { italic: true }), underline = (input) => applyStyle(input, { underline: true }), strikethrough = (input) => applyStyle(input, { strikethrough: true }), dim = (input) => applyStyle(input, { dim: true }), reverse = (input) => applyStyle(input, { reverse: true }), blink = (input) => applyStyle(input, { blink: true }), fg = (color) => (input) => applyStyle(input, { fg: color }), bg = (color) => (input) => applyStyle(input, { bg: color }), link = (url2) => (input) => {
+}, exports_src, loadYoga, yoga_wasm_base64_esm_default, Align, BoxSizing, Dimension, Direction, Display, Edge, Errata, ExperimentalFeature, FlexDirection, Gutter, Justify, LogLevel, MeasureMode, NodeType, Overflow, PositionType, Unit, Wrap, constants5, YGEnums_default, Yoga, src_default, VALID_BORDER_STYLES, BorderChars, BorderCharArrays, KeyHandler, InternalKeyHandler, CSS_COLOR_NAMES, block_default, shade_default, slick_default, tiny_default, huge_default, grid_default, pallet_default, fonts, parsedFonts, TextAttributes, ATTRIBUTE_BASE_BITS = 8, ATTRIBUTE_BASE_MASK = 255, DebugOverlayCorner, TargetChannel, ATTRIBUTE_BASE_MASK2 = 255, LINK_ID_SHIFT = 8, LINK_ID_PAYLOAD_MASK = 16777215, BrandedStyledText, StyledText, black = (input) => applyStyle(input, { fg: "black" }), red = (input) => applyStyle(input, { fg: "red" }), green = (input) => applyStyle(input, { fg: "green" }), yellow = (input) => applyStyle(input, { fg: "yellow" }), blue = (input) => applyStyle(input, { fg: "blue" }), magenta = (input) => applyStyle(input, { fg: "magenta" }), cyan = (input) => applyStyle(input, { fg: "cyan" }), white = (input) => applyStyle(input, { fg: "white" }), brightBlack = (input) => applyStyle(input, { fg: "brightBlack" }), brightRed = (input) => applyStyle(input, { fg: "brightRed" }), brightGreen = (input) => applyStyle(input, { fg: "brightGreen" }), brightYellow = (input) => applyStyle(input, { fg: "brightYellow" }), brightBlue = (input) => applyStyle(input, { fg: "brightBlue" }), brightMagenta = (input) => applyStyle(input, { fg: "brightMagenta" }), brightCyan = (input) => applyStyle(input, { fg: "brightCyan" }), brightWhite = (input) => applyStyle(input, { fg: "brightWhite" }), bgBlack = (input) => applyStyle(input, { bg: "black" }), bgRed = (input) => applyStyle(input, { bg: "red" }), bgGreen = (input) => applyStyle(input, { bg: "green" }), bgYellow = (input) => applyStyle(input, { bg: "yellow" }), bgBlue = (input) => applyStyle(input, { bg: "blue" }), bgMagenta = (input) => applyStyle(input, { bg: "magenta" }), bgCyan = (input) => applyStyle(input, { bg: "cyan" }), bgWhite = (input) => applyStyle(input, { bg: "white" }), bold = (input) => applyStyle(input, { bold: true }), italic = (input) => applyStyle(input, { italic: true }), underline = (input) => applyStyle(input, { underline: true }), strikethrough = (input) => applyStyle(input, { strikethrough: true }), dim = (input) => applyStyle(input, { dim: true }), reverse = (input) => applyStyle(input, { reverse: true }), blink = (input) => applyStyle(input, { blink: true }), fg = (color) => (input) => applyStyle(input, { fg: color }), bg = (color) => (input) => applyStyle(input, { bg: color }), link = (url2) => (input) => {
   const chunk = typeof input === "object" && "__isChunk" in input ? input : {
     __isChunk: true,
     text: String(input)
@@ -73076,7 +74398,7 @@ var init_index_vy1rm1x3 = __esm(async () => {
     Wrap2[Wrap2["WrapReverse"] = 2] = "WrapReverse";
     return Wrap2;
   }({});
-  constants4 = {
+  constants5 = {
     ALIGN_AUTO: Align.Auto,
     ALIGN_FLEX_START: Align.FlexStart,
     ALIGN_CENTER: Align.Center,
@@ -73150,7 +74472,7 @@ var init_index_vy1rm1x3 = __esm(async () => {
     WRAP_WRAP: Wrap.Wrap,
     WRAP_WRAP_REVERSE: Wrap.WrapReverse
   };
-  YGEnums_default = constants4;
+  YGEnums_default = constants5;
   Yoga = wrapAssembly(await yoga_wasm_base64_esm_default());
   src_default = Yoga;
   VALID_BORDER_STYLES = ["single", "double", "rounded", "heavy"];
@@ -76584,7 +77906,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 +124980,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("~");
@@ -123667,6 +124989,7 @@ async function runUpCommand(context, args) {
   let target = null;
   let agentName;
   let harness;
+  let model;
   for (let index2 = 0;index2 < args.length; index2 += 1) {
     const current = args[index2] ?? "";
     if (current === "--name") {
@@ -123695,6 +125018,19 @@ async function runUpCommand(context, args) {
       harness = current.slice("--harness=".length);
       continue;
     }
+    if (current === "--model") {
+      const value = args[index2 + 1];
+      if (!value) {
+        throw new ScoutCliError("missing value for --model");
+      }
+      model = value;
+      index2 += 1;
+      continue;
+    }
+    if (current.startsWith("--model=")) {
+      model = current.slice("--model=".length);
+      continue;
+    }
     if (current.startsWith("--")) {
       throw new ScoutCliError(`unexpected argument for up: ${current}`);
     }
@@ -123704,10 +125040,10 @@ async function runUpCommand(context, args) {
     target = current;
   }
   if (!target) {
-    throw new ScoutCliError("usage: scout up <name|path> [--name <alias>] [--harness <claude|codex>]");
+    throw new ScoutCliError("usage: scout up <name|path> [--name <alias>] [--harness <claude|codex>] [--model <model>]");
   }
   let projectPath;
-  if (looksLikePath(target) || existsSync21(resolve17(target))) {
+  if (looksLikePath(target) || existsSync23(resolve17(target))) {
     projectPath = resolve17(target);
   } else {
     const resolved = await resolveLocalAgentByName(target);
@@ -123720,6 +125056,7 @@ async function runUpCommand(context, args) {
     projectPath,
     agentName,
     harness: parseScoutHarness(harness),
+    model,
     currentDirectory: defaultScoutContextDirectory(context)
   });
   context.output.writeValue(agent, renderScoutUpResult);
@@ -123827,10 +125164,10 @@ 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";
+import { homedir as homedir24 } from "os";
 
 // ../../apps/desktop/src/cli/argv.ts
 function parseScoutArgv(argv) {
@@ -124090,8 +125427,8 @@ var _scoutBinPath = null;
 function getScoutBinPath() {
   if (_scoutBinPath)
     return _scoutBinPath;
-  _scoutBinPath = join32(homedir23(), ".bun", "bin", "scout");
-  if (!existsSync23(_scoutBinPath)) {
+  _scoutBinPath = join32(homedir24(), ".bun", "bin", "scout");
+  if (!existsSync25(_scoutBinPath)) {
     _scoutBinPath = spawnSync3("which", ["scout"], { encoding: "utf8" }).stdout.trim();
   }
   return _scoutBinPath;
@@ -124099,18 +125436,18 @@ function getScoutBinPath() {
 async function ensureBrokerUptodate() {
   try {
     const mtime = statSync5(getScoutBinPath()).mtimeMs;
-    const checkpointDir = join32(homedir23(), ".scout");
+    const checkpointDir = join32(homedir24(), ".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");
+      const plistPath = join32(homedir24(), "Library", "LaunchAgents", "dev.openscout.broker.plist");
       spawnSync3("launchctl", ["bootout", `gui/${uid}/dev.openscout.broker`], { stdio: "ignore" });
       await new Promise((resolve18) => setTimeout(resolve18, 1500));
       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" });