@sideboard-ai/core 0.1.275 → 0.1.277

package/dist/index.js

@@ -4098,8 +4098,8 @@ function crushMarkdown(text6, opts) {
   }
   const must = blocks.filter((b) => looksLikeMustKeep(b));
   const rest = blocks.filter((b) => !looksLikeMustKeep(b));
-  const marker = `[\u2026crushed body; ${original.length} chars originally. Pass include=full to read the rest.]`;
-  let used = must.reduce((n, b) => n + b.length, 0) + marker.length;
+  const marker2 = `[\u2026crushed body; ${original.length} chars originally. Pass include=full to read the rest.]`;
+  let used = must.reduce((n, b) => n + b.length, 0) + marker2.length;
   const keptRest = [];
   const headN = Math.max(1, Math.ceil(rest.length * 0.3));
   const tailN = Math.max(1, Math.ceil(rest.length * 0.15));
@@ -4139,7 +4139,7 @@ function crushMarkdown(text6, opts) {
       continue;
     }
     if (!inserted) {
-      out.push(marker);
+      out.push(marker2);
       inserted = true;
     }
   }
@@ -9375,8 +9375,195 @@ var RemoteHub = class {
 // src/remote/client.ts
 import { WebSocket as WsWebSocket3 } from "ws";
 
+// src/remote/phone-media.ts
+var PHONE_IMAGE_MAX_BYTES = 15e5;
+var IMAGE_MIME = {
+  png: "image/png",
+  jpg: "image/jpeg",
+  jpeg: "image/jpeg",
+  gif: "image/gif",
+  webp: "image/webp",
+  bmp: "image/bmp"
+};
+function phoneWorktreeRelative(worktreePath, raw) {
+  let text6 = raw.trim();
+  if (!text6) return null;
+  if (/^file:\/\//i.test(text6)) {
+    try {
+      text6 = decodeURIComponent(new URL(text6).pathname);
+    } catch {
+      return null;
+    }
+  }
+  text6 = (text6.split("#")[0] ?? text6).replace(/\\/g, "/");
+  if (!text6 || text6.includes("\0") || text6.split("/").includes("..")) return null;
+  const root = worktreePath.replace(/\/+$/, "");
+  if (!root || root === "/") return null;
+  if (text6.startsWith("/")) {
+    if (text6 !== root && !text6.startsWith(`${root}/`)) return null;
+    text6 = text6 === root ? "" : text6.slice(root.length + 1);
+  }
+  text6 = text6.replace(/^\.\//, "").replace(/\/+$/, "");
+  if (!text6 || text6 === "." || text6.startsWith("/")) return null;
+  return text6;
+}
+function phoneImageMime(relativePath) {
+  const ext = relativePath.split(".").pop()?.toLowerCase() ?? "";
+  return IMAGE_MIME[ext] ?? null;
+}
+function phoneImageDataUrl(worktreePath, raw) {
+  const relative = phoneWorktreeRelative(worktreePath, raw);
+  if (!relative) return null;
+  const mime = phoneImageMime(relative);
+  if (!mime) return null;
+  try {
+    const file = readWorktreeFileForUpload(worktreePath, relative, { maxBytes: PHONE_IMAGE_MAX_BYTES });
+    return `data:${mime};base64,${file.contentBase64}`;
+  } catch {
+    return null;
+  }
+}
+
 // src/remote/phone-chats.ts
 import { randomUUID as randomUUID7 } from "crypto";
+
+// src/remote/phone-artifact.ts
+var FENCE_RE = /```([a-zA-Z0-9_+-]*)[^\n]*\n([\s\S]*?)(?:```|$)/g;
+var DOC_LANGS = /* @__PURE__ */ new Set(["html", "htm", "xhtml", "svg", "markdown", "md", "mdx", "jsx", "tsx", "react"]);
+var MIN_FENCE_CHARS = 40;
+var MIN_MD_CHARS = 120;
+function oneLine(value, max) {
+  return value.replace(/[`\r\n]/g, " ").replace(/\s+/g, " ").trim().slice(0, max);
+}
+function asRecord3(value) {
+  if (typeof value === "string") {
+    try {
+      return asRecord3(JSON.parse(value));
+    } catch {
+      return void 0;
+    }
+  }
+  if (value && typeof value === "object" && !Array.isArray(value)) return value;
+  return void 0;
+}
+function str3(value) {
+  return typeof value === "string" ? value : "";
+}
+function normalizedBody(content) {
+  return content.trim().replace(/\s+/g, " ");
+}
+function artifactHint(content) {
+  const body = normalizedBody(content);
+  if (!body) return "";
+  return fnv1a32(body).toString(36);
+}
+function fnv1a32(value) {
+  let hash = 2166136261;
+  for (let i = 0; i < value.length; i++) {
+    hash ^= value.charCodeAt(i);
+    hash = Math.imul(hash, 16777619);
+  }
+  return hash >>> 0;
+}
+function looksLikeHtml(content) {
+  const head = content.trim().slice(0, 200).toLowerCase();
+  return head.startsWith("<!doctype") || head.startsWith("<html") || head.startsWith("<svg");
+}
+function kindFor(language, content) {
+  const lang = language.toLowerCase();
+  if (!lang) {
+    if (!looksLikeHtml(content) || content.trim().length < MIN_FENCE_CHARS) return null;
+    return content.trim().toLowerCase().startsWith("<svg") ? "svg" : "html";
+  }
+  if (!DOC_LANGS.has(lang)) return null;
+  const min = lang === "markdown" || lang === "md" || lang === "mdx" ? MIN_MD_CHARS : MIN_FENCE_CHARS;
+  if (content.trim().length < min) return null;
+  if (lang === "svg") return "svg";
+  if (lang === "markdown" || lang === "md" || lang === "mdx") return "markdown";
+  if (lang === "jsx" || lang === "tsx" || lang === "react") return "react";
+  return "html";
+}
+function titleFor(kind, content) {
+  if (kind === "html" || kind === "svg") {
+    const title = /<title[^>]*>([^<]+)<\/title>/i.exec(content)?.[1]?.trim();
+    if (title) return oneLine(title, 80);
+  }
+  if (kind === "markdown") {
+    const heading = /^#\s+(.+)$/m.exec(content)?.[1]?.trim();
+    if (heading) return oneLine(heading, 80);
+  }
+  if (kind === "react") {
+    const name = /export\s+default\s+(?:function|class)\s+([A-Za-z_$][\w$]*)/.exec(content)?.[1];
+    if (name) return name;
+  }
+  if (kind === "svg") return "SVG artifact";
+  if (kind === "markdown") return "Document";
+  if (kind === "react") return "React artifact";
+  return "HTML artifact";
+}
+function marker(title, hint) {
+  return hint ? `\`\`\`sb-artifact
+${title}
+${hint}
+\`\`\`` : `\`\`\`sb-artifact
+${title}
+\`\`\``;
+}
+function toolContent(input) {
+  if (!input) return "";
+  const direct = input.content;
+  if (typeof direct === "string") return direct;
+  const nested = asRecord3(direct);
+  if (!nested) return "";
+  for (const key of ["html", "markup", "text", "source", "content", "code"]) {
+    if (typeof nested[key] === "string") return nested[key];
+  }
+  return "";
+}
+function isArtifactTool(name) {
+  const short = name.split("__").pop() ?? name;
+  return /^(present_artifact|create_artifact|update_artifact)$/i.test(short);
+}
+function phoneArtifactText(text6, parts, limit = Number.POSITIVE_INFINITY) {
+  const hints = /* @__PURE__ */ new Set();
+  const body = text6.replace(new RegExp(FENCE_RE.source, "g"), (full, language, content) => {
+    const kind = kindFor(language, content);
+    if (!kind) return full;
+    const hint = artifactHint(content);
+    hints.add(hint);
+    return marker(titleFor(kind, content), hint);
+  });
+  const extras = [];
+  for (const part of parts ?? []) {
+    if (part.type !== "tool" || part.parentId || !isArtifactTool(part.name)) continue;
+    const input = asRecord3(part.input);
+    const content = toolContent(input);
+    const hint = artifactHint(content);
+    if (hint && hints.has(hint)) continue;
+    const kind = kindFor("", content);
+    const title = oneLine(str3(input?.title), 80) || (kind ? titleFor(kind, content) : "Artifact");
+    if (!str3(input?.title) && content.trim().length < MIN_FENCE_CHARS) continue;
+    if (hint) hints.add(hint);
+    extras.push(marker(title, hint));
+  }
+  const tail = extras.join("\n\n");
+  const room = tail ? Math.max(0, limit - tail.length - 2) : limit;
+  const prose = body.length > room ? `${body.slice(0, Math.max(0, room - 1))}\u2026` : body;
+  if (!tail) return prose;
+  return prose ? `${prose}
+
+${tail}` : tail;
+}
+function parseOpenArtifact(value, chatId) {
+  const record = asRecord3(value);
+  if (!record) return "invalid";
+  const title = oneLine(str3(record.title), 200);
+  if (!title) return "invalid";
+  const hint = oneLine(str3(record.hint), 200);
+  return { op: "open-artifact", chatId, title, ...hint ? { hint } : {} };
+}
+
+// src/remote/phone-chats.ts
 var PHONE_CONTROL_PREFIX = "\0sb.phone\n";
 var PHONE_USER_PREFIX = "Phone\n\n";
 var TRANSCRIPT_LIMIT = 40;
@@ -9431,6 +9618,21 @@ function parsePhoneControl(value) {
   const chatId = typeof value.chatId === "string" ? value.chatId.trim() : "";
   if (!chatId) return "invalid";
   if (op === "open" || op === "archive" || op === "restore" || op === "stop") return { op, chatId };
+  if (op === "open-artifact") return parseOpenArtifact(value, chatId);
+  if (op === "open-file" || op === "media") {
+    const path2 = textField(value, "path");
+    if (!path2 || path2.length > 2e3) return "invalid";
+    if (op === "media") return { op, chatId, path: path2 };
+    const startLine = lineField(value, "startLine");
+    const endLine = lineField(value, "endLine");
+    return {
+      op,
+      chatId,
+      path: path2,
+      ...startLine != null ? { startLine } : {},
+      ...endLine != null ? { endLine } : {}
+    };
+  }
   const draft = parsePhoneDraft(value);
   if (draft === "invalid") return "invalid";
   if (op === "options") return { op: "options", chatId, ...draft };
@@ -9446,6 +9648,11 @@ function textField(value, key) {
   const raw = value[key];
   return typeof raw === "string" ? raw.trim() : "";
 }
+function lineField(value, key) {
+  const raw = value[key];
+  if (typeof raw !== "number" || !Number.isInteger(raw) || raw < 1 || raw > 1e6) return void 0;
+  return raw;
+}
 function agentField(value) {
   const agent = textField(value, "agent");
   if (!agent) return void 0;
@@ -9589,7 +9796,8 @@ function summarize(thread) {
     title: thread.title?.trim() || "Untitled",
     status: thread.status,
     preview: previewOf(thread),
-    updatedAt: thread.updatedAt
+    updatedAt: thread.updatedAt,
+    agent: thread.agent
   };
 }
 function previewOf(thread) {
@@ -9603,10 +9811,8 @@ function listPhoneMessages(thread) {
   for (const message of thread.messages) {
     if (message.role !== "user" && message.role !== "agent") continue;
     const names = (message.attachments ?? []).map((item) => item.name.trim()).filter(Boolean);
-    const text6 = clip(
-      [phoneVisibleText(message.role, message.text), names.length ? names.join(", ") : ""].filter(Boolean).join("\n"),
-      MESSAGE_LIMIT
-    );
+    const visible = [phoneVisibleText(message.role, message.text), names.length ? names.join(", ") : ""].filter(Boolean).join("\n");
+    const text6 = message.role === "agent" ? phoneArtifactText(visible, message.parts, MESSAGE_LIMIT) : clip(visible, MESSAGE_LIMIT);
     if (!text6) continue;
     out.push({ role: message.role, text: text6 });
   }
@@ -9685,13 +9891,28 @@ function listPhoneHistory(opts) {
     ...more && last ? { next: historyCursor(last) } : {}
   };
 }
-function readPhoneThread(chatId) {
+function matchPhoneThread(chatId) {
   const id = chatId.trim();
   if (!id) return null;
-  const thread = readThread(id);
+  const exact = readThread(id);
+  if (exact) return exact;
+  const match = findThreadByRef(id);
+  if (!match) return null;
+  if (match.id !== id && !match.id.startsWith(id)) return null;
+  return match;
+}
+function visiblePhoneThread(thread) {
+  if (isGlobalThread(thread)) return true;
+  return isProjectPath(thread.repoPath);
+}
+function findPhoneChat(chatId) {
+  const thread = matchPhoneThread(chatId);
+  if (!thread || !visiblePhoneThread(thread)) return null;
+  return thread;
+}
+function readPhoneThread(chatId) {
+  const thread = findPhoneChat(chatId);
   if (!thread || thread.status === "archived") return null;
-  if (isGlobalThread(thread)) return thread;
-  if (!isProjectPath(thread.repoPath)) return null;
   return thread;
 }
 function phoneComposerOptions(thread) {
@@ -9837,6 +10058,21 @@ async function createPhoneProjectWorktree(repoPathOrInput) {
   });
   return openedFrom(thread, projectPlace(thread));
 }
+async function listPhoneModels(agent) {
+  const catalogs = await listModelsForAgent(agent);
+  return (catalogs[0]?.models ?? []).slice(0, 40).map((model) => ({
+    id: model.id,
+    label: model.displayName || model.id
+  }));
+}
+function archivePhoneChat(chatId) {
+  const thread = readPhoneThread(chatId);
+  if (!thread) return false;
+  updateThread(thread.id, { status: "archived" });
+  return true;
+}
+
+// src/remote/phone-sources.ts
 function sourceWarning(label, err) {
   const message = err instanceof Error ? err.message : String(err);
   return message ? `${label}: ${message}` : `${label} failed.`;
@@ -9879,60 +10115,37 @@ async function listPhoneSources(repoPath, query) {
     ...warnings.length ? { warnings } : {}
   };
 }
-async function listPhoneModels(agent) {
-  const catalogs = await listModelsForAgent(agent);
-  return (catalogs[0]?.models ?? []).slice(0, 40).map((model) => ({
-    id: model.id,
-    label: model.displayName || model.id
-  }));
+
+// src/remote/phone-stream.ts
+var PHONE_STREAM_FLUSH_MS = 80;
+function phoneStreamFrame(parts) {
+  return {
+    text: phoneArtifactText(visibleAssistantText(void 0, parts), parts),
+    activity: liveActivitySummary(parts)
+  };
 }
-function archivePhoneChat(chatId) {
-  const thread = readPhoneThread(chatId);
-  if (!thread) return false;
-  updateThread(thread.id, { status: "archived" });
-  return true;
+var SKIPPED = /* @__PURE__ */ new Set(["session_id", "usage", "stderr", "exit"]);
+function phoneStreamParts(parts, event) {
+  if (SKIPPED.has(event.type)) return null;
+  return applyAgentEvent(parts, event);
+}
+function phoneStreamFlushNow(event) {
+  return event.type === "tool_use" || event.type === "tool_result" && !event.partial;
 }
 
-// src/remote/listen.ts
+// src/remote/phone-live.ts
 var REMOTE_STOPPED_REPLY = "Sideboard stopped the in-progress turn.";
-function formatRemotePrompt(text6) {
-  return `Phone
-
-${text6.trim()}`;
-}
-function isRemoteStopCommand(text6) {
-  return text6.trim().toLowerCase() === "stop";
-}
-var handleChain2 = Promise.resolve();
-var inboundGeneration = 0;
 var chatChains = /* @__PURE__ */ new Map();
 var chatGeneration = /* @__PURE__ */ new Map();
-function enqueue(fn) {
-  const run2 = handleChain2.then(fn, fn);
-  handleChain2 = run2.then(
-    () => void 0,
-    () => void 0
-  );
-}
-function interruptRemoteCoordinator(deviceId, log = () => void 0) {
-  try {
-    const live = findRemoteCoordinator(deviceId);
-    if (!live) return false;
-    const fresh = readThread(live.id) ?? live;
-    if (fresh.status !== "running" && fresh.status !== "queued") return false;
-    getOrchestrator().stop(fresh.id, { clearQueue: true });
-    log(`interrupt phone \u2192 coordinator ${fresh.id.slice(0, 8)} (${fresh.status})`);
-    return true;
-  } catch (err) {
-    log(`interrupt: ${err instanceof Error ? err.message : String(err)}`);
-    return false;
-  }
-}
+var phoneTurnGen = /* @__PURE__ */ new Map();
 function bumpChat(chatId) {
   const next = (chatGeneration.get(chatId) ?? 0) + 1;
   chatGeneration.set(chatId, next);
   return next;
 }
+function finishPhoneTurn(chatId, generation) {
+  if (phoneTurnGen.get(chatId) === generation) phoneTurnGen.delete(chatId);
+}
 function enqueueChat(chatId, fn) {
   const prev = chatChains.get(chatId) ?? Promise.resolve();
   const run2 = prev.then(fn, fn);
@@ -9947,6 +10160,49 @@ function enqueueChat(chatId, fn) {
 function emitControl(opts, reply) {
   opts.onOutbound({ type: "assistant", text: encodePhoneControl(reply) });
 }
+function watchPhoneStream(opts, chatId, threadId, generation) {
+  let parts = [];
+  let timer = null;
+  let lastKey = "";
+  let closed = false;
+  const alive = () => !closed && chatGeneration.get(chatId) === generation;
+  const flush = () => {
+    timer = null;
+    if (!alive()) return;
+    const frame = phoneStreamFrame(parts);
+    const key = `${frame.activity}
+${frame.text}`;
+    if (key === lastKey) return;
+    if (!frame.text && !frame.activity) return;
+    lastKey = key;
+    emitControl(opts, { op: "stream", chatId, text: frame.text, activity: frame.activity });
+  };
+  const schedule = (event) => {
+    if (phoneStreamFlushNow(event) || lastKey === "") {
+      if (timer) {
+        clearTimeout(timer);
+        timer = null;
+      }
+      flush();
+      return;
+    }
+    if (timer) return;
+    timer = setTimeout(flush, PHONE_STREAM_FLUSH_MS);
+  };
+  const off = getOrchestrator().on((event) => {
+    if (!alive()) return;
+    if (event.type !== "turn_output" || event.threadId !== threadId) return;
+    const next = phoneStreamParts(parts, event.event);
+    if (!next) return;
+    parts = next;
+    schedule(event.event);
+  });
+  return () => {
+    closed = true;
+    if (timer) clearTimeout(timer);
+    off();
+  };
+}
 function interruptChat(chatId, log) {
   try {
     const thread = readPhoneThread(chatId);
@@ -9994,7 +10250,12 @@ function emitChatTurn(opts, chatId, threadId) {
     completedEmpty: () => "",
     failed: (detail) => detail ? `Sideboard failed: ${detail}` : "Sideboard failed before producing a result."
   });
-  emitControl(opts, { op: "assistant", chatId, text: reply.trim() });
+  const agent = [...thread.messages].reverse().find((m) => m.role === "agent");
+  emitControl(opts, {
+    op: "assistant",
+    chatId,
+    text: phoneArtifactText(reply.trim(), agent?.parts)
+  });
 }
 function phoneError(err) {
   return err instanceof Error ? err.message : String(err);
@@ -10002,20 +10263,73 @@ function phoneError(err) {
 function deliverPhoneTurn(opts, chatId) {
   const thread = readPhoneThread(chatId);
   if (!thread || thread.status !== "running" && thread.status !== "queued") return;
-  const generation = bumpChat(chatId);
-  enqueueChat(chatId, async () => {
-    if (chatGeneration.get(chatId) !== generation) return;
+  const id = thread.id;
+  const claimed = phoneTurnGen.get(id);
+  if (claimed != null && claimed === chatGeneration.get(id)) return;
+  const generation = bumpChat(id);
+  phoneTurnGen.set(id, generation);
+  enqueueChat(id, async () => {
+    if (chatGeneration.get(id) !== generation) return;
+    const stopStream = watchPhoneStream(opts, id, id, generation);
     try {
-      await getOrchestrator().waitForTurn(chatId, 14 * 60 * 1e3);
+      await getOrchestrator().waitForTurn(id, 14 * 60 * 1e3);
     } catch (err) {
-      if (chatGeneration.get(chatId) !== generation) return;
-      emitControl(opts, { op: "error", chatId, message: `Sideboard failed: ${phoneError(err)}` });
+      stopStream();
+      finishPhoneTurn(id, generation);
+      if (chatGeneration.get(id) !== generation) return;
+      emitControl(opts, { op: "error", chatId: id, message: `Sideboard failed: ${phoneError(err)}` });
       return;
     }
-    if (chatGeneration.get(chatId) !== generation) return;
-    emitChatTurn(opts, chatId, chatId);
+    stopStream();
+    finishPhoneTurn(id, generation);
+    if (chatGeneration.get(id) !== generation) return;
+    emitChatTurn(opts, id, id);
   });
 }
+
+// src/remote/listen.ts
+function formatRemotePrompt(text6) {
+  return `Phone
+
+${text6.trim()}`;
+}
+function isRemoteStopCommand(text6) {
+  return text6.trim().toLowerCase() === "stop";
+}
+var handleChain2 = Promise.resolve();
+var inboundGeneration = 0;
+function enqueue(fn) {
+  const run2 = handleChain2.then(fn, fn);
+  handleChain2 = run2.then(
+    () => void 0,
+    () => void 0
+  );
+}
+function interruptRemoteCoordinator(deviceId, log = () => void 0) {
+  try {
+    const live = findRemoteCoordinator(deviceId);
+    if (!live) return false;
+    const fresh = readThread(live.id) ?? live;
+    if (fresh.status !== "running" && fresh.status !== "queued") return false;
+    getOrchestrator().stop(fresh.id, { clearQueue: true });
+    log(`interrupt phone \u2192 coordinator ${fresh.id.slice(0, 8)} (${fresh.status})`);
+    return true;
+  } catch (err) {
+    log(`interrupt: ${err instanceof Error ? err.message : String(err)}`);
+    return false;
+  }
+}
+function publishOpenedChat(opts, chatId) {
+  const opened = openPhoneChat(chatId);
+  if (!opened) {
+    emitControl(opts, { op: "error", message: "That agent is not on this Mac." });
+    return;
+  }
+  emitControl(opts, { op: "opened", ...opened });
+  if (opened.chat.status === "running" || opened.chat.status === "queued") {
+    deliverPhoneTurn(opts, opened.chat.id);
+  }
+}
 function applyPhoneOptions(chatId, draft) {
   const patch = {};
   if (draft.agent) patch.agent = draft.agent;
@@ -10166,12 +10480,21 @@ function handlePhoneControl(cmd, opts) {
     return;
   }
   if (cmd.op === "open") {
-    const opened = openPhoneChat(cmd.chatId);
-    if (!opened) {
+    const thread = findPhoneChat(cmd.chatId);
+    if (!thread) {
       emitControl(opts, { op: "error", message: "That agent is not on this Mac." });
       return;
     }
-    emitControl(opts, { op: "opened", ...opened });
+    if (thread.status === "archived") {
+      void getOrchestrator().restore(thread.id).then(() => {
+        emitControl(opts, { op: "sidebar", ...listPhoneSidebar() });
+        publishOpenedChat(opts, thread.id);
+      }).catch((err) => {
+        emitControl(opts, { op: "error", message: phoneError(err) });
+      });
+      return;
+    }
+    publishOpenedChat(opts, thread.id);
     return;
   }
   if (cmd.op === "archive") {
@@ -10200,6 +10523,54 @@ function handlePhoneControl(cmd, opts) {
     });
     return;
   }
+  if (cmd.op === "media") {
+    const thread = readPhoneThread(cmd.chatId);
+    const dataUrl = thread ? phoneImageDataUrl(thread.worktreePath, cmd.path) : null;
+    emitControl(opts, {
+      op: "media",
+      chatId: cmd.chatId,
+      path: cmd.path,
+      ...dataUrl ? { dataUrl } : {}
+    });
+    return;
+  }
+  if (cmd.op === "open-file") {
+    const thread = readPhoneThread(cmd.chatId);
+    const relative = thread ? phoneWorktreeRelative(thread.worktreePath, cmd.path) : null;
+    if (!thread || !relative) {
+      emitControl(opts, { op: "error", chatId: cmd.chatId, message: "That file is not in this worktree." });
+      return;
+    }
+    void getOrchestrator().statPath(thread.id, relative).then((kind) => {
+      if (kind === "missing") {
+        emitControl(opts, { op: "error", chatId: cmd.chatId, message: "That file is not in this worktree." });
+        return;
+      }
+      opts.onOpenWorktreeFile?.({
+        threadId: thread.id,
+        path: relative,
+        ...kind === "dir" ? { directory: true } : {},
+        ...cmd.startLine != null ? { startLine: cmd.startLine } : {},
+        ...cmd.endLine != null ? { endLine: cmd.endLine } : {}
+      });
+    }).catch(() => {
+      emitControl(opts, { op: "error", chatId: cmd.chatId, message: "That file is not in this worktree." });
+    });
+    return;
+  }
+  if (cmd.op === "open-artifact") {
+    const thread = readPhoneThread(cmd.chatId);
+    if (!thread) {
+      emitControl(opts, { op: "error", chatId: cmd.chatId, message: "That agent is not on this Mac." });
+      return;
+    }
+    opts.onOpenArtifact?.({
+      threadId: thread.id,
+      title: cmd.title,
+      ...cmd.hint ? { hint: cmd.hint } : {}
+    });
+    return;
+  }
   if (cmd.op === "stop") {
     if (!readPhoneThread(cmd.chatId)) {
       emitControl(opts, { op: "error", chatId: cmd.chatId, message: "That agent is not on this Mac." });
@@ -10212,6 +10583,7 @@ function handlePhoneControl(cmd, opts) {
   }
   const chatId = cmd.chatId;
   const generation = bumpChat(chatId);
+  phoneTurnGen.set(chatId, generation);
   interruptChat(chatId, log);
   enqueueChat(chatId, async () => {
     if (chatGeneration.get(chatId) !== generation) return;
@@ -10227,6 +10599,7 @@ function handlePhoneControl(cmd, opts) {
       }
     }
     if (chatGeneration.get(chatId) !== generation) return;
+    const stopStream = watchPhoneStream(opts, chatId, thread.id, generation);
     try {
       try {
         applyPhoneOptions(thread.id, cmd);
@@ -10244,6 +10617,9 @@ function handlePhoneControl(cmd, opts) {
       const message = err instanceof Error ? err.message : String(err);
       emitControl(opts, { op: "error", chatId, message: `Sideboard failed: ${message}` });
       return;
+    } finally {
+      stopStream();
+      finishPhoneTurn(chatId, generation);
     }
     if (chatGeneration.get(chatId) !== generation) return;
     emitChatTurn(opts, chatId, thread.id);
@@ -10485,7 +10861,8 @@ function runRemoteHost(opts) {
       handleRemoteInbound("stop", {
         deviceId: opts.deviceId,
         onLog: log,
-        onOutbound: emit
+        onOutbound: emit,
+        onOpenWorktreeFile: opts.onOpenWorktreeFile
       });
       return;
     }
@@ -10494,7 +10871,9 @@ function runRemoteHost(opts) {
         deviceId: opts.deviceId,
         onLog: log,
         onOutbound: emit,
-        transcribeWav: opts.transcribeWav
+        transcribeWav: opts.transcribeWav,
+        onOpenWorktreeFile: opts.onOpenWorktreeFile,
+        onOpenArtifact: opts.onOpenArtifact
       });
     }
   };
@@ -10893,9 +11272,74 @@ function sendJson2(res, status, body) {
   res.writeHead(status, { "Content-Type": "application/json", "Cache-Control": "no-store" });
   res.end(JSON.stringify(body));
 }
+function relayOAuthReturnPage(title, body) {
+  return `<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta name="robots" content="noindex">
+<title>${escapeHtml(title)}</title>
+<style>
+  :root {
+    --bg: #09090b;
+    --card: #16171b;
+    --line: rgba(255, 255, 255, 0.08);
+    --text: #f4f5f7;
+    --muted: #9aa3ad;
+    --blue: #3b9eff;
+    --blue-fill: #0f7ed4;
+  }
+  * { box-sizing: border-box }
+  body {
+    margin: 0;
+    min-height: 100vh;
+    display: grid;
+    place-items: center;
+    padding: 48px 24px;
+    background:
+      radial-gradient(closest-side, rgba(15, 126, 212, 0.22), transparent 72%) center -120px / 720px 480px no-repeat,
+      var(--bg);
+    color: var(--text);
+    font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", "Helvetica Neue", sans-serif;
+    -webkit-font-smoothing: antialiased;
+  }
+  main {
+    width: min(28rem, 100%);
+    background: var(--card);
+    border: 1px solid var(--line);
+    border-radius: 16px;
+    padding: 28px 28px 32px;
+  }
+  .brand {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+    margin: 0 0 22px;
+    font-weight: 650;
+    font-size: 17px;
+    letter-spacing: -0.02em;
+  }
+  .mark { position: relative; display: inline-block; width: 26px; height: 26px; flex: none }
+  .mark i { position: absolute; width: 18px; height: 18px; border-radius: 3px; transform: rotate(14deg) }
+  .mark i:first-child { left: 6px; top: 6px; background: var(--blue-fill) }
+  .mark i:last-child { left: 1px; top: 1px; border: 2px solid #d7dbdf }
+  h1 { margin: 0; font-size: 1.5rem; line-height: 1.2; letter-spacing: -0.03em; font-weight: 650 }
+  p { margin: 10px 0 0; line-height: 1.55; color: var(--muted) }
+  a { color: var(--blue) }
+</style>
+</head>
+<body>
+<main>
+  <div class="brand"><span class="mark" aria-hidden="true"><i></i><i></i></span>Sideboard</div>
+  ${body}
+</main>
+</body>
+</html>`;
+}
 function sendHtml(res, status, title, body) {
   res.writeHead(status, { "Content-Type": "text/html; charset=utf-8", "Cache-Control": "no-store" });
-  res.end(`<!DOCTYPE html><html><head><meta charset="utf-8"><title>${escapeHtml(title)}</title></head><body>${body}</body></html>`);
+  res.end(relayOAuthReturnPage(title, body));
 }
 async function handleRelayAccountHttp(opts) {
   const reqUrl = opts.req.url || "/";