@openscout/scout 0.2.58 → 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
   };
@@ -9446,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}`;
 }
@@ -9556,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;
@@ -9745,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() {
@@ -9767,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,
@@ -9777,7 +9892,8 @@ class CodexAppServerSession {
       ...buildScoutMcpCodexLaunchArgs({
         currentDirectory: this.options.cwd,
         env
-      })
+      }),
+      ...launchArgs
     ], {
       cwd: this.options.cwd,
       env,
@@ -9875,6 +9991,8 @@ class CodexAppServerSession {
       turnId: "",
       startedAt: Date.now(),
       timer: null,
+      graceTimer: null,
+      timedOutAt: null,
       messageOrder: [],
       messageByItemId: new Map,
       resolve: resolve6,
@@ -9882,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,
@@ -9929,6 +10070,9 @@ class CodexAppServerSession {
     if (turn.timer) {
       clearTimeout(turn.timer);
     }
+    if (turn.graceTimer) {
+      clearTimeout(turn.graceTimer);
+    }
     if (this.activeTurn === turn) {
       this.activeTurn = null;
     }
@@ -11134,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;
 }
@@ -11149,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);
@@ -11158,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]) {
@@ -11166,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"]) {
@@ -11178,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;
@@ -11202,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)
         }
       }
     };
@@ -11251,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) {
@@ -11320,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,
@@ -11341,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) {
@@ -11352,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) {
@@ -11386,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"))}`;
   }
@@ -11758,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.`);
@@ -11771,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: {
@@ -11798,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,
@@ -11808,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,
@@ -11823,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", {
@@ -11935,6 +12228,7 @@ function readPersistedClaudeSessionId(agentName) {
 }
 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;
@@ -11959,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: {
@@ -11986,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),
@@ -12019,6 +12315,7 @@ function buildLocalAgentBinding(agentId, record, alive, nodeId, source) {
         nodeQualifier: instance.nodeQualifier,
         workspaceQualifier: instance.workspaceQualifier,
         branch: instance.branch,
+        ...configuredModel ? { model: configuredModel } : {},
         ...externalSessionId ? { externalSessionId } : {}
       }
     }
@@ -13130,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])))
@@ -14413,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");
@@ -14470,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 } : {}
     }
   };
 }
@@ -14504,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;
@@ -14588,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.",
     "",
@@ -14597,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(`
 `);
 }
@@ -14661,6 +15026,7 @@ async function runCardCommand(context, args) {
     agentName,
     displayName,
     harness: parseScoutHarness(options.harness),
+    model: options.model,
     currentDirectory: options.currentDirectory,
     createdById: resolveScoutAgentName(options.requesterId)
   });
@@ -45391,6 +45757,7 @@ function defaultScoutMcpDependencies(env) {
       agentName,
       displayName,
       harness,
+      model,
       currentDirectory,
       createdById
     }) => createScoutAgentCard({
@@ -45398,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
@@ -45515,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: {
@@ -45530,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);
@@ -45539,6 +45917,7 @@ function createScoutMcpServer(options) {
       agentName: agentName?.trim() || undefined,
       displayName: displayName?.trim() || undefined,
       harness,
+      model: model?.trim() || undefined,
       currentDirectory: resolvedCurrentDirectory,
       createdById: resolvedSenderId
     });
@@ -45618,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()
@@ -45638,6 +46018,7 @@ function createScoutMcpServer(options) {
     body,
     currentDirectory,
     senderId,
+    targetLabel,
     channel,
     shouldSpeak,
     mentionAgentIds
@@ -45674,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,
@@ -46025,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(),
@@ -49402,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;
@@ -49415,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 {
@@ -49423,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 });
@@ -49446,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) {
@@ -49465,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
@@ -50319,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;
@@ -50388,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
           }
         };
       }
@@ -55584,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();
@@ -55592,6 +56628,7 @@ var init_router = __esm(async () => {
   init_log();
   init_config3();
   init_db_queries();
+  init_web_handoff();
   await __promiseAll([
     init_service5(),
     init_src2(),
@@ -55799,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(),
@@ -56004,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
       };
     })
   });
@@ -60620,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();
@@ -60952,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`);
@@ -61010,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);
@@ -61983,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 existsSync20 } 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() {
@@ -62108,6 +63236,42 @@ function resolveBundledStaticClientRoot(entry, _mode) {
   const indexPath = join28(clientDirectory, "index.html");
   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);
   const autoEnv = {};
@@ -62280,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,
@@ -62373,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
     });
@@ -71572,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)
@@ -73232,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,
@@ -73306,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"];
@@ -123823,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") {
@@ -123851,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}`);
     }
@@ -123860,7 +125040,7 @@ 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) || existsSync23(resolve17(target))) {
@@ -123876,6 +125056,7 @@ async function runUpCommand(context, args) {
     projectPath,
     agentName,
     harness: parseScoutHarness(harness),
+    model,
     currentDirectory: defaultScoutContextDirectory(context)
   });
   context.output.writeValue(agent, renderScoutUpResult);
@@ -123986,7 +125167,7 @@ var init_whoami = __esm(async () => {
 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) {
@@ -124246,7 +125427,7 @@ var _scoutBinPath = null;
 function getScoutBinPath() {
   if (_scoutBinPath)
     return _scoutBinPath;
-  _scoutBinPath = join32(homedir23(), ".bun", "bin", "scout");
+  _scoutBinPath = join32(homedir24(), ".bun", "bin", "scout");
   if (!existsSync25(_scoutBinPath)) {
     _scoutBinPath = spawnSync3("which", ["scout"], { encoding: "utf8" }).stdout.trim();
   }
@@ -124255,12 +125436,12 @@ 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 = 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" });