toyon 0.12.0 → 0.14.0

package/dist/daemon.js

@@ -1,7 +1,7 @@
 // @bun
 // ../daemon/src/index.ts
-import { rmSync as rmSync9, writeFileSync as writeFileSync12 } from "fs";
-import { dirname as dirname13, join as join30 } from "path";
+import { rmSync as rmSync9, writeFileSync as writeFileSync13 } from "fs";
+import { dirname as dirname13, join as join31 } from "path";
 import { fileURLToPath } from "url";
 
 // ../shared/src/protocol/events.ts
@@ -358,10 +358,13 @@ var DAEMON_FILES = {
 };
 function machineLabel(hostname, remote) {
   const of = (name) => name.split(".")[0]?.toLowerCase() ?? "";
-  if (remote && isTailnetName(remote.host))
+  if (remote && (isTailnetName(remote.host) || isFlyName(remote.host)))
     return of(remote.host) || of(hostname);
   return of(hostname) || "toyon";
 }
+function isFlyName(host) {
+  return host.toLowerCase().endsWith(".fly.dev");
+}
 function isShellOrigin(origin) {
   let url;
   try {
@@ -6599,7 +6602,7 @@ ${text.slice(text.length - (CONTEXT_CHARS - HEAD_CHARS))}`;
 }
 
 // ../shared/src/protocol/limits.ts
-var PROTOCOL_VERSION = 100;
+var PROTOCOL_VERSION = 107;
 var PAGE_ERROR_MAX_CHARS = 2000;
 var PAGE_TITLE_MAX_CHARS = 1000;
 var RENDER_ERRORS_MAX = 10;
@@ -6924,6 +6927,7 @@ var clientMsgSchema = discriminatedUnion("t", [
   object({ t: literal("commit"), worktreeId: id, message: string2().max(5000) }),
   object({ t: literal("graft"), targetId: id, sourceIds: array(id).min(1).max(20) }),
   object({ t: literal("sync-main"), worktreeId: id }),
+  object({ t: literal("unqueue-sync"), worktreeId: id }),
   object({ t: literal("run-after-land"), repoId: id }),
   object({ t: literal("restart-daemon") }),
   object({ t: literal("forget-machine"), origin: string2().max(2048) }),
@@ -8406,7 +8410,7 @@ function readinessOf(json) {
         line: "this machine is waiting to be approved in the Tailscale admin console"
       };
     case "Stopped":
-      return { state: "signed-out", name, line: "Tailscale is disconnected; run `tailscale up`, then this again" };
+      return { state: "disconnected", name, line: "Tailscale is disconnected; run `tailscale up`, then this again" };
     default:
       return {
         state: "not-running",
@@ -8524,7 +8528,7 @@ async function turnRemoteOff(ts, daemonPort, file, was) {
 // ../daemon/package.json
 var package_default = {
   name: "@toyon/daemon",
-  version: "0.12.0",
+  version: "0.14.0",
   private: true,
   type: "module",
   main: "src/index.ts",
@@ -14848,6 +14852,562 @@ function unformatOutput(output) {
 
 // ../daemon/src/agent/policy.ts
 import { isAbsolute as isAbsolute2, resolve as resolve4 } from "path";
+
+// ../daemon/src/agent/acp/background.ts
+import { existsSync as existsSync10, statSync as statSync4 } from "fs";
+import { open as open2 } from "fs/promises";
+import { homedir as homedir5 } from "os";
+import { basename as basename3, dirname as dirname4, join as join8 } from "path";
+var STARTED = /Command running in background with ID: (\S+)\. Output is being written to: (\S+)\./;
+function backgroundStart(input, output) {
+  const flag = input && typeof input === "object" ? input.run_in_background : undefined;
+  if (flag !== true)
+    return null;
+  const m = STARTED.exec(output);
+  return m ? { taskId: m[1], file: m[2] } : null;
+}
+function spawnDetached(output) {
+  return output.includes("Async agent launched successfully");
+}
+function claudeConfigDir() {
+  return process.env.CLAUDE_CONFIG_DIR || join8(homedir5(), ".claude");
+}
+function sessionLogFor(file, configDir = claudeConfigDir()) {
+  const tasks = dirname4(file);
+  if (basename3(tasks) !== "tasks")
+    return null;
+  const session = dirname4(tasks);
+  const path = join8(configDir, "projects", basename3(dirname4(session)), `${basename3(session)}.jsonl`);
+  return existsSync10(path) ? path : null;
+}
+function taskEnd(text, toolId) {
+  const at = text.indexOf(`<tool-use-id>${toolId}</tool-use-id>`);
+  if (at === -1)
+    return null;
+  const tail = text.slice(at, at + 2000);
+  const status = /<status>(\w+)<\/status>/.exec(tail)?.[1] ?? "completed";
+  const exit = /exit code (\d+)/.exec(tail)?.[1];
+  return { status, exit: exit === undefined ? null : Number(exit) };
+}
+var POLL_MS = 500;
+var DEFAULT_BASH_TIMEOUT_MS = 120000;
+var GRACE_MS = 60000;
+var READ_CHUNK = 1 << 20;
+var CARRY = 4000;
+
+class BackgroundTasks {
+  deps;
+  watched = new Map;
+  constructor(deps) {
+    this.deps = deps;
+  }
+  get size() {
+    return this.watched.size;
+  }
+  start(toolId, start, input) {
+    const logPath = sessionLogFor(start.file, this.deps.configDir);
+    if (!logPath)
+      return false;
+    const timeout = input?.timeout;
+    const ceiling = (typeof timeout === "number" ? timeout : DEFAULT_BASH_TIMEOUT_MS) + (this.deps.graceMs ?? GRACE_MS);
+    const w = {
+      toolId,
+      file: start.file,
+      log: logPath,
+      read: 0,
+      logRead: statSync4(logPath).size,
+      carry: "",
+      decoder: new TextDecoder,
+      text: "",
+      truncated: false,
+      ceiling: Date.now() + ceiling,
+      timer: null
+    };
+    this.watched.set(toolId, w);
+    this.schedule(w);
+    return true;
+  }
+  endAll(reason) {
+    for (const w of [...this.watched.values()]) {
+      fireAndForget("background", this.finish(w, null, reason, true), `ending ${w.toolId}`);
+    }
+  }
+  schedule(w) {
+    w.timer = setTimeout(() => this.poll(w), this.deps.pollMs ?? POLL_MS);
+    w.timer.unref?.();
+  }
+  async poll(w) {
+    w.timer = null;
+    try {
+      await this.drain(w);
+      const fresh = await readSince(w.log, w.logRead);
+      w.logRead += fresh.length;
+      const text = w.carry + fresh.toString("utf8");
+      w.carry = text.slice(-CARRY);
+      const end = fresh.length > 0 ? taskEnd(text, w.toolId) : null;
+      if (end)
+        return this.finish(w, end);
+      if (Date.now() >= w.ceiling)
+        return this.finish(w, null, "no word of its end; the row stops watching");
+    } catch (e) {
+      log.warn("background", `watching ${w.toolId} failed`, e);
+    }
+    if (this.watched.has(w.toolId))
+      this.schedule(w);
+  }
+  async drain(w) {
+    const fresh = await readSince(w.file, w.read);
+    w.read += fresh.length;
+    if (fresh.length === 0 || w.truncated)
+      return;
+    const chunk = w.decoder.decode(fresh, { stream: true });
+    const take = chunk.slice(0, OUTPUT_CAP - w.text.length);
+    w.text += take;
+    if (take.length < chunk.length)
+      w.truncated = true;
+    if (take)
+      this.deps.note({ type: "tool-delta", toolId: w.toolId, text: take });
+  }
+  async finish(w, end, note, killed = false) {
+    if (!this.watched.delete(w.toolId))
+      return;
+    if (w.timer)
+      clearTimeout(w.timer);
+    try {
+      await this.drain(w);
+    } catch (e) {
+      log.warn("background", `reading the last of ${w.toolId} failed`, e);
+    }
+    const exit = end ? end.exit ?? (end.status === "completed" ? 0 : null) : null;
+    const lines = [formatOutput(w.text, exit ?? 0, w.truncated)];
+    if (end && exit === null)
+      lines.push(end.status);
+    if (note)
+      lines.push(note);
+    this.deps.note({
+      type: "tool-end",
+      toolId: w.toolId,
+      output: lines.filter(Boolean).join(`
+`),
+      isError: killed || end !== null && (exit !== 0 || end.status !== "completed")
+    });
+    this.deps.onEnd?.();
+  }
+}
+async function readSince(path, offset) {
+  let fh;
+  try {
+    fh = await open2(path, "r");
+  } catch (e) {
+    if (e.code === "ENOENT")
+      return Buffer.alloc(0);
+    throw e;
+  }
+  try {
+    const { size } = await fh.stat();
+    if (size <= offset)
+      return Buffer.alloc(0);
+    const buf = Buffer.alloc(Math.min(size - offset, READ_CHUNK));
+    const { bytesRead } = await fh.read(buf, 0, buf.length, offset);
+    return buf.subarray(0, bytesRead);
+  } finally {
+    await fh.close();
+  }
+}
+
+// ../daemon/src/agent/acp/diff.ts
+function diffOps(a, b) {
+  return diffSeq(a, b).map((op) => ({ mark: op.mark, text: op.value }));
+}
+function unifiedDiff(oldText, newText, context = 3) {
+  const a = oldText === "" ? [] : oldText.split(`
+`);
+  const b = newText === "" ? [] : newText.split(`
+`);
+  const ops = diffOps(a, b);
+  const oldNo = [];
+  const newNo = [];
+  let o = 1;
+  let n = 1;
+  for (const op of ops) {
+    oldNo.push(o);
+    newNo.push(n);
+    if (op.mark !== "+")
+      o++;
+    if (op.mark !== "-")
+      n++;
+  }
+  const out = [];
+  let k = 0;
+  while (k < ops.length) {
+    if (ops[k]?.mark === " ") {
+      k++;
+      continue;
+    }
+    const start = k;
+    let end = k;
+    let j = k;
+    while (j < ops.length) {
+      if (ops[j]?.mark !== " ") {
+        end = j;
+        j++;
+        continue;
+      }
+      let run = 0;
+      while (j + run < ops.length && ops[j + run]?.mark === " ")
+        run++;
+      if (run > context * 2 || j + run >= ops.length)
+        break;
+      j += run;
+    }
+    const from = Math.max(0, start - context);
+    const to = Math.min(ops.length, end + context + 1);
+    const body = ops.slice(from, to);
+    const oldCount = body.filter((op) => op.mark !== "+").length;
+    const newCount = body.filter((op) => op.mark !== "-").length;
+    out.push(`@@ -${oldNo[from]},${oldCount} +${newNo[from]},${newCount} @@`, ...body.map((op) => `${op.mark}${op.text}`));
+    k = to;
+  }
+  return out.join(`
+`);
+}
+
+// ../daemon/src/agent/acp/map.ts
+function spawnOf(meta) {
+  const claude = asRecord2(asRecord2(meta).claudeCode);
+  const parentToolId = typeof claude.parentToolUseId === "string" ? claude.parentToolUseId : undefined;
+  const codex = asRecord2(asRecord2(meta).codex).subagent;
+  const spawns = claude.toolName === "Agent" || claude.toolName === "Task";
+  const subagent = spawns || claude.subagent === true || Object.keys(asRecord2(codex)).length > 0;
+  return { ...parentToolId ? { parentToolId } : {}, ...subagent ? { subagent: true } : {} };
+}
+function asRecord2(v) {
+  return v && typeof v === "object" && !Array.isArray(v) ? v : {};
+}
+var NETWORK_ASK = "SandboxNetworkAccess";
+function isNetworkAsk(update) {
+  return update.name === NETWORK_ASK || asRecord2(asRecord2(update._meta).claudeCode).toolName === NETWORK_ASK;
+}
+function isToolSearch(update) {
+  return update.name === TOOL_SEARCH || asRecord2(asRecord2(update._meta).claudeCode).toolName === TOOL_SEARCH;
+}
+function toolSearchQuery(rawInput) {
+  const query = asRecord2(rawInput).query;
+  if (typeof query !== "string")
+    return "";
+  const names = /^select:(.*)$/.exec(query.trim());
+  if (!names)
+    return query.trim();
+  return (names[1] ?? "").split(",").map((s) => s.trim()).filter(Boolean).join(", ");
+}
+var TOYON_TOOL = new RegExp(`^(?:mcp__${TOYON_MCP_SERVER}__|${TOYON_MCP_SERVER}/)([A-Za-z0-9_-]+)$`);
+function toyonTool(update) {
+  const meta = asRecord2(asRecord2(update._meta).claudeCode).toolName;
+  for (const spelled of [update.name ?? "", typeof meta === "string" ? meta : ""]) {
+    const m = TOYON_TOOL.exec(spelled);
+    if (m)
+      return m[1];
+  }
+  return null;
+}
+function toyonTitle(tool, rawInput, title) {
+  if (tool !== HANDOFF_TOOL)
+    return title && toyonTool({ name: title }) === null ? title : tool;
+  const project = asRecord2(rawInput).project;
+  return typeof project === "string" && project.trim() ? `Continue in ${project.trim()}` : "Continue in another project";
+}
+function heading(update) {
+  const name = typeof update.name === "string" ? update.name : "";
+  const host = asRecord2(update.rawInput).host;
+  if (isNetworkAsk(update) && typeof host === "string")
+    return { name: "", title: host, kind: "fetch" };
+  if (isToolSearch(update)) {
+    return { name: TOOL_SEARCH, title: toolSearchQuery(update.rawInput) || TOOL_SEARCH, kind: "search" };
+  }
+  const own = toyonTool(update);
+  if (own)
+    return { name: own, title: toyonTitle(own, update.rawInput, update.title), kind: "other" };
+  return { name, title: update.title, ...update.kind ? { kind: update.kind } : {} };
+}
+function endOfAsk(req, res, memos) {
+  const memo = memos.get(req.toolCall.toolCallId);
+  if (req.toolCall.name !== NETWORK_ASK || !memo || memo.ended)
+    return null;
+  const outcome = res.outcome;
+  const picked = outcome.outcome === "selected" ? req.options.find((o) => o.optionId === outcome.optionId) : undefined;
+  const allowed = picked?.kind === "allow_once" || picked?.kind === "allow_always";
+  memo.ended = true;
+  return {
+    type: "tool-end",
+    toolId: req.toolCall.toolCallId,
+    output: allowed ? "allowed" : "refused",
+    isError: !allowed
+  };
+}
+function release(toolId, memo) {
+  const held = memo.held;
+  if (!held)
+    return null;
+  delete memo.held;
+  if (!emptyInput(memo.input))
+    memo.writing = false;
+  return memo.ended ? null : { type: "tool-update", toolId, ...held };
+}
+function preempted(memos) {
+  for (const memo of memos.values()) {
+    if (!memo.ended && memo.writing && !memo.parent)
+      memo.cut = true;
+  }
+}
+function abandoned(memos, parent, opening = false) {
+  const out = [];
+  for (const [toolId, memo] of memos) {
+    if (memo.ended || !memo.writing || memo.parent !== parent)
+      continue;
+    if (opening && memo.held && !memo.cut) {
+      const sent = release(toolId, memo);
+      if (sent)
+        out.push(sent);
+      continue;
+    }
+    memo.ended = true;
+    out.push({ type: "tool-end", toolId });
+  }
+  return out;
+}
+function mapUpdate(update, memos, tag, sink, background) {
+  switch (update.sessionUpdate) {
+    case "agent_message_chunk": {
+      const { parentToolId } = spawnOf(update._meta);
+      const out = abandoned(memos, parentToolId);
+      const text = textOf(update.content, tag, "message");
+      if (text === null)
+        return out;
+      out.push(parentToolId ? { type: "tool-delta", toolId: parentToolId, text } : { type: "text-delta", text, ...update.messageId ? { messageId: update.messageId } : {} });
+      return out;
+    }
+    case "agent_thought_chunk": {
+      const { parentToolId } = spawnOf(update._meta);
+      const out = abandoned(memos, parentToolId);
+      if (parentToolId)
+        return out;
+      const text = textOf(update.content, tag, "thought");
+      if (text !== null)
+        out.push({ type: "thinking-delta", text });
+      return out;
+    }
+    case "tool_call": {
+      const spawn = spawnOf(update._meta);
+      const out = abandoned(memos, spawn.parentToolId, true);
+      const input = update.rawInput ?? { locations: update.locations ?? [] };
+      const head = heading(update);
+      const memo = {
+        ...head,
+        input,
+        content: update.content ?? [],
+        rawOutput: update.rawOutput,
+        ended: false,
+        writing: writingCall(head, input),
+        ...spawn.parentToolId ? { parent: spawn.parentToolId } : {},
+        ...spawn.subagent ? { spawns: true } : {}
+      };
+      memos.set(update.toolCallId, memo);
+      out.push({
+        type: "tool-start",
+        toolId: update.toolCallId,
+        name: memo.name,
+        input,
+        ...memo.kind ? { kind: memo.kind } : {},
+        title: memo.title,
+        ...spawn
+      });
+      if (update.status === "completed" || update.status === "failed")
+        out.push(endOf(update.toolCallId, memo, update.status, sink, background));
+      return out;
+    }
+    case "tool_call_update": {
+      let memo = memos.get(update.toolCallId);
+      const out = [];
+      if (!memo) {
+        const spawn = spawnOf(update._meta);
+        const input = update.rawInput ?? { locations: update.locations ?? [] };
+        memo = {
+          name: update.name ?? "",
+          title: update.title ?? update.name ?? "tool",
+          ...update.kind ? { kind: update.kind } : {},
+          input,
+          content: [],
+          ended: false,
+          writing: writingCall({ name: update.name ?? "", kind: update.kind ?? undefined }, input),
+          ...spawn.parentToolId ? { parent: spawn.parentToolId } : {},
+          ...spawn.subagent ? { spawns: true } : {}
+        };
+        memos.set(update.toolCallId, memo);
+        out.push({
+          type: "tool-start",
+          toolId: update.toolCallId,
+          name: memo.name,
+          input,
+          ...memo.kind ? { kind: memo.kind } : {},
+          title: memo.title,
+          ...spawn
+        });
+      }
+      const refined = { ...memo.held };
+      const title = memo.name === TOOL_SEARCH ? toolSearchQuery(update.rawInput) : memo.name === HANDOFF_TOOL ? update.rawInput !== undefined ? toyonTitle(HANDOFF_TOOL, update.rawInput, update.title) : undefined : update.title;
+      if (title && title !== memo.title)
+        refined.title = memo.title = title;
+      if (update.name && update.name !== memo.name && toyonTool(update) !== memo.name)
+        refined.name = memo.name = update.name;
+      if (update.kind && update.kind !== memo.kind)
+        refined.kind = memo.kind = update.kind;
+      if (update.rawInput !== undefined)
+        refined.input = memo.input = update.rawInput;
+      if (update.rawInput !== undefined && update.content === undefined && update.status === undefined) {
+        if (out.length === 0)
+          memo.held = refined;
+        return out;
+      }
+      delete memo.held;
+      if (!emptyInput(memo.input))
+        memo.writing = false;
+      if (Object.keys(refined).length > 0 && !memo.ended && out.length === 0) {
+        out.push({ type: "tool-update", toolId: update.toolCallId, ...refined });
+      }
+      if (update.content)
+        memo.content = update.content;
+      if (update.rawOutput !== undefined)
+        memo.rawOutput = update.rawOutput;
+      if ((update.status === "completed" || update.status === "failed") && !memo.ended) {
+        out.push(endOf(update.toolCallId, memo, update.status, sink, background));
+      }
+      return out;
+    }
+    case "config_option_update": {
+      const values = currentValues(readOptions(update.configOptions));
+      return Object.keys(values).length > 0 ? [{ type: "session-info", sessionId: "", ...values }] : [];
+    }
+    case "usage_update": {
+      const cost = update.cost && update.cost.currency === "USD" ? update.cost.amount : undefined;
+      return [
+        {
+          type: "usage",
+          used: update.used,
+          size: update.size,
+          ...cost !== undefined ? { cost } : {},
+          ts: Date.now()
+        }
+      ];
+    }
+    default:
+      log.debug(tag, `acp: ignoring ${update.sessionUpdate}`);
+      return [];
+  }
+}
+function textOf(content, tag, what) {
+  if (content.type === "text" && typeof content.text === "string")
+    return content.text;
+  log.debug(tag, `acp: dropping non-text ${what} block (${content.type})`);
+  return null;
+}
+function endOf(toolId, memo, status, sink, background) {
+  memo.ended = true;
+  const output = summarizeToolOutput(memo.content, memo.rawOutput);
+  if (status === "completed" && memo.kind === "execute" && background) {
+    const start = backgroundStart(memo.input, output);
+    if (start && background(toolId, start, memo.input))
+      return { type: "tool-update", toolId, background: true };
+  }
+  const images = sink ? toolImages(memo.content, sink) : [];
+  const detached = status === "completed" && !!memo.spawns && spawnDetached(wholeText(memo.content, memo.rawOutput));
+  return {
+    type: "tool-end",
+    toolId,
+    output,
+    isError: status === "failed" || exitCodeOf(memo.rawOutput) > 0,
+    ...detached ? { detached: true } : {},
+    ...images.length ? { images } : {}
+  };
+}
+function wholeText(content, rawOutput) {
+  const parts = content.flatMap((c) => c.type === "content" && c.content.type === "text" ? [c.content.text] : []);
+  if (typeof rawOutput === "string")
+    parts.push(rawOutput);
+  return parts.join(`
+`);
+}
+function toolImages(content, sink) {
+  const out = [];
+  for (const c of content) {
+    if (c.type !== "content" || c.content.type !== "image")
+      continue;
+    const img = toolImage(c.content.data, c.content.mimeType);
+    if (!img)
+      continue;
+    sink(img.ref.file, img.bytes);
+    out.push(img.ref);
+  }
+  return out;
+}
+function exitCodeOf(rawOutput) {
+  const exit = rawOutput?.metadata?.exit;
+  return typeof exit === "number" ? exit : 0;
+}
+function summarizeToolOutput(content, rawOutput) {
+  const parts = [];
+  let pictured = false;
+  for (const c of content) {
+    if (c.type === "content") {
+      if (c.content.type === "text")
+        parts.push(c.content.text);
+      else if (c.content.type === "image")
+        pictured = true;
+    } else if (c.type === "diff") {
+      const body = unifiedDiff(c.oldText ?? "", c.newText);
+      if (body)
+        parts.push(`\`\`\`diff
+${body}
+\`\`\``);
+    }
+  }
+  if (parts.length > 0)
+    return truncate(parts.join(`
+`));
+  if (pictured)
+    return "";
+  if (typeof rawOutput === "string")
+    return truncate(rawOutput);
+  if (rawOutput && typeof rawOutput === "object") {
+    const rec = rawOutput;
+    for (const k of ["formatted_output", "output", "stdout", "text"])
+      if (typeof rec[k] === "string")
+        return truncate(rec[k]);
+    return truncate(JSON.stringify(rawOutput, null, 1));
+  }
+  return "";
+}
+function truncate(s, max = 4000) {
+  return s.length > max ? `${s.slice(0, max)}
+\u2026 (${s.length - max} more chars)` : s;
+}
+function mapCommands(cmds) {
+  const seen = new Set;
+  return cmds.filter((c) => {
+    if (typeof c.name !== "string" || c.name.length === 0 || c.name.length > 120 || seen.has(c.name))
+      return false;
+    seen.add(c.name);
+    return true;
+  }).slice(0, 300).map((c) => ({
+    name: c.name,
+    description: c.description ?? "",
+    ...c.input?.hint ? { hint: c.input.hint } : {}
+  }));
+}
+function mapStopReason(r) {
+  return r === "cancelled" ? "interrupted" : r;
+}
+
+// ../daemon/src/agent/policy.ts
 var NON_WRITE_KINDS = new Set(["execute", "read", "search", "fetch", "think"]);
 function requestedPaths(req) {
   const raw = [];
@@ -14876,6 +15436,8 @@ function decide(req, bounds, cwd, mode = "auto", sandboxed = true) {
   const commandAsks = kind === "execute" && !sandboxed;
   if (kind === "switch_mode")
     return { kind: "prompt" };
+  if (toyonTool(req.toolCall) !== null)
+    return { kind: "allow" };
   const asks = mode !== "auto";
   if (paths.length === 0) {
     if (kind === "execute")
@@ -15014,7 +15576,7 @@ function fixWhy(f) {
 }
 function pageFixPrompt(errors) {
   return [
-    "After your last edits the preview threw this in the user's browser:",
+    "Since your last edits the preview threw this in the user's browser:",
     "",
     ...errors.map((e) => `- ${e}`),
     "",
@@ -15227,11 +15789,11 @@ ${a.text}
 }
 
 // ../daemon/src/agent/transcript.ts
-import { existsSync as existsSync10, readFileSync as readFileSync9 } from "fs";
+import { existsSync as existsSync11, readFileSync as readFileSync9 } from "fs";
 import { appendFile } from "fs/promises";
-import { join as join8 } from "path";
+import { join as join9 } from "path";
 function transcriptPathFor(transcriptsDir, worktreeId) {
-  return join8(transcriptsDir, `${worktreeId}.jsonl`);
+  return join9(transcriptsDir, `${worktreeId}.jsonl`);
 }
 function coalesce(entries) {
   const out = [];
@@ -15285,7 +15847,7 @@ class Transcript {
     this.seq = (this.entries.at(-1)?.seq ?? -1) + 1;
   }
   read() {
-    return existsSync10(this.path) ? parseTranscript(readFileSync9(this.path, "utf8"), this.tag) : [];
+    return existsSync11(this.path) ? parseTranscript(readFileSync9(this.path, "utf8"), this.tag) : [];
   }
   append(event) {
     const entry = { seq: this.seq++, event };
@@ -15382,168 +15944,6 @@ async function cleanUp(ctx, a, sessionId) {
     await ctx.request(methods.agent.session.delete, { sessionId }).catch(quietly("delete"));
 }
 
-// ../daemon/src/agent/acp/background.ts
-import { existsSync as existsSync11, statSync as statSync4 } from "fs";
-import { open as open2 } from "fs/promises";
-import { homedir as homedir5 } from "os";
-import { basename as basename3, dirname as dirname4, join as join9 } from "path";
-var STARTED = /Command running in background with ID: (\S+)\. Output is being written to: (\S+)\./;
-function backgroundStart(input, output) {
-  const flag = input && typeof input === "object" ? input.run_in_background : undefined;
-  if (flag !== true)
-    return null;
-  const m = STARTED.exec(output);
-  return m ? { taskId: m[1], file: m[2] } : null;
-}
-function spawnDetached(output) {
-  return output.includes("Async agent launched successfully");
-}
-function claudeConfigDir() {
-  return process.env.CLAUDE_CONFIG_DIR || join9(homedir5(), ".claude");
-}
-function sessionLogFor(file, configDir = claudeConfigDir()) {
-  const tasks = dirname4(file);
-  if (basename3(tasks) !== "tasks")
-    return null;
-  const session = dirname4(tasks);
-  const path = join9(configDir, "projects", basename3(dirname4(session)), `${basename3(session)}.jsonl`);
-  return existsSync11(path) ? path : null;
-}
-function taskEnd(text, toolId) {
-  const at = text.indexOf(`<tool-use-id>${toolId}</tool-use-id>`);
-  if (at === -1)
-    return null;
-  const tail = text.slice(at, at + 2000);
-  const status = /<status>(\w+)<\/status>/.exec(tail)?.[1] ?? "completed";
-  const exit = /exit code (\d+)/.exec(tail)?.[1];
-  return { status, exit: exit === undefined ? null : Number(exit) };
-}
-var POLL_MS = 500;
-var DEFAULT_BASH_TIMEOUT_MS = 120000;
-var GRACE_MS = 60000;
-var READ_CHUNK = 1 << 20;
-var CARRY = 4000;
-
-class BackgroundTasks {
-  deps;
-  watched = new Map;
-  constructor(deps) {
-    this.deps = deps;
-  }
-  get size() {
-    return this.watched.size;
-  }
-  start(toolId, start, input) {
-    const logPath = sessionLogFor(start.file, this.deps.configDir);
-    if (!logPath)
-      return false;
-    const timeout = input?.timeout;
-    const ceiling = (typeof timeout === "number" ? timeout : DEFAULT_BASH_TIMEOUT_MS) + (this.deps.graceMs ?? GRACE_MS);
-    const w = {
-      toolId,
-      file: start.file,
-      log: logPath,
-      read: 0,
-      logRead: statSync4(logPath).size,
-      carry: "",
-      decoder: new TextDecoder,
-      text: "",
-      truncated: false,
-      ceiling: Date.now() + ceiling,
-      timer: null
-    };
-    this.watched.set(toolId, w);
-    this.schedule(w);
-    return true;
-  }
-  endAll(reason) {
-    for (const w of [...this.watched.values()]) {
-      fireAndForget("background", this.finish(w, null, reason, true), `ending ${w.toolId}`);
-    }
-  }
-  schedule(w) {
-    w.timer = setTimeout(() => this.poll(w), this.deps.pollMs ?? POLL_MS);
-    w.timer.unref?.();
-  }
-  async poll(w) {
-    w.timer = null;
-    try {
-      await this.drain(w);
-      const fresh = await readSince(w.log, w.logRead);
-      w.logRead += fresh.length;
-      const text = w.carry + fresh.toString("utf8");
-      w.carry = text.slice(-CARRY);
-      const end = fresh.length > 0 ? taskEnd(text, w.toolId) : null;
-      if (end)
-        return this.finish(w, end);
-      if (Date.now() >= w.ceiling)
-        return this.finish(w, null, "no word of its end; the row stops watching");
-    } catch (e) {
-      log.warn("background", `watching ${w.toolId} failed`, e);
-    }
-    if (this.watched.has(w.toolId))
-      this.schedule(w);
-  }
-  async drain(w) {
-    const fresh = await readSince(w.file, w.read);
-    w.read += fresh.length;
-    if (fresh.length === 0 || w.truncated)
-      return;
-    const chunk = w.decoder.decode(fresh, { stream: true });
-    const take = chunk.slice(0, OUTPUT_CAP - w.text.length);
-    w.text += take;
-    if (take.length < chunk.length)
-      w.truncated = true;
-    if (take)
-      this.deps.note({ type: "tool-delta", toolId: w.toolId, text: take });
-  }
-  async finish(w, end, note, killed = false) {
-    if (!this.watched.delete(w.toolId))
-      return;
-    if (w.timer)
-      clearTimeout(w.timer);
-    try {
-      await this.drain(w);
-    } catch (e) {
-      log.warn("background", `reading the last of ${w.toolId} failed`, e);
-    }
-    const exit = end ? end.exit ?? (end.status === "completed" ? 0 : null) : null;
-    const lines = [formatOutput(w.text, exit ?? 0, w.truncated)];
-    if (end && exit === null)
-      lines.push(end.status);
-    if (note)
-      lines.push(note);
-    this.deps.note({
-      type: "tool-end",
-      toolId: w.toolId,
-      output: lines.filter(Boolean).join(`
-`),
-      isError: killed || end !== null && (exit !== 0 || end.status !== "completed")
-    });
-    this.deps.onEnd?.();
-  }
-}
-async function readSince(path, offset) {
-  let fh;
-  try {
-    fh = await open2(path, "r");
-  } catch (e) {
-    if (e.code === "ENOENT")
-      return Buffer.alloc(0);
-    throw e;
-  }
-  try {
-    const { size } = await fh.stat();
-    if (size <= offset)
-      return Buffer.alloc(0);
-    const buf = Buffer.alloc(Math.min(size - offset, READ_CHUNK));
-    const { bytesRead } = await fh.read(buf, 0, buf.length, offset);
-    return buf.subarray(0, bytesRead);
-  } finally {
-    await fh.close();
-  }
-}
-
 // ../daemon/src/agent/acp/elicit.ts
 var CODEX_META = "codex";
 var CLAUDE_CUSTOM_KEY = /^(question_\d+)_custom$/;
@@ -15657,398 +16057,6 @@ function toContent(form, answers) {
   return out;
 }
 
-// ../daemon/src/agent/acp/diff.ts
-function diffOps(a, b) {
-  return diffSeq(a, b).map((op) => ({ mark: op.mark, text: op.value }));
-}
-function unifiedDiff(oldText, newText, context = 3) {
-  const a = oldText === "" ? [] : oldText.split(`
-`);
-  const b = newText === "" ? [] : newText.split(`
-`);
-  const ops = diffOps(a, b);
-  const oldNo = [];
-  const newNo = [];
-  let o = 1;
-  let n = 1;
-  for (const op of ops) {
-    oldNo.push(o);
-    newNo.push(n);
-    if (op.mark !== "+")
-      o++;
-    if (op.mark !== "-")
-      n++;
-  }
-  const out = [];
-  let k = 0;
-  while (k < ops.length) {
-    if (ops[k]?.mark === " ") {
-      k++;
-      continue;
-    }
-    const start = k;
-    let end = k;
-    let j = k;
-    while (j < ops.length) {
-      if (ops[j]?.mark !== " ") {
-        end = j;
-        j++;
-        continue;
-      }
-      let run = 0;
-      while (j + run < ops.length && ops[j + run]?.mark === " ")
-        run++;
-      if (run > context * 2 || j + run >= ops.length)
-        break;
-      j += run;
-    }
-    const from = Math.max(0, start - context);
-    const to = Math.min(ops.length, end + context + 1);
-    const body = ops.slice(from, to);
-    const oldCount = body.filter((op) => op.mark !== "+").length;
-    const newCount = body.filter((op) => op.mark !== "-").length;
-    out.push(`@@ -${oldNo[from]},${oldCount} +${newNo[from]},${newCount} @@`, ...body.map((op) => `${op.mark}${op.text}`));
-    k = to;
-  }
-  return out.join(`
-`);
-}
-
-// ../daemon/src/agent/acp/map.ts
-function spawnOf(meta) {
-  const claude = asRecord2(asRecord2(meta).claudeCode);
-  const parentToolId = typeof claude.parentToolUseId === "string" ? claude.parentToolUseId : undefined;
-  const codex = asRecord2(asRecord2(meta).codex).subagent;
-  const spawns = claude.toolName === "Agent" || claude.toolName === "Task";
-  const subagent = spawns || claude.subagent === true || Object.keys(asRecord2(codex)).length > 0;
-  return { ...parentToolId ? { parentToolId } : {}, ...subagent ? { subagent: true } : {} };
-}
-function asRecord2(v) {
-  return v && typeof v === "object" && !Array.isArray(v) ? v : {};
-}
-var NETWORK_ASK = "SandboxNetworkAccess";
-function isNetworkAsk(update) {
-  return update.name === NETWORK_ASK || asRecord2(asRecord2(update._meta).claudeCode).toolName === NETWORK_ASK;
-}
-function isToolSearch(update) {
-  return update.name === TOOL_SEARCH || asRecord2(asRecord2(update._meta).claudeCode).toolName === TOOL_SEARCH;
-}
-function toolSearchQuery(rawInput) {
-  const query = asRecord2(rawInput).query;
-  if (typeof query !== "string")
-    return "";
-  const names = /^select:(.*)$/.exec(query.trim());
-  if (!names)
-    return query.trim();
-  return (names[1] ?? "").split(",").map((s) => s.trim()).filter(Boolean).join(", ");
-}
-var TOYON_TOOL = new RegExp(`^(?:mcp__${TOYON_MCP_SERVER}__|${TOYON_MCP_SERVER}/)([A-Za-z0-9_-]+)$`);
-function toyonTool(update) {
-  const meta = asRecord2(asRecord2(update._meta).claudeCode).toolName;
-  for (const spelled of [update.name ?? "", typeof meta === "string" ? meta : ""]) {
-    const m = TOYON_TOOL.exec(spelled);
-    if (m)
-      return m[1];
-  }
-  return null;
-}
-function toyonTitle(tool, rawInput, title) {
-  if (tool !== HANDOFF_TOOL)
-    return title && toyonTool({ name: title }) === null ? title : tool;
-  const project = asRecord2(rawInput).project;
-  return typeof project === "string" && project.trim() ? `Continue in ${project.trim()}` : "Continue in another project";
-}
-function heading(update) {
-  const name = typeof update.name === "string" ? update.name : "";
-  const host = asRecord2(update.rawInput).host;
-  if (isNetworkAsk(update) && typeof host === "string")
-    return { name: "", title: host, kind: "fetch" };
-  if (isToolSearch(update)) {
-    return { name: TOOL_SEARCH, title: toolSearchQuery(update.rawInput) || TOOL_SEARCH, kind: "search" };
-  }
-  const own = toyonTool(update);
-  if (own)
-    return { name: own, title: toyonTitle(own, update.rawInput, update.title), kind: "other" };
-  return { name, title: update.title, ...update.kind ? { kind: update.kind } : {} };
-}
-function endOfAsk(req, res, memos) {
-  const memo = memos.get(req.toolCall.toolCallId);
-  if (req.toolCall.name !== NETWORK_ASK || !memo || memo.ended)
-    return null;
-  const outcome = res.outcome;
-  const picked = outcome.outcome === "selected" ? req.options.find((o) => o.optionId === outcome.optionId) : undefined;
-  const allowed = picked?.kind === "allow_once" || picked?.kind === "allow_always";
-  memo.ended = true;
-  return {
-    type: "tool-end",
-    toolId: req.toolCall.toolCallId,
-    output: allowed ? "allowed" : "refused",
-    isError: !allowed
-  };
-}
-function release(toolId, memo) {
-  const held = memo.held;
-  if (!held)
-    return null;
-  delete memo.held;
-  if (!emptyInput(memo.input))
-    memo.writing = false;
-  return memo.ended ? null : { type: "tool-update", toolId, ...held };
-}
-function preempted(memos) {
-  for (const memo of memos.values()) {
-    if (!memo.ended && memo.writing && !memo.parent)
-      memo.cut = true;
-  }
-}
-function abandoned(memos, parent, opening = false) {
-  const out = [];
-  for (const [toolId, memo] of memos) {
-    if (memo.ended || !memo.writing || memo.parent !== parent)
-      continue;
-    if (opening && memo.held && !memo.cut) {
-      const sent = release(toolId, memo);
-      if (sent)
-        out.push(sent);
-      continue;
-    }
-    memo.ended = true;
-    out.push({ type: "tool-end", toolId });
-  }
-  return out;
-}
-function mapUpdate(update, memos, tag, sink, background) {
-  switch (update.sessionUpdate) {
-    case "agent_message_chunk": {
-      const { parentToolId } = spawnOf(update._meta);
-      const out = abandoned(memos, parentToolId);
-      const text = textOf(update.content, tag, "message");
-      if (text === null)
-        return out;
-      out.push(parentToolId ? { type: "tool-delta", toolId: parentToolId, text } : { type: "text-delta", text, ...update.messageId ? { messageId: update.messageId } : {} });
-      return out;
-    }
-    case "agent_thought_chunk": {
-      const { parentToolId } = spawnOf(update._meta);
-      const out = abandoned(memos, parentToolId);
-      if (parentToolId)
-        return out;
-      const text = textOf(update.content, tag, "thought");
-      if (text !== null)
-        out.push({ type: "thinking-delta", text });
-      return out;
-    }
-    case "tool_call": {
-      const spawn = spawnOf(update._meta);
-      const out = abandoned(memos, spawn.parentToolId, true);
-      const input = update.rawInput ?? { locations: update.locations ?? [] };
-      const head = heading(update);
-      const memo = {
-        ...head,
-        input,
-        content: update.content ?? [],
-        rawOutput: update.rawOutput,
-        ended: false,
-        writing: writingCall(head, input),
-        ...spawn.parentToolId ? { parent: spawn.parentToolId } : {},
-        ...spawn.subagent ? { spawns: true } : {}
-      };
-      memos.set(update.toolCallId, memo);
-      out.push({
-        type: "tool-start",
-        toolId: update.toolCallId,
-        name: memo.name,
-        input,
-        ...memo.kind ? { kind: memo.kind } : {},
-        title: memo.title,
-        ...spawn
-      });
-      if (update.status === "completed" || update.status === "failed")
-        out.push(endOf(update.toolCallId, memo, update.status, sink, background));
-      return out;
-    }
-    case "tool_call_update": {
-      let memo = memos.get(update.toolCallId);
-      const out = [];
-      if (!memo) {
-        const spawn = spawnOf(update._meta);
-        const input = update.rawInput ?? { locations: update.locations ?? [] };
-        memo = {
-          name: update.name ?? "",
-          title: update.title ?? update.name ?? "tool",
-          ...update.kind ? { kind: update.kind } : {},
-          input,
-          content: [],
-          ended: false,
-          writing: writingCall({ name: update.name ?? "", kind: update.kind ?? undefined }, input),
-          ...spawn.parentToolId ? { parent: spawn.parentToolId } : {},
-          ...spawn.subagent ? { spawns: true } : {}
-        };
-        memos.set(update.toolCallId, memo);
-        out.push({
-          type: "tool-start",
-          toolId: update.toolCallId,
-          name: memo.name,
-          input,
-          ...memo.kind ? { kind: memo.kind } : {},
-          title: memo.title,
-          ...spawn
-        });
-      }
-      const refined = { ...memo.held };
-      const title = memo.name === TOOL_SEARCH ? toolSearchQuery(update.rawInput) : memo.name === HANDOFF_TOOL ? update.rawInput !== undefined ? toyonTitle(HANDOFF_TOOL, update.rawInput, update.title) : undefined : update.title;
-      if (title && title !== memo.title)
-        refined.title = memo.title = title;
-      if (update.name && update.name !== memo.name && toyonTool(update) !== memo.name)
-        refined.name = memo.name = update.name;
-      if (update.kind && update.kind !== memo.kind)
-        refined.kind = memo.kind = update.kind;
-      if (update.rawInput !== undefined)
-        refined.input = memo.input = update.rawInput;
-      if (update.rawInput !== undefined && update.content === undefined && update.status === undefined) {
-        if (out.length === 0)
-          memo.held = refined;
-        return out;
-      }
-      delete memo.held;
-      if (!emptyInput(memo.input))
-        memo.writing = false;
-      if (Object.keys(refined).length > 0 && !memo.ended && out.length === 0) {
-        out.push({ type: "tool-update", toolId: update.toolCallId, ...refined });
-      }
-      if (update.content)
-        memo.content = [...memo.content, ...update.content];
-      if (update.rawOutput !== undefined)
-        memo.rawOutput = update.rawOutput;
-      if ((update.status === "completed" || update.status === "failed") && !memo.ended) {
-        out.push(endOf(update.toolCallId, memo, update.status, sink, background));
-      }
-      return out;
-    }
-    case "config_option_update": {
-      const values = currentValues(readOptions(update.configOptions));
-      return Object.keys(values).length > 0 ? [{ type: "session-info", sessionId: "", ...values }] : [];
-    }
-    case "usage_update": {
-      const cost = update.cost && update.cost.currency === "USD" ? update.cost.amount : undefined;
-      return [
-        {
-          type: "usage",
-          used: update.used,
-          size: update.size,
-          ...cost !== undefined ? { cost } : {},
-          ts: Date.now()
-        }
-      ];
-    }
-    default:
-      log.debug(tag, `acp: ignoring ${update.sessionUpdate}`);
-      return [];
-  }
-}
-function textOf(content, tag, what) {
-  if (content.type === "text" && typeof content.text === "string")
-    return content.text;
-  log.debug(tag, `acp: dropping non-text ${what} block (${content.type})`);
-  return null;
-}
-function endOf(toolId, memo, status, sink, background) {
-  memo.ended = true;
-  const output = summarizeToolOutput(memo.content, memo.rawOutput);
-  if (status === "completed" && memo.kind === "execute" && background) {
-    const start = backgroundStart(memo.input, output);
-    if (start && background(toolId, start, memo.input))
-      return { type: "tool-update", toolId, background: true };
-  }
-  const images = sink ? toolImages(memo.content, sink) : [];
-  const detached = status === "completed" && !!memo.spawns && spawnDetached(wholeText(memo.content, memo.rawOutput));
-  return {
-    type: "tool-end",
-    toolId,
-    output,
-    isError: status === "failed" || exitCodeOf(memo.rawOutput) > 0,
-    ...detached ? { detached: true } : {},
-    ...images.length ? { images } : {}
-  };
-}
-function wholeText(content, rawOutput) {
-  const parts = content.flatMap((c) => c.type === "content" && c.content.type === "text" ? [c.content.text] : []);
-  if (typeof rawOutput === "string")
-    parts.push(rawOutput);
-  return parts.join(`
-`);
-}
-function toolImages(content, sink) {
-  const out = [];
-  for (const c of content) {
-    if (c.type !== "content" || c.content.type !== "image")
-      continue;
-    const img = toolImage(c.content.data, c.content.mimeType);
-    if (!img)
-      continue;
-    sink(img.ref.file, img.bytes);
-    out.push(img.ref);
-  }
-  return out;
-}
-function exitCodeOf(rawOutput) {
-  const exit = rawOutput?.metadata?.exit;
-  return typeof exit === "number" ? exit : 0;
-}
-function summarizeToolOutput(content, rawOutput) {
-  const parts = [];
-  let pictured = false;
-  for (const c of content) {
-    if (c.type === "content") {
-      if (c.content.type === "text")
-        parts.push(c.content.text);
-      else if (c.content.type === "image")
-        pictured = true;
-    } else if (c.type === "diff") {
-      const body = unifiedDiff(c.oldText ?? "", c.newText);
-      if (body)
-        parts.push(`\`\`\`diff
-${body}
-\`\`\``);
-    }
-  }
-  if (parts.length > 0)
-    return truncate(parts.join(`
-`));
-  if (pictured)
-    return "";
-  if (typeof rawOutput === "string")
-    return truncate(rawOutput);
-  if (rawOutput && typeof rawOutput === "object") {
-    const rec = rawOutput;
-    for (const k of ["formatted_output", "output", "stdout", "text"])
-      if (typeof rec[k] === "string")
-        return truncate(rec[k]);
-    return truncate(JSON.stringify(rawOutput, null, 1));
-  }
-  return "";
-}
-function truncate(s, max = 4000) {
-  return s.length > max ? `${s.slice(0, max)}
-\u2026 (${s.length - max} more chars)` : s;
-}
-function mapCommands(cmds) {
-  const seen = new Set;
-  return cmds.filter((c) => {
-    if (typeof c.name !== "string" || c.name.length === 0 || c.name.length > 120 || seen.has(c.name))
-      return false;
-    seen.add(c.name);
-    return true;
-  }).slice(0, 300).map((c) => ({
-    name: c.name,
-    description: c.description ?? "",
-    ...c.input?.hint ? { hint: c.input.hint } : {}
-  }));
-}
-function mapStopReason(r) {
-  return r === "cancelled" ? "interrupted" : r;
-}
-
 // ../daemon/src/agent/acp/ratelimit.ts
 var RATE_LIMIT_META = "_claude/rateLimit";
 var STATUSES = new Set(["allowed", "allowed_warning", "rejected"]);
@@ -16123,7 +16131,10 @@ class AcpSession {
   running = false;
   interrupted = false;
   stopped = false;
-  held = false;
+  holds = 0;
+  get held() {
+    return this.holds > 0;
+  }
   conn = null;
   connecting = null;
   opening = null;
@@ -16171,15 +16182,30 @@ class AcpSession {
       this.emit({ type: "tool-end", toolId, output: output.join(`
 `), isError: true });
     }
-    for (const { event } of this.log.entries)
+    const going = new Set;
+    for (const { event } of this.log.entries) {
       this.trackHandoff(event);
+      if (event.type === "handoff-go")
+        going.add(event.id);
+      else if (event.type === "handoff" || event.type === "handoff-declined")
+        going.delete(event.id);
+    }
+    for (const id of going) {
+      this.emit({
+        type: "handoff-declined",
+        id,
+        outcome: "failed",
+        reason: "Toyon stopped while the worktree was being made",
+        ts: Date.now()
+      });
+    }
     if (this.openHandoffs.size > 0)
       this.syncStatus();
   }
   trackHandoff(event) {
     if (event.type === "handoff-proposed")
       return this.openHandoffs.add(event.id).size > 0;
-    if (event.type === "handoff" || event.type === "handoff-declined")
+    if (event.type === "handoff-go" || event.type === "handoff" || event.type === "handoff-declined")
       return this.openHandoffs.delete(event.id);
     return false;
   }
@@ -16316,14 +16342,14 @@ class AcpSession {
       fireAndForget(this.d.worktreeId, this.drain(), "agent drain");
   }
   hold() {
-    this.held = true;
+    this.holds++;
     let released = false;
     return () => {
       if (released)
         return;
       released = true;
-      this.held = false;
-      if (!this.running && this.queue.length > 0)
+      this.holds--;
+      if (!this.held && !this.running && this.queue.length > 0)
         fireAndForget(this.d.worktreeId, this.drain(), "agent drain");
     };
   }
@@ -18630,6 +18656,8 @@ class RuntimeRegistry {
     }
     if (this.settingUp.has(id))
       return;
+    if (wt.kind === "spare" && wt.phase !== undefined && wt.phase !== "ready")
+      return;
     const repo = this.deps.state.repos.find((r) => r.id === wt.repoId);
     if (repo)
       await this.start(wt, repo);
@@ -19424,7 +19452,7 @@ function openAskOf(entries) {
       open.delete(e.id);
     else if (e.type === "handoff-proposed")
       open.set(e.id, `Continue in ${e.repo.name}?`);
-    else if (e.type === "handoff" || e.type === "handoff-declined")
+    else if (e.type === "handoff-go" || e.type === "handoff" || e.type === "handoff-declined")
       open.delete(e.id);
   }
   const last = [...open.values()].at(-1)?.trim();
@@ -19714,32 +19742,83 @@ function makePlanner(agents) {
   return async (request, cwd, agentId) => parsePlan(await askFreshAgent(agents, agentId, cwd, PLAN_SYSTEM, planPrompt(request), { quick: "prefer" }));
 }
 
+// ../daemon/src/agent/transcriptForward.ts
+import { readdirSync as readdirSync5, readFileSync as readFileSync11, renameSync as renameSync2, writeFileSync as writeFileSync6 } from "fs";
+import { join as join12 } from "path";
+function forwardLine(line) {
+  if (!line.includes('"page-error"'))
+    return null;
+  let entry;
+  try {
+    entry = JSON.parse(line);
+  } catch {
+    return null;
+  }
+  const e = entry.event;
+  if (e?.type !== "page-error" || Array.isArray(e.errors) || typeof e.message !== "string")
+    return null;
+  const { message, ...rest } = e;
+  return JSON.stringify({ ...entry, event: { ...rest, errors: [message] } });
+}
+function forwardText(text) {
+  let changed = 0;
+  const lines = text.split(`
+`).map((line) => {
+    const next = forwardLine(line);
+    if (next === null)
+      return line;
+    changed++;
+    return next;
+  });
+  return { text: changed ? lines.join(`
+`) : text, changed };
+}
+function forwardTranscripts(dir) {
+  let files = 0;
+  let rows = 0;
+  for (const name of readdirSync5(dir)) {
+    if (!name.endsWith(".jsonl"))
+      continue;
+    const path = join12(dir, name);
+    const { text, changed } = forwardText(readFileSync11(path, "utf8"));
+    if (!changed)
+      continue;
+    const tmp = `${path}.tmp`;
+    writeFileSync6(tmp, text);
+    renameSync2(tmp, path);
+    files++;
+    rows += changed;
+  }
+  if (files)
+    log.info("transcripts", `rewrote ${rows} page-error row(s) in ${files} transcript(s) to the list shape`);
+}
+
 // ../daemon/src/core/assets.ts
-import { existsSync as existsSync14, readdirSync as readdirSync5, rmSync as rmSync3, statSync as statSync5 } from "fs";
-import { join as join12, resolve as resolve5 } from "path";
+import { existsSync as existsSync14, readdirSync as readdirSync6, rmSync as rmSync3, statSync as statSync5 } from "fs";
+import { join as join13, resolve as resolve5 } from "path";
 function locateAssets(here, env = process.env) {
-  const packaged = existsSync14(join12(here, "shell", "index.html"));
+  const packaged = existsSync14(join13(here, "shell", "index.html"));
   return {
-    shellDist: env.TOYON_SHELL_DIST ?? (packaged ? join12(here, "shell") : join12(here, "../../shell/dist")),
-    bridgeJs: env.TOYON_BRIDGE_JS ?? (packaged ? join12(here, "bridge.js") : join12(here, "../../bridge/dist/bridge.js")),
-    helperStub: packaged ? join12(here, "helper-stub") : join12(here, "../dist/helper-stub"),
-    cliEntry: packaged ? join12(here, "cli.js") : join12(here, "../../cli/src/cli.ts"),
+    shellDist: env.TOYON_SHELL_DIST ?? (packaged ? join13(here, "shell") : join13(here, "../../shell/dist")),
+    bridgeJs: env.TOYON_BRIDGE_JS ?? (packaged ? join13(here, "bridge.js") : join13(here, "../../bridge/dist/bridge.js")),
+    helperStub: packaged ? join13(here, "helper-stub") : join13(here, "../dist/helper-stub"),
+    cliEntry: packaged ? join13(here, "cli.js") : join13(here, "../../cli/src/cli.ts"),
     sourceRoot: packaged ? null : resolve5(here, "../../.."),
-    packageJson: packaged ? join12(here, "..", "package.json") : null
+    packageJson: packaged ? join13(here, "..", "package.json") : null
   };
 }
 var KEEP_MS = 3 * 24 * 60 * 60 * 1000;
 function pruneAssets(shellDist) {
-  const dir = join12(shellDist, "assets");
+  const dir = join13(shellDist, "assets");
   let names;
   try {
-    names = readdirSync5(dir);
+    names = readdirSync6(dir);
   } catch {
     return 0;
   }
   const found = [];
   for (const name of names) {
-    const path = join12(dir, name);
+    const path = join13(dir, name);
     try {
       found.push({ path, mtime: statSync5(path).mtimeMs });
     } catch {}
@@ -20281,7 +20360,7 @@ class GrantCodes {
 import { createHash as createHash3 } from "crypto";
 import { existsSync as existsSync16 } from "fs";
 import { chmod, copyFile as copyFile3, mkdir as mkdir2, readFile as readFile2, rm, writeFile as writeFile2 } from "fs/promises";
-import { basename as basename4, dirname as dirname5, join as join13 } from "path";
+import { basename as basename4, dirname as dirname5, join as join14 } from "path";
 var EXECUTABLE = "Toyon";
 function helperWanted(where) {
   return where.platform === "darwin" && !where.cloud && where.port === DAEMON_DEFAULT_PORT && where.home === undefined;
@@ -20364,19 +20443,19 @@ class Helper {
       return "skipped";
     const stubHash = createHash3("sha256").update(await readFile2(spec.stub)).digest("hex").slice(0, 16);
     const { plist, script } = helperFiles(spec, stubHash);
-    const contents = join13(spec.dir, "Contents");
-    const resources = join13(contents, "Resources");
-    const stub = join13(contents, "MacOS", EXECUTABLE);
-    const scriptFile = join13(resources, "launch.sh");
+    const contents = join14(spec.dir, "Contents");
+    const resources = join14(contents, "Resources");
+    const stub = join14(contents, "MacOS", EXECUTABLE);
+    const scriptFile = join14(resources, "launch.sh");
     if (existsSync16(stub) && existsSync16(scriptFile) && await readFile2(scriptFile, "utf8") === script)
       return "kept";
-    await mkdir2(join13(contents, "MacOS"), { recursive: true });
+    await mkdir2(join14(contents, "MacOS"), { recursive: true });
     await mkdir2(resources, { recursive: true });
-    await writeFile2(join13(contents, "Info.plist"), plist);
+    await writeFile2(join14(contents, "Info.plist"), plist);
     await writeFile2(scriptFile, script, { mode: 493 });
     await copyFile3(spec.stub, stub);
     await chmod(stub, 493);
-    if (!existsSync16(join13(resources, "AppIcon.icns")))
+    if (!existsSync16(join14(resources, "AppIcon.icns")))
       await this.drawIcon(resources);
     await this.run(["xattr", "-cr", spec.dir]);
     if (!await this.run(["codesign", "--force", "--deep", "-s", "-", spec.dir])) {
@@ -20387,16 +20466,16 @@ class Helper {
   }
   async drawIcon(resources) {
     const svg = this.spec.icon;
-    const tmp = join13(resources, "iconset.tmp");
-    const set = join13(tmp, "AppIcon.iconset");
+    const tmp = join14(resources, "iconset.tmp");
+    const set = join14(tmp, "AppIcon.iconset");
     await mkdir2(set, { recursive: true });
     await this.run(["qlmanage", "-t", "-s", "1024", "-o", tmp, svg]);
-    const big = join13(tmp, `${basename4(svg)}.png`);
+    const big = join14(tmp, `${basename4(svg)}.png`);
     if (existsSync16(big)) {
       for (const size of [16, 32, 64, 128, 256, 512, 1024]) {
-        await this.run(["sips", "-z", String(size), String(size), big, "--out", join13(set, `icon_${size}x${size}.png`)]);
+        await this.run(["sips", "-z", String(size), String(size), big, "--out", join14(set, `icon_${size}x${size}.png`)]);
       }
-      await this.run(["iconutil", "-c", "icns", set, "-o", join13(resources, "AppIcon.icns")]);
+      await this.run(["iconutil", "-c", "icns", set, "-o", join14(resources, "AppIcon.icns")]);
     }
     await rm(tmp, { recursive: true, force: true });
   }
@@ -20620,7 +20699,7 @@ class Origins {
 }
 
 // ../daemon/src/core/remoteSwitch.ts
-import { writeFileSync as writeFileSync6 } from "fs";
+import { writeFileSync as writeFileSync7 } from "fs";
 class RemoteSwitch {
   d;
   constructor(d) {
@@ -20653,7 +20732,7 @@ class RemoteSwitch {
     const accepted = acceptRemote(view, this.d.policy);
     if (typeof accepted === "string")
       throw new UserError(accepted);
-    writeFileSync6(this.d.file, `${JSON.stringify(accepted, null, 2)}
+    writeFileSync7(this.d.file, `${JSON.stringify(accepted, null, 2)}
 `);
     return this.live(accepted);
   }
@@ -20835,7 +20914,7 @@ class SelfWatch {
 
 // ../daemon/src/core/state.ts
 import { randomBytes as randomBytes6 } from "crypto";
-import { existsSync as existsSync17, readFileSync as readFileSync11, renameSync as renameSync2, writeFileSync as writeFileSync7 } from "fs";
+import { existsSync as existsSync17, readFileSync as readFileSync12, renameSync as renameSync3, writeFileSync as writeFileSync8 } from "fs";
 var TRUSTED_MAX = 16;
 var DAEMON_GROUPS = "daemon";
 var GROUPS_SAVE_MS = 250;
@@ -20848,7 +20927,7 @@ function loadState(paths) {
     return structuredClone(empty);
   let raw;
   try {
-    raw = readFileSync11(STATE_FILE, "utf8");
+    raw = readFileSync12(STATE_FILE, "utf8");
   } catch (e) {
     log.error("state", `cannot read ${STATE_FILE}; starting empty`, e);
     return structuredClone(empty);
@@ -20859,7 +20938,7 @@ function loadState(paths) {
   } catch (e) {
     const backup = `${STATE_FILE}.corrupt-${Date.now()}`;
     try {
-      writeFileSync7(backup, raw);
+      writeFileSync8(backup, raw);
     } catch (be) {
       log.warn("state", "could not write the corrupt-state backup", be);
     }
@@ -20890,16 +20969,16 @@ function loadState(paths) {
 }
 function saveState(paths, state) {
   const tmp = `${paths.stateFile}.tmp`;
-  writeFileSync7(tmp, JSON.stringify(state, null, 2));
-  renameSync2(tmp, paths.stateFile);
+  writeFileSync8(tmp, JSON.stringify(state, null, 2));
+  renameSync3(tmp, paths.stateFile);
 }
 function loadOrCreateToken(paths) {
   ensureDirs(paths);
   const TOKEN_FILE = paths.tokenFile;
   if (existsSync17(TOKEN_FILE))
-    return readFileSync11(TOKEN_FILE, "utf8").trim();
+    return readFileSync12(TOKEN_FILE, "utf8").trim();
   const token = randomBytes6(32).toString("hex");
-  writeFileSync7(TOKEN_FILE, token, { mode: 384 });
+  writeFileSync8(TOKEN_FILE, token, { mode: 384 });
   return token;
 }
 
@@ -20985,6 +21064,10 @@ class StateStore {
     this.save();
   }
   removeWorktree(id) {
+    const wt = this.state.worktrees.find((w) => w.id === id);
+    const repo = wt && wt.kind !== "spare" ? this.repo(wt.repoId) : undefined;
+    if (wt && repo)
+      repo.promptedAt = Math.max(repo.promptedAt ?? 0, sentAt(wt));
     this.state.worktrees = this.state.worktrees.filter((w) => w.id !== id);
     delete this.state.sessions[id];
     if (this.state.seen)
@@ -21168,7 +21251,7 @@ class StateStore {
 
 // ../daemon/src/core/tailnet.ts
 var PHONE_OS = new Set(["android", "ios"]);
-function tailnetPeers(json) {
+function tailnetListed(json) {
   let st;
   try {
     st = JSON.parse(json);
@@ -21183,12 +21266,31 @@ function tailnetPeers(json) {
       continue;
     const host = dnsName(p.DNSName);
     const name = p.HostName || host.split(".")[0] || "a device";
-    peers.push({ name, host, ip: p.TailscaleIPs?.[0] ?? null, os: (p.OS ?? "").toLowerCase() });
+    peers.push({
+      name,
+      host,
+      ip: p.TailscaleIPs?.[0] ?? null,
+      os: (p.OS ?? "").toLowerCase(),
+      online: p.Online === true
+    });
   }
-  return peers;
+  return { here: st.Self?.Online !== false, peers };
 }
 var isPhone = (p) => PHONE_OS.has(p.os);
+function loginUrl(json) {
+  try {
+    const st = JSON.parse(json);
+    return typeof st?.AuthURL === "string" && st.AuthURL !== "" ? st.AuthURL : null;
+  } catch {
+    return null;
+  }
+}
+var lastLine2 = (r) => (r.err.trim() || r.out.trim()).split(`
+`).at(-1) ?? "tailscale failed";
+var LOGIN_URL_WAIT_MS = 4000;
+var LOGIN_URL_POLL_MS = 300;
 var PROBE_TIMEOUT_MS2 = 2000;
+var ANSWERED_RECENTLY_MS = 3 * 60000;
 var probe = async (origin, named) => {
   try {
     const r = await fetch(`${origin}/health`, { signal: AbortSignal.timeout(PROBE_TIMEOUT_MS2) });
@@ -21205,6 +21307,8 @@ var probe = async (origin, named) => {
 var PING_TIMEOUT = "2s";
 var pingArgs = (ip) => ["ping", "--until-direct=false", "--c", "1", "--timeout", PING_TIMEOUT, ip];
 var STATUS_FRESH_MS = 5000;
+var VIEW_FRESH_MS = 4000;
+var VIEW_STALE_MAX_MS = 60000;
 var READINESS_EVERY_MS = 60000;
 class Tailnet {
   d;
@@ -21212,6 +21316,9 @@ class Tailnet {
   statusAt = 0;
   status = null;
   timer = null;
+  answered = new Map;
+  lastView = null;
+  viewing = null;
   constructor(d) {
     this.d = d;
   }
@@ -21229,7 +21336,9 @@ class Tailnet {
     return this.readinessNow;
   }
   async refresh() {
-    const json = await this.statusJson(true);
+    return this.noteReadiness(await this.statusJson(true));
+  }
+  noteReadiness(json) {
     const next = this.d.ts === null ? {
       state: "not-installed",
       name: null,
@@ -21241,6 +21350,32 @@ class Tailnet {
       this.d.hub.emit("tailscaleChanged");
     return next;
   }
+  async up() {
+    const ts = this.d.ts;
+    if (ts === null)
+      return "Tailscale is not installed here";
+    const r = await ts(["up"]);
+    await this.refresh();
+    return r.ok ? null : lastLine2(r);
+  }
+  async login() {
+    const ts = this.d.ts;
+    if (ts === null)
+      return { why: "Tailscale is not installed here" };
+    fireAndForget("tailscale", ts(["login"]), "tailscale login");
+    const sleep = this.d.sleep ?? ((ms) => Bun.sleep(ms));
+    const now = this.d.now ?? Date.now;
+    const until = now() + LOGIN_URL_WAIT_MS;
+    for (;; ) {
+      const json = await this.statusJson(true);
+      const url = json === null ? null : loginUrl(json);
+      if (url !== null)
+        return { url };
+      if (now() >= until)
+        return { why: "Tailscale did not offer a sign-in link; run `tailscale login` in a terminal" };
+      await sleep(LOGIN_URL_POLL_MS);
+    }
+  }
   statusJson(fresh = false) {
     const ts = this.d.ts;
     if (ts === null)
@@ -21252,26 +21387,50 @@ class Tailnet {
     }
     return this.status;
   }
-  async peers() {
+  async listed() {
     const json = await this.statusJson();
-    return json === null ? null : tailnetPeers(json);
+    this.noteReadiness(json);
+    return json === null ? null : tailnetListed(json);
   }
-  async phones() {
+  async view() {
+    const now = (this.d.now ?? Date.now)();
+    const last = this.lastView;
+    if (last && now - last.at < VIEW_FRESH_MS)
+      return last.view;
+    if (this.viewing === null) {
+      this.viewing = this.makeView().finally(() => {
+        this.viewing = null;
+      });
+    }
+    if (last && now - last.at < VIEW_STALE_MAX_MS) {
+      fireAndForget("tailnet", this.viewing, "tailnet view");
+      return last.view;
+    }
+    return this.viewing;
+  }
+  async makeView() {
     const ts = this.d.ts;
-    const peers = await this.peers();
-    if (peers === null || ts === null)
-      return null;
-    return Promise.all(peers.filter(isPhone).map(async (p) => ({
-      name: p.name,
-      online: p.ip !== null && (await ts(pingArgs(p.ip))).ok
-    })));
-  }
-  async machines() {
-    const peers = await this.peers();
-    if (peers === null)
+    const listed = await this.listed();
+    if (listed === null || ts === null)
       return null;
     const health = this.d.health ?? probe;
-    return Promise.all(peers.filter((p) => !isPhone(p) && p.host !== "").map(async (p) => ({ name: p.name, host: p.host, toyon: await health(`https://${p.host}`, true) })));
+    const now = (this.d.now ?? Date.now)();
+    const devices = await Promise.all(listed.peers.map(async (p) => {
+      const kind = isPhone(p) ? "phone" : "machine";
+      const ask = listed.here;
+      const [reached, got] = await Promise.all([
+        ask && p.ip !== null ? ts(pingArgs(p.ip)).then((r) => r.ok) : false,
+        ask && kind === "machine" && p.host !== "" ? health(`https://${p.host}`, true) : null
+      ]);
+      if (got)
+        this.answered.set(p.host, { machine: got.machine, at: now });
+      const last = kind === "machine" ? this.answered.get(p.host) : undefined;
+      const toyon = got ? { machine: got.machine, answering: true } : last && now - last.at < ANSWERED_RECENTLY_MS ? { machine: last.machine, answering: false } : null;
+      return { name: p.name, host: p.host, kind, reached, toyon };
+    }));
+    const view = { here: listed.here, devices };
+    this.lastView = { view, at: now };
+    return view;
   }
   isToyon(origin) {
     return (this.d.health ?? probe)(origin, false).then((r) => r !== null);
@@ -21279,7 +21438,7 @@ class Tailnet {
 }
 
 // ../daemon/src/design/service.ts
-import { join as join14 } from "path";
+import { join as join15 } from "path";
 
 // ../daemon/src/design/scan.ts
 var COLOR = /^(#|rgba?\(|hsla?\(|oklch\(|oklab\(|lab\(|lch\(|color\(|color-mix\(|light-dark\()/i;
@@ -21729,7 +21888,7 @@ class DesignService {
 async function readAll(root, paths) {
   const out = [];
   for (const path of paths) {
-    const file = Bun.file(join14(root, path));
+    const file = Bun.file(join15(root, path));
     if (file.size === 0 || file.size > MAX_FILE_BYTES)
       continue;
     try {
@@ -21844,14 +22003,14 @@ function typicalUse(classes) {
 var normal = (s) => s.replace(/[-_]/g, "").toLowerCase();
 async function loadProjectTypescript(root) {
   try {
-    return await import(join14(root, "node_modules", "typescript", "lib", "typescript.js"));
+    return await import(join15(root, "node_modules", "typescript", "lib", "typescript.js"));
   } catch {
     return null;
   }
 }
 
 // ../daemon/src/drafts/store.ts
-import { existsSync as existsSync18, readFileSync as readFileSync12, renameSync as renameSync3, writeFileSync as writeFileSync8 } from "fs";
+import { existsSync as existsSync18, readFileSync as readFileSync13, renameSync as renameSync4, writeFileSync as writeFileSync9 } from "fs";
 var SAVE_DELAY_MS = 1000;
 
 class DraftStore {
@@ -21991,7 +22150,7 @@ function readRecord(file) {
   if (!existsSync18(file))
     return [];
   try {
-    const raw = JSON.parse(readFileSync12(file, "utf8"));
+    const raw = JSON.parse(readFileSync13(file, "utf8"));
     return raw && typeof raw === "object" ? Object.entries(raw) : [];
   } catch (e) {
     log.warn("drafts", `skipped an unreadable ${file}`, e);
@@ -22001,8 +22160,8 @@ function readRecord(file) {
 function writeAtomic(file, value) {
   const tmp = `${file}.tmp`;
   try {
-    writeFileSync8(tmp, JSON.stringify(value));
-    renameSync3(tmp, file);
+    writeFileSync9(tmp, JSON.stringify(value));
+    renameSync4(tmp, file);
   } catch (e) {
     log.error("drafts", `could not write ${file}`, e);
   }
@@ -22251,10 +22410,10 @@ import { basename as basename5, resolve as resolve7 } from "path";
 import { existsSync as existsSync19, statSync as statSync6 } from "fs";
 import { readdir } from "fs/promises";
 import { homedir as homedir8 } from "os";
-import { dirname as dirname6, join as join15 } from "path";
+import { dirname as dirname6, join as join16 } from "path";
 var MAX_ENTRIES = 40;
 function expandTilde(raw) {
-  return raw === "~" || raw.startsWith("~/") ? join15(homedir8(), raw.slice(1)) : raw;
+  return raw === "~" || raw.startsWith("~/") ? join16(homedir8(), raw.slice(1)) : raw;
 }
 function collapseTilde(abs) {
   const home = homedir8();
@@ -22265,7 +22424,7 @@ function holdsNothing(names) {
 }
 async function describeFolder(abs) {
   const path = collapseTilde(abs);
-  if (existsSync19(join15(abs, ".git")))
+  if (existsSync19(join16(abs, ".git")))
     return { path, kind: "project" };
   try {
     return { path, kind: holdsNothing(await readdir(abs)) ? "empty" : "folder" };
@@ -22282,7 +22441,7 @@ function describe2(typed, parent) {
   return {
     exists: existsSync19(typed),
     isDir,
-    isRepo: isDir && existsSync19(join15(typed, ".git")),
+    isRepo: isDir && existsSync19(join16(typed, ".git")),
     parentExists: existsSync19(parent)
   };
 }
@@ -22307,8 +22466,8 @@ async function browsePath(raw) {
       continue;
     if (!name.toLowerCase().startsWith(prefix))
       continue;
-    const abs = join15(dir, name);
-    entries.push({ path: collapseTilde(abs), name, isRepo: existsSync19(join15(abs, ".git")) });
+    const abs = join16(dir, name);
+    entries.push({ path: collapseTilde(abs), name, isRepo: existsSync19(join16(abs, ".git")) });
   }
   entries.sort((a, b) => a.isRepo !== b.isRepo ? a.isRepo ? -1 : 1 : a.name.localeCompare(b.name));
   return { entries: entries.slice(0, MAX_ENTRIES), target };
@@ -22422,7 +22581,7 @@ function withFetchLock(repoPath, fn) {
 var fileLockKey = (absPath) => `file:${absPath}`;
 
 // ../daemon/src/git/status.ts
-import { join as join16 } from "path";
+import { join as join17 } from "path";
 async function treeFingerprint(worktreePath) {
   const [head, diff, untracked] = await Promise.all([
     git(worktreePath, "rev-parse", "HEAD"),
@@ -22432,7 +22591,7 @@ async function treeFingerprint(worktreePath) {
   const others = await Promise.all(untracked.out.split(`
 `).filter(Boolean).map(async (p) => {
     try {
-      const f = Bun.file(join16(worktreePath, p));
+      const f = Bun.file(join17(worktreePath, p));
       const body = f.size > 2000000 ? String(f.size) : Bun.hash(await f.arrayBuffer()).toString(36);
       return `${p}:${body}`;
     } catch {
@@ -22517,7 +22676,7 @@ async function numstat(worktreePath, ...range) {
 }
 async function untrackedLines(worktreePath, file) {
   try {
-    const f = Bun.file(join16(worktreePath, file));
+    const f = Bun.file(join17(worktreePath, file));
     if (f.size > 2000000)
       return {};
     const buf = new Uint8Array(await f.arrayBuffer());
@@ -22596,9 +22755,14 @@ async function behindUpstream(worktreePath) {
   const r = await git(worktreePath, "rev-list", "--count", "HEAD..@{upstream}");
   return r.ok ? Number(r.out) || 0 : null;
 }
-async function aheadUpstream(worktreePath) {
+async function aheadUpstream(worktreePath, branch) {
   const r = await git(worktreePath, "rev-list", "--count", "@{upstream}..HEAD");
-  return r.ok ? Number(r.out) || 0 : null;
+  if (r.ok)
+    return Number(r.out) || 0;
+  if (!branch)
+    return null;
+  const o = await git(worktreePath, "rev-list", "--count", `origin/${branch}..HEAD`);
+  return o.ok ? Number(o.out) || 0 : null;
 }
 async function aheadBehind(worktreePath, defaultBr) {
   const [a, b] = await Promise.all([
@@ -23283,7 +23447,7 @@ function prNumberOf(url) {
 
 // ../daemon/src/preview/errors.ts
 var KEPT = 5;
-var NOTED_MAX = 3;
+var ROWS_MAX = 3;
 var TWICE_MS = 1000;
 
 class PageErrorService {
@@ -23301,18 +23465,28 @@ class PageErrorService {
   of(worktreeId) {
     let h = this.held.get(worktreeId);
     if (!h) {
-      h = { recent: [], writes: false, noted: new Set };
+      h = { recent: [], running: false, noted: new Set, rows: 0 };
       this.held.set(worktreeId, h);
     }
     return h;
   }
   heard(worktreeId, event) {
     const h = this.of(worktreeId);
-    if (event.type === "turn-start" || event.type === "user-message" || event.type === "fix-asked") {
-      h.writes = false;
-    } else if ((event.type === "tool-start" || event.type === "tool-update" && event.kind) && isEditTool({ name: event.name ?? "", kind: event.kind }) && !h.writes) {
-      h.writes = true;
-      h.noted = new Set;
+    switch (event.type) {
+      case "user-message":
+      case "fix-asked":
+        h.noted = new Set;
+        h.rows = 0;
+        break;
+      case "turn-start":
+        h.running = true;
+        break;
+      case "turn-end":
+      case "agent-error":
+      case "agent-auth-required":
+        h.running = false;
+        this.flush(worktreeId, h, event.ts);
+        break;
     }
   }
   report(worktreeId, message) {
@@ -23328,13 +23502,20 @@ class PageErrorService {
     h.recent.push({ message, ts: now });
     if (h.recent.length > KEPT)
       h.recent.splice(0, h.recent.length - KEPT);
-    if (!h.writes || h.noted.has(message) || h.noted.size >= NOTED_MAX)
+    if (!h.running)
+      this.flush(worktreeId, h, now);
+  }
+  flush(worktreeId, h, ts) {
+    const fresh = [...new Set(h.recent.map((e) => e.message))].filter((m) => !h.noted.has(m));
+    if (fresh.length === 0 || h.rows >= ROWS_MAX)
       return;
     const agent = this.d.runtime.agentFor(worktreeId);
     if (!agent)
       return;
-    h.noted.add(message);
-    agent.note({ type: "page-error", message, ts: now });
+    for (const m of fresh)
+      h.noted.add(m);
+    h.rows++;
+    agent.note({ type: "page-error", errors: fresh, ts });
   }
   loaded(worktreeId) {
     const h = this.held.get(worktreeId);
@@ -23598,9 +23779,9 @@ class AfterLand {
 }
 
 // ../daemon/src/repos/registry.ts
-import { existsSync as existsSync23, mkdirSync as mkdirSync7, rmSync as rmSync4, writeFileSync as writeFileSync9 } from "fs";
+import { existsSync as existsSync23, mkdirSync as mkdirSync7, rmSync as rmSync4, writeFileSync as writeFileSync10 } from "fs";
 import { homedir as homedir10 } from "os";
-import { basename as basename7, dirname as dirname8, join as join20 } from "path";
+import { basename as basename7, dirname as dirname8, join as join21 } from "path";
 
 // ../daemon/src/git/base.ts
 async function resolveBase(repoPath, defaultBranch, route) {
@@ -23611,8 +23792,8 @@ async function resolveBase(repoPath, defaultBranch, route) {
 }
 
 // ../daemon/src/repos/config.ts
-import { closeSync, existsSync as existsSync20, openSync as openSync2, readdirSync as readdirSync6, readFileSync as readFileSync13, readSync, statSync as statSync7 } from "fs";
-import { join as join17 } from "path";
+import { closeSync, existsSync as existsSync20, openSync as openSync2, readdirSync as readdirSync7, readFileSync as readFileSync14, readSync, statSync as statSync7 } from "fs";
+import { join as join18 } from "path";
 
 // ../../node_modules/.bun/jsonc-parser@3.3.1/node_modules/jsonc-parser/lib/esm/impl/scanner.js
 function createScanner(text, ignoreTrivia = false) {
@@ -24976,7 +25157,7 @@ function applyEdits(text, edits) {
 
 // ../daemon/src/repos/config.ts
 var PLACES = [CONFIG_FILES.folder, CONFIG_FILES.root];
-var present = (repoPath, place) => [place.shared, place.local].filter((rel) => existsSync20(join17(repoPath, rel)));
+var present = (repoPath, place) => [place.shared, place.local].filter((rel) => existsSync20(join18(repoPath, rel)));
 var isObject2 = (v) => typeof v === "object" && v !== null && !Array.isArray(v);
 function parseSettings(text) {
   const errors = [];
@@ -25001,7 +25182,7 @@ function readConfigFile(repoPath) {
   for (const rel of files) {
     let raw;
     try {
-      raw = parseSettings(readFileSync13(join17(repoPath, rel), "utf8"));
+      raw = parseSettings(readFileSync14(join18(repoPath, rel), "utf8"));
     } catch (e) {
       return { ok: false, reason: `${rel} is not valid JSON: ${e instanceof Error ? e.message : String(e)}` };
     }
@@ -25060,12 +25241,12 @@ function configTarget(repoPath, made) {
 }
 function configBody(repoPath, rel, config) {
   const place = PLACES.find((p) => p.local === rel);
-  const abs = place && join17(repoPath, place.shared);
+  const abs = place && join18(repoPath, place.shared);
   if (!abs || !existsSync20(abs))
     return config;
   let shared;
   try {
-    shared = parseSettings(readFileSync13(abs, "utf8"));
+    shared = parseSettings(readFileSync14(abs, "utf8"));
   } catch {
     return config;
   }
@@ -25078,7 +25259,7 @@ function configText(repoPath, rel, config) {
   let text;
   let was;
   try {
-    text = readFileSync13(join17(repoPath, rel), "utf8");
+    text = readFileSync14(join18(repoPath, rel), "utf8");
     was = parseSettings(text);
   } catch {
     return fresh;
@@ -25108,9 +25289,9 @@ function detectConfig(repoPath) {
     return { config: explicit.config, needsSetup: false };
   if (explicit)
     log.warn("config", `${repoPath}: ${explicit.reason}; detecting instead`);
-  const pkgPath = join17(repoPath, "package.json");
+  const pkgPath = join18(repoPath, "package.json");
   if (existsSync20(pkgPath)) {
-    const pkg = JSON.parse(readFileSync13(pkgPath, "utf8"));
+    const pkg = JSON.parse(readFileSync14(pkgPath, "utf8"));
     const scripts = pkg.scripts ?? {};
     const runner = detectRunner(repoPath, pkg.packageManager);
     const pages = detectPages(repoPath, scripts, runner);
@@ -25131,7 +25312,7 @@ function detectConfig(repoPath) {
       };
     }
   }
-  if (existsSync20(join17(repoPath, "start.sh"))) {
+  if (existsSync20(join18(repoPath, "start.sh"))) {
     return { config: { run: { app: "./start.sh" } }, needsSetup: true, from: "start.sh" };
   }
   const assumed = assumeNothingToRun(repoPath);
@@ -25174,24 +25355,24 @@ function assumeNothingToRun(repoPath) {
   return marker && !servesPage(repoPath) ? marker : undefined;
 }
 function markerIn(repoPath) {
-  const named = NO_PAGE_MARKERS.find((f) => existsSync20(join17(repoPath, f)));
+  const named = NO_PAGE_MARKERS.find((f) => existsSync20(join18(repoPath, f)));
   if (named)
     return named;
   let entries;
   try {
-    entries = readdirSync6(repoPath);
+    entries = readdirSync7(repoPath);
   } catch {
     return;
   }
   return entries.find((f) => NO_PAGE_EXTENSIONS.some((ext) => f.endsWith(ext)));
 }
 function servesPage(repoPath) {
-  if (WEB_FILES.some((f) => existsSync20(join17(repoPath, f))))
+  if (WEB_FILES.some((f) => existsSync20(join18(repoPath, f))))
     return true;
-  if (/^web:/m.test(head(join17(repoPath, "Procfile"))))
+  if (/^web:/m.test(head(join18(repoPath, "Procfile"))))
     return true;
   for (const [files, names] of WEB_DEPENDENCIES) {
-    const text = files.map((f) => head(join17(repoPath, f))).join(`
+    const text = files.map((f) => head(join18(repoPath, f))).join(`
 `);
     if (text.trim() && names.some((n) => mentions(text, n)))
       return true;
@@ -25201,14 +25382,14 @@ function servesPage(repoPath) {
 function frontEndBeside(repoPath) {
   let dirs;
   try {
-    dirs = readdirSync6(repoPath, { withFileTypes: true });
+    dirs = readdirSync7(repoPath, { withFileTypes: true });
   } catch {
     return false;
   }
   return dirs.some((d) => {
     if (!d.isDirectory() || d.name.startsWith(".") || NOT_A_PACKAGE.has(d.name))
       return false;
-    const pkg = head(join17(repoPath, d.name, "package.json"));
+    const pkg = head(join18(repoPath, d.name, "package.json"));
     if (!pkg)
       return false;
     try {
@@ -25264,11 +25445,11 @@ function isLocalDatabase(url) {
 }
 function detectServices(repoPath) {
   const out = {};
-  const compose = COMPOSE_FILES.find((f) => existsSync20(join17(repoPath, f)));
+  const compose = COMPOSE_FILES.find((f) => existsSync20(join18(repoPath, f)));
   if (compose)
     out.compose = compose;
   for (const file of ENV_FILES) {
-    const text = head(join17(repoPath, file));
+    const text = head(join18(repoPath, file));
     if (!text)
       continue;
     for (const name of DB_URL_NAMES) {
@@ -25292,7 +25473,7 @@ function inferPaths(cmd, repoPath, depth = 1) {
       return;
     let dir = false;
     try {
-      dir = statSync7(join17(repoPath, clean)).isDirectory();
+      dir = statSync7(join18(repoPath, clean)).isDirectory();
     } catch {
       return;
     }
@@ -25303,25 +25484,25 @@ function inferPaths(cmd, repoPath, depth = 1) {
     const t = tokens[i];
     if (t === "cd") {
       const dir = tokens[i + 1];
-      if (dir && !dir.startsWith("-") && existsSync20(join17(repoPath, dir)))
+      if (dir && !dir.startsWith("-") && existsSync20(join18(repoPath, dir)))
         add(dir);
       continue;
     }
     if (t.startsWith("-") || t.startsWith("$"))
       continue;
     const mod = /^([A-Za-z_]\w*)(?:\.\w+)*:\w+$/.exec(t);
-    if (mod?.[1] && existsSync20(join17(repoPath, mod[1]))) {
+    if (mod?.[1] && existsSync20(join18(repoPath, mod[1]))) {
       add(mod[1]);
       continue;
     }
     const rel = t.replace(/^\.\//, "");
     if (rel.startsWith("/") || rel.startsWith("..") || rel.includes("="))
       continue;
-    if (!existsSync20(join17(repoPath, rel)))
+    if (!existsSync20(join18(repoPath, rel)))
       continue;
     add(rel);
     if (depth > 0 && rel.endsWith(".sh")) {
-      for (const p of inferPaths(head(join17(repoPath, rel)), repoPath, depth - 1))
+      for (const p of inferPaths(head(join18(repoPath, rel)), repoPath, depth - 1))
         out.add(p);
     }
   }
@@ -25344,31 +25525,31 @@ function procCommand(runner, script, body) {
   return `${base}${runner === "npm" ? " --" : ""} ${flag}`;
 }
 function detectPages(repoPath, scripts, runner) {
-  if (!scripts.build || !existsSync20(join17(repoPath, "functions")))
+  if (!scripts.build || !existsSync20(join18(repoPath, "functions")))
     return null;
-  const cfg = ["wrangler.jsonc", "wrangler.json", "wrangler.toml"].map((f) => join17(repoPath, f)).find((f) => existsSync20(f));
+  const cfg = ["wrangler.jsonc", "wrangler.json", "wrangler.toml"].map((f) => join18(repoPath, f)).find((f) => existsSync20(f));
   if (!cfg)
     return null;
-  const out = readFileSync13(cfg, "utf8").match(/pages_build_output_dir"?\s*[:=]\s*"([^"]+)"/)?.[1];
+  const out = readFileSync14(cfg, "utf8").match(/pages_build_output_dir"?\s*[:=]\s*"([^"]+)"/)?.[1];
   if (!out)
     return null;
   return { web: `${runner} run build && npx wrangler pages dev ${out} --ip 127.0.0.1 --port $PORT` };
 }
 function detectRunner(repoPath, packageManager) {
-  if (existsSync20(join17(repoPath, "bun.lock")) || existsSync20(join17(repoPath, "bun.lockb")))
+  if (existsSync20(join18(repoPath, "bun.lock")) || existsSync20(join18(repoPath, "bun.lockb")))
     return "bun";
-  if (existsSync20(join17(repoPath, "pnpm-lock.yaml")))
+  if (existsSync20(join18(repoPath, "pnpm-lock.yaml")))
     return "pnpm";
-  if (existsSync20(join17(repoPath, "yarn.lock")) || typeof packageManager === "string" && packageManager.startsWith("yarn"))
+  if (existsSync20(join18(repoPath, "yarn.lock")) || typeof packageManager === "string" && packageManager.startsWith("yarn"))
     return "yarn";
   return "npm";
 }
 
 // ../daemon/src/repos/create.ts
-import { existsSync as existsSync21, readdirSync as readdirSync7, realpathSync as realpathSync2, statSync as statSync8 } from "fs";
+import { existsSync as existsSync21, realpathSync as realpathSync2, statSync as statSync8 } from "fs";
 import { appendFile as appendFile2, mkdir as mkdir3, rm as rm2 } from "fs/promises";
 import { homedir as homedir9 } from "os";
-import { dirname as dirname7, join as join18, resolve as resolve8 } from "path";
+import { dirname as dirname7, join as join19, resolve as resolve8 } from "path";
 function isInside(dir, parent) {
   const p = parent.replace(/\/+$/, "");
   return dir === p || dir.startsWith(`${p}/`);
@@ -25379,31 +25560,28 @@ function planProject(opts, home = homedir9()) {
     throw new UserError(nameError);
   const first = firstProjectsFolder(opts.parent, home);
   const parent = first ?? resolveParent(opts.parent);
-  const dir = join18(parent, opts.name.trim());
+  const dir = join19(parent, opts.name.trim());
   if (existsSync21(dir))
     throw new UserError(`${dir} already exists`);
   return { parent, dir, makeParent: first !== null };
 }
 function firstProjectsFolder(raw, home) {
   const typed = expandTilde(raw.trim()).replace(/\/+$/, "");
-  if (typed !== join18(home, PROJECTS_FOLDER) || existsSync21(typed) || !existsSync21(home))
+  if (typed !== join19(home, PROJECTS_FOLDER) || existsSync21(typed) || !existsSync21(home))
     return null;
-  return join18(realpathSync2(home), PROJECTS_FOLDER);
+  return join19(realpathSync2(home), PROJECTS_FOLDER);
 }
 function planInPlace(opts) {
   const name = opts.name.trim();
   if (!name || name === "." || name === ".." || name.includes("/")) {
     throw new UserError(`${opts.name} is not a folder name`);
   }
-  const typed = join18(resolveParent(opts.parent), name);
+  const typed = join19(resolveParent(opts.parent), name);
   if (!existsSync21(typed) || !statSync8(typed).isDirectory())
     throw new UserError(`${typed} is not a folder`);
   const dir = realpathSync2(typed);
-  if (existsSync21(join18(dir, ".git")))
+  if (existsSync21(join19(dir, ".git")))
     throw new UserError(`${dir} is already a project; open it instead`);
-  if (!holdsNothing(readdirSync7(dir))) {
-    throw new UserError(`${dir} is not empty; only an empty folder can become a project where it is`);
-  }
   return { parent: dirname7(dir), dir, makeParent: false };
 }
 function resolveParent(raw) {
@@ -25423,7 +25601,7 @@ async function createRepoDir(opts, home = homedir9()) {
     await mkdir3(parent);
   await mkdir3(dir);
   try {
-    await initWithEmptyCommit(dir);
+    await initWithFirstCommit(dir);
   } catch (e) {
     await undoCreate(dir);
     throw e;
@@ -25434,7 +25612,7 @@ async function initRepoInPlace(opts) {
   const { dir } = planInPlace(opts);
   await requireGitIdentity(dir);
   try {
-    await initWithEmptyCommit(dir);
+    await initWithFirstCommit(dir);
   } catch (e) {
     await undoInit(dir);
     throw e;
@@ -25445,7 +25623,7 @@ var LOCAL_EXCLUDES = [
   ".DS_Store",
   "node_modules/"
 ];
-async function initWithEmptyCommit(dir) {
+async function initWithFirstCommit(dir) {
   await ok(git(dir, "init", "-q"), "git init");
   const exclude = await git(dir, "rev-parse", "--git-path", "info/exclude");
   if (!exclude.ok)
@@ -25456,7 +25634,8 @@ async function initWithEmptyCommit(dir) {
 ${LOCAL_EXCLUDES.join(`
 `)}
 `);
-  await ok(git(dir, "-c", "commit.gpgsign=false", "commit", "--allow-empty", "-qm", "initial commit"), "git commit");
+  await ok(git(dir, "add", "-A"), "git add");
+  await ok(git(dir, "-c", "commit.gpgsign=false", "commit", "--no-verify", "--allow-empty", "-qm", "initial commit"), "git commit");
 }
 async function cloneInto(plan, name, url, opts = {}) {
   if (!url)
@@ -25490,13 +25669,13 @@ async function undoCreate(dir) {
 }
 async function undoInit(dir) {
   try {
-    await rm2(join18(dir, ".git"), { recursive: true, force: true });
+    await rm2(join19(dir, ".git"), { recursive: true, force: true });
   } catch (e) {
     log.warn(dir, "could not take back a half-made .git", e);
   }
 }
 async function unmakeProject(dir, made) {
-  const target = made === "folder" ? dir : join18(dir, ".git");
+  const target = made === "folder" ? dir : join19(dir, ".git");
   try {
     await rm2(target, { recursive: true, force: true });
   } catch (e) {
@@ -25527,7 +25706,7 @@ async function ok(p, what) {
 
 // ../daemon/src/repos/watcher.ts
 import { existsSync as existsSync22, watch } from "fs";
-import { basename as basename6, join as join19 } from "path";
+import { basename as basename6, join as join20 } from "path";
 function watchDefaultBranch(repoPath, branch, onMove) {
   const last = { local: null, upstream: null };
   const read = async () => {
@@ -25580,13 +25759,13 @@ function watchDefaultBranch(repoPath, branch, onMove) {
     ]);
     if (stopped)
       return;
-    const gitDir = common.ok && common.out ? common.out : join19(repoPath, ".git");
+    const gitDir = common.ok && common.out ? common.out : join20(repoPath, ".git");
     tryWatch(gitDir);
-    tryWatch(join19(gitDir, "refs", "heads"));
+    tryWatch(join20(gitDir, "refs", "heads"));
     if (!remote.ok || !remote.out)
       return;
-    const remotes = join19(gitDir, "refs", "remotes");
-    const mine = join19(remotes, remote.out);
+    const remotes = join20(gitDir, "refs", "remotes");
+    const mine = join20(remotes, remote.out);
     let inner = null;
     let mid = null;
     const armInner = () => {
@@ -25602,7 +25781,7 @@ function watchDefaultBranch(repoPath, branch, onMove) {
       }) : null;
       armInner();
     };
-    tryWatch(join19(gitDir, "refs"), (_event, filename) => {
+    tryWatch(join20(gitDir, "refs"), (_event, filename) => {
       if (!filename || filename === "remotes")
         armMid();
       schedule();
@@ -25631,7 +25810,7 @@ function watchWorktreeDir(repoPath, onChange) {
     }, 300);
   };
   const arm = (commonDir) => {
-    const dir = join19(commonDir, "worktrees");
+    const dir = join20(commonDir, "worktrees");
     const armInner = () => {
       inner?.close();
       inner = null;
@@ -25674,7 +25853,7 @@ function watchWorktreeDir(repoPath, onChange) {
 function watchConfigFile(repoPath, onChange) {
   const atRoot = new Set([CONFIG_FILES.root.shared, CONFIG_FILES.root.local, CONFIG_DIR]);
   const inDir = new Set([CONFIG_FILES.folder.shared, CONFIG_FILES.folder.local].map((rel) => basename6(rel)));
-  const dir = join19(repoPath, CONFIG_DIR);
+  const dir = join20(repoPath, CONFIG_DIR);
   let timer = null;
   let outer = null;
   let inner = null;
@@ -25811,7 +25990,7 @@ class RepoRegistry {
       return `${repo.name} is set up now`;
     if (main.promptedAt || main.lastTurn)
       return `${repo.name} has a chat now`;
-    if (existsSync23(join20(repo.path, ".claude")))
+    if (existsSync23(join21(repo.path, ".claude")))
       return `an agent has already run in ${repo.name}`;
     if ((await statusFiles(repo.path)).length > 0 || !await treeEmpty(repo.path)) {
       return `${repo.name} has files in it now`;
@@ -25821,9 +26000,13 @@ class RepoRegistry {
     return null;
   }
   refuseIfManaged(dir) {
-    const managed = [...this.d.state.repos, ...this.d.state.worktrees].some((r) => isInside(dir, r.path));
-    if (managed)
+    const records = [...this.d.state.repos, ...this.d.state.worktrees];
+    if (records.some((r) => isInside(dir, r.path))) {
       throw new UserError(`${dir} is inside a project Toyon already manages`);
+    }
+    if (records.some((r) => isInside(r.path, dir))) {
+      throw new UserError(`${dir} holds projects Toyon already manages`);
+    }
   }
   get pending() {
     return [...this.imports.values()].map((i) => i.pending).sort((a, b) => a.startedAt - b.startedAt);
@@ -25962,10 +26145,10 @@ class RepoRegistry {
       throw new UserError(current.reason);
     const was = configTarget(repo.path, !!repo.made);
     const rel = configSibling(was, kind);
-    const moved = rel !== was && existsSync23(join20(repo.path, was));
+    const moved = rel !== was && existsSync23(join21(repo.path, was));
     if (moved && !(kind === "local" && await isTracked(repo.path, was))) {
       try {
-        rmSync4(join20(repo.path, was));
+        rmSync4(join21(repo.path, was));
       } catch (e) {
         log.warn(repoId, `could not remove ${was}`, e);
       }
@@ -25974,10 +26157,10 @@ class RepoRegistry {
     }
     if (isLocalConfigFile(rel))
       await excludeFromGit(repo.path, rel);
-    const file = join20(repo.path, rel);
+    const file = join21(repo.path, rel);
     try {
       mkdirSync7(dirname8(file), { recursive: true });
-      writeFileSync9(file, configText(repo.path, rel, config));
+      writeFileSync10(file, configText(repo.path, rel, config));
     } catch (e) {
       log.warn(repoId, `could not write ${rel}`, e);
     }
@@ -26078,7 +26261,7 @@ class RepoRegistry {
   }
   placeConfig(repo) {
     const rel = configTarget(repo.path, !!repo.made);
-    if (isLocalConfigFile(rel) && existsSync23(join20(repo.path, rel))) {
+    if (isLocalConfigFile(rel) && existsSync23(join21(repo.path, rel))) {
       fireAndForget(repo.id, excludeFromGit(repo.path, rel), "exclude local settings");
     }
     if (repo.configFile === rel)
@@ -26170,7 +26353,7 @@ class RepoRegistry {
 }
 
 // ../daemon/src/routes/service.ts
-import { join as join21 } from "path";
+import { join as join22 } from "path";
 
 // ../daemon/src/routes/fileRouters.ts
 var SKIP = /(^|\/)(node_modules|dist|build|out|coverage|\.next|\.nuxt|\.output|\.svelte-kit|\.vercel|\.netlify)\//;
@@ -27370,7 +27553,7 @@ class RouteService {
     return mergeRoutes(fileRoutes(paths, roots), code);
   }
   async cachedRead(root, path, had, kept, decode) {
-    const abs = join21(root, path);
+    const abs = join22(root, path);
     const stat = await this.fs.stat(abs);
     if (!stat)
       return null;
@@ -27395,7 +27578,7 @@ class RouteService {
     }
   }
   async hash(root, file) {
-    const abs = join21(root, file);
+    const abs = join22(root, file);
     const stat = await this.fs.stat(abs);
     if (!stat)
       return null;
@@ -27657,7 +27840,7 @@ function isAlive(pid) {
 }
 
 // ../daemon/src/runtime/bridge-script.ts
-import { existsSync as existsSync24, readFileSync as readFileSync14, statSync as statSync9 } from "fs";
+import { existsSync as existsSync24, readFileSync as readFileSync15, statSync as statSync9 } from "fs";
 var LEARNED_MAX = 8;
 
 class BridgeScript {
@@ -27696,7 +27879,7 @@ class BridgeScript {
     this.stamp = stamp;
     const origins = [...this.origins, ...this.learned];
     this.cache = `window.__toyonShellOrigins=${JSON.stringify(origins)};
-${readFileSync14(this.path, "utf8")}`;
+${readFileSync15(this.path, "utf8")}`;
     return this.cache;
   }
 }
@@ -27720,9 +27903,9 @@ import { homedir as homedir12, hostname as hostname2 } from "os";
 import { randomBytes as randomBytes7 } from "crypto";
 
 // ../daemon/src/agent/config.ts
-import { existsSync as existsSync25, readFileSync as readFileSync15 } from "fs";
+import { existsSync as existsSync25, readFileSync as readFileSync16 } from "fs";
 import { homedir as homedir11 } from "os";
-import { join as join22 } from "path";
+import { join as join23 } from "path";
 function agentConfigFiles(spec, repoPath, home = homedir11()) {
   const file = (id, label, path) => ({
     id,
@@ -27732,30 +27915,30 @@ function agentConfigFiles(spec, repoPath, home = homedir11()) {
   });
   if (spec.id === "claude") {
     return [
-      file("user-config", "user config (MCP servers, projects)", join22(home, ".claude.json")),
-      file("user-settings", "user settings (permissions, hooks)", join22(home, ".claude", "settings.json")),
-      ...repoPath ? [file("project-mcp", "project MCP servers", join22(repoPath, ".mcp.json"))] : [],
-      ...repoPath ? [file("project-settings", "project settings", join22(repoPath, ".claude", "settings.json"))] : []
+      file("user-config", "user config (MCP servers, projects)", join23(home, ".claude.json")),
+      file("user-settings", "user settings (permissions, hooks)", join23(home, ".claude", "settings.json")),
+      ...repoPath ? [file("project-mcp", "project MCP servers", join23(repoPath, ".mcp.json"))] : [],
+      ...repoPath ? [file("project-settings", "project settings", join23(repoPath, ".claude", "settings.json"))] : []
     ];
   }
   if (spec.id === "codex")
-    return [file("user-config", "config", join22(home, ".codex", "config.toml"))];
+    return [file("user-config", "config", join23(home, ".codex", "config.toml"))];
   return [];
 }
 function describeAgentConfig(spec, repoPath, home = homedir11()) {
   const files = agentConfigFiles(spec, repoPath, home);
   const servers = [];
   if (spec.id === "claude") {
-    const user = readJson(join22(home, ".claude.json"));
+    const user = readJson(join23(home, ".claude.json"));
     servers.push(...serversOf(user?.mcpServers, "user"));
     if (repoPath) {
       const projects = user?.projects;
       const mine = projects?.[repoPath];
       servers.push(...serversOf(mine?.mcpServers, "local"));
-      servers.push(...serversOf(readJson(join22(repoPath, ".mcp.json"))?.mcpServers, "project"));
+      servers.push(...serversOf(readJson(join23(repoPath, ".mcp.json"))?.mcpServers, "project"));
     }
   } else if (spec.id === "codex") {
-    servers.push(...codexServers(join22(home, ".codex", "config.toml")));
+    servers.push(...codexServers(join23(home, ".codex", "config.toml")));
   }
   return { agent: spec.id, files, servers };
 }
@@ -27763,7 +27946,7 @@ function readJson(path) {
   if (!existsSync25(path))
     return null;
   try {
-    const v = JSON.parse(readFileSync15(path, "utf8"));
+    const v = JSON.parse(readFileSync16(path, "utf8"));
     return v && typeof v === "object" && !Array.isArray(v) ? v : null;
   } catch (e) {
     log.warn("agent-config", `${path} is not valid JSON`, e);
@@ -27785,7 +27968,7 @@ function codexServers(path) {
     return [];
   const out = [];
   let current = null;
-  for (const raw of readFileSync15(path, "utf8").split(`
+  for (const raw of readFileSync16(path, "utf8").split(`
 `)) {
     const line = raw.trim();
     const header = /^\[mcp_servers\.("?)([^\]"]+)\1\]$/.exec(line);
@@ -28579,6 +28762,9 @@ var handlers = {
     const { result } = await s.worktrees.sync(msg.worktreeId);
     await notify(s, ctx, msg.worktreeId, shipped(msg.worktreeId, result.ok, result.message, result.asked ? { asked: true } : {}));
   },
+  "unqueue-sync"(msg, _ctx, s) {
+    s.worktrees.unqueueSync(msg.worktreeId);
+  },
   async "pull-main"(msg, ctx, s) {
     const result = await s.worktrees.pull(msg.worktreeId);
     await notify(s, ctx, msg.worktreeId, shipped(msg.worktreeId, result.ok, result.message));
@@ -28800,10 +28986,12 @@ var handlers = {
       const followUp = msg.attachments?.length ? { attachments: msg.attachments } : undefined;
       s.runtime.agentFor(msg.worktreeId)?.answer(msg.askId, { kind: "answers", answers: msg.answers }, followUp);
     });
+    s.worktrees.markPrompted(msg.worktreeId);
   },
   "agent-decide"(msg, _ctx, s) {
     requireRun(s, msg.worktreeId);
     s.runtime.agentFor(msg.worktreeId)?.answer(msg.askId, { kind: "choice", choiceId: msg.choiceId });
+    s.worktrees.markPrompted(msg.worktreeId);
   },
   async "handoff-answer"(msg, _ctx, s) {
     requireRun(s, msg.worktreeId);
@@ -28897,8 +29085,8 @@ var handlers = {
     ctx.reply({ t: "refs", repoId: msg.repoId, query: msg.query, refs });
   },
   async "search-chats"(msg, ctx, s) {
-    const { hits, truncated } = await s.chats.search(msg.repoId, msg.query);
-    ctx.reply({ t: "chat-hits", repoId: msg.repoId, query: msg.query, hits, truncated });
+    const { hits, truncated, asks } = await s.chats.search(msg.repoId, msg.query);
+    ctx.reply({ t: "chat-hits", repoId: msg.repoId, query: msg.query, hits, truncated, asks });
   },
   async "open-ref"(msg, _ctx, s) {
     await s.worktrees.openRef(msg.repoId, msg.kind, msg.ref, { createdBy: msg.clientId, pr: msg.pr });
@@ -28954,7 +29142,7 @@ async function dispatch(msg, ctx, s) {
 // ../daemon/src/server/http.ts
 import { existsSync as existsSync26 } from "fs";
 import { hostname } from "os";
-import { join as join23 } from "path";
+import { join as join24 } from "path";
 
 // ../daemon/src/server/cors.ts
 var ALLOW_HEADERS = "authorization, content-type";
@@ -29006,7 +29194,7 @@ function pairingRoutes(d) {
       const body = state === "let-in" ? { state, token: d.token } : { state };
       return json(body, headers);
     }
-    if (!url.pathname.match(/^\/(knocks|knock\/[A-Za-z0-9_-]+\/answer|phones|tailnet|remote|machines)$/))
+    if (!url.pathname.match(/^\/(knocks|knock\/[A-Za-z0-9_-]+\/answer|tailnet|tailscale|remote|machines)$/))
       return;
     if (!d.authed(req))
       return unauthorized();
@@ -29027,14 +29215,18 @@ function pairingRoutes(d) {
       d.knocks.answer(answered, body.letIn);
       return new Response(null, { status: 204 });
     }
-    if (url.pathname === "/phones" && req.method === "GET") {
-      const body = remote && isTailnetName(remote.host) ? await d.tailnet.phones() : null;
-      return json(body);
-    }
     if (url.pathname === "/tailnet" && req.method === "GET") {
-      const body = await d.tailnet.machines();
+      const body = await d.tailnet.view();
       return json(body);
     }
+    if (url.pathname === "/tailscale" && req.method === "POST") {
+      const body = await req.json().catch(() => ({}));
+      if (body.up === true)
+        return json({ refused: await d.tailnet.up() });
+      if (body.login === true)
+        return json(await d.tailnet.login());
+      return new Response("say up or login", { status: 400 });
+    }
     if (url.pathname === "/remote" && req.method === "POST") {
       const body = await req.json().catch(() => ({}));
       try {
@@ -29285,7 +29477,7 @@ function createFetch(opts) {
       });
     }
     const rel = url.pathname === "/" ? "/index.html" : url.pathname;
-    const file = join23(opts.shellDist, rel.replaceAll("..", ""));
+    const file = join24(opts.shellDist, rel.replaceAll("..", ""));
     const hashed = rel.startsWith("/assets/");
     if (existsSync26(file) && Bun.file(file).size > 0) {
       if (rel === "/manifest.json") {
@@ -29306,7 +29498,7 @@ function createFetch(opts) {
     }
     if (hashed)
       return new Response("not found", { status: 404 });
-    const index = join23(opts.shellDist, "index.html");
+    const index = join24(opts.shellDist, "index.html");
     if (existsSync26(index))
       return new Response(Bun.file(index), { headers: { "cache-control": NO_STORE2 } });
     return new Response("Toyon daemon running; shell not built (run: bun run build)", { status: 200 });
@@ -29681,7 +29873,7 @@ function startServer(opts) {
       bootstrap: helloFrame,
       manifestColors: () => {
         const { surface0, surface1 } = s.themes.current().colors;
-        return { bar: surface1, ground: surface0 };
+        return { bar: surface0, ground: surface1 };
       },
       open: (path) => s.opens.open(path),
       restart: (now) => s.restarter.request({ now }),
@@ -29799,16 +29991,16 @@ function startServer(opts) {
 }
 
 // ../daemon/src/themes/store.ts
-import { existsSync as existsSync27, readdirSync as readdirSync8, readFileSync as readFileSync16, statSync as statSync10, writeFileSync as writeFileSync10 } from "fs";
+import { existsSync as existsSync27, readdirSync as readdirSync8, readFileSync as readFileSync17, statSync as statSync10, writeFileSync as writeFileSync11 } from "fs";
 import { homedir as homedir13 } from "os";
-import { basename as basename8, dirname as dirname9, join as join24, resolve as resolve9 } from "path";
+import { basename as basename8, dirname as dirname9, join as join25, resolve as resolve9 } from "path";
 var home = homedir13();
 var defaultExtensionDirs = [
-  join24(home, ".vscode", "extensions"),
-  join24(home, ".vscode-insiders", "extensions"),
-  join24(home, ".vscode-oss", "extensions"),
-  join24(home, ".cursor", "extensions"),
-  join24(home, ".windsurf", "extensions"),
+  join25(home, ".vscode", "extensions"),
+  join25(home, ".vscode-insiders", "extensions"),
+  join25(home, ".vscode-oss", "extensions"),
+  join25(home, ".cursor", "extensions"),
+  join25(home, ".windsurf", "extensions"),
   "/Applications/Visual Studio Code.app/Contents/Resources/app/extensions",
   "/Applications/Visual Studio Code - Insiders.app/Contents/Resources/app/extensions",
   "/Applications/Cursor.app/Contents/Resources/app/extensions",
@@ -29892,14 +30084,14 @@ class ThemeStore {
       name: json?.name ?? base,
       source: "file"
     });
-    writeFileSync10(join24(this.themesDir, `${base}.json`), `${JSON.stringify(theme, null, 2)}
+    writeFileSync11(join25(this.themesDir, `${base}.json`), `${JSON.stringify(theme, null, 2)}
 `);
     this.load();
     return theme;
   }
 }
 function readJsonc(file) {
-  return parse6(readFileSync16(file, "utf8"), [], { allowTrailingComma: true });
+  return parse6(readFileSync17(file, "utf8"), [], { allowTrailingComma: true });
 }
 function readVscodeTheme(file, depth = 0) {
   const json = readJsonc(file);
@@ -29927,7 +30119,7 @@ function loadDir(dir) {
   for (const f of readdirSync8(dir)) {
     if (!/\.jsonc?$/i.test(f))
       continue;
-    const file = join24(dir, f);
+    const file = join25(dir, f);
     const id = `file:${slug(f.replace(/\.(json|jsonc)$/i, ""))}`;
     try {
       const json = readJsonc(file);
@@ -29953,21 +30145,21 @@ function discover(dir) {
     return out;
   }
   for (const name of entries) {
-    const extDir = join24(dir, name);
-    const pkgFile = join24(extDir, "package.json");
+    const extDir = join25(dir, name);
+    const pkgFile = join25(extDir, "package.json");
     try {
       if (!statSync10(extDir).isDirectory() || !existsSync27(pkgFile))
         continue;
-      const pkg = JSON.parse(readFileSync16(pkgFile, "utf8"));
+      const pkg = JSON.parse(readFileSync17(pkgFile, "utf8"));
       const themes = pkg.contributes?.themes;
       if (!Array.isArray(themes))
         continue;
       const ext = `${pkg.publisher ?? "local"}.${pkg.name ?? name}`;
       let nls = {};
-      const nlsFile = join24(extDir, "package.nls.json");
+      const nlsFile = join25(extDir, "package.nls.json");
       if (existsSync27(nlsFile)) {
         try {
-          nls = JSON.parse(readFileSync16(nlsFile, "utf8"));
+          nls = JSON.parse(readFileSync17(nlsFile, "utf8"));
         } catch {}
       }
       for (const c of themes) {
@@ -30379,9 +30571,9 @@ class BackendShare {
 
 // ../daemon/src/worktrees/cache.ts
 import { createHash as createHash4 } from "crypto";
-import { existsSync as existsSync28, readFileSync as readFileSync17 } from "fs";
+import { existsSync as existsSync28, readFileSync as readFileSync18 } from "fs";
 import { mkdir as mkdir5, readdir as readdir2, rename, rm as rm4, stat as stat4, utimes, writeFile as writeFile3 } from "fs/promises";
-import { join as join25 } from "path";
+import { join as join26 } from "path";
 
 // ../daemon/src/core/clone.ts
 import { mkdir as mkdir4, rm as rm3 } from "fs/promises";
@@ -30412,7 +30604,7 @@ var STALE_MS = 30 * 24 * 3600000;
 var TMP = ".tmp-";
 var MANIFEST = "manifest.json";
 function defaultTools(dir) {
-  const has = (...files) => files.some((f) => existsSync28(join25(dir, f)));
+  const has = (...files) => files.some((f) => existsSync28(join26(dir, f)));
   const out = [];
   if (has("bun.lock", "bun.lockb"))
     out.push("bun --version");
@@ -30425,7 +30617,7 @@ function defaultTools(dir) {
   return out;
 }
 function withSidecars(root, rel) {
-  return [rel, ...SIDECARS.map((s) => rel + s)].filter((n) => existsSync28(join25(root, n)));
+  return [rel, ...SIDECARS.map((s) => rel + s)].filter((n) => existsSync28(join26(root, n)));
 }
 var entryName = (base, at) => `${base.slice(0, 12)}-${at.toString(36)}`;
 async function listEntries(familyDir) {
@@ -30440,8 +30632,8 @@ async function listEntries(familyDir) {
     const m = /^([0-9a-f]{12})-([0-9a-z]+)$/.exec(name);
     if (!m?.[1] || !m[2])
       continue;
-    const dir = join25(familyDir, name);
-    if (!existsSync28(join25(dir, MANIFEST)))
+    const dir = join26(familyDir, name);
+    if (!existsSync28(join26(dir, MANIFEST)))
       continue;
     out.push({ dir, base: m[1], at: Number.parseInt(m[2], 36) });
   }
@@ -30471,7 +30663,7 @@ class ArtifactCache {
     try {
       const family = await this.family(wt, repo, policy);
       const base = await this.baseCommit(wt, repo);
-      const entries = await listEntries(join25(this.d.paths.cacheDir, repo.id, family.key));
+      const entries = await listEntries(join26(this.d.paths.cacheDir, repo.id, family.key));
       const entry = entries.find((e) => e.base === base.slice(0, 12)) ?? entries[0];
       if (!entry) {
         say(`cache: nothing kept for these lockfiles and tools on ${family.platform}`);
@@ -30479,14 +30671,14 @@ class ArtifactCache {
       }
       const restored = [];
       for (const rel of policy.paths) {
-        if (existsSync28(join25(wt.path, rel)))
+        if (existsSync28(join26(wt.path, rel)))
           continue;
         const names = withSidecars(entry.dir, rel);
         if (names.length === 0)
           continue;
         let whole = true;
         for (const name of names) {
-          const r = await (this.d.clone ?? cloneTree)(join25(entry.dir, name), join25(wt.path, name));
+          const r = await (this.d.clone ?? cloneTree)(join26(entry.dir, name), join26(wt.path, name));
           if (r.ok)
             continue;
           say(`cache: could not restore ${name}: ${r.error}`);
@@ -30520,12 +30712,12 @@ class ArtifactCache {
     let tmp;
     let slot;
     try {
-      const present = policy.paths.filter((rel) => existsSync28(join25(wt.path, rel)));
+      const present = policy.paths.filter((rel) => existsSync28(join26(wt.path, rel)));
       if (present.length === 0)
         return;
       const family = await this.family(wt, repo, policy);
       const base = await this.baseCommit(wt, repo);
-      const familyDir = join25(this.d.paths.cacheDir, repo.id, family.key);
+      const familyDir = join26(this.d.paths.cacheDir, repo.id, family.key);
       const key = `${familyDir}/${base.slice(0, 12)}`;
       const kept = (await listEntries(familyDir)).find((e) => e.base === base.slice(0, 12));
       if (kept || this.making.has(key)) {
@@ -30536,21 +30728,21 @@ class ArtifactCache {
       this.making.add(key);
       const at = Date.now();
       const name = entryName(base, at);
-      tmp = join25(familyDir, `${TMP}${name}`);
+      tmp = join26(familyDir, `${TMP}${name}`);
       await mkdir5(tmp, { recursive: true });
       let how = "clonefile";
       for (const rel of present) {
         for (const n of withSidecars(wt.path, rel)) {
-          const r = await (this.d.clone ?? cloneTree)(join25(wt.path, n), join25(tmp, n));
+          const r = await (this.d.clone ?? cloneTree)(join26(wt.path, n), join26(tmp, n));
           if (!r.ok)
             throw new Error(`could not keep ${n}: ${r.error}`);
           how = r.how;
         }
       }
       const manifest = { at, base, platform: family.platform, tools: family.tools, paths: present };
-      await writeFile3(join25(tmp, MANIFEST), `${JSON.stringify(manifest, null, 2)}
+      await writeFile3(join26(tmp, MANIFEST), `${JSON.stringify(manifest, null, 2)}
 `);
-      await rename(tmp, join25(familyDir, name));
+      await rename(tmp, join26(familyDir, name));
       tmp = undefined;
       log.info(worktreeId, `cache: kept ${list(present)} for ${base.slice(0, 7)} via ${how} in ${Date.now() - started}ms`);
       await this.prune(familyDir);
@@ -30578,7 +30770,7 @@ class ArtifactCache {
       return;
     }
     for (const repoId of repoIds) {
-      const repoDir = join25(root, repoId);
+      const repoDir = join26(root, repoId);
       if (!this.d.state.repo(repoId)) {
         await rm4(repoDir, { recursive: true, force: true });
         continue;
@@ -30590,7 +30782,7 @@ class ArtifactCache {
         continue;
       }
       for (const family of families) {
-        const familyDir = join25(repoDir, family);
+        const familyDir = join26(repoDir, family);
         let names;
         try {
           names = await readdir2(familyDir);
@@ -30599,7 +30791,7 @@ class ArtifactCache {
         }
         for (const n of names)
           if (n.startsWith(TMP))
-            await rm4(join25(familyDir, n), { recursive: true, force: true });
+            await rm4(join26(familyDir, n), { recursive: true, force: true });
         const entries = await listEntries(familyDir);
         let newest = 0;
         for (const e of entries) {
@@ -30619,7 +30811,7 @@ class ArtifactCache {
     for (const f of policy.key) {
       h.update(`\x00${f}\x00`);
       try {
-        h.update(readFileSync17(join25(wt.path, f)));
+        h.update(readFileSync18(join26(wt.path, f)));
       } catch {
         h.update("(absent)");
       }
@@ -30647,6 +30839,7 @@ var CHAT_HITS_MAX = 200;
 var MIN_QUERY = 2;
 var SNIPPET = 160;
 var BEFORE = 50;
+var ASK = 500;
 var bunFs2 = {
   async stat(path) {
     try {
@@ -30718,6 +30911,9 @@ function searchRows(rows, terms, chat, limit = CHAT_HITS_PER_WORKTREE) {
   }
   return { hits, more: false };
 }
+function firstAsk(rows) {
+  return rows.find((r) => r.role === "user")?.text.slice(0, ASK);
+}
 function termRanges(lower, terms) {
   const ranges = [];
   for (const term of terms) {
@@ -30739,7 +30935,7 @@ class ChatSearch {
     this.d.state.requireRepo(repoId);
     const terms = needleTerms(query);
     if (terms.length === 0)
-      return { hits: [], truncated: false };
+      return { hits: [], truncated: false, asks: {} };
     const chats = [
       ...this.d.state.worktrees.filter((w) => w.repoId === repoId && w.kind === "worktree").map((w) => ({ id: w.id, archived: false, path: this.d.transcriptPath(w.id) })),
       ...this.d.archivedChats(repoId).map((a) => ({ id: a.id, archived: true, path: a.transcript }))
@@ -30747,13 +30943,23 @@ class ChatSearch {
     const read = new Set;
     const found = await Promise.all(chats.map(async (c) => {
       const rows = await this.rowsOf(c.id, c.archived, c.path, read);
-      return searchRows(rows, terms, { worktreeId: c.id, archived: c.archived });
+      return {
+        id: c.id,
+        ...searchRows(rows, terms, { worktreeId: c.id, archived: c.archived }),
+        ask: firstAsk(rows)
+      };
     }));
     for (const key of this.said.keys())
       if (!read.has(key))
         this.said.delete(key);
     const all = found.filter((f) => f.hits.length > 0).sort((a, b) => b.hits[0].ts - a.hits[0].ts).flatMap((f) => f.hits);
-    return { hits: all.slice(0, CHAT_HITS_MAX), truncated: all.length > CHAT_HITS_MAX || found.some((f) => f.more) };
+    const hits = all.slice(0, CHAT_HITS_MAX);
+    const kept = new Set(hits.map((h) => h.worktreeId));
+    const asks = {};
+    for (const f of found)
+      if (f.ask && kept.has(f.id))
+        asks[f.id] = f.ask;
+    return { hits, truncated: all.length > CHAT_HITS_MAX || found.some((f) => f.more), asks };
   }
   async rowsOf(id, archived, path, read) {
     const live = archived ? undefined : this.d.live(id);
@@ -30824,7 +31030,7 @@ function lastPageErrors(entries) {
   for (let i = entries.length - 1;i >= 0; i--) {
     const e = entries[i].event;
     if (e.type === "page-error") {
-      errors.unshift(e.message);
+      errors.unshift(...e.errors);
       continue;
     }
     if (e.type === "user-message" || e.type === "fix-asked")
@@ -30939,7 +31145,7 @@ function openProposals(entries) {
   for (const { event } of entries) {
     if (event.type === "handoff-proposed")
       open.set(event.id, event);
-    else if (event.type === "handoff" || event.type === "handoff-declined")
+    else if (event.type === "handoff-go" || event.type === "handoff" || event.type === "handoff-declined")
       open.delete(event.id);
   }
   return [...open.values()];
@@ -30958,7 +31164,6 @@ function proposedThisTurn(entries) {
 
 class HandoffService {
   d;
-  settling = new Set;
   constructor(d) {
     this.d = d;
     d.hub.on("landed", (worktreeId) => this.landed(worktreeId));
@@ -31071,13 +31276,11 @@ class HandoffService {
     if (!openProposals(entries).some((p) => p.id === id)) {
       return log.debug(worktreeId, `answer for a handoff that already closed (${id})`);
     }
-    if (this.settling.has(id))
-      return;
     if (!go) {
       agent.note({ type: "handoff-declined", id, ts: Date.now() });
       return;
     }
-    this.settling.add(id);
+    agent.note({ type: "handoff-go", id, ts: Date.now() });
     try {
       const repo = this.d.state.repo(proposed.repo.id);
       if (!repo)
@@ -31103,8 +31306,6 @@ class HandoffService {
       const reason = e instanceof Error ? e.message : String(e);
       agent.note({ type: "handoff-declined", id, outcome: "failed", reason, ts: Date.now() });
       throw e;
-    } finally {
-      this.settling.delete(id);
     }
   }
   async ask(worktreeId, repoId, text) {
@@ -31837,9 +32038,9 @@ function rankRefs({ refs, merged, prs, query, defaultBranch, rowIdForPath }) {
 }
 
 // ../daemon/src/worktrees/service.ts
-import { cpSync, existsSync as existsSync33, readFileSync as readFileSync19, rmSync as rmSync8 } from "fs";
+import { cpSync, existsSync as existsSync33, readFileSync as readFileSync20, rmSync as rmSync8 } from "fs";
 import { rm as rm5 } from "fs/promises";
-import { dirname as dirname12, join as join29 } from "path";
+import { dirname as dirname12, join as join30 } from "path";
 
 // ../daemon/src/git/archive.ts
 import { rmSync as rmSync5 } from "fs";
@@ -32415,7 +32616,7 @@ function compareUrl(remoteUrl, base, branch) {
 
 // ../daemon/src/git/turn.ts
 import { copyFileSync, existsSync as existsSync30, rmSync as rmSync6 } from "fs";
-import { join as join26 } from "path";
+import { join as join27 } from "path";
 var turnRef = (worktreeId, which) => `refs/toyon/turns/${worktreeId}/${which}`;
 var SNAPSHOT_SUBJECT2 = "toyon: tree at a send";
 var queue = new Map;
@@ -32433,7 +32634,7 @@ async function treeNow(wtPath, head, dirty) {
     const dir = await git(wtPath, "rev-parse", "--absolute-git-dir");
     if (!dir.ok || !dir.out)
       return null;
-    index = join26(dir.out, "toyon-turn-index");
+    index = join27(dir.out, "toyon-turn-index");
   }
   const env = { GIT_INDEX_FILE: index };
   const writeTree = async () => {
@@ -32456,7 +32657,7 @@ async function treeNow(wtPath, head, dirty) {
   }
   synced.delete(wtPath);
   if (!existsSync30(index)) {
-    const own = join26(index, "..", "index");
+    const own = join27(index, "..", "index");
     if (existsSync30(own))
       copyFileSync(own, index);
     else if (!(await run(GIT, ["read-tree", "HEAD"], wtPath, env)).ok)
@@ -32538,8 +32739,8 @@ async function dropTurnRefs(repoPath, worktreeId) {
 }
 
 // ../daemon/src/worktrees/archive.ts
-import { existsSync as existsSync31, mkdirSync as mkdirSync8, readdirSync as readdirSync9, readFileSync as readFileSync18, renameSync as renameSync4, rmSync as rmSync7, writeFileSync as writeFileSync11 } from "fs";
-import { basename as basename10, dirname as dirname11, join as join27 } from "path";
+import { existsSync as existsSync31, mkdirSync as mkdirSync8, readdirSync as readdirSync9, readFileSync as readFileSync19, renameSync as renameSync5, rmSync as rmSync7, writeFileSync as writeFileSync12 } from "fs";
+import { basename as basename10, dirname as dirname11, join as join28 } from "path";
 class WorktreeArchive {
   dir;
   records = new Map;
@@ -32551,7 +32752,7 @@ class WorktreeArchive {
       if (!existsSync31(file))
         continue;
       try {
-        this.records.set(id, JSON.parse(readFileSync18(file, "utf8")));
+        this.records.set(id, JSON.parse(readFileSync19(file, "utf8")));
       } catch (e) {
         log.warn("archive", `skipped an unreadable record: ${file}`, e);
       }
@@ -32566,7 +32767,7 @@ class WorktreeArchive {
     move(from.transcript, at.transcript);
     move(from.attachments, at.attachments);
     move(from.plans, at.plans);
-    writeFileSync11(at.record, JSON.stringify(rec, null, 2));
+    writeFileSync12(at.record, JSON.stringify(rec, null, 2));
     this.records.set(rec.worktree.id, rec);
     return { transcript: at.transcript, attachments: at.attachments, plans: at.plans };
   }
@@ -32595,7 +32796,7 @@ class WorktreeArchive {
     const rec = this.records.get(id);
     if (!rec)
       return;
-    writeFileSync11(this.filesOf(id).record, JSON.stringify(rec, null, 2));
+    writeFileSync12(this.filesOf(id).record, JSON.stringify(rec, null, 2));
   }
   chatFiles(id) {
     if (!this.records.has(id))
@@ -32606,24 +32807,24 @@ class WorktreeArchive {
   planFile(id, rel) {
     if (!this.records.has(id) || !isPlanPath(rel))
       return null;
-    const file = join27(this.filesOf(id).plans, basename10(rel));
+    const file = join28(this.filesOf(id).plans, basename10(rel));
     if (!existsSync31(file))
       return null;
     try {
-      return readFileSync18(file, "utf8");
+      return readFileSync19(file, "utf8");
     } catch (e) {
       log.warn(id, `could not read its archived plan ${rel}`, e);
       return null;
     }
   }
   filesOf(id) {
-    const dir = join27(this.dir, id);
+    const dir = join28(this.dir, id);
     return {
       dir,
-      record: join27(dir, "record.json"),
-      transcript: join27(dir, "transcript.jsonl"),
-      attachments: join27(dir, "attachments"),
-      plans: join27(dir, "plans")
+      record: join28(dir, "record.json"),
+      transcript: join28(dir, "transcript.jsonl"),
+      attachments: join28(dir, "attachments"),
+      plans: join28(dir, "plans")
     };
   }
 }
@@ -32650,7 +32851,7 @@ function summarize(r, repoId, transcript) {
 function lastUsage(transcript) {
   if (!existsSync31(transcript))
     return null;
-  const lines = readFileSync18(transcript, "utf8").split(`
+  const lines = readFileSync19(transcript, "utf8").split(`
 `);
   for (let i = lines.length - 1;i >= 0; i--) {
     if (!lines[i]?.includes('"usage"'))
@@ -32666,7 +32867,7 @@ function lastUsage(transcript) {
 function firstPrompt(transcript) {
   if (!existsSync31(transcript))
     return;
-  for (const line of readFileSync18(transcript, "utf8").split(`
+  for (const line of readFileSync19(transcript, "utf8").split(`
 `)) {
     if (!line.includes('"user-message"'))
       continue;
@@ -32683,7 +32884,7 @@ function move(from, to) {
     return;
   mkdirSync8(dirname11(to), { recursive: true });
   rmSync7(to, { recursive: true, force: true });
-  renameSync4(from, to);
+  renameSync5(from, to);
 }
 
 // ../daemon/src/worktrees/archivedGit.ts
@@ -32851,7 +33052,7 @@ async function fillLandMarks(jobs, read, width = 8) {
 
 // ../daemon/src/worktrees/spare.ts
 import { existsSync as existsSync32 } from "fs";
-import { basename as basename11, join as join28 } from "path";
+import { basename as basename11, join as join29 } from "path";
 class SparePool {
   d;
   inflight = new Map;
@@ -32915,11 +33116,11 @@ class SparePool {
     return this.record(repoId, repo).then((wt) => this.warmUp(wt, repo, {}));
   }
   async record(repoId, repo) {
-    const { id, dir } = freeSlot(join28(this.d.paths.worktreesDir, repo.name));
+    const { id, dir } = freeSlot(join29(this.d.paths.worktreesDir, repo.name));
     const wt = {
       id,
       repoId,
-      path: join28(this.d.paths.worktreesDir, repo.name, dir),
+      path: join29(this.d.paths.worktreesDir, repo.name, dir),
       branch: repo.defaultBranch,
       kind: "spare",
       phase: "reserved",
@@ -32939,6 +33140,7 @@ class SparePool {
       await withRepoLock(repo.path, () => gitOrThrow(repo.path, "worktree", "add", "--detach", wt.path, baseOf(repo)));
     })();
     const done = (async () => {
+      this.d.runtime.markSetup(wt.id, true);
       try {
         await added;
         if (after) {
@@ -32968,6 +33170,7 @@ class SparePool {
       } catch (e) {
         await this.rollBack(wt, e);
       } finally {
+        this.d.runtime.markSetup(wt.id, false);
         if (this.inflight.get(repoId)?.added === added)
           this.inflight.delete(repoId);
       }
@@ -33308,6 +33511,7 @@ class WorktreeService {
   spare;
   runs;
   ops = new Map;
+  syncQueued = new Set;
   trunk;
   archive;
   archiving = new Map;
@@ -33379,6 +33583,8 @@ class WorktreeService {
         if (wt && prompt)
           this.scheduleNaming(wt, prompt, wt.variant);
       }
+      if (turn.end !== "asking")
+        this.syncAfterTurn(worktreeId);
       if (turn.end !== "done" && turn.end !== "stopped")
         return;
       for (const p of d.runtime.get(worktreeId)?.procs?.states() ?? []) {
@@ -33429,7 +33635,7 @@ class WorktreeService {
         claimed.effort = opts.effort;
       if (profile !== undefined && profile !== resolveRun(repo, claimed).profile) {
         claimed.profile = profile;
-        this.restartProcs(claimed, repo);
+        this.restartProcs(claimed);
       }
       const carried = await this.carryMain(repo, claimed, !!opts.carry);
       this.d.state.save();
@@ -33446,8 +33652,8 @@ class WorktreeService {
     if (!await isGitRepo(repo.path)) {
       throw new UserError(`git no longer reads ${repo.name} as a checkout, so there is nothing to start a worktree from. If \`git config core.bare\` says true there, \`git config --unset core.bare\` puts it back.`);
     }
-    const { id, dir } = freeSlot(join29(this.d.paths.worktreesDir, repo.name));
-    const wtPath = join29(this.d.paths.worktreesDir, repo.name, dir);
+    const { id, dir } = freeSlot(join30(this.d.paths.worktreesDir, repo.name));
+    const wtPath = join30(this.d.paths.worktreesDir, repo.name, dir);
     const branch = `toyon/${dir}`;
     await withRepoLock(repo.path, () => gitOrThrow(repo.path, "worktree", "add", "--no-track", "-b", branch, wtPath, baseOf(repo)));
     const wt = {
@@ -33524,7 +33730,7 @@ class WorktreeService {
       };
       const carried = await git(repo.path, "ls-tree", "-r", "--name-only", `${sha}^3`);
       const restored = (carried.ok ? carried.out.split(`
-`).filter(Boolean) : []).filter((p) => !existsSync33(join29(wt.path, p)));
+`).filter(Boolean) : []).filter((p) => !existsSync33(join30(wt.path, p)));
       const applied = await git(wt.path, "stash", "apply", sha);
       if (applied.ok) {
         const ref = await entry();
@@ -33564,9 +33770,9 @@ class WorktreeService {
     const branch = kind === "pr" ? `pr/${number}` : ref;
     const title = kind === "pr" ? `pr-${number}` : cleanTitle2(ref) || "branch";
     let slug = branchSlug(title) || "branch";
-    if (existsSync33(join29(this.d.paths.worktreesDir, repo.name, slug)))
+    if (existsSync33(join30(this.d.paths.worktreesDir, repo.name, slug)))
       slug = `${slug}-${shortId().slice(0, 4)}`;
-    const wtPath = join29(this.d.paths.worktreesDir, repo.name, slug);
+    const wtPath = join30(this.d.paths.worktreesDir, repo.name, slug);
     await withRepoLock(repo.path, async () => {
       const out = (await listWorktrees(repo.path)).find((w) => w.branch === branch);
       if (out)
@@ -33681,8 +33887,8 @@ class WorktreeService {
       throw new UserError(`no profile "${name}" in ${repo.configFile}`);
     return name;
   }
-  restartProcs(wt, repo) {
-    fireAndForget(wt.id, this.d.runtime.stopProcs(wt.id).then(() => this.d.runtime.start(wt, repo)), "profile restart");
+  restartProcs(wt) {
+    fireAndForget(wt.id, this.d.runtime.stopProcs(wt.id).then(() => this.d.runtime.wake(wt.id)), "profile restart");
   }
   setProfile(worktreeId, name) {
     const { wt, repo } = this.d.state.requireWorktreeWithRepo(worktreeId);
@@ -33694,7 +33900,7 @@ class WorktreeService {
     wt.profile = profile;
     this.d.state.save();
     this.d.hub.emit("worktreesChanged");
-    this.restartProcs(wt, repo);
+    this.restartProcs(wt);
   }
   setMode(worktreeId, mode) {
     if (!this.d.state.setMode(worktreeId, mode))
@@ -33768,6 +33974,7 @@ class WorktreeService {
   }
   async takeDown(wt, archive, reason) {
     this.going.add(wt.id);
+    this.syncQueued.delete(wt.id);
     try {
       return await this.removeAndRecord(wt, archive, reason);
     } finally {
@@ -33799,7 +34006,10 @@ class WorktreeService {
       return k;
     });
     const sessionId = this.d.state.session(worktreeId);
+    const placed = repo.promptedAt;
     this.d.state.removeWorktree(worktreeId);
+    if (repo.promptedAt !== placed)
+      this.d.hub.emit("reposChanged");
     releasePort(wt.proxyPort);
     let archived = null;
     await dropTurnRefs(repo.path, worktreeId);
@@ -33824,7 +34034,7 @@ class WorktreeService {
     }
   }
   async keep(repo, wt) {
-    const index = join29(this.d.paths.archiveDir, `${wt.id}.index`);
+    const index = join30(this.d.paths.archiveDir, `${wt.id}.index`);
     const kept = await keepState(repo.path, wt.path, archiveRef(wt.id), index) ?? await this.keepUnlinked(repo, wt);
     if (!kept)
       log.warn(wt.id, "could not keep its git state");
@@ -33861,10 +34071,10 @@ class WorktreeService {
       log.warn(wt.id, `its directory could not be deleted and stays at ${wt.path}`);
   }
   plansScratch(worktreeId) {
-    return join29(this.d.paths.archiveDir, `${worktreeId}.plans`);
+    return join30(this.d.paths.archiveDir, `${worktreeId}.plans`);
   }
   keepPlans(wt) {
-    const from = join29(wt.path, PLANS_DIR);
+    const from = join30(wt.path, PLANS_DIR);
     if (!existsSync33(from))
       return;
     try {
@@ -33931,6 +34141,24 @@ class WorktreeService {
     });
     this.archiveChat(wt, repo, kept, sessionId);
   }
+  fillSentStamps() {
+    let filled = 0;
+    for (const repo of this.d.state.repos) {
+      if (repo.promptedAt !== undefined)
+        continue;
+      let at = 0;
+      for (const rec of this.archive.recordsOf(repo))
+        at = Math.max(at, sentAt(rec.worktree));
+      if (at === 0)
+        continue;
+      repo.promptedAt = at;
+      filled++;
+    }
+    if (filled === 0)
+      return;
+    this.d.state.save();
+    log.info("daemon", `placed ${filled} projects by what their archives were sent`);
+  }
   async fillLandMarks() {
     const jobs = [];
     const rows = new Set;
@@ -33986,7 +34214,7 @@ class WorktreeService {
   }
   archivedAttachment(archiveId, file) {
     const files = this.archive.chatFiles(archiveId);
-    return files && isAttachmentFile(file) ? join29(files.attachments, file) : null;
+    return files && isAttachmentFile(file) ? join30(files.attachments, file) : null;
   }
   archivedGit(archiveId) {
     const rec = this.archive.get(archiveId);
@@ -34041,7 +34269,7 @@ class WorktreeService {
       throw new UserError(`${old.title} was archived without its commits, so there is nothing to restore`);
     if (rec.auto)
       log.info(old.id, `restoring a worktree that archived itself (${rec.auto})`);
-    const path = existsSync33(old.path) ? join29(dirname12(old.path), freeSlot(dirname12(old.path)).dir) : old.path;
+    const path = existsSync33(old.path) ? join30(dirname12(old.path), freeSlot(dirname12(old.path)).dir) : old.path;
     const branch = await withRepoLock(repo.path, async () => {
       if (!await commitOf(repo.path, archiveRef(old.id))) {
         throw new UserError(`${old.title}'s kept commits are gone from git`);
@@ -34079,7 +34307,7 @@ class WorktreeService {
       ...createdBy ? { createdBy } : {}
     };
     try {
-      this.archive.take(old.id, { ...this.chatFiles(old.id), plans: join29(path, PLANS_DIR) });
+      this.archive.take(old.id, { ...this.chatFiles(old.id), plans: join30(path, PLANS_DIR) });
     } catch (e) {
       log.warn(old.id, "could not move its chat back out of the archive", e);
     }
@@ -34221,10 +34449,10 @@ class WorktreeService {
     }
   }
   async mirrorBaseIgnore(repo) {
-    const src = join29(repo.path, ".gitignore");
+    const src = join30(repo.path, ".gitignore");
     const tracked = existsSync33(src) && (await git(repo.path, "ls-files", "--", ".gitignore")).out !== "";
     const mirror = existsSync33(src) && !tracked;
-    const lines = mirror ? readFileSync19(src, "utf8").split(`
+    const lines = mirror ? readFileSync20(src, "utf8").split(`
 `).filter((l) => l.trim() !== "") : [];
     await excludeBlock(repo.path, BASE_IGNORE, lines);
   }
@@ -34236,8 +34464,8 @@ class WorktreeService {
       await this.d.cache.restore(wt, repo, (line) => this.d.hub.emit("log", wt.id, "setup", line));
       run.finish(0);
     }
-    const srcNm = join29(depsSource, "node_modules");
-    const dstNm = join29(wt.path, "node_modules");
+    const srcNm = join30(depsSource, "node_modules");
+    const dstNm = join30(wt.path, "node_modules");
     if (existsSync33(srcNm) && !existsSync33(dstNm)) {
       const r = await cloneTree(srcNm, dstNm);
       if (r.ok)
@@ -34246,10 +34474,10 @@ class WorktreeService {
         log.warn(wt.id, "could not copy node_modules from the base checkout", r.error);
     }
     for (const f of LOCAL_CONFIG_FILES) {
-      const src = join29(depsSource, f);
-      if (!existsSync33(src) || existsSync33(join29(wt.path, f)))
+      const src = join30(depsSource, f);
+      if (!existsSync33(src) || existsSync33(join30(wt.path, f)))
         continue;
-      const r = await run("cp", [src, join29(wt.path, f)], wt.path);
+      const r = await run("cp", [src, join30(wt.path, f)], wt.path);
       if (r.ok)
         this.d.hub.emit("log", wt.id, "setup", `copied ${f}`);
       else
@@ -34502,6 +34730,9 @@ ${wt.landing.body}` : s;
       this.ops.delete(id);
       release?.();
       this.d.hub.emit("worktreesChanged");
+      const status = this.d.runtime.agentFor(id)?.status;
+      if (status !== "working" && status !== "waiting")
+        this.syncAfterTurn(id);
     }
   }
   step(id, name) {
@@ -34529,7 +34760,7 @@ ${wt.landing.body}` : wt.landing.subject : undefined;
         return { result: fetched };
       if (wt.pr?.state === "open") {
         const dirty = (await statusFiles(wt.path)).length > 0;
-        const missing = dirty || (await aheadUpstream(wt.path) ?? 0) > 0;
+        const missing = dirty || (await aheadUpstream(wt.path, wt.branch) ?? 0) > 0;
         if (!missing)
           return { result: await mergePr(wt.path, wt.pr.number, policy.merge, w) };
         const committed = await this.commitIfDirty(wt, message);
@@ -34775,8 +35006,11 @@ ${wt.landing.body}` : wt.landing.subject : undefined;
     const own = r.wt ? hasOwnBranch(r.wt) : false;
     const carry = !!r.wt;
     const status = this.d.runtime.agentFor(worktreeId)?.status;
-    if (carry && (status === "working" || status === "waiting") && (await statusFiles(r.path)).length > 0)
-      throw new UserError(`${r.name}'s agent is mid-turn with uncommitted changes: sync when it is done`);
+    if (carry && (status === "working" || status === "waiting") && (await statusFiles(r.path)).length > 0) {
+      this.syncQueued.add(worktreeId);
+      this.d.hub.emit("worktreesChanged");
+      return { result: { ok: true, message: `${r.name} syncs from ${r.base} once the turn ends` }, base: r.base };
+    }
     const w = r.wt ? this.landWatch(r.wt) : UNWATCHED;
     const result = await this.ship(worktreeId, "sync-main", async () => {
       if (r.wt) {
@@ -34794,6 +35028,31 @@ ${wt.landing.body}` : wt.landing.subject : undefined;
     });
     return { result: r.wt ? this.fixShip(r.wt, result, r.base) : result, base: r.base };
   }
+  unqueueSync(worktreeId) {
+    if (!this.syncQueued.delete(worktreeId))
+      return;
+    this.d.hub.emit("worktreesChanged");
+  }
+  syncAfterTurn(worktreeId) {
+    if (!this.syncQueued.has(worktreeId))
+      return;
+    if (this.ops.has(worktreeId))
+      return;
+    this.syncQueued.delete(worktreeId);
+    const release = this.d.runtime.agentFor(worktreeId)?.hold();
+    this.d.hub.emit("worktreesChanged");
+    fireAndForget(worktreeId, (async () => {
+      try {
+        const { result } = await this.sync(worktreeId);
+        if (!result.ok && !result.asked)
+          this.d.hub.emit("failed", worktreeId, result.message);
+      } catch (e) {
+        this.d.hub.emit("failed", worktreeId, e instanceof Error ? e.message : String(e));
+      } finally {
+        release?.();
+      }
+    })(), "sync after the turn");
+  }
   async pull(worktreeId) {
     const wt = this.d.state.requireWorktree(worktreeId);
     if (!isMain(wt))
@@ -34933,9 +35192,10 @@ ${wt.landing.body}` : wt.landing.subject : undefined;
     return { ...ab, ...unpushed === undefined ? {} : { unpushed }, dirty };
   }
   async unpushed(id, path) {
-    if (this.d.state.worktree(id)?.pr?.state !== "open")
+    const wt = this.d.state.worktree(id);
+    if (wt?.pr?.state !== "open")
       return;
-    return await aheadUpstream(path) ?? undefined;
+    return await aheadUpstream(path, wt.branch) ?? undefined;
   }
   async freshCounts(worktreeId) {
     if (this.going.has(worktreeId))
@@ -35152,7 +35412,8 @@ ${wt.landing.body}` : wt.landing.subject : undefined;
         usage: this.usageFor(wt.id),
         transcript: transcriptPathFor(this.d.paths.transcriptsDir, wt.id),
         sessionId: this.d.state.session(wt.id),
-        shipping: this.ops.get(wt.id)
+        shipping: this.ops.get(wt.id),
+        syncQueued: this.syncQueued.has(wt.id) || undefined
       };
     });
   }
@@ -35279,16 +35540,17 @@ if (pruned > 0)
 var managed = await loadManaged();
 var paths = makePaths();
 ensureDirs(paths);
+forwardTranscripts(paths.transcriptsDir);
 var token = loadOrCreateToken(paths);
 var port = Number(process.env.TOYON_PORT ?? DAEMON_DEFAULT_PORT);
-var helperApp = join30(paths.home, DAEMON_FILES.helper);
+var helperApp = join31(paths.home, DAEMON_FILES.helper);
 var helper = helperWanted({ platform: process.platform, cloud: cloud.enabled, port, home: process.env.TOYON_HOME }) ? new Helper({
   dir: helperApp,
   stub: HELPER_STUB,
   bun: process.execPath,
   cli: CLI_ENTRY,
-  log: join30(paths.home, DAEMON_FILES.launcherLog),
-  icon: join30(SHELL_DIST, "icon.svg"),
+  log: join31(paths.home, DAEMON_FILES.launcherLog),
+  icon: join31(SHELL_DIST, "icon.svg"),
   version: package_default.version
 }) : null;
 if (helper) {
@@ -35505,6 +35767,7 @@ var keepAwake = new KeepAwake({
   answerable: () => setting.get() !== null
 });
 await worktrees.fillLandMarks();
+worktrees.fillSentStamps();
 var {
   server,
   branded,
@@ -35581,7 +35844,7 @@ hub.on("remoteChanged", () => {
   fireAndForget("remote", tailnet.refresh(), "ask Tailscale");
 });
 fireAndForget("remote", tailnet.start(), "ask Tailscale");
-writeFileSync12(paths.pidFile, `${process.pid}
+writeFileSync13(paths.pidFile, `${process.pid}
 `);
 var stopLagSampler = startLagSampler();
 await runtime.reclaimOrphans();