@openscout/scout 0.2.47 → 0.2.48

package/dist/main.mjs

@@ -2682,31 +2682,6 @@ var init_user_project_hints = __esm(() => {
 });
 
 // ../runtime/src/setup.ts
-var exports_setup = {};
-__export(exports_setup, {
-  writeRelayAgentOverrides: () => writeRelayAgentOverrides,
-  writeProjectConfig: () => writeProjectConfig,
-  writeOpenScoutSettings: () => writeOpenScoutSettings,
-  resolveRelayAgentConfig: () => resolveRelayAgentConfig,
-  readRelayAgentOverrides: () => readRelayAgentOverrides,
-  readProjectConfig: () => readProjectConfig,
-  readOpenScoutSettings: () => readOpenScoutSettings,
-  primaryDirectConversationIdForAgent: () => primaryDirectConversationIdForAgent,
-  loadResolvedRelayAgents: () => loadResolvedRelayAgents,
-  installScoutSkillToHarnesses: () => installScoutSkillToHarnesses,
-  initializeOpenScoutSetup: () => initializeOpenScoutSetup,
-  findNearestProjectRoot: () => findNearestProjectRoot,
-  ensureScoutRelayAgentConfigured: () => ensureScoutRelayAgentConfigured,
-  ensureRelayAgentConfigured: () => ensureRelayAgentConfigured,
-  ensureProjectConfigForDirectory: () => ensureProjectConfigForDirectory,
-  detectPreferredHarness: () => detectPreferredHarness,
-  clearGitBranchCache: () => clearGitBranchCache,
-  buildRelayAgentInstance: () => buildRelayAgentInstance,
-  SCOUT_PRIMARY_CONVERSATION_ID: () => SCOUT_PRIMARY_CONVERSATION_ID,
-  SCOUT_AGENT_ID: () => SCOUT_AGENT_ID,
-  MANAGED_AGENT_HARNESSES: () => MANAGED_AGENT_HARNESSES,
-  DEFAULT_OPERATOR_NAME: () => DEFAULT_OPERATOR_NAME
-});
 import { execFileSync as execFileSync2 } from "child_process";
 import { existsSync as existsSync3, readFileSync } from "fs";
 import { access, mkdir as mkdir2, readdir as readdir2, readFile as readFile3, realpath, rm, stat as stat2, writeFile as writeFile2 } from "fs/promises";
@@ -2885,13 +2860,6 @@ function normalizeTelegramConversationId(value) {
   }
   return normalized;
 }
-function primaryDirectConversationIdForAgent(agentId) {
-  const normalizedAgentId = normalizeAgentId(agentId);
-  if (normalizedAgentId === SCOUT_AGENT_ID) {
-    return SCOUT_PRIMARY_CONVERSATION_ID;
-  }
-  return `dm.operator.${normalizedAgentId}`;
-}
 function resolveNodeQualifier() {
   const fromEnv = process.env.OPENSCOUT_NODE_QUALIFIER?.trim();
   if (fromEnv) {
@@ -2937,13 +2905,6 @@ function detectGitBranch(projectRoot) {
   gitBranchCache.set(projectRoot, { branch, expiresAt: now + GIT_BRANCH_CACHE_TTL_MS });
   return branch;
 }
-function clearGitBranchCache(projectRoot) {
-  if (projectRoot) {
-    gitBranchCache.delete(projectRoot);
-  } else {
-    gitBranchCache.clear();
-  }
-}
 function resolveWorkspaceQualifier(projectRoot) {
   const normalizedProjectRoot = normalizePath(projectRoot);
   const branch = detectGitBranch(normalizedProjectRoot);
@@ -4430,52 +4391,6 @@ async function ensureRelayAgentConfigured(value, options = {}) {
     registrationKind: "configured"
   };
 }
-async function ensureScoutRelayAgentConfigured(options = {}) {
-  const settings = await readOpenScoutSettings({ currentDirectory: options.currentDirectory });
-  const overrides = await readRelayAgentOverrides();
-  const resolvedProjectRoot = options.projectRoot ? normalizePath(options.projectRoot) : options.currentDirectory ? await findNearestProjectRoot(options.currentDirectory) ?? normalizePath(options.currentDirectory) : normalizePath(process.cwd());
-  const qualifiedAgentId = buildRelayAgentInstance(SCOUT_AGENT_ID, resolvedProjectRoot).id;
-  const existing = overrides[qualifiedAgentId] ?? overrides[SCOUT_AGENT_ID];
-  const nextOverride = {
-    ...existing,
-    agentId: qualifiedAgentId,
-    definitionId: SCOUT_AGENT_ID,
-    displayName: "Scout",
-    projectName: "OpenScout",
-    projectRoot: resolvedProjectRoot,
-    projectConfigPath: existing?.projectConfigPath ? normalizePath(existing.projectConfigPath) : null,
-    source: "manual",
-    startedAt: existing?.startedAt ?? nowSeconds(),
-    systemPrompt: existing?.systemPrompt?.trim() || undefined,
-    capabilities: normalizeCapabilities(existing?.capabilities),
-    defaultHarness: "claude",
-    harnessProfiles: buildHarnessProfiles({
-      projectRoot: resolvedProjectRoot,
-      sessionKey: qualifiedAgentId,
-      sessionPrefix: settings.agents.sessionPrefix,
-      defaultHarness: "claude",
-      profiles: existing?.harnessProfiles,
-      runtime: existing?.runtime,
-      launchArgs: normalizeLaunchArgs(existing?.launchArgs)
-    }),
-    runtime: {
-      cwd: resolvedProjectRoot,
-      harness: "claude",
-      transport: "claude_stream_json",
-      sessionId: normalizeTmuxSessionName(existing?.runtime?.sessionId, `${SCOUT_AGENT_ID}-claude`, settings.agents.sessionPrefix),
-      wakePolicy: "on_demand"
-    }
-  };
-  nextOverride.launchArgs = nextOverride.harnessProfiles?.claude?.launchArgs ?? [];
-  if (overrides[SCOUT_AGENT_ID]) {
-    delete overrides[SCOUT_AGENT_ID];
-  }
-  if (JSON.stringify(overrides[qualifiedAgentId]) !== JSON.stringify(nextOverride)) {
-    overrides[qualifiedAgentId] = nextOverride;
-    await writeRelayAgentOverrides(overrides);
-  }
-  return nextOverride;
-}
 async function initializeOpenScoutSetup(options = {}) {
   return loadResolvedRelayAgents({
     currentDirectory: options.currentDirectory,
@@ -4639,418 +4554,6 @@ async function readOptionalFile(filePath) {
     return null;
   }
 }
-function parseJsonObject(value) {
-  const trimmed = value?.trim();
-  if (!trimmed) {
-    return {};
-  }
-  try {
-    const parsed = JSON.parse(trimmed);
-    return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : {};
-  } catch {
-    return {};
-  }
-}
-function appendActionOutput(blockState, output) {
-  if (!blockState || blockState.block.type !== "action" || !output) {
-    return;
-  }
-  const actionBlock = blockState.block;
-  actionBlock.action.output += output;
-}
-function updateBlockCompletion(blockState, completed) {
-  if (!blockState) {
-    return;
-  }
-  blockState.status = completed ? "completed" : "streaming";
-  blockState.block.status = completed ? "completed" : "streaming";
-}
-function parseQuestionAnswer(value) {
-  if (Array.isArray(value)) {
-    return value.map((entry) => typeof entry === "string" ? entry.trim() : String(entry).trim()).filter(Boolean);
-  }
-  if (typeof value === "string") {
-    return value.split(",").map((entry) => entry.trim()).filter(Boolean);
-  }
-  if (value == null) {
-    return [];
-  }
-  return [String(value)];
-}
-function isClaudeSessionGlobalEvent(event) {
-  return event.type === "system" && event.subtype === "init";
-}
-function stringifyToolResultContent(value) {
-  if (typeof value === "string") {
-    return value;
-  }
-  if (Array.isArray(value)) {
-    return value.map((entry) => stringifyToolResultContent(entry)).filter(Boolean).join(`
-`);
-  }
-  if (value == null) {
-    return "";
-  }
-  try {
-    return JSON.stringify(value);
-  } catch {
-    return String(value);
-  }
-}
-function buildClaudeAction(toolName, toolUseId, input) {
-  if (toolName === "Edit" || toolName === "Write" || toolName === "MultiEdit") {
-    return {
-      kind: "file_change",
-      path: typeof input.file_path === "string" ? input.file_path : typeof input.path === "string" ? input.path : "",
-      diff: "",
-      status: "running",
-      output: ""
-    };
-  }
-  if (toolName === "Bash") {
-    return {
-      kind: "command",
-      command: typeof input.command === "string" ? input.command : "",
-      status: "running",
-      output: ""
-    };
-  }
-  if (toolName === "Agent") {
-    return {
-      kind: "subagent",
-      agentId: toolUseId,
-      agentName: typeof input.description === "string" ? input.description : undefined,
-      prompt: typeof input.prompt === "string" ? input.prompt : undefined,
-      status: "running",
-      output: ""
-    };
-  }
-  return {
-    kind: "tool_call",
-    toolName,
-    toolCallId: toolUseId,
-    input,
-    status: "running",
-    output: ""
-  };
-}
-function buildClaudeStreamJsonSessionSnapshot(raw, options, targetClaudeSessionId) {
-  const lines = raw.split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
-  let resolvedSessionId = targetClaudeSessionId?.trim() || null;
-  if (!resolvedSessionId) {
-    for (const line of lines) {
-      try {
-        const event = JSON.parse(line);
-        const nextSessionId = typeof event.session_id === "string" ? event.session_id : typeof event.sessionId === "string" ? event.sessionId : null;
-        if (event.type === "system" && event.subtype === "init" && nextSessionId) {
-          resolvedSessionId = nextSessionId;
-        } else if (!resolvedSessionId && nextSessionId) {
-          resolvedSessionId = nextSessionId;
-        }
-      } catch {}
-    }
-  }
-  const snapshot = {
-    session: {
-      id: options.sessionId,
-      name: options.agentName,
-      adapterType: "claude_stream_json",
-      status: "idle",
-      cwd: options.cwd,
-      providerMeta: resolvedSessionId ? { transportSessionId: resolvedSessionId } : undefined
-    },
-    turns: []
-  };
-  let currentTurn = null;
-  const blockById = new Map;
-  let activeContentBlocks = new Map;
-  let pendingToolBlocks = new Map;
-  const startTurn = () => {
-    const turn = {
-      id: `${options.sessionId}:turn:${snapshot.turns.length + 1}`,
-      status: "streaming",
-      blocks: [],
-      startedAt: Date.now(),
-      nextBlockIndex: 0,
-      nextMessageIndex: 0
-    };
-    snapshot.turns.push(turn);
-    snapshot.currentTurnId = turn.id;
-    currentTurn = turn;
-    activeContentBlocks = new Map;
-    pendingToolBlocks = new Map;
-    snapshot.session.status = "active";
-    return turn;
-  };
-  const ensureTurn = () => currentTurn ?? startTurn();
-  const startTextualBlock = (type, index, initialText = "") => {
-    const turn = ensureTurn();
-    const blockId = `${turn.id}:m${turn.nextMessageIndex}:i${index}`;
-    const block = type === "text" ? {
-      id: blockId,
-      turnId: turn.id,
-      index: turn.nextBlockIndex++,
-      type: "text",
-      text: initialText,
-      status: "streaming"
-    } : {
-      id: blockId,
-      turnId: turn.id,
-      index: turn.nextBlockIndex++,
-      type: "reasoning",
-      text: initialText,
-      status: "streaming"
-    };
-    const blockState = {
-      block,
-      status: "streaming"
-    };
-    turn.blocks.push(blockState);
-    blockById.set(blockId, blockState);
-    activeContentBlocks.set(index, blockState);
-    return blockState;
-  };
-  const finalizeCurrentTurn = (status) => {
-    if (!currentTurn) {
-      return;
-    }
-    for (const blockState of activeContentBlocks.values()) {
-      updateBlockCompletion(blockState, true);
-    }
-    activeContentBlocks.clear();
-    currentTurn.status = status;
-    currentTurn.endedAt = Date.now();
-    currentTurn = null;
-    snapshot.currentTurnId = undefined;
-    snapshot.session.status = status === "error" ? "error" : "idle";
-  };
-  for (const line of lines) {
-    let event;
-    try {
-      event = JSON.parse(line);
-    } catch {
-      continue;
-    }
-    const eventSessionId = typeof event.session_id === "string" ? event.session_id : typeof event.sessionId === "string" ? event.sessionId : null;
-    if (resolvedSessionId) {
-      if (eventSessionId && eventSessionId !== resolvedSessionId) {
-        continue;
-      }
-      if (!eventSessionId && !isClaudeSessionGlobalEvent(event)) {
-        continue;
-      }
-    }
-    if (event.type === "system" && event.subtype === "init") {
-      if (typeof event.model === "string" && event.model.trim()) {
-        snapshot.session.model = event.model;
-      }
-      if (typeof event.cwd === "string" && event.cwd.trim()) {
-        snapshot.session.cwd = event.cwd;
-      }
-      snapshot.session.status = currentTurn ? "active" : "idle";
-      continue;
-    }
-    if (event.type === "stream_event") {
-      const streamEvent = event.event;
-      const streamEventType = typeof streamEvent?.type === "string" ? streamEvent.type : "";
-      if (streamEventType === "message_start") {
-        const turn = ensureTurn();
-        turn.nextMessageIndex += 1;
-        activeContentBlocks.clear();
-        pendingToolBlocks.clear();
-        snapshot.session.status = "active";
-        continue;
-      }
-      if (streamEventType === "content_block_start") {
-        const turn = ensureTurn();
-        const blockIndex = typeof streamEvent?.index === "number" ? streamEvent.index : 0;
-        const contentBlock = streamEvent?.content_block;
-        const contentType = typeof contentBlock?.type === "string" ? contentBlock.type : "";
-        if (contentType === "thinking") {
-          startTextualBlock("reasoning", blockIndex, typeof contentBlock?.thinking === "string" ? contentBlock.thinking : "");
-        } else if (contentType === "text") {
-          startTextualBlock("text", blockIndex, typeof contentBlock?.text === "string" ? contentBlock.text : "");
-        } else if (contentType === "tool_use") {
-          pendingToolBlocks.set(blockIndex, {
-            toolUseId: typeof contentBlock?.id === "string" ? contentBlock.id : `${turn.id}:tool:${blockIndex}`,
-            toolName: typeof contentBlock?.name === "string" ? contentBlock.name : "unknown",
-            input: contentBlock?.input && typeof contentBlock.input === "object" && !Array.isArray(contentBlock.input) ? contentBlock.input : {},
-            inputJson: "",
-            blockIndex: turn.nextBlockIndex++
-          });
-        }
-        continue;
-      }
-      if (streamEventType === "content_block_delta") {
-        const blockIndex = typeof streamEvent?.index === "number" ? streamEvent.index : 0;
-        const delta = streamEvent?.delta;
-        const deltaType = typeof delta?.type === "string" ? delta.type : "";
-        if (deltaType === "text_delta") {
-          const blockState = activeContentBlocks.get(blockIndex);
-          if (blockState?.block.type === "text" && typeof delta?.text === "string") {
-            blockState.block.text += delta.text;
-          }
-          continue;
-        }
-        if (deltaType === "thinking_delta") {
-          const blockState = activeContentBlocks.get(blockIndex);
-          if (blockState?.block.type === "reasoning" && typeof delta?.thinking === "string") {
-            blockState.block.text += delta.thinking;
-          }
-          continue;
-        }
-        if (deltaType === "input_json_delta") {
-          const pending = pendingToolBlocks.get(blockIndex);
-          if (pending && typeof delta?.partial_json === "string") {
-            pending.inputJson += delta.partial_json;
-          }
-        }
-        continue;
-      }
-      if (streamEventType === "content_block_stop") {
-        const blockIndex = typeof streamEvent?.index === "number" ? streamEvent.index : 0;
-        const blockState = activeContentBlocks.get(blockIndex);
-        if (blockState) {
-          updateBlockCompletion(blockState, true);
-          activeContentBlocks.delete(blockIndex);
-          continue;
-        }
-        const pendingTool = pendingToolBlocks.get(blockIndex);
-        if (!pendingTool) {
-          continue;
-        }
-        const turn = ensureTurn();
-        const parsedInput = {
-          ...pendingTool.input,
-          ...parseJsonObject(pendingTool.inputJson)
-        };
-        if (pendingTool.toolName === "AskUserQuestion") {
-          const questions = Array.isArray(parsedInput.questions) ? parsedInput.questions : [];
-          const firstQuestion = questions[0] ?? {};
-          const block = {
-            id: pendingTool.toolUseId,
-            turnId: turn.id,
-            index: pendingTool.blockIndex,
-            type: "question",
-            header: typeof firstQuestion.header === "string" ? firstQuestion.header : undefined,
-            question: typeof firstQuestion.question === "string" ? firstQuestion.question : "",
-            options: Array.isArray(firstQuestion.options) ? firstQuestion.options.map((option) => {
-              if (typeof option === "string") {
-                return { label: option };
-              }
-              const optionRecord = option;
-              return {
-                label: typeof optionRecord.label === "string" ? optionRecord.label : String(option),
-                description: typeof optionRecord.description === "string" ? optionRecord.description : undefined
-              };
-            }) : [],
-            multiSelect: Boolean(firstQuestion.multiSelect),
-            questionStatus: "awaiting_answer",
-            status: "streaming"
-          };
-          const nextBlockState = { block, status: "streaming" };
-          turn.blocks.push(nextBlockState);
-          blockById.set(block.id, nextBlockState);
-        } else {
-          const block = {
-            id: pendingTool.toolUseId,
-            turnId: turn.id,
-            index: pendingTool.blockIndex,
-            type: "action",
-            action: buildClaudeAction(pendingTool.toolName, pendingTool.toolUseId, parsedInput),
-            status: "streaming"
-          };
-          const nextBlockState = { block, status: "streaming" };
-          turn.blocks.push(nextBlockState);
-          blockById.set(block.id, nextBlockState);
-        }
-        pendingToolBlocks.delete(blockIndex);
-      }
-      continue;
-    }
-    if (event.type === "user") {
-      const message = event.message;
-      const content = Array.isArray(message?.content) ? message.content : [];
-      for (const entry of content) {
-        const result = entry;
-        if (result.type !== "tool_result" || typeof result.tool_use_id !== "string") {
-          continue;
-        }
-        const blockState = blockById.get(result.tool_use_id);
-        if (!blockState) {
-          continue;
-        }
-        if (blockState.block.type === "question") {
-          const questionBlock = blockState.block;
-          questionBlock.questionStatus = result.is_error ? "denied" : "answered";
-          const answer = parseQuestionAnswer(result.content);
-          questionBlock.answer = answer.length > 0 ? answer : undefined;
-          updateBlockCompletion(blockState, true);
-          continue;
-        }
-        appendActionOutput(blockState, stringifyToolResultContent(result.content));
-        if (blockState.block.type === "action") {
-          blockState.block.action.status = result.is_error ? "failed" : "completed";
-        }
-        updateBlockCompletion(blockState, true);
-      }
-      continue;
-    }
-    if (event.type === "result") {
-      const permissionDenials = Array.isArray(event.permission_denials) ? event.permission_denials : [];
-      for (const denial of permissionDenials) {
-        if (denial.tool_name !== "AskUserQuestion") {
-          continue;
-        }
-        const toolUseId = typeof denial.tool_use_id === "string" ? denial.tool_use_id : null;
-        const blockState = toolUseId ? blockById.get(toolUseId) : undefined;
-        if (blockState?.block.type === "question") {
-          blockState.block.questionStatus = "denied";
-          updateBlockCompletion(blockState, true);
-          continue;
-        }
-        const input = denial.tool_input && typeof denial.tool_input === "object" && !Array.isArray(denial.tool_input) ? denial.tool_input : {};
-        const questions = Array.isArray(input.questions) ? input.questions : [];
-        const firstQuestion = questions[0] ?? {};
-        const turn = ensureTurn();
-        const block = {
-          id: toolUseId ?? `${turn.id}:denied:${turn.nextBlockIndex}`,
-          turnId: turn.id,
-          index: turn.nextBlockIndex++,
-          type: "question",
-          header: typeof firstQuestion.header === "string" ? firstQuestion.header : undefined,
-          question: typeof firstQuestion.question === "string" ? firstQuestion.question : "",
-          options: Array.isArray(firstQuestion.options) ? firstQuestion.options.map((option) => {
-            if (typeof option === "string") {
-              return { label: option };
-            }
-            const optionRecord = option;
-            return {
-              label: typeof optionRecord.label === "string" ? optionRecord.label : String(option),
-              description: typeof optionRecord.description === "string" ? optionRecord.description : undefined
-            };
-          }) : [],
-          multiSelect: Boolean(firstQuestion.multiSelect),
-          questionStatus: "denied",
-          status: "completed"
-        };
-        const deniedBlock = { block, status: "completed" };
-        turn.blocks.push(deniedBlock);
-        blockById.set(block.id, deniedBlock);
-      }
-      finalizeCurrentTurn(event.is_error ? "error" : "completed");
-      continue;
-    }
-    if (event.type === "error") {
-      finalizeCurrentTurn("error");
-    }
-  }
-  if (!resolvedSessionId && snapshot.turns.length === 0) {
-    return null;
-  }
-  snapshot.session.status = currentTurn ? "active" : snapshot.session.status;
-  return snapshot;
-}
 
 class ClaudeStreamJsonSession {
   options;
@@ -5333,35 +4836,10 @@ async function ensureClaudeStreamJsonAgentOnline(options) {
   session.update(options);
   return session.ensureOnline();
 }
-async function invokeClaudeStreamJsonAgent(options) {
-  const session = getOrCreateSession(options);
-  session.update(options);
-  return session.invoke(options.prompt, options.timeoutMs);
-}
 function isClaudeStreamJsonAgentAlive(options) {
   const session = sessions.get(sessionKey(options));
   return Boolean(session?.isAlive());
 }
-async function answerClaudeStreamJsonQuestion(options, input) {
-  const session = sessions.get(sessionKey(options));
-  if (!session) {
-    throw new Error(`Claude stream-json session for ${options.agentName} is not running.`);
-  }
-  session.update(options);
-  await session.answerQuestion(input.blockId, input.answer);
-}
-async function getClaudeStreamJsonAgentSnapshot(options) {
-  const stdoutLogPath = join5(options.logsDirectory, "stdout.log");
-  const sessionStatePath = join5(options.runtimeDirectory, "claude-session-id.txt");
-  const [rawLog, persistedSessionId] = await Promise.all([
-    readOptionalFile(stdoutLogPath),
-    readOptionalFile(sessionStatePath)
-  ]);
-  if (!rawLog) {
-    return null;
-  }
-  return buildClaudeStreamJsonSessionSnapshot(rawLog, options, persistedSessionId);
-}
 async function shutdownClaudeStreamJsonAgent(options, shutdownOptions = {}) {
   const key = sessionKey(options);
   const session = sessions.get(key);
@@ -5383,11 +4861,6 @@ var init_claude_stream_json = __esm(() => {
 import { spawn as spawn2 } from "child_process";
 import { access as access2, appendFile as appendFile2, constants, mkdir as mkdir4, readFile as readFile5, rm as rm3, writeFile as writeFile4 } from "fs/promises";
 import { delimiter, join as join6 } from "path";
-function isCodexThreadGlobalMessage(message) {
-  const result = message.result;
-  const thread = result?.thread;
-  return typeof thread?.id === "string";
-}
 function sessionKey2(options) {
   return `${options.agentName}:${options.sessionId}`;
 }
@@ -5454,14 +4927,6 @@ function parseJsonLine(line) {
     return null;
   }
 }
-function parseJsonRecord(line) {
-  try {
-    const value = JSON.parse(line);
-    return value && typeof value === "object" && !Array.isArray(value) ? value : null;
-  } catch {
-    return null;
-  }
-}
 function errorMessage2(error) {
   if (error instanceof Error) {
     return error.message;
@@ -5500,687 +4965,6 @@ async function readOptionalFile2(filePath) {
     return null;
   }
 }
-async function readOptionalJsonRecord(filePath) {
-  const raw = await readOptionalFile2(filePath);
-  return raw ? parseJsonRecord(raw) : null;
-}
-function codexThreadStatusToSessionStatus(status) {
-  switch (status) {
-    case "active":
-      return "active";
-    case "idle":
-      return "idle";
-    case "error":
-      return "error";
-    default:
-      return "connecting";
-  }
-}
-function codexTurnStatusToTurnStatus(status) {
-  switch (status) {
-    case "completed":
-      return "completed";
-    case "interrupted":
-      return "interrupted";
-    case "failed":
-      return "error";
-    default:
-      return "streaming";
-  }
-}
-function stringifyCodexItem(value) {
-  if (typeof value === "string") {
-    return value;
-  }
-  if (value == null) {
-    return "";
-  }
-  try {
-    return JSON.stringify(value);
-  } catch {
-    return String(value);
-  }
-}
-function parseCodexTimestamp(value) {
-  if (typeof value === "number" && Number.isFinite(value)) {
-    return value > 1000000000000 ? value : value * 1000;
-  }
-  if (typeof value === "string") {
-    const parsed = Date.parse(value);
-    if (Number.isFinite(parsed)) {
-      return parsed;
-    }
-  }
-  return;
-}
-function parseCodexMaybeJson(value) {
-  if (typeof value !== "string") {
-    return value;
-  }
-  const trimmed = value.trim();
-  if (!trimmed) {
-    return value;
-  }
-  try {
-    return JSON.parse(trimmed);
-  } catch {
-    return value;
-  }
-}
-function extractCodexReasoningText(item) {
-  const summary = Array.isArray(item.summary) ? item.summary : [];
-  const content = Array.isArray(item.content) ? item.content : [];
-  const summaryText = summary.map((entry) => {
-    if (typeof entry === "string") {
-      return entry;
-    }
-    const record = entry;
-    if (typeof record.text === "string") {
-      return record.text;
-    }
-    if (typeof record.summary === "string") {
-      return record.summary;
-    }
-    return "";
-  }).filter(Boolean).join(`
-`);
-  const contentText = content.map((entry) => {
-    if (typeof entry === "string") {
-      return entry;
-    }
-    const record = entry;
-    return typeof record.text === "string" ? record.text : "";
-  }).filter(Boolean).join(`
-`);
-  return [summaryText, contentText].filter(Boolean).join(`
-
-`).trim();
-}
-function extractCodexMessageText(item) {
-  const content = Array.isArray(item.content) ? item.content : [];
-  return content.map((entry) => {
-    if (typeof entry === "string") {
-      return entry;
-    }
-    const record = entry;
-    return typeof record.text === "string" ? record.text : "";
-  }).filter(Boolean).join(`
-
-`).trim();
-}
-function extractCodexUserMessageText(item) {
-  const text = extractCodexMessageText(item);
-  if (text) {
-    return text;
-  }
-  return typeof item.text === "string" ? item.text.trim() : "";
-}
-function renderCodexActionOutput(item) {
-  if (typeof item.text === "string" && item.text.trim()) {
-    return item.text;
-  }
-  if (item.action !== undefined) {
-    return stringifyCodexItem(item.action);
-  }
-  return stringifyCodexItem(item);
-}
-function buildCodexActionBlock(item, turnId, index) {
-  return {
-    id: typeof item.id === "string" ? item.id : `${turnId}:action:${index}`,
-    turnId,
-    index,
-    type: "action",
-    status: "streaming",
-    action: {
-      kind: "tool_call",
-      toolName: typeof item.type === "string" ? item.type : "unknown",
-      toolCallId: typeof item.id === "string" ? item.id : `${turnId}:action:${index}`,
-      input: item,
-      output: "",
-      status: "running"
-    }
-  };
-}
-function buildCodexRolloutActionBlock(item, turnId, index) {
-  const itemType = typeof item.type === "string" ? item.type : "tool_call";
-  const toolCallId = typeof item.call_id === "string" ? item.call_id : `${turnId}:action:${index}`;
-  const toolName = typeof item.name === "string" ? item.name : itemType === "web_search_call" ? "web_search" : itemType;
-  const input = itemType === "function_call" ? parseCodexMaybeJson(item.arguments) : itemType === "custom_tool_call" ? item.input : item;
-  return {
-    id: toolCallId,
-    turnId,
-    index,
-    type: "action",
-    status: "streaming",
-    action: {
-      kind: "tool_call",
-      toolName,
-      toolCallId,
-      input,
-      output: "",
-      status: "running"
-    }
-  };
-}
-function finalizeCodexTurnBlocks(turn, status) {
-  for (const blockState of turn.blocks) {
-    if (blockState.status === "completed") {
-      continue;
-    }
-    blockState.status = "completed";
-    blockState.block.status = "completed";
-    if (blockState.block.type === "action") {
-      blockState.block.action.status = status === "completed" ? "completed" : "failed";
-    }
-  }
-}
-function setCodexProviderMeta(snapshot, threadId, threadPath) {
-  if (!threadId && !threadPath) {
-    return;
-  }
-  snapshot.session.providerMeta = {
-    ...snapshot.session.providerMeta ?? {},
-    ...threadId ? { threadId } : {},
-    ...threadPath ? { threadPath } : {}
-  };
-}
-function buildCodexAppServerSessionSnapshot(raw, options, targetThreadId) {
-  const lines = raw.split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
-  let resolvedThreadId = targetThreadId?.trim() || null;
-  if (!resolvedThreadId) {
-    for (const line of lines) {
-      try {
-        const message = JSON.parse(line);
-        const resultThread = message.result?.thread;
-        const paramsThread = message.params?.thread;
-        const params = message.params;
-        const nextThreadId = typeof resultThread?.id === "string" ? resultThread.id : typeof paramsThread?.id === "string" ? paramsThread.id : typeof params?.threadId === "string" ? params.threadId : null;
-        if (nextThreadId) {
-          resolvedThreadId = nextThreadId;
-        }
-      } catch {}
-    }
-  }
-  const snapshot = {
-    session: {
-      id: options.sessionId,
-      name: options.agentName,
-      adapterType: "codex_app_server",
-      status: resolvedThreadId ? "idle" : "connecting",
-      cwd: options.cwd,
-      providerMeta: resolvedThreadId ? { threadId: resolvedThreadId } : undefined
-    },
-    turns: []
-  };
-  const turnsById = new Map;
-  const blocksById = new Map;
-  const ensureTurn = (turnId) => {
-    const existing = turnsById.get(turnId);
-    if (existing) {
-      return existing;
-    }
-    const turn = {
-      id: turnId,
-      status: "streaming",
-      blocks: [],
-      startedAt: Date.now(),
-      nextBlockIndex: 0
-    };
-    turnsById.set(turnId, turn);
-    snapshot.turns.push(turn);
-    snapshot.currentTurnId = turnId;
-    snapshot.session.status = "active";
-    return turn;
-  };
-  const completeBlock = (blockState) => {
-    if (!blockState) {
-      return;
-    }
-    blockState.status = "completed";
-    blockState.block.status = "completed";
-  };
-  for (const line of lines) {
-    let message;
-    try {
-      message = JSON.parse(line);
-    } catch {
-      continue;
-    }
-    const params = message.params;
-    const result = message.result;
-    const paramsThread = params?.thread;
-    const resultThread = result?.thread;
-    const lineThreadId = typeof params?.threadId === "string" ? params.threadId : typeof paramsThread?.id === "string" ? paramsThread.id : typeof resultThread?.id === "string" ? resultThread.id : null;
-    if (resolvedThreadId) {
-      if (lineThreadId && lineThreadId !== resolvedThreadId) {
-        continue;
-      }
-      if (!lineThreadId && !isCodexThreadGlobalMessage(message)) {
-        continue;
-      }
-    }
-    const resultModel = typeof result?.model === "string" ? result.model : null;
-    if (resultThread && resultModel) {
-      snapshot.session.model = resultModel;
-    }
-    if (typeof resultThread?.path === "string") {
-      snapshot.session.providerMeta = {
-        ...snapshot.session.providerMeta ?? {},
-        threadId: resolvedThreadId ?? resultThread.id,
-        threadPath: resultThread.path
-      };
-    }
-    if (typeof resultThread?.cwd === "string") {
-      snapshot.session.cwd = resultThread.cwd;
-    }
-    if (message.method === "thread/started" || message.method === "thread/name/updated") {
-      if (typeof paramsThread?.path === "string") {
-        snapshot.session.providerMeta = {
-          ...snapshot.session.providerMeta ?? {},
-          threadId: resolvedThreadId ?? paramsThread.id,
-          threadPath: paramsThread.path
-        };
-      }
-      if (typeof paramsThread?.cwd === "string") {
-        snapshot.session.cwd = paramsThread.cwd;
-      }
-      if (typeof paramsThread?.name === "string" && paramsThread.name.trim()) {
-        snapshot.session.name = paramsThread.name;
-      }
-      continue;
-    }
-    if (message.method === "thread/status/changed") {
-      const status = params?.status?.type;
-      snapshot.session.status = codexThreadStatusToSessionStatus(typeof status === "string" ? status : undefined);
-      continue;
-    }
-    if (message.method === "turn/started") {
-      const turn = params?.turn;
-      if (typeof turn?.id === "string") {
-        ensureTurn(turn.id);
-      }
-      continue;
-    }
-    if (message.method === "item/started") {
-      const item = params?.item;
-      const turnId = typeof params?.turnId === "string" ? params.turnId : null;
-      const itemType = typeof item?.type === "string" ? item.type : "";
-      const itemId = typeof item?.id === "string" ? item.id : null;
-      if (!turnId || !item || !itemId || !itemType) {
-        continue;
-      }
-      const turn = ensureTurn(turnId);
-      if (itemType === "userMessage") {
-        const block2 = {
-          id: itemId,
-          turnId,
-          index: turn.nextBlockIndex++,
-          type: "text",
-          text: extractCodexUserMessageText(item),
-          status: "streaming"
-        };
-        const blockState2 = { block: block2, status: "streaming" };
-        turn.blocks.push(blockState2);
-        blocksById.set(itemId, blockState2);
-        continue;
-      }
-      if (itemType === "agentMessage") {
-        const block2 = {
-          id: itemId,
-          turnId,
-          index: turn.nextBlockIndex++,
-          type: "text",
-          text: typeof item.text === "string" ? item.text : "",
-          status: "streaming"
-        };
-        const blockState2 = { block: block2, status: "streaming" };
-        turn.blocks.push(blockState2);
-        blocksById.set(itemId, blockState2);
-        continue;
-      }
-      if (itemType === "reasoning") {
-        const text = extractCodexReasoningText(item);
-        if (!text) {
-          continue;
-        }
-        const block2 = {
-          id: itemId,
-          turnId,
-          index: turn.nextBlockIndex++,
-          type: "reasoning",
-          text,
-          status: "streaming"
-        };
-        const blockState2 = { block: block2, status: "streaming" };
-        turn.blocks.push(blockState2);
-        blocksById.set(itemId, blockState2);
-        continue;
-      }
-      const block = buildCodexActionBlock(item, turnId, turn.nextBlockIndex++);
-      const blockState = { block, status: "streaming" };
-      turn.blocks.push(blockState);
-      blocksById.set(block.id, blockState);
-      continue;
-    }
-    if (message.method === "item/agentMessage/delta") {
-      const itemId = typeof params?.itemId === "string" ? params.itemId : null;
-      const delta = typeof params?.delta === "string" ? params.delta : "";
-      const blockState = itemId ? blocksById.get(itemId) : undefined;
-      if (blockState?.block.type === "text") {
-        blockState.block.text += delta;
-      }
-      continue;
-    }
-    if (message.method === "item/completed") {
-      const item = params?.item;
-      const turnId = typeof params?.turnId === "string" ? params.turnId : null;
-      const itemType = typeof item?.type === "string" ? item.type : "";
-      const itemId = typeof item?.id === "string" ? item.id : null;
-      if (!turnId || !item || !itemId || !itemType) {
-        continue;
-      }
-      if (itemType === "userMessage") {
-        const turn2 = ensureTurn(turnId);
-        let blockState2 = blocksById.get(itemId);
-        if (!blockState2) {
-          const block = {
-            id: itemId,
-            turnId,
-            index: turn2.nextBlockIndex++,
-            type: "text",
-            text: "",
-            status: "streaming"
-          };
-          blockState2 = { block, status: "streaming" };
-          turn2.blocks.push(blockState2);
-          blocksById.set(itemId, blockState2);
-        }
-        if (blockState2.block.type === "text") {
-          blockState2.block.text = extractCodexUserMessageText(item);
-        }
-        completeBlock(blockState2);
-        continue;
-      }
-      if (itemType === "agentMessage") {
-        const turn2 = ensureTurn(turnId);
-        let blockState2 = blocksById.get(itemId);
-        if (!blockState2) {
-          const block = {
-            id: itemId,
-            turnId,
-            index: turn2.nextBlockIndex++,
-            type: "text",
-            text: "",
-            status: "streaming"
-          };
-          blockState2 = { block, status: "streaming" };
-          turn2.blocks.push(blockState2);
-          blocksById.set(itemId, blockState2);
-        }
-        if (blockState2.block.type === "text" && typeof item.text === "string" && item.text.length > 0) {
-          blockState2.block.text = item.text;
-        }
-        completeBlock(blockState2);
-        continue;
-      }
-      if (itemType === "reasoning") {
-        const text = extractCodexReasoningText(item);
-        if (!text) {
-          continue;
-        }
-        const turn2 = ensureTurn(turnId);
-        let blockState2 = blocksById.get(itemId);
-        if (!blockState2) {
-          const block = {
-            id: itemId,
-            turnId,
-            index: turn2.nextBlockIndex++,
-            type: "reasoning",
-            text,
-            status: "streaming"
-          };
-          blockState2 = { block, status: "streaming" };
-          turn2.blocks.push(blockState2);
-          blocksById.set(itemId, blockState2);
-        }
-        if (blockState2.block.type === "reasoning" && text) {
-          blockState2.block.text = text;
-        }
-        completeBlock(blockState2);
-        continue;
-      }
-      const turn = ensureTurn(turnId);
-      let blockState = blocksById.get(itemId);
-      if (!blockState) {
-        const block = buildCodexActionBlock(item, turnId, turn.nextBlockIndex++);
-        blockState = { block, status: "streaming" };
-        turn.blocks.push(blockState);
-        blocksById.set(itemId, blockState);
-      }
-      if (blockState.block.type === "action") {
-        blockState.block.action.output = renderCodexActionOutput(item);
-        blockState.block.action.status = "completed";
-      }
-      completeBlock(blockState);
-      continue;
-    }
-    if (message.method === "turn/completed") {
-      const turn = params?.turn;
-      if (!turn || typeof turn.id !== "string") {
-        continue;
-      }
-      const turnState = ensureTurn(turn.id);
-      turnState.status = codexTurnStatusToTurnStatus(typeof turn.status === "string" ? turn.status : undefined);
-      turnState.endedAt = Date.now();
-      if (snapshot.currentTurnId === turn.id) {
-        snapshot.currentTurnId = undefined;
-      }
-      snapshot.session.status = turnState.status === "error" ? "error" : "idle";
-      continue;
-    }
-    if (message.method === "error") {
-      snapshot.session.status = "error";
-    }
-  }
-  if (!resolvedThreadId && snapshot.turns.length === 0) {
-    return null;
-  }
-  return snapshot;
-}
-function buildCodexRolloutSessionSnapshot(raw, options, targetThreadId, rolloutPath) {
-  const lines = raw.split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
-  let resolvedThreadId = targetThreadId?.trim() || null;
-  const snapshot = {
-    session: {
-      id: options.sessionId,
-      name: options.agentName,
-      adapterType: "codex_app_server",
-      status: resolvedThreadId ? "idle" : "connecting",
-      cwd: options.cwd
-    },
-    turns: []
-  };
-  setCodexProviderMeta(snapshot, resolvedThreadId, rolloutPath ?? null);
-  const turnsById = new Map;
-  const blocksByCallId = new Map;
-  let currentTurnId = null;
-  const ensureTurn = (turnId, startedAt) => {
-    const existing = turnsById.get(turnId);
-    if (existing) {
-      if (startedAt && !existing.startedAt) {
-        existing.startedAt = startedAt;
-      }
-      return existing;
-    }
-    const turn = {
-      id: turnId,
-      status: "streaming",
-      blocks: [],
-      startedAt: startedAt ?? Date.now(),
-      nextBlockIndex: 0
-    };
-    turnsById.set(turnId, turn);
-    snapshot.turns.push(turn);
-    snapshot.currentTurnId = turnId;
-    snapshot.session.status = "active";
-    return turn;
-  };
-  for (const line of lines) {
-    const message = parseJsonRecord(line);
-    if (!message) {
-      continue;
-    }
-    const timestamp = parseCodexTimestamp(message.timestamp) ?? Date.now();
-    const entryType = typeof message.type === "string" ? message.type : "";
-    const payload = message.payload && typeof message.payload === "object" && !Array.isArray(message.payload) ? message.payload : undefined;
-    if (!payload) {
-      continue;
-    }
-    if (entryType === "session_meta") {
-      const sessionThreadId = typeof payload.id === "string" ? payload.id : null;
-      if (sessionThreadId) {
-        if (resolvedThreadId && sessionThreadId !== resolvedThreadId) {
-          return null;
-        }
-        resolvedThreadId = sessionThreadId;
-      }
-      if (typeof payload.cwd === "string" && payload.cwd.trim()) {
-        snapshot.session.cwd = payload.cwd;
-      }
-      setCodexProviderMeta(snapshot, resolvedThreadId, rolloutPath ?? null);
-      snapshot.session.status = resolvedThreadId ? "idle" : snapshot.session.status;
-      continue;
-    }
-    if (entryType === "turn_context") {
-      if (typeof payload.cwd === "string" && payload.cwd.trim()) {
-        snapshot.session.cwd = payload.cwd;
-      }
-      if (typeof payload.model === "string" && payload.model.trim()) {
-        snapshot.session.model = payload.model;
-      }
-      continue;
-    }
-    if (entryType === "event_msg") {
-      const payloadType2 = typeof payload.type === "string" ? payload.type : "";
-      if (payloadType2 === "task_started") {
-        const turnId = typeof payload.turn_id === "string" ? payload.turn_id : null;
-        if (!turnId) {
-          continue;
-        }
-        currentTurnId = turnId;
-        ensureTurn(turnId, parseCodexTimestamp(payload.started_at) ?? timestamp);
-        snapshot.currentTurnId = turnId;
-        snapshot.session.status = "active";
-        continue;
-      }
-      if (payloadType2 === "task_complete" || payloadType2 === "turn_aborted") {
-        const turnId = typeof payload.turn_id === "string" ? payload.turn_id : currentTurnId;
-        if (!turnId) {
-          continue;
-        }
-        const turn2 = ensureTurn(turnId);
-        turn2.status = payloadType2 === "task_complete" ? "completed" : payload.reason === "interrupted" ? "interrupted" : "error";
-        turn2.endedAt = parseCodexTimestamp(payload.completed_at) ?? timestamp;
-        finalizeCodexTurnBlocks(turn2, turn2.status);
-        if (snapshot.currentTurnId === turnId) {
-          snapshot.currentTurnId = undefined;
-        }
-        currentTurnId = currentTurnId === turnId ? null : currentTurnId;
-        snapshot.session.status = turn2.status === "error" ? "error" : "idle";
-      }
-      continue;
-    }
-    if (entryType !== "response_item" || !currentTurnId) {
-      continue;
-    }
-    const turn = ensureTurn(currentTurnId);
-    const payloadType = typeof payload.type === "string" ? payload.type : "";
-    if (payloadType === "message" && payload.role === "user") {
-      const text = extractCodexMessageText(payload);
-      if (!text) {
-        continue;
-      }
-      const block = {
-        id: `${turn.id}:text:${turn.nextBlockIndex}`,
-        turnId: turn.id,
-        index: turn.nextBlockIndex++,
-        type: "text",
-        text,
-        status: "completed"
-      };
-      turn.blocks.push({ block, status: "completed" });
-      continue;
-    }
-    if (payloadType === "message" && payload.role === "assistant") {
-      const text = extractCodexMessageText(payload);
-      if (!text) {
-        continue;
-      }
-      const block = {
-        id: `${turn.id}:text:${turn.nextBlockIndex}`,
-        turnId: turn.id,
-        index: turn.nextBlockIndex++,
-        type: "text",
-        text,
-        status: "completed"
-      };
-      turn.blocks.push({ block, status: "completed" });
-      continue;
-    }
-    if (payloadType === "reasoning") {
-      const text = extractCodexReasoningText(payload);
-      if (!text) {
-        continue;
-      }
-      const block = {
-        id: `${turn.id}:reasoning:${turn.nextBlockIndex}`,
-        turnId: turn.id,
-        index: turn.nextBlockIndex++,
-        type: "reasoning",
-        text,
-        status: "completed"
-      };
-      turn.blocks.push({ block, status: "completed" });
-      continue;
-    }
-    if (payloadType === "function_call" || payloadType === "custom_tool_call" || payloadType === "web_search_call") {
-      const block = buildCodexRolloutActionBlock(payload, turn.id, turn.nextBlockIndex++);
-      const blockState = { block, status: "streaming" };
-      turn.blocks.push(blockState);
-      blocksByCallId.set(block.id, blockState);
-      continue;
-    }
-    if (payloadType === "function_call_output" || payloadType === "custom_tool_call_output") {
-      const callId = typeof payload.call_id === "string" ? payload.call_id : null;
-      if (!callId) {
-        continue;
-      }
-      let blockState = blocksByCallId.get(callId);
-      if (!blockState) {
-        const block = buildCodexRolloutActionBlock({
-          type: "tool_call",
-          call_id: callId,
-          name: "unknown"
-        }, turn.id, turn.nextBlockIndex++);
-        blockState = { block, status: "streaming" };
-        turn.blocks.push(blockState);
-        blocksByCallId.set(callId, blockState);
-      }
-      if (blockState.block.type === "action") {
-        blockState.block.action.output = stringifyCodexItem(payload.output);
-        blockState.block.action.status = "completed";
-      }
-      blockState.status = "completed";
-      blockState.block.status = "completed";
-    }
-  }
-  if (!resolvedThreadId && snapshot.turns.length === 0) {
-    return null;
-  }
-  setCodexProviderMeta(snapshot, resolvedThreadId, rolloutPath ?? null);
-  snapshot.session.status = snapshot.currentTurnId ? "active" : snapshot.session.status;
-  return snapshot;
-}
 function isMissingCodexRolloutError(error) {
   const message = errorMessage2(error).toLowerCase();
   return message.includes("no rollout found for thread id");
@@ -6827,48 +5611,10 @@ async function ensureCodexAppServerAgentOnline(options) {
   session.update(options);
   return session.ensureOnline();
 }
-async function invokeCodexAppServerAgent(options) {
-  const session = getOrCreateSession2(options);
-  session.update(options);
-  return session.invoke(options.prompt, options.timeoutMs);
-}
-async function sendCodexAppServerAgent(options) {
-  const session = getOrCreateSession2(options);
-  session.update(options);
-  if (session.hasActiveTurn()) {
-    return session.steerAndWait(options.prompt, options.timeoutMs);
-  }
-  return session.invoke(options.prompt, options.timeoutMs);
-}
 function isCodexAppServerAgentAlive(options) {
   const session = sessions2.get(sessionKey2(options));
   return Boolean(session?.isAlive());
 }
-async function getCodexAppServerAgentSnapshot(options) {
-  const stdoutLogPath = join6(options.logsDirectory, "stdout.log");
-  const threadIdPath = join6(options.runtimeDirectory, "codex-thread-id.txt");
-  const statePath = join6(options.runtimeDirectory, "state.json");
-  const [rawLog, persistedThreadId, persistedState] = await Promise.all([
-    readOptionalFile2(stdoutLogPath),
-    readOptionalFile2(threadIdPath),
-    readOptionalJsonRecord(statePath)
-  ]);
-  const resolvedThreadId = options.threadId ?? persistedThreadId ?? metadataString(persistedState ?? undefined, "threadId") ?? undefined;
-  const persistedThreadPath = metadataString(persistedState ?? undefined, "threadPath");
-  if (persistedThreadPath) {
-    const rawRollout = await readOptionalFile2(persistedThreadPath);
-    if (rawRollout) {
-      const rolloutSnapshot = buildCodexRolloutSessionSnapshot(rawRollout, options, resolvedThreadId, persistedThreadPath);
-      if (rolloutSnapshot) {
-        return rolloutSnapshot;
-      }
-    }
-  }
-  if (!rawLog) {
-    return null;
-  }
-  return buildCodexAppServerSessionSnapshot(rawLog, options, resolvedThreadId);
-}
 async function shutdownCodexAppServerAgent(options, shutdownOptions = {}) {
   const key = sessionKey2(options);
   const session = sessions2.get(key);
@@ -6888,49 +5634,6 @@ var init_codex_app_server = __esm(() => {
 });
 
 // ../runtime/src/collaboration-contract.ts
-function metadataValue(metadata, key) {
-  return metadata?.[key];
-}
-function recordFromInvocation(invocation, key) {
-  const contextRecord = metadataValue(invocation.context, key);
-  if (typeof contextRecord !== "undefined") {
-    return contextRecord;
-  }
-  const nestedContext = metadataValue(invocation.context, "collaboration");
-  if (nestedContext && typeof nestedContext === "object" && !Array.isArray(nestedContext)) {
-    const nestedValue = metadataValue(nestedContext, key);
-    if (typeof nestedValue !== "undefined") {
-      return nestedValue;
-    }
-  }
-  const metadataRecord2 = metadataValue(invocation.metadata, key);
-  if (typeof metadataRecord2 !== "undefined") {
-    return metadataRecord2;
-  }
-  const nestedMetadata = metadataValue(invocation.metadata, "collaboration");
-  if (nestedMetadata && typeof nestedMetadata === "object" && !Array.isArray(nestedMetadata)) {
-    return metadataValue(nestedMetadata, key);
-  }
-  return;
-}
-function stringFromInvocation(invocation, key) {
-  const value = recordFromInvocation(invocation, key);
-  return typeof value === "string" && value.trim().length > 0 ? value.trim() : undefined;
-}
-function waitingOnLabel(value) {
-  if (typeof value === "string" && value.trim().length > 0) {
-    return value.trim();
-  }
-  if (!value || typeof value !== "object" || Array.isArray(value)) {
-    return;
-  }
-  const waitingOn = value;
-  const kind = typeof waitingOn.kind === "string" ? waitingOn.kind : undefined;
-  const label = typeof waitingOn.label === "string" ? waitingOn.label.trim() : "";
-  const targetId = typeof waitingOn.targetId === "string" ? waitingOn.targetId.trim() : "";
-  const parts = [label || kind, targetId || undefined].filter(Boolean);
-  return parts.length > 0 ? parts.join(" \xB7 ") : undefined;
-}
 function buildCollaborationContractPrompt(agentId) {
   return [
     "Collaboration contract:",
@@ -6947,38 +5650,6 @@ function buildCollaborationContractPrompt(agentId) {
   ].join(`
 `);
 }
-function buildInvocationCollaborationContextPrompt(invocation) {
-  const recordId = stringFromInvocation(invocation, "recordId") ?? stringFromInvocation(invocation, "collaborationRecordId");
-  const kind = stringFromInvocation(invocation, "kind") ?? stringFromInvocation(invocation, "collaborationKind");
-  const state = stringFromInvocation(invocation, "state") ?? stringFromInvocation(invocation, "collaborationState");
-  const ownerId = stringFromInvocation(invocation, "ownerId");
-  const nextMoveOwnerId = stringFromInvocation(invocation, "nextMoveOwnerId");
-  const wakeReason = stringFromInvocation(invocation, "wakeReason");
-  const targetAgentId = stringFromInvocation(invocation, "targetAgentId");
-  const waitingOn = waitingOnLabel(recordFromInvocation(invocation, "waitingOn") ?? recordFromInvocation(invocation, "waiting_on"));
-  const acceptanceState = stringFromInvocation(invocation, "acceptanceState");
-  const requestedById = stringFromInvocation(invocation, "requestedById");
-  const askedById = stringFromInvocation(invocation, "askedById");
-  const askedOfId = stringFromInvocation(invocation, "askedOfId");
-  const lines = [
-    recordId ? `  - Record: ${kind ? `${kind} ` : ""}${recordId}` : undefined,
-    state ? `  - State: ${state}` : undefined,
-    ownerId ? `  - Owner: ${ownerId}` : undefined,
-    nextMoveOwnerId ? `  - Next move owner: ${nextMoveOwnerId}` : undefined,
-    wakeReason ? `  - Wake reason: ${wakeReason}` : undefined,
-    targetAgentId ? `  - Wake target: ${targetAgentId}` : undefined,
-    waitingOn ? `  - Waiting on: ${waitingOn}` : undefined,
-    acceptanceState ? `  - Acceptance: ${acceptanceState}` : undefined,
-    requestedById ? `  - Requested by: ${requestedById}` : undefined,
-    askedById ? `  - Asked by: ${askedById}` : undefined,
-    askedOfId ? `  - Asked of: ${askedOfId}` : undefined
-  ].filter((value) => Boolean(value));
-  if (lines.length === 0) {
-    return;
-  }
-  return ["Collaboration context:", ...lines].join(`
-`);
-}
 
 // ../runtime/src/broker-service.ts
 import { spawnSync } from "child_process";
@@ -7507,43 +6178,6 @@ var init_local_agent_template = __esm(() => {
 });
 
 // ../runtime/src/local-agents.ts
-var exports_local_agents = {};
-__export(exports_local_agents, {
-  updateLocalAgentConfig: () => updateLocalAgentConfig,
-  stripLocalAgentReplyMetadata: () => stripLocalAgentReplyMetadata,
-  stopLocalAgent: () => stopLocalAgent,
-  stopAllLocalAgents: () => stopAllLocalAgents,
-  startLocalAgent: () => startLocalAgent,
-  shutdownLocalSessionEndpoint: () => shutdownLocalSessionEndpoint,
-  shouldDisableGeneratedCodexEndpoint: () => shouldDisableGeneratedCodexEndpoint,
-  sendTmuxPrompt: () => sendTmuxPrompt,
-  restartLocalAgent: () => restartLocalAgent,
-  restartAllLocalAgents: () => restartAllLocalAgents,
-  resolveLocalAgentIdentity: () => resolveLocalAgentIdentity,
-  resolveLocalAgentByName: () => resolveLocalAgentByName,
-  renderLocalAgentSystemPromptTemplate: () => renderLocalAgentSystemPromptTemplate,
-  loadRegisteredLocalAgentBindings: () => loadRegisteredLocalAgentBindings,
-  listLocalAgents: () => listLocalAgents,
-  isLocalAgentSessionAlive: () => isLocalAgentSessionAlive,
-  isLocalAgentEndpointAlive: () => isLocalAgentEndpointAlive,
-  invokeLocalAgentEndpoint: () => invokeLocalAgentEndpoint,
-  interruptLocalAgent: () => interruptLocalAgent,
-  inferLocalAgentBinding: () => inferLocalAgentBinding,
-  getLocalAgentSessionSnapshot: () => getLocalAgentSessionSnapshot,
-  getLocalAgentEndpointSessionSnapshot: () => getLocalAgentEndpointSessionSnapshot,
-  getLocalAgentConfig: () => getLocalAgentConfig,
-  ensureLocalSessionEndpointOnline: () => ensureLocalSessionEndpointOnline,
-  ensureLocalAgentBindingOnline: () => ensureLocalAgentBindingOnline,
-  buildTmuxLaunchShellCommand: () => buildTmuxLaunchShellCommand,
-  buildLocalAgentSystemPromptTemplate: () => buildLocalAgentSystemPromptTemplate,
-  buildLocalAgentSystemPrompt: () => buildLocalAgentSystemPrompt,
-  buildLocalAgentNudge: () => buildLocalAgentNudge,
-  buildLocalAgentDirectInvocationPrompt: () => buildLocalAgentDirectInvocationPrompt,
-  buildAttachedSessionInvocationPrompt: () => buildAttachedSessionInvocationPrompt,
-  answerLocalAgentSessionQuestion: () => answerLocalAgentSessionQuestion,
-  SUPPORTED_LOCAL_AGENT_HARNESSES: () => SUPPORTED_LOCAL_AGENT_HARNESSES
-});
-import { randomUUID as randomUUID2 } from "crypto";
 import { execFileSync as execFileSync3, execSync } from "child_process";
 import { existsSync as existsSync5, readFileSync as readFileSync3 } from "fs";
 import { mkdir as mkdir5, rm as rm4, stat as stat3, writeFile as writeFile5 } from "fs/promises";
@@ -7574,21 +6208,9 @@ function resolveBrokerUrl() {
 function nowSeconds2() {
   return Math.floor(Date.now() / 1000);
 }
-function normalizeBrokerTimestamp(value) {
-  return value > 10000000000 ? Math.floor(value / 1000) : value;
-}
 function brokerRelayCommand() {
   return `node ${JSON.stringify(join8(OPENSCOUT_REPO_ROOT, "packages", "cli", "bin", "scout.mjs"))}`;
 }
-function sleep2(ms) {
-  return new Promise((resolve7) => setTimeout(resolve7, ms));
-}
-function createLocalAgentFlightId() {
-  return `f-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 6)}`;
-}
-function escapeRegExp(value) {
-  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
 function titleCaseLocalAgentName(value) {
   return value.split(/[-_.\s]+/).filter(Boolean).map((segment) => segment.charAt(0).toUpperCase() + segment.slice(1)).join(" ");
 }
@@ -7833,13 +6455,6 @@ function expandHomePath3(value) {
 function normalizeProjectPath(value) {
   return resolve6(expandHomePath3(value.trim() || "."));
 }
-function compactHomePath(value) {
-  const home = process.env.HOME;
-  if (!home) {
-    return value;
-  }
-  return value.startsWith(home) ? value.replace(home, "~") : value;
-}
 function normalizeTmuxSessionName2(value, agentId) {
   const fallback = `relay-${agentId}`;
   const trimmed = value?.trim() ?? "";
@@ -8085,134 +6700,6 @@ function relayAgentOverrideFromLocalAgentRecord(agentId, record, existing) {
     }
   };
 }
-function buildLocalAgentConfigState(agentId, record) {
-  return {
-    agentId,
-    editable: true,
-    systemPrompt: record.systemPrompt || buildLocalAgentSystemPromptTemplate(),
-    runtime: {
-      cwd: compactHomePath(record.cwd),
-      harness: normalizeLocalAgentHarness(record.harness),
-      transport: normalizeLocalAgentTransport(record.transport, normalizeLocalAgentHarness(record.harness)),
-      sessionId: record.tmuxSession,
-      wakePolicy: "on_demand"
-    },
-    launchArgs: normalizeLocalAgentLaunchArgs(record.launchArgs),
-    capabilities: normalizeLocalAgentCapabilities(record.capabilities),
-    applyMode: "restart",
-    templateHint: LOCAL_AGENT_SYSTEM_PROMPT_TEMPLATE_HINT
-  };
-}
-async function assertDirectoryExists(directory) {
-  const stats = await stat3(directory);
-  if (!stats.isDirectory()) {
-    throw new Error(`${directory} is not a directory.`);
-  }
-}
-async function resolveConfiguredLocalAgentRecord(agentId) {
-  const overrides = await readRelayAgentOverrides();
-  const override = overrides[agentId];
-  if (override) {
-    return localAgentRecordFromRelayAgentOverride(agentId, override);
-  }
-  const registry = await readLocalAgentRegistry();
-  const record = registry[agentId];
-  return record ? normalizeLocalAgentRecord(agentId, record) : null;
-}
-async function getLocalAgentConfig(agentId) {
-  const record = await resolveConfiguredLocalAgentRecord(agentId);
-  if (!record) {
-    return null;
-  }
-  return buildLocalAgentConfigState(agentId, record);
-}
-async function getLocalAgentSessionSnapshot(agentId) {
-  const record = await resolveConfiguredLocalAgentRecord(agentId);
-  if (!record) {
-    return null;
-  }
-  if (record.transport === "codex_app_server") {
-    return getCodexAppServerAgentSnapshot(buildCodexAgentSessionOptions(agentId, record));
-  }
-  if (record.transport === "claude_stream_json") {
-    return getClaudeStreamJsonAgentSnapshot(buildClaudeAgentSessionOptions(agentId, record));
-  }
-  return null;
-}
-async function getLocalAgentEndpointSessionSnapshot(endpoint) {
-  if (endpoint.transport === "codex_app_server") {
-    return getCodexAppServerAgentSnapshot(buildCodexEndpointSessionOptions(endpoint));
-  }
-  if (endpoint.transport === "claude_stream_json") {
-    return getClaudeStreamJsonAgentSnapshot(buildClaudeEndpointSessionOptions(endpoint));
-  }
-  return null;
-}
-async function ensureLocalSessionEndpointOnline(endpoint) {
-  if (endpoint.transport === "codex_app_server") {
-    await ensureCodexAppServerAgentOnline(buildCodexEndpointSessionOptions(endpoint));
-    return;
-  }
-  if (endpoint.transport === "claude_stream_json") {
-    await ensureClaudeStreamJsonAgentOnline(buildClaudeEndpointSessionOptions(endpoint));
-  }
-}
-async function shutdownLocalSessionEndpoint(endpoint) {
-  if (endpoint.transport === "codex_app_server") {
-    await shutdownCodexAppServerAgent(buildCodexEndpointSessionOptions(endpoint));
-    return;
-  }
-  if (endpoint.transport === "claude_stream_json") {
-    await shutdownClaudeStreamJsonAgent(buildClaudeEndpointSessionOptions(endpoint));
-  }
-}
-async function answerLocalAgentSessionQuestion(agentId, input) {
-  const record = await resolveConfiguredLocalAgentRecord(agentId);
-  if (!record) {
-    throw new Error(`Agent ${agentId} is not configured.`);
-  }
-  if (record.transport !== "claude_stream_json") {
-    throw new Error(`Agent ${agentId} does not support direct question answers for transport ${record.transport}.`);
-  }
-  await answerClaudeStreamJsonQuestion(buildClaudeAgentSessionOptions(agentId, record), input);
-}
-async function updateLocalAgentConfig(agentId, input) {
-  const [registry, overrides] = await Promise.all([
-    readLocalAgentRegistry(),
-    readRelayAgentOverrides()
-  ]);
-  const record = registry[agentId] ?? (overrides[agentId] ? localAgentRecordFromRelayAgentOverride(agentId, overrides[agentId]) : undefined);
-  if (!record) {
-    return null;
-  }
-  const cwd = normalizeProjectPath(input.runtime.cwd || record.cwd);
-  await assertDirectoryExists(cwd);
-  const nextHarness = normalizeLocalAgentHarness(input.runtime.harness);
-  const nextTransport = normalizeLocalAgentTransport(input.runtime.transport ?? record.transport, nextHarness);
-  const nextRecord = normalizeLocalAgentRecord(agentId, {
-    ...record,
-    cwd,
-    tmuxSession: input.runtime.sessionId,
-    harness: nextHarness,
-    defaultHarness: nextHarness,
-    harnessProfiles: {
-      ...record.harnessProfiles ?? {},
-      [normalizeManagedHarness2(input.runtime.harness, "claude")]: {
-        cwd,
-        transport: nextTransport,
-        sessionId: normalizeTmuxSessionName2(input.runtime.sessionId, `${agentId}-${normalizeManagedHarness2(input.runtime.harness, "claude")}`),
-        launchArgs: input.launchArgs
-      }
-    },
-    transport: nextTransport,
-    systemPrompt: input.systemPrompt.trim() || undefined,
-    launchArgs: input.launchArgs,
-    capabilities: input.capabilities
-  });
-  registry[agentId] = nextRecord;
-  await writeLocalAgentRegistry(registry);
-  return buildLocalAgentConfigState(agentId, nextRecord);
-}
 function buildCodexAgentSessionOptions(agentName, record, systemPrompt) {
   return {
     agentName,
@@ -8235,72 +6722,6 @@ function buildClaudeAgentSessionOptions(agentName, record, systemPrompt) {
     launchArgs: normalizeLocalAgentLaunchArgs(record.launchArgs)
   };
 }
-function endpointMetadataString(endpoint, key) {
-  const value = endpoint.metadata?.[key];
-  return typeof value === "string" && value.trim().length > 0 ? value.trim() : undefined;
-}
-function endpointInvocationPrompt(endpoint, agentName, invocation) {
-  const source = endpointMetadataString(endpoint, "source");
-  const externalSource = endpointMetadataString(endpoint, "externalSource");
-  const attachedTransport = endpointMetadataString(endpoint, "attachedTransport");
-  const sessionBacked = endpoint.metadata?.sessionBacked === true;
-  if (invocation.action === "consult" && (sessionBacked || source === "local-session" || externalSource === "local-session" || attachedTransport === "codex_app_server" || attachedTransport === "claude_stream_json")) {
-    return invocation.task;
-  }
-  if (sessionBacked) {
-    return buildAttachedSessionInvocationPrompt(invocation);
-  }
-  return buildLocalAgentDirectInvocationPrompt(agentName, invocation);
-}
-function isSessionBackedEndpoint(endpoint) {
-  const source = endpointMetadataString(endpoint, "source");
-  const externalSource = endpointMetadataString(endpoint, "externalSource");
-  const attachedTransport = endpointMetadataString(endpoint, "attachedTransport");
-  return endpoint.metadata?.sessionBacked === true || source === "local-session" || externalSource === "local-session" || attachedTransport === "codex_app_server" || attachedTransport === "claude_stream_json";
-}
-function endpointAgentName(endpoint) {
-  return endpointMetadataString(endpoint, "agentName") ?? endpointMetadataString(endpoint, "definitionId") ?? endpoint.agentId;
-}
-function endpointRuntimeInstanceId(endpoint) {
-  return endpointMetadataString(endpoint, "runtimeInstanceId") ?? endpointMetadataString(endpoint, "runtimeSessionId") ?? endpoint.sessionId ?? `relay-${endpointAgentName(endpoint)}`;
-}
-function endpointCwd(endpoint) {
-  return endpoint.cwd ?? endpoint.projectRoot ?? process.cwd();
-}
-function attachedLocalSessionSystemPrompt(endpoint) {
-  const explicit = endpointMetadataString(endpoint, "systemPrompt");
-  if (explicit) {
-    return explicit;
-  }
-  return "Resume the existing session without changing its identity or prior context.";
-}
-function buildCodexEndpointSessionOptions(endpoint) {
-  const agentName = endpointAgentName(endpoint);
-  const threadId = endpointMetadataString(endpoint, "threadId") ?? endpointMetadataString(endpoint, "externalSessionId") ?? endpoint.sessionId ?? undefined;
-  return {
-    agentName,
-    sessionId: endpointRuntimeInstanceId(endpoint),
-    cwd: endpointCwd(endpoint),
-    systemPrompt: attachedLocalSessionSystemPrompt(endpoint),
-    runtimeDirectory: relayAgentRuntimeDirectory(agentName),
-    logsDirectory: relayAgentLogsDirectory(agentName),
-    launchArgs: [],
-    threadId,
-    requireExistingThread: Boolean(threadId)
-  };
-}
-function buildClaudeEndpointSessionOptions(endpoint) {
-  const agentName = endpointAgentName(endpoint);
-  return {
-    agentName,
-    sessionId: endpointRuntimeInstanceId(endpoint),
-    cwd: endpointCwd(endpoint),
-    systemPrompt: attachedLocalSessionSystemPrompt(endpoint),
-    runtimeDirectory: relayAgentRuntimeDirectory(agentName),
-    logsDirectory: relayAgentLogsDirectory(agentName),
-    launchArgs: []
-  };
-}
 function isLocalAgentRecordOnline(agentName, record) {
   const normalizedRecord = normalizeLocalAgentRecord(agentName, record);
   if (normalizedRecord.transport === "codex_app_server") {
@@ -8319,117 +6740,12 @@ function isLocalAgentSessionAlive(sessionName) {
     return false;
   }
 }
-function isLocalAgentEndpointAlive(endpoint) {
-  if (endpoint.transport === "pairing_bridge") {
-    return endpoint.state !== "offline";
-  }
-  if (endpoint.transport === "codex_app_server") {
-    return isCodexAppServerAgentAlive(buildCodexEndpointSessionOptions(endpoint));
-  }
-  if (endpoint.transport === "claude_stream_json") {
-    return isClaudeStreamJsonAgentAlive(buildClaudeEndpointSessionOptions(endpoint));
-  }
-  const sessionId = endpoint.sessionId ?? (typeof endpoint.metadata?.tmuxSession === "string" ? String(endpoint.metadata.tmuxSession) : null);
-  return sessionId ? isLocalAgentSessionAlive(sessionId) : false;
-}
-async function readBrokerMessagesSince(sinceSeconds) {
-  const response = await fetch(new URL("/v1/snapshot", resolveBrokerUrl()));
-  if (!response.ok) {
-    throw new Error(`Broker snapshot failed: ${response.status} ${response.statusText}`);
-  }
-  const snapshot = await response.json();
-  return Object.values(snapshot.messages).filter((message) => normalizeBrokerTimestamp(message.createdAt) >= sinceSeconds).sort((lhs, rhs) => normalizeBrokerTimestamp(lhs.createdAt) - normalizeBrokerTimestamp(rhs.createdAt));
-}
 function buildLocalAgentSystemPrompt(agentName, projectName, projectPath, options = {}) {
   return renderLocalAgentSystemPromptTemplate(buildLocalAgentSystemPromptTemplate(), buildLocalAgentTemplateContext(agentName, projectName, projectPath), options);
 }
 function buildLocalAgentInitialMessage(projectName, agentName) {
   return `You are now online as the ${agentName} relay agent for ${projectName}. Announce yourself on the relay with: ${brokerRelayCommand()} send --as ${agentName} "relay agent online \u2014 ready to assist with ${projectName}"`;
 }
-function buildLocalAgentDirectInvocationPrompt(agentName, invocation) {
-  const contextLines = Object.entries(invocation.context ?? {}).map(([key, value]) => `- ${key}: ${String(value)}`);
-  const collaborationContract = buildCollaborationContractPrompt(agentName);
-  const collaborationContext = buildInvocationCollaborationContextPrompt(invocation);
-  const actionRules = invocation.action === "execute" ? "You may inspect and modify the workspace when needed. End with the concise broker-visible reply for the requester." : "Do not modify files unless the request explicitly requires it. End with the concise broker-visible reply for the requester.";
-  return [
-    `OpenScout invocation for ${agentName}.`,
-    `Requester: ${invocation.requesterId}.`,
-    `Action: ${invocation.action}.`,
-    invocation.conversationId ? `Conversation: ${invocation.conversationId}.` : undefined,
-    invocation.messageId ? `Message: ${invocation.messageId}.` : undefined,
-    "",
-    actionRules,
-    collaborationContract,
-    "Return only the reply that should be delivered back through the broker.",
-    "",
-    collaborationContext,
-    contextLines.length > 0 ? `Context:
-${contextLines.join(`
-`)}` : undefined,
-    "Task:",
-    invocation.task
-  ].filter((value) => Boolean(value && value.length > 0)).join(`
-`);
-}
-function buildAttachedSessionInvocationPrompt(invocation) {
-  const contextLines = Object.entries(invocation.context ?? {}).map(([key, value]) => `- ${key}: ${String(value)}`);
-  return [
-    `Scout message from ${invocation.requesterId}.`,
-    invocation.conversationId ? `Conversation: ${invocation.conversationId}.` : undefined,
-    invocation.messageId ? `Reply-To Message: ${invocation.messageId}.` : undefined,
-    invocation.action !== "consult" ? `Requested action: ${invocation.action}.` : undefined,
-    "Treat this as a direct message to the current session and reply normally as yourself in this session.",
-    contextLines.length > 0 ? `Context:
-${contextLines.join(`
-`)}` : undefined,
-    "",
-    invocation.task
-  ].filter((value) => Boolean(value && value.length > 0)).join(`
-`);
-}
-function buildLocalAgentNudge(agentName, invocation, flightId) {
-  const relayCommand = brokerRelayCommand();
-  const parts = [
-    `New broker ask from ${invocation.requesterId}.`,
-    `Task: ${invocation.task}`,
-    "Follow the OpenScout collaboration contract: answer directly if you can, otherwise make the next owner explicit and avoid broad wakeups."
-  ];
-  if (invocation.context && Object.keys(invocation.context).length > 0) {
-    parts.push(`Context: ${JSON.stringify(invocation.context)}`);
-  }
-  parts.push(`Read recent context if needed: ${relayCommand} read -n 20 --as ${agentName}.`);
-  parts.push(`Reply with: ${relayCommand} send --as ${agentName} "[ask:${flightId}] @${invocation.requesterId} <your response>"`);
-  return parts.join(" ");
-}
-function stripLocalAgentReplyMetadata(body, flightId, asker) {
-  return body.replace(new RegExp(`\\[ask:${escapeRegExp(flightId)}\\]`, "g"), "").replace(new RegExp(`@${escapeRegExp(asker)}`, "g"), "").trim();
-}
-async function sendLocalAgentPrompt(agentName, record, prompt) {
-  if (normalizeLocalAgentHarness(record.harness) === "codex") {
-    const promptPipe = join8(relayAgentRuntimeDirectory(agentName), "prompt.pipe");
-    await writeFile5(promptPipe, prompt.trim() + "\x00");
-    return;
-  }
-  sendTmuxPrompt(record.tmuxSession, prompt);
-}
-function sendTmuxPrompt(sessionName, prompt) {
-  const bufferName = `openscout-prompt-${randomUUID2()}`;
-  try {
-    execFileSync3("tmux", ["load-buffer", "-b", bufferName, "-"], {
-      stdio: "pipe",
-      input: prompt
-    });
-    execFileSync3("tmux", ["paste-buffer", "-d", "-b", bufferName, "-t", sessionName], {
-      stdio: "pipe"
-    });
-    execFileSync3("tmux", ["send-keys", "-t", sessionName, "Enter"], { stdio: "pipe" });
-  } catch (error) {
-    try {
-      execFileSync3("tmux", ["delete-buffer", "-b", bufferName], { stdio: "pipe" });
-    } catch {}
-    throw error;
-  }
-}
 function shellQuoteArguments(args) {
   return args.map((arg) => JSON.stringify(arg)).join(" ");
 }
@@ -9125,110 +7441,6 @@ async function ensureLocalAgentBindingOnline(agentId, nodeId, options = {}) {
   const onlineRecord = await ensureLocalAgentOnline(agentId, recordForHarness(localAgentRecordFromRelayAgentOverride(agentId, override), options.harness));
   return buildLocalAgentBinding(agentId, onlineRecord, isLocalAgentRecordOnline(agentId, onlineRecord), nodeId, "relay-agent-registry");
 }
-async function invokeLocalAgentEndpoint(endpoint, invocation) {
-  const agentRuntimeId = endpoint.agentId;
-  const definitionId = String(endpoint.metadata?.definitionId ?? endpoint.metadata?.agentName ?? endpoint.agentId);
-  const prompt = endpointInvocationPrompt(endpoint, definitionId, invocation);
-  const registry = await readLocalAgentRegistry();
-  const existing = registry[agentRuntimeId];
-  if (!existing && endpoint.transport === "codex_app_server") {
-    await ensureLocalSessionEndpointOnline(endpoint);
-    const invoke = isSessionBackedEndpoint(endpoint) ? sendCodexAppServerAgent : invokeCodexAppServerAgent;
-    const result = await invoke({
-      ...buildCodexEndpointSessionOptions(endpoint),
-      prompt,
-      timeoutMs: invocation.timeoutMs
-    });
-    return {
-      output: result.output
-    };
-  }
-  if (!existing && endpoint.transport === "claude_stream_json") {
-    await ensureLocalSessionEndpointOnline(endpoint);
-    const result = await invokeClaudeStreamJsonAgent({
-      ...buildClaudeEndpointSessionOptions(endpoint),
-      prompt,
-      timeoutMs: invocation.timeoutMs
-    });
-    return {
-      output: result.output
-    };
-  }
-  const projectRoot = endpoint.projectRoot ?? endpoint.cwd;
-  const requestedHarness = invocation.execution?.harness;
-  const record = existing ?? (projectRoot ? {
-    definitionId,
-    project: basename3(projectRoot),
-    projectRoot,
-    tmuxSession: String(endpoint.metadata?.tmuxSession ?? `relay-${agentRuntimeId}`),
-    cwd: projectRoot,
-    startedAt: nowSeconds2(),
-    harness: normalizeLocalAgentHarness(typeof endpoint.harness === "string" ? endpoint.harness : undefined),
-    defaultHarness: normalizeLocalAgentHarness(typeof endpoint.harness === "string" ? endpoint.harness : undefined),
-    harnessProfiles: {
-      [normalizeManagedHarness2(typeof endpoint.harness === "string" ? endpoint.harness : undefined, "claude")]: {
-        cwd: projectRoot,
-        sessionId: String(endpoint.sessionId ?? endpoint.metadata?.runtimeInstanceId ?? endpoint.metadata?.runtimeSessionId ?? `relay-${agentRuntimeId}`),
-        transport: normalizeLocalAgentTransport(typeof endpoint.transport === "string" ? endpoint.transport : undefined, normalizeLocalAgentHarness(typeof endpoint.harness === "string" ? endpoint.harness : undefined)),
-        launchArgs: []
-      }
-    },
-    transport: normalizeLocalAgentTransport(typeof endpoint.transport === "string" ? endpoint.transport : undefined, normalizeLocalAgentHarness(typeof endpoint.harness === "string" ? endpoint.harness : undefined)),
-    capabilities: [...DEFAULT_LOCAL_AGENT_CAPABILITIES],
-    launchArgs: []
-  } : null);
-  if (!record) {
-    throw new Error(`Agent ${agentRuntimeId} is not registered and has no project root.`);
-  }
-  const selectedRecord = recordForHarness(record, requestedHarness);
-  const onlineRecord = await ensureLocalAgentOnline(agentRuntimeId, selectedRecord);
-  if (onlineRecord.transport === "codex_app_server") {
-    const result = await invokeCodexAppServerAgent({
-      ...buildCodexAgentSessionOptions(agentRuntimeId, onlineRecord, renderLocalAgentSystemPromptTemplate(onlineRecord.systemPrompt || buildLocalAgentSystemPromptTemplate(), buildLocalAgentTemplateContext(definitionId, onlineRecord.project, onlineRecord.cwd), { transport: "codex_app_server" })),
-      prompt,
-      timeoutMs: invocation.timeoutMs
-    });
-    return {
-      output: result.output
-    };
-  }
-  if (onlineRecord.transport === "claude_stream_json") {
-    const result = await invokeClaudeStreamJsonAgent({
-      ...buildClaudeAgentSessionOptions(agentRuntimeId, onlineRecord, renderLocalAgentSystemPromptTemplate(onlineRecord.systemPrompt || buildLocalAgentSystemPromptTemplate(), buildLocalAgentTemplateContext(definitionId, onlineRecord.project, onlineRecord.cwd), { transport: "claude_stream_json" })),
-      prompt,
-      timeoutMs: invocation.timeoutMs
-    });
-    return {
-      output: result.output
-    };
-  }
-  const flightId = createLocalAgentFlightId();
-  const askedAt = nowSeconds2();
-  const timeoutSeconds = invocation.timeoutMs ? Math.max(30, Math.floor(invocation.timeoutMs / 1000)) : 300;
-  await sendLocalAgentPrompt(agentRuntimeId, onlineRecord, buildLocalAgentNudge(definitionId, invocation, flightId));
-  const deadline = Date.now() + timeoutSeconds * 1000;
-  while (Date.now() <= deadline) {
-    const messages2 = await readBrokerMessagesSince(askedAt - 1);
-    for (let index = messages2.length - 1;index >= 0; index -= 1) {
-      const message = messages2[index];
-      if (message.actorId !== agentRuntimeId)
-        continue;
-      if (!message.body.includes(`[ask:${flightId}]`))
-        continue;
-      return {
-        output: stripLocalAgentReplyMetadata(message.body, flightId, invocation.requesterId)
-      };
-    }
-    await sleep2(500);
-  }
-  throw new Error(`Timed out after ${timeoutSeconds}s waiting for ${agentRuntimeId}.`);
-}
-function shouldDisableGeneratedCodexEndpoint(endpoint) {
-  if (endpoint.transport !== "codex_exec") {
-    return false;
-  }
-  return endpoint.metadata?.source === "scout-app";
-}
 var MODULE_DIRECTORY, OPENSCOUT_REPO_ROOT, DEFAULT_LOCAL_AGENT_CAPABILITIES, DEFAULT_LOCAL_AGENT_HARNESS = "claude", SUPPORTED_LOCAL_AGENT_HARNESSES;
 var init_local_agents = __esm(async () => {
   init_src();
@@ -9326,19 +7538,41 @@ function resolveScoutAgentName(agentName) {
   }
   return resolveOperatorName();
 }
-async function resolveScoutSenderId(agentName, currentDirectory) {
+function resolveConfiguredSenderIdForProjectRoot(overrides, projectRoot) {
+  for (const [agentId, override] of Object.entries(overrides)) {
+    if (BUILT_IN_AGENT_DEFINITION_IDS.has(agentId)) {
+      continue;
+    }
+    if (!override.projectRoot || override.projectRoot !== projectRoot) {
+      continue;
+    }
+    return agentId;
+  }
+  return null;
+}
+async function inferSenderIdForProjectRoot(projectRoot) {
+  const overrides = await readRelayAgentOverrides();
+  const configuredSenderId = resolveConfiguredSenderIdForProjectRoot(overrides, projectRoot);
+  if (configuredSenderId) {
+    return configuredSenderId;
+  }
+  const projectConfig = await readProjectConfig(projectRoot);
+  const configuredDefinitionId = normalizeAgentSelectorSegment(projectConfig?.agent?.id?.trim() ?? "");
+  const definitionId = configuredDefinitionId || normalizeAgentSelectorSegment(basename4(projectRoot)) || "agent";
+  return buildRelayAgentInstance(definitionId, projectRoot).id;
+}
+async function resolveScoutSenderId(agentName, currentDirectory, env = process.env) {
   if (agentName?.trim()) {
     return agentName.trim();
   }
-  if (process.env.OPENSCOUT_AGENT?.trim()) {
-    return process.env.OPENSCOUT_AGENT.trim();
+  if (env.OPENSCOUT_AGENT?.trim()) {
+    return env.OPENSCOUT_AGENT.trim();
+  }
+  const projectRoot = await findNearestProjectRoot(currentDirectory);
+  if (!projectRoot) {
+    return resolveOperatorName();
   }
-  const { findNearestProjectRoot: findNearestProjectRoot2 } = await Promise.resolve().then(() => (init_setup(), exports_setup));
-  const { resolveLocalAgentByName: resolveLocalAgentByName2 } = await init_local_agents().then(() => exports_local_agents);
-  const projectRoot = await findNearestProjectRoot2(currentDirectory) ?? currentDirectory;
-  const projectName = basename4(projectRoot);
-  const agent = await resolveLocalAgentByName2(projectName);
-  return agent?.agentId ?? projectName;
+  return inferSenderIdForProjectRoot(projectRoot);
 }
 function parseScoutHarness(value) {
   const trimmed = value?.trim();
@@ -9912,14 +8146,17 @@ async function sendScoutMessage(input) {
   const senderId = await resolveConversationActorId(broker.baseUrl, broker.snapshot, broker.node.id, input.senderId, 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])))].sort();
+  const unresolvedTargets = mentionResolution.resolved.filter((target) => !validTargets.includes(target.agentId)).map((target) => target.label).concat(mentionResolution.unresolved).concat(mentionResolution.ambiguous.map((entry) => entry.label));
+  if (unresolvedTargets.length > 0) {
+    return { usedBroker: true, invokedTargets: [], unresolvedTargets };
+  }
   let conversation;
   if (validTargets.length === 1 && !input.channel) {
     const dm = await ensureBrokerDirectConversationBetween(broker.baseUrl, broker.snapshot, broker.node.id, senderId, validTargets[0]);
     conversation = dm.conversation;
   } else {
-    conversation = await ensureBrokerConversation(broker.baseUrl, broker.snapshot, broker.node.id, input.channel, senderId, availableTargets.map((target) => target.agentId));
+    conversation = await ensureBrokerConversation(broker.baseUrl, broker.snapshot, broker.node.id, input.channel, senderId, validTargets);
   }
-  const unresolvedTargets = mentionResolution.resolved.filter((target) => !validTargets.includes(target.agentId)).map((target) => target.label).concat(mentionResolution.unresolved).concat(mentionResolution.ambiguous.map((entry) => entry.label));
   const messageId = `m-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 6)}`;
   const speechText = input.shouldSpeak ? stripScoutAgentSelectorLabels(input.body) : "";
   const returnAddress = buildScoutReturnAddress(broker.snapshot, senderId, {
@@ -9946,27 +8183,6 @@ async function sendScoutMessage(input) {
       returnAddress
     }
   });
-  for (const targetAgentId of validTargets) {
-    await brokerPostJson(broker.baseUrl, scoutBrokerPaths.v1.invocations, {
-      id: `inv-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}`,
-      requesterId: senderId,
-      requesterNodeId: broker.node.id,
-      targetAgentId,
-      action: "consult",
-      task: input.body,
-      conversationId: conversation.id,
-      messageId,
-      execution: input.executionHarness ? { harness: input.executionHarness } : undefined,
-      ensureAwake: true,
-      stream: false,
-      createdAt: Date.now(),
-      metadata: {
-        source: "scout-cli",
-        relayChannel: input.channel ?? "shared",
-        returnAddress
-      }
-    });
-  }
   return { usedBroker: true, invokedTargets: validTargets, unresolvedTargets };
 }
 async function openScoutPeerSession(input) {
@@ -10251,7 +8467,7 @@ async function watchScoutMessages(options) {
         return;
       }
       const message = event.payload?.message;
-      if (!message || message.conversationId !== conversationId || message.actorId === options.agentId)
+      if (!message || message.conversationId !== conversationId)
         return;
       options.onMessage(message);
     };
@@ -10548,13 +8764,15 @@ async function runAskCommand(context, args) {
   await runAskWithOptions(context, options);
 }
 async function runAskWithOptions(context, options) {
+  const currentDirectory = options.currentDirectory ?? defaultScoutContextDirectory(context);
+  const senderId = await resolveScoutSenderId(options.agentName, currentDirectory, context.env);
   const result = await askScoutQuestion({
-    senderId: resolveScoutAgentName(options.agentName),
+    senderId,
     targetLabel: options.targetLabel,
     body: options.message,
     channel: options.channel,
     executionHarness: parseScoutHarness(options.harness),
-    currentDirectory: options.currentDirectory
+    currentDirectory
   });
   if (!result.usedBroker) {
     throw new Error("broker is not reachable");
@@ -10703,6 +8921,57 @@ function renderScoutActivityList(items) {
 }
 var init_broker = () => {};
 
+// ../../apps/desktop/src/cli/commands/send.ts
+var exports_send = {};
+__export(exports_send, {
+  runSendCommand: () => runSendCommand,
+  formatScoutSendRoutingError: () => formatScoutSendRoutingError
+});
+function renderTargetLabel(label) {
+  const trimmed = label.trim();
+  if (!trimmed) {
+    return "";
+  }
+  return trimmed.startsWith("@") ? trimmed : `@${trimmed}`;
+}
+function formatScoutSendRoutingError(unresolvedTargets) {
+  const rendered = unresolvedTargets.map(renderTargetLabel).filter((label) => label.length > 0);
+  if (rendered.length === 1) {
+    return `target ${rendered[0]} is not uniquely routable; nothing was sent.`;
+  }
+  return `targets ${rendered.join(", ")} are not uniquely routable; nothing was sent.`;
+}
+async function runSendCommand(context, args) {
+  const options = parseSendCommandOptions(args, defaultScoutContextDirectory(context));
+  const currentDirectory = options.currentDirectory ?? defaultScoutContextDirectory(context);
+  const senderId = await resolveScoutSenderId(options.agentName, currentDirectory, context.env);
+  const result = await sendScoutMessage({
+    senderId,
+    body: options.message,
+    channel: options.channel,
+    shouldSpeak: options.shouldSpeak,
+    executionHarness: parseScoutHarness(options.harness),
+    currentDirectory: options.currentDirectory
+  });
+  if (!result.usedBroker) {
+    throw new Error("broker is not reachable");
+  }
+  if (result.unresolvedTargets.length > 0) {
+    throw new Error(formatScoutSendRoutingError(result.unresolvedTargets));
+  }
+  context.output.writeValue({
+    message: options.message,
+    invokedTargets: result.invokedTargets,
+    unresolvedTargets: result.unresolvedTargets
+  }, renderScoutMessagePostResult);
+}
+var init_send = __esm(async () => {
+  init_context();
+  init_options();
+  init_broker();
+  await init_service();
+});
+
 // ../../apps/desktop/src/cli/commands/broadcast.ts
 var exports_broadcast = {};
 __export(exports_broadcast, {
@@ -10710,15 +8979,20 @@ __export(exports_broadcast, {
 });
 async function runBroadcastCommand(context, args) {
   const options = parseSendCommandOptions(args, defaultScoutContextDirectory(context));
+  const currentDirectory = options.currentDirectory ?? defaultScoutContextDirectory(context);
+  const senderId = await resolveScoutSenderId(options.agentName, currentDirectory, context.env);
   const result = await sendScoutMessage({
-    senderId: resolveScoutAgentName(options.agentName),
+    senderId,
     body: `@all ${options.message}`,
     executionHarness: parseScoutHarness(options.harness),
-    currentDirectory: options.currentDirectory
+    currentDirectory
   });
   if (!result.usedBroker) {
     throw new Error("broker is not reachable");
   }
+  if (result.unresolvedTargets.length > 0) {
+    throw new Error(formatScoutSendRoutingError(result.unresolvedTargets));
+  }
   context.output.writeValue({
     message: options.message,
     invokedTargets: result.invokedTargets,
@@ -10729,7 +9003,10 @@ var init_broadcast = __esm(async () => {
   init_context();
   init_options();
   init_broker();
-  await init_service();
+  await __promiseAll([
+    init_service(),
+    init_send()
+  ]);
 });
 
 // ../runtime/src/relay-agent-cards.ts
@@ -11822,7 +10099,7 @@ function resolveScoutBinPath(appRoot) {
   }
   return candidates[candidates.length - 1];
 }
-function loadScoutEnvReport(context, currentDirectory) {
+async function loadScoutEnvReport(context, currentDirectory) {
   const appRoot = resolveScoutAppRoot({
     currentDirectory,
     env: context.env
@@ -11840,6 +10117,8 @@ function loadScoutEnvReport(context, currentDirectory) {
   const binPath = resolveScoutBinPath(appRoot);
   const scoutPath = resolveCommandOnPath("scout", context.env);
   const fallbackCommand = `bun ${binPath}`;
+  const resolvedId = await resolveScoutSenderId(null, currentDirectory, context.env);
+  const projectRoot = await findNearestProjectRoot(currentDirectory);
   return {
     executable: {
       command: scoutPath ? "scout" : fallbackCommand,
@@ -11847,8 +10126,9 @@ function loadScoutEnvReport(context, currentDirectory) {
       scoutPath
     },
     agent: {
-      resolvedId: context.env.OPENSCOUT_AGENT?.trim() || "operator",
-      envAgent: context.env.OPENSCOUT_AGENT?.trim() || null
+      resolvedId,
+      envAgent: context.env.OPENSCOUT_AGENT?.trim() || null,
+      projectRoot
     },
     context: {
       cwd: context.cwd,
@@ -11875,10 +10155,11 @@ function renderScoutEnvReport(report) {
 }
 async function runEnvCommand(context, args) {
   const options = parseContextRootCommandOptions("env", args, defaultScoutContextDirectory(context));
-  const report = loadScoutEnvReport(context, options.currentDirectory);
+  const report = await loadScoutEnvReport(context, options.currentDirectory);
   context.output.writeValue(report, renderScoutEnvReport);
 }
 var init_env = __esm(async () => {
+  init_setup();
   init_context();
   init_options();
   init_paths2();
@@ -11907,6 +10188,273 @@ var init_latest = __esm(async () => {
   await init_service();
 });
 
+// ../../apps/desktop/src/cli/commands/menu.ts
+var exports_menu = {};
+__export(exports_menu, {
+  runMenuCommand: () => runMenuCommand,
+  renderMenuCommandHelp: () => renderMenuCommandHelp,
+  parseMenuCommand: () => parseMenuCommand
+});
+import { spawnSync as spawnSync2 } from "child_process";
+import { existsSync as existsSync10 } from "fs";
+import { homedir as homedir7 } from "os";
+import { dirname as dirname10, join as join15, resolve as resolve8 } from "path";
+import { fileURLToPath as fileURLToPath7 } from "url";
+function renderMenuCommandHelp() {
+  return [
+    "scout menu \u2014 macOS menu bar app",
+    "",
+    "Usage:",
+    "  scout menu",
+    "  scout menu launch",
+    "  scout menu status",
+    "  scout menu restart",
+    "  scout menu quit",
+    "  scout menu build",
+    "  scout menu dmg",
+    "",
+    "Aliases:",
+    "  launch = open = start",
+    "  quit   = stop",
+    "",
+    "Behavior:",
+    "  On macOS, `scout menu` launches the installed OpenScout menu app when available.",
+    "  When run inside an OpenScout repo checkout, it prefers `apps/macos/bin/openscout-menu.ts`",
+    "  so launch/build/restart reuse the repo helper and auto-build the app bundle if needed.",
+    "",
+    "Examples:",
+    "  scout menu",
+    "  scout menu status",
+    "  scout menu restart",
+    "  scout menu build --version 0.2.16"
+  ].join(`
+`);
+}
+function parseMenuCommand(args) {
+  const [first, ...rest] = args;
+  if (!first) {
+    return { action: "launch", passthroughArgs: [] };
+  }
+  if (first.startsWith("-")) {
+    return { action: "launch", passthroughArgs: args };
+  }
+  switch (first) {
+    case "launch":
+    case "open":
+    case "start":
+      return { action: "launch", passthroughArgs: rest };
+    case "restart":
+      return { action: "restart", passthroughArgs: rest };
+    case "quit":
+    case "stop":
+      return { action: "quit", passthroughArgs: rest };
+    case "status":
+      return { action: "status", passthroughArgs: rest };
+    case "build":
+      return { action: "build", passthroughArgs: rest };
+    case "dmg":
+      return { action: "dmg", passthroughArgs: rest };
+    default:
+      throw new ScoutCliError(`unknown subcommand: ${first} (try: scout menu)`);
+  }
+}
+function runProcess(command, args, options) {
+  const result = spawnSync2(command, args, {
+    cwd: options.cwd,
+    env: options.env,
+    encoding: "utf8"
+  });
+  if (result.error) {
+    throw new ScoutCliError(`failed to run ${command}: ${result.error.message}`);
+  }
+  const stdout = result.stdout.trim();
+  const stderr = result.stderr.trim();
+  const ok = (result.status ?? 1) === 0;
+  if (!ok && !options.allowFailure) {
+    const detail = stderr || stdout || `${command} ${args.join(" ")} failed`;
+    throw new ScoutCliError(detail);
+  }
+  return {
+    ok,
+    stdout,
+    stderr,
+    status: result.status
+  };
+}
+function findRepoMenuHelper(startDirectory) {
+  let current = resolve8(startDirectory);
+  while (true) {
+    const candidate = join15(current, "apps", "macos", "bin", "openscout-menu.ts");
+    if (existsSync10(candidate)) {
+      return candidate;
+    }
+    const parent = dirname10(current);
+    if (parent === current) {
+      break;
+    }
+    current = parent;
+  }
+  const sourceRelativeCandidate = fileURLToPath7(new URL("../../../../macos/bin/openscout-menu.ts", import.meta.url));
+  return existsSync10(sourceRelativeCandidate) ? sourceRelativeCandidate : null;
+}
+function resolveRepoBundlePath(helperPath) {
+  return resolve8(dirname10(helperPath), "..", "dist", MENU_BUNDLE_NAME);
+}
+function isMenuRunning(env) {
+  return runProcess("pgrep", ["-x", MENU_PROCESS_NAME], { env, allowFailure: true }).ok;
+}
+function stopRunningMenu(env) {
+  return runProcess("pkill", ["-x", MENU_PROCESS_NAME], { env, allowFailure: true }).ok;
+}
+function resolveInstalledMenuBundlePath(env) {
+  const spotlight = runProcess("mdfind", [`kMDItemCFBundleIdentifier == '${MENU_BUNDLE_ID}'`], { env, allowFailure: true });
+  const indexedPath = spotlight.stdout.split(`
+`).map((line) => line.trim()).find(Boolean);
+  if (indexedPath) {
+    return indexedPath;
+  }
+  for (const candidate of COMMON_MENU_BUNDLE_PATHS) {
+    if (existsSync10(candidate)) {
+      return candidate;
+    }
+  }
+  return null;
+}
+function openInstalledMenuApp(bundlePath, env) {
+  const bundleAttempts = [
+    { command: "open", args: ["-b", MENU_BUNDLE_ID] }
+  ];
+  if (bundlePath) {
+    bundleAttempts.push({ command: "open", args: [bundlePath] });
+  }
+  let lastFailure = "OpenScout Menu is not installed.";
+  for (const attempt of bundleAttempts) {
+    const result = runProcess(attempt.command, attempt.args, { env, allowFailure: true });
+    if (result.ok) {
+      return;
+    }
+    lastFailure = result.stderr || result.stdout || lastFailure;
+  }
+  throw new ScoutCliError(`${lastFailure} Run this command from the OpenScout repo to auto-build the menu app, or install the app first.`);
+}
+function renderMenuResult(result) {
+  if (result.action === "status") {
+    const lines2 = [
+      `Installed: ${result.installed ? "yes" : "no"}`,
+      `Running: ${result.running ? "yes" : "no"}`
+    ];
+    if (result.bundlePath) {
+      lines2.splice(1, 0, `Bundle: ${result.bundlePath}`);
+    }
+    if (result.helperPath) {
+      lines2.push(`Helper: ${result.helperPath}`);
+    }
+    return lines2.join(`
+`);
+  }
+  const lines = [result.message];
+  if (result.bundlePath) {
+    lines.push(`Bundle: ${result.bundlePath}`);
+  }
+  return lines.join(`
+`);
+}
+function renderActionMessage(action) {
+  switch (action) {
+    case "build":
+      return "Built the OpenScout menu app bundle.";
+    case "dmg":
+      return "Built the OpenScout menu app DMG.";
+    case "restart":
+      return "Restarted the OpenScout menu app.";
+    case "quit":
+      return "Stopped the OpenScout menu app.";
+    case "status":
+      return "Checked the OpenScout menu app status.";
+    case "launch":
+    default:
+      return "Opened the OpenScout menu app.";
+  }
+}
+function runWithRepoHelper(context, helperPath, command) {
+  runProcess(process.execPath, [helperPath, command.action, ...command.passthroughArgs], {
+    cwd: defaultScoutContextDirectory(context),
+    env: context.env
+  });
+  const bundlePath = resolveRepoBundlePath(helperPath);
+  const running = command.action === "quit" ? false : isMenuRunning(context.env);
+  const installed = existsSync10(bundlePath) || running;
+  return {
+    action: command.action,
+    mode: "repo-helper",
+    bundleId: MENU_BUNDLE_ID,
+    bundlePath,
+    helperPath,
+    installed,
+    running,
+    message: renderActionMessage(command.action)
+  };
+}
+function runWithInstalledApp(context, command) {
+  const bundlePath = resolveInstalledMenuBundlePath(context.env);
+  if (command.action === "build" || command.action === "dmg") {
+    throw new ScoutCliError(`scout menu ${command.action} requires an OpenScout repo checkout. Run from the repo root or use bun run macos:${command.action}.`);
+  }
+  switch (command.action) {
+    case "launch":
+      if (!isMenuRunning(context.env)) {
+        openInstalledMenuApp(bundlePath, context.env);
+      }
+      break;
+    case "restart":
+      stopRunningMenu(context.env);
+      openInstalledMenuApp(bundlePath, context.env);
+      break;
+    case "quit":
+      stopRunningMenu(context.env);
+      break;
+    case "status":
+      break;
+    default:
+      break;
+  }
+  const running = command.action === "quit" ? false : isMenuRunning(context.env);
+  const installed = Boolean(bundlePath) || running;
+  return {
+    action: command.action,
+    mode: "installed-app",
+    bundleId: MENU_BUNDLE_ID,
+    bundlePath,
+    helperPath: null,
+    installed,
+    running,
+    message: renderActionMessage(command.action)
+  };
+}
+async function runMenuCommand(context, args) {
+  if (HELP_FLAGS.has(args[0] ?? "")) {
+    context.output.writeText(renderMenuCommandHelp());
+    return;
+  }
+  if (process.platform !== "darwin") {
+    throw new ScoutCliError("scout menu is only supported on macOS.");
+  }
+  const command = parseMenuCommand(args);
+  const helperPath = findRepoMenuHelper(defaultScoutContextDirectory(context));
+  const result = helperPath ? runWithRepoHelper(context, helperPath, command) : runWithInstalledApp(context, command);
+  context.output.writeValue(result, renderMenuResult);
+}
+var MENU_BUNDLE_ID = "com.openscout.menu", MENU_BUNDLE_NAME = "OpenScoutMenu.app", MENU_PROCESS_NAME = "OpenScoutMenu", HELP_FLAGS, COMMON_MENU_BUNDLE_PATHS;
+var init_menu = __esm(() => {
+  init_context();
+  init_errors();
+  HELP_FLAGS = new Set(["help", "--help", "-h"]);
+  COMMON_MENU_BUNDLE_PATHS = [
+    join15("/Applications", MENU_BUNDLE_NAME),
+    join15(homedir7(), "Applications", MENU_BUNDLE_NAME)
+  ];
+});
+
 // ../runtime/src/tailscale.ts
 import { readFile as readFile8 } from "fs/promises";
 import { execFile } from "child_process";
@@ -12369,11 +10917,11 @@ var init_mesh = __esm(async () => {
 });
 
 // ../../apps/desktop/src/core/pairing/runtime/config.ts
-import { existsSync as existsSync10, mkdirSync as mkdirSync4, readFileSync as readFileSync6, writeFileSync as writeFileSync4 } from "fs";
-import { homedir as homedir7 } from "os";
+import { existsSync as existsSync11, mkdirSync as mkdirSync4, readFileSync as readFileSync6, writeFileSync as writeFileSync4 } from "fs";
+import { homedir as homedir8 } from "os";
 import path from "path";
 function pairingPaths() {
-  const rootDir = path.join(homedir7(), ".scout/pairing");
+  const rootDir = path.join(homedir8(), ".scout/pairing");
   return {
     rootDir,
     configPath: path.join(rootDir, "config.json"),
@@ -12386,7 +10934,7 @@ function pairingPaths() {
 }
 function loadPairingConfig() {
   const { configPath } = pairingPaths();
-  if (!existsSync10(configPath)) {
+  if (!existsSync11(configPath)) {
     return {};
   }
   try {
@@ -14473,11 +13021,11 @@ var init_noise = __esm(() => {
 });
 
 // ../../apps/desktop/src/core/pairing/runtime/security/identity.ts
-import { existsSync as existsSync11, mkdirSync as mkdirSync5, readFileSync as readFileSync7, writeFileSync as writeFileSync5 } from "fs";
-import { join as join15 } from "path";
-import { homedir as homedir8 } from "os";
+import { existsSync as existsSync12, mkdirSync as mkdirSync5, readFileSync as readFileSync7, writeFileSync as writeFileSync5 } from "fs";
+import { join as join16 } from "path";
+import { homedir as homedir9 } from "os";
 function loadOrCreateIdentity() {
-  if (existsSync11(IDENTITY_FILE)) {
+  if (existsSync12(IDENTITY_FILE)) {
     return loadIdentity();
   }
   return createAndSaveIdentity();
@@ -14501,7 +13049,7 @@ function createAndSaveIdentity() {
   return keyPair;
 }
 function loadTrustedPeers() {
-  if (!existsSync11(TRUSTED_PEERS_FILE))
+  if (!existsSync12(TRUSTED_PEERS_FILE))
     return new Map;
   const data = JSON.parse(readFileSync7(TRUSTED_PEERS_FILE, "utf8"));
   return new Map(data.map((p) => [p.publicKey, p]));
@@ -14537,9 +13085,9 @@ function hexToBytes2(hex) {
 var PAIRING_DIR, IDENTITY_FILE, TRUSTED_PEERS_FILE, QR_VERSION = 1, QR_EXPIRY_MS;
 var init_identity = __esm(() => {
   init_noise();
-  PAIRING_DIR = join15(homedir8(), ".scout/pairing");
-  IDENTITY_FILE = join15(PAIRING_DIR, "identity.json");
-  TRUSTED_PEERS_FILE = join15(PAIRING_DIR, "trusted-peers.json");
+  PAIRING_DIR = join16(homedir9(), ".scout/pairing");
+  IDENTITY_FILE = join16(PAIRING_DIR, "identity.json");
+  TRUSTED_PEERS_FILE = join16(PAIRING_DIR, "trusted-peers.json");
   QR_EXPIRY_MS = 5 * 60 * 1000;
 });
 
@@ -14684,10 +13232,10 @@ var init_security2 = __esm(() => {
 });
 
 // ../../apps/desktop/src/core/pairing/runtime/runtime-state.ts
-import { existsSync as existsSync12, mkdirSync as mkdirSync6, readFileSync as readFileSync8, renameSync, unlinkSync, writeFileSync as writeFileSync6 } from "fs";
+import { existsSync as existsSync13, mkdirSync as mkdirSync6, readFileSync as readFileSync8, renameSync, unlinkSync, writeFileSync as writeFileSync6 } from "fs";
 function readPairingRuntimeSnapshot() {
   const { runtimeStatePath } = pairingPaths();
-  if (!existsSync12(runtimeStatePath)) {
+  if (!existsSync13(runtimeStatePath)) {
     return null;
   }
   try {
@@ -15216,17 +13764,17 @@ var init_registry = __esm(() => {
 });
 
 // ../agent-sessions/src/adapters/claude-code.ts
-import { existsSync as existsSync13, readdirSync, statSync as statSync2 } from "fs";
-import { homedir as homedir9 } from "os";
-import { join as join16 } from "path";
+import { existsSync as existsSync14, readdirSync, statSync as statSync2 } from "fs";
+import { homedir as homedir10 } from "os";
+import { join as join17 } from "path";
 function resolveClaudeResumeContext(config) {
   const rawResumeId = config.options?.["resume"];
   const resumeId = typeof rawResumeId === "string" ? rawResumeId.trim().replace(/\.jsonl$/u, "") : "";
   if (!resumeId) {
     return null;
   }
-  const projectsRoot = join16(homedir9(), ".claude", "projects");
-  if (!existsSync13(projectsRoot)) {
+  const projectsRoot = join17(homedir10(), ".claude", "projects");
+  if (!existsSync14(projectsRoot)) {
     return null;
   }
   let projectSlugs;
@@ -15236,8 +13784,8 @@ function resolveClaudeResumeContext(config) {
     return null;
   }
   for (const slug of projectSlugs) {
-    const sessionPath = join16(projectsRoot, slug, `${resumeId}.jsonl`);
-    if (!existsSync13(sessionPath)) {
+    const sessionPath = join17(projectsRoot, slug, `${resumeId}.jsonl`);
+    if (!existsSync14(sessionPath)) {
       continue;
     }
     const cwd = decodeClaudeProjectsSlug2(slug);
@@ -15676,11 +14224,11 @@ Referenced files: ${prompt.files.join(", ")}` });
       });
     }
     answerQuestion(answer) {
-      const resolve8 = this.pendingAnswers.get(answer.blockId);
-      if (!resolve8)
+      const resolve9 = this.pendingAnswers.get(answer.blockId);
+      if (!resolve9)
         return;
       this.pendingAnswers.delete(answer.blockId);
-      resolve8(answer.answer);
+      resolve9(answer.answer);
       const turn = this.currentTurn;
       if (turn) {
         this.emit("event", {
@@ -15694,8 +14242,8 @@ Referenced files: ${prompt.files.join(", ")}` });
       }
     }
     async awaitAndSendAnswer(blockId, toolCallId) {
-      const answer = await new Promise((resolve8) => {
-        this.pendingAnswers.set(blockId, resolve8);
+      const answer = await new Promise((resolve9) => {
+        this.pendingAnswers.set(blockId, resolve9);
       });
       if (!this.process?.stdin || typeof this.process.stdin === "number")
         return;
@@ -15780,8 +14328,8 @@ Referenced files: ${prompt.files.join(", ")}` });
 // ../agent-sessions/src/adapters/codex.ts
 import { spawn as spawn4 } from "child_process";
 import { access as access3, appendFile as appendFile3, constants as constants2, mkdir as mkdir8, readFile as readFile9, rm as rm6, writeFile as writeFile7 } from "fs/promises";
-import { delimiter as delimiter2, join as join17 } from "path";
-import { homedir as homedir10 } from "os";
+import { delimiter as delimiter2, join as join18 } from "path";
+import { homedir as homedir11 } from "os";
 function parseJsonLine2(line) {
   try {
     return JSON.parse(line);
@@ -15931,7 +14479,7 @@ async function resolveCodexExecutable2() {
     "/usr/local/bin"
   ].filter(Boolean);
   for (const directory of [...pathEntries, ...commonDirectories]) {
-    const candidate = join17(directory, "codex");
+    const candidate = join18(directory, "codex");
     if (await isExecutable2(candidate)) {
       return candidate;
     }
@@ -16035,7 +14583,7 @@ var init_codex = __esm(() => {
       this.pendingRequests.clear();
       if (child && child.exitCode === null && !child.killed) {
         child.kill("SIGTERM");
-        await new Promise((resolve8) => setTimeout(resolve8, 250));
+        await new Promise((resolve9) => setTimeout(resolve9, 250));
         if (child.exitCode === null && !child.killed) {
           child.kill("SIGKILL");
         }
@@ -16044,7 +14592,7 @@ var init_codex = __esm(() => {
       await this.persistState();
     }
     get codexOptions() {
-      const runtimeRoot = join17(homedir10(), ".scout/pairing", "codex", this.session.id);
+      const runtimeRoot = join18(homedir11(), ".scout/pairing", "codex", this.session.id);
       const configuredThreadId = this.config.options?.["threadId"];
       const requireExistingThread = this.config.options?.["requireExistingThread"];
       const rawLaunchArgs = this.config.options?.["launchArgs"];
@@ -16054,8 +14602,8 @@ var init_codex = __esm(() => {
         sessionId: this.session.id,
         cwd: this.config.cwd ?? process.cwd(),
         systemPrompt: this.systemPrompt,
-        runtimeDirectory: join17(runtimeRoot, "runtime"),
-        logsDirectory: join17(runtimeRoot, "logs"),
+        runtimeDirectory: join18(runtimeRoot, "runtime"),
+        logsDirectory: join18(runtimeRoot, "logs"),
         launchArgs,
         threadId: typeof configuredThreadId === "string" && configuredThreadId.trim().length > 0 ? configuredThreadId.trim() : undefined,
         requireExistingThread: requireExistingThread ?? Boolean(configuredThreadId)
@@ -16066,16 +14614,16 @@ var init_codex = __esm(() => {
       return typeof raw === "string" && raw.trim().length > 0 ? raw : "You are a helpful agent working through Pairing.";
     }
     get threadIdPath() {
-      return join17(this.codexOptions.runtimeDirectory, "codex-thread-id.txt");
+      return join18(this.codexOptions.runtimeDirectory, "codex-thread-id.txt");
     }
     get statePath() {
-      return join17(this.codexOptions.runtimeDirectory, "state.json");
+      return join18(this.codexOptions.runtimeDirectory, "state.json");
     }
     get stdoutLogPath() {
-      return join17(this.codexOptions.logsDirectory, "stdout.log");
+      return join18(this.codexOptions.logsDirectory, "stdout.log");
     }
     get stderrLogPath() {
-      return join17(this.codexOptions.logsDirectory, "stderr.log");
+      return join18(this.codexOptions.logsDirectory, "stderr.log");
     }
     enqueue(task) {
       const next = this.serialized.then(task, task);
@@ -16104,7 +14652,7 @@ var init_codex = __esm(() => {
       const options = this.codexOptions;
       await mkdir8(options.runtimeDirectory, { recursive: true });
       await mkdir8(options.logsDirectory, { recursive: true });
-      await writeFile7(join17(options.runtimeDirectory, "prompt.txt"), options.systemPrompt);
+      await writeFile7(join18(options.runtimeDirectory, "prompt.txt"), options.systemPrompt);
       const codexExecutable = await resolveCodexExecutable2();
       const child = spawn4(codexExecutable, ["app-server", ...options.launchArgs], {
         cwd: options.cwd,
@@ -16821,9 +15369,9 @@ var init_codex = __esm(() => {
     }
     async request(method, params) {
       const id = String(this.nextRequestId++);
-      return new Promise((resolve8, reject) => {
+      return new Promise((resolve9, reject) => {
         this.pendingRequests.set(id, {
-          resolve: (value) => resolve8(value),
+          resolve: (value) => resolve9(value),
           reject
         });
         try {
@@ -18178,8 +16726,8 @@ var init_echo = __esm(() => {
           blockId: actionId,
           approval: { version: 1, description: `Run echo tool with: ${text}`, risk: "low" }
         });
-        const decision = await new Promise((resolve8) => {
-          this.pendingApprovals.set(this.approvalKey(turnId, actionId), { resolve: resolve8 });
+        const decision = await new Promise((resolve9) => {
+          this.pendingApprovals.set(this.approvalKey(turnId, actionId), { resolve: resolve9 });
         });
         if (this.interrupted) {
           this.emitTurnEnd(sessionId, turnId, "stopped");
@@ -18254,7 +16802,7 @@ var init_echo = __esm(() => {
     delay() {
       if (this.stepDelay <= 0)
         return Promise.resolve();
-      return new Promise((resolve8) => setTimeout(resolve8, this.stepDelay));
+      return new Promise((resolve9) => setTimeout(resolve9, this.stepDelay));
     }
   };
 });
@@ -18273,8 +16821,8 @@ var init_src2 = __esm(() => {
 
 // ../../apps/desktop/src/core/pairing/runtime/bridge/log.ts
 import { appendFileSync, mkdirSync as mkdirSync7 } from "fs";
-import { join as join18 } from "path";
-import { homedir as homedir11 } from "os";
+import { join as join19 } from "path";
+import { homedir as homedir12 } from "os";
 function write(level, category, message, data) {
   const ts = new Date().toISOString().slice(11, 23);
   const lvl = level.toUpperCase().padEnd(5);
@@ -18290,8 +16838,8 @@ function write(level, category, message, data) {
 }
 var LOG_DIR, LOG_FILE, log;
 var init_log = __esm(() => {
-  LOG_DIR = join18(homedir11(), ".scout/pairing");
-  LOG_FILE = join18(LOG_DIR, "bridge.log");
+  LOG_DIR = join19(homedir12(), ".scout/pairing");
+  LOG_FILE = join19(LOG_DIR, "bridge.log");
   mkdirSync7(LOG_DIR, { recursive: true });
   log = {
     debug: (cat, msg, data) => write("debug", cat, msg, data),
@@ -18367,11 +16915,11 @@ var init_bridge = __esm(() => {
 });
 
 // ../../apps/desktop/src/core/pairing/runtime/bridge/config.ts
-import { existsSync as existsSync14, readFileSync as readFileSync9 } from "fs";
-import { join as join19 } from "path";
-import { homedir as homedir12 } from "os";
+import { existsSync as existsSync15, readFileSync as readFileSync9 } from "fs";
+import { join as join20 } from "path";
+import { homedir as homedir13 } from "os";
 function loadConfigFile() {
-  if (!existsSync14(CONFIG_FILE)) {
+  if (!existsSync15(CONFIG_FILE)) {
     return {};
   }
   try {
@@ -18432,17 +16980,17 @@ var init_config3 = __esm(() => {
     port: 7888,
     secure: true
   };
-  CONFIG_DIR = join19(homedir12(), ".scout/pairing");
-  CONFIG_FILE = join19(CONFIG_DIR, "config.json");
+  CONFIG_DIR = join20(homedir13(), ".scout/pairing");
+  CONFIG_FILE = join20(CONFIG_DIR, "config.json");
 });
 
 // ../../apps/desktop/src/core/pairing/runtime/bridge/fileserver.ts
 import { isAbsolute as isAbsolute2 } from "path";
-import { homedir as homedir13 } from "os";
+import { homedir as homedir14 } from "os";
 function isAllowedPath(filePath) {
   if (!isAbsolute2(filePath))
     return false;
-  const relToHome = filePath.slice(homedir13().length + 1);
+  const relToHome = filePath.slice(homedir14().length + 1);
   if (relToHome.startsWith(".") && !relToHome.startsWith(".claude") && !relToHome.startsWith(".scout/pairing")) {
     return false;
   }
@@ -18501,16 +17049,16 @@ function serveFile(url) {
 }
 var ALLOWED_ROOTS;
 var init_fileserver = __esm(() => {
-  ALLOWED_ROOTS = [homedir13(), "/tmp"];
+  ALLOWED_ROOTS = [homedir14(), "/tmp"];
 });
 
 // ../../apps/desktop/src/server/db-queries.ts
 import { Database } from "bun:sqlite";
-import { homedir as homedir14 } from "os";
-import { join as join20 } from "path";
+import { homedir as homedir15 } from "os";
+import { join as join21 } from "path";
 function resolveDbPath() {
-  const controlHome = process.env.OPENSCOUT_CONTROL_HOME ?? join20(homedir14(), ".openscout", "control-plane");
-  return join20(controlHome, "control-plane.sqlite");
+  const controlHome = process.env.OPENSCOUT_CONTROL_HOME ?? join21(homedir15(), ".openscout", "control-plane");
+  return join21(controlHome, "control-plane.sqlite");
 }
 function db() {
   if (!_db) {
@@ -18752,11 +17300,11 @@ function queryMobileAgentDetail(agentId) {
 }
 var _db = null, HOME;
 var init_db_queries = __esm(() => {
-  HOME = homedir14();
+  HOME = homedir15();
 });
 
 // ../../apps/desktop/src/core/mobile/service.ts
-import { basename as basename6, resolve as resolve8 } from "path";
+import { basename as basename6, resolve as resolve9 } from "path";
 function normalizeTimestamp(value) {
   if (!value)
     return null;
@@ -19145,7 +17693,7 @@ async function createScoutSession(input, currentDirectory, deviceId) {
   if (!rawWorkspaceId) {
     throw new Error(`Invalid workspaceId.`);
   }
-  const workspaceRoot = resolve8(rawWorkspaceId);
+  const workspaceRoot = resolve9(rawWorkspaceId);
   const projectName = basename6(workspaceRoot) || workspaceRoot;
   const workspace = {
     id: workspaceRoot,
@@ -19255,17 +17803,17 @@ async function deriveNewAgentName(projectName, branch, harness) {
 }
 async function createGitWorktree(projectRoot, agentName) {
   const { execSync: execSync2 } = await import("child_process");
-  const { join: join21 } = await import("path");
-  const { mkdirSync: mkdirSync8, existsSync: existsSync15 } = await import("fs");
+  const { join: join22 } = await import("path");
+  const { mkdirSync: mkdirSync8, existsSync: existsSync16 } = await import("fs");
   try {
     execSync2("git rev-parse --git-dir", { cwd: projectRoot, stdio: "pipe" });
   } catch {
     return null;
   }
   const branchName = `scout/${agentName}`;
-  const worktreeDir = join21(projectRoot, ".scout-worktrees");
-  const worktreePath = join21(worktreeDir, agentName);
-  if (existsSync15(worktreePath)) {
+  const worktreeDir = join22(projectRoot, ".scout-worktrees");
+  const worktreePath = join22(worktreeDir, agentName);
+  if (existsSync16(worktreePath)) {
     return { path: worktreePath, branch: branchName };
   }
   mkdirSync8(worktreeDir, { recursive: true });
@@ -19310,8 +17858,8 @@ var init_service5 = __esm(async () => {
 // ../../apps/desktop/src/core/pairing/runtime/bridge/server.ts
 import { readdirSync as readdirSync2, readFileSync as readFileSync10, realpathSync, statSync as statSync3 } from "fs";
 import { execSync as execSync2 } from "child_process";
-import { basename as basename7, isAbsolute as isAbsolute3, join as join21, relative as relative2 } from "path";
-import { homedir as homedir15 } from "os";
+import { basename as basename7, isAbsolute as isAbsolute3, join as join22, relative as relative2 } from "path";
+import { homedir as homedir16 } from "os";
 function replaySyncEvents(bridge, sessionId, lastSeq) {
   return bridge.replay(sessionId, lastSeq);
 }
@@ -19765,13 +18313,13 @@ function resolveMobileCurrentDirectory() {
   }
 }
 function resolveWorkspaceRoot(root) {
-  const expandedRoot = root.replace(/^~/, homedir15());
+  const expandedRoot = root.replace(/^~/, homedir16());
   return realpathSync(expandedRoot);
 }
 function resolveWorkspacePath(root, requestedPath) {
   const normalizedRoot = resolveWorkspaceRoot(root);
-  const expandedPath = requestedPath?.replace(/^~/, homedir15());
-  const candidate = expandedPath ? isAbsolute3(expandedPath) ? expandedPath : join21(normalizedRoot, expandedPath) : normalizedRoot;
+  const expandedPath = requestedPath?.replace(/^~/, homedir16());
+  const candidate = expandedPath ? isAbsolute3(expandedPath) ? expandedPath : join22(normalizedRoot, expandedPath) : normalizedRoot;
   const resolvedCandidate = realpathSync(candidate);
   const rel = relative2(normalizedRoot, resolvedCandidate);
   if (rel === "" || !rel.startsWith("..") && !isAbsolute3(rel)) {
@@ -19786,7 +18334,7 @@ function listDirectories(dirPath) {
       continue;
     if (name === "node_modules" || name === ".build" || name === "target")
       continue;
-    const fullPath = join21(dirPath, name);
+    const fullPath = join22(dirPath, name);
     try {
       const stat4 = statSync3(fullPath);
       if (!stat4.isDirectory())
@@ -19809,7 +18357,7 @@ function listDirectories(dirPath) {
   return entries.sort((a, b) => a.name.localeCompare(b.name));
 }
 async function discoverSessionFiles(maxAgeDays, limit) {
-  const home = homedir15();
+  const home = homedir16();
   const results = [];
   const searchPaths = [
     { pattern: `${home}/.claude/projects`, agent: "claude-code" },
@@ -34717,8 +33265,8 @@ var init_zod = __esm(() => {
 // ../../apps/desktop/src/core/pairing/runtime/bridge/router.ts
 import { readFileSync as readFileSync11, readdirSync as readdirSync3, realpathSync as realpathSync2, statSync as statSync4 } from "fs";
 import { execSync as execSync3 } from "child_process";
-import { basename as basename8, isAbsolute as isAbsolute4, join as join22, relative as relative3 } from "path";
-import { homedir as homedir16 } from "os";
+import { basename as basename8, isAbsolute as isAbsolute4, join as join23, relative as relative3 } from "path";
+import { homedir as homedir17 } from "os";
 function resolveMobileCurrentDirectory2() {
   const config2 = resolveConfig();
   const configuredRoot = config2.workspace?.root;
@@ -34731,13 +33279,13 @@ function resolveMobileCurrentDirectory2() {
   }
 }
 function resolveWorkspaceRoot2(root) {
-  const expandedRoot = root.replace(/^~/, homedir16());
+  const expandedRoot = root.replace(/^~/, homedir17());
   return realpathSync2(expandedRoot);
 }
 function resolveWorkspacePath2(root, requestedPath) {
   const normalizedRoot = resolveWorkspaceRoot2(root);
-  const expandedPath = requestedPath?.replace(/^~/, homedir16());
-  const candidate = expandedPath ? isAbsolute4(expandedPath) ? expandedPath : join22(normalizedRoot, expandedPath) : normalizedRoot;
+  const expandedPath = requestedPath?.replace(/^~/, homedir17());
+  const candidate = expandedPath ? isAbsolute4(expandedPath) ? expandedPath : join23(normalizedRoot, expandedPath) : normalizedRoot;
   const resolvedCandidate = realpathSync2(candidate);
   const rel = relative3(normalizedRoot, resolvedCandidate);
   if (rel === "" || !rel.startsWith("..") && !isAbsolute4(rel)) {
@@ -34752,7 +33300,7 @@ function listDirectories2(dirPath) {
       continue;
     if (name === "node_modules" || name === ".build" || name === "target")
       continue;
-    const fullPath = join22(dirPath, name);
+    const fullPath = join23(dirPath, name);
     try {
       const stat4 = statSync4(fullPath);
       if (!stat4.isDirectory())
@@ -34791,7 +33339,7 @@ function detectAgent2(filePath) {
   return "unknown";
 }
 async function discoverSessionFiles2(maxAgeDays, limit) {
-  const home = homedir16();
+  const home = homedir17();
   const results = [];
   const searchPaths = [
     { pattern: `${home}/.claude/projects`, agent: "claude-code" },
@@ -34873,23 +33421,23 @@ function bridgeEventIterable(bridge, signal) {
   return {
     [Symbol.asyncIterator]() {
       const buffer = [];
-      let resolve9 = null;
+      let resolve10 = null;
       let done = false;
       const unsub = bridge.onEvent((event) => {
         if (done)
           return;
         buffer.push(event);
-        if (resolve9) {
-          resolve9();
-          resolve9 = null;
+        if (resolve10) {
+          resolve10();
+          resolve10 = null;
         }
       });
       const cleanup = () => {
         done = true;
         unsub();
-        if (resolve9) {
-          resolve9();
-          resolve9 = null;
+        if (resolve10) {
+          resolve10();
+          resolve10 = null;
         }
       };
       signal?.addEventListener("abort", cleanup, { once: true });
@@ -34902,7 +33450,7 @@ function bridgeEventIterable(bridge, signal) {
               return { done: false, value: buffer.shift() };
             }
             await new Promise((r) => {
-              resolve9 = r;
+              resolve10 = r;
             });
           }
         },
@@ -37620,15 +36168,15 @@ function resolveSelfTuple(promise2) {
   return Unpromise.proxy(promise2).then(() => [promise2]);
 }
 function withResolvers() {
-  let resolve9;
+  let resolve10;
   let reject;
   const promise2 = new Promise((_resolve, _reject) => {
-    resolve9 = _resolve;
+    resolve10 = _resolve;
     reject = _reject;
   });
   return {
     promise: promise2,
-    resolve: resolve9,
+    resolve: resolve10,
     reject
   };
 }
@@ -37667,8 +36215,8 @@ function timerResource(ms) {
   return makeResource({ start() {
     if (timer)
       throw new Error("Timer already started");
-    const promise2 = new Promise((resolve9) => {
-      timer = setTimeout(() => resolve9(disposablePromiseTimerResult), ms);
+    const promise2 = new Promise((resolve10) => {
+      timer = setTimeout(() => resolve10(disposablePromiseTimerResult), ms);
     });
     return promise2;
   } }, () => {
@@ -37717,15 +36265,15 @@ function _takeWithGrace() {
   return _takeWithGrace.apply(this, arguments);
 }
 function createDeferred() {
-  let resolve9;
+  let resolve10;
   let reject;
   const promise2 = new Promise((res, rej) => {
-    resolve9 = res;
+    resolve10 = res;
     reject = rej;
   });
   return {
     promise: promise2,
-    resolve: resolve9,
+    resolve: resolve10,
     reject
   };
 }
@@ -38701,8 +37249,8 @@ var import_objectSpread2$13, jsonContentTypeHandler, formDataContentTypeHandler,
         status: "fulfilled",
         value
       };
-      subscribers === null || subscribers === undefined || subscribers.forEach(({ resolve: resolve9 }) => {
-        resolve9(value);
+      subscribers === null || subscribers === undefined || subscribers.forEach(({ resolve: resolve10 }) => {
+        resolve10(value);
       });
     });
     if ("catch" in thenReturn)
@@ -39433,14 +37981,14 @@ var init_observable = __esm(() => {
 
 // ../../apps/desktop/src/core/pairing/runtime/bridge/server-trpc.ts
 import { realpathSync as realpathSync3 } from "fs";
-import { homedir as homedir17 } from "os";
+import { homedir as homedir18 } from "os";
 function resolveCurrentDirectory() {
   try {
     const config2 = resolveConfig();
     const configuredRoot = config2.workspace?.root;
     if (!configuredRoot)
       return process.cwd();
-    const expanded = configuredRoot.replace(/^~/, homedir17());
+    const expanded = configuredRoot.replace(/^~/, homedir18());
     return realpathSync3(expanded);
   } catch {
     return process.cwd();
@@ -39558,8 +38106,8 @@ function startBridgeServerTRPC(options) {
           }
           const iterable = isObservable(result) ? observableToAsyncIterable(result, abortController.signal) : result;
           const iterator = iterable[Symbol.asyncIterator]();
-          const abortPromise = new Promise((resolve9) => {
-            abortController.signal.addEventListener("abort", () => resolve9("abort"), {
+          const abortPromise = new Promise((resolve10) => {
+            abortController.signal.addEventListener("abort", () => resolve10("abort"), {
               once: true
             });
           });
@@ -39856,7 +38404,7 @@ var init_server_trpc = __esm(async () => {
 });
 
 // ../../apps/desktop/src/core/pairing/runtime/runtime.ts
-import { homedir as homedir18 } from "os";
+import { homedir as homedir19 } from "os";
 function createPairingAdapterRegistry(configAdapters) {
   const adapters = {
     "claude-code": createAdapter,
@@ -39933,7 +38481,7 @@ async function autoStartConfiguredSessions(bridge, sessions3) {
     try {
       const session = await bridge.createSession(entry.adapter, {
         name: entry.name,
-        cwd: entry.cwd?.replace(/^~/, homedir18()),
+        cwd: entry.cwd?.replace(/^~/, homedir19()),
         options: entry.options
       });
       console.log(`[bridge] session started: ${session.name} (${entry.adapter})`);
@@ -40204,11 +38752,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 existsSync15, mkdirSync as mkdirSync9, readdirSync as readdirSync4 } from "fs";
-import { homedir as homedir19 } from "os";
-import { join as join23 } from "path";
+import { existsSync as existsSync16, mkdirSync as mkdirSync9, readdirSync as readdirSync4 } from "fs";
+import { homedir as homedir20 } from "os";
+import { join as join24 } from "path";
 function findStoredCerts() {
-  if (!existsSync15(PAIRING_DIR2)) {
+  if (!existsSync16(PAIRING_DIR2)) {
     return null;
   }
   try {
@@ -40222,8 +38770,8 @@ function findStoredCerts() {
       return null;
     }
     return {
-      cert: join23(PAIRING_DIR2, certFile),
-      key: join23(PAIRING_DIR2, keyFile)
+      cert: join24(PAIRING_DIR2, certFile),
+      key: join24(PAIRING_DIR2, keyFile)
     };
   } catch {
     return null;
@@ -40244,8 +38792,8 @@ function getTailscaleHostname() {
 }
 function generateTailscaleCerts(hostname5) {
   mkdirSync9(PAIRING_DIR2, { recursive: true });
-  const certPath = join23(PAIRING_DIR2, `${hostname5}.crt`);
-  const keyPath = join23(PAIRING_DIR2, `${hostname5}.key`);
+  const certPath = join24(PAIRING_DIR2, `${hostname5}.crt`);
+  const keyPath = join24(PAIRING_DIR2, `${hostname5}.key`);
   try {
     pairingLog.info("relay", "generating tailscale TLS cert", { hostname: hostname5 });
     execSync4(`tailscale cert --cert-file "${certPath}" --key-file "${keyPath}" "${hostname5}"`, {
@@ -40261,8 +38809,8 @@ function generateTailscaleCerts(hostname5) {
 }
 function generateSelfSignedCert(hostname5) {
   mkdirSync9(PAIRING_DIR2, { recursive: true });
-  const certPath = join23(PAIRING_DIR2, `${hostname5}.crt`);
-  const keyPath = join23(PAIRING_DIR2, `${hostname5}.key`);
+  const certPath = join24(PAIRING_DIR2, `${hostname5}.crt`);
+  const keyPath = join24(PAIRING_DIR2, `${hostname5}.key`);
   try {
     execSync4(`openssl req -x509 -newkey ec -pkeyopt ec_paramgen_curve:prime256v1 ` + `-keyout "${keyPath}" -out "${certPath}" -days 365 -nodes ` + `-subj "/CN=${hostname5}" -addext "subjectAltName=DNS:${hostname5}"`, {
       stdio: ["pipe", "pipe", "pipe"],
@@ -40325,7 +38873,7 @@ function startManagedRelay(port = 7889) {
 var PAIRING_DIR2;
 var init_relay_runtime = __esm(() => {
   init_log2();
-  PAIRING_DIR2 = join23(homedir19(), ".scout/pairing");
+  PAIRING_DIR2 = join24(homedir20(), ".scout/pairing");
 });
 
 // ../../node_modules/.bun/uqr@0.1.3/node_modules/uqr/dist/index.mjs
@@ -41190,8 +39738,8 @@ async function runPairCommand(context, args) {
   process.on("SIGINT", handleSignal);
   process.on("SIGTERM", handleSignal);
   try {
-    await new Promise((resolve9) => {
-      controller.signal.addEventListener("abort", () => resolve9(), { once: true });
+    await new Promise((resolve10) => {
+      controller.signal.addEventListener("abort", () => resolve10(), { once: true });
     });
   } finally {
     process.off("SIGINT", handleSignal);
@@ -41254,39 +39802,6 @@ var init_runtimes = __esm(() => {
   init_service3();
 });
 
-// ../../apps/desktop/src/cli/commands/send.ts
-var exports_send = {};
-__export(exports_send, {
-  runSendCommand: () => runSendCommand
-});
-async function runSendCommand(context, args) {
-  const options = parseSendCommandOptions(args, defaultScoutContextDirectory(context));
-  const currentDirectory = options.currentDirectory ?? defaultScoutContextDirectory(context);
-  const senderId = await resolveScoutSenderId(options.agentName, currentDirectory);
-  const result = await sendScoutMessage({
-    senderId,
-    body: options.message,
-    channel: options.channel,
-    shouldSpeak: options.shouldSpeak,
-    executionHarness: parseScoutHarness(options.harness),
-    currentDirectory: options.currentDirectory
-  });
-  if (!result.usedBroker) {
-    throw new Error("broker is not reachable");
-  }
-  context.output.writeValue({
-    message: options.message,
-    invokedTargets: result.invokedTargets,
-    unresolvedTargets: result.unresolvedTargets
-  }, renderScoutMessagePostResult);
-}
-var init_send = __esm(async () => {
-  init_context();
-  init_options();
-  init_broker();
-  await init_service();
-});
-
 // ../../apps/desktop/src/cli/commands/server.ts
 var exports_server = {};
 __export(exports_server, {
@@ -41297,9 +39812,9 @@ __export(exports_server, {
   normalizeServerOpenPath: () => normalizeServerOpenPath
 });
 import { spawn as spawn5 } from "child_process";
-import { existsSync as existsSync16 } from "fs";
-import { dirname as dirname10, join as join24, resolve as resolve9 } from "path";
-import { fileURLToPath as fileURLToPath7 } from "url";
+import { existsSync as existsSync17 } from "fs";
+import { dirname as dirname11, join as join25, resolve as resolve10 } from "path";
+import { fileURLToPath as fileURLToPath8 } from "url";
 function renderServerCommandHelp() {
   return [
     "scout server \u2014 desktop web UI (Bun runtime)",
@@ -41332,25 +39847,25 @@ function renderServerCommandHelp() {
 `);
 }
 function resolveScoutWebServerEntry() {
-  const mainDir = dirname10(fileURLToPath7(import.meta.url));
-  const bundled = join24(mainDir, "scout-web-server.mjs");
-  if (existsSync16(bundled)) {
+  const mainDir = dirname11(fileURLToPath8(import.meta.url));
+  const bundled = join25(mainDir, "scout-web-server.mjs");
+  if (existsSync17(bundled)) {
     return bundled;
   }
-  const source = fileURLToPath7(new URL("../../server/index.ts", import.meta.url));
-  if (existsSync16(source)) {
+  const source = fileURLToPath8(new URL("../../server/index.ts", import.meta.url));
+  if (existsSync17(source)) {
     return source;
   }
   throw new ScoutCliError("Could not find Scout web server entry. Rebuild @openscout/scout or run from the OpenScout repository.");
 }
 function resolveScoutControlPlaneWebServerEntry() {
-  const mainDir = dirname10(fileURLToPath7(import.meta.url));
-  const bundled = join24(mainDir, "scout-control-plane-web.mjs");
-  if (existsSync16(bundled)) {
+  const mainDir = dirname11(fileURLToPath8(import.meta.url));
+  const bundled = join25(mainDir, "scout-control-plane-web.mjs");
+  if (existsSync17(bundled)) {
     return bundled;
   }
-  const source = fileURLToPath7(new URL("../../server/control-plane-index.ts", import.meta.url));
-  if (existsSync16(source)) {
+  const source = fileURLToPath8(new URL("../../server/control-plane-index.ts", import.meta.url));
+  if (existsSync17(source)) {
     return source;
   }
   throw new ScoutCliError("Could not find Scout control-plane web server entry. Rebuild @openscout/scout or run from the OpenScout repository.");
@@ -41424,10 +39939,10 @@ function parseServerFlags(args) {
   return { env, openPath };
 }
 function resolveBundledStaticClientRoot(entry, mode) {
-  const entryDir = dirname10(entry);
-  const clientDirectory = mode === "control-plane" ? join24(entryDir, "control-plane-client") : join24(entryDir, "client");
-  const indexPath = join24(clientDirectory, "index.html");
-  return existsSync16(indexPath) ? clientDirectory : null;
+  const entryDir = dirname11(entry);
+  const clientDirectory = mode === "control-plane" ? join25(entryDir, "control-plane-client") : join25(entryDir, "client");
+  const indexPath = join25(clientDirectory, "index.html");
+  return existsSync17(indexPath) ? clientDirectory : null;
 }
 function buildMergedServerEnv(entry, mode, flagEnv) {
   const bundledStaticClientRoot = resolveBundledStaticClientRoot(entry, mode);
@@ -41493,7 +40008,7 @@ function resolveServerPort(env) {
   return port;
 }
 function resolveExpectedCurrentDirectory(env) {
-  return resolve9(env.OPENSCOUT_SETUP_CWD?.trim() || process.cwd());
+  return resolve10(env.OPENSCOUT_SETUP_CWD?.trim() || process.cwd());
 }
 function renderModeLabel(mode) {
   return mode === "control-plane" ? "Scout control plane" : "Scout";
@@ -41617,7 +40132,7 @@ async function waitForScoutServer(port, mode, expectedCurrentDirectory) {
   while (Date.now() < deadline) {
     const probe = await probeScoutServer(port);
     if (probe.status === "healthy") {
-      const actualCurrentDirectory = resolve9(probe.health.currentDirectory);
+      const actualCurrentDirectory = resolve10(probe.health.currentDirectory);
       if (probe.health.surface !== mode) {
         throw new ScoutCliError(`port ${port} is serving Scout ${renderSurfaceLabel(probe.health.surface)}, not ${renderModeLabel(mode)}.`);
       }
@@ -41639,7 +40154,7 @@ async function openScoutServer(options) {
   const browserUrl = new URL(normalizeServerOpenPath(options.openPath), `http://127.0.0.1:${port}`).toString();
   const probe = await probeScoutServer(port);
   if (probe.status === "healthy") {
-    const actualCurrentDirectory = resolve9(probe.health.currentDirectory);
+    const actualCurrentDirectory = resolve10(probe.health.currentDirectory);
     if (probe.health.surface !== options.mode) {
       throw new ScoutCliError(`port ${port} is already serving Scout ${renderSurfaceLabel(probe.health.surface)}, not ${renderModeLabel(options.mode)}.`);
     }
@@ -41720,8 +40235,8 @@ var init_server2 = __esm(() => {
 });
 
 // ../../apps/desktop/src/cli/commands/setup.ts
-var exports_setup2 = {};
-__export(exports_setup2, {
+var exports_setup = {};
+__export(exports_setup, {
   runSetupCommand: () => runSetupCommand
 });
 async function runSetupCommand(context, args) {
@@ -41743,7 +40258,7 @@ __export(exports_speak, {
 async function runSpeakCommand(context, args) {
   const options = parseSendCommandOptions(args, defaultScoutContextDirectory(context));
   const currentDirectory = options.currentDirectory ?? defaultScoutContextDirectory(context);
-  const senderId = await resolveScoutSenderId(options.agentName, currentDirectory);
+  const senderId = await resolveScoutSenderId(options.agentName, currentDirectory, context.env);
   const config3 = await loadScoutRelayConfig();
   const voice = getScoutVoiceForChannel(config3, "voice");
   await acquireScoutOnAir(senderId);
@@ -41766,6 +40281,9 @@ async function runSpeakCommand(context, args) {
   if (!result.usedBroker) {
     throw new Error("broker is not reachable");
   }
+  if (result.unresolvedTargets.length > 0) {
+    throw new Error(formatScoutSendRoutingError(result.unresolvedTargets));
+  }
   context.output.writeValue({
     message: options.message,
     invokedTargets: result.invokedTargets,
@@ -41776,7 +40294,10 @@ var init_speak = __esm(async () => {
   init_context();
   init_options();
   init_broker();
-  await init_service();
+  await __promiseAll([
+    init_service(),
+    init_send()
+  ]);
 });
 
 // ../../node_modules/.bun/@opentui+core@0.1.96+a7e4efcb39f2fc50/node_modules/@opentui/core/assets/javascript/highlights.scm
@@ -41828,11 +40349,11 @@ import { EventEmitter } from "events";
 import { Buffer as Buffer2 } from "buffer";
 import { Buffer as Buffer3 } from "buffer";
 import { EventEmitter as EventEmitter2 } from "events";
-import { resolve as resolve10, dirname as dirname11 } from "path";
-import { fileURLToPath as fileURLToPath8 } from "url";
+import { resolve as resolve11, dirname as dirname12 } from "path";
+import { fileURLToPath as fileURLToPath9 } from "url";
 import { resolve as resolve22, isAbsolute as isAbsolute5, parse as parse6 } from "path";
-import { existsSync as existsSync17 } from "fs";
-import { basename as basename9, join as join25 } from "path";
+import { existsSync as existsSync18 } from "fs";
+import { basename as basename9, join as join26 } from "path";
 import os from "os";
 import path2 from "path";
 import { EventEmitter as EventEmitter3 } from "events";
@@ -44964,13 +43485,13 @@ class DebounceController {
   }
   debounce(id, ms, fn) {
     const scopeMap = TIMERS_MAP.get(this.scopeId);
-    return new Promise((resolve12, reject) => {
+    return new Promise((resolve13, reject) => {
       if (scopeMap.has(id)) {
         clearTimeout(scopeMap.get(id));
       }
       const timerId = setTimeout(() => {
         try {
-          resolve12(fn());
+          resolve13(fn());
         } catch (error48) {
           reject(error48);
         }
@@ -45060,25 +43581,25 @@ function getParsers() {
         filetype: "javascript",
         aliases: ["javascriptreact"],
         queries: {
-          highlights: [resolve10(dirname11(fileURLToPath8(import.meta.url)), highlights_default)]
+          highlights: [resolve11(dirname12(fileURLToPath9(import.meta.url)), highlights_default)]
         },
-        wasm: resolve10(dirname11(fileURLToPath8(import.meta.url)), tree_sitter_javascript_default)
+        wasm: resolve11(dirname12(fileURLToPath9(import.meta.url)), tree_sitter_javascript_default)
       },
       {
         filetype: "typescript",
         aliases: ["typescriptreact"],
         queries: {
-          highlights: [resolve10(dirname11(fileURLToPath8(import.meta.url)), highlights_default2)]
+          highlights: [resolve11(dirname12(fileURLToPath9(import.meta.url)), highlights_default2)]
         },
-        wasm: resolve10(dirname11(fileURLToPath8(import.meta.url)), tree_sitter_typescript_default)
+        wasm: resolve11(dirname12(fileURLToPath9(import.meta.url)), tree_sitter_typescript_default)
       },
       {
         filetype: "markdown",
         queries: {
-          highlights: [resolve10(dirname11(fileURLToPath8(import.meta.url)), highlights_default3)],
-          injections: [resolve10(dirname11(fileURLToPath8(import.meta.url)), injections_default)]
+          highlights: [resolve11(dirname12(fileURLToPath9(import.meta.url)), highlights_default3)],
+          injections: [resolve11(dirname12(fileURLToPath9(import.meta.url)), injections_default)]
         },
-        wasm: resolve10(dirname11(fileURLToPath8(import.meta.url)), tree_sitter_markdown_default),
+        wasm: resolve11(dirname12(fileURLToPath9(import.meta.url)), tree_sitter_markdown_default),
         injectionMapping: {
           nodeTypes: {
             inline: "markdown_inline",
@@ -45101,16 +43622,16 @@ function getParsers() {
       {
         filetype: "markdown_inline",
         queries: {
-          highlights: [resolve10(dirname11(fileURLToPath8(import.meta.url)), highlights_default4)]
+          highlights: [resolve11(dirname12(fileURLToPath9(import.meta.url)), highlights_default4)]
         },
-        wasm: resolve10(dirname11(fileURLToPath8(import.meta.url)), tree_sitter_markdown_inline_default)
+        wasm: resolve11(dirname12(fileURLToPath9(import.meta.url)), tree_sitter_markdown_inline_default)
       },
       {
         filetype: "zig",
         queries: {
-          highlights: [resolve10(dirname11(fileURLToPath8(import.meta.url)), highlights_default5)]
+          highlights: [resolve11(dirname12(fileURLToPath9(import.meta.url)), highlights_default5)]
         },
-        wasm: resolve10(dirname11(fileURLToPath8(import.meta.url)), tree_sitter_zig_default)
+        wasm: resolve11(dirname12(fileURLToPath9(import.meta.url)), tree_sitter_zig_default)
       }
     ];
   }
@@ -45123,7 +43644,7 @@ function getBunfsRootPath() {
   return process.platform === "win32" ? "B:\\~BUN\\root" : "/$bunfs/root";
 }
 function normalizeBunfsPath(fileName) {
-  return join25(getBunfsRootPath(), basename9(fileName));
+  return join26(getBunfsRootPath(), basename9(fileName));
 }
 function addDefaultParsers(parsers) {
   for (const parser of parsers) {
@@ -56045,7 +54566,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 (!existsSync17(resolve22(import.meta.dirname, "parser.worker.js"))) {
+        if (!existsSync18(resolve22(import.meta.dirname, "parser.worker.js"))) {
           worker_path = new URL("./parser.worker.ts", import.meta.url).href;
         }
       }
@@ -74346,14 +72867,14 @@ See https://react.dev/link/invalid-hook-call for tips about how to debug and fix
       prevActScopeDepth !== actScopeDepth - 1 && console.error("You seem to have overlapping act() calls, this is not supported. Be sure to await previous act() calls before making a new one. ");
       actScopeDepth = prevActScopeDepth;
     }
-    function recursivelyFlushAsyncActWork(returnValue, resolve12, reject) {
+    function recursivelyFlushAsyncActWork(returnValue, resolve13, reject) {
       var queue = ReactSharedInternals.actQueue;
       if (queue !== null)
         if (queue.length !== 0)
           try {
             flushActQueue(queue);
             enqueueTask(function() {
-              return recursivelyFlushAsyncActWork(returnValue, resolve12, reject);
+              return recursivelyFlushAsyncActWork(returnValue, resolve13, reject);
             });
             return;
           } catch (error48) {
@@ -74361,7 +72882,7 @@ See https://react.dev/link/invalid-hook-call for tips about how to debug and fix
           }
         else
           ReactSharedInternals.actQueue = null;
-      0 < ReactSharedInternals.thrownErrors.length ? (queue = aggregateErrors(ReactSharedInternals.thrownErrors), ReactSharedInternals.thrownErrors.length = 0, reject(queue)) : resolve12(returnValue);
+      0 < ReactSharedInternals.thrownErrors.length ? (queue = aggregateErrors(ReactSharedInternals.thrownErrors), ReactSharedInternals.thrownErrors.length = 0, reject(queue)) : resolve13(returnValue);
     }
     function flushActQueue(queue) {
       if (!isFlushing) {
@@ -74537,14 +73058,14 @@ See https://react.dev/link/invalid-hook-call for tips about how to debug and fix
           didAwaitActCall || didWarnNoAwaitAct || (didWarnNoAwaitAct = true, console.error("You called act(async () => ...) without await. This could lead to unexpected testing behaviour, interleaving multiple act calls and mixing their scopes. You should - await act(async () => ...);"));
         });
         return {
-          then: function(resolve12, reject) {
+          then: function(resolve13, reject) {
             didAwaitActCall = true;
             thenable.then(function(returnValue) {
               popActScope(prevActQueue, prevActScopeDepth);
               if (prevActScopeDepth === 0) {
                 try {
                   flushActQueue(queue), enqueueTask(function() {
-                    return recursivelyFlushAsyncActWork(returnValue, resolve12, reject);
+                    return recursivelyFlushAsyncActWork(returnValue, resolve13, reject);
                   });
                 } catch (error$0) {
                   ReactSharedInternals.thrownErrors.push(error$0);
@@ -74555,7 +73076,7 @@ See https://react.dev/link/invalid-hook-call for tips about how to debug and fix
                   reject(_thrownError);
                 }
               } else
-                resolve12(returnValue);
+                resolve13(returnValue);
             }, function(error48) {
               popActScope(prevActQueue, prevActScopeDepth);
               0 < ReactSharedInternals.thrownErrors.length ? (error48 = aggregateErrors(ReactSharedInternals.thrownErrors), ReactSharedInternals.thrownErrors.length = 0, reject(error48)) : reject(error48);
@@ -74571,11 +73092,11 @@ See https://react.dev/link/invalid-hook-call for tips about how to debug and fix
       if (0 < ReactSharedInternals.thrownErrors.length)
         throw callback = aggregateErrors(ReactSharedInternals.thrownErrors), ReactSharedInternals.thrownErrors.length = 0, callback;
       return {
-        then: function(resolve12, reject) {
+        then: function(resolve13, reject) {
           didAwaitActCall = true;
           prevActScopeDepth === 0 ? (ReactSharedInternals.actQueue = queue, enqueueTask(function() {
-            return recursivelyFlushAsyncActWork(returnValue$jscomp$0, resolve12, reject);
-          })) : resolve12(returnValue$jscomp$0);
+            return recursivelyFlushAsyncActWork(returnValue$jscomp$0, resolve13, reject);
+          })) : resolve13(returnValue$jscomp$0);
         }
       };
     };
@@ -77056,8 +75577,8 @@ It can also happen if the client has a browser extension installed which messes
         currentEntangledActionThenable = {
           status: "pending",
           value: undefined,
-          then: function(resolve12) {
-            entangledListeners.push(resolve12);
+          then: function(resolve13) {
+            entangledListeners.push(resolve13);
           }
         };
       }
@@ -77081,8 +75602,8 @@ It can also happen if the client has a browser extension installed which messes
         status: "pending",
         value: null,
         reason: null,
-        then: function(resolve12) {
-          listeners.push(resolve12);
+        then: function(resolve13) {
+          listeners.push(resolve13);
         }
       };
       thenable.then(function() {
@@ -103064,14 +101585,14 @@ async function runScoutMonitorApp(options) {
   }
   const renderer = await createCliRenderer();
   let closed = false;
-  await new Promise((resolve12) => {
+  await new Promise((resolve13) => {
     const close = () => {
       if (closed) {
         return;
       }
       closed = true;
       renderer.destroy();
-      resolve12();
+      resolve13();
     };
     createRoot(renderer).render(/* @__PURE__ */ import_jsx_dev_runtime2.jsxDEV(ScoutMonitorApp, {
       currentDirectory: options.currentDirectory,
@@ -103119,8 +101640,8 @@ var exports_up = {};
 __export(exports_up, {
   runUpCommand: () => runUpCommand
 });
-import { existsSync as existsSync18 } from "fs";
-import { resolve as resolve12 } from "path";
+import { existsSync as existsSync19 } from "fs";
+import { resolve as resolve13 } from "path";
 function looksLikePath(value) {
   return value.includes("/") || value.startsWith(".") || value.startsWith("~");
 }
@@ -103168,8 +101689,8 @@ async function runUpCommand(context, args) {
     throw new ScoutCliError("usage: scout up <name|path> [--name <alias>] [--harness <claude|codex>]");
   }
   let projectPath;
-  if (looksLikePath(target) || existsSync18(resolve12(target))) {
-    projectPath = resolve12(target);
+  if (looksLikePath(target) || existsSync19(resolve13(target))) {
+    projectPath = resolve13(target);
   } else {
     const resolved = await resolveLocalAgentByName(target);
     if (!resolved) {
@@ -103207,10 +101728,9 @@ async function runWatchCommand(context, args) {
   process.on("SIGINT", shutdown);
   try {
     if (context.output.mode === "plain") {
-      context.stdout(`Watching ${options.channel?.trim() || "shared"} as ${resolveScoutAgentName(options.agentName)}`);
+      context.stdout(`Watching ${options.channel?.trim() || "shared"}`);
     }
     await watchScoutMessages({
-      agentId: resolveScoutAgentName(options.agentName),
       channel: options.channel,
       signal: controller.signal,
       onMessage(message) {
@@ -103251,12 +101771,10 @@ __export(exports_whoami, {
   runWhoAmICommand: () => runWhoAmICommand
 });
 async function loadScoutWhoAmIReport(context, currentDirectory) {
-  const askWatchId = resolveScoutAgentName(null);
-  const sendSpeakId = await resolveScoutSenderId(null, currentDirectory);
+  const defaultSenderId = await resolveScoutSenderId(null, currentDirectory, context.env);
   const projectRoot = await findNearestProjectRoot(currentDirectory);
   return {
-    askWatchId,
-    sendSpeakId,
+    defaultSenderId,
     envAgent: context.env.OPENSCOUT_AGENT?.trim() || null,
     currentDirectory,
     projectRoot,
@@ -103265,8 +101783,7 @@ async function loadScoutWhoAmIReport(context, currentDirectory) {
 }
 function renderScoutWhoAmIReport(report) {
   const lines = [
-    `Ask/Watch: ${report.askWatchId}`,
-    `Send/Speak: ${report.sendSpeakId}`,
+    `Default Sender: ${report.defaultSenderId}`,
     `Current Directory: ${report.currentDirectory}`,
     `Broker: ${report.brokerUrl}`
   ];
@@ -103352,6 +101869,8 @@ async function loadScoutCommandHandler(name) {
       return (await init_env().then(() => exports_env)).runEnvCommand;
     case "latest":
       return (await init_latest().then(() => exports_latest)).runLatestCommand;
+    case "menu":
+      return (await Promise.resolve().then(() => (init_menu(), exports_menu))).runMenuCommand;
     case "mesh":
       return (await init_mesh().then(() => exports_mesh)).runMeshCommand;
     case "pair":
@@ -103367,7 +101886,7 @@ async function loadScoutCommandHandler(name) {
     case "server":
       return (await Promise.resolve().then(() => (init_server2(), exports_server))).runServerCommand;
     case "setup":
-      return (await Promise.resolve().then(() => (init_setup2(), exports_setup2))).runSetupCommand;
+      return (await Promise.resolve().then(() => (init_setup2(), exports_setup))).runSetupCommand;
     case "speak":
       return (await init_speak().then(() => exports_speak)).runSpeakCommand;
     case "tui":
@@ -103405,6 +101924,7 @@ var SCOUT_COMMANDS = [
   { name: "down", summary: "Stop one or all local agents" },
   { name: "ps", summary: "List configured local agents" },
   { name: "restart", summary: "Restart configured local agents" },
+  { name: "menu", summary: "Launch the OpenScout macOS menu bar app" },
   { name: "config", summary: "View or set user config (name, etc.)" },
   { name: "mesh", summary: "Mesh status and diagnostics" },
   { name: "pair", summary: "Pair a companion device via QR" },
@@ -103461,6 +101981,7 @@ function renderScoutHelp(version2 = "0.2.18") {
     "  scout whoami",
     "  scout who",
     "  scout latest",
+    "  scout menu",
     "  scout server open",
     "",
     "Addressing:",