toyon 0.2.0 → 0.3.0

package/dist/daemon.js

@@ -1,6 +1,6 @@
 // @bun
 // ../daemon/src/index.ts
-import { rmSync as rmSync6, writeFileSync as writeFileSync8 } from "fs";
+import { rmSync as rmSync6, writeFileSync as writeFileSync9 } from "fs";
 import { dirname as dirname9 } from "path";
 import { fileURLToPath } from "url";
 
@@ -13,6 +13,111 @@ function isWriteTool(ev) {
   return ev.kind ? WRITE_KINDS.has(ev.kind) : WRITE_TOOLS.has(ev.name);
 }
 
+// ../shared/src/model.ts
+var DEFAULT_PERMISSION_MODE = "auto";
+function hasOwnBranch(wt) {
+  return wt.branch.startsWith("toyon/");
+}
+function isUnseen(wt) {
+  return wt.unread === true || wt.lastTurn != null && (wt.seenAt == null || wt.seenAt < wt.lastTurn.at);
+}
+var SHELL_STREAM = "shell";
+var LOGIN_STREAM = "login";
+function streamKey(worktreeId, stream) {
+  return `${worktreeId}/${stream}`;
+}
+
+// ../shared/src/worktree-caps.ts
+function isMain(wt) {
+  return wt.kind === "main";
+}
+function canArchive(wt) {
+  return wt.kind === "worktree";
+}
+function canRename(wt) {
+  return wt.kind === "worktree" && hasOwnBranch(wt);
+}
+function canLand(wt) {
+  return wt.kind === "worktree" && wt.from?.kind !== "pr";
+}
+function canGraft(wt) {
+  return wt.kind === "worktree";
+}
+
+// ../shared/src/railOrder.ts
+var sentAt = (w) => w.promptedAt ?? w.lastTurn?.at ?? w.createdAt;
+var tierOf = (w) => isMain(w) ? 0 : w.landed ? 2 : 1;
+var railUnitOf = (w) => w.variant ? `${tierOf(w)}:${w.variant.group}` : `row:${w.id}`;
+function railOrder(rows) {
+  const units = [];
+  const groups = new Map;
+  for (const row of rows) {
+    const w = row.worktree;
+    const key = railUnitOf(w);
+    const unit = groups.get(key);
+    if (unit) {
+      unit.rows.push(row);
+      unit.at = Math.max(unit.at, sentAt(w));
+      continue;
+    }
+    const fresh = { tier: tierOf(w), at: sentAt(w), rows: [row] };
+    units.push(fresh);
+    groups.set(key, fresh);
+  }
+  units.sort((a, b) => a.tier - b.tier || b.at - a.at);
+  return units.flatMap((u) => u.rows.length > 1 ? u.rows.sort((a, b) => (a.worktree.variant?.index ?? 0) - (b.worktree.variant?.index ?? 0)) : u.rows);
+}
+
+// ../shared/src/archiveRule.ts
+var ARCHIVE_KEEP_RECENT = 5;
+function archiveReason(wt, f) {
+  const group = wt.variant ? f.rows.filter((w) => w.variant?.group === wt.variant?.group) : [wt];
+  const decided = group.some((w) => !!w.lands?.length);
+  const lost = decided && !wt.lands?.length;
+  if (decided) {
+    if (!nothingToKeep(wt, f, lost))
+      return null;
+  } else if (!group.every((w) => nothingToKeep(w, f, false)))
+    return null;
+  if (unitsAhead(wt, f.rows) < ARCHIVE_KEEP_RECENT)
+    return null;
+  const what = lost ? "a sibling landed" : wt.landed ? "landed" : "no changes";
+  return `${what}, not opened in ${duration(f.afterMs)}`;
+}
+function nothingToKeep(w, f, lost) {
+  if (w.kind !== "worktree" || !hasOwnBranch(w))
+    return false;
+  if (w.lastTurn?.end !== "done" || isUnseen(w))
+    return false;
+  if (w.planned || w.pr?.state === "open")
+    return false;
+  if (f.viewed(w.id) || f.pending(w.id) || f.drafted(w.id))
+    return false;
+  if (f.now - (w.viewedAt ?? w.createdAt) < f.afterMs)
+    return false;
+  const c = f.counts(w.id);
+  return c.dirty === 0 && (lost ? c.ahead !== undefined : c.ahead === 0);
+}
+function unitsAhead(wt, rows) {
+  const tasks = railOrder(rows.filter((w) => w.kind === "worktree").map((worktree) => ({ worktree })));
+  const mine = railUnitOf(wt);
+  const seen = new Set;
+  for (const { worktree: w } of tasks) {
+    const unit = railUnitOf(w);
+    if (unit === mine)
+      return seen.size;
+    seen.add(unit);
+  }
+  return seen.size;
+}
+function duration(ms) {
+  if (ms >= 60 * 60000)
+    return `${Math.round(ms / (60 * 60000))}h`;
+  if (ms >= 60000)
+    return `${Math.round(ms / 60000)} min`;
+  return `${Math.round(ms / 1000)}s`;
+}
+
 // ../shared/src/attachment.ts
 var ATTACHMENT_KINDS = ["image", "paste", "pick"];
 var ATTACHMENT_LIMITS = { image: 6, paste: 4, pick: 8 };
@@ -50,6 +155,7 @@ var DAEMON_FILES = {
   token: "token",
   pid: "daemon.pid",
   state: "state.json",
+  drafts: "drafts.json",
   log: "daemon.log",
   remote: "remote.json"
 };
@@ -163,6 +269,11 @@ function middle(a, b) {
   return ops;
 }
 
+// ../shared/src/drafts.ts
+var DRAFT_PREFIX = "draft:";
+var draftKey = (repoId) => DRAFT_PREFIX + repoId;
+var draftRepoOf = (boxId) => boxId.startsWith(DRAFT_PREFIX) ? boxId.slice(DRAFT_PREFIX.length) : null;
+
 // ../shared/src/land.ts
 var DEFAULT_LAND_ROUTE = "merge";
 var DEFAULT_MERGE_METHOD = "merge";
@@ -175,19 +286,8 @@ function landPolicy(config) {
   };
 }
 
-// ../shared/src/model.ts
-var DEFAULT_PERMISSION_MODE = "auto";
-function hasOwnBranch(wt) {
-  return wt.branch.startsWith("toyon/");
-}
-var SHELL_STREAM = "shell";
-var LOGIN_STREAM = "login";
-function streamKey(worktreeId, stream) {
-  return `${worktreeId}/${stream}`;
-}
-
 // ../shared/src/protocol/limits.ts
-var PROTOCOL_VERSION = 50;
+var PROTOCOL_VERSION = 56;
 var FILE_MAX_CHARS = 5000000;
 var IMAGE_MIME_TYPES = ["image/png", "image/jpeg", "image/gif", "image/webp"];
 var IMAGE_MAX_EDGE = 2576;
@@ -1130,7 +1230,7 @@ var nanoid = /^[a-zA-Z0-9_-]{21}$/;
 function nanoidOfLength(length) {
   return new RegExp(`^[a-zA-Z0-9_-]{${length}}$`);
 }
-var duration = /^P(?:(\d+W)|(?!.*W)(?=\d|T\d)(\d+Y)?(\d+M)?(\d+D)?(T(?=\d)(\d+H)?(\d+M)?(\d+([.,]\d+)?S)?)?)$/;
+var duration2 = /^P(?:(\d+W)|(?!.*W)(?=\d|T\d)(\d+Y)?(\d+M)?(\d+D)?(T(?=\d)(\d+H)?(\d+M)?(\d+([.,]\d+)?S)?)?)$/;
 var guid = /^([0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12})$/;
 var uuid = (version) => {
   if (!version)
@@ -1923,7 +2023,7 @@ var $ZodISOTime = /* @__PURE__ */ $constructor("$ZodISOTime", (inst, def) => {
   $ZodStringFormat.init(inst, def);
 });
 var $ZodISODuration = /* @__PURE__ */ $constructor("$ZodISODuration", (inst, def) => {
-  def.pattern ?? (def.pattern = duration);
+  def.pattern ?? (def.pattern = duration2);
   $ZodStringFormat.init(inst, def);
 });
 var $ZodIPv4 = /* @__PURE__ */ $constructor("$ZodIPv4", (inst, def) => {
@@ -6264,6 +6364,7 @@ var clientMsgSchema = discriminatedUnion("t", [
   object({
     t: literal("chat"),
     worktreeId: id,
+    clientId: string2().max(64).optional(),
     text: prose,
     context: prose.optional(),
     attachments
@@ -6295,7 +6396,7 @@ var clientMsgSchema = discriminatedUnion("t", [
   object({ t: literal("set-worktree-model"), worktreeId: id, model: string2().max(200) }),
   object({ t: literal("set-worktree-effort"), worktreeId: id, effort: string2().max(100) }),
   object({ t: literal("set-worktree-profile"), worktreeId: id, profile: string2().max(100) }),
-  object({ t: literal("remove-worktree"), worktreeId: id }),
+  object({ t: literal("archive-worktree"), worktreeId: id }),
   object({ t: literal("list-archived"), repoId: id }),
   object({
     t: literal("restore-worktree"),
@@ -6319,6 +6420,7 @@ var clientMsgSchema = discriminatedUnion("t", [
   object({ t: literal("sync-main"), worktreeId: id }),
   object({ t: literal("run-after-land"), repoId: id }),
   object({ t: literal("restart-daemon") }),
+  object({ t: literal("update-now") }),
   object({ t: literal("pull-main"), worktreeId: id }),
   object({
     t: literal("write-file"),
@@ -6338,6 +6440,7 @@ var clientMsgSchema = discriminatedUnion("t", [
   object({ t: literal("stop-agent"), worktreeId: id }),
   object({ t: literal("seen"), worktreeId: id }),
   object({ t: literal("mark-unread"), worktreeId: id }),
+  object({ t: literal("set-draft"), boxId: id, text: prose, clientId: string2().max(64).optional() }),
   object({ t: literal("refresh-git"), repoId: id }),
   object({ t: literal("visit"), worktreeId: id, path: routePath, title: pageTitle.optional() }),
   object({ t: literal("page-title"), worktreeId: id, path: routePath, title: pageTitle }),
@@ -7377,6 +7480,52 @@ function isDark(hex) {
   return luminance(hex) < 0.4;
 }
 
+// ../shared/src/update.ts
+function installMethod(packageJson) {
+  if (!packageJson)
+    return "none";
+  const p = packageJson.replaceAll("\\", "/");
+  if (p.includes("/_npx/"))
+    return "npx";
+  if (p.includes("/.bun/install/global/"))
+    return "bun";
+  if (p.includes("/node_modules/toyon/"))
+    return "npm";
+  return "none";
+}
+function installCommand(method, version) {
+  if (method === "npm")
+    return ["npm", "install", "-g", `toyon@${version}`];
+  if (method === "bun")
+    return ["bun", "add", "-g", `toyon@${version}`];
+  return null;
+}
+function newer(a, b) {
+  const pa = parseVersion(a);
+  const pb = parseVersion(b);
+  if (!pa || !pb)
+    return false;
+  for (let i = 0;i < 3; i++) {
+    const x = pa.nums[i] ?? 0;
+    const y = pb.nums[i] ?? 0;
+    if (x !== y)
+      return x > y;
+  }
+  if (pa.pre === pb.pre)
+    return false;
+  if (pa.pre === null)
+    return true;
+  if (pb.pre === null)
+    return false;
+  return pa.pre > pb.pre;
+}
+function parseVersion(v) {
+  const m = /^(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z.-]+))?$/.exec(v.trim());
+  if (!m)
+    return null;
+  return { nums: [Number(m[1]), Number(m[2]), Number(m[3])], pre: m[4] ?? null };
+}
+
 // ../shared/src/vscode-theme.ts
 var workbenchKeys = {
   surface0: ["editor.background"],
@@ -7553,27 +7702,10 @@ function pickSyntax(tokenColors) {
 function slug(s) {
   return s.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "") || "theme";
 }
-
-// ../shared/src/worktree-caps.ts
-function isMain(wt) {
-  return wt.kind === "main";
-}
-function canRemove(wt) {
-  return wt.kind === "worktree";
-}
-function canRename(wt) {
-  return wt.kind === "worktree" && hasOwnBranch(wt);
-}
-function canLand(wt) {
-  return wt.kind === "worktree" && wt.from?.kind !== "pr";
-}
-function canGraft(wt) {
-  return wt.kind === "worktree";
-}
 // ../daemon/package.json
 var package_default = {
   name: "@toyon/daemon",
-  version: "0.2.0",
+  version: "0.3.0",
   private: true,
   type: "module",
   main: "src/index.ts",
@@ -12494,6 +12626,7 @@ function makePaths(home = process.env.TOYON_HOME ?? join3(homedir(), ".toyon"))
   return {
     home,
     stateFile: join3(home, DAEMON_FILES.state),
+    draftsFile: join3(home, DAEMON_FILES.drafts),
     tokenFile: join3(home, DAEMON_FILES.token),
     pidFile: join3(home, DAEMON_FILES.pid),
     logFile: join3(home, DAEMON_FILES.log),
@@ -13708,6 +13841,9 @@ class AcpSession {
   get queueLength() {
     return this.queue.length;
   }
+  get unsettled() {
+    return this.queue.length > 0 || this.steered.length > 0 || this.refused !== null || this.asks.size > 0;
+  }
   get queueItems() {
     return this.waiting().map((q) => q.text);
   }
@@ -14230,6 +14366,8 @@ class AcpSession {
   }
   askPermission(params) {
     const plan = params.toolCall.kind === "switch_mode";
+    if (plan)
+      this.d.onPlan?.();
     const offered = plan ? params.options : params.options.filter((o) => o.kind !== "allow_always");
     const choices = offered.map((o) => ({ id: o.optionId, name: o.name, kind: o.kind }));
     return this.openAsk((id) => ({
@@ -15319,6 +15457,13 @@ function defaultAgent(wt, d) {
       d.state.save();
       d.hub.emit("worktreesChanged");
     },
+    onPlan: () => {
+      const w = d.state.worktree(wt.id);
+      if (!w || w.planned)
+        return;
+      w.planned = true;
+      d.state.save();
+    },
     option: (category) => d.state.requireWorktree(wt.id)[OPTION_FIELDS[category]],
     onOptionsLearned: (category, choices) => {
       const agentId = d.state.requireWorktree(wt.id).agent ?? "";
@@ -15388,6 +15533,21 @@ class RuntimeRegistry {
   holdCount(id) {
     return this.holds.get(id)?.size ?? 0;
   }
+  busy(id) {
+    const agent = this.agentFor(id);
+    if (agent && (agent.status !== "idle" || agent.unsettled))
+      return true;
+    return this.holdCount(id) > 0;
+  }
+  anyBusy() {
+    for (const id of this.runtimes.keys())
+      if (this.busy(id))
+        return true;
+    for (const id of this.holds.keys())
+      if (this.busy(id))
+        return true;
+    return false;
+  }
   markSetup(id, on) {
     if (on)
       this.settingUp.add(id);
@@ -16127,7 +16287,8 @@ function locateAssets(here, env = process.env) {
   return {
     shellDist: env.TOYON_SHELL_DIST ?? (packaged ? join7(here, "shell") : join7(here, "../../shell/dist")),
     bridgeJs: env.TOYON_BRIDGE_JS ?? (packaged ? join7(here, "bridge.js") : join7(here, "../../bridge/dist/bridge.js")),
-    sourceRoot: packaged ? null : resolve5(here, "../../..")
+    sourceRoot: packaged ? null : resolve5(here, "../../.."),
+    packageJson: packaged ? join7(here, "..", "package.json") : null
   };
 }
 var KEEP_MS = 3 * 24 * 60 * 60 * 1000;
@@ -16265,9 +16426,57 @@ function respawn(logFile) {
     stdio: ["ignore", logFd, logFd],
     env: { ...process.env }
   });
+  child.on("error", (e) => log.warn("daemon", `the replacement did not start: ${e.message}`));
   child.unref();
 }
 
+// ../daemon/src/core/restarter.ts
+class Restarter {
+  d;
+  asked = false;
+  gone = false;
+  announced = null;
+  constructor(d) {
+    this.d = d;
+    const settle = () => {
+      if (this.asked)
+        this.attempt();
+    };
+    d.hub.on("agentStatus", settle);
+    d.hub.on("worktreesChanged", settle);
+  }
+  request() {
+    const refused = this.d.refusal();
+    if (refused)
+      return refused;
+    this.asked = true;
+    this.attempt();
+    return null;
+  }
+  waitingOn() {
+    if (!this.asked)
+      return null;
+    return this.gone ? [] : this.working();
+  }
+  working() {
+    return this.d.state.worktrees.filter((w) => this.d.runtime.agentFor(w.id)?.status === "working").map((w) => w.title);
+  }
+  attempt() {
+    if (this.gone)
+      return;
+    const names = this.working();
+    if (names.length === 0)
+      this.gone = true;
+    const key = JSON.stringify(this.waitingOn());
+    if (key !== this.announced) {
+      this.announced = key;
+      this.d.hub.emit("updateChanged");
+    }
+    if (this.gone)
+      this.d.go();
+  }
+}
+
 // ../daemon/src/core/self.ts
 function needsRestart(path) {
   return path.startsWith("packages/daemon/") || path.startsWith("packages/shared/") || path === "package.json" || path === "bun.lock";
@@ -16535,6 +16744,13 @@ class StateStore {
     this.state.theme = prefs;
     this.save();
   }
+  get updateFailed() {
+    return this.state.updateFailed;
+  }
+  setUpdateFailed(failed) {
+    this.state.updateFailed = failed;
+    this.save();
+  }
   save() {
     saveState(this.paths, this.state);
   }
@@ -17112,6 +17328,87 @@ async function loadProjectTypescript(root) {
   }
 }
 
+// ../daemon/src/drafts/store.ts
+import { existsSync as existsSync12, readFileSync as readFileSync9, renameSync as renameSync3, writeFileSync as writeFileSync5 } from "fs";
+var SAVE_DELAY_MS = 1000;
+
+class DraftStore {
+  d;
+  drafts = {};
+  saveTimer = null;
+  constructor(d) {
+    this.d = d;
+    if (!existsSync12(d.file))
+      return;
+    try {
+      const raw = JSON.parse(readFileSync9(d.file, "utf8"));
+      if (!raw || typeof raw !== "object")
+        return;
+      for (const [id, text] of Object.entries(raw)) {
+        if (typeof text === "string" && text)
+          this.drafts[id] = text;
+      }
+    } catch (e) {
+      log.warn("drafts", `skipped an unreadable ${d.file}`, e);
+    }
+  }
+  all() {
+    return { ...this.drafts };
+  }
+  has(boxId) {
+    return !!this.drafts[boxId]?.trim();
+  }
+  set(boxId, text, clientId) {
+    if ((this.drafts[boxId] ?? "") === text)
+      return;
+    if (text)
+      this.drafts[boxId] = text;
+    else
+      delete this.drafts[boxId];
+    this.scheduleSave();
+    this.d.hub.emit("draftChanged", boxId, text, clientId);
+  }
+  drop(boxId) {
+    this.set(boxId, "");
+  }
+  prune(known) {
+    let changed = false;
+    for (const id of Object.keys(this.drafts)) {
+      if (known(id))
+        continue;
+      delete this.drafts[id];
+      changed = true;
+    }
+    if (changed)
+      this.scheduleSave();
+  }
+  flush() {
+    if (!this.saveTimer)
+      return;
+    clearTimeout(this.saveTimer);
+    this.saveTimer = null;
+    this.write();
+  }
+  scheduleSave() {
+    if (this.saveTimer)
+      return;
+    this.saveTimer = setTimeout(() => {
+      this.saveTimer = null;
+      this.write();
+    }, this.d.saveDelayMs ?? SAVE_DELAY_MS);
+    this.saveTimer.unref?.();
+  }
+  write() {
+    const tmp = `${this.d.file}.tmp`;
+    try {
+      writeFileSync5(tmp, JSON.stringify(this.drafts));
+      renameSync3(tmp, this.d.file);
+    } catch (e) {
+      log.error("drafts", "could not write the drafts", e);
+    }
+  }
+}
+
 // ../daemon/src/exec/service.ts
 var OUTPUT_CAP = 200000;
 var TIMEOUT_MS = 10 * 60000;
@@ -17363,10 +17660,13 @@ async function committedFiles(worktreePath, defaultBr) {
   const base = await git(worktreePath, "merge-base", "HEAD", defaultBr);
   if (!base.ok || !base.out)
     return [];
-  const r = await git(worktreePath, "diff", "--name-status", base.out, "HEAD");
+  return filesBetween(worktreePath, base.out, "HEAD");
+}
+async function filesBetween(cwd, from, to) {
+  const r = await git(cwd, "diff", "--name-status", from, to);
   if (!r.ok || !r.out)
     return [];
-  const counts = await numstat(worktreePath, base.out, "HEAD");
+  const counts = await numstat(cwd, from, to);
   return r.out.split(`
 `).filter(Boolean).map((line) => {
     const [status, ...rest] = line.split("\t");
@@ -17419,10 +17719,15 @@ async function logCommits(worktreePath, defaultBr, limit = LOG_LIMIT) {
     git(worktreePath, "log", `-n${limit}`, FORMAT),
     aheadShas(worktreePath, defaultBr)
   ]);
-  if (!r.ok || !r.out)
-    return [];
+  return r.ok && r.out ? parseLog(r.out, (sha) => ahead.has(sha)) : [];
+}
+async function logRange(cwd, from, to, limit = LOG_LIMIT) {
+  const r = await git(cwd, "log", `-n${limit}`, FORMAT, `${from}..${to}`);
+  return r.ok && r.out ? parseLog(r.out, () => true) : [];
+}
+function parseLog(out, ahead) {
   const commits = [];
-  for (const rec of r.out.split("\x1E")) {
+  for (const rec of out.split("\x1E")) {
     const [sha, short, author, at, subject] = rec.trim().split("\x00");
     if (!sha || !short || subject === undefined)
       continue;
@@ -17432,7 +17737,7 @@ async function logCommits(worktreePath, defaultBr, limit = LOG_LIMIT) {
       subject,
       author: author ?? "",
       at: Number(at) * 1000 || 0,
-      ahead: ahead.has(sha)
+      ahead: ahead(sha)
     });
   }
   return commits;
@@ -17613,6 +17918,30 @@ function rankElementSources(el, rows) {
   };
 }
 
+// ../daemon/src/files/listing.ts
+var SUBMODULE_MODE = "160000";
+var entries = (out) => out.split("\x00").filter(Boolean);
+function parseListing(staged, untracked, deleted) {
+  const gone = new Set(entries(deleted));
+  const paths = new Set;
+  const submodules = new Set;
+  for (const line of entries(staged)) {
+    const tab = line.indexOf("\t");
+    if (tab === -1)
+      continue;
+    const path = line.slice(tab + 1);
+    if (gone.has(path))
+      continue;
+    if (line.startsWith(SUBMODULE_MODE))
+      submodules.add(path);
+    else
+      paths.add(path);
+  }
+  for (const path of entries(untracked))
+    paths.add(path);
+  return { paths: [...paths], submodules: [...submodules] };
+}
+
 // ../daemon/src/files/vite-offset.ts
 async function viteLineOffset(worktreePath, path, target) {
   if (!target)
@@ -17693,6 +18022,9 @@ function sides(before, after) {
   }
   return { before, after, binary: false, tooLarge: false };
 }
+function keptRead(before, after) {
+  return { ...sides(before, after), version: null, writable: false };
+}
 
 class FileService {
   state;
@@ -17771,9 +18103,13 @@ class FileService {
     });
   }
   async list(worktreeId) {
-    const r = await git(this.require(worktreeId).path, "ls-files", "-co", "--exclude-standard");
-    return r.out.split(`
-`).filter(Boolean);
+    const cwd = this.require(worktreeId).path;
+    const [staged, untracked, deleted] = await Promise.all([
+      git(cwd, "ls-files", "-z", "-s"),
+      git(cwd, "ls-files", "-z", "-o", "--exclude-standard"),
+      git(cwd, "ls-files", "-z", "-d")
+    ]);
+    return parseListing(staged.out, untracked.out, deleted.out);
   }
   async search(worktreeId, query) {
     const { path: cwd } = this.require(worktreeId);
@@ -18015,7 +18351,7 @@ class AfterLand {
 }
 
 // ../daemon/src/repos/registry.ts
-import { existsSync as existsSync16, mkdirSync as mkdirSync5, rmSync as rmSync2, writeFileSync as writeFileSync5 } from "fs";
+import { existsSync as existsSync17, mkdirSync as mkdirSync5, rmSync as rmSync2, writeFileSync as writeFileSync6 } from "fs";
 import { homedir as homedir7 } from "os";
 import { basename as basename3, dirname as dirname6, join as join14 } from "path";
 
@@ -18043,7 +18379,7 @@ function variantLens(index) {
 }
 
 // ../daemon/src/repos/browse.ts
-import { existsSync as existsSync12, statSync as statSync3 } from "fs";
+import { existsSync as existsSync13, statSync as statSync3 } from "fs";
 import { readdir } from "fs/promises";
 import { homedir as homedir5 } from "os";
 import { dirname as dirname4, join as join10 } from "path";
@@ -18060,7 +18396,7 @@ function holdsNothing(names) {
 }
 async function describeFolder(abs) {
   const path = collapseTilde(abs);
-  if (existsSync12(join10(abs, ".git")))
+  if (existsSync13(join10(abs, ".git")))
     return { path, kind: "project" };
   try {
     return { path, kind: holdsNothing(await readdir(abs)) ? "empty" : "folder" };
@@ -18075,10 +18411,10 @@ function describe2(typed, parent) {
     isDir = statSync3(typed).isDirectory();
   } catch {}
   return {
-    exists: existsSync12(typed),
+    exists: existsSync13(typed),
     isDir,
-    isRepo: isDir && existsSync12(join10(typed, ".git")),
-    parentExists: existsSync12(parent)
+    isRepo: isDir && existsSync13(join10(typed, ".git")),
+    parentExists: existsSync13(parent)
   };
 }
 async function browsePath(raw) {
@@ -18103,17 +18439,17 @@ async function browsePath(raw) {
     if (!name.toLowerCase().startsWith(prefix))
       continue;
     const abs = join10(dir, name);
-    entries.push({ path: collapseTilde(abs), name, isRepo: existsSync12(join10(abs, ".git")) });
+    entries.push({ path: collapseTilde(abs), name, isRepo: existsSync13(join10(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 };
 }
 
 // ../daemon/src/repos/config.ts
-import { closeSync, existsSync as existsSync13, openSync as openSync2, readdirSync as readdirSync3, readFileSync as readFileSync9, readSync } from "fs";
+import { closeSync, existsSync as existsSync14, openSync as openSync2, readdirSync as readdirSync3, readFileSync as readFileSync10, readSync } from "fs";
 import { join as join11 } from "path";
 var PLACES = [CONFIG_FILES.folder, CONFIG_FILES.root];
-var present = (repoPath, place) => [place.shared, place.local].filter((rel) => existsSync13(join11(repoPath, rel)));
+var present = (repoPath, place) => [place.shared, place.local].filter((rel) => existsSync14(join11(repoPath, rel)));
 var isObject2 = (v) => typeof v === "object" && v !== null && !Array.isArray(v);
 function readConfigFile(repoPath) {
   const found = PLACES.map((p) => present(repoPath, p)).filter((files) => files.length > 0);
@@ -18128,7 +18464,7 @@ function readConfigFile(repoPath) {
   for (const rel of files) {
     let raw;
     try {
-      raw = JSON.parse(readFileSync9(join11(repoPath, rel), "utf8"));
+      raw = JSON.parse(readFileSync10(join11(repoPath, rel), "utf8"));
     } catch (e) {
       return { ok: false, reason: `${rel} is not valid JSON: ${e instanceof Error ? e.message : String(e)}` };
     }
@@ -18186,11 +18522,11 @@ function configTarget(repoPath, made) {
 function configBody(repoPath, rel, config) {
   const place = PLACES.find((p) => p.local === rel);
   const abs = place && join11(repoPath, place.shared);
-  if (!abs || !existsSync13(abs))
+  if (!abs || !existsSync14(abs))
     return config;
   let shared;
   try {
-    shared = JSON.parse(readFileSync9(abs, "utf8"));
+    shared = JSON.parse(readFileSync10(abs, "utf8"));
   } catch {
     return config;
   }
@@ -18203,8 +18539,8 @@ function detectConfig(repoPath) {
   if (explicit)
     log.warn("config", `${repoPath}: ${explicit.reason}; detecting instead`);
   const pkgPath = join11(repoPath, "package.json");
-  if (existsSync13(pkgPath)) {
-    const pkg = JSON.parse(readFileSync9(pkgPath, "utf8"));
+  if (existsSync14(pkgPath)) {
+    const pkg = JSON.parse(readFileSync10(pkgPath, "utf8"));
     const scripts = pkg.scripts ?? {};
     const runner = detectRunner(repoPath, pkg.packageManager);
     const pages = detectPages(repoPath, scripts, runner);
@@ -18225,7 +18561,7 @@ function detectConfig(repoPath) {
       };
     }
   }
-  if (existsSync13(join11(repoPath, "start.sh"))) {
+  if (existsSync14(join11(repoPath, "start.sh"))) {
     return { config: { run: { app: "./start.sh" } }, needsSetup: true, from: "start.sh" };
   }
   const assumed = assumeNothingToRun(repoPath);
@@ -18268,7 +18604,7 @@ function assumeNothingToRun(repoPath) {
   return marker && !servesPage(repoPath) ? marker : undefined;
 }
 function markerIn(repoPath) {
-  const named = NO_PAGE_MARKERS.find((f) => existsSync13(join11(repoPath, f)));
+  const named = NO_PAGE_MARKERS.find((f) => existsSync14(join11(repoPath, f)));
   if (named)
     return named;
   let entries;
@@ -18280,7 +18616,7 @@ function markerIn(repoPath) {
   return entries.find((f) => NO_PAGE_EXTENSIONS.some((ext) => f.endsWith(ext)));
 }
 function servesPage(repoPath) {
-  if (WEB_FILES.some((f) => existsSync13(join11(repoPath, f))))
+  if (WEB_FILES.some((f) => existsSync14(join11(repoPath, f))))
     return true;
   if (/^web:/m.test(head(join11(repoPath, "Procfile"))))
     return true;
@@ -18317,7 +18653,7 @@ function mentions(text, name) {
   return new RegExp(`(?<![\\w-])${escaped}(?![\\w-])`, "i").test(text);
 }
 function head(path) {
-  if (!existsSync13(path))
+  if (!existsSync14(path))
     return "";
   try {
     const fd = openSync2(path, "r");
@@ -18345,28 +18681,28 @@ function procCommand(runner, script, body) {
   return `${base}${runner === "npm" ? " --" : ""} ${flag}`;
 }
 function detectPages(repoPath, scripts, runner) {
-  if (!scripts.build || !existsSync13(join11(repoPath, "functions")))
+  if (!scripts.build || !existsSync14(join11(repoPath, "functions")))
     return null;
-  const cfg = ["wrangler.jsonc", "wrangler.json", "wrangler.toml"].map((f) => join11(repoPath, f)).find((f) => existsSync13(f));
+  const cfg = ["wrangler.jsonc", "wrangler.json", "wrangler.toml"].map((f) => join11(repoPath, f)).find((f) => existsSync14(f));
   if (!cfg)
     return null;
-  const out = readFileSync9(cfg, "utf8").match(/pages_build_output_dir"?\s*[:=]\s*"([^"]+)"/)?.[1];
+  const out = readFileSync10(cfg, "utf8").match(/pages_build_output_dir"?\s*[:=]\s*"([^"]+)"/)?.[1];
   if (!out)
     return null;
   return { web: `${runner} run build && npx wrangler pages dev ${out} --ip 127.0.0.1 --port $PORT` };
 }
 function detectRunner(repoPath, packageManager) {
-  if (existsSync13(join11(repoPath, "bun.lock")) || existsSync13(join11(repoPath, "bun.lockb")))
+  if (existsSync14(join11(repoPath, "bun.lock")) || existsSync14(join11(repoPath, "bun.lockb")))
     return "bun";
-  if (existsSync13(join11(repoPath, "pnpm-lock.yaml")))
+  if (existsSync14(join11(repoPath, "pnpm-lock.yaml")))
     return "pnpm";
-  if (existsSync13(join11(repoPath, "yarn.lock")) || typeof packageManager === "string" && packageManager.startsWith("yarn"))
+  if (existsSync14(join11(repoPath, "yarn.lock")) || typeof packageManager === "string" && packageManager.startsWith("yarn"))
     return "yarn";
   return "npm";
 }
 
 // ../daemon/src/repos/create.ts
-import { existsSync as existsSync14, readdirSync as readdirSync4, realpathSync as realpathSync2, statSync as statSync4 } from "fs";
+import { existsSync as existsSync15, readdirSync as readdirSync4, realpathSync as realpathSync2, statSync as statSync4 } 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 join12, resolve as resolve7 } from "path";
@@ -18381,13 +18717,13 @@ function planProject(opts, home = homedir6()) {
   const first = firstProjectsFolder(opts.parent, home);
   const parent = first ?? resolveParent(opts.parent);
   const dir = join12(parent, opts.name.trim());
-  if (existsSync14(dir))
+  if (existsSync15(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 !== join12(home, PROJECTS_FOLDER) || existsSync14(typed) || !existsSync14(home))
+  if (typed !== join12(home, PROJECTS_FOLDER) || existsSync15(typed) || !existsSync15(home))
     return null;
   return join12(realpathSync2(home), PROJECTS_FOLDER);
 }
@@ -18397,10 +18733,10 @@ function planInPlace(opts) {
     throw new UserError(`${opts.name} is not a folder name`);
   }
   const typed = join12(resolveParent(opts.parent), name);
-  if (!existsSync14(typed) || !statSync4(typed).isDirectory())
+  if (!existsSync15(typed) || !statSync4(typed).isDirectory())
     throw new UserError(`${typed} is not a folder`);
   const dir = realpathSync2(typed);
-  if (existsSync14(join12(dir, ".git")))
+  if (existsSync15(join12(dir, ".git")))
     throw new UserError(`${dir} is already a project; open it instead`);
   if (!holdsNothing(readdirSync4(dir))) {
     throw new UserError(`${dir} is not empty; only an empty folder can become a project where it is`);
@@ -18411,7 +18747,7 @@ function resolveParent(raw) {
   const typed = expandTilde(raw.trim());
   if (!typed.startsWith("/"))
     throw new UserError(`${raw} is not a folder path`);
-  if (!existsSync14(typed))
+  if (!existsSync15(typed))
     throw new UserError(`${raw} does not exist; make it first`);
   if (!statSync4(typed).isDirectory())
     throw new UserError(`${raw} is not a folder`);
@@ -18527,7 +18863,7 @@ async function ok(p, what) {
 }
 
 // ../daemon/src/repos/watcher.ts
-import { existsSync as existsSync15, watch } from "fs";
+import { existsSync as existsSync16, watch } from "fs";
 import { basename as basename2, join as join13 } from "path";
 function watchDefaultBranch(repoPath, branch, onMove) {
   let last = null;
@@ -18639,7 +18975,7 @@ function watchConfigFile(repoPath, onChange) {
   const armInner = () => {
     inner?.close();
     inner = null;
-    if (!existsSync15(dir))
+    if (!existsSync16(dir))
       return;
     try {
       inner = watch(dir, (_event, filename) => {
@@ -18693,7 +19029,7 @@ class RepoRegistry {
   }
   async boot() {
     const { state } = this.d;
-    const gone = state.worktrees.filter((wt) => !existsSync16(wt.path) || !state.repos.some((r) => r.id === wt.repoId));
+    const gone = state.worktrees.filter((wt) => !existsSync17(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) {
@@ -18760,7 +19096,7 @@ class RepoRegistry {
       return `${repo.name} is set up now`;
     if (main.promptedAt || main.lastTurn)
       return `${repo.name} has a chat now`;
-    if (existsSync16(join14(repo.path, ".claude")))
+    if (existsSync17(join14(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`;
@@ -18837,7 +19173,7 @@ class RepoRegistry {
   }
   async register(rawPath, made) {
     const path = expandTilde(rawPath);
-    if (!existsSync16(path))
+    if (!existsSync17(path))
       throw new UserError(`${path} does not exist`);
     if (!await isGitRepo(path))
       throw new UserError(`${path} is not a git repository`);
@@ -18887,17 +19223,18 @@ class RepoRegistry {
     const mine = this.d.state.worktrees.filter((w) => w.repoId === repoId);
     const tasks = mine.filter((w) => w.kind !== "main" && w.kind !== "spare");
     if (tasks.length > 0) {
-      throw new UserError(`${repo.name} still has ${tasks.length} worktree${tasks.length === 1 ? "" : "s"}; remove them first`);
+      throw new UserError(`${repo.name} still has ${tasks.length} worktree${tasks.length === 1 ? "" : "s"}; archive them first`);
     }
     this.stopWatcher(repoId);
     for (const wt of mine.filter((w) => w.kind === "spare"))
-      await this.d.worktrees.remove(wt.id, { spare: true });
+      await this.d.worktrees.discardWorktree(wt.id);
     for (const wt of mine.filter((w) => w.kind === "main")) {
       await this.d.runtime.stop(wt.id);
       this.d.state.removeWorktree(wt.id);
       this.d.worktrees.deleteChat(wt.id);
       releasePort(wt.proxyPort);
     }
+    this.d.drafts?.drop(draftKey(repoId));
     this.d.state.removeRepo(repoId);
     this.d.hub.emit("reposChanged");
     this.d.hub.emit("worktreesChanged");
@@ -18909,7 +19246,7 @@ class RepoRegistry {
       throw new UserError(current.reason);
     const was = configTarget(repo.path, !!repo.made);
     const rel = configSibling(was, kind);
-    const moved = rel !== was && existsSync16(join14(repo.path, was));
+    const moved = rel !== was && existsSync17(join14(repo.path, was));
     if (moved && !(kind === "local" && await isTracked(repo.path, was))) {
       try {
         rmSync2(join14(repo.path, was));
@@ -18924,7 +19261,7 @@ class RepoRegistry {
     const file = join14(repo.path, rel);
     try {
       mkdirSync5(dirname6(file), { recursive: true });
-      writeFileSync5(file, `${JSON.stringify(configBody(repo.path, rel, config), null, 2)}
+      writeFileSync6(file, `${JSON.stringify(configBody(repo.path, rel, config), null, 2)}
 `);
     } catch (e) {
       log.warn(repoId, `could not write ${rel}`, e);
@@ -18999,7 +19336,7 @@ class RepoRegistry {
   }
   placeConfig(repo) {
     const rel = configTarget(repo.path, !!repo.made);
-    if (isLocalConfigFile(rel) && existsSync16(join14(repo.path, rel))) {
+    if (isLocalConfigFile(rel) && existsSync17(join14(repo.path, rel))) {
       fireAndForget(repo.id, excludeFromGit(repo.path, rel), "exclude local settings");
     }
     if (repo.configFile === rel)
@@ -19336,7 +19673,7 @@ function retitle(pages, key, title) {
 function rank(pages, now, n = KEEP) {
   return Object.keys(pages).sort(byStanding(pages, now)).slice(0, n);
 }
-function entries(pages, now) {
+function entries2(pages, now) {
   return rank(pages, now).map((path) => {
     const v = pages[path];
     return { path, score: rounded(decayed(v, now)), last: v.last, ...v.title ? { title: v.title } : {} };
@@ -20031,7 +20368,7 @@ function unseenOf(candidates, seen, hashes) {
 }
 
 // ../daemon/src/routes/service.ts
-var SAVE_DELAY_MS = 5000;
+var SAVE_DELAY_MS2 = 5000;
 var MAX_MANIFESTS = 50;
 var SCAN_CACHE = 20;
 var MAX_HASHED = 64;
@@ -20106,7 +20443,7 @@ class RouteService {
   }
   history(repoId) {
     const pages = this.d.state.visitsOf(repoId);
-    return pages ? entries(pages, this.now()) : [];
+    return pages ? entries2(pages, this.now()) : [];
   }
   historyAll() {
     const out = {};
@@ -20331,7 +20668,7 @@ class RouteService {
       } catch (e) {
         log.error("routes", "could not write the page lists", e);
       }
-    }, this.d.saveDelayMs ?? SAVE_DELAY_MS);
+    }, this.d.saveDelayMs ?? SAVE_DELAY_MS2);
     this.saveTimer.unref();
   }
   repoOf(worktreeId) {
@@ -20343,7 +20680,7 @@ class RouteService {
 }
 
 // ../daemon/src/runtime/bridge-script.ts
-import { existsSync as existsSync17, readFileSync as readFileSync10, statSync as statSync5 } from "fs";
+import { existsSync as existsSync18, readFileSync as readFileSync11, statSync as statSync5 } from "fs";
 var LEARNED_MAX = 8;
 
 class BridgeScript {
@@ -20373,7 +20710,7 @@ class BridgeScript {
     this.cache = null;
   }
   get() {
-    if (!existsSync17(this.path))
+    if (!existsSync18(this.path))
       return "// toyon bridge not built";
     const s = statSync5(this.path);
     const stamp = `${s.mtimeMs}:${s.size}`;
@@ -20382,7 +20719,7 @@ class BridgeScript {
     this.stamp = stamp;
     const origins = [...this.origins, ...this.learned];
     this.cache = `window.__toyonShellOrigins=${JSON.stringify(origins)};
-${readFileSync10(this.path, "utf8")}`;
+${readFileSync11(this.path, "utf8")}`;
     return this.cache;
   }
 }
@@ -20400,7 +20737,7 @@ function servedLocally(origin) {
 }
 
 // ../daemon/src/runtime/memory.ts
-var MAC_PRESSURE_NORMAL = 1;
+var MAC_PRESSURE_CRITICAL = 4;
 var AVAILABLE_FLOOR = 0.15;
 var unsupportedLogged = false;
 async function memoryTight() {
@@ -20418,10 +20755,12 @@ async function darwin() {
   const [level, available] = r.out.split(/\s+/).map(Number);
   if (level === undefined || available === undefined || Number.isNaN(level) || Number.isNaN(available))
     return null;
-  const pressure = level === MAC_PRESSURE_NORMAL ? "normal" : level === 2 ? "warn" : level === 4 ? "critical" : `level ${level}`;
+  return darwinSignal(level, available);
+}
+function darwinSignal(level, available) {
+  const pressure = level === 1 ? "normal" : level === 2 ? "warn" : level === MAC_PRESSURE_CRITICAL ? "critical" : `level ${level}`;
   return {
-    tight: level !== MAC_PRESSURE_NORMAL,
-    backstop: level === MAC_PRESSURE_NORMAL && available < AVAILABLE_FLOOR * 100,
+    tight: level === MAC_PRESSURE_CRITICAL || available < AVAILABLE_FLOOR * 100,
     why: `memory pressure ${pressure} with ${available}% available`
   };
 }
@@ -20441,7 +20780,7 @@ async function linux() {
   if (!total || available === null)
     return null;
   const percent = Math.round(available / total * 100);
-  return { tight: available / total < AVAILABLE_FLOOR, backstop: false, why: `${percent}% of memory available` };
+  return { tight: available / total < AVAILABLE_FLOOR, why: `${percent}% of memory available` };
 }
 async function sampleCosts(pgids) {
   const costs = new Map;
@@ -20593,16 +20932,12 @@ class IdlePolicy {
   }
   async checkPressure() {
     const signal = await (this.d.memory ?? memoryTight)();
-    if (!signal || !signal.tight && !signal.backstop)
+    if (!signal?.tight)
       return;
     const pick = this.d.state.worktrees.filter((w) => this.candidate(w.id)).sort((a, b) => this.entry(a.id).activeAt - this.entry(b.id).activeAt)[0];
     if (!pick)
       return;
-    const why = `${signal.why}; least recently used`;
-    if (signal.tight)
-      this.sleep(pick.id, why);
-    else
-      log.info(pick.id, `would sleep on the backstop: ${why}`);
+    this.sleep(pick.id, `${signal.why}; least recently used`);
   }
   async sampleCosts() {
     this.recordViewed();
@@ -20653,10 +20988,7 @@ class IdlePolicy {
     return true;
   }
   busy(id) {
-    const agent = this.d.runtime.agentFor(id);
-    if (agent && (agent.status !== "idle" || agent.queueItems.length > 0))
-      return true;
-    return this.d.runtime.holdCount(id) > 0;
+    return this.d.runtime.busy(id);
   }
   reconsider(id) {
     if (!this.candidate(id)) {
@@ -20740,7 +21072,7 @@ function humanMs(ms) {
 import { homedir as homedir9 } from "os";
 
 // ../daemon/src/agent/config.ts
-import { existsSync as existsSync18, readFileSync as readFileSync11 } from "fs";
+import { existsSync as existsSync19, readFileSync as readFileSync12 } from "fs";
 import { homedir as homedir8 } from "os";
 import { join as join16 } from "path";
 function agentConfigFiles(spec, repoPath, home = homedir8()) {
@@ -20748,7 +21080,7 @@ function agentConfigFiles(spec, repoPath, home = homedir8()) {
     id,
     label,
     path,
-    exists: existsSync18(path)
+    exists: existsSync19(path)
   });
   if (spec.id === "claude") {
     return [
@@ -20780,10 +21112,10 @@ function describeAgentConfig(spec, repoPath, home = homedir8()) {
   return { agent: spec.id, files, servers };
 }
 function readJson(path) {
-  if (!existsSync18(path))
+  if (!existsSync19(path))
     return null;
   try {
-    const v = JSON.parse(readFileSync11(path, "utf8"));
+    const v = JSON.parse(readFileSync12(path, "utf8"));
     return v && typeof v === "object" && !Array.isArray(v) ? v : null;
   } catch (e) {
     log.warn("agent-config", `${path} is not valid JSON`, e);
@@ -20801,11 +21133,11 @@ function serversOf(raw, scope) {
   });
 }
 function codexServers(path) {
-  if (!existsSync18(path))
+  if (!existsSync19(path))
     return [];
   const out = [];
   let current = null;
-  for (const raw of readFileSync11(path, "utf8").split(`
+  for (const raw of readFileSync12(path, "utf8").split(`
 `)) {
     const line = raw.trim();
     const header = /^\[mcp_servers\.("?)([^\]"]+)\1\]$/.exec(line);
@@ -21376,6 +21708,7 @@ var handlers = {
       ctx.reply({ t: "backfill", worktreeId: msg.worktreeId, events: coalesce(kept), log: [] });
       ctx.reply({ t: "queue", worktreeId: msg.worktreeId, items: [] });
       ctx.reply({ t: "agent-commands", worktreeId: msg.worktreeId, commands: [] });
+      await gitStatus(s, ctx, msg.worktreeId);
       return;
     }
     if (!ctx.subscribe(msg.worktreeId))
@@ -21410,6 +21743,9 @@ var handlers = {
   "mark-unread"(msg, _ctx, s) {
     s.turns.markUnread(msg.worktreeId);
   },
+  "set-draft"(msg, _ctx, s) {
+    s.drafts.set(msg.boxId, msg.text, msg.clientId);
+  },
   "refresh-git"(msg, _ctx, s) {
     s.worktrees.recount(msg.repoId);
   },
@@ -21422,7 +21758,12 @@ var handlers = {
   "forget-visit"(msg, _ctx, s) {
     s.routes.forget(msg.repoId, msg.path);
   },
-  chat(msg, _ctx, s) {
+  async chat(msg, _ctx, s) {
+    await s.worktrees.archivingNow(msg.worktreeId);
+    if (!s.state.worktree(msg.worktreeId) && s.worktrees.hasArchived(msg.worktreeId)) {
+      await s.worktrees.restore(msg.worktreeId, msg.clientId, { text: msg.text, attachments: msg.attachments });
+      return;
+    }
     requireRun(s, msg.worktreeId);
     const agent = s.runtime.agentFor(msg.worktreeId);
     if (!agent)
@@ -21475,8 +21816,8 @@ var handlers = {
         ctx.reply(shipped("", false, `batch: ${started} started, ${failed} failed (see daemon log)`));
     })(), "batch");
   },
-  async "remove-worktree"(msg, _ctx, s) {
-    await s.worktrees.remove(msg.worktreeId);
+  async "archive-worktree"(msg, _ctx, s) {
+    await s.worktrees.archiveWorktree(msg.worktreeId);
   },
   "list-archived"(msg, ctx, s) {
     ctx.reply({ t: "archived", repoId: msg.repoId, items: s.worktrees.archived(msg.repoId) });
@@ -21496,7 +21837,9 @@ var handlers = {
   async "read-file"(msg, ctx, s) {
     const head = { t: "file-read", worktreeId: msg.worktreeId, path: msg.path, ref: msg.ref, seq: msg.seq };
     try {
-      ctx.reply({ ...head, ...await s.files.read(msg.worktreeId, msg.path, msg.ref) });
+      const kept = s.worktrees.readable(msg.worktreeId) ? null : await s.worktrees.archivedFile(msg.worktreeId, msg.path, msg.ref);
+      const read = kept ? keptRead(kept.before, kept.after) : await s.files.read(msg.worktreeId, msg.path, msg.ref);
+      ctx.reply({ ...head, ...read });
     } catch (e) {
       if (!(e instanceof UserError))
         log.error(msg.worktreeId, "read-file failed", e);
@@ -21513,7 +21856,7 @@ var handlers = {
     ctx.reply({ t: "git-commit", worktreeId: msg.worktreeId, sha: msg.sha, files });
   },
   async land(msg, ctx, s) {
-    const { result, removeIds } = await s.worktrees.land(msg.worktreeId, msg.message);
+    const { result, archiveIds } = await s.worktrees.land(msg.worktreeId, msg.message);
     const suggestion = !result.ok && result.conflict ? "Bring main into this branch and resolve the conflicts, then verify the app still works." : undefined;
     if (result.ok && (result.pr || s.state.worktree(msg.worktreeId)?.pr)) {
       fireAndForget(msg.worktreeId, s.prs.refresh(msg.worktreeId), "pr refresh");
@@ -21521,7 +21864,7 @@ var handlers = {
     await notify(s, ctx, msg.worktreeId, shipped(msg.worktreeId, result.ok, result.message, {
       merged: result.ok,
       url: result.url,
-      removeIds: removeIds ?? [],
+      archiveIds: archiveIds ?? [],
       ...suggestion ? { suggestion } : {}
     }));
   },
@@ -21547,15 +21890,13 @@ var handlers = {
     ctx.reply({ t: "self", self: s.self.get() });
   },
   "restart-daemon"(_msg, _ctx, s) {
-    const busy = s.state.worktrees.filter((w) => s.runtime.agentFor(w.id)?.status === "working");
-    if (busy.length > 0) {
-      const names = busy.map((w) => w.title).join(", ");
-      throw new UserError(`still working on ${names}; restart once that settles`);
-    }
-    const refused = s.restart();
+    const refused = s.restarter.request();
     if (refused)
       throw new UserError(refused);
   },
+  "update-now"(_msg, _ctx, s) {
+    return s.update.updateNow();
+  },
   async commit(msg, ctx, s) {
     const result = await s.worktrees.commit(msg.worktreeId, msg.message);
     await notify(s, ctx, msg.worktreeId, shipped(msg.worktreeId, result.ok, result.message));
@@ -21574,7 +21915,7 @@ var handlers = {
       fireAndForget(msg.worktreeId, agent.warmCommands(), "warm commands");
   },
   async "list-files"(msg, ctx, s) {
-    ctx.reply({ t: "files", worktreeId: msg.worktreeId, paths: await s.files.list(msg.worktreeId) });
+    ctx.reply({ t: "files", worktreeId: msg.worktreeId, ...await s.files.list(msg.worktreeId) });
   },
   async search(msg, ctx, s) {
     const { hits, truncated } = await s.files.search(msg.worktreeId, msg.query);
@@ -21792,7 +22133,7 @@ async function dispatch(msg, ctx, s) {
 }
 
 // ../daemon/src/server/http.ts
-import { existsSync as existsSync19 } from "fs";
+import { existsSync as existsSync20 } from "fs";
 import { join as join17 } from "path";
 var IMMUTABLE = "private, max-age=31536000, immutable";
 var NO_STORE = "no-store";
@@ -21863,6 +22204,12 @@ function createFetch(opts) {
         headers["set-cookie"] = grantCookie(grant, remote.host);
       return Response.json(await opts.bootstrap(), { headers });
     }
+    if (url.pathname === "/restart" && req.method === "POST") {
+      if (!sameSecret(url.searchParams.get("token"), opts.token))
+        return new Response("unauthorized", { status: 401 });
+      const refused = opts.restart();
+      return refused ? new Response(refused, { status: 409 }) : new Response(null, { status: 202 });
+    }
     if (url.pathname === "/register" && req.method === "POST") {
       if (!sameSecret(req.headers.get("authorization"), `Bearer ${opts.token}`)) {
         return new Response("unauthorized", { status: 401 });
@@ -21885,7 +22232,7 @@ function createFetch(opts) {
         return new Response("unauthorized", { status: 401 });
       const [worktreeId, file, extra] = url.pathname.slice("/attachments/".length).split("/");
       const places = worktreeId && file && !extra ? [opts.attachments.fileFor(worktreeId, file), opts.archivedAttachment(worktreeId, file)] : [];
-      const path = places.find((p) => !!p && existsSync19(p));
+      const path = places.find((p) => !!p && existsSync20(p));
       if (!path)
         return new Response("not found", { status: 404 });
       return new Response(Bun.file(path), { headers: { "cache-control": IMMUTABLE } });
@@ -21893,13 +22240,13 @@ function createFetch(opts) {
     const rel = url.pathname === "/" ? "/index.html" : url.pathname;
     const file = join17(opts.shellDist, rel.replaceAll("..", ""));
     const hashed = rel.startsWith("/assets/");
-    if (existsSync19(file) && Bun.file(file).size > 0) {
+    if (existsSync20(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 = join17(opts.shellDist, "index.html");
-    if (existsSync19(index))
+    if (existsSync20(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 });
   };
@@ -21997,6 +22344,7 @@ function startServer(opts) {
       ...s.runtime.tiers()
     },
     costs: s.idle.costs(),
+    updates: s.update.status(),
     sockets: [...sockets].map((ws) => ({ subs: [...ws.data.subs], sent: ws.data.sent, bytes: ws.data.bytes }))
   });
   let statusesInFlight = false;
@@ -22106,28 +22454,35 @@ function startServer(opts) {
   });
   s.hub.on("agentsChanged", () => broadcast(agentsMsg()));
   s.hub.on("selfChanged", () => broadcast({ t: "self", self: s.self.get() }));
+  s.hub.on("updateChanged", () => broadcast({ t: "update", update: s.update.get() }));
   s.hub.on("visitsChanged", (repoId) => broadcast({ t: "visits", repoId, pages: s.routes.history(repoId) }));
   s.hub.on("archiveChanged", (repoId) => broadcast({ t: "archived", repoId, items: s.worktrees.archived(repoId) }));
-  const helloFrame = async () => ({
-    t: "hello",
-    version,
-    protocol: PROTOCOL_VERSION,
-    repos: s.state.repos,
-    rows: await s.worktrees.rows({ quick: true }),
-    spares: s.worktrees.spares(),
-    themes: s.themes.themes,
-    themePrefs: s.themes.prefs,
-    agents: agentInfos(),
-    defaultAgent: s.state.defaultAgent ?? DEFAULT_AGENT_ID,
-    agentChosen: s.state.defaultAgent !== undefined,
-    home: homedir9(),
-    folderDialog: process.platform === "darwin" && !cloud.enabled,
-    remote: opts.remote && { host: opts.remote.host, previews: opts.remote.previews },
-    gitIdentity: await s.repos.gitIdentity(),
-    pending: s.repos.pending,
-    visits: s.routes.historyAll(),
-    self: s.self.get()
-  });
+  s.hub.on("draftChanged", (boxId, text, clientId) => broadcast({ t: "draft", boxId, text, ...clientId ? { clientId } : {} }));
+  const helloFrame = async () => {
+    await s.update.refresh();
+    return {
+      t: "hello",
+      version,
+      protocol: PROTOCOL_VERSION,
+      repos: s.state.repos,
+      rows: await s.worktrees.rows({ quick: true }),
+      spares: s.worktrees.spares(),
+      themes: s.themes.themes,
+      themePrefs: s.themes.prefs,
+      agents: agentInfos(),
+      defaultAgent: s.state.defaultAgent ?? DEFAULT_AGENT_ID,
+      agentChosen: s.state.defaultAgent !== undefined,
+      home: homedir9(),
+      folderDialog: process.platform === "darwin" && !cloud.enabled,
+      remote: opts.remote && { host: opts.remote.host, previews: opts.remote.previews },
+      gitIdentity: await s.repos.gitIdentity(),
+      pending: s.repos.pending,
+      visits: s.routes.historyAll(),
+      self: s.self.get(),
+      update: s.update.get(),
+      drafts: s.drafts.all()
+    };
+  };
   let branded = false;
   const serverConfig = {
     hostname: cloud.bindHost,
@@ -22143,7 +22498,8 @@ function startServer(opts) {
       noteShellOrigin: opts.noteShellOrigin,
       remote: opts.remote,
       preview: (id) => s.runtime.get(id)?.proxy?.handler ?? null,
-      bootstrap: helloFrame
+      bootstrap: helloFrame,
+      restart: () => s.restarter.request()
     }),
     websocket: {
       maxPayloadLength: 64 * 1024 * 1024,
@@ -22220,7 +22576,8 @@ function startServer(opts) {
         } catch (e) {
           if (!(e instanceof UserError || e instanceof ThemeImportError))
             log.error("ws", `${parsed.msg.t} failed`, e);
-          const worktreeId = "worktreeId" in parsed.msg ? parsed.msg.worktreeId : undefined;
+          const m = parsed.msg;
+          const worktreeId = "worktreeId" in m ? m.worktreeId : ("archiveId" in m) ? m.archiveId : undefined;
           send(ws, {
             t: "error",
             message: e instanceof Error ? e.message : String(e),
@@ -22249,7 +22606,7 @@ function startServer(opts) {
 }
 
 // ../daemon/src/themes/store.ts
-import { existsSync as existsSync20, readdirSync as readdirSync5, readFileSync as readFileSync12, statSync as statSync6, writeFileSync as writeFileSync6 } from "fs";
+import { existsSync as existsSync21, readdirSync as readdirSync5, readFileSync as readFileSync13, statSync as statSync6, writeFileSync as writeFileSync7 } from "fs";
 import { homedir as homedir10 } from "os";
 import { basename as basename4, dirname as dirname7, join as join18, resolve as resolve8 } from "path";
 
@@ -23148,14 +23505,14 @@ class ThemeStore {
       name: json?.name ?? base,
       source: "file"
     });
-    writeFileSync6(join18(this.themesDir, `${base}.json`), `${JSON.stringify(theme, null, 2)}
+    writeFileSync7(join18(this.themesDir, `${base}.json`), `${JSON.stringify(theme, null, 2)}
 `);
     this.load();
     return theme;
   }
 }
 function readJsonc(file) {
-  return parse7(readFileSync12(file, "utf8"), [], { allowTrailingComma: true });
+  return parse7(readFileSync13(file, "utf8"), [], { allowTrailingComma: true });
 }
 function readVscodeTheme(file, depth = 0) {
   const json = readJsonc(file);
@@ -23177,7 +23534,7 @@ function readVscodeTheme(file, depth = 0) {
   return t;
 }
 function loadDir(dir) {
-  if (!existsSync20(dir))
+  if (!existsSync21(dir))
     return [];
   const out = [];
   for (const f of readdirSync5(dir)) {
@@ -23199,7 +23556,7 @@ function loadDir(dir) {
   return out;
 }
 function discover(dir) {
-  if (!existsSync20(dir))
+  if (!existsSync21(dir))
     return [];
   const out = [];
   let entries;
@@ -23212,18 +23569,18 @@ function discover(dir) {
     const extDir = join18(dir, name);
     const pkgFile = join18(extDir, "package.json");
     try {
-      if (!statSync6(extDir).isDirectory() || !existsSync20(pkgFile))
+      if (!statSync6(extDir).isDirectory() || !existsSync21(pkgFile))
         continue;
-      const pkg = JSON.parse(readFileSync12(pkgFile, "utf8"));
+      const pkg = JSON.parse(readFileSync13(pkgFile, "utf8"));
       const themes = pkg.contributes?.themes;
       if (!Array.isArray(themes))
         continue;
       const ext = `${pkg.publisher ?? "local"}.${pkg.name ?? name}`;
       let nls = {};
       const nlsFile = join18(extDir, "package.nls.json");
-      if (existsSync20(nlsFile)) {
+      if (existsSync21(nlsFile)) {
         try {
-          nls = JSON.parse(readFileSync12(nlsFile, "utf8"));
+          nls = JSON.parse(readFileSync13(nlsFile, "utf8"));
         } catch {}
       }
       for (const c of themes) {
@@ -23247,6 +23604,211 @@ function discover(dir) {
   return out;
 }
 
+// ../daemon/src/update/infra.ts
+import { homedir as homedir11 } 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());
+  if (!r.ok)
+    return { version: null, registry };
+  try {
+    const v = JSON.parse(r.out);
+    return { version: typeof v === "string" ? v : null, registry };
+  } catch {
+    return { version: null, 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 lines = `${r.out}
+${r.err}`.split(`
+`).map((l) => l.trim()).filter((l) => l !== "" && !LOG_POINTER.test(l));
+  return { ok: r.ok, line: lines.at(-1) ?? String(r.exit) };
+}
+
+// ../daemon/src/update/installed.ts
+async function readVersion(path) {
+  try {
+    const json = await Bun.file(path).json();
+    return typeof json.version === "string" ? json.version : null;
+  } catch {
+    return null;
+  }
+}
+
+// ../daemon/src/update/service.ts
+var REFRESH_EVERY_MS = 60000;
+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;
+
+class UpdateService {
+  d;
+  installed = null;
+  latest = null;
+  unreachable = null;
+  installing = false;
+  failed = null;
+  wanted = false;
+  busyAt;
+  announced;
+  now;
+  constructor(d) {
+    this.d = d;
+    this.now = d.now ?? Date.now;
+    this.busyAt = this.now();
+    this.announced = JSON.stringify(this.get());
+    const every = d.setInterval ?? ((fn, ms) => {
+      setInterval(fn, ms).unref?.();
+    });
+    const later = d.setTimeout ?? ((fn, ms) => {
+      setTimeout(fn, ms).unref?.();
+    });
+    every(() => fireAndForget("update", this.tick(), "update tick"), REFRESH_EVERY_MS);
+    every(() => fireAndForget("update", this.check(), "update check"), CHECK_EVERY_MS);
+    later(() => fireAndForget("update", this.check(), "update check"), FIRST_CHECK_MS);
+    d.hub.on("agentStatus", () => {
+      this.busyAt = this.now();
+      if (this.wanted)
+        fireAndForget("update", this.proceed(), "update");
+    });
+    d.hub.on("holdsChanged", () => {
+      this.busyAt = this.now();
+    });
+  }
+  async tick() {
+    await this.refresh();
+    await this.auto();
+  }
+  async refresh() {
+    const v = await this.d.installed();
+    if (v === null)
+      return;
+    this.installed = v === this.d.running ? null : v;
+    this.announce();
+  }
+  async check() {
+    if (this.d.method === "none" || this.d.managed)
+      return;
+    const answer = await this.d.latest();
+    if (answer.version === null) {
+      this.unreachable = answer.registry;
+      return;
+    }
+    this.unreachable = null;
+    this.latest = newer(answer.version, this.d.running) ? answer.version : null;
+    this.announce();
+    await this.auto();
+  }
+  async updateNow() {
+    if (this.d.managed)
+      throw new UserError("Updates are turned off for this machine (TOYON_UPDATES=off)");
+    const target = this.target();
+    if (target === null)
+      throw new UserError("Toyon is up to date");
+    if (this.needsInstall() && this.d.command(target) === null) {
+      throw new UserError(`Run npx toyon@${target} to use it`);
+    }
+    this.failed = null;
+    this.wanted = true;
+    await this.proceed();
+  }
+  get() {
+    const restarting = this.d.restarter.waitingOn() ?? (this.wanted && !this.installing ? this.d.restarter.working() : null);
+    if (this.installed === null && this.latest === null && !this.installing && this.failed === null && restarting === null) {
+      return null;
+    }
+    return {
+      running: this.d.running,
+      latest: this.latest,
+      installed: this.installed,
+      method: this.d.method,
+      installing: this.installing,
+      failed: this.failed,
+      restarting
+    };
+  }
+  status() {
+    return { managed: this.d.managed, unreachable: this.unreachable, latest: this.latest };
+  }
+  async auto() {
+    if (this.wanted || this.installing || this.d.managed)
+      return;
+    const target = this.target();
+    if (target === null)
+      return;
+    if (this.needsInstall() && this.d.command(target) === null)
+      return;
+    const failed = this.d.state.updateFailed;
+    if (failed?.version === target && this.now() - failed.at < RETRY_AFTER_MS)
+      return;
+    if (this.d.busy()) {
+      this.busyAt = this.now();
+      return;
+    }
+    if (this.now() - this.busyAt < SETTLED_MS)
+      return;
+    log.info("update", `nothing is busy: updating to ${target}`);
+    this.wanted = true;
+    await this.proceed();
+  }
+  target() {
+    if (this.latest && (this.installed === null || newer(this.latest, this.installed)))
+      return this.latest;
+    return this.installed;
+  }
+  needsInstall() {
+    const target = this.target();
+    return target !== null && target !== this.installed;
+  }
+  async proceed() {
+    if (!this.wanted || this.installing)
+      return;
+    if (this.d.restarter.working().length > 0) {
+      this.announce();
+      return;
+    }
+    const target = this.target();
+    const command = target === null ? null : this.d.command(target);
+    if (target !== null && command !== null && this.needsInstall()) {
+      this.installing = true;
+      this.announce();
+      log.info("update", `installing ${target}: ${command.join(" ")}`);
+      const r = await this.d.install(command);
+      this.installing = false;
+      if (!r.ok) {
+        this.wanted = false;
+        this.failed = { version: target, line: r.line, command: command.join(" ") };
+        this.d.state.setUpdateFailed({ version: target, at: this.now() });
+        log.warn("update", `installing ${target} failed: ${r.line}`);
+        this.announce();
+        return;
+      }
+      await this.refresh();
+    }
+    this.wanted = false;
+    const refused = this.d.restarter.request();
+    if (refused) {
+      this.failed = { version: target ?? this.d.running, line: refused, command: "toyon restart" };
+      log.warn("update", `restart refused: ${refused}`);
+    }
+    this.announce();
+  }
+  announce() {
+    const key = JSON.stringify(this.get());
+    if (key === this.announced)
+      return;
+    this.announced = key;
+    this.d.hub.emit("updateChanged");
+  }
+}
+
 // ../daemon/src/worktrees/chats.ts
 var CHAT_HITS_PER_WORKTREE = 20;
 var CHAT_HITS_MAX = 200;
@@ -23842,7 +24404,7 @@ function rankRefs({ refs, merged, prs, query, defaultBranch, rowIdForPath }) {
 }
 
 // ../daemon/src/worktrees/service.ts
-import { existsSync as existsSync22, lstatSync, readlinkSync, rmSync as rmSync5, symlinkSync, unlinkSync } from "fs";
+import { existsSync as existsSync23, lstatSync, readlinkSync, rmSync as rmSync5, symlinkSync, unlinkSync } from "fs";
 import { basename as basename6, dirname as dirname8, join as join21 } from "path";
 
 // ../daemon/src/git/archive.ts
@@ -23899,6 +24461,24 @@ async function commitOf(repoPath, ref) {
   const r = await git(repoPath, "rev-parse", "--verify", "--quiet", `${ref}^{commit}`);
   return r.ok ? r.out : null;
 }
+var landRef = (worktreeId, n) => `refs/toyon/lands/${worktreeId}/${n}`;
+async function landingMark(worktreePath, defaultBr) {
+  const [tip, base] = await Promise.all([
+    git(worktreePath, "rev-parse", "HEAD"),
+    git(worktreePath, "merge-base", "HEAD", defaultBr)
+  ]);
+  if (!tip.ok || !base.ok || !tip.out || tip.out === base.out)
+    return null;
+  return { base: base.out, tip: tip.out };
+}
+async function dropLandRefs(repoPath, worktreeId) {
+  const r = await git(repoPath, "for-each-ref", "--format=%(refname)", `refs/toyon/lands/${worktreeId}/`);
+  if (!r.ok || !r.out)
+    return;
+  for (const ref of r.out.split(`
+`).filter(Boolean))
+    await git(repoPath, "update-ref", "-d", ref);
+}
 
 // ../daemon/src/git/land.ts
 async function commitWorktree(worktreePath, message) {
@@ -24111,7 +24691,7 @@ function compareUrl(remoteUrl, base, branch) {
 }
 
 // ../daemon/src/worktrees/archive.ts
-import { existsSync as existsSync21, mkdirSync as mkdirSync6, readdirSync as readdirSync6, readFileSync as readFileSync13, renameSync as renameSync3, rmSync as rmSync4, writeFileSync as writeFileSync7 } from "fs";
+import { existsSync as existsSync22, mkdirSync as mkdirSync6, readdirSync as readdirSync6, readFileSync as readFileSync14, renameSync as renameSync4, rmSync as rmSync4, writeFileSync as writeFileSync8 } from "fs";
 import { join as join19 } from "path";
 class WorktreeArchive {
   dir;
@@ -24121,10 +24701,10 @@ class WorktreeArchive {
     mkdirSync6(dir, { recursive: true });
     for (const id of readdirSync6(dir)) {
       const file = this.filesOf(id).record;
-      if (!existsSync21(file))
+      if (!existsSync22(file))
         continue;
       try {
-        this.records.set(id, JSON.parse(readFileSync13(file, "utf8")));
+        this.records.set(id, JSON.parse(readFileSync14(file, "utf8")));
       } catch (e) {
         log.warn("archive", `skipped an unreadable record: ${file}`, e);
       }
@@ -24138,7 +24718,7 @@ class WorktreeArchive {
     mkdirSync6(at.dir, { recursive: true });
     move(from.transcript, at.transcript);
     move(from.attachments, at.attachments);
-    writeFileSync7(at.record, JSON.stringify(rec, null, 2));
+    writeFileSync8(at.record, JSON.stringify(rec, null, 2));
     this.records.set(rec.worktree.id, rec);
   }
   take(id, to) {
@@ -24187,13 +24767,14 @@ function summarize(r, repoId) {
     restorable: !!r.kept,
     ...r.kept?.snapshot ? { uncommitted: true } : {},
     ...r.worktree.landed ? { landed: true } : {},
-    ...r.cost !== undefined ? { cost: r.cost } : {}
+    ...r.cost !== undefined ? { cost: r.cost } : {},
+    ...r.auto ? { auto: r.auto } : {}
   };
 }
 function lastUsage(transcript) {
-  if (!existsSync21(transcript))
+  if (!existsSync22(transcript))
     return null;
-  const lines = readFileSync13(transcript, "utf8").split(`
+  const lines = readFileSync14(transcript, "utf8").split(`
 `);
   for (let i = lines.length - 1;i >= 0; i--) {
     if (!lines[i]?.includes('"usage"'))
@@ -24207,9 +24788,9 @@ function lastUsage(transcript) {
   return null;
 }
 function firstPrompt(transcript) {
-  if (!existsSync21(transcript))
+  if (!existsSync22(transcript))
     return;
-  for (const line of readFileSync13(transcript, "utf8").split(`
+  for (const line of readFileSync14(transcript, "utf8").split(`
 `)) {
     if (!line.includes('"user-message"'))
       continue;
@@ -24222,10 +24803,67 @@ function firstPrompt(transcript) {
   return;
 }
 function move(from, to) {
-  if (!existsSync21(from))
+  if (!existsSync22(from))
     return;
   rmSync4(to, { recursive: true, force: true });
-  renameSync3(from, to);
+  renameSync4(from, to);
+}
+
+// ../daemon/src/worktrees/archivedGit.ts
+class ArchivedGit {
+  repoPath;
+  kept;
+  lands;
+  defaultBr;
+  constructor(repoPath, kept, lands, defaultBr) {
+    this.repoPath = repoPath;
+    this.kept = kept;
+    this.lands = lands;
+    this.defaultBr = defaultBr;
+  }
+  async tailBase() {
+    const r = await git(this.repoPath, "merge-base", this.kept.head, this.defaultBr);
+    return r.ok && r.out ? r.out : this.kept.head;
+  }
+  async status() {
+    const base = await this.tailBase();
+    const { head, snapshot } = this.kept;
+    const [files, committed] = await Promise.all([
+      snapshot ? filesBetween(this.repoPath, head, snapshot) : [],
+      base === head ? [] : filesBetween(this.repoPath, base, head)
+    ]);
+    return { files, committed, head: snapshot ?? head };
+  }
+  async log() {
+    const seen = new Set;
+    const unseen = (list) => {
+      const out = list.filter((c) => !seen.has(c.sha));
+      for (const c of out)
+        seen.add(c.sha);
+      return out;
+    };
+    const landed = [];
+    for (const land of this.lands) {
+      const commits = unseen(await logRange(this.repoPath, land.base, land.tip));
+      landed.push(commits.map((c) => ({ ...c, landedAt: land.at })));
+    }
+    const base = await this.tailBase();
+    const tail = base === this.kept.head ? [] : unseen(await logRange(this.repoPath, base, this.kept.head));
+    return [...tail, ...landed.reverse().flat()];
+  }
+  commitFiles(sha) {
+    return commitFiles(this.repoPath, sha);
+  }
+  async file(path, ref) {
+    if (ref)
+      return fileAtCommit(this.repoPath, ref, path);
+    const base = await this.tailBase();
+    const [before, after] = await Promise.all([
+      gitRaw(this.repoPath, "show", `${base}:${path}`),
+      gitRaw(this.repoPath, "show", `${this.kept.snapshot ?? this.kept.head}:${path}`)
+    ]);
+    return { before: before.ok ? before.out : "", after: after.ok ? after.out : "" };
+  }
 }
 
 // ../daemon/src/worktrees/spare.ts
@@ -24243,7 +24881,7 @@ class SparePool {
   adopt(repoId) {
     const persisted = this.d.state.worktrees.filter((w) => w.repoId === repoId && w.kind === "spare");
     for (const extra of persisted.slice(1))
-      fireAndForget(extra.id, this.d.remove(extra.id), "stale spare removal");
+      fireAndForget(extra.id, this.d.discard(extra.id), "stale spare removal");
     const spare = persisted[0];
     if (!spare)
       return;
@@ -24300,7 +24938,7 @@ class SparePool {
       log.warn(repoId, "spare warm-up failed; rolling back", e);
       this.spares.delete(repoId);
       if (entry.worktreeId && this.d.state.worktree(entry.worktreeId)) {
-        await this.d.remove(entry.worktreeId).catch((re) => log.warn(repoId, "spare rollback failed", re));
+        await this.d.discard(entry.worktreeId).catch((re) => log.warn(repoId, "spare rollback failed", re));
       }
     }
   }
@@ -24506,9 +25144,6 @@ function stopOf(prev, next) {
     return "failed";
   return null;
 }
-function isUnseen(wt) {
-  return wt.unread === true || wt.lastTurn != null && (wt.seenAt == null || wt.seenAt < wt.lastTurn.at);
-}
 
 // ../daemon/src/worktrees/service.ts
 var LOCAL_CONFIG_FILES = [".env", ".env.local", ".env.development", ".env.development.local", ".dev.vars"];
@@ -24533,6 +25168,7 @@ class WorktreeService {
   d;
   spare;
   archive;
+  archiving = new Map;
   countsCache = new Map;
   discoverCache = new Map;
   usage = new Map;
@@ -24546,8 +25182,8 @@ class WorktreeService {
       runtime: d.runtime,
       paths: d.paths,
       setupAndStart: (wt, repo) => this.setupAndStart(wt, repo),
-      remove: async (id) => {
-        await this.remove(id, { spare: true });
+      discard: async (id) => {
+        await this.discardWorktree(id);
       }
     });
     for (const wt of d.state.worktrees)
@@ -24699,7 +25335,7 @@ class WorktreeService {
     const branch = kind === "pr" ? `pr/${number}` : ref;
     const title = kind === "pr" ? `pr-${number}` : cleanTitle2(ref) || "branch";
     let slug = title;
-    if (existsSync22(join21(this.d.paths.worktreesDir, repo.name, slug)))
+    if (existsSync23(join21(this.d.paths.worktreesDir, repo.name, slug)))
       slug = `${slug}-${shortId().slice(0, 4)}`;
     const wtPath = join21(this.d.paths.worktreesDir, repo.name, slug);
     await withRepoLock(repo.path, async () => {
@@ -24855,12 +25491,32 @@ class WorktreeService {
       }
     }), "auto-naming");
   }
-  async remove(worktreeId, opts = {}) {
+  archiveWorktree(worktreeId, opts = {}) {
+    const running = this.archiving.get(worktreeId);
+    if (running)
+      return running;
     const wt = this.d.state.worktree(worktreeId);
-    if (!wt || !(canRemove(wt) || opts.spare && wt.kind === "spare"))
-      return null;
+    if (!wt || !canArchive(wt))
+      return Promise.resolve(null);
+    if (opts.still && !opts.still())
+      return Promise.resolve(null);
+    const done = this.takeDown(wt, true, opts.reason).finally(() => this.archiving.delete(worktreeId));
+    this.archiving.set(worktreeId, done);
+    return done;
+  }
+  archivingNow(worktreeId) {
+    return this.archiving.get(worktreeId);
+  }
+  async discardWorktree(worktreeId) {
+    const wt = this.d.state.worktree(worktreeId);
+    if (!wt || !(canArchive(wt) || wt.kind === "spare"))
+      return;
+    await this.takeDown(wt, false);
+    this.d.drafts?.drop(worktreeId);
+  }
+  async takeDown(wt, archive, reason) {
+    const worktreeId = wt.id;
     const repo = this.d.state.requireRepo(wt.repoId);
-    const archive = wt.kind !== "spare" && opts.archive !== false;
     await this.d.runtime.stop(worktreeId);
     const kept = await withRepoLock(repo.path, async () => {
       const k = archive ? await this.keep(repo, wt) : null;
@@ -24878,9 +25534,12 @@ class WorktreeService {
     releasePort(wt.proxyPort);
     let archived = null;
     if (archive)
-      archived = this.archiveChat(wt, repo, kept, sessionId);
-    else
+      archived = this.archiveChat(wt, repo, kept, sessionId, reason);
+    else {
       this.deleteChat(worktreeId);
+      if (wt.lands?.length)
+        await dropLandRefs(repo.path, worktreeId);
+    }
     this.d.hub.emit("worktreesChanged");
     return archived;
   }
@@ -24893,7 +25552,7 @@ class WorktreeService {
       log.warn(wt.id, "could not keep its uncommitted changes: only its commits are archived");
     return kept;
   }
-  archiveChat(wt, repo, kept, sessionId) {
+  archiveChat(wt, repo, kept, sessionId, reason) {
     const files = this.chatFiles(wt.id);
     const prompt = firstPrompt(files.transcript);
     const cost = (this.usage.get(wt.id) ?? lastUsage(files.transcript))?.cost;
@@ -24904,7 +25563,8 @@ class WorktreeService {
       ...sessionId ? { sessionId } : {},
       ...prompt ? { prompt } : {},
       ...cost !== undefined ? { cost } : {},
-      ...kept ? { kept } : {}
+      ...kept ? { kept } : {},
+      ...reason ? { auto: reason } : {}
     };
     try {
       this.archive.put(rec, files);
@@ -24950,6 +25610,9 @@ class WorktreeService {
     });
     this.archiveChat(wt, repo, kept, sessionId);
   }
+  hasArchived(archiveId) {
+    return !!this.archive.get(archiveId);
+  }
   archived(repoId) {
     const repo = this.d.state.repo(repoId);
     return repo ? this.archive.list(repo) : [];
@@ -24971,6 +25634,28 @@ class WorktreeService {
     const files = this.archive.chatFiles(archiveId);
     return files && isAttachmentFile(file) ? join21(files.attachments, file) : null;
   }
+  archivedGit(archiveId) {
+    const rec = this.archive.get(archiveId);
+    const repo = rec && this.repoOf(rec);
+    if (!rec?.kept || !repo)
+      return null;
+    return new ArchivedGit(repo.path, rec.kept, rec.worktree.lands ?? [], repo.defaultBranch);
+  }
+  async archivedStatus(archiveId) {
+    const kept = this.archivedGit(archiveId);
+    if (!kept)
+      return null;
+    try {
+      return await kept.status();
+    } catch (e) {
+      log.warn(archiveId, "reading its kept changes failed", e);
+      return null;
+    }
+  }
+  async archivedFile(archiveId, path, ref) {
+    const kept = this.archivedGit(archiveId);
+    return kept ? kept.file(path, ref) : null;
+  }
   repoOf(rec) {
     return this.d.state.repo(rec.worktree.repoId) ?? this.d.state.repos.find((r) => r.path === rec.repoPath);
   }
@@ -24985,7 +25670,9 @@ class WorktreeService {
     const kept = rec.kept;
     if (!kept)
       throw new UserError(`${old.title} was archived without its commits, so there is nothing to restore`);
-    const path = existsSync22(old.path) ? join21(dirname8(old.path), `${basename6(old.path)}-${shortId().slice(0, 4)}`) : old.path;
+    if (rec.auto)
+      log.info(old.id, `restoring a worktree that archived itself (${rec.auto})`);
+    const path = existsSync23(old.path) ? join21(dirname8(old.path), `${basename6(old.path)}-${shortId().slice(0, 4)}`) : 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`);
@@ -25045,12 +25732,15 @@ class WorktreeService {
       return;
     const repo = this.repoOf(rec);
     const repoPath = repo?.path ?? rec.repoPath;
-    if (rec.kept && existsSync22(repoPath)) {
+    if (rec.kept && existsSync23(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 && existsSync23(repoPath))
+      await dropLandRefs(repoPath, archiveId);
     this.archive.delete(archiveId);
+    this.d.drafts?.drop(archiveId);
     if (repo)
       this.d.hub.emit("archiveChanged", repo.id);
   }
@@ -25120,7 +25810,7 @@ class WorktreeService {
     const group = wt.variant.group;
     const siblings = this.d.state.worktrees.filter((w) => w.variant?.group === group && w.id !== worktreeId);
     for (const sibling of siblings) {
-      await this.remove(sibling.id).catch((e) => log.warn(sibling.id, "could not remove variant sibling", e));
+      await this.archiveWorktree(sibling.id).catch((e) => log.warn(sibling.id, "could not archive variant sibling", e));
     }
     delete wt.variant;
     this.d.state.save();
@@ -25165,7 +25855,7 @@ class WorktreeService {
         agent.note(withoutAttachments(event));
     }
     for (const w of sources)
-      await this.remove(w.id, { archive: false });
+      await this.discardWorktree(w.id);
     this.setLanded(target.id, false);
     this.countsCache.delete(target.id);
     this.d.hub.emit("worktreesChanged");
@@ -25182,7 +25872,7 @@ class WorktreeService {
   async setupThenStart(wt, repo, depsSource, { setupCommands = true }) {
     const srcNm = join21(depsSource, "node_modules");
     const dstNm = join21(wt.path, "node_modules");
-    if (existsSync22(srcNm) && !existsSync22(dstNm)) {
+    if (existsSync23(srcNm) && !existsSync23(dstNm)) {
       const started = Date.now();
       const attempts = [
         ["clonefile", ["-Rc", srcNm, dstNm]],
@@ -25199,7 +25889,7 @@ class WorktreeService {
     }
     for (const f of LOCAL_CONFIG_FILES) {
       const src = join21(depsSource, f);
-      if (!existsSync22(src) || existsSync22(join21(wt.path, f)))
+      if (!existsSync23(src) || existsSync23(join21(wt.path, f)))
         continue;
       const r = await run("cp", [src, join21(wt.path, f)], wt.path);
       if (r.ok)
@@ -25319,12 +26009,14 @@ ${wt.landing.body}` : wt.landing.subject : undefined;
       const taken = await takeMainIn(wt.path, repo.defaultBranch, own);
       if (!taken.ok)
         return taken;
+      const mark = await landingMark(wt.path, repo.defaultBranch);
       const method = policy.merge ?? DEFAULT_MERGE_METHOD;
       const squash = method === "squash" ? await squashMessage(wt.path, repo.defaultBranch, suggested) : "";
       const landed = await landLocally(wt.path, wt.branch, repo.path, repo.defaultBranch, method, squash);
       if (!landed.ok)
         return landed;
       mergedHere = true;
+      await this.noteLand(repo, wt, mark);
       await this.restartFromMain(wt, repo.defaultBranch);
       if (policy.land === "push") {
         const pushed = await pushMain(repo.path, repo.defaultBranch);
@@ -25340,9 +26032,21 @@ ${wt.landing.body}` : wt.landing.subject : undefined;
     }
     if (!result.ok)
       return { result };
-    const removeIds = wt.variant ? this.d.state.worktrees.filter((w) => w.variant?.group === wt.variant?.group && w.id !== wt.id).map((w) => w.id) : [];
+    const archiveIds = wt.variant ? this.d.state.worktrees.filter((w) => w.variant?.group === wt.variant?.group && w.id !== wt.id).map((w) => w.id) : [];
     const where = policy.land === "push" ? `${repo.defaultBranch}, pushed` : repo.defaultBranch;
-    return { result: { ...result, message: `${wt.title} is on ${where}` }, removeIds };
+    return { result: { ...result, message: `${wt.title} is on ${where}` }, archiveIds };
+  }
+  async noteLand(repo, wt, mark) {
+    if (!mark)
+      return;
+    const n = wt.lands?.length ?? 0;
+    const pinned = await git(repo.path, "update-ref", landRef(wt.id, n), mark.tip);
+    if (!pinned.ok) {
+      log.warn(wt.id, `could not keep the commits it landed: ${pinned.err}`);
+      return;
+    }
+    wt.lands = [...wt.lands ?? [], { ...mark, at: Date.now() }];
+    this.d.state.save();
   }
   async restartFromMain(wt, defaultBr) {
     if (!hasOwnBranch(wt))
@@ -25355,9 +26059,11 @@ ${wt.landing.body}` : wt.landing.subject : undefined;
   async prMerged(worktreeId) {
     const { wt, repo } = this.d.state.requireWorktreeWithRepo(worktreeId);
     const result = await withRepoLock(repo.path, async () => {
+      const mark = await landingMark(wt.path, repo.defaultBranch);
       const pulled = await fastForwardMain(repo.path, repo.defaultBranch);
       if (!pulled.ok)
         return pulled;
+      await this.noteLand(repo, wt, mark);
       await this.restartFromMain(wt, repo.defaultBranch);
       return pulled;
     });
@@ -25505,6 +26211,14 @@ ${wt.landing.body}` : wt.landing.subject : undefined;
       return cached ?? {};
     }
   }
+  async freshCounts(worktreeId) {
+    const wt = this.d.state.worktree(worktreeId);
+    const repo = wt && this.d.state.repo(wt.repoId);
+    if (!wt || !repo)
+      return {};
+    this.countsCache.delete(worktreeId);
+    return this.counts(wt.id, wt.path, repo.defaultBranch, true);
+  }
   readable(id) {
     const wt = this.d.state.worktree(id);
     if (wt) {
@@ -25530,7 +26244,7 @@ ${wt.landing.body}` : wt.landing.subject : undefined;
   async gitStatus(worktreeId) {
     const r = this.readable(worktreeId);
     if (!r)
-      return null;
+      return this.archivedStatus(worktreeId);
     try {
       const isMain = r.wt?.kind === "main";
       const [files, counts, head] = await Promise.all([
@@ -25568,11 +26282,15 @@ ${wt.landing.body}` : wt.landing.subject : undefined;
   }
   async gitLog(worktreeId) {
     const r = this.readable(worktreeId);
-    return r ? logCommits(r.path, r.defaultBranch) : [];
+    if (r)
+      return logCommits(r.path, r.defaultBranch);
+    return await this.archivedGit(worktreeId)?.log() ?? [];
   }
   async commitFiles(worktreeId, sha) {
     const r = this.readable(worktreeId);
-    return r ? commitFiles(r.path, sha) : [];
+    if (r)
+      return commitFiles(r.path, sha);
+    return await this.archivedGit(worktreeId)?.commitFiles(sha) ?? [];
   }
   markPrompted(worktreeId) {
     const wt = this.d.state.worktree(worktreeId);
@@ -25639,11 +26357,112 @@ ${wt.landing.body}` : wt.landing.subject : undefined;
   }
 }
 
+// ../daemon/src/worktrees/sweep.ts
+var ARCHIVE_AFTER_MS = 2 * 60 * 60000;
+var SWEEP_EVERY_MS = 10 * 60000;
+function archiveAfterFrom(raw) {
+  if (raw === "off")
+    return null;
+  const n = Number(raw);
+  return raw && Number.isFinite(n) && n > 0 ? n : ARCHIVE_AFTER_MS;
+}
+
+class ArchiveSweep {
+  d;
+  timer = null;
+  running = false;
+  again = false;
+  afterMs;
+  constructor(d) {
+    this.d = d;
+    this.afterMs = d.afterMs === undefined ? ARCHIVE_AFTER_MS : d.afterMs;
+    if (this.afterMs === null)
+      return;
+    const every = d.setInterval ?? ((fn, ms) => {
+      const t = setInterval(fn, ms);
+      t.unref?.();
+      return t;
+    });
+    this.timer = every(() => this.request(), Math.min(d.everyMs ?? SWEEP_EVERY_MS, this.afterMs));
+  }
+  stop() {
+    if (this.timer && !this.d.setInterval)
+      clearInterval(this.timer);
+    this.timer = null;
+  }
+  request() {
+    if (this.running) {
+      this.again = true;
+      return;
+    }
+    this.running = true;
+    fireAndForget("sweep", this.sweep().finally(() => {
+      this.running = false;
+      if (!this.again)
+        return;
+      this.again = false;
+      this.request();
+    }), "archive sweep");
+  }
+  async sweep() {
+    if (this.afterMs === null)
+      return;
+    for (const repo of this.d.state.repos) {
+      const beforeGit = this.facts(repo.id, () => ({ dirty: 0, ahead: 0 }));
+      const maybe = beforeGit.rows.filter((w) => archiveReason(w, beforeGit) !== null);
+      if (maybe.length === 0)
+        continue;
+      const fresh = new Map;
+      for (const w of beforeGit.rows) {
+        if (!maybe.some((m) => m.id === w.id || !!m.variant && m.variant.group === w.variant?.group))
+          continue;
+        fresh.set(w.id, await this.d.worktrees.freshCounts(w.id));
+      }
+      const counts = (id) => fresh.get(id) ?? {};
+      for (const w of maybe) {
+        const reason = archiveReason(w, this.facts(repo.id, counts));
+        if (!reason)
+          continue;
+        log.info(w.id, `archiving on its own: ${reason}`);
+        try {
+          await this.d.worktrees.archiveWorktree(w.id, {
+            reason,
+            still: () => this.stillGoes(repo.id, w.id, counts)
+          });
+        } catch (e) {
+          log.warn(w.id, "could not archive it", e);
+        }
+      }
+    }
+  }
+  facts(repoId, counts) {
+    return {
+      now: (this.d.now ?? Date.now)(),
+      afterMs: this.afterMs ?? ARCHIVE_AFTER_MS,
+      rows: this.d.state.worktrees.filter((w) => w.repoId === repoId && w.kind !== "spare"),
+      viewed: this.d.viewed,
+      pending: this.d.busy,
+      drafted: (id) => this.d.drafts.has(id),
+      counts
+    };
+  }
+  stillGoes(repoId, id, counts) {
+    const f = this.facts(repoId, counts);
+    const wt = f.rows.find((w) => w.id === id);
+    return !!wt && archiveReason(wt, f) !== null;
+  }
+}
+
 // ../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 = dirname9(fileURLToPath(import.meta.url));
-var { shellDist: SHELL_DIST, bridgeJs: BRIDGE_JS, sourceRoot: SOURCE_ROOT } = locateAssets(here);
+var {
+  shellDist: SHELL_DIST,
+  bridgeJs: BRIDGE_JS,
+  sourceRoot: SOURCE_ROOT,
+  packageJson: PACKAGE_JSON
+} = locateAssets(here);
 var pruned = pruneAssets(SHELL_DIST);
 if (pruned > 0)
   log.debug("daemon", `pruned ${pruned} assets from builds this one has outlived`);
@@ -25692,7 +26511,8 @@ var runtime = new RuntimeRegistry({
   remote,
   grant: previewGrant(token)
 });
-var worktrees = new WorktreeService({ state, hub, runtime, paths, agents });
+var drafts = new DraftStore({ file: paths.draftsFile, hub });
+var worktrees = new WorktreeService({ state, hub, runtime, paths, agents, drafts });
 var turns = new TurnService({
   state,
   hub,
@@ -25724,7 +26544,7 @@ var prs = new PrService({ state, hub, worktrees, view: viewPr });
 var self = new SelfWatch(SOURCE_ROOT);
 await self.start();
 var afterLand = new AfterLand({ state, hub, self });
-var repos = new RepoRegistry({ state, hub, runtime, worktrees, afterLand, self });
+var repos = new RepoRegistry({ state, hub, runtime, worktrees, afterLand, self, drafts });
 var idle = new IdlePolicy({
   runtime,
   state,
@@ -25732,8 +26552,43 @@ var idle = new IdlePolicy({
   wake: (id) => repos.touch(id),
   warmSpare: (repoId) => repos.warm(repoId)
 });
+var sweep = new ArchiveSweep({
+  state,
+  viewed: (id) => idle.isViewed(id),
+  busy: (id) => runtime.busy(id),
+  drafts,
+  worktrees,
+  afterMs: archiveAfterFrom(process.env.TOYON_ARCHIVE_AFTER_MS)
+});
 var themes = new ThemeStore({ get: () => state.theme, set: (p) => state.setTheme(p) }, paths.themesDir);
 themes.load();
+var restarter = new Restarter({
+  hub,
+  state,
+  runtime,
+  refusal: () => {
+    const can = restartable();
+    return can.ok ? null : can.reason;
+  },
+  go: () => {
+    setTimeout(() => fireAndForget("daemon", shutdown("restart", { respawn: true }), "restart"), 100);
+  }
+});
+var installedPackage = cloud.enabled || process.env.TOYON_WORKTREE !== undefined ? null : PACKAGE_JSON;
+var method = installMethod(installedPackage);
+var update = new UpdateService({
+  hub,
+  state,
+  running: package_default.version,
+  method,
+  restarter,
+  installed: async () => installedPackage ? readVersion(installedPackage) : null,
+  latest: latestVersion,
+  command: (version) => installCommand(method, version),
+  install: runInstall,
+  busy: () => runtime.anyBusy(),
+  managed: process.env.TOYON_UPDATES === "off"
+});
 var { branded, stop: stopServer } = startServer({
   port,
   token,
@@ -25755,6 +26610,7 @@ var { branded, stop: stopServer } = startServer({
     exec,
     refs,
     chats,
+    drafts,
     prs,
     themes,
     agents,
@@ -25762,13 +26618,8 @@ var { branded, stop: stopServer } = startServer({
     attachments: attachments2,
     self,
     afterLand,
-    restart: () => {
-      const can = restartable();
-      if (!can.ok)
-        return can.reason;
-      fireAndForget("daemon", shutdown("restart", { respawn: true }), "restart");
-      return null;
-    },
+    restarter,
+    update,
     planTasks: makePlanner(agents),
     folderDialog: folderDialog()
   }
@@ -25784,10 +26635,14 @@ bridge.setShellOrigins([
   ],
   ...remote ? [`https://${remote.host}`] : []
 ]);
-writeFileSync8(paths.pidFile, `${process.pid}
+writeFileSync9(paths.pidFile, `${process.pid}
 `);
 var stopLagSampler = startLagSampler();
 await repos.boot();
+drafts.prune((id) => {
+  const repoId = draftRepoOf(id);
+  return repoId ? !!state.repo(repoId) : !!state.worktree(id) || worktrees.hasArchived(id);
+});
 idle.boot();
 fireAndForget("agents", agents.installMissing().then(() => probe.missing()), "agent adapter install");
 var repoArg = process.argv[2];
@@ -25821,9 +26676,11 @@ async function shutdown(signal, opts = {}) {
   idle.shutdown();
   repos.stopWatchers();
   prs.stop();
+  sweep.stop();
   stopLagSampler();
   stopServer();
   routes.flush();
+  drafts.flush();
   const deadline = new Promise((resolve) => setTimeout(resolve, 5000));
   await Promise.race([runtime.shutdown(), deadline]);
   rmSync6(paths.pidFile, { force: true });