@openscout/scout 0.2.61 → 0.2.62

package/dist/pair-supervisor.mjs

@@ -56,6 +56,9 @@ function resolvedPairingConfig() {
   };
 }
 
+// ../../apps/desktop/src/core/pairing/supervisor.ts
+import { spawn as spawn4 } from "child_process";
+
 // ../../node_modules/.bun/uqr@0.1.3/node_modules/uqr/dist/index.mjs
 var QrCodeDataType = /* @__PURE__ */ ((QrCodeDataType2) => {
   QrCodeDataType2[QrCodeDataType2["Border"] = -1] = "Border";
@@ -685,7 +688,7 @@ function renderQRCode(payload) {
 // ../../apps/desktop/src/core/pairing/runtime/relay-runtime.ts
 import { execSync } from "child_process";
 import { existsSync as existsSync2, mkdirSync as mkdirSync3, readdirSync } from "fs";
-import { homedir as homedir2 } from "os";
+import { homedir as homedir2, networkInterfaces } from "os";
 import { join } from "path";
 
 // ../../apps/desktop/src/core/pairing/runtime/log.ts
@@ -716,6 +719,7 @@ function startRelay(port, options = {}) {
   const roomByBridgeKey = new Map;
   const server = Bun.serve({
     port,
+    hostname: "0.0.0.0",
     ...options.tls ? {
       tls: {
         cert: Bun.file(options.tls.cert),
@@ -974,24 +978,42 @@ function readTailscaleStatus() {
     return null;
   }
 }
-function resolveRelayEndpointForTailscaleStatus(port, tailscale) {
+function resolveRelayEndpointForTailscaleStatus(port, tailscale, options = {}) {
   const backendState = tailscale?.backendState?.trim().toLowerCase() ?? "";
   const hostname = tailscale?.dnsName ?? null;
   const tailscaleRunning = backendState === "running" && tailscale?.online !== false && Boolean(hostname);
-  const tls = resolveTls(tailscaleRunning ? hostname : null);
-  if (tailscaleRunning && hostname && tls) {
+  const tls = tailscaleRunning ? options.tls !== undefined ? options.tls : resolveTls(hostname) : null;
+  const scheme = tls ? "wss" : "ws";
+  const connectUrl = `${scheme}://127.0.0.1:${port}`;
+  const localAddress = options.localAddress !== undefined ? normalizedOptionalAddress(options.localAddress) : findLocalNetworkAddress();
+  const localRelayUrl = localAddress ? `${scheme}://${localAddress}:${port}` : null;
+  const tailnetRelayUrl = tailscaleRunning && hostname ? `${scheme}://${hostname}:${port}` : null;
+  const fallbackRelayUrls = tailnetRelayUrl && localRelayUrl ? [tailnetRelayUrl] : [];
+  if (localRelayUrl) {
     return {
-      relayUrl: `wss://${hostname}:${port}`,
+      relayUrl: localRelayUrl,
+      connectUrl,
+      fallbackRelayUrls,
+      options: tls ? { tls } : {}
+    };
+  }
+  if (tailnetRelayUrl && tls) {
+    return {
+      relayUrl: tailnetRelayUrl,
+      connectUrl,
+      fallbackRelayUrls: [],
       options: { tls }
     };
   }
-  if (tailscaleRunning && hostname) {
+  if (tailnetRelayUrl) {
     pairingLog.warn("relay", "tailscale is running without TLS; falling back to insecure websocket relay", {
       hostname,
       port
     });
     return {
-      relayUrl: `ws://${hostname}:${port}`,
+      relayUrl: tailnetRelayUrl,
+      connectUrl,
+      fallbackRelayUrls: [],
       options: {}
     };
   }
@@ -1004,7 +1026,9 @@ function resolveRelayEndpointForTailscaleStatus(port, tailscale) {
     });
   }
   return {
-    relayUrl: `ws://127.0.0.1:${port}`,
+    relayUrl: connectUrl,
+    connectUrl,
+    fallbackRelayUrls: [],
     options: {}
   };
 }
@@ -1057,16 +1081,87 @@ function resolveRelayEndpoint(port) {
 }
 function startManagedRelay(port = 7889) {
   const endpoint = resolveRelayEndpoint(port);
-  pairingLog.info("relay", "starting managed relay", { relay: endpoint.relayUrl, port });
+  pairingLog.info("relay", "starting managed relay", {
+    relay: endpoint.relayUrl,
+    connectUrl: endpoint.connectUrl,
+    fallbackRelayUrls: endpoint.fallbackRelayUrls,
+    port
+  });
   const relay = startRelay(port, endpoint.options);
   return {
     relayUrl: endpoint.relayUrl,
+    connectUrl: endpoint.connectUrl,
+    fallbackRelayUrls: endpoint.fallbackRelayUrls,
     stop() {
       pairingLog.info("relay", "stopping managed relay", { relay: endpoint.relayUrl, port });
       relay.stop();
     }
   };
 }
+function normalizedOptionalAddress(address) {
+  const trimmed = address?.trim();
+  return trimmed ? trimmed : null;
+}
+function findLocalNetworkAddress() {
+  const candidates = [];
+  const interfaces = networkInterfaces();
+  for (const [name, entries] of Object.entries(interfaces)) {
+    for (const entry of entries ?? []) {
+      if (entry.internal || entry.family !== "IPv4") {
+        continue;
+      }
+      if (!isPrivateIPv4(entry.address) || isLinkLocalIPv4(entry.address) || isTailscaleIPv4(entry.address)) {
+        continue;
+      }
+      candidates.push({ name, address: entry.address });
+    }
+  }
+  candidates.sort((left, right) => {
+    const leftScore = localInterfaceScore(left.name);
+    const rightScore = localInterfaceScore(right.name);
+    if (leftScore !== rightScore) {
+      return leftScore - rightScore;
+    }
+    return left.address.localeCompare(right.address);
+  });
+  return candidates[0]?.address ?? null;
+}
+function localInterfaceScore(name) {
+  if (/^en\d+$/i.test(name)) {
+    return 0;
+  }
+  if (/^bridge\d*$/i.test(name)) {
+    return 2;
+  }
+  return 1;
+}
+function isPrivateIPv4(address) {
+  const octets = parseIPv4(address);
+  if (!octets) {
+    return false;
+  }
+  const [first, second] = octets;
+  return first === 10 || first === 172 && second >= 16 && second <= 31 || first === 192 && second === 168;
+}
+function isLinkLocalIPv4(address) {
+  const octets = parseIPv4(address);
+  return Boolean(octets && octets[0] === 169 && octets[1] === 254);
+}
+function isTailscaleIPv4(address) {
+  const octets = parseIPv4(address);
+  return Boolean(octets && octets[0] === 100 && octets[1] >= 64 && octets[1] <= 127);
+}
+function parseIPv4(address) {
+  const octets = address.split(".");
+  if (octets.length !== 4) {
+    return null;
+  }
+  const numbers = octets.map((octet) => Number(octet));
+  if (numbers.some((value) => !Number.isInteger(value) || value < 0 || value > 255)) {
+    return null;
+  }
+  return numbers;
+}
 
 // ../../apps/desktop/src/core/pairing/runtime/runtime-state.ts
 import { existsSync as existsSync4, mkdirSync as mkdirSync5, readFileSync as readFileSync3, renameSync, unlinkSync, writeFileSync as writeFileSync3 } from "fs";
@@ -3152,15 +3247,30 @@ function isTrustedPeer(publicKeyHex) {
 }
 var QR_VERSION = 1;
 var QR_EXPIRY_MS = 5 * 60 * 1000;
-function createQRPayload(bridgePublicKey, relayUrl) {
+function createQRPayload(bridgePublicKey, relayUrl, fallbackRelayUrls = []) {
+  const fallbackRelays = normalizedRelayUrls(fallbackRelayUrls, relayUrl);
   return {
     v: QR_VERSION,
     relay: relayUrl,
+    ...fallbackRelays.length > 0 ? { fallbackRelays } : {},
     room: crypto.randomUUID(),
     publicKey: bytesToHex2(bridgePublicKey),
     expiresAt: Date.now() + QR_EXPIRY_MS
   };
 }
+function normalizedRelayUrls(urls, primaryRelayUrl) {
+  const seen = new Set([primaryRelayUrl.trim()]);
+  const normalized = [];
+  for (const url of urls) {
+    const trimmed = url.trim();
+    if (!trimmed || seen.has(trimmed)) {
+      continue;
+    }
+    seen.add(trimmed);
+    normalized.push(trimmed);
+  }
+  return normalized;
+}
 function bytesToHex2(bytes) {
   return Array.from(bytes, (b) => b.toString(16).padStart(2, "0")).join("");
 }
@@ -3394,7 +3504,7 @@ function writeJsonAtomically(filePath, value) {
 }
 
 // ../../apps/desktop/src/core/pairing/runtime/runtime.ts
-import { homedir as homedir18 } from "os";
+import { homedir as homedir19 } from "os";
 // ../agent-sessions/src/protocol/adapter.ts
 class BaseAdapter {
   config;
@@ -4026,6 +4136,15 @@ function stringifyUnknown(value) {
     return String(value);
   }
 }
+function isRecord(value) {
+  return !!value && typeof value === "object" && !Array.isArray(value);
+}
+function maybeString(value) {
+  return typeof value === "string" && value.trim().length > 0 ? value.trim() : undefined;
+}
+function maybeNumber(value) {
+  return typeof value === "number" && Number.isFinite(value) ? value : undefined;
+}
 function renderToolResultContent(content) {
   if (typeof content === "string") {
     return content;
@@ -4081,6 +4200,7 @@ class ClaudeCodeHistoryParser {
   blockById = new Map;
   activeStreamBlocks = new Map;
   sawStreamTextThisTurn = false;
+  assistantUsageByMessageId = new Map;
   constructor(session, baseTimestampMs) {
     this.session = session;
     this.baseTimestampMs = baseTimestampMs;
@@ -4090,6 +4210,7 @@ class ClaudeCodeHistoryParser {
     let parsedLineCount = 0;
     let skippedLineCount = 0;
     let lineCount = 0;
+    let lastCapturedAt = this.baseTimestampMs;
     for (let index = 0;index < lines.length; index += 1) {
       const rawLine = lines[index];
       const trimmed = rawLine.trim();
@@ -4110,12 +4231,19 @@ class ClaudeCodeHistoryParser {
         continue;
       }
       const capturedAt = extractRecordTimestamp(record) ?? this.baseTimestampMs + index;
+      lastCapturedAt = capturedAt;
       if (this.handleRecord(record, capturedAt)) {
         parsedLineCount += 1;
       } else {
         skippedLineCount += 1;
       }
     }
+    if (this.persistObserveUsageMetadata()) {
+      this.emitEvent(lastCapturedAt, {
+        event: "session:update",
+        session: { ...this.session }
+      });
+    }
     return {
       events: this.events,
       lineCount,
@@ -4124,6 +4252,7 @@ class ClaudeCodeHistoryParser {
     };
   }
   handleRecord(record, capturedAt) {
+    this.captureRecordMetadata(record);
     const type = typeof record.type === "string" ? record.type : null;
     if (!type) {
       return false;
@@ -4133,7 +4262,7 @@ class ClaudeCodeHistoryParser {
         this.handleSystem(record, capturedAt);
         return true;
       case "user":
-        this.startTurn(capturedAt);
+        this.handleUser(record, capturedAt);
         return true;
       case "assistant":
         this.handleAssistant(record, capturedAt);
@@ -4157,6 +4286,130 @@ class ClaudeCodeHistoryParser {
         return false;
     }
   }
+  captureRecordMetadata(record) {
+    const runtime = this.ensureObserveMetaRecord("observeRuntime");
+    this.assignObserveString(runtime, "entrypoint", record.entrypoint);
+    this.assignObserveString(runtime, "cliVersion", record.version);
+    this.assignObserveString(runtime, "gitBranch", record.gitBranch);
+    this.assignObserveString(runtime, "permissionMode", record.permissionMode);
+    this.assignObserveString(runtime, "userType", record.userType);
+    const recordCwd = maybeString(record.cwd);
+    if (recordCwd && !this.session.cwd) {
+      this.session.cwd = recordCwd;
+    }
+    const message = isRecord(record.message) ? record.message : null;
+    const model = maybeString(message?.model);
+    if (model && !this.session.model) {
+      this.session.model = model;
+    }
+    const usage = this.readClaudeUsageEntry(record);
+    if (!usage) {
+      return;
+    }
+    const messageId = maybeString(message?.id) ?? maybeString(record.requestId) ?? maybeString(record.uuid);
+    if (!messageId) {
+      return;
+    }
+    this.assistantUsageByMessageId.set(messageId, usage);
+  }
+  readClaudeUsageEntry(record) {
+    const type = maybeString(record.type);
+    const message = isRecord(record.message) ? record.message : null;
+    const role = maybeString(message?.role);
+    if (type !== "assistant" && role !== "assistant") {
+      return null;
+    }
+    const usage = isRecord(message?.usage) ? message.usage : null;
+    const serverToolUse = isRecord(usage?.server_tool_use) ? usage.server_tool_use : null;
+    const entry = {
+      inputTokens: maybeNumber(usage?.input_tokens) ?? 0,
+      outputTokens: maybeNumber(usage?.output_tokens) ?? 0,
+      cacheReadInputTokens: maybeNumber(usage?.cache_read_input_tokens) ?? 0,
+      cacheCreationInputTokens: maybeNumber(usage?.cache_creation_input_tokens) ?? 0,
+      webSearchRequests: maybeNumber(serverToolUse?.web_search_requests) ?? 0,
+      webFetchRequests: maybeNumber(serverToolUse?.web_fetch_requests) ?? 0,
+      ...maybeString(message?.service_tier) ? { serviceTier: maybeString(message?.service_tier) } : {},
+      ...maybeString(message?.speed) ? { speed: maybeString(message?.speed) } : {}
+    };
+    const hasUsage = entry.inputTokens > 0 || entry.outputTokens > 0 || entry.cacheReadInputTokens > 0 || entry.cacheCreationInputTokens > 0 || entry.webSearchRequests > 0 || entry.webFetchRequests > 0 || Boolean(entry.serviceTier) || Boolean(entry.speed);
+    return hasUsage ? entry : null;
+  }
+  persistObserveUsageMetadata() {
+    if (this.assistantUsageByMessageId.size === 0) {
+      return false;
+    }
+    const usage = this.ensureObserveMetaRecord("observeUsage");
+    let inputTokens = 0;
+    let outputTokens = 0;
+    let cacheReadInputTokens = 0;
+    let cacheCreationInputTokens = 0;
+    let webSearchRequests = 0;
+    let webFetchRequests = 0;
+    let serviceTier;
+    let speed;
+    for (const entry of this.assistantUsageByMessageId.values()) {
+      inputTokens += entry.inputTokens;
+      outputTokens += entry.outputTokens;
+      cacheReadInputTokens += entry.cacheReadInputTokens;
+      cacheCreationInputTokens += entry.cacheCreationInputTokens;
+      webSearchRequests += entry.webSearchRequests;
+      webFetchRequests += entry.webFetchRequests;
+      if (entry.serviceTier) {
+        serviceTier = entry.serviceTier;
+      }
+      if (entry.speed) {
+        speed = entry.speed;
+      }
+    }
+    let changed = false;
+    const assignNumber = (key, value) => {
+      if (usage[key] !== value) {
+        usage[key] = value;
+        changed = true;
+      }
+    };
+    const assignString = (key, value) => {
+      if (usage[key] !== value) {
+        usage[key] = value;
+        changed = true;
+      }
+    };
+    assignNumber("assistantMessages", this.assistantUsageByMessageId.size);
+    if (inputTokens > 0)
+      assignNumber("inputTokens", inputTokens);
+    if (outputTokens > 0)
+      assignNumber("outputTokens", outputTokens);
+    if (cacheReadInputTokens > 0)
+      assignNumber("cacheReadInputTokens", cacheReadInputTokens);
+    if (cacheCreationInputTokens > 0)
+      assignNumber("cacheCreationInputTokens", cacheCreationInputTokens);
+    if (webSearchRequests > 0)
+      assignNumber("webSearchRequests", webSearchRequests);
+    if (webFetchRequests > 0)
+      assignNumber("webFetchRequests", webFetchRequests);
+    if (serviceTier)
+      assignString("serviceTier", serviceTier);
+    if (speed)
+      assignString("speed", speed);
+    return changed;
+  }
+  ensureObserveMetaRecord(key) {
+    const providerMeta = isRecord(this.session.providerMeta) ? this.session.providerMeta : {};
+    this.session.providerMeta = providerMeta;
+    const existing = providerMeta[key];
+    if (isRecord(existing)) {
+      return existing;
+    }
+    const next = {};
+    providerMeta[key] = next;
+    return next;
+  }
+  assignObserveString(target, key, value) {
+    const next = maybeString(value);
+    if (next) {
+      target[key] = next;
+    }
+  }
   handleSystem(record, capturedAt) {
     if (record.subtype !== "init") {
       return;
@@ -4186,19 +4439,41 @@ class ClaudeCodeHistoryParser {
       });
     }
   }
+  handleUser(record, capturedAt) {
+    const message = record.message && typeof record.message === "object" ? record.message : null;
+    const content = message?.content;
+    if (Array.isArray(content) && content.length > 0) {
+      const toolResults = content.filter((entry) => {
+        return !!entry && typeof entry === "object" && !Array.isArray(entry) && entry.type === "tool_result";
+      });
+      if (toolResults.length === content.length) {
+        for (const toolResult of toolResults) {
+          this.handleToolResult({
+            ...toolResult,
+            tool_use_id: typeof toolResult.tool_use_id === "string" ? toolResult.tool_use_id : toolResult.id,
+            is_error: toolResult.is_error === true
+          }, capturedAt);
+        }
+        return;
+      }
+    }
+    this.startTurn(capturedAt);
+  }
   handleAssistant(record, capturedAt) {
     const turn = this.ensureTurn(capturedAt);
-    if (this.sawStreamTextThisTurn) {
-      return;
-    }
     const content = record.message && typeof record.message === "object" ? record.message.content : record.content;
     if (!Array.isArray(content)) {
+      this.maybeEndTurnFromAssistant(record, capturedAt);
       return;
     }
+    const skipTextBlocks = this.sawStreamTextThisTurn;
     for (const part of content) {
       const contentPart = part;
       const contentType = typeof contentPart.type === "string" ? contentPart.type : "";
       if (contentType === "thinking" || contentType === "reasoning") {
+        if (skipTextBlocks) {
+          continue;
+        }
         const block = this.startBlock(turn, capturedAt, {
           type: "reasoning",
           text: typeof contentPart.thinking === "string" ? contentPart.thinking : typeof contentPart.text === "string" ? contentPart.text : "",
@@ -4206,14 +4481,20 @@ class ClaudeCodeHistoryParser {
         });
         this.emitBlockEnd(capturedAt, turn, block, "completed");
       } else if (contentType === "text") {
+        if (skipTextBlocks) {
+          continue;
+        }
         const block = this.startBlock(turn, capturedAt, {
           type: "text",
           text: typeof contentPart.text === "string" ? contentPart.text : "",
           status: "completed"
         });
         this.emitBlockEnd(capturedAt, turn, block, "completed");
+      } else if (contentType === "tool_use") {
+        this.handleToolUse(contentPart, capturedAt);
       }
     }
+    this.maybeEndTurnFromAssistant(record, capturedAt);
   }
   handleStreamEvent(record, capturedAt) {
     const turn = this.ensureTurn(capturedAt);
@@ -4435,6 +4716,12 @@ class ClaudeCodeHistoryParser {
     this.emitError(turn, capturedAt, message);
     this.endTurn("failed", capturedAt);
   }
+  maybeEndTurnFromAssistant(record, capturedAt) {
+    const stopReason = record.message && typeof record.message === "object" ? record.message.stop_reason : record.stop_reason;
+    if (stopReason === "end_turn") {
+      this.endTurn("completed", capturedAt);
+    }
+  }
   startTurn(capturedAt) {
     if (this.currentTurn) {
       this.endTurn("stopped", capturedAt);
@@ -8539,11 +8826,11 @@ function formatTimestamp(value) {
 // ../../apps/desktop/src/core/pairing/runtime/bridge/server.ts
 import { readdirSync as readdirSync3, readFileSync as readFileSync9, realpathSync, statSync as statSync3 } from "fs";
 import { execSync as execSync3 } from "child_process";
-import { basename as basename6, isAbsolute as isAbsolute3, join as join17, relative as relative2 } from "path";
-import { homedir as homedir15 } from "os";
+import { basename as basename7, isAbsolute as isAbsolute3, join as join18, relative as relative2 } from "path";
+import { homedir as homedir16 } from "os";
 
 // ../../apps/desktop/src/core/mobile/service.ts
-import { basename as basename5, resolve as resolve6 } from "path";
+import { basename as basename6, resolve as resolve7 } from "path";
 
 // ../runtime/src/harness-catalog.ts
 import { execFileSync } from "child_process";
@@ -10154,41 +10441,6 @@ function diagnoseAgentIdentity(identity, candidates) {
 var parseAgentSelector = parseAgentIdentity;
 var formatAgentSelector = formatAgentIdentity;
 var resolveAgentSelector = resolveAgentIdentity;
-// ../protocol/dist/scout-agent-card.js
-function buildScoutReturnAddress(input) {
-  const next = {
-    actorId: input.actorId,
-    handle: input.handle.trim()
-  };
-  if (input.displayName?.trim()) {
-    next.displayName = input.displayName.trim();
-  }
-  if (input.selector?.trim()) {
-    next.selector = input.selector.trim();
-  }
-  if (input.defaultSelector?.trim()) {
-    next.defaultSelector = input.defaultSelector.trim();
-  }
-  if (input.conversationId?.trim()) {
-    next.conversationId = input.conversationId.trim();
-  }
-  if (input.replyToMessageId?.trim()) {
-    next.replyToMessageId = input.replyToMessageId.trim();
-  }
-  if (input.nodeId?.trim()) {
-    next.nodeId = input.nodeId.trim();
-  }
-  if (input.projectRoot?.trim()) {
-    next.projectRoot = input.projectRoot.trim();
-  }
-  if (input.sessionId?.trim()) {
-    next.sessionId = input.sessionId.trim();
-  }
-  if (input.metadata && Object.keys(input.metadata).length > 0) {
-    next.metadata = input.metadata;
-  }
-  return next;
-}
 // ../runtime/src/user-project-hints.ts
 import { readdir, readFile as readFile3, stat } from "fs/promises";
 import { homedir as homedir11 } from "os";
@@ -12239,9 +12491,9 @@ async function ensureRelayAgentConfigured(value, options = {}) {
 
 // ../runtime/src/local-agents.ts
 import { execFileSync as execFileSync3, execSync as execSync2 } from "child_process";
-import { existsSync as existsSync13, readFileSync as readFileSync8 } from "fs";
+import { existsSync as existsSync14, readFileSync as readFileSync8 } from "fs";
 import { mkdir as mkdir6, rm as rm5, stat as stat3, writeFile as writeFile6 } from "fs/promises";
-import { basename as basename4, dirname as dirname6, join as join15, resolve as resolve5 } from "path";
+import { basename as basename5, dirname as dirname7, join as join16, resolve as resolve6 } from "path";
 import { fileURLToPath as fileURLToPath5 } from "url";
 
 // ../runtime/src/claude-stream-json.ts
@@ -13585,10 +13837,116 @@ function buildCollaborationContractPrompt(agentId) {
 
 // ../runtime/src/broker-service.ts
 import { spawnSync } from "child_process";
-import { existsSync as existsSync12, mkdirSync as mkdirSync8, readFileSync as readFileSync7, rmSync as rmSync2, writeFileSync as writeFileSync5 } from "fs";
+import { existsSync as existsSync13, mkdirSync as mkdirSync8, readFileSync as readFileSync7, rmSync as rmSync2, writeFileSync as writeFileSync5 } from "fs";
+import { homedir as homedir14 } from "os";
+import { dirname as dirname6, join as join15, resolve as resolve5 } from "path";
+import { fileURLToPath as fileURLToPath4 } from "url";
+
+// ../runtime/src/tool-resolution.ts
+import { accessSync as accessSync2, constants as constants4, existsSync as existsSync12 } from "fs";
 import { homedir as homedir13 } from "os";
 import { basename as basename3, dirname as dirname5, join as join14, resolve as resolve4 } from "path";
-import { fileURLToPath as fileURLToPath4 } from "url";
+var DEFAULT_COMMON_EXECUTABLE_DIRECTORIES = [
+  join14(homedir13(), ".bun", "bin"),
+  "/opt/homebrew/bin",
+  "/usr/local/bin"
+];
+function expandHomePath3(value, env = process.env) {
+  const home = env.HOME ?? homedir13();
+  if (value === "~") {
+    return home;
+  }
+  if (value.startsWith("~/")) {
+    return join14(home, value.slice(2));
+  }
+  return value;
+}
+function isExecutablePath(candidate) {
+  if (!candidate) {
+    return false;
+  }
+  try {
+    accessSync2(candidate, constants4.X_OK);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function splitPathEntries(env = process.env) {
+  const separator = process.platform === "win32" ? ";" : ":";
+  return (env.PATH ?? "").split(separator).filter(Boolean);
+}
+function dedupeDirectories(values, env) {
+  const seen = new Set;
+  const resolvedEntries = [];
+  for (const value of values) {
+    const normalized = resolve4(expandHomePath3(value, env));
+    if (seen.has(normalized)) {
+      continue;
+    }
+    seen.add(normalized);
+    resolvedEntries.push(normalized);
+  }
+  return resolvedEntries;
+}
+function resolveExecutableFromSearch(options) {
+  const env = options.env ?? process.env;
+  const envKeys = options.envKeys ?? [];
+  for (const envKey of envKeys) {
+    const explicit = env[envKey]?.trim();
+    if (!explicit) {
+      continue;
+    }
+    const expanded = expandHomePath3(explicit, env);
+    if (isExecutablePath(expanded)) {
+      return { path: resolve4(expanded), source: "env" };
+    }
+    const foundOnPath = findExecutableOnSearchPath(explicit, env);
+    if (foundOnPath) {
+      return { path: foundOnPath.path, source: "env" };
+    }
+  }
+  const commonDirectories = dedupeDirectories([...options.commonDirectories ?? DEFAULT_COMMON_EXECUTABLE_DIRECTORIES], env);
+  const searchDirectories = dedupeDirectories([
+    ...splitPathEntries(env),
+    ...options.extraDirectories ?? [],
+    ...commonDirectories
+  ], env);
+  for (const directory of searchDirectories) {
+    for (const name of options.names) {
+      const candidate = join14(directory, name);
+      if (isExecutablePath(candidate)) {
+        return {
+          path: candidate,
+          source: commonDirectories.includes(directory) ? "common-path" : "path"
+        };
+      }
+    }
+  }
+  return null;
+}
+function resolveBunExecutable2(env = process.env) {
+  return resolveExecutableFromSearch({
+    env,
+    envKeys: ["OPENSCOUT_BUN_BIN", "SCOUT_BUN_BIN", "BUN_BIN"],
+    names: ["bun"]
+  });
+}
+function findExecutableOnSearchPath(name, env) {
+  const searchDirectories = dedupeDirectories([
+    ...splitPathEntries(env),
+    ...DEFAULT_COMMON_EXECUTABLE_DIRECTORIES
+  ], env);
+  for (const directory of searchDirectories) {
+    const candidate = join14(directory, name);
+    if (isExecutablePath(candidate)) {
+      return { path: candidate, source: "path" };
+    }
+  }
+  return null;
+}
+
+// ../runtime/src/broker-service.ts
 function isTmpPath(p) {
   return /^\/(?:private\/)?tmp\//.test(p);
 }
@@ -13627,17 +13985,17 @@ function runtimePackageDir() {
   const fromCwd = findWorkspaceRuntimeDir(process.cwd());
   if (fromCwd)
     return fromCwd;
-  const moduleDir = dirname5(fileURLToPath4(import.meta.url));
-  return resolve4(moduleDir, "..");
+  const moduleDir = dirname6(fileURLToPath4(import.meta.url));
+  return resolve5(moduleDir, "..");
 }
 function isInstalledRuntimePackageDir(candidate) {
-  return existsSync12(join14(candidate, "package.json")) && existsSync12(join14(candidate, "bin", "openscout-runtime.mjs"));
+  return existsSync13(join15(candidate, "package.json")) && existsSync13(join15(candidate, "bin", "openscout-runtime.mjs"));
 }
 function findGlobalRuntimeDir() {
   const candidates = [
-    join14(homedir13(), ".bun", "node_modules", "@openscout", "runtime"),
-    join14(homedir13(), ".bun", "install", "global", "node_modules", "@openscout", "runtime"),
-    join14(homedir13(), ".bun", "install", "global", "node_modules", "@openscout", "scout", "node_modules", "@openscout", "runtime")
+    join15(homedir14(), ".bun", "node_modules", "@openscout", "runtime"),
+    join15(homedir14(), ".bun", "install", "global", "node_modules", "@openscout", "runtime"),
+    join15(homedir14(), ".bun", "install", "global", "node_modules", "@openscout", "scout", "node_modules", "@openscout", "runtime")
   ];
   for (const c of candidates) {
     if (isInstalledRuntimePackageDir(c))
@@ -13647,11 +14005,11 @@ function findGlobalRuntimeDir() {
     const result = spawnSync("which", ["scout"], { encoding: "utf8", timeout: 3000 });
     const scoutBin = result.stdout?.trim();
     if (scoutBin) {
-      const scoutPkg = resolve4(scoutBin, "..", "..");
-      const nested = join14(scoutPkg, "node_modules", "@openscout", "runtime");
+      const scoutPkg = resolve5(scoutBin, "..", "..");
+      const nested = join15(scoutPkg, "node_modules", "@openscout", "runtime");
       if (isInstalledRuntimePackageDir(nested))
         return nested;
-      const sibling = resolve4(scoutPkg, "..", "runtime");
+      const sibling = resolve5(scoutPkg, "..", "runtime");
       if (isInstalledRuntimePackageDir(sibling))
         return sibling;
     }
@@ -13659,38 +14017,24 @@ function findGlobalRuntimeDir() {
   return null;
 }
 function findWorkspaceRuntimeDir(startDir) {
-  let current = resolve4(startDir);
+  let current = resolve5(startDir);
   while (true) {
-    const candidate = join14(current, "packages", "runtime");
-    if (existsSync12(join14(candidate, "package.json")) && existsSync12(join14(candidate, "src"))) {
+    const candidate = join15(current, "packages", "runtime");
+    if (existsSync13(join15(candidate, "package.json")) && existsSync13(join15(candidate, "src"))) {
       return candidate;
     }
-    const parent = dirname5(current);
+    const parent = dirname6(current);
     if (parent === current)
       return null;
     current = parent;
   }
 }
-function resolveBunExecutable2() {
-  const explicit = process.env.OPENSCOUT_BUN_BIN ?? process.env.BUN_BIN;
-  if (explicit && explicit.trim().length > 0) {
-    return explicit;
+function resolveBunExecutable3() {
+  const bun = resolveBunExecutable2(process.env);
+  if (bun) {
+    return bun.path;
   }
-  if (basename3(process.execPath).startsWith("bun") && existsSync12(process.execPath)) {
-    return process.execPath;
-  }
-  const pathEntries = (process.env.PATH ?? "").split(":").filter(Boolean);
-  for (const entry of pathEntries) {
-    const candidate = join14(entry, "bun");
-    if (existsSync12(candidate)) {
-      return candidate;
-    }
-  }
-  const homeBun = join14(homedir13(), ".bun", "bin", "bun");
-  if (existsSync12(homeBun)) {
-    return homeBun;
-  }
-  return "bun";
+  throw new Error("Unable to locate Bun for broker service management. Install Bun or set OPENSCOUT_BUN_BIN.");
 }
 function resolveBrokerServiceMode() {
   const explicit = (process.env.OPENSCOUT_BROKER_SERVICE_MODE ?? "").trim().toLowerCase();
@@ -13729,15 +14073,15 @@ function resolveBrokerServiceConfig() {
   const label = resolveBrokerServiceLabel(mode);
   const uid = typeof process.getuid === "function" ? process.getuid() : Number.parseInt(process.env.UID ?? "0", 10);
   const supportPaths = resolveOpenScoutSupportPaths();
-  const defaultSupportDir = join14(homedir13(), "Library", "Application Support", "OpenScout");
+  const defaultSupportDir = join15(homedir14(), "Library", "Application Support", "OpenScout");
   const supportDirectory = isTmpPath(supportPaths.supportDirectory) ? defaultSupportDir : supportPaths.supportDirectory;
-  const logsDirectory = join14(supportDirectory, "logs", "broker");
-  const controlHome = isTmpPath(supportPaths.controlHome) ? join14(homedir13(), ".openscout", "control-plane") : supportPaths.controlHome;
+  const logsDirectory = join15(supportDirectory, "logs", "broker");
+  const controlHome = isTmpPath(supportPaths.controlHome) ? join15(homedir14(), ".openscout", "control-plane") : supportPaths.controlHome;
   const advertiseScope = resolveAdvertiseScope();
   const brokerHost = resolveBrokerHost(advertiseScope);
   const brokerPort = Number.parseInt(process.env.OPENSCOUT_BROKER_PORT ?? String(DEFAULT_BROKER_PORT), 10);
   const brokerUrl = process.env.OPENSCOUT_BROKER_URL ?? buildDefaultBrokerUrl(brokerHost, brokerPort);
-  const launchAgentPath = join14(homedir13(), "Library", "LaunchAgents", `${label}.plist`);
+  const launchAgentPath = join15(homedir14(), "Library", "LaunchAgents", `${label}.plist`);
   return {
     label,
     mode,
@@ -13747,11 +14091,11 @@ function resolveBrokerServiceConfig() {
     launchAgentPath,
     supportDirectory,
     logsDirectory,
-    stdoutLogPath: join14(logsDirectory, "stdout.log"),
-    stderrLogPath: join14(logsDirectory, "stderr.log"),
+    stdoutLogPath: join15(logsDirectory, "stdout.log"),
+    stderrLogPath: join15(logsDirectory, "stderr.log"),
     controlHome,
     runtimePackageDir: runtimePackageDir(),
-    bunExecutable: resolveBunExecutable2(),
+    bunExecutable: resolveBunExecutable3(),
     brokerHost,
     brokerPort,
     brokerUrl,
@@ -13768,7 +14112,7 @@ function renderLaunchAgentPlist(config) {
     OPENSCOUT_BROKER_SERVICE_MODE: config.mode,
     OPENSCOUT_BROKER_SERVICE_LABEL: config.label,
     OPENSCOUT_ADVERTISE_SCOPE: config.advertiseScope,
-    HOME: homedir13(),
+    HOME: homedir14(),
     PATH: launchPath,
     ...collectOptionalEnvVars([
       "OPENSCOUT_MESH_ID",
@@ -13794,7 +14138,7 @@ function renderLaunchAgentPlist(config) {
   <key>ProgramArguments</key>
   <array>
     <string>${xmlEscape(config.bunExecutable)}</string>
-    <string>${xmlEscape(join14(config.runtimePackageDir, "bin", "openscout-runtime.mjs"))}</string>
+    <string>${xmlEscape(join15(config.runtimePackageDir, "bin", "openscout-runtime.mjs"))}</string>
     <string>broker</string>
   </array>
   <key>WorkingDirectory</key>
@@ -13829,7 +14173,7 @@ function collectOptionalEnvVars(keys) {
 }
 function resolveLaunchAgentPATH() {
   const entries = [
-    join14(homedir13(), ".bun", "bin"),
+    join15(homedir14(), ".bun", "bin"),
     ...(process.env.PATH ?? "").split(":").filter(Boolean),
     "/opt/homebrew/bin",
     "/usr/local/bin",
@@ -13844,7 +14188,7 @@ function xmlEscape(value) {
   return value.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll('"', "&quot;").replaceAll("'", "&apos;");
 }
 function ensureParentDirectory(filePath) {
-  mkdirSync8(dirname5(filePath), { recursive: true });
+  mkdirSync8(dirname6(filePath), { recursive: true });
 }
 function ensureServiceDirectories(config) {
   ensureOpenScoutCleanSlateSync();
@@ -13877,7 +14221,7 @@ function launchctlPath() {
   return "/bin/launchctl";
 }
 function readLogLines(path2) {
-  if (!existsSync12(path2)) {
+  if (!existsSync13(path2)) {
     return [];
   }
   return readFileSync7(path2, "utf8").split(`
@@ -13977,7 +14321,7 @@ async function brokerServiceStatus(config = resolveBrokerServiceConfig()) {
   ensureServiceDirectories(config);
   const launchctl = inspectLaunchctl(config);
   const health = await fetchHealthSnapshot(config);
-  const installed = existsSync12(config.launchAgentPath);
+  const installed = existsSync13(config.launchAgentPath);
   const lastLogLine = health.reachable ? readLastLogLine([config.stdoutLogPath, config.stderrLogPath]) : readLastLogLine([config.stderrLogPath, config.stdoutLogPath]);
   return {
     label: config.label,
@@ -14020,7 +14364,7 @@ async function startBrokerService(config = resolveBrokerServiceConfig()) {
   throw new Error(status.lastLogLine ?? status.health.error ?? "Broker service did not become healthy.");
 }
 function sleep(ms) {
-  return new Promise((resolve5) => setTimeout(resolve5, ms));
+  return new Promise((resolve6) => setTimeout(resolve6, ms));
 }
 async function stopBrokerService(config = resolveBrokerServiceConfig()) {
   runCommand(launchctlPath(), ["bootout", config.serviceTarget], { allowFailure: true });
@@ -14039,7 +14383,7 @@ async function restartBrokerService(config = resolveBrokerServiceConfig()) {
 }
 async function uninstallBrokerService(config = resolveBrokerServiceConfig()) {
   await stopBrokerService(config);
-  if (existsSync12(config.launchAgentPath)) {
+  if (existsSync13(config.launchAgentPath)) {
     rmSync2(config.launchAgentPath, { force: true });
   }
   return brokerServiceStatus(config);
@@ -14109,8 +14453,8 @@ var LOCAL_AGENT_SYSTEM_PROMPT_TEMPLATE_HINT = [
 ].join("");
 
 // ../runtime/src/local-agents.ts
-var MODULE_DIRECTORY = dirname6(fileURLToPath5(import.meta.url));
-var OPENSCOUT_REPO_ROOT = resolve5(MODULE_DIRECTORY, "..", "..", "..");
+var MODULE_DIRECTORY = dirname7(fileURLToPath5(import.meta.url));
+var OPENSCOUT_REPO_ROOT = resolve6(MODULE_DIRECTORY, "..", "..", "..");
 var DEFAULT_LOCAL_AGENT_CAPABILITIES = ["chat", "invoke", "deliver"];
 var DEFAULT_LOCAL_AGENT_HARNESS = "claude";
 function resolveRelayHub() {
@@ -14118,18 +14462,18 @@ function resolveRelayHub() {
 }
 function resolveProjectsRoot(projectPath) {
   if (process.env.OPENSCOUT_PROJECTS_ROOT?.trim()) {
-    return resolve5(process.env.OPENSCOUT_PROJECTS_ROOT.trim());
+    return resolve6(process.env.OPENSCOUT_PROJECTS_ROOT.trim());
   }
   try {
     const supportPaths = resolveOpenScoutSupportPaths();
-    if (!existsSync13(supportPaths.settingsPath)) {
-      return dirname6(projectPath);
+    if (!existsSync14(supportPaths.settingsPath)) {
+      return dirname7(projectPath);
     }
     const raw = JSON.parse(readFileSync8(supportPaths.settingsPath, "utf8"));
     const workspaceRoot = raw.discovery?.workspaceRoots?.find((entry) => typeof entry === "string" && entry.trim().length > 0);
-    return workspaceRoot ? resolve5(workspaceRoot) : dirname6(projectPath);
+    return workspaceRoot ? resolve6(workspaceRoot) : dirname7(projectPath);
   } catch {
-    return dirname6(projectPath);
+    return dirname7(projectPath);
   }
 }
 function resolveBrokerUrl() {
@@ -14139,7 +14483,7 @@ function nowSeconds2() {
   return Math.floor(Date.now() / 1000);
 }
 function scoutCliPath() {
-  return join15(OPENSCOUT_REPO_ROOT, "packages", "cli", "bin", "scout.mjs");
+  return join16(OPENSCOUT_REPO_ROOT, "packages", "cli", "bin", "scout.mjs");
 }
 function legacyNodeBrokerRelayCommand() {
   return `node ${JSON.stringify(scoutCliPath())}`;
@@ -14152,13 +14496,13 @@ function titleCaseLocalAgentName(value) {
 }
 function resolveScoutSkillPath() {
   const candidatePaths = [
-    join15(OPENSCOUT_REPO_ROOT, ".agents", "skills", "scout", "SKILL.md"),
-    join15(process.env.HOME ?? "", ".agents", "skills", "scout", "SKILL.md"),
-    join15(OPENSCOUT_REPO_ROOT, ".agents", "skills", "relay-agent-comms", "SKILL.md"),
-    join15(process.env.HOME ?? "", ".agents", "skills", "relay-agent-comms", "SKILL.md")
+    join16(OPENSCOUT_REPO_ROOT, ".agents", "skills", "scout", "SKILL.md"),
+    join16(process.env.HOME ?? "", ".agents", "skills", "scout", "SKILL.md"),
+    join16(OPENSCOUT_REPO_ROOT, ".agents", "skills", "relay-agent-comms", "SKILL.md"),
+    join16(process.env.HOME ?? "", ".agents", "skills", "relay-agent-comms", "SKILL.md")
   ];
   for (const path2 of candidatePaths) {
-    if (existsSync13(path2)) {
+    if (existsSync14(path2)) {
       return path2;
     }
   }
@@ -14209,7 +14553,7 @@ function buildLocalAgentCollaborationPrompt(context) {
 function buildLocalAgentTmuxProtocolPrompt(context) {
   return [
     "Relay protocol:",
-    `  - Read recent context with: ${context.relayCommand} read --as ${context.agentId}`,
+    `  - Read recent context when needed with: ${context.relayCommand} latest --agent ${context.agentId} --limit 20`,
     `  - Tell one agent with: ${context.relayCommand} send --as ${context.agentId} "@<agent> your message"`,
     `  - Ask one agent and stay attached with: ${context.relayCommand} ask --to <agent> --as ${context.agentId} "your request"`,
     "",
@@ -14221,9 +14565,10 @@ function buildLocalAgentTmuxProtocolPrompt(context) {
     "  - If you need multiple agents, use separate DMs or an explicit channel; do not guess a venue from multiple mentions",
     "  - Do not use channel.shared for ordinary delegation or follow-up; reserve it for explicit group updates or broadcasts",
     "  - If a short @handle may be ambiguous, resolve the exact target before sending; do not guess and do not fall back to shared",
+    "  - Treat known offline / on-demand agents as wakeable: use send or ask first and let the broker wake them; only surface ambiguity or unknown-target failures to the operator",
     "  - Use send for tells and status; use ask when the meaning is 'do this and get back to me'",
     "  - When replying to an [ask:<id>] request, include the same [ask:<id>] tag in your reply",
-    "  - Use the broker-backed relay read command above to inspect recent context before responding",
+    "  - Use the broker-backed latest command above only when recent context is needed before responding",
     `  - Follow the scout skill at ${context.scoutSkill} for agent-to-agent communication`
   ].join(`
 `);
@@ -14234,7 +14579,7 @@ function buildLocalAgentDirectProtocolPrompt(context) {
     "  - You are invoked directly by the OpenScout broker",
     "  - Return your final answer in the assistant message for the current turn",
     "  - Do not shell out to send the final answer through relay yourself",
-    `  - If you need recent relay context, inspect it with: ${context.relayCommand} read --as ${context.agentId}`,
+    `  - If you need recent broker context, inspect it with: ${context.relayCommand} latest --agent ${context.agentId} --limit 20`,
     `  - If you need to tell one agent something, use: ${context.relayCommand} send --as ${context.agentId} "@<agent> your message"`,
     `  - If you need another agent to do work, use: ${context.relayCommand} ask --to <agent> --as ${context.agentId} "your request"`,
     "  - Default Scout loop: resolve identity, resolve one target, choose DM vs explicit channel, keep follow-up in that same venue",
@@ -14242,6 +14587,7 @@ function buildLocalAgentDirectProtocolPrompt(context) {
     "  - If you need multiple agents, use separate DMs or an explicit channel; do not guess a venue from multiple mentions",
     "  - Do not use channel.shared for ordinary delegation or follow-up; reserve it for explicit group updates or broadcasts",
     "  - If a short @handle may be ambiguous, resolve the exact target before sending; do not guess and do not fall back to shared",
+    "  - Treat known offline / on-demand agents as wakeable: use send or ask first and let the broker wake them; only surface ambiguity or unknown-target failures to the operator",
     "  - Use send for tells and status; use ask when the meaning is 'do this and get back to me'",
     `  - Follow the scout skill at ${context.scoutSkill} for agent-to-agent communication`
   ].join(`
@@ -14304,7 +14650,7 @@ function buildLegacySimpleRelayPrompt(agentId, projectName, projectPath, relayCo
     "A primary agent may call into you for context, execution, follow-through, and handoff.",
     "",
     `You have full access to the codebase at ${projectPath}.`,
-    `There is a structured relay event stream at ${join15(relayHub, "channel.jsonl")} shared by all agents.`,
+    `There is a structured relay event stream at ${join16(relayHub, "channel.jsonl")} shared by all agents.`,
     "",
     "Your job:",
     `  - Respond to @${agentId} mentions from other agents`,
@@ -14408,17 +14754,17 @@ async function writeLocalAgentRegistry(registry) {
   }
   await writeRelayAgentOverrides(nextOverrides);
 }
-function expandHomePath3(value) {
+function expandHomePath4(value) {
   if (value === "~") {
     return process.env.HOME ?? process.cwd();
   }
   if (value.startsWith("~/")) {
-    return join15(process.env.HOME ?? process.cwd(), value.slice(2));
+    return join16(process.env.HOME ?? process.cwd(), value.slice(2));
   }
   return value;
 }
 function normalizeProjectPath(value) {
-  return resolve5(expandHomePath3(value.trim() || "."));
+  return resolve6(expandHomePath4(value.trim() || "."));
 }
 function normalizeTmuxSessionName2(value, agentId) {
   const fallback = `relay-${agentId}`;
@@ -14681,7 +15027,7 @@ function recordForHarness(record, harnessOverride) {
 function normalizeLocalAgentRecord(agentId, record) {
   const cwd = normalizeProjectPath(record.cwd || process.cwd());
   const projectRoot = normalizeProjectPath(record.projectRoot || cwd);
-  const project = record.project?.trim() || basename4(projectRoot);
+  const project = record.project?.trim() || basename5(projectRoot);
   const definitionId = record.definitionId?.trim() || agentId;
   const defaultHarness = activeLocalHarness(record);
   const harnessProfiles = normalizeLocalHarnessProfiles(agentId, {
@@ -14746,7 +15092,7 @@ function localAgentRecordFromResolvedConfig(config) {
 function localAgentRecordFromRelayAgentOverride(agentId, override) {
   return normalizeLocalAgentRecord(agentId, {
     definitionId: override.definitionId ?? agentId,
-    project: override.projectName ?? basename4(override.projectRoot || override.runtime?.cwd || agentId),
+    project: override.projectName ?? basename5(override.projectRoot || override.runtime?.cwd || agentId),
     projectRoot: override.projectRoot ?? override.runtime?.cwd,
     tmuxSession: override.runtime?.sessionId ?? `relay-${agentId}`,
     cwd: override.runtime?.cwd ?? override.projectRoot,
@@ -14842,7 +15188,7 @@ function buildLocalAgentBootstrapPrompt(_harness, _systemPrompt, initialMessage)
 function buildLocalAgentLaunchCommand(agentName, record, projectPath, promptFile, workerScript) {
   const extraArgs = shellQuoteArguments(normalizeLaunchArgsForHarness(normalizeLocalAgentHarness(record.harness), record.launchArgs));
   if (normalizeLocalAgentHarness(record.harness) === "codex") {
-    return `exec bash ${JSON.stringify(workerScript ?? join15(relayAgentRuntimeDirectory(agentName), "codex-worker.sh"))}`;
+    return `exec bash ${JSON.stringify(workerScript ?? join16(relayAgentRuntimeDirectory(agentName), "codex-worker.sh"))}`;
   }
   return [
     "claude",
@@ -14888,7 +15234,7 @@ async function ensureLocalAgentOnline(agentName, record) {
     return normalizedRecord;
   }
   const projectPath = normalizedRecord.cwd;
-  const projectName = normalizedRecord.project || basename4(projectPath);
+  const projectName = normalizedRecord.project || basename5(projectPath);
   const systemPromptTemplate = normalizedRecord.systemPrompt || buildLocalAgentSystemPromptTemplate();
   const systemPrompt = renderLocalAgentSystemPromptTemplate(systemPromptTemplate, buildLocalAgentTemplateContext(agentName, projectName, projectPath), { transport: normalizedRecord.transport });
   const agentRuntimeDir = relayAgentRuntimeDirectory(agentName);
@@ -14896,7 +15242,7 @@ async function ensureLocalAgentOnline(agentName, record) {
   await mkdir6(agentRuntimeDir, { recursive: true });
   await mkdir6(logsDir, { recursive: true });
   if (normalizedRecord.transport === "codex_app_server") {
-    await writeFile6(join15(agentRuntimeDir, "prompt.txt"), systemPrompt);
+    await writeFile6(join16(agentRuntimeDir, "prompt.txt"), systemPrompt);
     await ensureCodexAppServerAgentOnline(buildCodexAgentSessionOptions(agentName, normalizedRecord, systemPrompt));
     const registry2 = await readLocalAgentRegistry();
     registry2[agentName] = {
@@ -14908,7 +15254,7 @@ async function ensureLocalAgentOnline(agentName, record) {
     return registry2[agentName];
   }
   if (normalizedRecord.transport === "claude_stream_json") {
-    await writeFile6(join15(agentRuntimeDir, "prompt.txt"), systemPrompt);
+    await writeFile6(join16(agentRuntimeDir, "prompt.txt"), systemPrompt);
     await ensureClaudeStreamJsonAgentOnline(buildClaudeAgentSessionOptions(agentName, normalizedRecord, systemPrompt));
     const registry2 = await readLocalAgentRegistry();
     registry2[agentName] = {
@@ -14921,17 +15267,17 @@ async function ensureLocalAgentOnline(agentName, record) {
   }
   const initialMessage = buildLocalAgentInitialMessage(projectName, agentName);
   const bootstrapPrompt = buildLocalAgentBootstrapPrompt(normalizeLocalAgentHarness(normalizedRecord.harness), systemPrompt, initialMessage);
-  const queueDirectory = join15(agentRuntimeDir, "queue");
-  const processingDirectory = join15(queueDirectory, "processing");
-  const processedDirectory = join15(queueDirectory, "processed");
-  const promptFile = join15(agentRuntimeDir, "prompt.txt");
-  const initialFile = join15(agentRuntimeDir, "initial.txt");
-  const launchScript = join15(agentRuntimeDir, "launch.sh");
-  const workerScript = join15(agentRuntimeDir, "codex-worker.sh");
-  const codexSessionIdFile = join15(agentRuntimeDir, "codex-session-id.txt");
-  const stateFile = join15(agentRuntimeDir, "state.json");
-  const stdoutLogFile = join15(logsDir, "stdout.log");
-  const stderrLogFile = join15(logsDir, "stderr.log");
+  const queueDirectory = join16(agentRuntimeDir, "queue");
+  const processingDirectory = join16(queueDirectory, "processing");
+  const processedDirectory = join16(queueDirectory, "processed");
+  const promptFile = join16(agentRuntimeDir, "prompt.txt");
+  const initialFile = join16(agentRuntimeDir, "initial.txt");
+  const launchScript = join16(agentRuntimeDir, "launch.sh");
+  const workerScript = join16(agentRuntimeDir, "codex-worker.sh");
+  const codexSessionIdFile = join16(agentRuntimeDir, "codex-session-id.txt");
+  const stateFile = join16(agentRuntimeDir, "state.json");
+  const stdoutLogFile = join16(logsDir, "stdout.log");
+  const stderrLogFile = join16(logsDir, "stderr.log");
   await writeFile6(promptFile, systemPrompt);
   await writeFile6(initialFile, bootstrapPrompt);
   await writeFile6(stderrLogFile, "");
@@ -14993,10 +15339,10 @@ async function ensureLocalAgentOnline(agentName, record) {
     if (isLocalAgentSessionAlive(normalizedRecord.tmuxSession)) {
       break;
     }
-    await new Promise((resolve6) => setTimeout(resolve6, 100));
+    await new Promise((resolve7) => setTimeout(resolve7, 100));
   }
   if (!isLocalAgentSessionAlive(normalizedRecord.tmuxSession)) {
-    const stderrTail = existsSync13(stderrLogFile) ? readFileSync8(stderrLogFile, "utf8").trim().split(/\r?\n/).slice(-10).join(`
+    const stderrTail = existsSync14(stderrLogFile) ? readFileSync8(stderrLogFile, "utf8").trim().split(/\r?\n/).slice(-10).join(`
 `).trim() : "";
     throw new Error(stderrTail ? `Relay agent ${agentName} failed to stay online:
 ${stderrTail}` : `Relay agent ${agentName} failed to stay online.`);
@@ -15051,6 +15397,7 @@ async function startLocalAgent(input) {
   const preferredHarness = input.harness ? normalizeLocalAgentHarness(input.harness) : undefined;
   const currentDirectory = input.currentDirectory ?? projectPath;
   const effectiveCwd = input.cwdOverride ? normalizeProjectPath(input.cwdOverride) : undefined;
+  const shouldEnsureOnline = input.ensureOnline !== false;
   const requestedDefinitionId = input.agentName?.trim() ? normalizeAgentSelectorSegment(input.agentName.trim()) : "";
   if (input.agentName?.trim() && !requestedDefinitionId) {
     throw new Error(`Invalid agent name "${input.agentName}".`);
@@ -15098,7 +15445,7 @@ async function startLocalAgent(input) {
   }
   if (!matchingOverride) {
     const configDefinitionId = coldProjectConfig?.agent?.id?.trim() ? normalizeAgentSelectorSegment(coldProjectConfig.agent.id.trim()) : "";
-    const definitionId = requestedDefinitionId || configDefinitionId || normalizeAgentSelectorSegment(basename4(projectRoot)) || "agent";
+    const definitionId = requestedDefinitionId || configDefinitionId || normalizeAgentSelectorSegment(basename5(projectRoot)) || "agent";
     const configDisplayName = coldProjectConfig?.agent?.displayName?.trim() || "";
     const effectiveDisplayName = input.displayName || configDisplayName || titleCaseLocalAgentName(definitionId);
     const instance = buildRelayAgentInstance(definitionId, projectRoot);
@@ -15115,7 +15462,7 @@ async function startLocalAgent(input) {
       agentId: instance.id,
       definitionId,
       displayName: effectiveDisplayName,
-      projectName: basename4(projectRoot),
+      projectName: basename5(projectRoot),
       projectRoot,
       projectConfigPath: coldProjectConfigPath,
       source: "manual",
@@ -15155,7 +15502,7 @@ async function startLocalAgent(input) {
       agentId: instance.id,
       definitionId: requestedDefinitionId,
       displayName: input.displayName || titleCaseLocalAgentName(requestedDefinitionId),
-      projectName: matchingOverride.projectName ?? basename4(matchingProjectRoot),
+      projectName: matchingOverride.projectName ?? basename5(matchingProjectRoot),
       projectRoot: matchingProjectRoot,
       projectConfigPath: matchingOverride.projectConfigPath ?? null,
       source: "manual",
@@ -15200,12 +15547,14 @@ async function startLocalAgent(input) {
     }
     targetAgentId = matchingAgentId;
   }
-  await ensureLocalAgentBindingOnline(targetAgentId, process.env.OPENSCOUT_NODE_ID ?? "local", {
-    includeDiscovered: false,
-    currentDirectory,
-    ensureCurrentProjectConfig: false,
-    harness: preferredHarness
-  });
+  if (shouldEnsureOnline) {
+    await ensureLocalAgentBindingOnline(targetAgentId, process.env.OPENSCOUT_NODE_ID ?? "local", {
+      includeDiscovered: false,
+      currentDirectory,
+      ensureCurrentProjectConfig: false,
+      harness: preferredHarness
+    });
+  }
   const finalOverrides = await readRelayAgentOverrides();
   const finalOverride = finalOverrides[targetAgentId];
   if (!finalOverride) {
@@ -15271,8 +15620,8 @@ async function interruptLocalAgent(agentId) {
 function readPersistedClaudeSessionId(agentName) {
   try {
     const runtimeDir = relayAgentRuntimeDirectory(agentName);
-    const catalogPath = join15(runtimeDir, "session-catalog.json");
-    if (existsSync13(catalogPath)) {
+    const catalogPath = join16(runtimeDir, "session-catalog.json");
+    if (existsSync14(catalogPath)) {
       const raw = readFileSync8(catalogPath, "utf8").trim();
       if (raw) {
         const catalog = JSON.parse(raw);
@@ -15281,8 +15630,8 @@ function readPersistedClaudeSessionId(agentName) {
         }
       }
     }
-    const legacyPath = join15(runtimeDir, "claude-session-id.txt");
-    if (existsSync13(legacyPath)) {
+    const legacyPath = join16(runtimeDir, "claude-session-id.txt");
+    if (existsSync14(legacyPath)) {
       const value = readFileSync8(legacyPath, "utf8").trim();
       return value || null;
     }
@@ -15476,6 +15825,7 @@ var scoutBrokerPaths = {
     endpoints: "/v1/endpoints",
     conversations: "/v1/conversations",
     invocations: "/v1/invocations",
+    deliver: "/v1/deliver",
     activity: "/v1/activity",
     collaborationRecords: "/v1/collaboration/records",
     collaborationEvents: "/v1/collaboration/events"
@@ -15505,29 +15855,6 @@ function titleCaseName(value) {
 function displayNameForBrokerActor(snapshot, actorId) {
   return snapshot.agents[actorId]?.displayName ?? snapshot.actors[actorId]?.displayName ?? titleCaseName(metadataString2(snapshot.agents[actorId]?.metadata, "definitionId") || actorId);
 }
-function firstEndpointForActor(snapshot, actorId) {
-  return Object.values(snapshot.endpoints).filter((endpoint) => endpoint.agentId === actorId).sort((lhs, rhs) => lhs.id.localeCompare(rhs.id))[0];
-}
-function buildScoutReturnAddress2(snapshot, actorId, options = {}) {
-  const agent = snapshot.agents[actorId];
-  const actor = snapshot.actors[actorId];
-  const endpoint = firstEndpointForActor(snapshot, actorId);
-  const selector = agent?.selector?.trim() || metadataString2(agent?.metadata, "selector") || metadataString2(actor?.metadata, "selector");
-  const defaultSelector = agent?.defaultSelector?.trim() || metadataString2(agent?.metadata, "defaultSelector") || metadataString2(actor?.metadata, "defaultSelector");
-  const projectRoot = endpoint?.projectRoot ?? endpoint?.cwd ?? metadataString2(agent?.metadata, "projectRoot") ?? metadataString2(actor?.metadata, "projectRoot");
-  return buildScoutReturnAddress({
-    actorId,
-    handle: agent?.handle?.trim() || actor?.handle?.trim() || actorId,
-    displayName: agent?.displayName || actor?.displayName,
-    selector,
-    defaultSelector,
-    conversationId: options.conversationId,
-    replyToMessageId: options.replyToMessageId,
-    nodeId: endpoint?.nodeId || agent?.authorityNodeId || agent?.homeNodeId,
-    projectRoot,
-    sessionId: endpoint?.sessionId
-  });
-}
 function metadataString2(metadata, key) {
   const value = metadata?.[key];
   return typeof value === "string" && value.trim().length > 0 ? value.trim() : undefined;
@@ -15830,74 +16157,42 @@ async function openScoutPeerSession(input) {
   };
 }
 async function sendScoutDirectMessage(input) {
-  const currentDirectory = input.currentDirectory ?? process.cwd();
-  const directSession = await openScoutPeerSession({
-    sourceId: OPERATOR_ID,
-    targetId: input.agentId,
-    currentDirectory
-  });
   const broker = await requireScoutBrokerContext();
   const createdAt = Date.now();
-  const messageId = `msg-${createdAt.toString(36)}-${Math.random().toString(36).slice(2, 8)}`;
   const source = input.source?.trim() || "scout-mobile";
-  const targetAgentId = directSession.targetId;
-  const targetAgent = broker.snapshot.agents[targetAgentId] ?? ("agent" in directSession ? directSession.agent : undefined);
-  const targetLabel = `@${targetAgent?.handle?.trim() || targetAgent?.displayName?.trim() || targetAgentId}`;
-  const returnAddress = buildScoutReturnAddress2(broker.snapshot, OPERATOR_ID, {
-    conversationId: directSession.conversation.id,
-    replyToMessageId: messageId
-  });
-  await brokerPostJson(broker.baseUrl, scoutBrokerPaths.v1.messages, {
-    id: messageId,
-    conversationId: directSession.conversation.id,
-    replyToMessageId: input.replyToMessageId ?? undefined,
-    actorId: OPERATOR_ID,
-    originNodeId: broker.node.id,
-    class: "agent",
+  const delivery = await brokerPostJson(broker.baseUrl, scoutBrokerPaths.v1.deliver, {
+    id: `deliver-${createdAt.toString(36)}-${Math.random().toString(36).slice(2, 8)}`,
+    requesterId: OPERATOR_ID,
+    requesterNodeId: broker.node.id,
+    targetAgentId: input.agentId,
     body: input.body.trim(),
-    mentions: [{ actorId: targetAgentId, label: targetLabel }],
-    audience: {
-      notify: [targetAgentId],
-      reason: "direct_message"
-    },
-    visibility: "private",
-    policy: "durable",
+    intent: "consult",
+    replyToMessageId: input.replyToMessageId ?? undefined,
+    execution: input.executionHarness ? { harness: input.executionHarness } : undefined,
+    ensureAwake: true,
     createdAt,
-    metadata: {
+    messageMetadata: {
       source,
       destinationKind: "direct",
-      destinationId: targetAgentId,
+      destinationId: input.agentId,
       referenceMessageIds: input.referenceMessageIds ?? [],
       clientMessageId: input.clientMessageId ?? null,
-      returnAddress,
       ...input.deviceId ? { deviceId: input.deviceId } : {}
-    }
-  });
-  const invocationResponse = await brokerPostJson(broker.baseUrl, scoutBrokerPaths.v1.invocations, {
-    id: `inv-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}`,
-    requesterId: OPERATOR_ID,
-    requesterNodeId: broker.node.id,
-    targetAgentId,
-    action: "consult",
-    task: input.body.trim(),
-    conversationId: directSession.conversation.id,
-    messageId,
-    execution: input.executionHarness ? { harness: input.executionHarness } : undefined,
-    ensureAwake: true,
-    stream: false,
-    createdAt,
-    metadata: {
+    },
+    invocationMetadata: {
       source,
       destinationKind: "direct",
-      destinationId: targetAgentId,
-      returnAddress,
+      destinationId: input.agentId,
       ...input.deviceId ? { deviceId: input.deviceId } : {}
     }
   });
+  if (delivery.kind !== "delivery") {
+    throw new Error(delivery.kind === "question" ? delivery.question.detail : delivery.rejection.detail);
+  }
   return {
-    conversationId: directSession.conversation.id,
-    messageId,
-    flight: invocationResponse.flight
+    conversationId: delivery.conversation.id,
+    messageId: delivery.message.id,
+    flight: delivery.flight
   };
 }
 async function loadScoutActivityItems(options = {}) {
@@ -15924,11 +16219,11 @@ async function upScoutAgent(input) {
 
 // ../../apps/desktop/src/server/db-queries.ts
 import { Database } from "bun:sqlite";
-import { homedir as homedir14 } from "os";
-import { join as join16 } from "path";
+import { homedir as homedir15 } from "os";
+import { join as join17 } from "path";
 function resolveDbPath() {
-  const controlHome = process.env.OPENSCOUT_CONTROL_HOME ?? join16(homedir14(), ".openscout", "control-plane");
-  return join16(controlHome, "control-plane.sqlite");
+  const controlHome = process.env.OPENSCOUT_CONTROL_HOME ?? join17(homedir15(), ".openscout", "control-plane");
+  return join17(controlHome, "control-plane.sqlite");
 }
 var _db = null;
 function db() {
@@ -15939,7 +16234,7 @@ function db() {
   }
   return _db;
 }
-var HOME = homedir14();
+var HOME = homedir15();
 function compact(p) {
   if (!p)
     return null;
@@ -16595,8 +16890,8 @@ async function createScoutSession(input, currentDirectory, deviceId) {
   if (!rawWorkspaceId) {
     throw new Error(`Invalid workspaceId.`);
   }
-  const workspaceRoot = resolve6(rawWorkspaceId);
-  const projectName = basename5(workspaceRoot) || workspaceRoot;
+  const workspaceRoot = resolve7(rawWorkspaceId);
+  const projectName = basename6(workspaceRoot) || workspaceRoot;
   const workspace = {
     id: workspaceRoot,
     title: projectName,
@@ -16705,17 +17000,17 @@ async function deriveNewAgentName(projectName, branch, harness) {
 }
 async function createGitWorktree(projectRoot, agentName) {
   const { execSync: execSync3 } = await import("child_process");
-  const { join: join17 } = await import("path");
-  const { mkdirSync: mkdirSync9, existsSync: existsSync14 } = await import("fs");
+  const { join: join18 } = await import("path");
+  const { mkdirSync: mkdirSync9, existsSync: existsSync15 } = await import("fs");
   try {
     execSync3("git rev-parse --git-dir", { cwd: projectRoot, stdio: "pipe" });
   } catch {
     return null;
   }
   const branchName = `scout/${agentName}`;
-  const worktreeDir = join17(projectRoot, ".scout-worktrees");
-  const worktreePath = join17(worktreeDir, agentName);
-  if (existsSync14(worktreePath)) {
+  const worktreeDir = join18(projectRoot, ".scout-worktrees");
+  const worktreePath = join18(worktreeDir, agentName);
+  if (existsSync15(worktreePath)) {
     return { path: worktreePath, branch: branchName };
   }
   mkdirSync9(worktreeDir, { recursive: true });
@@ -16919,9 +17214,9 @@ async function handleRPCInner(bridge, req, deviceId) {
       }
       case "session/resume": {
         const p = req.params;
-        const sessionFilename = basename6(p.sessionPath, ".jsonl");
+        const sessionFilename = basename7(p.sessionPath, ".jsonl");
         const parentDir = p.sessionPath.substring(0, p.sessionPath.lastIndexOf("/"));
-        const dirName = basename6(parentDir);
+        const dirName = basename7(parentDir);
         let cwd;
         if (dirName.startsWith("-")) {
           const candidate = "/" + dirName.slice(1).replace(/-/g, "/");
@@ -16988,7 +17283,7 @@ async function handleRPCInner(bridge, req, deviceId) {
           return { id: req.id, error: { code: -32000, message: "Workspace target is not a directory" } };
         }
         const adapterType = p.adapter ?? "claude-code";
-        const name = p.name ?? basename6(projectPath);
+        const name = p.name ?? basename7(projectPath);
         const session = await bridge.createSession(adapterType, {
           name,
           cwd: projectPath
@@ -17228,13 +17523,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 : join17(normalizedRoot, expandedPath) : normalizedRoot;
+  const expandedPath = requestedPath?.replace(/^~/, homedir16());
+  const candidate = expandedPath ? isAbsolute3(expandedPath) ? expandedPath : join18(normalizedRoot, expandedPath) : normalizedRoot;
   const resolvedCandidate = realpathSync(candidate);
   const rel = relative2(normalizedRoot, resolvedCandidate);
   if (rel === "" || !rel.startsWith("..") && !isAbsolute3(rel)) {
@@ -17264,7 +17559,7 @@ function listDirectories(dirPath) {
       continue;
     if (name === "node_modules" || name === ".build" || name === "target")
       continue;
-    const fullPath = join17(dirPath, name);
+    const fullPath = join18(dirPath, name);
     try {
       const stat4 = statSync3(fullPath);
       if (!stat4.isDirectory())
@@ -17287,7 +17582,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" },
@@ -31829,7 +32124,7 @@ import { Database as Database2 } from "bun:sqlite";
 import { mkdirSync as mkdirSync9, readFileSync as readFileSync10 } from "fs";
 import { connect as connectHttp2 } from "http2";
 import { createPrivateKey, sign as signWithKey } from "crypto";
-import { dirname as dirname7, join as join18 } from "path";
+import { dirname as dirname8, join as join19 } from "path";
 var MOBILE_PUSH_SCHEMA = `
 CREATE TABLE IF NOT EXISTS mobile_push_registrations (
   id TEXT PRIMARY KEY,
@@ -31857,7 +32152,7 @@ var dbHandle = null;
 var dbPath = null;
 var cachedApnsJwt = null;
 function resolveControlPlaneDbPath() {
-  return join18(resolveOpenScoutSupportPaths().controlHome, "control-plane.sqlite");
+  return join19(resolveOpenScoutSupportPaths().controlHome, "control-plane.sqlite");
 }
 function ensureMobilePushSchema(database) {
   database.exec("PRAGMA busy_timeout = 5000;");
@@ -31871,7 +32166,7 @@ function writeDb() {
     dbHandle = null;
   }
   if (!dbHandle) {
-    mkdirSync9(dirname7(nextPath), { recursive: true });
+    mkdirSync9(dirname8(nextPath), { recursive: true });
     dbHandle = new Database2(nextPath, { create: true });
     dbPath = nextPath;
     ensureMobilePushSchema(dbHandle);
@@ -32087,7 +32382,7 @@ async function sendApnsAlertToRegistration(registration, alert) {
     },
     ...alert.payload ? { scout: alert.payload } : {}
   });
-  return new Promise((resolve7, reject) => {
+  return new Promise((resolve8, reject) => {
     const client = connectHttp2(authority);
     client.once("error", reject);
     const request = client.request({
@@ -32125,7 +32420,7 @@ async function sendApnsAlertToRegistration(registration, alert) {
         }
       }
       if (status === 200) {
-        resolve7({
+        resolve8({
           delivered: true,
           skipped: false,
           status,
@@ -32137,7 +32432,7 @@ async function sendApnsAlertToRegistration(registration, alert) {
       if (reason === "BadDeviceToken" || reason === "Unregistered") {
         deleteMobilePushRegistrationByToken(registration.pushToken);
       }
-      resolve7({
+      resolve8({
         delivered: false,
         skipped: false,
         status,
@@ -32200,8 +32495,8 @@ async function broadcastApnsAlertToActiveMobileDevices(alert) {
 // ../../apps/desktop/src/core/pairing/runtime/bridge/router.ts
 import { readFileSync as readFileSync11, readdirSync as readdirSync4, realpathSync as realpathSync2, statSync as statSync4 } from "fs";
 import { execSync as execSync4 } from "child_process";
-import { basename as basename7, isAbsolute as isAbsolute4, join as join19, relative as relative3 } from "path";
-import { homedir as homedir16 } from "os";
+import { basename as basename8, isAbsolute as isAbsolute4, join as join20, relative as relative3 } from "path";
+import { homedir as homedir17 } from "os";
 var t = initTRPC.context().create();
 var logged = t.middleware(async ({ path: path2, type, next }) => {
   const start = Date.now();
@@ -32228,13 +32523,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 : join19(normalizedRoot, expandedPath) : normalizedRoot;
+  const expandedPath = requestedPath?.replace(/^~/, homedir17());
+  const candidate = expandedPath ? isAbsolute4(expandedPath) ? expandedPath : join20(normalizedRoot, expandedPath) : normalizedRoot;
   const resolvedCandidate = realpathSync2(candidate);
   const rel = relative3(normalizedRoot, resolvedCandidate);
   if (rel === "" || !rel.startsWith("..") && !isAbsolute4(rel)) {
@@ -32264,7 +32559,7 @@ function listDirectories2(dirPath) {
       continue;
     if (name === "node_modules" || name === ".build" || name === "target")
       continue;
-    const fullPath = join19(dirPath, name);
+    const fullPath = join20(dirPath, name);
     try {
       const stat4 = statSync4(fullPath);
       if (!stat4.isDirectory())
@@ -32303,7 +32598,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" },
@@ -32385,23 +32680,23 @@ function bridgeEventIterable(bridge, signal) {
   return {
     [Symbol.asyncIterator]() {
       const buffer = [];
-      let resolve7 = null;
+      let resolve8 = null;
       let done = false;
       const unsub = bridge.onEvent((event) => {
         if (done)
           return;
         buffer.push(event);
-        if (resolve7) {
-          resolve7();
-          resolve7 = null;
+        if (resolve8) {
+          resolve8();
+          resolve8 = null;
         }
       });
       const cleanup = () => {
         done = true;
         unsub();
-        if (resolve7) {
-          resolve7();
-          resolve7 = null;
+        if (resolve8) {
+          resolve8();
+          resolve8 = null;
         }
       };
       signal?.addEventListener("abort", cleanup, { once: true });
@@ -32414,7 +32709,7 @@ function bridgeEventIterable(bridge, signal) {
               return { done: false, value: buffer.shift() };
             }
             await new Promise((r) => {
-              resolve7 = r;
+              resolve8 = r;
             });
           }
         },
@@ -32543,9 +32838,9 @@ var sessionRouter = t.router({
     adapterType: exports_external.string().optional(),
     name: exports_external.string().optional()
   })).mutation(async ({ input, ctx }) => {
-    const sessionFilename = basename7(input.sessionPath, ".jsonl");
+    const sessionFilename = basename8(input.sessionPath, ".jsonl");
     const parentDir = input.sessionPath.substring(0, input.sessionPath.lastIndexOf("/"));
-    const dirName = basename7(parentDir);
+    const dirName = basename8(parentDir);
     let cwd;
     if (dirName.startsWith("-")) {
       const candidate = "/" + dirName.slice(1).replace(/-/g, "/");
@@ -32845,7 +33140,7 @@ var workspaceRouter = t.router({
       });
     }
     const adapterType = input.adapter ?? "claude-code";
-    const name = input.name ?? basename7(projectPath);
+    const name = input.name ?? basename8(projectPath);
     return ctx.bridge.createSession(adapterType, {
       name,
       cwd: projectPath
@@ -33092,7 +33387,8 @@ var BACKOFF_MULTIPLIER = 2;
 var LEGACY_CLIENT_ID = "__legacy__";
 function connectToRelay(relayUrl, identity2, bridge, options = {}) {
   const { secure = true, events: events2 } = options;
-  const qrPayload = createQRPayload(identity2.publicKey, relayUrl);
+  const publicRelayUrl = options.publicRelayUrl?.trim() || relayUrl;
+  const qrPayload = createQRPayload(identity2.publicKey, publicRelayUrl, options.fallbackRelayUrls);
   let ws = null;
   let eventUnsub = null;
   let stopped = false;
@@ -33106,12 +33402,12 @@ function connectToRelay(relayUrl, identity2, bridge, options = {}) {
     const bridgeKeyHex = bytesToHex2(identity2.publicKey);
     const url2 = buildRelayUrl(relayUrl, qrPayload.room, bridgeKeyHex);
     console.log(`[relay-client] connecting to relay (room: ${qrPayload.room})`);
-    events2?.onConnecting?.({ relayUrl, room: qrPayload.room });
+    events2?.onConnecting?.({ relayUrl: publicRelayUrl, room: qrPayload.room });
     ws = new WebSocket(url2, relayWebSocketOptions(relayUrl));
     ws.addEventListener("open", () => {
       console.log(`[relay-client] connected to relay (room: ${qrPayload.room})`);
       backoff = INITIAL_BACKOFF_MS;
-      events2?.onConnected?.({ relayUrl, room: qrPayload.room });
+      events2?.onConnected?.({ relayUrl: publicRelayUrl, room: qrPayload.room });
     });
     ws.addEventListener("message", (event) => {
       handleRelaySocketMessage(event.data);
@@ -33119,7 +33415,7 @@ function connectToRelay(relayUrl, identity2, bridge, options = {}) {
     ws.addEventListener("close", (event) => {
       console.log(`[relay-client] disconnected (code: ${event.code}, reason: ${event.reason})`);
       events2?.onClosed?.({
-        relayUrl,
+        relayUrl: publicRelayUrl,
         room: qrPayload.room,
         code: event.code,
         reason: event.reason
@@ -33130,7 +33426,7 @@ function connectToRelay(relayUrl, identity2, bridge, options = {}) {
     ws.addEventListener("error", () => {
       const error48 = new Error("Relay websocket error");
       console.error("[relay-client] connection error");
-      events2?.onError?.({ relayUrl, room: qrPayload.room, error: error48 });
+      events2?.onError?.({ relayUrl: publicRelayUrl, room: qrPayload.room, error: error48 });
     });
   }
   function handleRelaySocketMessage(raw) {
@@ -33184,7 +33480,7 @@ function connectToRelay(relayUrl, identity2, bridge, options = {}) {
         replaceOlderPeerForSameDevice(peer);
         ensureBridgeEventSubscription();
         console.log(`[relay-client] secure handshake complete (peer: ${pubHex.slice(0, 12)}..., device: ${peer.deviceId}, client: ${clientId})`);
-        events2?.onPaired?.({ relayUrl, room: qrPayload.room, remotePublicKey });
+        events2?.onPaired?.({ relayUrl: publicRelayUrl, room: qrPayload.room, remotePublicKey });
         sendExistingSessions((json2) => {
           if (peer.transport.isReady()) {
             peer.transport.send(json2);
@@ -33197,7 +33493,7 @@ function connectToRelay(relayUrl, identity2, bridge, options = {}) {
       onError: (err) => {
         console.error("[relay-client] secure transport error:", err.message);
         log.error("trns:cry", `decrypt failed for ${clientId} \u2014 resetting handshake: ${err.message}`);
-        events2?.onError?.({ relayUrl, room: qrPayload.room, error: err });
+        events2?.onError?.({ relayUrl: publicRelayUrl, room: qrPayload.room, error: err });
         sendRelayClose(clientId, 4002, "Transport reset");
         teardownSecurePeer(clientId);
       },
@@ -33396,7 +33692,7 @@ function connectToRelay(relayUrl, identity2, bridge, options = {}) {
     if (stopped)
       return;
     console.log(`[relay-client] reconnecting in ${backoff}ms...`);
-    events2?.onReconnectScheduled?.({ relayUrl, room: qrPayload.room, delayMs: backoff });
+    events2?.onReconnectScheduled?.({ relayUrl: publicRelayUrl, room: qrPayload.room, delayMs: backoff });
     reconnectTimer = setTimeout(() => {
       reconnectTimer = null;
       connect();
@@ -35392,8 +35688,8 @@ var Unpromise = class Unpromise2 {
         status: "fulfilled",
         value
       };
-      subscribers === null || subscribers === undefined || subscribers.forEach(({ resolve: resolve7 }) => {
-        resolve7(value);
+      subscribers === null || subscribers === undefined || subscribers.forEach(({ resolve: resolve8 }) => {
+        resolve8(value);
       });
     });
     if ("catch" in thenReturn)
@@ -35501,15 +35797,15 @@ function resolveSelfTuple(promise2) {
   return Unpromise.proxy(promise2).then(() => [promise2]);
 }
 function withResolvers() {
-  let resolve7;
+  let resolve8;
   let reject;
   const promise2 = new Promise((_resolve, _reject) => {
-    resolve7 = _resolve;
+    resolve8 = _resolve;
     reject = _reject;
   });
   return {
     promise: promise2,
-    resolve: resolve7,
+    resolve: resolve8,
     reject
   };
 }
@@ -35555,8 +35851,8 @@ function timerResource(ms) {
   return makeResource({ start() {
     if (timer)
       throw new Error("Timer already started");
-    const promise2 = new Promise((resolve7) => {
-      timer = setTimeout(() => resolve7(disposablePromiseTimerResult), ms);
+    const promise2 = new Promise((resolve8) => {
+      timer = setTimeout(() => resolve8(disposablePromiseTimerResult), ms);
     });
     return promise2;
   } }, () => {
@@ -35759,15 +36055,15 @@ function _takeWithGrace() {
   return _takeWithGrace.apply(this, arguments);
 }
 function createDeferred() {
-  let resolve7;
+  let resolve8;
   let reject;
   const promise2 = new Promise((res, rej) => {
-    resolve7 = res;
+    resolve8 = res;
     reject = rej;
   });
   return {
     promise: promise2,
-    resolve: resolve7,
+    resolve: resolve8,
     reject
   };
 }
@@ -36998,14 +37294,14 @@ function parseTRPCMessage(obj, transformer) {
 }
 // ../../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();
@@ -37152,8 +37448,8 @@ function startBridgeServerTRPC(options) {
           }
           const iterable = isObservable(result) ? observableToAsyncIterable(result, abortController.signal) : result;
           const iterator = iterable[Symbol.asyncIterator]();
-          const abortPromise = new Promise((resolve7) => {
-            abortController.signal.addEventListener("abort", () => resolve7("abort"), {
+          const abortPromise = new Promise((resolve8) => {
+            abortController.signal.addEventListener("abort", () => resolve8("abort"), {
               once: true
             });
           });
@@ -37498,6 +37794,8 @@ async function startPairingRuntime(options) {
   }
   const relayConnection = connectToRelay(relayUrl, identity2, bridge, {
     secure: true,
+    publicRelayUrl: options?.advertisedRelayUrl ?? undefined,
+    fallbackRelayUrls: options?.fallbackRelayUrls,
     events: options?.relayEvents
   });
   await autoStartConfiguredSessions(bridge, config2.sessions);
@@ -37525,7 +37823,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})`);
@@ -37539,6 +37837,7 @@ async function autoStartConfiguredSessions(bridge, sessions3) {
 // ../../apps/desktop/src/core/pairing/supervisor.ts
 var SCOUT_PAIR_REFRESH_LEEWAY_MS = 30000;
 var SCOUT_PAIR_RESTART_DELAY_MS = 2000;
+var BONJOUR_SERVICE_TYPE = "_scout-pair._tcp";
 async function runScoutPairingSupervisor() {
   clearStalePairingRuntimeFiles();
   const existingPid = readPairingRuntimePid();
@@ -37560,7 +37859,8 @@ async function runScoutPairingSupervisor() {
     refreshTimer: null,
     intentionalStop: false,
     runtime: null,
-    relay: null
+    relay: null,
+    bonjour: null
   };
   const shutdown = async () => {
     state.intentionalStop = true;
@@ -37588,6 +37888,8 @@ async function startSupervisorRuntime(state) {
   const config2 = resolvedPairingConfig();
   const relayPort = config2.port + 1;
   const resolvedRelayUrl = config2.relay?.trim() || null;
+  const identity2 = loadOrCreateIdentity();
+  const publicKeyHex = bytesToHex2(identity2.publicKey);
   writeCurrent(state, {
     status: "starting",
     statusLabel: "Starting",
@@ -37599,12 +37901,24 @@ async function startSupervisorRuntime(state) {
   });
   const emitStatus = createStatusWriter(state);
   try {
-    const activeRelayUrl = resolvedRelayUrl ?? (() => {
+    const managedRelay = resolvedRelayUrl ? null : (() => {
       state.relay = startManagedRelay(relayPort);
-      return state.relay.relayUrl;
+      return state.relay;
     })();
-    state.runtime = await startPairingRuntime({
+    const activeRelayUrl = resolvedRelayUrl ?? managedRelay?.relayUrl;
+    const connectRelayUrl = resolvedRelayUrl ?? managedRelay?.connectUrl ?? managedRelay?.relayUrl;
+    if (!activeRelayUrl || !connectRelayUrl) {
+      throw new Error("Scout pairing relay URL is not configured.");
+    }
+    state.bonjour = managedRelay ? startBonjourRelayAdvertisement({
+      port: relayPort,
       relayUrl: activeRelayUrl,
+      publicKeyHex
+    }) : null;
+    state.runtime = await startPairingRuntime({
+      relayUrl: connectRelayUrl,
+      advertisedRelayUrl: activeRelayUrl,
+      fallbackRelayUrls: managedRelay?.fallbackRelayUrls,
       relayEvents: {
         onConnecting() {
           emitStatus("connecting", `Connecting to ${activeRelayUrl}`);
@@ -37627,7 +37941,6 @@ async function startSupervisorRuntime(state) {
     if (!payload) {
       throw new Error("Scout pairing runtime did not produce a QR payload.");
     }
-    const identity2 = loadOrCreateIdentity();
     writeCurrent(state, {
       status: "connecting",
       statusLabel: "Pairing Ready",
@@ -37644,7 +37957,7 @@ async function startSupervisorRuntime(state) {
       },
       childPid: null
     }, {
-      identityFingerprint: bytesToHex2(identity2.publicKey).slice(0, 16),
+      identityFingerprint: publicKeyHex.slice(0, 16),
       trustedPeerCount: trustedPeerCount()
     });
     schedulePairingRefresh(state, payload);
@@ -37718,6 +38031,9 @@ function clearRefreshTimer(state) {
   }
 }
 async function stopSupervisorRuntime(state) {
+  try {
+    state.bonjour?.stop();
+  } catch {}
   try {
     await state.runtime?.stop();
   } catch {}
@@ -37726,6 +38042,57 @@ async function stopSupervisorRuntime(state) {
   } catch {}
   state.runtime = null;
   state.relay = null;
+  state.bonjour = null;
+}
+function startBonjourRelayAdvertisement(input) {
+  if (process.platform !== "darwin") {
+    return null;
+  }
+  const scheme = relayScheme(input.relayUrl);
+  const fingerprint = input.publicKeyHex.slice(0, 16);
+  const serviceName = `OpenScout ${fingerprint}`;
+  const args = [
+    "-R",
+    serviceName,
+    BONJOUR_SERVICE_TYPE,
+    "local.",
+    String(input.port),
+    "v=1",
+    `pk=${input.publicKeyHex}`,
+    `fp=${fingerprint}`,
+    `scheme=${scheme}`
+  ];
+  let processRef = null;
+  try {
+    processRef = spawn4("/usr/bin/dns-sd", args, { stdio: "ignore" });
+    processRef.on("error", (error48) => {
+      console.warn(`[pairing] bonjour advertisement failed: ${error48.message}`);
+    });
+    processRef.on("exit", (code, signal) => {
+      if (code !== 0 && signal !== "SIGTERM") {
+        console.warn(`[pairing] bonjour advertisement exited (code=${code ?? "null"}, signal=${signal ?? "null"})`);
+      }
+    });
+    console.log(`[pairing] bonjour advertising ${serviceName} on ${BONJOUR_SERVICE_TYPE} port ${input.port}`);
+  } catch (error48) {
+    const detail = error48 instanceof Error ? error48.message : String(error48);
+    console.warn(`[pairing] bonjour advertisement unavailable: ${detail}`);
+    return null;
+  }
+  return {
+    stop() {
+      processRef?.kill("SIGTERM");
+      processRef = null;
+    }
+  };
+}
+function relayScheme(relayUrl) {
+  try {
+    const protocol = new URL(relayUrl).protocol;
+    return protocol === "wss:" ? "wss" : "ws";
+  } catch {
+    return relayUrl.startsWith("wss://") ? "wss" : "ws";
+  }
 }
 function writeCurrent(state, patch, overrides = {}) {
   state.current = writePairingRuntimeSnapshot({