toyon 0.7.0 → 0.8.0

package/dist/daemon.js

@@ -1,7 +1,7 @@
 // @bun
 // ../daemon/src/index.ts
 import { rmSync as rmSync6, writeFileSync as writeFileSync10 } from "fs";
-import { dirname as dirname11 } from "path";
+import { dirname as dirname12 } from "path";
 import { fileURLToPath } from "url";
 
 // ../shared/src/agent-tools.ts
@@ -6469,7 +6469,7 @@ var PAIR_TTL_MS = 120000;
 var pairLink = (host, code) => `https://${host}/#pair=${code}`;
 
 // ../shared/src/protocol/limits.ts
-var PROTOCOL_VERSION = 80;
+var PROTOCOL_VERSION = 82;
 var FILE_MAX_CHARS = 5000000;
 var IMAGE_MIME_TYPES = ["image/png", "image/jpeg", "image/gif", "image/webp"];
 var IMAGE_MAX_EDGE = 2576;
@@ -6542,6 +6542,7 @@ var elementTraitsSchema = object({
 // ../shared/src/protocol/events.ts
 var SHELL_TOOL = "shell";
 var CHECK_TOOL = "check";
+var TOOL_SEARCH = "ToolSearch";
 
 // ../shared/src/protocol/ws.ts
 var id = string2().min(1).max(200);
@@ -6793,7 +6794,7 @@ var clientMsgSchema = discriminatedUnion("t", [
   object({ t: literal("search"), worktreeId: id, query: string2().max(500) }),
   object({ t: literal("find-element"), worktreeId: id, seq, element: elementTraitsSchema }),
   object({ t: literal("design-scan"), worktreeId: id }),
-  object({ t: literal("discard-file"), worktreeId: id, path: relPath }),
+  object({ t: literal("discard-files"), worktreeId: id, paths: array(relPath).min(1).max(500) }),
   object({ t: literal("judge"), worktreeId: id, note: string2().max(500).optional() }),
   object({ t: literal("reveal"), worktreeId: id, path: relPath.optional() }),
   object({ t: literal("stop-agent"), worktreeId: id }),
@@ -6905,6 +6906,18 @@ function parseClientMsg(raw) {
   return { ok: false, reason: issueReason(r.error, "invalid message") };
 }
 
+// ../shared/src/query.ts
+var TERM = /["\u201C\u201D]([^"\u201C\u201D]*)["\u201C\u201D]?|(\S+)/g;
+function queryTerms(query) {
+  const out = new Set;
+  for (const m of query.matchAll(TERM)) {
+    const term = (m[1] ?? m[2] ?? "").replace(/\s+/g, " ").trim().toLowerCase();
+    if (term)
+      out.add(term);
+  }
+  return [...out];
+}
+
 // ../shared/src/restart.ts
 var RESTART_NOW = "now";
 
@@ -7869,6 +7882,15 @@ function installCommand(method, version) {
     return ["bun", "add", "-g", `toyon@${version}`];
   return null;
 }
+function registryHost(registry) {
+  if (registry === null || registry === "")
+    return "the npm registry";
+  try {
+    return new URL(registry).host;
+  } catch {
+    return registry;
+  }
+}
 function newer(a, b) {
   const pa = parseVersion(a);
   const pb = parseVersion(b);
@@ -8141,7 +8163,7 @@ function safeUser() {
 // ../daemon/package.json
 var package_default = {
   name: "@toyon/daemon",
-  version: "0.7.0",
+  version: "0.8.0",
   private: true,
   type: "module",
   main: "src/index.ts",
@@ -13424,7 +13446,7 @@ var BUILTIN_AGENTS = [
     name: "Claude Code",
     short: "Claude",
     builtin: true,
-    run: { kind: "npm-bin", pkg: "@agentclientprotocol/claude-agent-acp", version: "0.75.1", bin: "claude-agent-acp" },
+    run: { kind: "npm-bin", pkg: "@agentclientprotocol/claude-agent-acp", version: "0.84.0", bin: "claude-agent-acp" },
     ...cloud.enabled ? { env: { NO_BROWSER: "1" } } : {},
     terminalLogins: {
       "claude-login": { args: ["--cli", "auth", "login", "--claudeai"], env: { NO_BROWSER: "1" }, plan: true }
@@ -13443,7 +13465,7 @@ var BUILTIN_AGENTS = [
     id: "codex",
     name: "Codex",
     builtin: true,
-    run: { kind: "npm-bin", pkg: "@agentclientprotocol/codex-acp", version: "1.10.0", bin: "codex-acp" },
+    run: { kind: "npm-bin", pkg: "@agentclientprotocol/codex-acp", version: "2.0.1", bin: "codex-acp" },
     env: {
       INITIAL_AGENT_MODE: "agent",
       CODEX_CONFIG: JSON.stringify({ features: { default_mode_request_user_input: true } }),
@@ -13460,7 +13482,7 @@ var BUILTIN_AGENTS = [
     id: "opencode",
     name: "OpenCode",
     builtin: true,
-    run: { kind: "npm-native", pkg: "opencode", version: "1.18.30", bin: "bin/opencode", args: ["acp"] },
+    run: { kind: "npm-native", pkg: "opencode", version: "1.18.33", bin: "bin/opencode", args: ["acp"] },
     onDemand: true,
     confinement: "toyon-sandbox",
     stateDirs: [".local/share/opencode", ".local/state/opencode", ".cache/opencode"],
@@ -13725,6 +13747,29 @@ function modeAfterPlan(optionName) {
   return /manual/i.test(optionName) ? "ask" : "auto";
 }
 
+// ../daemon/src/agent/output.ts
+var OUTPUT_CAP = 200000;
+function formatOutput(text, exit, truncated, ceiling) {
+  const body = text.replace(/\n+$/, "");
+  const notes = [];
+  if (truncated)
+    notes.push(`output cut at ${Math.round(OUTPUT_CAP / 1000)} KB`);
+  if (exit === "timeout")
+    notes.push(ceiling ? `gave up after ${describeDuration(ceiling)}` : "gave up at the ceiling");
+  else if (typeof exit === "string")
+    notes.push(`killed (${exit})`);
+  else if (exit !== 0)
+    notes.push(`exit ${exit}`);
+  const parts = [];
+  if (body.trim())
+    parts.push(`\`\`\`
+${body}
+\`\`\``);
+  parts.push(...notes);
+  return parts.join(`
+`);
+}
+
 // ../daemon/src/agent/policy.ts
 import { isAbsolute as isAbsolute2, resolve as resolve4 } from "path";
 var NON_WRITE_KINDS = new Set(["execute", "read", "search", "fetch", "think"]);
@@ -14087,9 +14132,168 @@ 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 existsSync8, statSync as statSync3 } from "fs";
+import { open as open2 } from "fs/promises";
+import { homedir as homedir4 } from "os";
+import { basename as basename2, dirname as dirname4, join as join7 } 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 claudeConfigDir() {
+  return process.env.CLAUDE_CONFIG_DIR || join7(homedir4(), ".claude");
+}
+function sessionLogFor(file, configDir = claudeConfigDir()) {
+  const tasks = dirname4(file);
+  if (basename2(tasks) !== "tasks")
+    return null;
+  const session = dirname4(tasks);
+  const path = join7(configDir, "projects", basename2(dirname4(session)), `${basename2(session)}.jsonl`);
+  return existsSync8(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: statSync3(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 CUSTOM_ANSWER_META = "_askUserQuestionCustomAnswer";
 var CODEX_META = "codex";
+var CLAUDE_CUSTOM_KEY = /^(question_\d+)_custom$/;
 var OPTION_PREVIEW_META = "_claude/askUserQuestionOption";
 function field(value, key) {
   return value && typeof value === "object" ? value[key] : undefined;
@@ -14100,12 +14304,12 @@ function meta2(value, key) {
 function text(value) {
   return typeof value === "string" && value ? value : undefined;
 }
-function customAnswerFor(prop) {
-  const claude = text(field(meta2(prop, CUSTOM_ANSWER_META), "questionId"));
-  if (claude)
-    return claude;
+function customAnswerFor(key, prop, keys) {
   const codex = meta2(prop, CODEX_META);
-  return field(codex, "isOtherAnswer") === true ? text(field(codex, "questionId")) ?? null : null;
+  if (field(codex, "role") === "user_note")
+    return text(field(codex, "questionId")) ?? null;
+  const owner = CLAUDE_CUSTOM_KEY.exec(key)?.[1];
+  return owner && keys.has(owner) ? owner : null;
 }
 function optionsOf(titled) {
   return titled.map((o) => {
@@ -14148,26 +14352,28 @@ function parseForm(req) {
   if (!props)
     return null;
   const entries = Object.entries(props);
+  const keys = new Set(Object.keys(props));
   const required = new Set(req.requestedSchema.required ?? []);
   const notes = new Map;
   for (const [key, prop] of entries) {
-    const owner = customAnswerFor(prop);
+    const owner = customAnswerFor(key, prop, keys);
     if (owner)
       notes.set(owner, { key, label: text(field(prop, "title")) ?? "Other" });
   }
   const questions = [];
   const fields = [];
   for (const [key, prop] of entries) {
-    if (customAnswerFor(prop))
+    if (customAnswerFor(key, prop, keys))
       continue;
     const select = selectOf(prop);
     if (!select)
       return null;
     const note = notes.get(key);
-    const header = text(field(prop, "title"));
+    const swapped = meta2(prop, CODEX_META) !== undefined;
+    const header = text(field(prop, swapped ? "description" : "title"));
     questions.push({
       id: key,
-      text: text(field(prop, "description")) ?? "",
+      text: text(field(prop, swapped ? "title" : "description")) ?? "",
       ...header ? { header } : {},
       options: select.options,
       ...select.multi ? { multi: true } : {},
@@ -14193,8 +14399,7 @@ function toContent(form, answers) {
     const note = answer.note?.trim();
     if (!note || !field.note)
       return;
-    const labels = chosen.map((v) => q.options.find((o) => o.value === v)?.label ?? v);
-    out[field.note] = labels.length > 0 ? `${labels.join(", ")}: ${note}` : note;
+    out[field.note] = note;
   });
   return out;
 }
@@ -14271,7 +14476,6 @@ var NETWORK_ASK = "SandboxNetworkAccess";
 function isNetworkAsk(update) {
   return update.name === NETWORK_ASK || asRecord(asRecord(update._meta).claudeCode).toolName === NETWORK_ASK;
 }
-var TOOL_SEARCH = "ToolSearch";
 function isToolSearch(update) {
   return update.name === TOOL_SEARCH || asRecord(asRecord(update._meta).claudeCode).toolName === TOOL_SEARCH;
 }
@@ -14319,7 +14523,7 @@ function abandoned(memos, parent) {
   }
   return out;
 }
-function mapUpdate(update, memos, tag, sink) {
+function mapUpdate(update, memos, tag, sink, background) {
   switch (update.sessionUpdate) {
     case "agent_message_chunk": {
       const { parentToolId } = spawnOf(update._meta);
@@ -14347,6 +14551,7 @@ function mapUpdate(update, memos, tag, sink) {
       const head = heading(update);
       const memo = {
         ...head,
+        input,
         content: update.content ?? [],
         rawOutput: update.rawOutput,
         ended: false,
@@ -14364,7 +14569,7 @@ function mapUpdate(update, memos, tag, sink) {
         ...spawn
       });
       if (update.status === "completed" || update.status === "failed")
-        out.push(endOf(update.toolCallId, memo, update.status, sink));
+        out.push(endOf(update.toolCallId, memo, update.status, sink, background));
       return out;
     }
     case "tool_call_update": {
@@ -14377,6 +14582,7 @@ function mapUpdate(update, memos, tag, sink) {
           name: update.name ?? "",
           title: update.title ?? update.name ?? "tool",
           ...update.kind ? { kind: update.kind } : {},
+          input,
           content: [],
           ended: false,
           writing: isWrittenKind(update.kind ?? undefined) && emptyInput(input),
@@ -14407,7 +14613,7 @@ function mapUpdate(update, memos, tag, sink) {
       if (update.kind && update.kind !== memo.kind)
         refined.kind = memo.kind = update.kind;
       if (update.rawInput !== undefined) {
-        refined.input = update.rawInput;
+        refined.input = memo.input = update.rawInput;
         if (!emptyInput(update.rawInput))
           memo.writing = false;
       }
@@ -14418,7 +14624,7 @@ function mapUpdate(update, memos, tag, sink) {
       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));
+        out.push(endOf(update.toolCallId, memo, update.status, sink, background));
       }
       return out;
     }
@@ -14449,13 +14655,19 @@ function textOf(content, tag, what) {
   log.debug(tag, `acp: dropping non-text ${what} block (${content.type})`);
   return null;
 }
-function endOf(toolId, memo, status, sink) {
+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) : [];
   return {
     type: "tool-end",
     toolId,
-    output: summarizeToolOutput(memo.content, memo.rawOutput),
+    output,
     isError: status === "failed" || exitCodeOf(memo.rawOutput) > 0,
     ...images.length ? { images } : {}
   };
@@ -14566,6 +14778,7 @@ class AcpSession {
   live = null;
   reaper = null;
   own = null;
+  tasks;
   asking = 0;
   asks = new Map;
   log;
@@ -14575,6 +14788,12 @@ class AcpSession {
     this.d = d;
     this.commandList = d.seedCommands?.() ?? [];
     this.log = new Transcript(transcriptPathFor(d.transcriptsDir, d.worktreeId), d.worktreeId);
+    this.tasks = new BackgroundTasks({
+      note: (e) => this.emit(e),
+      onEnd: () => this.maybeArmReaper(),
+      ...d.taskPollMs !== undefined ? { pollMs: d.taskPollMs } : {},
+      ...d.claudeConfigDir !== undefined ? { configDir: d.claudeConfigDir } : {}
+    });
     this.seq = nextNumbers(this.log.entries.map(({ event }) => event.type === "user-message" ? event.attachments : undefined));
     const open = new Set;
     for (const { event } of this.log.entries) {
@@ -14585,6 +14804,20 @@ class AcpSession {
     }
     for (const id of open)
       this.emit({ type: "agent-ask-end", id, outcome: "expired", ts: Date.now() });
+    const held = new Map;
+    for (const { event } of this.log.entries) {
+      if (event.type === "tool-update" && event.background)
+        held.set(event.toolId, "");
+      else if (event.type === "tool-delta" && held.has(event.toolId))
+        held.set(event.toolId, held.get(event.toolId) + event.text);
+      else if (event.type === "tool-end")
+        held.delete(event.toolId);
+    }
+    for (const [toolId, text] of held) {
+      const output = [formatOutput(text, 0, false), "ended with the daemon that was watching it"].filter(Boolean);
+      this.emit({ type: "tool-end", toolId, output: output.join(`
+`), isError: true });
+    }
   }
   get commands() {
     return this.commandList;
@@ -14983,6 +15216,7 @@ class AcpSession {
         this.conn = null;
         this.live = null;
         this.cancelAsks();
+        this.tasks.endAll("the agent stopped, and the command with it");
         this.endOwn("interrupted");
       }
     });
@@ -15155,7 +15389,7 @@ class AcpSession {
     }
     if (params.update.sessionUpdate === "config_option_update")
       this.absorb(live, params.update.configOptions);
-    const events = mapUpdate(params.update, live.tools, this.d.worktreeId, (file, bytes) => fireAndForget(this.d.worktreeId, this.d.attachments.putToolImage(this.d.worktreeId, file, bytes), "tool image"));
+    const events = mapUpdate(params.update, live.tools, this.d.worktreeId, (file, bytes) => fireAndForget(this.d.worktreeId, this.d.attachments.putToolImage(this.d.worktreeId, file, bytes), "tool image"), (toolId, start, input) => this.tasks.start(toolId, start, input));
     if (!this.running)
       this.trackOwn(events);
     for (const ev of events) {
@@ -15296,7 +15530,7 @@ class AcpSession {
     for (const e of events) {
       if (e.type === "tool-start")
         this.own.open.add(e.toolId);
-      else if (e.type === "tool-end")
+      else if (e.type === "tool-end" || e.type === "tool-update" && e.background)
         this.own.open.delete(e.toolId);
     }
     if (this.own.settle)
@@ -15318,8 +15552,11 @@ class AcpSession {
     this.syncStatus();
     this.maybeArmReaper();
   }
+  quiet() {
+    return !this.running && !this.own && !this.asking && this.asks.size === 0 && this.tasks.size === 0;
+  }
   maybeArmReaper() {
-    if (!this.running && !this.own && !this.asking && this.asks.size === 0 && this.conn && !this.stopped)
+    if (this.quiet() && this.conn && !this.stopped)
       this.armReaper();
   }
   armReaper() {
@@ -15327,7 +15564,7 @@ class AcpSession {
     const idleMs = this.d.idleMs ?? DEFAULT_IDLE_MS;
     const t = setTimeout(() => {
       this.reaper = null;
-      if (this.running || this.own || this.asking || this.asks.size > 0 || !this.conn)
+      if (!this.quiet() || !this.conn)
         return;
       fireAndForget(this.d.worktreeId, this.dropConn(`idle for ${Math.round(idleMs / 60000)} min`), "reap agent");
     }, idleMs);
@@ -15341,6 +15578,7 @@ class AcpSession {
   }
   async dropConn(why) {
     this.cancelAsks();
+    this.tasks.endAll("the agent stopped, and the command with it");
     const conn = this.conn;
     this.conn = null;
     this.live = null;
@@ -15413,15 +15651,15 @@ function sameCommands(a, b) {
 }
 
 // ../daemon/src/agent/planDoc.ts
-import { existsSync as existsSync8, mkdirSync as mkdirSync5, readdirSync as readdirSync2, readFileSync as readFileSync8, writeFileSync as writeFileSync4 } from "fs";
-import { join as join7 } from "path";
-var PLANS_DIR = join7(".toyon", "plans");
+import { existsSync as existsSync9, mkdirSync as mkdirSync5, readdirSync as readdirSync2, readFileSync as readFileSync8, writeFileSync as writeFileSync4 } from "fs";
+import { join as join8 } from "path";
+var PLANS_DIR = join8(".toyon", "plans");
 var PLAN_NAME = /^(\d+)\.md$/;
 function isPlanPath(rel) {
   return rel.startsWith(`${PLANS_DIR}/`) && PLAN_NAME.test(rel.slice(PLANS_DIR.length + 1));
 }
 function nextNumber(dir) {
-  if (!existsSync8(dir))
+  if (!existsSync9(dir))
     return 1;
   let max = 0;
   for (const name of readdirSync2(dir)) {
@@ -15432,11 +15670,11 @@ function nextNumber(dir) {
   return max + 1;
 }
 async function writePlanDoc(cwd, markdown) {
-  const dir = join7(cwd, PLANS_DIR);
-  const rel = join7(PLANS_DIR, `${nextNumber(dir)}.md`);
+  const dir = join8(cwd, PLANS_DIR);
+  const rel = join8(PLANS_DIR, `${nextNumber(dir)}.md`);
   try {
     mkdirSync5(dir, { recursive: true });
-    writeFileSync4(join7(cwd, rel), markdown.endsWith(`
+    writeFileSync4(join8(cwd, rel), markdown.endsWith(`
 `) ? markdown : `${markdown}
 `);
   } catch (e) {
@@ -15447,8 +15685,8 @@ async function writePlanDoc(cwd, markdown) {
   return rel;
 }
 function planEdited(cwd, rel, proposed) {
-  const file = join7(cwd, rel);
-  if (!existsSync8(file))
+  const file = join8(cwd, rel);
+  if (!existsSync9(file))
     return false;
   try {
     return readFileSync8(file, "utf8").trim() !== proposed.trim();
@@ -15459,7 +15697,7 @@ function planEdited(cwd, rel, proposed) {
 }
 
 // ../daemon/src/runtime/forward.ts
-var POLL_MS = 100;
+var POLL_MS2 = 100;
 var HOLD_MS = 60000;
 var PENDING_CAP = 1 << 20;
 function keep(chunk) {
@@ -15547,7 +15785,7 @@ function startForward(opts) {
         return connectUp(conn, t);
       if (!opts.coming() || Date.now() >= deadline)
         return closePair(conn);
-      await Bun.sleep(POLL_MS);
+      await Bun.sleep(POLL_MS2);
     }
   };
   const listener = Bun.listen({
@@ -15906,7 +16144,7 @@ function expandEnv(env, vars) {
 
 // ../daemon/src/core/remote.ts
 import { createHmac, timingSafeEqual } from "crypto";
-import { existsSync as existsSync9, readFileSync as readFileSync9 } from "fs";
+import { existsSync as existsSync10, readFileSync as readFileSync9 } from "fs";
 function loadRemote(file, env = process.env, managed = MANAGED_DEFAULTS) {
   if (env.TOYON_CLOUD === "1") {
     const host = (env.TOYON_PUBLIC_HOST ?? "").toLowerCase();
@@ -15919,7 +16157,7 @@ function loadRemote(file, env = process.env, managed = MANAGED_DEFAULTS) {
       throw new Error(`TOYON_PREVIEWS: ${why}`);
     return { host, previews, front: "edge" };
   }
-  if (!existsSync9(file))
+  if (!existsSync10(file))
     return null;
   if (managed.remote === "off") {
     log.warn("remote", `${file} is ignored: remote access is turned off by your organization's policy`);
@@ -17526,8 +17764,8 @@ class RuntimeRegistry {
 
 // ../daemon/src/worktrees/naming.ts
 import { randomBytes } from "crypto";
-import { existsSync as existsSync10 } from "fs";
-import { join as join8 } from "path";
+import { existsSync as existsSync11 } from "fs";
+import { join as join9 } from "path";
 function shortId() {
   return randomBytes(5).toString("hex");
 }
@@ -17535,7 +17773,7 @@ function freeSlot(parent) {
   for (;; ) {
     const id = shortId();
     const dir = `wt-${id.slice(0, 4)}`;
-    if (!existsSync10(join8(parent, dir)))
+    if (!existsSync11(join9(parent, dir)))
       return { id, dir };
   }
 }
@@ -17949,20 +18187,20 @@ function makePlanner(agents) {
 }
 
 // ../daemon/src/core/assets.ts
-import { existsSync as existsSync11, readdirSync as readdirSync3, rmSync, statSync as statSync3 } from "fs";
-import { join as join9, resolve as resolve5 } from "path";
+import { existsSync as existsSync12, readdirSync as readdirSync3, rmSync, statSync as statSync4 } from "fs";
+import { join as join10, resolve as resolve5 } from "path";
 function locateAssets(here, env = process.env) {
-  const packaged = existsSync11(join9(here, "shell", "index.html"));
+  const packaged = existsSync12(join10(here, "shell", "index.html"));
   return {
-    shellDist: env.TOYON_SHELL_DIST ?? (packaged ? join9(here, "shell") : join9(here, "../../shell/dist")),
-    bridgeJs: env.TOYON_BRIDGE_JS ?? (packaged ? join9(here, "bridge.js") : join9(here, "../../bridge/dist/bridge.js")),
+    shellDist: env.TOYON_SHELL_DIST ?? (packaged ? join10(here, "shell") : join10(here, "../../shell/dist")),
+    bridgeJs: env.TOYON_BRIDGE_JS ?? (packaged ? join10(here, "bridge.js") : join10(here, "../../bridge/dist/bridge.js")),
     sourceRoot: packaged ? null : resolve5(here, "../../.."),
-    packageJson: packaged ? join9(here, "..", "package.json") : null
+    packageJson: packaged ? join10(here, "..", "package.json") : null
   };
 }
 var KEEP_MS = 3 * 24 * 60 * 60 * 1000;
 function pruneAssets(shellDist) {
-  const dir = join9(shellDist, "assets");
+  const dir = join10(shellDist, "assets");
   let names;
   try {
     names = readdirSync3(dir);
@@ -17971,9 +18209,9 @@ function pruneAssets(shellDist) {
   }
   const found = [];
   for (const name of names) {
-    const path = join9(dir, name);
+    const path = join10(dir, name);
     try {
-      found.push({ path, mtime: statSync3(path).mtimeMs });
+      found.push({ path, mtime: statSync4(path).mtimeMs });
     } catch {}
   }
   if (found.length === 0)
@@ -17992,8 +18230,8 @@ function pruneAssets(shellDist) {
 }
 
 // ../daemon/src/core/dialog.ts
-import { existsSync as existsSync12 } from "fs";
-import { homedir as homedir4 } from "os";
+import { existsSync as existsSync13 } from "fs";
+import { homedir as homedir5 } from "os";
 var PROMPTS = {
   location: "Choose where the new project goes",
   open: "Choose a project folder to open"
@@ -18009,8 +18247,8 @@ function folderDialog() {
   let child = null;
   let cancelled = false;
   const ask = async (start, purpose) => {
-    const typed = start === "~" || start.startsWith("~/") ? `${homedir4()}${start.slice(1)}` : start;
-    const from = typed.startsWith("/") && existsSync12(typed) ? typed : homedir4();
+    const typed = start === "~" || start.startsWith("~/") ? `${homedir5()}${start.slice(1)}` : start;
+    const from = typed.startsWith("/") && existsSync13(typed) ? typed : homedir5();
     cancelled = false;
     const p = Bun.spawn(["osascript", ...SCRIPT.flatMap((line) => ["-e", line]), PROMPTS[purpose], from], {
       stdout: "pipe",
@@ -18476,12 +18714,23 @@ class IdleExit {
 // ../daemon/src/core/restart.ts
 import { spawn as spawn3 } from "child_process";
 import { openSync } from "fs";
+import { homedir as homedir6 } from "os";
 function restartable(env = process.env) {
   if (env.TOYON_WORKTREE !== undefined) {
     return { ok: false, reason: "this daemon runs as a toyon process; restart it from its terminal tab" };
   }
   return { ok: true };
 }
+async function replacementRuns() {
+  const r = await run(process.execPath, ["--version"], homedir6());
+  if (r.ok && /^\d+\.\d+\.\d+/.test(r.out))
+    return { ok: true };
+  const why = r.err !== "" ? r.err : `exit ${r.exit}`;
+  return {
+    ok: false,
+    reason: `the bun Toyon runs on did not start (${process.execPath}: ${why}); an install may still be writing it`
+  };
+}
 function respawn(logFile) {
   const logFd = openSync(logFile, "a");
   const child = spawn3(process.execPath, process.argv.slice(1), {
@@ -18508,8 +18757,8 @@ class Restarter {
     d.hub.on("agentStatus", settle);
     d.hub.on("worktreesChanged", settle);
   }
-  request(opts = {}) {
-    const refused = this.d.refusal();
+  async request(opts = {}) {
+    const refused = await this.d.refusal();
     if (refused)
       return refused;
     this.asked = true;
@@ -18626,14 +18875,14 @@ class SelfWatch {
 
 // ../daemon/src/core/state.ts
 import { randomBytes as randomBytes2 } from "crypto";
-import { existsSync as existsSync13, readFileSync as readFileSync10, renameSync as renameSync2, writeFileSync as writeFileSync5 } from "fs";
+import { existsSync as existsSync14, readFileSync as readFileSync10, renameSync as renameSync2, writeFileSync as writeFileSync5 } from "fs";
 var GROUPS_SAVE_MS = 250;
 var SEEN_WORKTREES = 50;
 var empty = { repos: [], worktrees: [], sessions: {} };
 function loadState(paths) {
   ensureDirs(paths);
   const STATE_FILE = paths.stateFile;
-  if (!existsSync13(STATE_FILE))
+  if (!existsSync14(STATE_FILE))
     return structuredClone(empty);
   let raw;
   try {
@@ -18685,7 +18934,7 @@ function saveState(paths, state) {
 function loadOrCreateToken(paths) {
   ensureDirs(paths);
   const TOKEN_FILE = paths.tokenFile;
-  if (existsSync13(TOKEN_FILE))
+  if (existsSync14(TOKEN_FILE))
     return readFileSync10(TOKEN_FILE, "utf8").trim();
   const token = randomBytes2(32).toString("hex");
   writeFileSync5(TOKEN_FILE, token, { mode: 384 });
@@ -18901,7 +19150,7 @@ class StateStore {
 }
 
 // ../daemon/src/design/service.ts
-import { join as join10 } from "path";
+import { join as join11 } from "path";
 
 // ../daemon/src/design/scan.ts
 var COLOR = /^(#|rgba?\(|hsla?\(|oklch\(|oklab\(|lab\(|lch\(|color\(|color-mix\(|light-dark\()/i;
@@ -19351,7 +19600,7 @@ class DesignService {
 async function readAll(root, paths) {
   const out = [];
   for (const path of paths) {
-    const file = Bun.file(join10(root, path));
+    const file = Bun.file(join11(root, path));
     if (file.size === 0 || file.size > MAX_FILE_BYTES)
       continue;
     try {
@@ -19466,14 +19715,14 @@ function typicalUse(classes) {
 var normal = (s) => s.replace(/[-_]/g, "").toLowerCase();
 async function loadProjectTypescript(root) {
   try {
-    return await import(join10(root, "node_modules", "typescript", "lib", "typescript.js"));
+    return await import(join11(root, "node_modules", "typescript", "lib", "typescript.js"));
   } catch {
     return null;
   }
 }
 
 // ../daemon/src/drafts/store.ts
-import { existsSync as existsSync14, readFileSync as readFileSync11, renameSync as renameSync3, writeFileSync as writeFileSync6 } from "fs";
+import { existsSync as existsSync15, readFileSync as readFileSync11, renameSync as renameSync3, writeFileSync as writeFileSync6 } from "fs";
 var SAVE_DELAY_MS = 1000;
 
 class DraftStore {
@@ -19482,7 +19731,7 @@ class DraftStore {
   saveTimer = null;
   constructor(d) {
     this.d = d;
-    if (!existsSync14(d.file))
+    if (!existsSync15(d.file))
       return;
     try {
       const raw = JSON.parse(readFileSync11(d.file, "utf8"));
@@ -19557,7 +19806,6 @@ class DraftStore {
 }
 
 // ../daemon/src/exec/service.ts
-var OUTPUT_CAP = 200000;
 var TIMEOUT_MS = 10 * 60000;
 var DRAIN_GRACE_MS = 500;
 var BACKGROUND_POLL_MS = 250;
@@ -19780,42 +20028,22 @@ class ExecService {
       await Bun.sleep(BACKGROUND_POLL_MS);
   }
 }
-function formatOutput(text, exit, truncated, ceiling) {
-  const body = text.replace(/\n+$/, "");
-  const notes = [];
-  if (truncated)
-    notes.push(`output cut at ${Math.round(OUTPUT_CAP / 1000)} KB`);
-  if (exit === "timeout")
-    notes.push(ceiling ? `gave up after ${describeDuration(ceiling)}` : "gave up at the ceiling");
-  else if (typeof exit === "string")
-    notes.push(`killed (${exit})`);
-  else if (exit !== 0)
-    notes.push(`exit ${exit}`);
-  const parts = [];
-  if (body.trim())
-    parts.push(`\`\`\`
-${body}
-\`\`\``);
-  parts.push(...notes);
-  return parts.join(`
-`);
-}
 
 // ../daemon/src/files/open.ts
 import { stat as stat2 } from "fs/promises";
-import { basename as basename2, resolve as resolve7 } from "path";
+import { basename as basename3, resolve as resolve7 } from "path";
 
 // ../daemon/src/repos/browse.ts
-import { existsSync as existsSync15, statSync as statSync4 } from "fs";
+import { existsSync as existsSync16, statSync as statSync5 } from "fs";
 import { readdir } from "fs/promises";
-import { homedir as homedir5 } from "os";
-import { dirname as dirname4, join as join11 } from "path";
+import { homedir as homedir7 } from "os";
+import { dirname as dirname5, join as join12 } from "path";
 var MAX_ENTRIES = 40;
 function expandTilde(raw) {
-  return raw === "~" || raw.startsWith("~/") ? join11(homedir5(), raw.slice(1)) : raw;
+  return raw === "~" || raw.startsWith("~/") ? join12(homedir7(), raw.slice(1)) : raw;
 }
 function collapseTilde(abs) {
-  const home = homedir5();
+  const home = homedir7();
   return abs === home || abs.startsWith(`${home}/`) ? `~${abs.slice(home.length)}` : abs;
 }
 function holdsNothing(names) {
@@ -19823,7 +20051,7 @@ function holdsNothing(names) {
 }
 async function describeFolder(abs) {
   const path = collapseTilde(abs);
-  if (existsSync15(join11(abs, ".git")))
+  if (existsSync16(join12(abs, ".git")))
     return { path, kind: "project" };
   try {
     return { path, kind: holdsNothing(await readdir(abs)) ? "empty" : "folder" };
@@ -19835,13 +20063,13 @@ var NOWHERE = { exists: false, isDir: false, isRepo: false, parentExists: false
 function describe2(typed, parent) {
   let isDir = false;
   try {
-    isDir = statSync4(typed).isDirectory();
+    isDir = statSync5(typed).isDirectory();
   } catch {}
   return {
-    exists: existsSync15(typed),
+    exists: existsSync16(typed),
     isDir,
-    isRepo: isDir && existsSync15(join11(typed, ".git")),
-    parentExists: existsSync15(parent)
+    isRepo: isDir && existsSync16(join12(typed, ".git")),
+    parentExists: existsSync16(parent)
   };
 }
 async function browsePath(raw) {
@@ -19849,7 +20077,7 @@ async function browsePath(raw) {
   if (!typed.startsWith("/"))
     return { entries: [], target: NOWHERE };
   const listing = typed.endsWith("/");
-  const dir = listing ? typed : dirname4(typed);
+  const dir = listing ? typed : dirname5(typed);
   const prefix = listing ? "" : typed.slice(dir.length).replace(/^\//, "").toLowerCase();
   const target = describe2(listing ? typed.replace(/\/+$/, "") : typed, dir);
   let names;
@@ -19865,8 +20093,8 @@ async function browsePath(raw) {
       continue;
     if (!name.toLowerCase().startsWith(prefix))
       continue;
-    const abs = join11(dir, name);
-    entries.push({ path: collapseTilde(abs), name, isRepo: existsSync15(join11(abs, ".git")) });
+    const abs = join12(dir, name);
+    entries.push({ path: collapseTilde(abs), name, isRepo: existsSync16(join12(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 };
@@ -19977,7 +20205,7 @@ function withRepoLock(repoPath, fn) {
 var fileLockKey = (absPath) => `file:${absPath}`;
 
 // ../daemon/src/git/status.ts
-import { join as join12 } from "path";
+import { join as join13 } from "path";
 async function treeFingerprint(worktreePath) {
   const [head, diff, untracked] = await Promise.all([
     git(worktreePath, "rev-parse", "HEAD"),
@@ -19987,7 +20215,7 @@ async function treeFingerprint(worktreePath) {
   const others = await Promise.all(untracked.out.split(`
 `).filter(Boolean).map(async (p) => {
     try {
-      const f = Bun.file(join12(worktreePath, p));
+      const f = Bun.file(join13(worktreePath, p));
       const body = f.size > 2000000 ? String(f.size) : Bun.hash(await f.arrayBuffer()).toString(36);
       return `${p}:${body}`;
     } catch {
@@ -20038,7 +20266,7 @@ async function numstat(worktreePath, ...range) {
 }
 async function untrackedLines(worktreePath, file) {
   try {
-    const f = Bun.file(join12(worktreePath, file));
+    const f = Bun.file(join13(worktreePath, file));
     if (f.size > 2000000)
       return {};
     const buf = new Uint8Array(await f.arrayBuffer());
@@ -20662,7 +20890,7 @@ class OpenService {
     return hit ? { kind: "file", worktreeId: hit.id, path: path.slice(hit.root.length + 1) } : null;
   }
   async grant(path, size, mtimeMs) {
-    const name = basename2(path);
+    const name = basename3(path);
     if (this.d.refused.some((r) => within2(path, canonical(resolve7(r))))) {
       throw new UserError(`${name} is inside Toyon's own folder, which is not for editing`);
     }
@@ -20867,17 +21095,28 @@ class AfterLand {
       return;
     }
     this.running.add(repoId);
-    const done = this.exec(repo, commands).finally(() => {
-      this.running.delete(repoId);
-      if (this.again.delete(repoId))
-        this.run(repoId);
-    });
+    if (this.d.self.building(true))
+      this.d.hub.emit("selfChanged");
+    const done = this.runs(repo, commands).finally(() => this.running.delete(repoId));
     fireAndForget(repo.id, done, "afterLand");
   }
-  async exec(repo, commands) {
-    await this.d.settled?.();
-    if (this.d.self.building(true))
+  async runs(repo, commands) {
+    let failure;
+    let notice;
+    do {
+      await this.d.settled?.();
+      ({ failure, notice } = await this.exec(repo, commands));
+    } while (this.again.delete(repo.id));
+    const onNotice = this.d.self.reports(repo);
+    if (this.d.self.building(false, failure))
       this.d.hub.emit("selfChanged");
+    if (notice !== undefined && !onNotice) {
+      const main = this.mainOf(repo);
+      if (main)
+        this.d.hub.emit("failed", main.id, notice);
+    }
+  }
+  async exec(repo, commands) {
     let failure;
     let notice;
     for (const command of commands) {
@@ -20897,14 +21136,7 @@ class AfterLand {
       log.warn(repo.id, `afterLand stopped: ${command} exited ${code}`);
       break;
     }
-    const onNotice = this.d.self.reports(repo);
-    if (this.d.self.building(false, failure))
-      this.d.hub.emit("selfChanged");
-    if (notice !== undefined && !onNotice) {
-      const main = this.mainOf(repo);
-      if (main)
-        this.d.hub.emit("failed", main.id, notice);
-    }
+    return { failure, notice };
   }
   tellMain(repo, line, retract) {
     const main = this.mainOf(repo);
@@ -20917,9 +21149,9 @@ class AfterLand {
 }
 
 // ../daemon/src/repos/registry.ts
-import { existsSync as existsSync19, mkdirSync as mkdirSync6, rmSync as rmSync2, writeFileSync as writeFileSync7 } from "fs";
-import { homedir as homedir7 } from "os";
-import { basename as basename4, dirname as dirname6, join as join16 } from "path";
+import { existsSync as existsSync20, mkdirSync as mkdirSync6, rmSync as rmSync2, writeFileSync as writeFileSync7 } from "fs";
+import { homedir as homedir9 } from "os";
+import { basename as basename5, dirname as dirname7, join as join17 } from "path";
 
 // ../daemon/src/git/base.ts
 async function resolveBase(repoPath, defaultBranch, route) {
@@ -20930,8 +21162,8 @@ async function resolveBase(repoPath, defaultBranch, route) {
 }
 
 // ../daemon/src/repos/config.ts
-import { closeSync, existsSync as existsSync16, openSync as openSync2, readdirSync as readdirSync4, readFileSync as readFileSync12, readSync, statSync as statSync5 } from "fs";
-import { join as join13 } from "path";
+import { closeSync, existsSync as existsSync17, openSync as openSync2, readdirSync as readdirSync4, readFileSync as readFileSync12, readSync, statSync as statSync6 } from "fs";
+import { join as join14 } from "path";
 
 // ../../node_modules/.bun/jsonc-parser@3.3.1/node_modules/jsonc-parser/lib/esm/impl/scanner.js
 function createScanner(text, ignoreTrivia = false) {
@@ -22295,7 +22527,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) => existsSync16(join13(repoPath, rel)));
+var present = (repoPath, place) => [place.shared, place.local].filter((rel) => existsSync17(join14(repoPath, rel)));
 var isObject2 = (v) => typeof v === "object" && v !== null && !Array.isArray(v);
 function parseSettings(text) {
   const errors = [];
@@ -22320,7 +22552,7 @@ function readConfigFile(repoPath) {
   for (const rel of files) {
     let raw;
     try {
-      raw = parseSettings(readFileSync12(join13(repoPath, rel), "utf8"));
+      raw = parseSettings(readFileSync12(join14(repoPath, rel), "utf8"));
     } catch (e) {
       return { ok: false, reason: `${rel} is not valid JSON: ${e instanceof Error ? e.message : String(e)}` };
     }
@@ -22379,8 +22611,8 @@ function configTarget(repoPath, made) {
 }
 function configBody(repoPath, rel, config) {
   const place = PLACES.find((p) => p.local === rel);
-  const abs = place && join13(repoPath, place.shared);
-  if (!abs || !existsSync16(abs))
+  const abs = place && join14(repoPath, place.shared);
+  if (!abs || !existsSync17(abs))
     return config;
   let shared;
   try {
@@ -22397,7 +22629,7 @@ function configText(repoPath, rel, config) {
   let text;
   let was;
   try {
-    text = readFileSync12(join13(repoPath, rel), "utf8");
+    text = readFileSync12(join14(repoPath, rel), "utf8");
     was = parseSettings(text);
   } catch {
     return fresh;
@@ -22427,8 +22659,8 @@ function detectConfig(repoPath) {
     return { config: explicit.config, needsSetup: false };
   if (explicit)
     log.warn("config", `${repoPath}: ${explicit.reason}; detecting instead`);
-  const pkgPath = join13(repoPath, "package.json");
-  if (existsSync16(pkgPath)) {
+  const pkgPath = join14(repoPath, "package.json");
+  if (existsSync17(pkgPath)) {
     const pkg = JSON.parse(readFileSync12(pkgPath, "utf8"));
     const scripts = pkg.scripts ?? {};
     const runner = detectRunner(repoPath, pkg.packageManager);
@@ -22450,7 +22682,7 @@ function detectConfig(repoPath) {
       };
     }
   }
-  if (existsSync16(join13(repoPath, "start.sh"))) {
+  if (existsSync17(join14(repoPath, "start.sh"))) {
     return { config: { run: { app: "./start.sh" } }, needsSetup: true, from: "start.sh" };
   }
   const assumed = assumeNothingToRun(repoPath);
@@ -22493,7 +22725,7 @@ function assumeNothingToRun(repoPath) {
   return marker && !servesPage(repoPath) ? marker : undefined;
 }
 function markerIn(repoPath) {
-  const named = NO_PAGE_MARKERS.find((f) => existsSync16(join13(repoPath, f)));
+  const named = NO_PAGE_MARKERS.find((f) => existsSync17(join14(repoPath, f)));
   if (named)
     return named;
   let entries;
@@ -22505,12 +22737,12 @@ function markerIn(repoPath) {
   return entries.find((f) => NO_PAGE_EXTENSIONS.some((ext) => f.endsWith(ext)));
 }
 function servesPage(repoPath) {
-  if (WEB_FILES.some((f) => existsSync16(join13(repoPath, f))))
+  if (WEB_FILES.some((f) => existsSync17(join14(repoPath, f))))
     return true;
-  if (/^web:/m.test(head(join13(repoPath, "Procfile"))))
+  if (/^web:/m.test(head(join14(repoPath, "Procfile"))))
     return true;
   for (const [files, names] of WEB_DEPENDENCIES) {
-    const text = files.map((f) => head(join13(repoPath, f))).join(`
+    const text = files.map((f) => head(join14(repoPath, f))).join(`
 `);
     if (text.trim() && names.some((n) => mentions(text, n)))
       return true;
@@ -22527,7 +22759,7 @@ function frontEndBeside(repoPath) {
   return dirs.some((d) => {
     if (!d.isDirectory() || d.name.startsWith(".") || NOT_A_PACKAGE.has(d.name))
       return false;
-    const pkg = head(join13(repoPath, d.name, "package.json"));
+    const pkg = head(join14(repoPath, d.name, "package.json"));
     if (!pkg)
       return false;
     try {
@@ -22542,7 +22774,7 @@ function mentions(text, name) {
   return new RegExp(`(?<![\\w-])${escaped}(?![\\w-])`, "i").test(text);
 }
 function head(path) {
-  if (!existsSync16(path))
+  if (!existsSync17(path))
     return "";
   try {
     const fd = openSync2(path, "r");
@@ -22583,11 +22815,11 @@ function isLocalDatabase(url) {
 }
 function detectServices(repoPath) {
   const out = {};
-  const compose = COMPOSE_FILES.find((f) => existsSync16(join13(repoPath, f)));
+  const compose = COMPOSE_FILES.find((f) => existsSync17(join14(repoPath, f)));
   if (compose)
     out.compose = compose;
   for (const file of ENV_FILES) {
-    const text = head(join13(repoPath, file));
+    const text = head(join14(repoPath, file));
     if (!text)
       continue;
     for (const name of DB_URL_NAMES) {
@@ -22611,7 +22843,7 @@ function inferPaths(cmd, repoPath, depth = 1) {
       return;
     let dir = false;
     try {
-      dir = statSync5(join13(repoPath, clean)).isDirectory();
+      dir = statSync6(join14(repoPath, clean)).isDirectory();
     } catch {
       return;
     }
@@ -22622,25 +22854,25 @@ function inferPaths(cmd, repoPath, depth = 1) {
     const t = tokens[i];
     if (t === "cd") {
       const dir = tokens[i + 1];
-      if (dir && !dir.startsWith("-") && existsSync16(join13(repoPath, dir)))
+      if (dir && !dir.startsWith("-") && existsSync17(join14(repoPath, dir)))
         add(dir);
       continue;
     }
     if (t.startsWith("-") || t.startsWith("$"))
       continue;
     const mod = /^([A-Za-z_]\w*)(?:\.\w+)*:\w+$/.exec(t);
-    if (mod?.[1] && existsSync16(join13(repoPath, mod[1]))) {
+    if (mod?.[1] && existsSync17(join14(repoPath, mod[1]))) {
       add(mod[1]);
       continue;
     }
     const rel = t.replace(/^\.\//, "");
     if (rel.startsWith("/") || rel.startsWith("..") || rel.includes("="))
       continue;
-    if (!existsSync16(join13(repoPath, rel)))
+    if (!existsSync17(join14(repoPath, rel)))
       continue;
     add(rel);
     if (depth > 0 && rel.endsWith(".sh")) {
-      for (const p of inferPaths(head(join13(repoPath, rel)), repoPath, depth - 1))
+      for (const p of inferPaths(head(join14(repoPath, rel)), repoPath, depth - 1))
         out.add(p);
     }
   }
@@ -22663,9 +22895,9 @@ function procCommand(runner, script, body) {
   return `${base}${runner === "npm" ? " --" : ""} ${flag}`;
 }
 function detectPages(repoPath, scripts, runner) {
-  if (!scripts.build || !existsSync16(join13(repoPath, "functions")))
+  if (!scripts.build || !existsSync17(join14(repoPath, "functions")))
     return null;
-  const cfg = ["wrangler.jsonc", "wrangler.json", "wrangler.toml"].map((f) => join13(repoPath, f)).find((f) => existsSync16(f));
+  const cfg = ["wrangler.jsonc", "wrangler.json", "wrangler.toml"].map((f) => join14(repoPath, f)).find((f) => existsSync17(f));
   if (!cfg)
     return null;
   const out = readFileSync12(cfg, "utf8").match(/pages_build_output_dir"?\s*[:=]\s*"([^"]+)"/)?.[1];
@@ -22674,68 +22906,68 @@ function detectPages(repoPath, scripts, runner) {
   return { web: `${runner} run build && npx wrangler pages dev ${out} --ip 127.0.0.1 --port $PORT` };
 }
 function detectRunner(repoPath, packageManager) {
-  if (existsSync16(join13(repoPath, "bun.lock")) || existsSync16(join13(repoPath, "bun.lockb")))
+  if (existsSync17(join14(repoPath, "bun.lock")) || existsSync17(join14(repoPath, "bun.lockb")))
     return "bun";
-  if (existsSync16(join13(repoPath, "pnpm-lock.yaml")))
+  if (existsSync17(join14(repoPath, "pnpm-lock.yaml")))
     return "pnpm";
-  if (existsSync16(join13(repoPath, "yarn.lock")) || typeof packageManager === "string" && packageManager.startsWith("yarn"))
+  if (existsSync17(join14(repoPath, "yarn.lock")) || typeof packageManager === "string" && packageManager.startsWith("yarn"))
     return "yarn";
   return "npm";
 }
 
 // ../daemon/src/repos/create.ts
-import { existsSync as existsSync17, readdirSync as readdirSync5, realpathSync as realpathSync2, statSync as statSync6 } from "fs";
+import { existsSync as existsSync18, readdirSync as readdirSync5, realpathSync as realpathSync2, statSync as statSync7 } from "fs";
 import { appendFile as appendFile2, mkdir as mkdir2, rm } from "fs/promises";
-import { homedir as homedir6 } from "os";
-import { dirname as dirname5, join as join14, resolve as resolve8 } from "path";
+import { homedir as homedir8 } from "os";
+import { dirname as dirname6, join as join15, resolve as resolve8 } from "path";
 function isInside(dir, parent) {
   const p = parent.replace(/\/+$/, "");
   return dir === p || dir.startsWith(`${p}/`);
 }
-function planProject(opts, home = homedir6()) {
+function planProject(opts, home = homedir8()) {
   const nameError = projectNameError(opts.name);
   if (nameError)
     throw new UserError(nameError);
   const first = firstProjectsFolder(opts.parent, home);
   const parent = first ?? resolveParent(opts.parent);
-  const dir = join14(parent, opts.name.trim());
-  if (existsSync17(dir))
+  const dir = join15(parent, opts.name.trim());
+  if (existsSync18(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 !== join14(home, PROJECTS_FOLDER) || existsSync17(typed) || !existsSync17(home))
+  if (typed !== join15(home, PROJECTS_FOLDER) || existsSync18(typed) || !existsSync18(home))
     return null;
-  return join14(realpathSync2(home), PROJECTS_FOLDER);
+  return join15(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 = join14(resolveParent(opts.parent), name);
-  if (!existsSync17(typed) || !statSync6(typed).isDirectory())
+  const typed = join15(resolveParent(opts.parent), name);
+  if (!existsSync18(typed) || !statSync7(typed).isDirectory())
     throw new UserError(`${typed} is not a folder`);
   const dir = realpathSync2(typed);
-  if (existsSync17(join14(dir, ".git")))
+  if (existsSync18(join15(dir, ".git")))
     throw new UserError(`${dir} is already a project; open it instead`);
   if (!holdsNothing(readdirSync5(dir))) {
     throw new UserError(`${dir} is not empty; only an empty folder can become a project where it is`);
   }
-  return { parent: dirname5(dir), dir, makeParent: false };
+  return { parent: dirname6(dir), dir, makeParent: false };
 }
 function resolveParent(raw) {
   const typed = expandTilde(raw.trim());
   if (!typed.startsWith("/"))
     throw new UserError(`${raw} is not a folder path`);
-  if (!existsSync17(typed))
+  if (!existsSync18(typed))
     throw new UserError(`${raw} does not exist; make it first`);
-  if (!statSync6(typed).isDirectory())
+  if (!statSync7(typed).isDirectory())
     throw new UserError(`${raw} is not a folder`);
   return realpathSync2(typed);
 }
-async function createRepoDir(opts, home = homedir6()) {
+async function createRepoDir(opts, home = homedir8()) {
   const { parent, dir, makeParent } = planProject(opts, home);
   await requireGitIdentity(makeParent ? home : parent);
   if (makeParent)
@@ -22770,7 +23002,7 @@ async function initWithEmptyCommit(dir) {
   if (!exclude.ok)
     throw new UserError(`git rev-parse failed: ${exclude.err}`);
   const excludePath = resolve8(dir, exclude.out);
-  await mkdir2(dirname5(excludePath), { recursive: true });
+  await mkdir2(dirname6(excludePath), { recursive: true });
   await appendFile2(excludePath, `
 ${LOCAL_EXCLUDES.join(`
 `)}
@@ -22809,13 +23041,13 @@ async function undoCreate(dir) {
 }
 async function undoInit(dir) {
   try {
-    await rm(join14(dir, ".git"), { recursive: true, force: true });
+    await rm(join15(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 : join14(dir, ".git");
+  const target = made === "folder" ? dir : join15(dir, ".git");
   try {
     await rm(target, { recursive: true, force: true });
   } catch (e) {
@@ -22830,8 +23062,8 @@ async function hasGitIdentity(cwd) {
   return !!email.out && !!name.out;
 }
 async function setGitIdentity(identity) {
-  await ok(git(homedir6(), "config", "--global", "user.name", identity.name.trim()), "git config");
-  await ok(git(homedir6(), "config", "--global", "user.email", identity.email.trim()), "git config");
+  await ok(git(homedir8(), "config", "--global", "user.name", identity.name.trim()), "git config");
+  await ok(git(homedir8(), "config", "--global", "user.email", identity.email.trim()), "git config");
 }
 async function requireGitIdentity(cwd) {
   if (!await hasGitIdentity(cwd)) {
@@ -22845,8 +23077,8 @@ async function ok(p, what) {
 }
 
 // ../daemon/src/repos/watcher.ts
-import { existsSync as existsSync18, watch } from "fs";
-import { basename as basename3, join as join15 } from "path";
+import { existsSync as existsSync19, watch } from "fs";
+import { basename as basename4, join as join16 } from "path";
 function watchDefaultBranch(repoPath, branch, onMove) {
   const last = { local: null, upstream: null };
   const read = async () => {
@@ -22899,29 +23131,29 @@ function watchDefaultBranch(repoPath, branch, onMove) {
     ]);
     if (stopped)
       return;
-    const gitDir = common.ok && common.out ? common.out : join15(repoPath, ".git");
+    const gitDir = common.ok && common.out ? common.out : join16(repoPath, ".git");
     tryWatch(gitDir);
-    tryWatch(join15(gitDir, "refs", "heads"));
+    tryWatch(join16(gitDir, "refs", "heads"));
     if (!remote.ok || !remote.out)
       return;
-    const remotes = join15(gitDir, "refs", "remotes");
-    const mine = join15(remotes, remote.out);
+    const remotes = join16(gitDir, "refs", "remotes");
+    const mine = join16(remotes, remote.out);
     let inner = null;
     let mid = null;
     const armInner = () => {
       inner?.close();
-      inner = existsSync18(mine) ? tryWatch(mine) : null;
+      inner = existsSync19(mine) ? tryWatch(mine) : null;
     };
     const armMid = () => {
       mid?.close();
-      mid = existsSync18(remotes) ? tryWatch(remotes, (_event, filename) => {
+      mid = existsSync19(remotes) ? tryWatch(remotes, (_event, filename) => {
         if (!filename || filename === remote.out)
           armInner();
         schedule();
       }) : null;
       armInner();
     };
-    tryWatch(join15(gitDir, "refs"), (_event, filename) => {
+    tryWatch(join16(gitDir, "refs"), (_event, filename) => {
       if (!filename || filename === "remotes")
         armMid();
       schedule();
@@ -22950,7 +23182,7 @@ function watchWorktreeDir(repoPath, onChange) {
     }, 300);
   };
   const arm = (commonDir) => {
-    const dir = join15(commonDir, "worktrees");
+    const dir = join16(commonDir, "worktrees");
     const armInner = () => {
       inner?.close();
       inner = null;
@@ -22992,8 +23224,8 @@ 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) => basename3(rel)));
-  const dir = join15(repoPath, CONFIG_DIR);
+  const inDir = new Set([CONFIG_FILES.folder.shared, CONFIG_FILES.folder.local].map((rel) => basename4(rel)));
+  const dir = join16(repoPath, CONFIG_DIR);
   let timer = null;
   let outer = null;
   let inner = null;
@@ -23008,7 +23240,7 @@ function watchConfigFile(repoPath, onChange) {
   const armInner = () => {
     inner?.close();
     inner = null;
-    if (!existsSync18(dir))
+    if (!existsSync19(dir))
       return;
     try {
       inner = watch(dir, (_event, filename) => {
@@ -23062,7 +23294,7 @@ class RepoRegistry {
   }
   async boot() {
     const { state } = this.d;
-    const gone = state.worktrees.filter((wt) => !existsSync19(wt.path) || !state.repos.some((r) => r.id === wt.repoId));
+    const gone = state.worktrees.filter((wt) => !existsSync20(wt.path) || !state.repos.some((r) => r.id === wt.repoId));
     for (const wt of gone)
       await this.d.worktrees.forgetGone(wt);
     for (const repo of state.repos) {
@@ -23107,7 +23339,7 @@ class RepoRegistry {
     }
   }
   gitIdentity() {
-    this.identity ??= hasGitIdentity(homedir7());
+    this.identity ??= hasGitIdentity(homedir9());
     return this.identity;
   }
   async unmake(repoId) {
@@ -23130,7 +23362,7 @@ class RepoRegistry {
       return `${repo.name} is set up now`;
     if (main.promptedAt || main.lastTurn)
       return `${repo.name} has a chat now`;
-    if (existsSync19(join16(repo.path, ".claude")))
+    if (existsSync20(join17(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`;
@@ -23207,7 +23439,7 @@ class RepoRegistry {
   }
   async register(rawPath, made) {
     const path = expandTilde(rawPath);
-    if (!existsSync19(path))
+    if (!existsSync20(path))
       throw new UserError(`${path} does not exist`);
     if (!await isGitRepo(path))
       throw new UserError(`${path} is not a git repository`);
@@ -23221,7 +23453,7 @@ class RepoRegistry {
     const repo = {
       id: shortId(),
       path: root,
-      name: basename4(root),
+      name: basename5(root),
       defaultBranch: await defaultBranch(root),
       config: detected.config,
       configFile: configTarget(root, !!made),
@@ -23281,10 +23513,10 @@ class RepoRegistry {
       throw new UserError(current.reason);
     const was = configTarget(repo.path, !!repo.made);
     const rel = configSibling(was, kind);
-    const moved = rel !== was && existsSync19(join16(repo.path, was));
+    const moved = rel !== was && existsSync20(join17(repo.path, was));
     if (moved && !(kind === "local" && await isTracked(repo.path, was))) {
       try {
-        rmSync2(join16(repo.path, was));
+        rmSync2(join17(repo.path, was));
       } catch (e) {
         log.warn(repoId, `could not remove ${was}`, e);
       }
@@ -23293,9 +23525,9 @@ class RepoRegistry {
     }
     if (isLocalConfigFile(rel))
       await excludeFromGit(repo.path, rel);
-    const file = join16(repo.path, rel);
+    const file = join17(repo.path, rel);
     try {
-      mkdirSync6(dirname6(file), { recursive: true });
+      mkdirSync6(dirname7(file), { recursive: true });
       writeFileSync7(file, configText(repo.path, rel, config));
     } catch (e) {
       log.warn(repoId, `could not write ${rel}`, e);
@@ -23397,7 +23629,7 @@ class RepoRegistry {
   }
   placeConfig(repo) {
     const rel = configTarget(repo.path, !!repo.made);
-    if (isLocalConfigFile(rel) && existsSync19(join16(repo.path, rel))) {
+    if (isLocalConfigFile(rel) && existsSync20(join17(repo.path, rel))) {
       fireAndForget(repo.id, excludeFromGit(repo.path, rel), "exclude local settings");
     }
     if (repo.configFile === rel)
@@ -23489,7 +23721,7 @@ class RepoRegistry {
 }
 
 // ../daemon/src/routes/service.ts
-import { join as join17 } from "path";
+import { join as join18 } from "path";
 
 // ../daemon/src/routes/fileRouters.ts
 var SKIP = /(^|\/)(node_modules|dist|build|out|coverage|\.next|\.nuxt|\.output|\.svelte-kit|\.vercel|\.netlify)\//;
@@ -24689,7 +24921,7 @@ class RouteService {
     return mergeRoutes(fileRoutes(paths, roots), code);
   }
   async cachedRead(root, path, had, kept, decode) {
-    const abs = join17(root, path);
+    const abs = join18(root, path);
     const stat = await this.fs.stat(abs);
     if (!stat)
       return null;
@@ -24714,7 +24946,7 @@ class RouteService {
     }
   }
   async hash(root, file) {
-    const abs = join17(root, file);
+    const abs = join18(root, file);
     const stat = await this.fs.stat(abs);
     if (!stat)
       return null;
@@ -24976,7 +25208,7 @@ function isAlive(pid) {
 }
 
 // ../daemon/src/runtime/bridge-script.ts
-import { existsSync as existsSync20, readFileSync as readFileSync13, statSync as statSync7 } from "fs";
+import { existsSync as existsSync21, readFileSync as readFileSync13, statSync as statSync8 } from "fs";
 var LEARNED_MAX = 8;
 
 class BridgeScript {
@@ -25006,9 +25238,9 @@ class BridgeScript {
     this.cache = null;
   }
   get() {
-    if (!existsSync20(this.path))
+    if (!existsSync21(this.path))
       return "// toyon bridge not built";
-    const s = statSync7(this.path);
+    const s = statSync8(this.path);
     const stamp = `${s.mtimeMs}:${s.size}`;
     if (this.cache && stamp === this.stamp)
       return this.cache;
@@ -25033,7 +25265,7 @@ function servedLocally(origin) {
 }
 
 // ../daemon/src/server/ws.ts
-import { homedir as homedir9 } from "os";
+import { homedir as homedir11 } from "os";
 
 // ../daemon/src/core/pair.ts
 import { randomBytes as randomBytes3 } from "crypto";
@@ -25056,47 +25288,47 @@ class PairCodes {
 }
 
 // ../daemon/src/agent/config.ts
-import { existsSync as existsSync21, readFileSync as readFileSync14 } from "fs";
-import { homedir as homedir8 } from "os";
-import { join as join18 } from "path";
-function agentConfigFiles(spec, repoPath, home = homedir8()) {
+import { existsSync as existsSync22, readFileSync as readFileSync14 } from "fs";
+import { homedir as homedir10 } from "os";
+import { join as join19 } from "path";
+function agentConfigFiles(spec, repoPath, home = homedir10()) {
   const file = (id, label, path) => ({
     id,
     label,
     path,
-    exists: existsSync21(path)
+    exists: existsSync22(path)
   });
   if (spec.id === "claude") {
     return [
-      file("user-config", "user config (MCP servers, projects)", join18(home, ".claude.json")),
-      file("user-settings", "user settings (permissions, hooks)", join18(home, ".claude", "settings.json")),
-      ...repoPath ? [file("project-mcp", "project MCP servers", join18(repoPath, ".mcp.json"))] : [],
-      ...repoPath ? [file("project-settings", "project settings", join18(repoPath, ".claude", "settings.json"))] : []
+      file("user-config", "user config (MCP servers, projects)", join19(home, ".claude.json")),
+      file("user-settings", "user settings (permissions, hooks)", join19(home, ".claude", "settings.json")),
+      ...repoPath ? [file("project-mcp", "project MCP servers", join19(repoPath, ".mcp.json"))] : [],
+      ...repoPath ? [file("project-settings", "project settings", join19(repoPath, ".claude", "settings.json"))] : []
     ];
   }
   if (spec.id === "codex")
-    return [file("user-config", "config", join18(home, ".codex", "config.toml"))];
+    return [file("user-config", "config", join19(home, ".codex", "config.toml"))];
   return [];
 }
-function describeAgentConfig(spec, repoPath, home = homedir8()) {
+function describeAgentConfig(spec, repoPath, home = homedir10()) {
   const files = agentConfigFiles(spec, repoPath, home);
   const servers = [];
   if (spec.id === "claude") {
-    const user = readJson(join18(home, ".claude.json"));
+    const user = readJson(join19(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(join18(repoPath, ".mcp.json"))?.mcpServers, "project"));
+      servers.push(...serversOf(readJson(join19(repoPath, ".mcp.json"))?.mcpServers, "project"));
     }
   } else if (spec.id === "codex") {
-    servers.push(...codexServers(join18(home, ".codex", "config.toml")));
+    servers.push(...codexServers(join19(home, ".codex", "config.toml")));
   }
   return { agent: spec.id, files, servers };
 }
 function readJson(path) {
-  if (!existsSync21(path))
+  if (!existsSync22(path))
     return null;
   try {
     const v = JSON.parse(readFileSync14(path, "utf8"));
@@ -25117,7 +25349,7 @@ function serversOf(raw, scope) {
   });
 }
 function codexServers(path) {
-  if (!existsSync21(path))
+  if (!existsSync22(path))
     return [];
   const out = [];
   let current = null;
@@ -25883,8 +26115,8 @@ var handlers = {
     s.afterLand.run(msg.repoId);
     ctx.reply({ t: "self", self: s.self.get() });
   },
-  "restart-daemon"(_msg, _ctx, s) {
-    const refused = s.restarter.request();
+  async "restart-daemon"(_msg, _ctx, s) {
+    const refused = await s.restarter.request();
     if (refused)
       throw new UserError(refused);
   },
@@ -25945,10 +26177,14 @@ var handlers = {
   reveal(msg, _ctx, s) {
     s.files.reveal(msg.worktreeId, msg.path);
   },
-  async "discard-file"(msg, _ctx, s) {
-    await s.files.discard(msg.worktreeId, msg.path);
-    s.hub.emit("filesChanged", msg.worktreeId);
-    s.landing.recheck(msg.worktreeId);
+  async "discard-files"(msg, _ctx, s) {
+    try {
+      for (const path of msg.paths)
+        await s.files.discard(msg.worktreeId, path);
+    } finally {
+      s.hub.emit("filesChanged", msg.worktreeId);
+      s.landing.recheck(msg.worktreeId);
+    }
   },
   async judge(msg, _ctx, s) {
     await s.landing.judge(msg.worktreeId, msg.note);
@@ -26168,8 +26404,8 @@ async function dispatch(msg, ctx, s) {
 }
 
 // ../daemon/src/server/http.ts
-import { existsSync as existsSync22 } from "fs";
-import { join as join19 } from "path";
+import { existsSync as existsSync23 } from "fs";
+import { join as join20 } from "path";
 var IMMUTABLE = "private, max-age=31536000, immutable";
 var NO_STORE = "no-store";
 function createFetch(opts) {
@@ -26245,7 +26481,7 @@ function createFetch(opts) {
         return new Response("unauthorized", { status: 401 });
       if (req.method === "GET")
         return Response.json(opts.restartWait(), { headers: { "cache-control": NO_STORE } });
-      const refused = opts.restart(url.searchParams.has(RESTART_NOW));
+      const refused = await opts.restart(url.searchParams.has(RESTART_NOW));
       return refused ? new Response(refused, { status: 409 }) : new Response(null, { status: 202 });
     }
     if (url.pathname === "/pair" && req.method === "POST") {
@@ -26312,7 +26548,7 @@ function createFetch(opts) {
       const places = worktreeId && file && !extra ? [opts.attachments.fileFor(worktreeId, file), opts.archivedAttachment(worktreeId, file)] : [];
       if (worktreeId && file)
         await opts.attachments.whenWritten(worktreeId, file);
-      const path = places.find((p) => !!p && existsSync22(p));
+      const path = places.find((p) => !!p && existsSync23(p));
       if (!path)
         return new Response("not found", { status: 404 });
       return new Response(Bun.file(path), { headers: { "cache-control": IMMUTABLE } });
@@ -26343,15 +26579,15 @@ function createFetch(opts) {
       });
     }
     const rel = url.pathname === "/" ? "/index.html" : url.pathname;
-    const file = join19(opts.shellDist, rel.replaceAll("..", ""));
+    const file = join20(opts.shellDist, rel.replaceAll("..", ""));
     const hashed = rel.startsWith("/assets/");
-    if (existsSync22(file) && Bun.file(file).size > 0) {
+    if (existsSync23(file) && Bun.file(file).size > 0) {
       return new Response(Bun.file(file), { headers: { "cache-control": hashed ? IMMUTABLE : NO_STORE } });
     }
     if (hashed)
       return new Response("not found", { status: 404 });
-    const index = join19(opts.shellDist, "index.html");
-    if (existsSync22(index))
+    const index = join20(opts.shellDist, "index.html");
+    if (existsSync23(index))
       return new Response(Bun.file(index), { headers: { "cache-control": NO_STORE } });
     return new Response("Toyon daemon running; shell not built (run: bun run build)", { status: 200 });
   };
@@ -26592,6 +26828,7 @@ function startServer(opts) {
       t: "hello",
       version,
       install: s.update.install(),
+      registry: await s.update.registry(),
       protocol: PROTOCOL_VERSION,
       repos: s.state.repos,
       rows: await s.worktrees.rows({ quick: true }),
@@ -26601,7 +26838,7 @@ function startServer(opts) {
       agents: agentInfos(),
       defaultAgent: s.agents.defaultId(s.state.defaultAgent),
       agentChosen: s.state.defaultAgent !== undefined,
-      home: homedir9(),
+      home: homedir11(),
       folderDialog: process.platform === "darwin" && !cloud.enabled,
       remote: opts.remote && { host: opts.remote.host, previews: opts.remote.previews },
       paired: s.state.paired,
@@ -26752,16 +26989,16 @@ function startServer(opts) {
 }
 
 // ../daemon/src/themes/store.ts
-import { existsSync as existsSync23, readdirSync as readdirSync6, readFileSync as readFileSync15, statSync as statSync8, writeFileSync as writeFileSync8 } from "fs";
-import { homedir as homedir10 } from "os";
-import { basename as basename5, dirname as dirname7, join as join20, resolve as resolve9 } from "path";
-var home = homedir10();
+import { existsSync as existsSync24, readdirSync as readdirSync6, readFileSync as readFileSync15, statSync as statSync9, writeFileSync as writeFileSync8 } from "fs";
+import { homedir as homedir12 } from "os";
+import { basename as basename6, dirname as dirname8, join as join21, resolve as resolve9 } from "path";
+var home = homedir12();
 var defaultExtensionDirs = [
-  join20(home, ".vscode", "extensions"),
-  join20(home, ".vscode-insiders", "extensions"),
-  join20(home, ".vscode-oss", "extensions"),
-  join20(home, ".cursor", "extensions"),
-  join20(home, ".windsurf", "extensions"),
+  join21(home, ".vscode", "extensions"),
+  join21(home, ".vscode-insiders", "extensions"),
+  join21(home, ".vscode-oss", "extensions"),
+  join21(home, ".cursor", "extensions"),
+  join21(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",
@@ -26839,13 +27076,13 @@ class ThemeStore {
     if (json && typeof json === "object" && typeof json.include === "string") {
       throw new ThemeImportError("this theme file uses `include`; drop the whole extension folder's theme into ~/.toyon/themes or install it in VS Code and rescan");
     }
-    const base = slug(basename5(name).replace(/\.(json|jsonc)$/i, ""));
+    const base = slug(basename6(name).replace(/\.(json|jsonc)$/i, ""));
     const theme = vscodeToTheme(json, {
       id: `file:${base}`,
       name: json?.name ?? base,
       source: "file"
     });
-    writeFileSync8(join20(this.themesDir, `${base}.json`), `${JSON.stringify(theme, null, 2)}
+    writeFileSync8(join21(this.themesDir, `${base}.json`), `${JSON.stringify(theme, null, 2)}
 `);
     this.load();
     return theme;
@@ -26860,7 +27097,7 @@ function readVscodeTheme(file, depth = 0) {
     throw new ThemeImportError(`${file}: not a JSON object`);
   const t = json;
   if (typeof t.include === "string" && depth < 5) {
-    const parent = readVscodeTheme(resolve9(dirname7(file), t.include), depth + 1);
+    const parent = readVscodeTheme(resolve9(dirname8(file), t.include), depth + 1);
     return {
       ...parent,
       ...t,
@@ -26874,13 +27111,13 @@ function readVscodeTheme(file, depth = 0) {
   return t;
 }
 function loadDir(dir) {
-  if (!existsSync23(dir))
+  if (!existsSync24(dir))
     return [];
   const out = [];
   for (const f of readdirSync6(dir)) {
     if (!/\.jsonc?$/i.test(f))
       continue;
-    const file = join20(dir, f);
+    const file = join21(dir, f);
     const id = `file:${slug(f.replace(/\.(json|jsonc)$/i, ""))}`;
     try {
       const json = readJsonc(file);
@@ -26896,7 +27133,7 @@ function loadDir(dir) {
   return out;
 }
 function discover(dir) {
-  if (!existsSync23(dir))
+  if (!existsSync24(dir))
     return [];
   const out = [];
   let entries;
@@ -26906,10 +27143,10 @@ function discover(dir) {
     return out;
   }
   for (const name of entries) {
-    const extDir = join20(dir, name);
-    const pkgFile = join20(extDir, "package.json");
+    const extDir = join21(dir, name);
+    const pkgFile = join21(extDir, "package.json");
     try {
-      if (!statSync8(extDir).isDirectory() || !existsSync23(pkgFile))
+      if (!statSync9(extDir).isDirectory() || !existsSync24(pkgFile))
         continue;
       const pkg = JSON.parse(readFileSync15(pkgFile, "utf8"));
       const themes = pkg.contributes?.themes;
@@ -26917,8 +27154,8 @@ function discover(dir) {
         continue;
       const ext = `${pkg.publisher ?? "local"}.${pkg.name ?? name}`;
       let nls = {};
-      const nlsFile = join20(extDir, "package.nls.json");
-      if (existsSync23(nlsFile)) {
+      const nlsFile = join21(extDir, "package.nls.json");
+      if (existsSync24(nlsFile)) {
         try {
           nls = JSON.parse(readFileSync15(nlsFile, "utf8"));
         } catch {}
@@ -26945,11 +27182,10 @@ function discover(dir) {
 }
 
 // ../daemon/src/update/infra.ts
-import { homedir as homedir11 } from "os";
+import { homedir as homedir13 } from "os";
 async function latestVersion() {
-  const config = await run("npm", ["config", "get", "registry"], homedir11());
-  const registry = config.ok && config.out !== "" ? config.out : "the npm registry";
-  const r = await run("npm", ["view", "toyon", "version", "--json"], homedir11());
+  const registry = await npmRegistry();
+  const r = await run("npm", ["view", "toyon", "version", "--json"], homedir13());
   if (!r.ok)
     return { version: null, registry };
   try {
@@ -26959,12 +27195,16 @@ async function latestVersion() {
     return { version: null, registry };
   }
 }
+async function npmRegistry() {
+  const config = await run("npm", ["config", "get", "registry"], homedir13());
+  return config.ok && config.out !== "" ? config.out : "the npm registry";
+}
 var LOG_POINTER = /complete log of this run/i;
 async function runInstall(command) {
   const [cmd, ...args] = command;
   if (!cmd)
     return { ok: false, line: "nothing to run" };
-  const r = await runLive(cmd, args, homedir11());
+  const r = await runLive(cmd, args, homedir13());
   const lines = `${r.out}
 ${r.err}`.split(`
 `).map((l) => l.trim()).filter((l) => l !== "" && !LOG_POINTER.test(l));
@@ -26987,12 +27227,16 @@ var CHECK_EVERY_MS = 6 * 60 * 60000;
 var FIRST_CHECK_MS = 2 * 60000;
 var SETTLED_MS = 2 * 60000;
 var RETRY_AFTER_MS = 24 * 60 * 60000;
+var INSTALL_SETTLE_MS = 60000;
 
 class UpdateService {
   d;
   installed = null;
   latest = null;
   unreachable = null;
+  registryName = null;
+  seen = null;
+  seenAt = 0;
   installing = false;
   failed = null;
   wanted = false;
@@ -27026,17 +27270,33 @@ class UpdateService {
     await this.refresh();
     await this.auto();
   }
-  async refresh() {
+  async refresh(settled = false) {
     const v = await this.d.installed();
     if (v === null)
       return;
+    if (!settled && v !== this.d.running) {
+      if (v !== this.seen) {
+        this.seen = v;
+        this.seenAt = this.now();
+        return;
+      }
+      if (this.now() - this.seenAt < INSTALL_SETTLE_MS)
+        return;
+    }
     this.installed = v === this.d.running ? null : v;
     this.announce();
   }
+  async registry() {
+    if (this.d.method === "none" || this.d.managedBy)
+      return null;
+    this.registryName ??= await this.d.registry();
+    return this.registryName;
+  }
   async check() {
     if (this.d.method === "none" || this.d.managedBy)
       return;
     const answer = await this.d.latest();
+    this.registryName = answer.registry;
     if (answer.version === null) {
       this.unreachable = answer.registry;
       return;
@@ -27066,8 +27326,9 @@ class UpdateService {
     await this.check();
     if (this.unreachable)
       throw new UserError(`Could not reach ${this.unreachable}`);
-    if (this.target() === null)
-      throw new UserError(`Toyon ${this.d.running} is the newest version`);
+    if (this.target() === null) {
+      throw new UserError(`Toyon ${this.d.running} is the newest version ${registryHost(this.registryName)} lists`);
+    }
   }
   install() {
     return this.d.method;
@@ -27088,7 +27349,12 @@ class UpdateService {
     };
   }
   status() {
-    return { managedBy: this.d.managedBy, unreachable: this.unreachable, latest: this.latest };
+    return {
+      managedBy: this.d.managedBy,
+      registry: this.d.method === "none" || this.d.managedBy ? null : this.registryName,
+      unreachable: this.unreachable,
+      latest: this.latest
+    };
   }
   refuseManaged() {
     if (this.d.managedBy === "policy")
@@ -27149,10 +27415,10 @@ class UpdateService {
         this.announce();
         return;
       }
-      await this.refresh();
+      await this.refresh(true);
     }
     this.wanted = false;
-    const refused = this.d.restarter.request();
+    const refused = await this.d.restarter.request();
     if (refused) {
       this.failed = { version: target ?? this.d.running, line: refused, command: "toyon restart" };
       log.warn("update", `restart refused: ${refused}`);
@@ -27296,16 +27562,16 @@ class BackendShare {
 
 // ../daemon/src/worktrees/cache.ts
 import { createHash as createHash3 } from "crypto";
-import { existsSync as existsSync24, readFileSync as readFileSync16 } from "fs";
+import { existsSync as existsSync25, readFileSync as readFileSync16 } from "fs";
 import { mkdir as mkdir4, readdir as readdir2, rename, rm as rm3, stat as stat3, utimes, writeFile as writeFile2 } from "fs/promises";
-import { join as join21 } from "path";
+import { join as join22 } from "path";
 
 // ../daemon/src/core/clone.ts
 import { mkdir as mkdir3, rm as rm2 } from "fs/promises";
-import { dirname as dirname8 } from "path";
+import { dirname as dirname9 } from "path";
 async function cloneTree(src, dst) {
   const started = Date.now();
-  await mkdir3(dirname8(dst), { recursive: true });
+  await mkdir3(dirname9(dst), { recursive: true });
   const attempts = [
     ["clonefile", ["-Rc", src, dst]],
     ["reflink", ["-R", "--reflink=auto", src, dst]],
@@ -27313,7 +27579,7 @@ async function cloneTree(src, dst) {
   ];
   let error = "";
   for (const [how, args] of attempts) {
-    const r = await run("cp", args, dirname8(dst));
+    const r = await run("cp", args, dirname9(dst));
     if (r.ok)
       return { ok: true, how, ms: Date.now() - started };
     error = r.err.split(`
@@ -27329,7 +27595,7 @@ var STALE_MS = 30 * 24 * 3600000;
 var TMP = ".tmp-";
 var MANIFEST = "manifest.json";
 function defaultTools(dir) {
-  const has = (...files) => files.some((f) => existsSync24(join21(dir, f)));
+  const has = (...files) => files.some((f) => existsSync25(join22(dir, f)));
   const out = [];
   if (has("bun.lock", "bun.lockb"))
     out.push("bun --version");
@@ -27342,7 +27608,7 @@ function defaultTools(dir) {
   return out;
 }
 function withSidecars(root, rel) {
-  return [rel, ...SIDECARS.map((s) => rel + s)].filter((n) => existsSync24(join21(root, n)));
+  return [rel, ...SIDECARS.map((s) => rel + s)].filter((n) => existsSync25(join22(root, n)));
 }
 var entryName = (base, at) => `${base.slice(0, 12)}-${at.toString(36)}`;
 async function listEntries(familyDir) {
@@ -27357,8 +27623,8 @@ async function listEntries(familyDir) {
     const m = /^([0-9a-f]{12})-([0-9a-z]+)$/.exec(name);
     if (!m?.[1] || !m[2])
       continue;
-    const dir = join21(familyDir, name);
-    if (!existsSync24(join21(dir, MANIFEST)))
+    const dir = join22(familyDir, name);
+    if (!existsSync25(join22(dir, MANIFEST)))
       continue;
     out.push({ dir, base: m[1], at: Number.parseInt(m[2], 36) });
   }
@@ -27388,7 +27654,7 @@ class ArtifactCache {
     try {
       const family = await this.family(wt, repo, policy);
       const base = await this.baseCommit(wt, repo);
-      const entries = await listEntries(join21(this.d.paths.cacheDir, repo.id, family.key));
+      const entries = await listEntries(join22(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}`);
@@ -27396,14 +27662,14 @@ class ArtifactCache {
       }
       const restored = [];
       for (const rel of policy.paths) {
-        if (existsSync24(join21(wt.path, rel)))
+        if (existsSync25(join22(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)(join21(entry.dir, name), join21(wt.path, name));
+          const r = await (this.d.clone ?? cloneTree)(join22(entry.dir, name), join22(wt.path, name));
           if (r.ok)
             continue;
           say(`cache: could not restore ${name}: ${r.error}`);
@@ -27437,12 +27703,12 @@ class ArtifactCache {
     let tmp;
     let slot;
     try {
-      const present = policy.paths.filter((rel) => existsSync24(join21(wt.path, rel)));
+      const present = policy.paths.filter((rel) => existsSync25(join22(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 = join21(this.d.paths.cacheDir, repo.id, family.key);
+      const familyDir = join22(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)) {
@@ -27453,21 +27719,21 @@ class ArtifactCache {
       this.making.add(key);
       const at = Date.now();
       const name = entryName(base, at);
-      tmp = join21(familyDir, `${TMP}${name}`);
+      tmp = join22(familyDir, `${TMP}${name}`);
       await mkdir4(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)(join21(wt.path, n), join21(tmp, n));
+          const r = await (this.d.clone ?? cloneTree)(join22(wt.path, n), join22(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 writeFile2(join21(tmp, MANIFEST), `${JSON.stringify(manifest, null, 2)}
+      await writeFile2(join22(tmp, MANIFEST), `${JSON.stringify(manifest, null, 2)}
 `);
-      await rename(tmp, join21(familyDir, name));
+      await rename(tmp, join22(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);
@@ -27495,7 +27761,7 @@ class ArtifactCache {
       return;
     }
     for (const repoId of repoIds) {
-      const repoDir = join21(root, repoId);
+      const repoDir = join22(root, repoId);
       if (!this.d.state.repo(repoId)) {
         await rm3(repoDir, { recursive: true, force: true });
         continue;
@@ -27507,7 +27773,7 @@ class ArtifactCache {
         continue;
       }
       for (const family of families) {
-        const familyDir = join21(repoDir, family);
+        const familyDir = join22(repoDir, family);
         let names;
         try {
           names = await readdir2(familyDir);
@@ -27516,7 +27782,7 @@ class ArtifactCache {
         }
         for (const n of names)
           if (n.startsWith(TMP))
-            await rm3(join21(familyDir, n), { recursive: true, force: true });
+            await rm3(join22(familyDir, n), { recursive: true, force: true });
         const entries = await listEntries(familyDir);
         let newest = 0;
         for (const e of entries) {
@@ -27536,7 +27802,7 @@ class ArtifactCache {
     for (const f of policy.key) {
       h.update(`\x00${f}\x00`);
       try {
-        h.update(readFileSync16(join21(wt.path, f)));
+        h.update(readFileSync16(join22(wt.path, f)));
       } catch {
         h.update("(absent)");
       }
@@ -27602,11 +27868,9 @@ function saidRows(entries) {
   }
   return out;
 }
-function needleWords(query) {
-  const needle = flat(query).toLowerCase();
-  if (needle.length < MIN_QUERY)
-    return [];
-  return [...new Set(needle.split(" "))];
+function needleTerms(query) {
+  const terms = queryTerms(query);
+  return terms.join(" ").length < MIN_QUERY ? [] : terms;
 }
 function snippet(text, ranges) {
   const first = Math.min(...ranges.map(([at]) => at));
@@ -27622,13 +27886,13 @@ function snippet(text, ranges) {
   }
   return { text: `${head}${text.slice(start, end)}${tail}`, match };
 }
-function searchRows(rows, words, chat, limit = CHAT_HITS_PER_WORKTREE) {
+function searchRows(rows, terms, chat, limit = CHAT_HITS_PER_WORKTREE) {
   const hits = [];
-  if (words.length === 0)
+  if (terms.length === 0)
     return { hits, more: false };
   for (let i = rows.length - 1;i >= 0; i--) {
     const row = rows[i];
-    const ranges = wordRanges(row.lower, words);
+    const ranges = termRanges(row.lower, terms);
     if (!ranges)
       continue;
     if (hits.length === limit)
@@ -27637,13 +27901,13 @@ function searchRows(rows, words, chat, limit = CHAT_HITS_PER_WORKTREE) {
   }
   return { hits, more: false };
 }
-function wordRanges(lower, words) {
+function termRanges(lower, terms) {
   const ranges = [];
-  for (const word of words) {
-    const at = lower.indexOf(word);
+  for (const term of terms) {
+    const at = lower.indexOf(term);
     if (at < 0)
       return null;
-    ranges.push([at, word.length]);
+    ranges.push([at, term.length]);
   }
   return ranges;
 }
@@ -27656,8 +27920,8 @@ class ChatSearch {
   }
   async search(repoId, query) {
     this.d.state.requireRepo(repoId);
-    const words = needleWords(query);
-    if (words.length === 0)
+    const terms = needleTerms(query);
+    if (terms.length === 0)
       return { hits: [], truncated: false };
     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) })),
@@ -27666,7 +27930,7 @@ 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, words, { worktreeId: c.id, archived: c.archived });
+      return searchRows(rows, terms, { worktreeId: c.id, archived: c.archived });
     }));
     for (const key of this.said.keys())
       if (!read.has(key))
@@ -27946,7 +28210,7 @@ async function recentSubjects(path, defaultBr) {
 }
 
 // ../daemon/src/worktrees/prs.ts
-var POLL_MS2 = 3 * 60000;
+var POLL_MS3 = 3 * 60000;
 
 class PrService {
   d;
@@ -27955,7 +28219,7 @@ class PrService {
   constructor(d) {
     this.d = d;
     d.hub.on("repoTick", (repoId) => this.refreshRepo(repoId));
-    this.timer = setInterval(() => this.refreshAll(), d.everyMs ?? POLL_MS2);
+    this.timer = setInterval(() => this.refreshAll(), d.everyMs ?? POLL_MS3);
     this.timer.unref?.();
   }
   stop() {
@@ -28057,7 +28321,7 @@ async function mergedBranches(repoPath, defaultBr) {
 
 // ../daemon/src/worktrees/discover.ts
 import { createHash as createHash4 } from "crypto";
-import { basename as basename6 } from "path";
+import { basename as basename7 } from "path";
 
 // ../daemon/src/git/worktrees.ts
 function parseWorktreeList(out) {
@@ -28146,7 +28410,7 @@ function subtractKnown(repoId, listed, known) {
     rows.push({
       id: discoveredId(g.path),
       repoId,
-      name: g.branch ?? basename6(g.path),
+      name: g.branch ?? basename7(g.path),
       path: g.path,
       ...g.branch ? { branch: g.branch } : {},
       ...g.locked ? { locked: true } : {},
@@ -28308,9 +28572,9 @@ function rankRefs({ refs, merged, prs, query, defaultBranch, rowIdForPath }) {
 }
 
 // ../daemon/src/worktrees/service.ts
-import { cpSync, existsSync as existsSync27, readFileSync as readFileSync18, rmSync as rmSync5 } from "fs";
+import { cpSync, existsSync as existsSync28, readFileSync as readFileSync18, rmSync as rmSync5 } from "fs";
 import { rm as rm4 } from "fs/promises";
-import { dirname as dirname10, join as join24 } from "path";
+import { dirname as dirname11, join as join25 } from "path";
 
 // ../daemon/src/git/archive.ts
 import { rmSync as rmSync3 } from "fs";
@@ -28463,12 +28727,31 @@ async function requireClean(worktreePath) {
   }
   return null;
 }
-async function requireMainReady(repoPath, defaultBr) {
+function overwritten(text) {
+  const files = [];
+  let listing = false;
+  for (const line of text.split(`
+`)) {
+    if (/would be overwritten by (merge|checkout):\s*$/.test(line)) {
+      listing = true;
+    } else if (listing && line.startsWith("\t")) {
+      files.push(line.trim());
+    } else {
+      listing = false;
+    }
+  }
+  return files;
+}
+function inTheWay(defaultBr, what, files) {
+  const shown = files.length > 3 ? `${files.slice(0, 3).join(", ")} and ${files.length - 3} more` : files.join(", ");
+  return `${defaultBr} has uncommitted files the ${what} would overwrite (${shown}): commit or stash them there first`;
+}
+async function requireMainReady(repoPath, defaultBr, clean) {
   const current = await git(repoPath, "branch", "--show-current");
   if (current.out !== defaultBr) {
     return { ok: false, message: `main checkout is on '${current.out}', not ${defaultBr}; switch it first` };
   }
-  if ((await statusFiles(repoPath)).length > 0) {
+  if (clean && (await statusFiles(repoPath)).length > 0) {
     return { ok: false, message: `${defaultBr} has uncommitted changes: commit or stash them there first` };
   }
   return null;
@@ -28508,14 +28791,18 @@ async function landLocally(worktreePath, branch, repoPath, defaultBr, method, me
   const { ahead } = await aheadBehind(worktreePath, defaultBr);
   if (ahead === 0)
     return { ok: false, message: `nothing to merge: no commits ahead of ${defaultBr}` };
-  const mErr = await requireMainReady(repoPath, defaultBr);
+  const mErr = await requireMainReady(repoPath, defaultBr, method === "squash");
   if (mErr)
     return mErr;
   if (method === "rebase") {
     w.step(`moving ${defaultBr} onto the branch`);
     const ff = await w.git(repoPath, ["merge", "--ff-only", branch]);
-    if (!ff.ok)
+    if (!ff.ok) {
+      const files = overwritten(ff.text);
+      if (files.length)
+        return { ok: false, message: inTheWay(defaultBr, "landing", files) };
       return { ok: false, message: `${branch} is not a fast-forward of ${defaultBr}: take ${defaultBr} in first` };
+    }
     return { ok: true, message: `${defaultBr} moved onto ${branch}` };
   }
   if (method === "squash") {
@@ -28534,8 +28821,12 @@ async function landLocally(worktreePath, branch, repoPath, defaultBr, method, me
   }
   w.step(`merging into ${defaultBr}`);
   const m = await w.git(repoPath, ["merge", "--no-ff", "--no-edit", branch]);
-  if (!m.ok)
+  if (!m.ok) {
+    const files = overwritten(m.text);
+    if (files.length)
+      return { ok: false, message: inTheWay(defaultBr, "landing", files) };
     return mergeFailure(repoPath, m, `merge conflicts with ${defaultBr}: take ${defaultBr} in first`);
+  }
   return { ok: true, message: `merged ${branch} into ${defaultBr}` };
 }
 async function squashMessage(worktreePath, defaultBr, suggested) {
@@ -28561,22 +28852,11 @@ async function fastForwardFetched(repoPath, defaultBr) {
   }
   if (behind === 0)
     return { ok: true, moved: false, message: "already up to date with origin" };
-  if ((await statusFiles(repoPath)).length > 0) {
-    return {
-      ok: false,
-      stale: "dirty",
-      message: `${defaultBr} has uncommitted changes: commit or stash them there first`
-    };
-  }
   const m = await git(repoPath, "merge", "--ff-only", "@{upstream}");
   if (!m.ok) {
-    const clobber = /overwritten by merge|would be overwritten/.test(`${m.out}
+    const files = overwritten(`${m.out}
 ${m.err}`);
-    return clobber ? {
-      ok: false,
-      stale: "dirty",
-      message: `${defaultBr} here has edits the pull would overwrite; commit or stash them first`
-    } : { ok: false, stale: "diverged", message: `${defaultBr} has diverged from origin; reconcile it in a terminal` };
+    return files.length ? { ok: false, stale: "dirty", message: inTheWay(defaultBr, "pull", files) } : { ok: false, stale: "diverged", message: `${defaultBr} has diverged from origin; reconcile it in a terminal` };
   }
   return { ok: true, moved: true, message: `pulled ${behind} commit(s) from origin` };
 }
@@ -28753,8 +29033,8 @@ function compareUrl(remoteUrl, base, branch) {
 }
 
 // ../daemon/src/worktrees/archive.ts
-import { existsSync as existsSync25, mkdirSync as mkdirSync7, readdirSync as readdirSync7, readFileSync as readFileSync17, renameSync as renameSync4, rmSync as rmSync4, writeFileSync as writeFileSync9 } from "fs";
-import { basename as basename7, dirname as dirname9, join as join22 } from "path";
+import { existsSync as existsSync26, mkdirSync as mkdirSync7, readdirSync as readdirSync7, readFileSync as readFileSync17, renameSync as renameSync4, rmSync as rmSync4, writeFileSync as writeFileSync9 } from "fs";
+import { basename as basename8, dirname as dirname10, join as join23 } from "path";
 class WorktreeArchive {
   dir;
   records = new Map;
@@ -28763,7 +29043,7 @@ class WorktreeArchive {
     mkdirSync7(dir, { recursive: true });
     for (const id of readdirSync7(dir)) {
       const file = this.filesOf(id).record;
-      if (!existsSync25(file))
+      if (!existsSync26(file))
         continue;
       try {
         this.records.set(id, JSON.parse(readFileSync17(file, "utf8")));
@@ -28812,8 +29092,8 @@ class WorktreeArchive {
   planFile(id, rel) {
     if (!this.records.has(id) || !isPlanPath(rel))
       return null;
-    const file = join22(this.filesOf(id).plans, basename7(rel));
-    if (!existsSync25(file))
+    const file = join23(this.filesOf(id).plans, basename8(rel));
+    if (!existsSync26(file))
       return null;
     try {
       return readFileSync17(file, "utf8");
@@ -28823,13 +29103,13 @@ class WorktreeArchive {
     }
   }
   filesOf(id) {
-    const dir = join22(this.dir, id);
+    const dir = join23(this.dir, id);
     return {
       dir,
-      record: join22(dir, "record.json"),
-      transcript: join22(dir, "transcript.jsonl"),
-      attachments: join22(dir, "attachments"),
-      plans: join22(dir, "plans")
+      record: join23(dir, "record.json"),
+      transcript: join23(dir, "transcript.jsonl"),
+      attachments: join23(dir, "attachments"),
+      plans: join23(dir, "plans")
     };
   }
 }
@@ -28848,12 +29128,13 @@ function summarize(r, repoId, transcript) {
     ...r.sessionId ? { sessionId: r.sessionId } : {},
     ...r.kept?.snapshot ? { uncommitted: true, ...r.kept.dirty ? { dirty: r.kept.dirty } : {} } : {},
     ...r.worktree.landed ? { landed: true } : {},
+    ...r.worktree.lands?.length ? { landedAt: r.worktree.lands[r.worktree.lands.length - 1]?.at } : {},
     ...r.cost !== undefined ? { cost: r.cost } : {},
     ...r.auto ? { auto: r.auto } : {}
   };
 }
 function lastUsage(transcript) {
-  if (!existsSync25(transcript))
+  if (!existsSync26(transcript))
     return null;
   const lines = readFileSync17(transcript, "utf8").split(`
 `);
@@ -28869,7 +29150,7 @@ function lastUsage(transcript) {
   return null;
 }
 function firstPrompt(transcript) {
-  if (!existsSync25(transcript))
+  if (!existsSync26(transcript))
     return;
   for (const line of readFileSync17(transcript, "utf8").split(`
 `)) {
@@ -28884,9 +29165,9 @@ function firstPrompt(transcript) {
   return;
 }
 function move(from, to) {
-  if (!existsSync25(from))
+  if (!existsSync26(from))
     return;
-  mkdirSync7(dirname9(to), { recursive: true });
+  mkdirSync7(dirname10(to), { recursive: true });
   rmSync4(to, { recursive: true, force: true });
   renameSync4(from, to);
 }
@@ -28949,8 +29230,8 @@ class ArchivedGit {
 }
 
 // ../daemon/src/worktrees/spare.ts
-import { existsSync as existsSync26 } from "fs";
-import { basename as basename8, join as join23 } from "path";
+import { existsSync as existsSync27 } from "fs";
+import { basename as basename9, join as join24 } from "path";
 class SparePool {
   d;
   inflight = new Map;
@@ -28969,7 +29250,7 @@ class SparePool {
     if (!text.trim())
       return;
     const wt = this.d.state.worktree(boxId);
-    if (wt?.kind !== "spare" || !existsSync26(wt.path))
+    if (wt?.kind !== "spare" || !existsSync27(wt.path))
       return;
     const agent = this.d.runtime.ensureAgent(wt).agent;
     if (agent.runningAgent === null)
@@ -29014,11 +29295,11 @@ class SparePool {
     return this.record(repoId, repo).then((wt) => this.warmUp(wt, repo, {}));
   }
   async record(repoId, repo) {
-    const { id, dir } = freeSlot(join23(this.d.paths.worktreesDir, repo.name));
+    const { id, dir } = freeSlot(join24(this.d.paths.worktreesDir, repo.name));
     const wt = {
       id,
       repoId,
-      path: join23(this.d.paths.worktreesDir, repo.name, dir),
+      path: join24(this.d.paths.worktreesDir, repo.name, dir),
       branch: repo.defaultBranch,
       kind: "spare",
       phase: "reserved",
@@ -29033,7 +29314,7 @@ class SparePool {
     const repoId = repo.id;
     let cut = () => {};
     const added = (async () => {
-      if (existsSync26(wt.path))
+      if (existsSync27(wt.path))
         return;
       await withRepoLock(repo.path, () => gitOrThrow(repo.path, "worktree", "add", "--detach", wt.path, baseOf(repo)));
     })();
@@ -29081,7 +29362,7 @@ class SparePool {
     }
     log.warn(wt.repoId, "spare warm-up failed; rolling back", e);
     this.d.carryDraft?.(wt.id, wt.repoId);
-    if (existsSync26(wt.path)) {
+    if (existsSync27(wt.path)) {
       await this.d.discard(wt.id).catch((re) => log.warn(wt.repoId, "spare rollback failed", re));
       return;
     }
@@ -29138,12 +29419,12 @@ class SparePool {
       const running = this.inflight.get(repoId);
       await running?.added.catch(() => {});
       running?.cut();
-      if (wt.kind !== "spare" || !existsSync26(wt.path))
+      if (wt.kind !== "spare" || !existsSync27(wt.path))
         return null;
     }
     await this.refreshing.get(repoId);
     const repo = this.d.state.requireRepo(repoId);
-    const branch = `toyon/${basename8(wt.path)}`;
+    const branch = `toyon/${basename9(wt.path)}`;
     await withRepoLock(repo.path, () => gitOrThrow(wt.path, "switch", "-c", branch));
     wt.kind = "worktree";
     delete wt.phase;
@@ -29526,8 +29807,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(join24(this.d.paths.worktreesDir, repo.name));
-    const wtPath = join24(this.d.paths.worktreesDir, repo.name, dir);
+    const { id, dir } = freeSlot(join25(this.d.paths.worktreesDir, repo.name));
+    const wtPath = join25(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 = {
@@ -29593,7 +29874,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) => !existsSync27(join24(wt.path, p)));
+`).filter(Boolean) : []).filter((p) => !existsSync28(join25(wt.path, p)));
       const applied = await git(wt.path, "stash", "apply", sha);
       if (applied.ok) {
         const ref = await entry();
@@ -29629,9 +29910,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 (existsSync27(join24(this.d.paths.worktreesDir, repo.name, slug)))
+    if (existsSync28(join25(this.d.paths.worktreesDir, repo.name, slug)))
       slug = `${slug}-${shortId().slice(0, 4)}`;
-    const wtPath = join24(this.d.paths.worktreesDir, repo.name, slug);
+    const wtPath = join25(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)
@@ -29877,7 +30158,7 @@ class WorktreeService {
   }
   async teardown(wt, repo) {
     const cmds = repo.config.teardown ?? [];
-    if (cmds.length === 0 || !existsSync27(wt.path))
+    if (cmds.length === 0 || !existsSync28(wt.path))
       return;
     for (const cmd of cmds) {
       const code = await runSetup(cmd, wt.path, (line) => this.d.hub.emit("log", wt.id, "setup", line), worktreeEnv(wt, repo), { timeoutMs: timeoutFor(repo.config, "setup") });
@@ -29886,7 +30167,7 @@ class WorktreeService {
     }
   }
   async keep(repo, wt) {
-    const index = join24(this.d.paths.archiveDir, `${wt.id}.index`);
+    const index = join25(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");
@@ -29918,16 +30199,16 @@ class WorktreeService {
       throw new Error(`git worktree remove --force ${wt.path} failed (${r.exit}): ${r.err}`);
     if (await deleteTree(wt.path))
       return;
-    await run("chmod", ["-R", "u+w", wt.path], dirname10(wt.path));
+    await run("chmod", ["-R", "u+w", wt.path], dirname11(wt.path));
     if (!await deleteTree(wt.path))
       log.warn(wt.id, `its directory could not be deleted and stays at ${wt.path}`);
   }
   plansScratch(worktreeId) {
-    return join24(this.d.paths.archiveDir, `${worktreeId}.plans`);
+    return join25(this.d.paths.archiveDir, `${worktreeId}.plans`);
   }
   keepPlans(wt) {
-    const from = join24(wt.path, PLANS_DIR);
-    if (!existsSync27(from))
+    const from = join25(wt.path, PLANS_DIR);
+    if (!existsSync28(from))
       return;
     try {
       cpSync(from, this.plansScratch(wt.id), { recursive: true });
@@ -30015,7 +30296,7 @@ class WorktreeService {
   }
   archivedAttachment(archiveId, file) {
     const files = this.archive.chatFiles(archiveId);
-    return files && isAttachmentFile(file) ? join24(files.attachments, file) : null;
+    return files && isAttachmentFile(file) ? join25(files.attachments, file) : null;
   }
   archivedGit(archiveId) {
     const rec = this.archive.get(archiveId);
@@ -30058,7 +30339,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 = existsSync27(old.path) ? join24(dirname10(old.path), freeSlot(dirname10(old.path)).dir) : old.path;
+    const path = existsSync28(old.path) ? join25(dirname11(old.path), freeSlot(dirname11(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`);
@@ -30095,7 +30376,7 @@ class WorktreeService {
       ...createdBy ? { createdBy } : {}
     };
     try {
-      this.archive.take(old.id, { ...this.chatFiles(old.id), plans: join24(path, PLANS_DIR) });
+      this.archive.take(old.id, { ...this.chatFiles(old.id), plans: join25(path, PLANS_DIR) });
     } catch (e) {
       log.warn(old.id, "could not move its chat back out of the archive", e);
     }
@@ -30106,6 +30387,13 @@ class WorktreeService {
       log.warn(old.id, `could not drop its archive ref: ${dropped.err}`);
     this.countsCache.delete(wt.id);
     this.launch(wt, repo, repo.path);
+    this.d.runtime.ensureAgent(wt).agent.note({
+      type: "restored",
+      archivedAt: rec.archivedAt,
+      branch,
+      uncommitted: !!kept.snapshot,
+      ts: Date.now()
+    });
     if (message)
       this.d.runtime.ensureAgent(wt).agent.send(message.text, { attachments: message.attachments });
     this.d.hub.emit("archiveChanged", repo.id);
@@ -30117,12 +30405,12 @@ class WorktreeService {
       return;
     const repo = this.repoOf(rec);
     const repoPath = repo?.path ?? rec.repoPath;
-    if (rec.kept && existsSync27(repoPath)) {
+    if (rec.kept && existsSync28(repoPath)) {
       const r = await git(repoPath, "update-ref", "-d", archiveRef(archiveId));
       if (!r.ok)
         log.warn(archiveId, `could not drop its archive ref: ${r.err}`);
     }
-    if (rec.worktree.lands?.length && existsSync27(repoPath))
+    if (rec.worktree.lands?.length && existsSync28(repoPath))
       await dropLandRefs(repoPath, archiveId);
     this.archive.delete(archiveId);
     this.d.drafts?.drop(archiveId);
@@ -30222,9 +30510,9 @@ class WorktreeService {
     }
   }
   async mirrorBaseIgnore(repo) {
-    const src = join24(repo.path, ".gitignore");
-    const tracked = existsSync27(src) && (await git(repo.path, "ls-files", "--", ".gitignore")).out !== "";
-    const mirror = existsSync27(src) && !tracked;
+    const src = join25(repo.path, ".gitignore");
+    const tracked = existsSync28(src) && (await git(repo.path, "ls-files", "--", ".gitignore")).out !== "";
+    const mirror = existsSync28(src) && !tracked;
     const lines = mirror ? readFileSync18(src, "utf8").split(`
 `).filter((l) => l.trim() !== "") : [];
     await excludeBlock(repo.path, BASE_IGNORE, lines);
@@ -30237,9 +30525,9 @@ class WorktreeService {
       await this.d.cache.restore(wt, repo, (line) => this.d.hub.emit("log", wt.id, "setup", line));
       run.finish(0);
     }
-    const srcNm = join24(depsSource, "node_modules");
-    const dstNm = join24(wt.path, "node_modules");
-    if (existsSync27(srcNm) && !existsSync27(dstNm)) {
+    const srcNm = join25(depsSource, "node_modules");
+    const dstNm = join25(wt.path, "node_modules");
+    if (existsSync28(srcNm) && !existsSync28(dstNm)) {
       const r = await cloneTree(srcNm, dstNm);
       if (r.ok)
         this.d.hub.emit("log", wt.id, "setup", `deps via ${r.how} in ${r.ms}ms`);
@@ -30247,10 +30535,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 = join24(depsSource, f);
-      if (!existsSync27(src) || existsSync27(join24(wt.path, f)))
+      const src = join25(depsSource, f);
+      if (!existsSync28(src) || existsSync28(join25(wt.path, f)))
         continue;
-      const r = await run("cp", [src, join24(wt.path, f)], wt.path);
+      const r = await run("cp", [src, join25(wt.path, f)], wt.path);
       if (r.ok)
         this.d.hub.emit("log", wt.id, "setup", `copied ${f}`);
       else
@@ -30719,12 +31007,6 @@ ${wt.landing.body}` : wt.landing.subject : undefined;
     const repo = this.d.state.requireRepo(wt.repoId);
     const w = { step: (name) => this.step(worktreeId, name), git: UNWATCHED.git };
     return this.ship(worktreeId, "pull-main", async () => {
-      if ((await statusFiles(repo.path)).length > 0) {
-        return {
-          ok: false,
-          message: `${repo.defaultBranch} has uncommitted changes: commit or stash them there first`
-        };
-      }
       const result = await this.trunk.pull(repo.id, w);
       if (result.ok) {
         this.invalidateCounts();
@@ -31153,7 +31435,7 @@ class ArchiveSweep {
 // ../daemon/src/index.ts
 process.on("unhandledRejection", (e) => log.error("daemon", "unhandled rejection", e));
 process.on("uncaughtException", (e) => log.error("daemon", "uncaught exception", e));
-var here = dirname11(fileURLToPath(import.meta.url));
+var here = dirname12(fileURLToPath(import.meta.url));
 var {
   shellDist: SHELL_DIST,
   bridgeJs: BRIDGE_JS,
@@ -31291,9 +31573,12 @@ var restarter = new Restarter({
   hub,
   state,
   runtime,
-  refusal: () => {
+  refusal: async () => {
     const can = restartable();
-    return can.ok ? null : can.reason;
+    if (!can.ok)
+      return can.reason;
+    const runs = await replacementRuns();
+    return runs.ok ? null : runs.reason;
   },
   go: () => {
     setTimeout(() => fireAndForget("daemon", shutdown("restart", { respawn: true }), "restart"), 100);
@@ -31309,6 +31594,7 @@ var update = new UpdateService({
   restarter,
   installed: async () => installedPackage ? readVersion(installedPackage) : null,
   latest: latestVersion,
+  registry: npmRegistry,
   command: (version) => installCommand(method, version),
   install: runInstall,
   busy: () => runtime.anyBusy(),
@@ -31440,7 +31726,12 @@ async function shutdown(signal, opts = {}) {
   if (opts.respawn) {
     await Bun.sleep(250);
     log.info("daemon", "starting the replacement");
-    respawn(paths.logFile);
+    try {
+      respawn(paths.logFile);
+    } catch (e) {
+      log.error("daemon", "the replacement did not start; run `toyon` to start it again", e);
+      process.exit(1);
+    }
   }
   process.exit(0);
 }