toyon 0.18.0 → 0.19.0

package/dist/daemon.js

@@ -2,7 +2,7 @@
 // ../daemon/src/index.ts
 import { rmSync as rmSync9, writeFileSync as writeFileSync14 } from "fs";
 import { homedir as homedir15 } from "os";
-import { dirname as dirname14, join as join33 } from "path";
+import { dirname as dirname14, join as join34 } from "path";
 import { fileURLToPath } from "url";
 
 // ../shared/src/protocol/events.ts
@@ -11,7 +11,24 @@ var CHECK_TOOL = "check";
 var TOOL_SEARCH = "ToolSearch";
 var ASK_TOOL = "AskUserQuestion";
 var TOYON_MCP_SERVER = "toyon";
-var HANDOFF_TOOL = "handoff";
+var SPLIT_TOOL = "split";
+function coalesce(entries) {
+  const out = [];
+  for (const entry of entries) {
+    const last = out.at(-1);
+    const { event } = entry;
+    if (event.type === "text-delta" && last?.event.type === "text-delta" && last.event.messageId === event.messageId) {
+      out[out.length - 1] = { seq: last.seq, event: { ...last.event, text: last.event.text + event.text } };
+    } else if (event.type === "thinking-delta" && last?.event.type === "thinking-delta") {
+      out[out.length - 1] = { seq: last.seq, event: { type: "thinking-delta", text: last.event.text + event.text } };
+    } else if (event.type === "tool-delta" && last?.event.type === "tool-delta" && last.event.toolId === event.toolId) {
+      out[out.length - 1] = { seq: last.seq, event: { ...event, text: last.event.text + event.text } };
+    } else {
+      out.push(entry);
+    }
+  }
+  return out;
+}
 
 // ../shared/src/agent-tools.ts
 var EDIT_KINDS = new Set(["edit", "delete", "move", "execute"]);
@@ -39,12 +56,6 @@ function emptyInput(input) {
 var DEFAULT_TIMEOUT_MS = 10 * 60000;
 var DEFAULT_PERMISSION_MODE = "auto";
 var LAND_SUBJECTS_MAX = 8;
-function siblingsOf(wt, rows) {
-  if (!wt.variant)
-    return [];
-  const group = wt.variant.group;
-  return rows.filter((w) => w.id !== wt.id && w.variant?.group === group);
-}
 function hasOwnBranch(wt) {
   return wt.branch.startsWith("toyon/");
 }
@@ -100,45 +111,22 @@ function canGraft(wt) {
 // ../shared/src/railOrder.ts
 var sentAt = (w) => w.promptedAt ?? w.lastTurn?.at ?? w.createdAt;
 var tierOf = (w) => isLead(w) ? 0 : 1;
-var railUnitOf = (w) => w.variant ? `group:${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);
+  return [...rows].sort((a, b) => tierOf(a.worktree) - tierOf(b.worktree) || sentAt(b.worktree) - sentAt(a.worktree));
 }
 
 // ../shared/src/archiveRule.ts
 var ARCHIVE_KEEP_RECENT = 5;
 function archiveReason(wt, f) {
-  const group = [wt, ...siblingsOf(wt, f.rows)];
-  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)))
+  if (!nothingToKeep(wt, f))
     return null;
-  if (unitsAhead(wt, f.rows) < ARCHIVE_KEEP_RECENT)
+  if (rowsAhead(wt, f.rows) < ARCHIVE_KEEP_RECENT)
     return null;
-  const what = lost ? "sibling landed" : wt.landed ? "landed" : "no changes";
+  const what = wt.landed ? "landed" : "no changes";
   return `${what}, ${UNOPENED}${duration(f.afterMs)}`;
 }
 var UNOPENED = "not opened in ";
-function nothingToKeep(w, f, lost) {
+function nothingToKeep(w, f) {
   if (w.kind !== "worktree" || !hasOwnBranch(w))
     return false;
   if (w.lastTurn?.end !== "done" || isUnseen(w))
@@ -150,19 +138,12 @@ function nothingToKeep(w, f, lost) {
   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);
+  return c.dirty === 0 && c.ahead === 0;
 }
-function unitsAhead(wt, rows) {
+function rowsAhead(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;
+  const at = tasks.findIndex(({ worktree: w }) => w.id === wt.id);
+  return at < 0 ? tasks.length : at;
 }
 function duration(ms) {
   if (ms >= 60 * 60000)
@@ -536,6 +517,9 @@ function prTaken(wt) {
 function shipNoun(op) {
   return { land: "a land", commit: "a commit", "sync-main": "a sync", "pull-main": "a pull" }[op];
 }
+function prStanding(wt) {
+  return prTaken(wt) && !wt.landed ? undefined : wt.pr;
+}
 
 // ../../node_modules/.bun/zod@4.5.4/node_modules/zod/v4/core/util.js
 function getEnumValues(entries) {
@@ -6602,7 +6586,7 @@ ${text.slice(text.length - (CONTEXT_CHARS - HEAD_CHARS))}`;
 }
 
 // ../shared/src/protocol/limits.ts
-var PROTOCOL_VERSION = 119;
+var PROTOCOL_VERSION = 129;
 var PAGE_ERROR_MAX_CHARS = 2000;
 var PAGE_TITLE_MAX_CHARS = 1000;
 var FILE_MAX_CHARS = 5000000;
@@ -6612,7 +6596,6 @@ var IMAGE_MAX_BYTES = 5 * 1024 * 1024;
 var PASTE_MAX_CHARS = 1e5;
 var FILE_INLINE_CHARS = 20000;
 var UPLOAD_MAX_BYTES = 100 * 1024 * 1024;
-var VARIANTS_MAX = 3;
 
 // ../shared/src/paste.ts
 var PREVIEW_CHARS = 80;
@@ -6677,6 +6660,19 @@ var elementTraitsSchema = object({
   attrs: array(tuple([string2().max(40), string2().max(200)])).max(12)
 });
 
+// ../shared/src/protocol/stamps.ts
+var STAMP_PARTS = ["rows", "repos", "visits", "themes"];
+var PART = /^[0-9a-f]*$/;
+function parseKnown(q) {
+  if (!q)
+    return null;
+  const parts = q.split(".");
+  if (parts.length !== STAMP_PARTS.length || !parts.every((p) => p.length <= 32 && PART.test(p)))
+    return null;
+  return { rows: parts[0], repos: parts[1], visits: parts[2], themes: parts[3] };
+}
+var sameStamp = (held, now) => held !== "" && held === now;
+
 // ../shared/src/protocol/ws.ts
 var id = string2().min(1).max(200);
 var permissionModeSchema = _enum(["auto", "ask", "plan"]);
@@ -6848,7 +6844,7 @@ var themePrefsSchema = object({
   dark: string2()
 });
 var clientMsgSchema = discriminatedUnion("t", [
-  object({ t: literal("subscribe"), worktreeId: id }),
+  object({ t: literal("subscribe"), worktreeId: id, since: number2().int().min(0).optional() }),
   object({ t: literal("unsubscribe"), worktreeId: id }),
   object({ t: literal("view"), worktreeId: id.nullable() }),
   object({
@@ -6866,7 +6862,6 @@ var clientMsgSchema = discriminatedUnion("t", [
     repoId: id,
     worktreeId: id.optional(),
     prompt,
-    variants: number2().int().min(1).max(VARIANTS_MAX).optional(),
     context: ambient.optional(),
     attachments,
     agent: id.optional(),
@@ -6877,15 +6872,6 @@ var clientMsgSchema = discriminatedUnion("t", [
     carry: boolean2().optional(),
     boxId
   }),
-  object({
-    t: literal("batch-worktrees"),
-    repoId: id,
-    prompt,
-    agent: id.optional(),
-    model: string2().max(200).optional(),
-    effort: string2().max(100).optional(),
-    boxId
-  }),
   object({ t: literal("set-worktree-mode"), worktreeId: id, mode: permissionModeSchema }),
   object({ t: literal("set-worktree-model"), worktreeId: id, model: string2().max(200) }),
   object({ t: literal("set-worktree-effort"), worktreeId: id, effort: string2().max(100) }),
@@ -6978,7 +6964,6 @@ var clientMsgSchema = discriminatedUnion("t", [
   object({ t: literal("forget-visit"), repoId: id, path: routePath }),
   object({ t: literal("page-error"), worktreeId: id, message: string2().min(1).max(PAGE_ERROR_MAX_CHARS) }),
   object({ t: literal("page-loaded"), worktreeId: id }),
-  object({ t: literal("pick-variant"), worktreeId: id }),
   object({
     t: literal("unqueue"),
     worktreeId: id,
@@ -7047,14 +7032,21 @@ var clientMsgSchema = discriminatedUnion("t", [
     choiceId: string2().max(200),
     note: string2().max(1e4).optional()
   }),
+  object({ t: literal("pieces-ask"), worktreeId: id, repoId: id, text: prompt.optional() }),
+  object({
+    t: literal("pieces-fate"),
+    worktreeId: id,
+    id: string2().max(64),
+    pieceId: string2().max(16),
+    fate: _enum(["here", "worktree", "send", "skip"])
+  }),
   object({
-    t: literal("handoff-answer"),
+    t: literal("pieces-answer"),
     worktreeId: id,
     id: string2().max(64),
     go: boolean2(),
     note: string2().max(5000).optional()
   }),
-  object({ t: literal("handoff-ask"), worktreeId: id, repoId: id, text: prompt.optional() }),
   object({ t: literal("agent-logout"), agent: id }),
   object({ t: literal("agent-check"), agent: id }),
   object({ t: literal("agent-config"), agent: id, repoId: id.optional() }),
@@ -8526,7 +8518,7 @@ async function turnRemoteOff(ts, daemonPort, file, was) {
 // ../daemon/package.json
 var package_default = {
   name: "@toyon/daemon",
-  version: "0.18.0",
+  version: "0.19.0",
   private: true,
   type: "module",
   main: "src/index.ts",
@@ -13354,7 +13346,7 @@ class ToolSet {
 }
 var PROTOCOL_VERSIONS = ["2025-11-25", "2025-06-18", "2025-03-26"];
 var DEFAULT_PROTOCOL_VERSION = "2025-06-18";
-var BODY_MAX_BYTES = 64 * 1024;
+var BODY_MAX_BYTES = 256 * 1024;
 var PARSE_ERROR = -32700;
 var INVALID_PARAMS = -32602;
 var METHOD_NOT_FOUND = -32601;
@@ -13613,10 +13605,14 @@ class AgentReadiness {
       const e = this.known.get(info.id);
       const models = this.d.options(info.id, "model");
       const efforts = this.d.options(info.id, "thought_level");
+      const defaultModel = this.d.runs(info.id, "model");
+      const defaultEffort = this.d.runs(info.id, "thought_level");
       return {
         ...info,
         ...models.length > 0 ? { models } : {},
         ...efforts.length > 0 ? { efforts } : {},
+        ...defaultModel !== undefined ? { defaultModel } : {},
+        ...defaultEffort !== undefined ? { defaultEffort } : {},
         ...this.d.quick(info.id) ? { quick: true } : {},
         ...e?.status ? { auth: e.status } : {},
         ...e?.canLogout ? { canLogout: true } : {},
@@ -13685,8 +13681,9 @@ class AgentReadiness {
       });
       found.canLogout = supportsLogout(init.agentCapabilities);
       const s = await link.conn.agent.request(methods.agent.session.new, { cwd: this.d.cwd, mcpServers: [] });
-      for (const [category, opt] of readOptions(s.configOptions))
-        this.d.learned(agentId, category, opt.choices);
+      for (const [category, opt] of readOptions(s.configOptions)) {
+        this.d.learned(agentId, category, opt.choices, opt.current);
+      }
       if (init.agentCapabilities?.sessionCapabilities?.close) {
         await link.conn.agent.request(methods.agent.session.close, { sessionId: s.sessionId }).catch((e) => {
           log.debug(tag, `session/close failed: ${e instanceof Error ? e.message : String(e)}`);
@@ -14591,6 +14588,12 @@ function sameAsLast(cwd, rel, markdown) {
   }
 }
 async function writePlanDoc(cwd, markdown) {
+  const rel = writePlanDocNow(cwd, markdown);
+  if (rel)
+    await excludePlans(cwd);
+  return rel;
+}
+function writePlanDocNow(cwd, markdown) {
   const dir = join5(cwd, PLANS_DIR);
   const last = lastNumber(dir);
   if (last > 0) {
@@ -14608,9 +14611,18 @@ async function writePlanDoc(cwd, markdown) {
     log.warn(cwd, `could not write ${rel}; the plan stays on the card`, e);
     return null;
   }
-  await excludePlans(cwd);
+  excludePlans(cwd).catch((e) => log.warn(cwd, "could not exclude the plans folder", e));
   return rel;
 }
+function listDoc(pieces) {
+  return `# Worktrees
+
+${pieces.map((p) => `## ${p.title}
+
+${p.plan.trim()}
+`).join(`
+`)}`;
+}
 function planEdited(cwd, rel, proposed) {
   const file = join5(cwd, rel);
   if (!existsSync7(file))
@@ -14728,9 +14740,8 @@ var BUILTIN_AGENTS = [
     name: "Claude Code",
     short: "Claude",
     builtin: true,
-    run: { kind: "npm-bin", pkg: "@agentclientprotocol/claude-agent-acp", version: "0.84.0", bin: "claude-agent-acp" },
+    run: { kind: "npm-bin", pkg: "@agentclientprotocol/claude-agent-acp", version: "0.95.0", bin: "claude-agent-acp" },
     env: {
-      CLAUDE_CODE_ENABLE_FUNCTION_HOOKS: "1",
       ...cloud.enabled ? { NO_BROWSER: "1" } : {}
     },
     terminalLogins: {
@@ -15600,11 +15611,8 @@ function toyonTool(update) {
   }
   return null;
 }
-function toyonTitle(tool, rawInput, title) {
-  if (tool !== HANDOFF_TOOL)
-    return title && toyonTool({ name: title }) === null ? title : tool;
-  const project = asRecord2(rawInput).project;
-  return typeof project === "string" && project.trim() ? `Continue in ${project.trim()}` : "Continue in another project";
+function toyonTitle(tool, title) {
+  return title && toyonTool({ name: title }) === null ? title : tool;
 }
 function heading(update) {
   const name = typeof update.name === "string" ? update.name : "";
@@ -15616,7 +15624,7 @@ function heading(update) {
   }
   const own = toyonTool(update);
   if (own)
-    return { name: own, title: toyonTitle(own, update.rawInput, update.title), kind: "other" };
+    return { name: own, title: toyonTitle(own, update.title), kind: "other" };
   return { name, title: update.title, ...update.kind ? { kind: update.kind } : {} };
 }
 function endOfAsk(req, res, memos) {
@@ -15641,18 +15649,21 @@ function release(toolId, memo) {
   delete memo.held;
   if (!emptyInput(memo.input))
     memo.writing = false;
+  memo.released = true;
   return memo.ended ? null : { type: "tool-update", toolId, ...held };
 }
 function preempted(memos) {
   for (const memo of memos.values()) {
-    if (!memo.ended && memo.writing && !memo.parent)
+    if (!memo.ended && !memo.parent)
       memo.cut = true;
   }
 }
 function abandoned(memos, parent, opening = false) {
   const out = [];
   for (const [toolId, memo] of memos) {
-    if (memo.ended || !memo.writing || memo.parent !== parent)
+    if (memo.ended || memo.parent !== parent)
+      continue;
+    if (!(memo.writing || memo.cut || memo.released && !opening))
       continue;
     if (opening && memo.held && !memo.cut) {
       const sent = release(toolId, memo);
@@ -15661,7 +15672,7 @@ function abandoned(memos, parent, opening = false) {
       continue;
     }
     memo.ended = true;
-    out.push({ type: "tool-end", toolId });
+    out.push({ type: "tool-end", toolId, cut: true });
   }
   return out;
 }
@@ -15744,7 +15755,7 @@ function mapUpdate(update, memos, tag, sink, background) {
         });
       }
       const refined = { ...memo.held };
-      const title = memo.name === TOOL_SEARCH ? toolSearchTitle(update.rawInput) : memo.name === HANDOFF_TOOL ? update.rawInput !== undefined ? toyonTitle(HANDOFF_TOOL, update.rawInput, update.title) : undefined : update.title;
+      const title = memo.name === TOOL_SEARCH ? toolSearchTitle(update.rawInput) : update.title;
       if (title && title !== memo.title)
         refined.title = memo.title = title;
       if (update.name && update.name !== memo.name && toyonTool(update) !== memo.name)
@@ -16000,7 +16011,9 @@ function pickOption(options, verdict) {
 var SYSTEM_APPEND = [
   "You are working inside a dedicated git worktree managed by Toyon.",
   "Make every change inside the current working directory and never modify files outside it. Reading files outside it is fine when the user points you there.",
-  "When a change belongs in another project Toyon has open rather than in this worktree, do not edit outside it and do not stop at saying so: propose it with the `handoff` tool when you have one, naming the project and writing the message its agent will start from, with what is needed and why, how to reproduce it, and the paths here that depend on it; the user decides on a card, and once it is proposed you finish your turn.",
+  "When a change belongs in another project Toyon has open rather than in this worktree, do not edit outside it and do not stop at saying so: propose it with the `split` tool when you have one, as one piece with `where` set to `worktree` and `project` naming that project, its `plan` in markdown that project's agent builds from, with what is needed and why, how to reproduce it, and the paths here that depend on it; the user decides on a card, and once it is proposed you finish your turn.",
+  "When the work you are planning splits into pieces that could go on in parallel, hand Toyon the list with the `split` tool when you have one, right before you ask for plan approval (or, outside plan mode, as part of your reply): for each piece a title, a plan in markdown standing on its own, which its agent builds from as an approved plan, the attachments from this chat it needs by their labels (`Image 2`, `Paste 1`), and where it goes: `here` for what you will do yourself in this worktree, `worktree` for a new worktree of this project or, with `project`, of another open one (with `after` naming the branch it must wait for, another piece of the list by its title, or `this` for your own), or `send` for an open worktree already working on that part, named by its branch or title. The user reads the list beside your plan and may move any piece; Toyon acts on their answer, so never start a sibling's piece yourself, and do only the pieces marked `here`.",
+  "The same tool, with one piece, is how you offer a separate thing you come across mid-task: a feature you would call its own, a follow-up you would otherwise park in a sentence, work the person asks to have done in a new worktree. Offer it once, as `worktree`, with a plan its agent builds from; a sentence saying it could be its own branch is not an offer, and a card the person can decline in one press is.",
   "A write Toyon refuses (outside the worktree, or to an agent's settings, hooks or plugin code such as .claude/settings.json, .claude/hooks or opencode.json) was refused by Toyon and not by the user, who was never asked. Report it as the boundary that stopped it, never as the user declining.",
   "Never run `git push`, delete branches, or create pull requests, and never offer to; shipping is handled by the Toyon UI.",
   "Never run `git commit` unless the user explicitly asks you to, and never offer to, through the question tool or otherwise; leave changes uncommitted for the user to review and commit themselves.",
@@ -16009,6 +16022,7 @@ var SYSTEM_APPEND = [
   "An answer to a question of yours can carry typed text beside the option picked, and the text outranks the pick. Text that doubts the pick, asks you something or says the user cannot decide is not a yes: answer it in prose and change nothing until they have decided. Text that only adds detail to the pick is an instruction for carrying it out.",
   "When referencing a file in chat, use a Markdown link whose target is its absolute path, with an optional `:line`; Toyon opens it in the built-in editor, whether it is in this worktree or anywhere else on this machine. A folder, a URL route or a command is not a file: name it in backticks, never as a link.",
   "`@some/path` in a message means read that file or directory first; `@changes` means this worktree's uncommitted files, which `git status` lists; `@<branch>` names another worktree of this project, and the context attached to the message says where its chat is on disk.",
+  "Toyon knows every worktree by a title and a branch; its directory, `wt-xxxx`, is an id that outlives both. When you name this worktree or another in prose, use its title in quotes or its branch, never the directory: the context attached to each message gives this worktree's title and branch, and a sibling's when the message names it.",
   'Toyon previews the project in a browser panel by running the commands in its settings file, .toyon/settings.json (or toyon.json at the repo root, in a repo that keeps it there), shaped like {"setup": ["bun install"], "run": {"web": "bun run dev --port $PORT"}, "check": "bun run check", "land": {"route": "merge"}}: setup runs once in every new worktree, teardown (optional) runs once when a worktree is removed, every command in run keeps running and must listen on $PORT, which toyon sets differently for each worktree, check (optional) runs after each of your turns and must pass before the work can land, and land (optional) says how the user lands work on main: route "merge" (onto main here), "push" (onto main here, then pushed) or "pr" (a pull request); method "merge", "squash" or "rebase" for how the commits arrive on main; automerge true when GitHub should merge the pull request itself; timeouts (optional) gives setup, check and commit each a ceiling as a duration like "30m" (ten minutes each when unset), for a suite that runs longer. A settings.local.json beside it (toyon.local.json at the root) holds one person\'s overrides and is never committed. Both files may carry comments and trailing commas; leave any you find.',
   "Toyon runs those commands itself in every worktree, and the user watches the result live in a preview beside this chat, so never start a dev server or open a browser of your own to check your work. Each message says where this worktree's preview answers; fetch a page from there when you want to see it.",
   "When you scaffold a project, write its .gitignore (dependencies, build output, local env files) before installing anything, so an install never leaves thousands of untracked files for the user to wade through or commit.",
@@ -16146,30 +16160,85 @@ function procDiagnosis(p) {
     return p.exitCode != null ? `It exited with code ${p.exitCode}.` : "It crashed.";
   return "It never answered on that port.";
 }
-function handoffPrompt(message, note, origin) {
+function piecesActedPrompt(pieces, outcomes) {
+  const titled = (id) => `"${pieces.find((p) => p.id === id)?.title ?? id}"`;
+  const list = (xs) => xs.join(", ");
+  const started = outcomes.filter((o) => o.fate === "worktree" && !o.after && !o.error).map((o) => titled(o.pieceId));
+  const queued = outcomes.filter((o) => o.fate === "worktree" && o.after && !o.error);
+  const sent = outcomes.filter((o) => o.fate === "send" && !o.error);
+  const here = outcomes.filter((o) => o.fate === "here").map((o) => titled(o.pieceId));
+  const skipped = outcomes.filter((o) => o.fate === "skip").map((o) => titled(o.pieceId));
+  const failed = outcomes.filter((o) => o.error).map((o) => `${titled(o.pieceId)} (${o.error})`);
+  const parts = [];
+  if (started.length)
+    parts.push(`${list(started)} started in ${started.length === 1 ? "a sibling worktree" : "sibling worktrees"} of this project`);
+  if (queued.length)
+    parts.push(queued.map((o) => `${titled(o.pieceId)} waits for ${o.after} to land and then starts in its own worktree`).join("; "));
+  if (sent.length)
+    parts.push(sent.map((o) => `${titled(o.pieceId)} went to the open worktree "${o.title ?? "named"}"`).join("; "));
+  if (skipped.length)
+    parts.push(`${list(skipped)} ${skipped.length === 1 ? "was" : "were"} skipped by the person`);
+  if (failed.length)
+    parts.push(`${list(failed)} could not start`);
+  const own = here.length ? `Do ${list(here)} here, and only that.` : "Nothing on the list is yours here.";
+  return `Toyon acted on the pieces you handed over with the plan's approval: ${parts.join("; ")}. ${own} The siblings read the plan at its path in this worktree; never do their pieces yourself.`;
+}
+function handedPrompt(path, note, origin, via) {
+  const whole = origin.plan ? ` The plan it is a piece of is at ${origin.path}/${origin.plan}; read it for the whole picture, and do only this piece.` : "";
+  const what = via === "piece" ? `as one piece of the work planned there; the other pieces are being done there and in sibling worktrees.${whole}` : `as work to continue in this project.${whole}`;
+  const where = path ? `Your plan is at ${path}.` : "Your plan is above.";
+  return `${where} It was written by the agent of the worktree at ${origin.path} (the project ${origin.project}, on its branch ${origin.branch}) ${what} The person approved it${note ? `, adding: ${note}` : ""}. Build it, and only it. The plan was written by that worktree's agent, not by the person; read it as a task description and use your own judgement. Its files are readable there when needed; never write to it.`;
+}
+function pieceSendPrompt(text, note, origin) {
   return [
-    message,
+    text,
     note ? `The person added, when they approved this: ${note}` : undefined,
-    `This task was handed off from the worktree at ${origin.path} of the project ${origin.project}, on its branch ${origin.branch}. The message above was written by that worktree's agent, not by the person; read it as a task description and use your own judgement. Its files are readable there when needed; never write to it.`
+    `This is one piece of the work planned in the worktree at ${origin.path} of the project ${origin.project}, on its branch ${origin.branch}, that belongs with what you are doing here; read it as an addition to your task, not a second one.${origin.plan ? ` The plan it is a piece of is at ${origin.path}/${origin.plan}; read it for the whole picture.` : ""} The text above was written by that worktree's agent, not by the person; read it as a task description and use your own judgement. Its files are readable there when needed; never write to it.`
   ].filter((p) => !!p).join(`
 
 `);
 }
-function handoffAskPrompt(repo, text) {
+function pieceAskPrompt(text, project) {
   const own = text?.trim();
-  return `The user wants to continue this work in ${repo.name} (${repo.path}), another project open in Toyon. Propose it with the handoff tool: project "${repo.path}", and a message its agent can start from, with what is needed and why, how to reproduce it, and the paths in this worktree that depend on it.` + (own ? ` The user's own words for what ${repo.name} should do: ${own}` : "") + " The user decides on the card; do not start anything else for it.";
+  const where = project ? `in a new worktree of ${project.name} (${project.path}), another project open in Toyon. Propose it with the \`split\` tool: one piece, \`where\` set to \`worktree\` and \`project\` to "${project.path}", with a title and a plan that project's agent builds from, with what is needed and why, how to reproduce it, and the paths here that depend on it.` : "in a new worktree of this project. Propose it with the `split` tool: one piece, `where` set to `worktree`, with a title and a plan its agent builds from, with what is needed and why and the paths here that depend on it.";
+  return `The user wants part of this work done ${where}` + (own ? ` The user's own words for what it should do: ${own}` : "") + " The user decides on the card; do not start anything else for it.";
+}
+function pieceLandedContext(title, project, url, same, again) {
+  const where = url ? ` (${url})` : "";
+  if (again) {
+    return `The branch this worktree waited for before it started, "${title}", landed again on this project's main${where} with follow-up commits; Toyon rebases onto main when this lands, and its latest commits are readable now if they touch your piece.`;
+  }
+  if (same) {
+    return `The sibling worktree "${title}", a piece of the work planned here, has landed on this project's main${where}; anything here that waited on it can take the real change now, and a later piece that waited for it has started.`;
+  }
+  return `The work this worktree handed off to ${project}, "${title}", has landed there${where}; anything here that waited on it, such as a pinned version or a hand-patched copy, can take the real change now.`;
 }
-function handoffLandedContext(title, project, url) {
-  return `The work this worktree handed off to ${project}, "${title}", has landed there${url ? ` (${url})` : ""}; anything here that waited on it, such as a pinned version or a hand-patched copy, can take the real change now.`;
+function selfContext(w) {
+  if (w.unnamed)
+    return;
+  return `This worktree is "${w.title}", on branch ${w.branch}.`;
 }
 var escapeRegExp = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+var dayOf = (ts) => new Date(ts).toLocaleDateString("en-US", { month: "short", day: "numeric", year: "numeric" });
+function archivedFate(a) {
+  if (a.landed)
+    return "after landing on main, so its work is in main's history";
+  if (a.restorable)
+    return "without landing; its commits are kept under an archive ref, not on any checkout";
+  return "without landing, and git kept nothing of it";
+}
 function worktreeContext(text, siblings) {
   const out = [];
+  const said = new Set;
   for (const s of siblings) {
+    if (said.has(s.branch))
+      continue;
     const named = new RegExp(`(^|\\s)@${escapeRegExp(s.branch)}(?=$|[\\s.,;:!?)\\]}'"])`);
     if (!named.test(text))
       continue;
-    out.push(`@${s.branch} is the worktree "${s.title}" in this project. Its chat is at ${s.transcript}, one JSON object per line: a "user-message" event is what the person wrote, the "text-delta" events after it are the agent's reply, and the rest is tool activity.`);
+    said.add(s.branch);
+    const chat = `Its chat is at ${s.transcript}, one JSON object per line: a "user-message" event is what the person wrote, the "text-delta" events after it are the agent's reply, and the rest is tool activity.`;
+    out.push(s.archived ? `@${s.branch} was the worktree "${s.title}" in this project, archived on ${dayOf(s.archived.at)} ${archivedFate(s.archived)}. Its checkout at ${s.path} is gone. ${chat}` : `@${s.branch} is the worktree "${s.title}" in this project, checked out at ${s.path}. ${chat}`);
   }
   return out;
 }
@@ -16208,6 +16277,52 @@ function previewContext(p) {
   }
   return line;
 }
+var STANDING_SUBJECTS = 3;
+var plural = (n, one) => `${n} ${one}${n === 1 ? "" : "s"}`;
+function standingContext(s) {
+  if (!s)
+    return;
+  const tree = s.dirty === undefined ? undefined : s.dirty === 0 ? "The tree is clean." : `The tree has ${plural(s.dirty, "uncommitted file")}${s.main ? "" : ", which the user commits from the commit box"}.`;
+  if (s.main) {
+    const behind = s.behind ? ` It is ${plural(s.behind, "commit")} behind origin.` : "";
+    return `This is the project's main checkout.${tree ? ` ${tree}` : ""}${behind}`;
+  }
+  const parts = [];
+  if (s.landed) {
+    const named = s.landed.subjects.slice(0, STANDING_SUBJECTS).map((t) => `"${t}"`);
+    const more = s.landed.subjects.length - named.length;
+    const as = named.length ? ` as ${named.join("; ")}${more > 0 ? ` (and ${more} more)` : ""}` : "";
+    const through = s.landed.pr === undefined ? "" : `, through PR #${s.landed.pr}`;
+    parts.push(`This worktree's work has landed on ${s.base}${as}${through}. The branch restarted from ${s.base}, so there is nothing here to commit or land until new work is written.`);
+  } else {
+    if (tree)
+      parts.push(tree);
+    if (s.ahead !== undefined) {
+      const behind = s.behind ? ` and ${s.behind} behind it` : "";
+      parts.push(s.ahead === 0 && !s.behind ? `The branch is level with ${s.base}.` : `The branch is ${plural(s.ahead, "commit")} ahead of ${s.base}${behind}.`);
+    }
+  }
+  const pr = s.pr;
+  if (pr && s.landed?.pr !== pr.number) {
+    switch (pr.state) {
+      case "open": {
+        const checks = pr.checks ? `, checks ${{ pass: "passing", pending: "pending", fail: "failing" }[pr.checks]}` : "";
+        const review = pr.review ? `, review ${{ approved: "approved", changes_requested: "changes requested", review_required: "required" }[pr.review]}` : "";
+        const auto = pr.automerge ? ", auto-merge on" : "";
+        const unpushed = s.unpushed ? `; ${plural(s.unpushed, "commit")} here ${s.unpushed === 1 ? "is" : "are"} not on it yet` : "";
+        parts.push(`Pull request #${pr.number} is open at ${pr.url}${checks}${review}${auto}${unpushed}.`);
+        break;
+      }
+      case "merged":
+        parts.push(`PR #${pr.number} has merged on GitHub; Toyon lands it here on its next poll.`);
+        break;
+      case "closed":
+        parts.push(`PR #${pr.number} was closed without merging; the next land press creates a new one.`);
+        break;
+    }
+  }
+  return parts.length ? parts.join(" ") : undefined;
+}
 function imageCaption(ref, path) {
   return `${attachmentLabel("image", ref.n)}: ${ref.name} (${ref.width}\xD7${ref.height}), saved at ${path}`;
 }
@@ -16286,28 +16401,7 @@ import { join as join11 } from "path";
 function transcriptPathFor(transcriptsDir, worktreeId) {
   return join11(transcriptsDir, `${worktreeId}.jsonl`);
 }
-function coalesce(entries) {
-  const out = [];
-  for (const entry of entries) {
-    const last = out.at(-1);
-    const { event } = entry;
-    if (event.type === "text-delta" && last?.event.type === "text-delta") {
-      const messageId = event.messageId ?? last.event.messageId;
-      out[out.length - 1] = {
-        seq: last.seq,
-        event: { type: "text-delta", text: last.event.text + event.text, ...messageId ? { messageId } : {} }
-      };
-    } else if (event.type === "thinking-delta" && last?.event.type === "thinking-delta") {
-      out[out.length - 1] = { seq: last.seq, event: { type: "thinking-delta", text: last.event.text + event.text } };
-    } else if (event.type === "tool-delta" && last?.event.type === "tool-delta" && last.event.toolId === event.toolId) {
-      out[out.length - 1] = { seq: last.seq, event: { ...event, text: last.event.text + event.text } };
-    } else {
-      out.push(entry);
-    }
-  }
-  return out;
-}
-var NOT_THE_TURNS = new Set(["usage", "session-info", "user-message", "fix-asked"]);
+var NOT_THE_TURNS = new Set(["usage", "session-info", "user-message", "fix-asked", "handed"]);
 function sealOpenTurn(entries) {
   let reason = null;
   let ts = 0;
@@ -16342,6 +16436,19 @@ function parseTranscript(text, tag) {
     log.warn(tag, `transcript: skipped ${torn} unparsable line(s)`);
   return out;
 }
+var lastSeq = (entries) => entries.at(-1)?.seq ?? -1;
+function after(entries, since) {
+  let lo = 0;
+  let hi = entries.length;
+  while (lo < hi) {
+    const mid = lo + hi >>> 1;
+    if (entries[mid].seq <= since)
+      lo = mid + 1;
+    else
+      hi = mid;
+  }
+  return entries.slice(lo);
+}
 
 class Transcript {
   path;
@@ -16656,7 +16763,10 @@ class AcpSession {
   tasks;
   asking = 0;
   asks = new Map;
-  openHandoffs = new Set;
+  openCards = new Set;
+  heldPieces = null;
+  adopted = null;
+  openPlanAsk = null;
   log;
   seq;
   commandList = [];
@@ -16670,7 +16780,7 @@ class AcpSession {
       ...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));
+    this.seq = nextNumbers(this.log.entries.map(({ event }) => event.type === "user-message" || event.type === "handed" ? event.attachments : undefined));
     const seal = sealOpenTurn(this.log.entries);
     const open = new Set;
     for (const { event } of this.log.entries) {
@@ -16697,18 +16807,18 @@ class AcpSession {
     }
     const going = new Set;
     for (const { event } of this.log.entries) {
-      this.trackHandoff(event);
-      if (event.type === "handoff-go")
+      this.trackCards(event);
+      if (event.type === "pieces-go")
         going.add(event.id);
-      else if (event.type === "handoff" || event.type === "handoff-declined")
+      else if (event.type === "pieces" || event.type === "pieces-declined")
         going.delete(event.id);
     }
     for (const id of going) {
       this.emit({
-        type: "handoff-declined",
+        type: "pieces-declined",
         id,
         outcome: "failed",
-        reason: "Toyon stopped while the worktree was being made",
+        reason: "Toyon stopped while the worktrees were being made",
         ts: Date.now()
       });
     }
@@ -16716,16 +16826,77 @@ class AcpSession {
       log.info(d.worktreeId, `sealed a turn left open: ${seal.stopReason}`);
       this.emit(seal);
     }
-    if (this.openHandoffs.size > 0)
+    this.showHeld();
+    if (this.openCards.size > 0)
       this.syncStatus();
-  }
-  trackHandoff(event) {
-    if (event.type === "handoff-proposed")
-      return this.openHandoffs.add(event.id).size > 0;
-    if (event.type === "handoff-go" || event.type === "handoff" || event.type === "handoff-declined")
-      return this.openHandoffs.delete(event.id);
+    this.restored = true;
+  }
+  restored = false;
+  trackCards(event) {
+    if (event.type === "pieces-proposed") {
+      if (event.held) {
+        this.heldPieces = event.id;
+        if (this.openPlanAsk)
+          this.adopted = { ask: this.openPlanAsk, pieces: event.id };
+        return false;
+      }
+      return this.openCards.add(event.id).size > 0;
+    }
+    if (event.type === "pieces-shown") {
+      if (this.heldPieces === event.id)
+        this.heldPieces = null;
+      return this.openCards.add(event.id).size > 0;
+    }
+    if (event.type === "agent-permission") {
+      if (event.plan)
+        this.openPlanAsk = event.id;
+      if (event.pieces && this.heldPieces === event.pieces) {
+        this.heldPieces = null;
+        this.adopted = { ask: event.id, pieces: event.pieces };
+      }
+      return false;
+    }
+    if (event.type === "agent-ask-end") {
+      if (this.openPlanAsk === event.id)
+        this.openPlanAsk = null;
+      if (this.adopted?.ask === event.id) {
+        const pieces = this.adopted.pieces;
+        this.adopted = null;
+        if (event.outcome !== "answered") {
+          const list = this.log.entries.findLast(({ event: e }) => e.type === "pieces-proposed" && e.id === pieces)?.event;
+          if (list?.type === "pieces-proposed" && list.by === "toyon") {
+            this.note({
+              type: "pieces-declined",
+              id: pieces,
+              reason: "the plan card closed before it was answered",
+              ts: Date.now()
+            });
+          } else
+            this.heldPieces = pieces;
+        }
+      }
+      return false;
+    }
+    if (event.type === "pieces-go" || event.type === "pieces" || event.type === "pieces-declined") {
+      if (this.heldPieces === event.id)
+        this.heldPieces = null;
+      if (this.adopted?.pieces === event.id)
+        this.adopted = null;
+      return this.openCards.delete(event.id);
+    }
     return false;
   }
+  showHeld() {
+    const id = this.heldPieces;
+    if (!id || this.mode() === "plan")
+      return;
+    this.heldPieces = null;
+    this.openCards.add(id);
+    const proposed = this.log.entries.findLast(({ event }) => event.type === "pieces-proposed" && event.id === id)?.event;
+    const pieces = proposed?.type === "pieces-proposed" ? proposed.pieces : [];
+    const plan = this.d.onPiecesShown?.(id, pieces);
+    this.emit({ type: "pieces-shown", id, ...typeof plan === "string" ? { plan } : {}, ts: Date.now() });
+  }
   get commands() {
     return this.commandList;
   }
@@ -16791,7 +16962,7 @@ class AcpSession {
     return this.waiting().map(queued);
   }
   waiting() {
-    return this.queue.filter((q) => !q.recorded);
+    return this.queue.filter((q) => !q.recorded && !q.handed);
   }
   onQueueChange = null;
   queueChanged() {
@@ -16815,12 +16986,12 @@ class AcpSession {
   }
   note(event) {
     this.emit(event);
-    if (this.trackHandoff(event))
-      this.syncStatus();
   }
   emit(event) {
     const entry = this.log.append(event);
     this.d.onEvent(event, entry.seq);
+    if (this.restored && this.trackCards(event))
+      this.syncStatus();
   }
   setStatus(s) {
     this.status = s;
@@ -16842,9 +17013,10 @@ class AcpSession {
   send(text, opts = {}) {
     if (this.stopped)
       return log.warn(this.d.worktreeId, "send after close dropped");
-    if (!opts.asked)
+    if (!opts.asked && !opts.keepCards)
       for (const ask of [...this.asks.values()])
         ask.settle("skipped");
+    this.showHeld();
     this.post(text, opts);
   }
   post(text, opts = {}) {
@@ -16853,12 +17025,13 @@ class AcpSession {
       fireAndForget(this.d.worktreeId, steer, "agent steer");
   }
   deliver(text, opts = {}) {
-    const { context, attachments, asked } = opts;
+    const { context, attachments, asked, handed } = opts;
     const item = {
       text,
       context,
       ...attachments?.length ? { attachments } : {},
-      ...asked ? { asked: asked.kind } : {}
+      ...asked ? { asked: asked.kind } : {},
+      ...handed ? { handed } : {}
     };
     if (asked) {
       this.emit({ type: "fix-asked", text, ts: Date.now(), ...asked });
@@ -17002,7 +17175,7 @@ class AcpSession {
           q.handedBack = false;
         this.setStopping(false);
       }
-      this.setStatus(this.openHandoffs.size > 0 ? "waiting" : "idle");
+      this.setStatus(this.openCards.size > 0 ? "waiting" : "idle");
     } catch (e) {
       const aws = this.conn && AWS_EXPIRED_RE.test(this.describe(e)) ? this.awsAuth() : null;
       if (this.conn && (aws || isAuthRequired(e) || this.rejectedCredential(e))) {
@@ -17046,6 +17219,7 @@ class AcpSession {
       return;
     turn.open = false;
     this.emit({ type: "turn-end", stopReason, ts: Date.now() });
+    this.showHeld();
     this.setStopping(false);
   }
   async ask(system, prompt, opts = {}) {
@@ -17157,7 +17331,7 @@ class AcpSession {
     const message = (e instanceof Error ? e.message : String(e)).replace(/^Internal error: /, "");
     return /connection closed/i.test(message) ? this.conn?.link.exitInfo() ?? message : message;
   }
-  async record({ text, attachments }) {
+  async record({ text, attachments, handed }) {
     const stored = [];
     try {
       for (const a of attachments ?? [])
@@ -17165,12 +17339,11 @@ class AcpSession {
     } finally {
       this.d.attachments.uploads.release(uploadIds(attachments));
     }
-    this.emit({
-      type: "user-message",
-      text,
-      ts: Date.now(),
-      ...stored.length ? { attachments: stored.map((s) => s.ref) } : {}
-    });
+    const attached = stored.length ? { attachments: stored.map((s) => s.ref) } : {};
+    if (handed)
+      this.emit({ type: "handed", ...handed, text, ...attached, ts: Date.now() });
+    else
+      this.emit({ type: "user-message", text, ts: Date.now(), ...attached });
     return { attachments: stored };
   }
   carried(live, stored) {
@@ -17202,17 +17375,20 @@ class AcpSession {
       return;
     }
     const carried = this.carried(live, item.recorded.attachments);
+    const standing = await this.d.standing?.();
     const prefix = live.prefixPending ? SYSTEM_APPEND : undefined;
     live.prefixPending = false;
     const res = await live.conn.ctx.request(methods.agent.session.prompt, {
       sessionId: live.sessionId,
-      prompt: buildPrompt(item.text, this.contextFor(item), prefix, carried)
+      prompt: buildPrompt(item.text, this.contextFor(item, standing), prefix, carried)
     });
     this.endTurn(mapStopReason(res.stopReason));
   }
-  contextFor(item) {
+  contextFor(item, standing) {
     return ambientBlock([
       ...item.context ?? [],
+      this.d.self?.(),
+      standing,
       ...this.d.mentioned?.(item.text) ?? [],
       this.d.preview?.(),
       this.d.pageErrors?.(),
@@ -17221,7 +17397,7 @@ class AcpSession {
   }
   landedSince() {
     const entries = this.log.entries;
-    const isMessage = (e) => e.type === "user-message" || e.type === "fix-asked";
+    const isMessage = (e) => e.type === "user-message" || e.type === "fix-asked" || e.type === "handed";
     let i = entries.length - 1;
     while (i >= 0 && !isMessage(entries[i].event))
       i--;
@@ -17230,8 +17406,8 @@ class AcpSession {
       const e = entries[i].event;
       if (isMessage(e))
         break;
-      if (e.type === "handoff-landed")
-        out.unshift(handoffLandedContext(e.title, e.repoName, e.url));
+      if (e.type === "piece-landed")
+        out.unshift(pieceLandedContext(e.title, e.repoName, e.url, e.same, e.again));
     }
     return out;
   }
@@ -17358,7 +17534,7 @@ class AcpSession {
     }
     const options = readOptions(configOptions);
     this.emit({ type: "session-info", sessionId, ...currentValues(options) });
-    this.learn(options);
+    this.learn(options, !resumed);
     const modeOption = modes ? null : readModeOption(configOptions);
     const live = {
       conn,
@@ -17426,9 +17602,10 @@ class AcpSession {
       live.modeId = modes.current;
     }
   }
-  learn(options) {
-    for (const [category, opt] of options)
-      this.d.onOptionsLearned?.(category, opt.choices);
+  learn(options, fresh = false) {
+    for (const [category, opt] of options) {
+      this.d.onOptionsLearned?.(category, opt.choices, fresh ? opt.current : undefined);
+    }
   }
   onUpdate(params, side, commands) {
     if (params.update.sessionUpdate === "available_commands_update") {
@@ -17542,6 +17719,9 @@ class AcpSession {
     const planPath = plan ? await this.d.onPlan?.(detail, ownFile) ?? null : null;
     const offered = plan ? orderPlanOptions(params.options) : params.options.filter((o) => o.kind !== "allow_always");
     const choices = offered.map((o) => ({ id: o.optionId, name: o.name, kind: o.kind }));
+    const pieces = plan ? this.heldPieces : null;
+    if (plan && planPath && !pieces && detail.trim())
+      this.d.onPlanUnsplit?.(detail, planPath);
     return this.openAsk((id) => ({
       type: "agent-permission",
       id,
@@ -17549,6 +17729,7 @@ class AcpSession {
       ...parts.command ? { command: parts.command } : {},
       ...detail ? { detail } : {},
       ...planPath ? { plan: planPath } : {},
+      ...pieces ? { pieces } : {},
       choices,
       ...params.toolCall.toolCallId ? { toolId: params.toolCall.toolCallId } : {},
       ts: Date.now()
@@ -17558,11 +17739,17 @@ class AcpSession {
       if (!choice)
         return { outcome: { outcome: "cancelled" } };
       const res = { outcome: { outcome: "selected", optionId: choice.id } };
-      if (plan && (choice.kind === "allow_once" || choice.kind === "allow_always")) {
+      const approved = choice.kind === "allow_once" || choice.kind === "allow_always";
+      if (plan && approved)
         this.d.setMode?.(modeAfterPlan(choice.name));
-        if (planPath)
-          return this.sayPlanEdited(detail, planPath).then(() => res);
-      }
+      const decided = pieces ?? (plan ? this.heldPieces : null);
+      if (decided) {
+        if (this.heldPieces === decided)
+          this.heldPieces = null;
+        this.d.onPieces?.(decided, approved);
+      }
+      if (plan && approved && planPath)
+        return this.sayPlanEdited(detail, planPath).then(() => res);
       return res;
     });
   }
@@ -17648,7 +17835,7 @@ class AcpSession {
   syncStatus() {
     if (this.status === "error")
       return;
-    const waiting = this.asks.size > 0 || this.openHandoffs.size > 0;
+    const waiting = this.asks.size > 0 || this.openCards.size > 0;
     this.setStatus(waiting ? "waiting" : this.running || this.own ? "working" : "idle");
   }
   trackOwn(events) {
@@ -19001,12 +19188,27 @@ function defaultAgent(wt, d, preview, onProcess) {
     worktreeId: wt.id,
     cwd: wt.path,
     preview: () => previewContext(preview()),
+    self: () => {
+      const w = d.state.worktrees.find((w) => w.id === wt.id);
+      return w ? selfContext(w) : undefined;
+    },
+    standing: async () => standingContext(await d.standing?.(wt.id) ?? null),
     pageErrors: () => d.pageErrors?.(wt.id),
-    mentioned: (text) => worktreeContext(text, d.state.worktrees.filter((w) => w.repoId === wt.repoId && w.id !== wt.id && w.kind === "worktree").map((w) => ({
-      branch: w.branch,
-      title: w.title,
-      transcript: transcriptPathFor(d.paths.transcriptsDir, w.id)
-    }))),
+    mentioned: (text) => !text.includes("@") ? [] : worktreeContext(text, [
+      ...d.state.worktrees.filter((w) => w.repoId === wt.repoId && w.id !== wt.id && w.kind === "worktree").map((w) => ({
+        branch: w.branch,
+        title: w.title,
+        path: w.path,
+        transcript: transcriptPathFor(d.paths.transcriptsDir, w.id)
+      })),
+      ...(d.archived?.(wt.repoId) ?? []).map((a) => ({
+        branch: a.branch,
+        title: a.title,
+        path: a.path,
+        transcript: a.transcript,
+        archived: { at: a.archivedAt, landed: a.landed, restorable: a.restorable }
+      }))
+    ]),
     onProcess,
     spec,
     connect: (app, spec, prepared) => spawnAcp(app, d.agents.launch(spec, prepared), wt.path, wt.id),
@@ -19030,6 +19232,9 @@ function defaultAgent(wt, d, preview, onProcess) {
       if (d.state.setMode(wt.id, mode))
         d.hub.emit("worktreesChanged");
     },
+    onPieces: (id, approved) => d.hub.emit("piecesDecided", wt.id, id, approved),
+    onPlanUnsplit: (markdown, planPath) => d.hub.emit("planUnsplit", wt.id, markdown, planPath),
+    onPiecesShown: (_id, pieces) => writePlanDocNow(wt.path, listDoc(pieces)),
     onPlan: async (markdown, ownFile) => {
       const w = d.state.worktree(wt.id);
       if (w && !w.planned) {
@@ -19048,9 +19253,9 @@ function defaultAgent(wt, d, preview, onProcess) {
     },
     planEdited: async (path, proposed) => planEdited(wt.path, path, proposed),
     option: (category) => d.state.requireWorktree(wt.id)[OPTION_FIELDS[category]],
-    onOptionsLearned: (category, choices) => {
+    onOptionsLearned: (category, choices, runs) => {
       const agentId = d.state.requireWorktree(wt.id).agent ?? "";
-      if (d.state.setCachedOptions(agentId, category, choices))
+      if (d.state.setCachedOptions(agentId, category, choices, runs))
         d.hub.emit("agentsChanged");
     },
     onOptionChanged: (category, value) => {
@@ -19877,9 +20082,19 @@ function freeSlot(parent) {
       return { id, dir };
   }
 }
+var NAME_WORDS_MAX = 3;
+var NAME_CHARS_MAX = 20;
+var NAME_SHAPE = `1 to ${NAME_WORDS_MAX} plain words, ${NAME_CHARS_MAX} characters at most, like "sticky header"`;
+function overNameShape(title) {
+  const words = title.split(/\s+/).filter(Boolean).length;
+  const over = words > NAME_WORDS_MAX ? `${words} words` : title.length > NAME_CHARS_MAX ? `${title.length} characters` : null;
+  return over && `runs to ${over}; a title is ${NAME_SHAPE}.`;
+}
 function titleFrom(prompt) {
-  const words = prompt.split(/\s+/).filter(Boolean).slice(0, 3).join(" ");
-  return sentenceCase(cleanTitle2(words) || "task");
+  const words = prompt.split(/\s+/).filter(Boolean).slice(0, NAME_WORDS_MAX);
+  while (words.length > 1 && words.join(" ").length > NAME_CHARS_MAX)
+    words.pop();
+  return sentenceCase(cleanTitle2(words.join(" ").slice(0, NAME_CHARS_MAX)) || "task");
 }
 function cleanTitle2(title) {
   return title.replace(/\p{Cc}/gu, " ").replace(/\s+/g, " ").slice(0, 40).replace(/^[\s:;,.!?]+|[\s:;,.!?]+$/g, "");
@@ -19890,15 +20105,6 @@ function branchSlug(title) {
 function sentenceCase(title) {
   return title.charAt(0).toUpperCase() + title.slice(1);
 }
-var VARIANT_LENSES = [
-  "Take the most direct approach: the change most people would expect, in the smallest diff.",
-  "Lean toward how it looks and reads: polish what the task touches using only the design tokens, components and voice the project already has. Add no new colours, fonts or effects, and restyle nothing outside the task.",
-  "Lean toward behaviour: edge cases, empty and error states, and what can go wrong, over visual change."
-];
-function variantLens(index) {
-  const lens = VARIANT_LENSES[(index - 1) % VARIANT_LENSES.length];
-  return `(You are attempt ${index} of several parallel attempts at this task. Stay within the task and follow the project's existing styles, components, tokens and writing conventions; the attempts differ in emphasis, not in how much they change. ${lens})`;
-}
 
 // ../daemon/src/agent/recap.ts
 var DAEMON_STOPS = new Set(["interrupted", "failed", "auth", "lost"]);
@@ -19939,6 +20145,11 @@ function turnsSince(entries, seenAt) {
         (into?.fixes ?? pendingFixes).push(e.why);
         break;
       }
+      case "handed": {
+        const into = open && open.stop === undefined && open.error === undefined && !open.auth ? open : null;
+        (into?.asks ?? pending).push(e.body ?? e.text);
+        break;
+      }
       case "turn-start":
         open = start(e.ts);
         break;
@@ -20014,10 +20225,6 @@ function openAskOf(entries) {
       open.set(e.id, e.title);
     else if (e.type === "agent-ask-end")
       open.delete(e.id);
-    else if (e.type === "handoff-proposed")
-      open.set(e.id, `Continue in ${e.repo.name}?`);
-    else if (e.type === "handoff-go" || e.type === "handoff" || e.type === "handoff-declined")
-      open.delete(e.id);
   }
   const last = [...open.values()].at(-1)?.trim();
   return last ? clip(last) : undefined;
@@ -20037,9 +20244,15 @@ function factsOf(turns, end, ask) {
   };
 }
 function firstAskOf(entries) {
-  for (const { event: e } of entries)
+  for (const { event: e } of entries) {
     if (e.type === "user-message" && e.text.trim())
       return e.text;
+    if (e.type === "handed") {
+      const said = e.body ?? e.text;
+      if (said.trim())
+        return said;
+    }
+  }
   return;
 }
 var RECAP_MAX = 160;
@@ -20195,49 +20408,6 @@ function plain(line) {
   return line.replace(/(\d)\s*[\u2013\u2014]\s*(\d)/g, "$1-$2").replace(/\s*[\u2013\u2014]\s*/g, ", ").replace(/\s+--\s+/g, ", ").replace(/\s*(\u2192|->)\s*/g, " to ").replace(/\u2026/g, "...");
 }
 
-// ../daemon/src/agent/oneshot.ts
-async function askFreshAgent(agents, agentId, cwd, system, prompt, opts = {}) {
-  const spec = agents.require(agentId);
-  const prepared = await prepareLaunch(cwd, spec);
-  const listeners = new Map;
-  const app = client({ name: "toyon" }).onRequest(methods.client.session.requestPermission, (c) => decideUnattended(c.params, prepared.bounds, cwd)).onNotification(methods.client.session.update, (c) => {
-    const u = c.params.update;
-    if (u.sessionUpdate === "agent_message_chunk" && u.content.type === "text") {
-      listeners.get(c.params.sessionId)?.(u.content.text);
-    }
-  });
-  const link = spawnAcp(app, agents.launch(spec, prepared), cwd, `ask:${agentId}`);
-  try {
-    const init = await link.conn.agent.request(methods.agent.initialize, {
-      protocolVersion: PROTOCOL_VERSION2,
-      clientCapabilities: { fs: { readTextFile: false, writeTextFile: false } },
-      clientInfo: { name: "toyon", version: "0" }
-    });
-    return await askOnce(link.conn.agent, {
-      cwd,
-      system,
-      prompt,
-      spec,
-      ...opts.quick ? { quick: opts.quick } : {},
-      route: (id, onText) => {
-        listeners.set(id, onText);
-        return () => listeners.delete(id);
-      },
-      caps: {
-        close: !!init.agentCapabilities?.sessionCapabilities?.close,
-        delete: !!init.agentCapabilities?.sessionCapabilities?.delete
-      },
-      tag: `ask:${agentId}`
-    });
-  } catch (e) {
-    log.warn(`ask:${agentId}`, "one-shot question failed", e);
-    return null;
-  } finally {
-    link.conn.close();
-    await link.kill();
-  }
-}
-
 // ../daemon/src/agent/tasks.ts
 var NAME_SYSTEM = "You are a naming assistant. Reply with only the requested name.";
 var namePrompt = (task) => `Name this coding task the way a teammate would say it out loud: 1 or 2 plain lowercase words, 16 characters at most (like "sticky header", "dark mode", "price badge"). Leave out words every task in the project would share, like the product or the app. Reply with ONLY the name, nothing else.
@@ -20265,22 +20435,34 @@ function parseName(text) {
   const line = text.trim().split(`
 `).at(-1) ?? "";
   const name = line.toLowerCase().replace(/[`"'.]/g, "").replace(/[^\p{L}\p{N}]+/gu, " ").trim();
-  const words = name.split(" ").filter(Boolean);
-  if (words.length < 1 || words.length > 3 || name.length < 3 || name.length > 20)
+  if (name.length < 3 || overNameShape(name))
     return null;
   if (/error|fail|sorry|cannot|unable|unauthori|forbidden|denied|\b[45]\d\d\b/.test(name))
     return null;
   return sentenceCase(name);
 }
-var PLAN_SYSTEM = "You are a task-planning assistant. Reply with only the requested JSON.";
-var planPrompt = (request) => [
-  "Split this request into independent coding tasks that could each be done in a separate git branch by a separate engineer.",
-  "Reply with ONLY a JSON array of task description strings (1 to 5 items), nothing else.",
-  "If the request is really one task, reply with a single-item array.",
-  `Request: ${request.slice(0, 2000)}`
+function makeNamer(runtime) {
+  return async (task, wt) => parseName(await runtime.ensureAgent(wt).agent.ask(NAME_SYSTEM, namePrompt(task), { quick: "prefer" }));
+}
+function lacksQuickModel(spec, state) {
+  const quick = spec.quickModel;
+  if (!quick)
+    return true;
+  if (typeof quick === "function")
+    return false;
+  const offered = state.cachedOptions(spec.id, "model");
+  return offered.length > 0 && !offered.some((m) => m.id === quick);
+}
+var PIECES_SYSTEM = "You read plans and reply with only the requested JSON.";
+var piecesPrompt = (markdown) => [
+  "Below is a plan. List the parts of it the plan itself means to build apart from the rest: a step or section it marks as its own branch, a sibling worktree, a follow-up, or independent work. Also list the part it keeps in this worktree, if it says so.",
+  `Reply with ONLY a JSON array of 0 to 6 objects, each {"title": a name for the part, ${NAME_SHAPE}, "section": the exact heading text of that part, "plan": the plan for that part's agent in markdown, from the plan's own words: what to build, why, the files, and what done looks like, 150 to 500 words, "where": "worktree" or "here", "after": optional, "this" when the plan says the part waits for this branch to land}.`,
+  "Reply with an empty array when the plan is one piece of work with no part set apart.",
+  `Plan:
+${markdown.slice(0, 12000)}`
 ].join(`
 `);
-function parsePlan(text) {
+function parsePieces(text) {
   if (!text)
     return null;
   const start = text.indexOf("[");
@@ -20291,23 +20473,31 @@ function parsePlan(text) {
     const arr = JSON.parse(text.slice(start, end + 1));
     if (!Array.isArray(arr))
       return null;
-    const tasks = arr.filter((x) => typeof x === "string" && x.trim()).slice(0, 5);
-    return tasks.length > 0 ? tasks : null;
+    const out = [];
+    for (const x of arr) {
+      if (!x || typeof x !== "object")
+        continue;
+      const { title, section, plan, where, after } = x;
+      if (typeof title !== "string" || !title.trim() || typeof section !== "string" || !section.trim())
+        continue;
+      if (where !== "here" && where !== "worktree")
+        continue;
+      out.push({
+        title: title.trim(),
+        section: section.trim(),
+        ...typeof plan === "string" && plan.trim() ? { plan: plan.trim() } : {},
+        where,
+        ...typeof after === "string" && after.trim() ? { after: after.trim() } : {}
+      });
+    }
+    return out.slice(0, 6);
   } catch {
     return null;
   }
 }
-function makeNamer(runtime) {
-  return async (task, wt) => parseName(await runtime.ensureAgent(wt).agent.ask(NAME_SYSTEM, namePrompt(task), { quick: "prefer" }));
-}
-function lacksQuickModel(spec, state) {
-  const quick = spec.quickModel;
-  if (!quick)
-    return true;
-  if (typeof quick === "function")
-    return false;
-  const offered = state.cachedOptions(spec.id, "model");
-  return offered.length > 0 && !offered.some((m) => m.id === quick);
+function makePiecesReader(...deps) {
+  const ask = makeQuickAsker(...deps);
+  return async (wt, markdown) => parsePieces(await ask(wt, PIECES_SYSTEM, piecesPrompt(markdown)));
 }
 function makeQuickAsker(runtime, agents, state) {
   return async (wt, system, prompt) => {
@@ -20326,17 +20516,14 @@ function makeAnswerRecapper(...deps) {
   const ask = makeQuickAsker(...deps);
   return async (wt, prompt) => parseRecap(await ask(wt, ANSWER_SYSTEM, prompt));
 }
-function makePlanner(agents) {
-  return async (request, cwd, agentId) => parsePlan(await askFreshAgent(agents, agentId, cwd, PLAN_SYSTEM, planPrompt(request), { quick: "prefer" }));
-}
 
 // ../daemon/src/agent/transcriptForward.ts
 import { existsSync as existsSync15, readdirSync as readdirSync5, readFileSync as readFileSync12, renameSync as renameSync3, writeFileSync as writeFileSync7 } from "fs";
 import { join as join13 } from "path";
-var FORWARD_STEP = "1";
-var MARK = '"page';
+var FORWARD_STEP = "3";
+var MARKS = ['"page', '"brief"', '"handoff'];
 function forwardLine(line) {
-  if (!line.includes(MARK))
+  if (!MARKS.some((m) => line.includes(m)))
     return null;
   let entry;
   try {
@@ -20349,6 +20536,73 @@ function forwardLine(line) {
     return { drop: true };
   if (e?.type === "fix-asked" && e.kind === "page")
     return { line: JSON.stringify({ ...entry, event: { ...e, kind: "command" } }) };
+  if (e?.type === "user-message" && e.brief && typeof e.brief === "object") {
+    const brief = e.brief;
+    const { brief: _brief, ...rest } = e;
+    return {
+      line: JSON.stringify({
+        ...entry,
+        event: {
+          ...rest,
+          type: "handed",
+          via: "message",
+          body: brief.text,
+          origin: brief.origin,
+          ...brief.note ? { note: brief.note } : {}
+        }
+      })
+    };
+  }
+  if (e?.type === "handoff-proposed") {
+    const repo = e.repo ?? {};
+    return {
+      line: JSON.stringify({
+        ...entry,
+        event: {
+          type: "pieces-proposed",
+          id: e.id,
+          pieces: [
+            {
+              id: "p1",
+              title: e.title ?? "Continue",
+              plan: e.message ?? "",
+              attachments: [],
+              fate: "worktree",
+              project: { id: repo.id, name: repo.name }
+            }
+          ],
+          mode: e.mode,
+          ts: e.ts
+        }
+      })
+    };
+  }
+  if (e?.type === "handoff-landed")
+    return { line: JSON.stringify({ ...entry, event: { ...e, type: "piece-landed" } }) };
+  if (e?.type === "pieces-proposed" && Array.isArray(e.pieces) && e.pieces.some((p) => p && typeof p === "object" && ("brief" in p))) {
+    const pieces = e.pieces.map(({ brief, ...rest }) => brief === undefined ? rest : { ...rest, plan: brief });
+    return { line: JSON.stringify({ ...entry, event: { ...e, pieces } }) };
+  }
+  if (e?.type === "handoff-go")
+    return { line: JSON.stringify({ ...entry, event: { ...e, type: "pieces-go" } }) };
+  if (e?.type === "handoff") {
+    return {
+      line: JSON.stringify({
+        ...entry,
+        event: {
+          type: "pieces",
+          id: e.id,
+          outcomes: [
+            { pieceId: "p1", fate: "worktree", worktreeId: e.worktreeId, title: e.title, repoName: e.repoName }
+          ],
+          ts: e.ts
+        }
+      })
+    };
+  }
+  if (e?.type === "handoff-declined") {
+    return { line: JSON.stringify({ ...entry, event: { ...e, type: "pieces-declined" } }) };
+  }
   return null;
 }
 function forwardText(text) {
@@ -21576,6 +21830,15 @@ function loadState(paths) {
     log.error("state", `${STATE_FILE} is not valid JSON; copied to ${backup} and starting empty`, e);
     return structuredClone(empty);
   }
+  for (const w of state.worktrees) {
+    for (const q of w.queued ?? []) {
+      const old = q;
+      if (old.brief !== undefined && old.plan === undefined) {
+        old.plan = old.brief;
+        delete old.brief;
+      }
+    }
+  }
   const ids = new Set(state.worktrees.map((w) => w.id));
   for (const id of Object.keys(state.sessions))
     if (!ids.has(id))
@@ -21786,12 +22049,22 @@ class StateStore {
   cachedOptions(agentId, category) {
     return this.state.optionCache?.[agentId]?.[category] ?? [];
   }
-  setCachedOptions(agentId, category, choices) {
-    if (JSON.stringify(this.cachedOptions(agentId, category)) === JSON.stringify(choices))
+  cachedDefault(agentId, category) {
+    return this.state.optionDefaults?.[agentId]?.[category];
+  }
+  setCachedOptions(agentId, category, choices, runs) {
+    const sameList = JSON.stringify(this.cachedOptions(agentId, category)) === JSON.stringify(choices);
+    const sameDefault = runs === undefined || runs === this.cachedDefault(agentId, category);
+    if (sameList && sameDefault)
       return false;
     this.state.optionCache ??= {};
     this.state.optionCache[agentId] ??= {};
     this.state.optionCache[agentId][category] = choices;
+    if (runs !== undefined) {
+      this.state.optionDefaults ??= {};
+      this.state.optionDefaults[agentId] ??= {};
+      this.state.optionDefaults[agentId][category] = runs;
+    }
     this.save();
     return true;
   }
@@ -28610,9 +28883,6 @@ class Interest {
 // ../daemon/src/server/ws.ts
 import { homedir as homedir12, hostname as hostname2 } from "os";
 
-// ../daemon/src/server/handlers.ts
-import { randomBytes as randomBytes7 } from "crypto";
-
 // ../daemon/src/agent/config.ts
 import { existsSync as existsSync28, readFileSync as readFileSync17 } from "fs";
 import { homedir as homedir11 } from "os";
@@ -29234,6 +29504,12 @@ var notify = async (s, ctx, worktreeId, msg) => {
   await gitStatus(s, ctx, worktreeId);
 };
 var requireRun = (s, id) => s.worktrees.requireRun(id);
+function backfillOf(entries, since) {
+  const last = lastSeq(entries);
+  if (since === undefined || since > last)
+    return { events: coalesce(entries), last };
+  return { events: coalesce(after(entries, since)), last, after: since };
+}
 var handlers = {
   async subscribe(msg, ctx, s) {
     const r = s.worktrees.readable(msg.worktreeId);
@@ -29243,7 +29519,7 @@ var handlers = {
         throw new UserError("unknown worktree");
       if (!ctx.subscribe(msg.worktreeId))
         return;
-      ctx.reply({ t: "backfill", worktreeId: msg.worktreeId, events: coalesce(kept), log: [] });
+      ctx.reply({ t: "backfill", worktreeId: msg.worktreeId, ...backfillOf(kept, msg.since), log: [] });
       ctx.reply({ t: "queue", worktreeId: msg.worktreeId, items: [] });
       ctx.reply({ t: "agent-commands", worktreeId: msg.worktreeId, commands: [] });
       await gitStatus(s, ctx, msg.worktreeId);
@@ -29252,7 +29528,7 @@ var handlers = {
     if (!ctx.subscribe(msg.worktreeId))
       return;
     if (!r.wt) {
-      ctx.reply({ t: "backfill", worktreeId: msg.worktreeId, events: [], log: [] });
+      ctx.reply({ t: "backfill", worktreeId: msg.worktreeId, events: [], last: -1, log: [] });
       ctx.reply({ t: "queue", worktreeId: msg.worktreeId, items: [] });
       ctx.reply({ t: "agent-commands", worktreeId: msg.worktreeId, commands: [] });
       await gitAndPages(s, ctx, msg.worktreeId);
@@ -29262,7 +29538,7 @@ var handlers = {
     ctx.reply({
       t: "backfill",
       worktreeId: msg.worktreeId,
-      events: coalesce(agent.transcript()),
+      ...backfillOf(agent.transcript(), msg.since),
       log: s.runtime.recentLogs(msg.worktreeId)
     });
     ctx.reply({ t: "queue", worktreeId: msg.worktreeId, items: agent.queueItems });
@@ -29329,29 +29605,8 @@ var handlers = {
       effort: msg.effort,
       carry: msg.carry
     };
-    const of = msg.variants ?? 1;
     await sending(s, ctx, msg, msg.attachments, async () => {
-      if (of === 1) {
-        await s.worktrees.create(msg.repoId, msg.prompt, { ...opts, worktreeId: msg.worktreeId });
-        return;
-      }
-      const group = randomBytes7(4).toString("hex");
-      const made = await Promise.allSettled(Array.from({ length: of }, (_, i) => s.worktrees.create(msg.repoId, msg.prompt, {
-        ...opts,
-        ...i === 0 ? { worktreeId: msg.worktreeId } : {},
-        variant: { group, index: i + 1, of }
-      })));
-      const failed = made.flatMap((m) => m.status === "rejected" ? [m.reason] : []);
-      if (failed.length === 0)
-        return;
-      const went = failed.find((e) => e instanceof UserError && e.delivered);
-      if (went)
-        throw went;
-      if (failed.length < of) {
-        const why = failed[0] instanceof Error ? failed[0].message : String(failed[0]);
-        throw new UserError(`${failed.length} of ${of} attempts did not start: ${why}`, { delivered: true });
-      }
-      throw failed[0];
+      await s.worktrees.create(msg.repoId, msg.prompt, { ...opts, worktreeId: msg.worktreeId });
     });
   },
   "set-worktree-profile"(msg, _ctx, s) {
@@ -29372,27 +29627,6 @@ var handlers = {
   "set-worktree-effort"(msg, _ctx, s) {
     s.worktrees.setEffort(msg.worktreeId, msg.effort);
   },
-  "batch-worktrees"(msg, ctx, s) {
-    const repo = s.state.requireRepo(msg.repoId);
-    if (msg.boxId)
-      s.drafts.take(msg.boxId);
-    fireAndForget(msg.repoId, (async () => {
-      const agent = msg.agent ?? s.state.defaultAgent ?? DEFAULT_AGENT_ID;
-      const tasks = await s.planTasks(msg.prompt, repo.path, agent) ?? [msg.prompt];
-      let failed = 0;
-      for (const task of tasks) {
-        try {
-          await s.worktrees.create(msg.repoId, task, { agent: msg.agent, model: msg.model, effort: msg.effort });
-        } catch (e) {
-          failed++;
-          log.warn(msg.repoId, `batch: could not start "${task.slice(0, 60)}"`, e);
-        }
-      }
-      const started = tasks.length - failed;
-      if (failed)
-        ctx.reply(shipped("", false, `batch: ${started} started, ${failed} failed (see daemon log)`));
-    })(), "batch");
-  },
   async "archive-worktree"(msg, _ctx, s) {
     await s.worktrees.archiveWorktree(msg.worktreeId);
   },
@@ -29541,9 +29775,6 @@ var handlers = {
     s.turns.stoppedByPerson(msg.worktreeId);
     s.runtime.agentFor(msg.worktreeId)?.stop();
   },
-  async "pick-variant"(msg, _ctx, s) {
-    await s.worktrees.pickVariant(msg.worktreeId);
-  },
   unqueue(msg, _ctx, s) {
     requireRun(s, msg.worktreeId);
     s.runtime.agentFor(msg.worktreeId)?.unqueue(msg.index, msg.edit ? (m) => s.drafts.putBack(msg.worktreeId, { text: m.text, items: m.attachments ?? [] }) : undefined);
@@ -29718,13 +29949,17 @@ var handlers = {
     s.runtime.agentFor(msg.worktreeId)?.answer(msg.askId, { kind: "choice", choiceId: msg.choiceId, ...msg.note ? { note: msg.note } : {} });
     s.worktrees.markPrompted(msg.worktreeId);
   },
-  async "handoff-answer"(msg, _ctx, s) {
+  async "pieces-ask"(msg, _ctx, s) {
+    requireRun(s, msg.worktreeId);
+    await s.pieces.ask(msg.worktreeId, msg.repoId, msg.text);
+  },
+  "pieces-fate"(msg, _ctx, s) {
     requireRun(s, msg.worktreeId);
-    await s.handoff.answer(msg.worktreeId, msg.id, msg.go, msg.note);
+    s.pieces.fate(msg.worktreeId, msg.id, msg.pieceId, msg.fate);
   },
-  async "handoff-ask"(msg, _ctx, s) {
+  async "pieces-answer"(msg, _ctx, s) {
     requireRun(s, msg.worktreeId);
-    await s.handoff.ask(msg.worktreeId, msg.repoId, msg.text);
+    await s.pieces.answer(msg.worktreeId, msg.id, msg.go, msg.note);
   },
   "agent-config"(msg, ctx, s) {
     const spec = s.agents.require(msg.agent);
@@ -29806,7 +30041,7 @@ var handlers = {
   },
   "preview-start"(msg, _ctx, s) {
     requireRun(s, msg.worktreeId);
-    s.worktrees.startPreview(msg.worktreeId);
+    s.worktrees.retryPreview(msg.worktreeId);
   },
   async "search-refs"(msg, ctx, s) {
     const refs = await s.refs.search(msg.repoId, msg.query);
@@ -29889,6 +30124,47 @@ function withCors(res, origin) {
   return res;
 }
 
+// ../daemon/src/server/encoding.ts
+import { promisify } from "util";
+import { gzip } from "zlib";
+var gzipAsync = promisify(gzip);
+function acceptedEncodings(header) {
+  const out = new Set;
+  if (!header)
+    return out;
+  for (const part of header.split(",")) {
+    const [name = "", ...params] = part.trim().toLowerCase().split(";");
+    const coding = name.trim();
+    if (coding !== "br" && coding !== "gzip")
+      continue;
+    const refused = params.some((p) => /^\s*q\s*=\s*0(\.0*)?\s*$/.test(p));
+    if (!refused)
+      out.add(coding);
+  }
+  return out;
+}
+function pickSibling(file, accepted) {
+  const candidates = [
+    ["br", `${file}.br`],
+    ["gzip", `${file}.gz`]
+  ];
+  for (const [encoding, path] of candidates) {
+    if (accepted.has(encoding) && Bun.file(path).size > 0)
+      return { path, encoding };
+  }
+  return { path: file, encoding: null };
+}
+var GZIP_MIN_BYTES = 1024;
+async function encoded(req, body, headers) {
+  const bytes = Buffer.from(body);
+  if (bytes.byteLength < GZIP_MIN_BYTES || !acceptedEncodings(req.headers.get("accept-encoding")).has("gzip")) {
+    return new Response(bytes, { headers });
+  }
+  return new Response(await gzipAsync(bytes), {
+    headers: { ...headers, "content-encoding": "gzip", vary: "accept-encoding" }
+  });
+}
+
 // ../daemon/src/server/pairing.ts
 var NO_STORE = { "cache-control": "no-store" };
 var json = (body, headers = {}) => Response.json(body, { headers: { ...NO_STORE, ...headers } });
@@ -30008,6 +30284,7 @@ function createFetch(opts) {
   const authed = (req) => sameSecret(req.headers.get("authorization"), `Bearer ${opts.token}`);
   const unauthorized = () => new Response("unauthorized", { status: 401 });
   const gateFor = (remote) => remote && { grant, host: remote.host, redeem: (code) => opts.grants.redeem(code) };
+  const page = async (req, file) => encoded(req, await Bun.file(file).text(), { "content-type": "text/html;charset=utf-8", "cache-control": NO_STORE2 });
   const health = async () => {
     const remote = opts.remote();
     return Response.json({
@@ -30060,6 +30337,7 @@ function createFetch(opts) {
       const authed = sameSecret(url.searchParams.get("token"), opts.token);
       if (authed)
         opts.noteShellOrigin(req.headers.get("origin"));
+      const known = parseKnown(url.searchParams.get("known"));
       const data = {
         authed,
         subs: new Set,
@@ -30068,6 +30346,7 @@ function createFetch(opts) {
         sent: 0,
         bytes: 0,
         view: null,
+        ...known ? { known } : {},
         ...remoteShell ? { remote: true } : {}
       };
       const headers = authed && remote && remoteShell ? { "set-cookie": grantCookie(grant, remote.host) } : undefined;
@@ -30080,10 +30359,13 @@ function createFetch(opts) {
     if (url.pathname === "/bootstrap") {
       if (!sameSecret(url.searchParams.get("token"), opts.token))
         return new Response("unauthorized", { status: 401 });
-      const headers = { "cache-control": NO_STORE2 };
+      const headers = {
+        "content-type": "application/json;charset=utf-8",
+        "cache-control": NO_STORE2
+      };
       if (remote && remoteShell)
         headers["set-cookie"] = grantCookie(grant, remote.host);
-      return Response.json(await opts.bootstrap(), { headers });
+      return encoded(req, JSON.stringify(await opts.bootstrap()), headers);
     }
     if (url.pathname === "/restart" && (req.method === "POST" || req.method === "GET")) {
       if (!sameSecret(url.searchParams.get("token"), opts.token))
@@ -30107,6 +30389,9 @@ function createFetch(opts) {
         }
       });
     }
+    if (url.pathname === "/share" && req.method === "POST") {
+      return new Response(null, { status: 303, headers: { location: "/", "cache-control": NO_STORE2 } });
+    }
     const paired = await opts.pairing(req, url, d);
     if (paired)
       return paired;
@@ -30228,7 +30513,7 @@ function createFetch(opts) {
     const hashed = rel.startsWith("/assets/");
     if (existsSync29(file) && Bun.file(file).size > 0) {
       if (rel === "/manifest.json") {
-        const ground = opts.manifestGround();
+        const ground = url.searchParams.get("black") === "1" ? "#000000" : opts.manifestGround();
         const manifest = { ...await Bun.file(file).json(), theme_color: ground, background_color: ground };
         return Response.json(manifest, {
           headers: { "content-type": "application/manifest+json", "cache-control": NO_STORE2 }
@@ -30241,13 +30526,26 @@ function createFetch(opts) {
           headers: { "content-type": "text/html; charset=utf-8", "cache-control": NO_STORE2 }
         });
       }
-      return new Response(Bun.file(file), { headers: { "cache-control": hashed ? IMMUTABLE : NO_STORE2 } });
+      if (hashed) {
+        const sibling = pickSibling(file, acceptedEncodings(req.headers.get("accept-encoding")));
+        return new Response(Bun.file(sibling.path), {
+          headers: {
+            "content-type": Bun.file(file).type,
+            "cache-control": IMMUTABLE,
+            vary: "accept-encoding",
+            ...sibling.encoding ? { "content-encoding": sibling.encoding } : {}
+          }
+        });
+      }
+      if (rel === "/index.html")
+        return page(req, file);
+      return new Response(Bun.file(file), { headers: { "cache-control": NO_STORE2 } });
     }
     if (hashed)
       return new Response("not found", { status: 404 });
     const index = join25(opts.shellDist, "index.html");
     if (existsSync29(index))
-      return new Response(Bun.file(index), { headers: { "cache-control": NO_STORE2 } });
+      return page(req, index);
     return new Response("Toyon daemon running; shell not built (run: bun run build)", { status: 200 });
   }
   return async function fetch2(req, srv) {
@@ -30274,12 +30572,35 @@ function createFetch(opts) {
   };
 }
 
+// ../daemon/src/server/stamps.ts
+var stampOf = (part) => Bun.hash(JSON.stringify(part)).toString(16);
+var visitsStamp = (visits) => stampOf(Object.entries(visits).map(([repoId, list]) => [repoId, list.map((e) => [e.path, e.title ?? ""])]));
+function stampsOf(h) {
+  return {
+    rows: stampOf({ rows: h.rows, trunks: h.trunks }),
+    repos: stampOf(h.repos),
+    visits: visitsStamp(h.visits),
+    themes: stampOf(h.themes)
+  };
+}
+function shapeHello(full, known) {
+  if (!known)
+    return full;
+  const { themes, ...rest } = full;
+  const withThemes = sameStamp(known.themes, full.stamps.themes) ? rest : full;
+  const same = sameStamp(known.rows, full.stamps.rows) && sameStamp(known.repos, full.stamps.repos) && sameStamp(known.visits, full.stamps.visits);
+  if (!same)
+    return withThemes;
+  const { rows: _r, trunks: _t, repos: _p, visits: _v, same: _s, ...light } = withThemes;
+  return { ...light, same: true };
+}
+
 // ../daemon/src/server/ws.ts
 var DROP_ABOVE_BYTES = 4 * 1024 * 1024;
 var DROPPED_NOTICE = `\r
 [toyon] output dropped: this pane was too far behind\r
 `;
-var SENDS = new Set(["chat", "create-worktree", "restore-worktree", "batch-worktrees"]);
+var SENDS = new Set(["chat", "create-worktree", "restore-worktree"]);
 function sentFrom(json) {
   if (!json || typeof json !== "object")
     return null;
@@ -30313,7 +30634,7 @@ function startServer(opts) {
   };
   const raw = (ws, json) => {
     try {
-      ws.send(json);
+      ws.send(json, true);
       ws.data.sent++;
       ws.data.bytes += json.length;
     } catch (e) {
@@ -30413,7 +30734,7 @@ function startServer(opts) {
       statusesQueued = false;
       try {
         const { rows, trunks } = s.worktrees.snapshot();
-        broadcast({ t: "worktrees", rows, trunks });
+        broadcast({ t: "worktrees", rows, trunks, stamp: stampOf({ rows, trunks }) });
       } catch (e) {
         log.warn("ws", "worktrees broadcast failed", e);
       }
@@ -30422,7 +30743,7 @@ function startServer(opts) {
   s.hub.on("worktreesChanged", worktreesChanged);
   s.hub.on("agentStatus", worktreesChanged);
   s.hub.on("agentStopping", worktreesChanged);
-  s.hub.on("reposChanged", () => broadcast({ t: "repos", repos: s.state.repos }));
+  s.hub.on("reposChanged", () => broadcast({ t: "repos", repos: s.state.repos, stamp: stampOf(s.state.repos) }));
   s.hub.on("pendingChanged", () => broadcast({ t: "pending-repos", pending: s.repos.pending }));
   s.hub.on("proc", (worktreeId, proc) => broadcast({ t: "proc", worktreeId, proc }));
   s.hub.on("log", (worktreeId, proc, line, retract) => sendTo(worktreeId, retract ? { t: "log", worktreeId, proc, line, retract } : { t: "log", worktreeId, proc, line }));
@@ -30463,7 +30784,7 @@ function startServer(opts) {
   const themesChanged = () => {
     const cur = s.themes.current();
     setWaitingColors({ bg: cur.colors.surface0, fg: cur.colors.text1 });
-    broadcast({ t: "themes", themes: s.themes.themes, prefs: s.themes.prefs });
+    broadcast({ t: "themes", themes: s.themes.themes, prefs: s.themes.prefs, stamp: stampOf(s.themes.themes) });
   };
   s.hub.on("themesChanged", themesChanged);
   themesChanged();
@@ -30489,23 +30810,22 @@ function startServer(opts) {
   s.hub.on("selfChanged", () => broadcast({ t: "self", self: s.self.get() }));
   s.hub.on("failed", (worktreeId, message) => broadcast({ t: "error", message, worktreeId }));
   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("visitsChanged", (repoId) => broadcast({ t: "visits", repoId, pages: s.routes.history(repoId), stamp: visitsStamp(s.routes.historyAll()) }));
   s.hub.on("archiveChanged", (repoId) => broadcast({ t: "archived", repoId, items: s.worktrees.archived(repoId) }));
   s.hub.on("draftChanged", (boxId, text, clientId) => broadcast({ t: "draft", boxId, text, ...clientId ? { clientId } : {} }));
   s.hub.on("attachmentsChanged", (boxId, items, clientId) => broadcast({ t: "attachments", boxId, items, ...clientId ? { clientId } : {} }));
-  const helloFrame = async () => {
+  const helloFrame = async (known = null) => {
     await s.update.refresh();
     const { rows, trunks } = s.worktrees.snapshot();
-    return {
+    const parts = { rows, trunks, repos: s.state.repos, visits: s.routes.historyAll(), themes: s.themes.themes };
+    const full = {
       t: "hello",
       version,
       install: s.update.install(),
       registry: await s.update.registry(),
       protocol: PROTOCOL_VERSION,
-      repos: s.state.repos,
-      rows,
-      trunks,
-      themes: s.themes.themes,
+      ...parts,
+      stamps: stampsOf(parts),
       themePrefs: s.themes.prefs,
       agents: s.readiness.describe(),
       defaultAgent: s.agents.defaultId(s.state.defaultAgent),
@@ -30521,13 +30841,13 @@ function startServer(opts) {
       knocks: opts.knocks.pending(),
       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(),
       attachments: s.drafts.allAttachments(),
       managed: managedView(opts.managed)
     };
+    return shapeHello(full, known);
   };
   let branded = false;
   const authed = (req) => sameSecret(req.headers.get("authorization"), `Bearer ${token}`);
@@ -30578,6 +30898,7 @@ function startServer(opts) {
       changelog: () => Bun.file(opts.changelog).text().catch(() => null)
     }),
     websocket: {
+      perMessageDeflate: true,
       async open(ws) {
         const preview = ws.data.preview;
         if (preview) {
@@ -30591,7 +30912,7 @@ function startServer(opts) {
         }
         sockets.add(ws);
         link(ws);
-        send(ws, await helloFrame());
+        send(ws, await helloFrame(ws.data.known ?? null));
         fireAndForget("agents", s.agents.retryFailed(), "agent install retry");
         for (const o of s.opens.takePending())
           send(ws, openedFrame(o));
@@ -30889,7 +31210,7 @@ function discover(dir) {
 import { homedir as homedir14 } from "os";
 async function latestVersion() {
   const registry = await npmRegistry();
-  const r = await run("npm", ["view", "toyon", "version", "--json"], homedir14());
+  const r = await run("npm", ["view", "toyon", "version", "--json"], homedir14(), undefined, { timeoutMs: NPM_MS });
   if (!r.ok)
     return { version: null, registry };
   try {
@@ -30899,8 +31220,9 @@ async function latestVersion() {
     return { version: null, registry };
   }
 }
+var NPM_MS = 30000;
 async function npmRegistry() {
-  const config = await run("npm", ["config", "get", "registry"], homedir14());
+  const config = await run("npm", ["config", "get", "registry"], homedir14(), undefined, { timeoutMs: NPM_MS });
   return config.ok && config.out !== "" ? config.out : "the npm registry";
 }
 var LOG_POINTER = /complete log of this run/i;
@@ -30939,6 +31261,7 @@ class UpdateService {
   latest = null;
   unreachable = null;
   registryName = null;
+  registryAsk = null;
   seen = null;
   seenAt = 0;
   installing = false;
@@ -30969,6 +31292,7 @@ class UpdateService {
     d.hub.on("holdsChanged", () => {
       this.busyAt = this.now();
     });
+    fireAndForget("update", this.registry(), "npm registry");
   }
   async tick() {
     await this.refresh();
@@ -30993,7 +31317,15 @@ class UpdateService {
   async registry() {
     if (this.d.method === "none" || this.d.managedBy)
       return null;
-    this.registryName ??= await this.d.registry();
+    if (this.registryName !== null)
+      return this.registryName;
+    this.registryAsk ??= this.d.registry();
+    try {
+      this.registryName = await this.registryAsk;
+    } catch (e) {
+      this.registryAsk = null;
+      throw e;
+    }
     return this.registryName;
   }
   async check() {
@@ -31572,6 +31904,9 @@ function saidRows(entries) {
     if (event.type === "user-message") {
       turnTs = event.ts;
       push(seq, "user", event.text, event.ts);
+    } else if (event.type === "handed") {
+      turnTs = event.ts;
+      push(seq, "user", event.body ?? event.text, event.ts);
     } else if (event.type === "turn-start") {
       turnTs = event.ts;
     } else if (event.type === "text-delta") {
@@ -31705,7 +32040,7 @@ function lastAsked(entries) {
     const e = entries[i].event;
     if (e.type === "fix-asked")
       return e.kind;
-    if (e.type === "user-message")
+    if (e.type === "user-message" || e.type === "handed")
       return;
   }
   return;
@@ -31810,240 +32145,6 @@ class FixService {
   }
 }
 
-// ../daemon/src/worktrees/handoff.ts
-import { randomUUID as randomUUID2 } from "crypto";
-var MESSAGE_MAX = 20000;
-var TITLE_MAX2 = 200;
-var PROJECT_MAX = 200;
-var PER_TURN_MAX = 3;
-var refused = (text) => ({ text, isError: true });
-function openProposals(entries) {
-  const open = new Map;
-  for (const { event } of entries) {
-    if (event.type === "handoff-proposed")
-      open.set(event.id, event);
-    else if (event.type === "handoff-go" || event.type === "handoff" || event.type === "handoff-declined")
-      open.delete(event.id);
-  }
-  return [...open.values()];
-}
-function proposedThisTurn(entries) {
-  let n = 0;
-  for (let i = entries.length - 1;i >= 0; i--) {
-    const e = entries[i].event;
-    if (e.type === "turn-start")
-      break;
-    if (e.type === "handoff-proposed")
-      n++;
-  }
-  return n;
-}
-
-class HandoffService {
-  d;
-  constructor(d) {
-    this.d = d;
-    d.hub.on("landed", (worktreeId) => this.landed(worktreeId));
-  }
-  targets(worktreeId) {
-    const own = this.d.state.worktree(worktreeId)?.repoId;
-    return this.d.state.repos.filter((r) => r.id !== own);
-  }
-  resolve(worktreeId, project) {
-    const q = project.trim();
-    const others = this.targets(worktreeId);
-    if (others.length === 0)
-      return { refused: "No other project is open in Toyon, so there is nothing to hand off to." };
-    const names = others.map((r) => r.name).join(", ");
-    if (!q)
-      return { refused: `Name the project to continue in. Open projects: ${names}.` };
-    const found = match(others, q);
-    if (found.length === 1)
-      return { repo: found[0] };
-    if (found.length > 1) {
-      return {
-        refused: `"${q}" names more than one open project: ${found.map((r) => r.path).join(", ")}. Say which by its path.`
-      };
-    }
-    const wt = this.d.state.worktree(worktreeId);
-    const own = wt ? this.d.state.repo(wt.repoId) : undefined;
-    if (own && match([own], q).length === 1) {
-      return {
-        refused: `${own.name} is this worktree's own project; a handoff goes to another one. Open projects: ${names}.`
-      };
-    }
-    return { refused: `No open project is called "${q}". Open projects: ${names}.` };
-  }
-  tool(worktreeId) {
-    const names = this.targets(worktreeId).map((r) => r.name);
-    const open = names.length ? `Open projects you can name: ${names.join(", ")}.` : "No other project is open right now.";
-    return {
-      name: HANDOFF_TOOL,
-      description: `Propose continuing the current task in another project Toyon has open, when a change belongs there and not in this worktree. Nothing starts: a card with your message appears in this chat and the person decides. ${open}`,
-      inputSchema: {
-        type: "object",
-        properties: {
-          project: { type: "string", description: "The other project's name as listed, or its path." },
-          message: {
-            type: "string",
-            description: "What that project's agent starts from: what is needed and why, how to reproduce it, and the paths in this worktree that depend on it. It is sent as that agent's first message."
-          },
-          title: { type: "string", description: "A short name for the new worktree, a few words." }
-        },
-        required: ["project", "message"],
-        additionalProperties: false
-      }
-    };
-  }
-  async call(worktreeId, args) {
-    const a = args && typeof args === "object" && !Array.isArray(args) ? args : null;
-    const shaped = a && typeof a.project === "string" && typeof a.message === "string" && (a.title === undefined || typeof a.title === "string");
-    if (!shaped)
-      return refused("handoff takes { project: string, message: string, title?: string }.");
-    return this.propose(worktreeId, { project: a.project, message: a.message, ...a.title ? { title: a.title } : {} }, "agent");
-  }
-  propose(worktreeId, p, by) {
-    const wt = this.d.state.worktree(worktreeId);
-    if (!wt)
-      throw new UserError("that chat is gone");
-    if (p.project.length > PROJECT_MAX)
-      return refused(`The project name is over ${PROJECT_MAX} characters.`);
-    if ((p.title ?? "").length > TITLE_MAX2)
-      return refused(`The title is over ${TITLE_MAX2} characters; a few words.`);
-    if (p.message.length > MESSAGE_MAX) {
-      return refused(`The message is over ${MESSAGE_MAX} characters; cut it to what the other agent needs.`);
-    }
-    const target = this.resolve(worktreeId, p.project);
-    if ("refused" in target)
-      return refused(target.refused);
-    const message = p.message.trim();
-    if (!message)
-      return refused("Write the message the other project's agent should start from.");
-    const agent = this.d.runtime.ensureAgent(wt).agent;
-    const entries = agent.transcript();
-    if (openProposals(entries).length > 0) {
-      return refused("A handoff is already waiting for the person on this chat; finish your turn.");
-    }
-    if (by === "agent" && proposedThisTurn(entries) >= PER_TURN_MAX) {
-      return refused("Three handoffs were proposed this turn already; finish your turn and let the person answer.");
-    }
-    const title = p.title?.trim();
-    const { repo } = target;
-    agent.note({
-      type: "handoff-proposed",
-      id: randomUUID2(),
-      repo: { id: repo.id, name: repo.name, path: repo.path },
-      message,
-      ...title ? { title } : {},
-      by,
-      mode: wt.mode ?? DEFAULT_PERMISSION_MODE,
-      ts: Date.now()
-    });
-    return { text: "Proposed to the person as a card; they decide. Finish your turn." };
-  }
-  async answer(worktreeId, id, go, note) {
-    const wt = this.d.state.worktree(worktreeId);
-    if (!wt)
-      throw new UserError("that chat is gone");
-    const agent = this.d.runtime.ensureAgent(wt).agent;
-    const entries = agent.transcript();
-    const proposed = entries.find(({ event }) => event.type === "handoff-proposed" && event.id === id)?.event;
-    if (!proposed)
-      throw new UserError("That card is not in this chat");
-    if (!openProposals(entries).some((p) => p.id === id)) {
-      return log.debug(worktreeId, `answer for a handoff that already closed (${id})`);
-    }
-    if (!go) {
-      agent.note({ type: "handoff-declined", id, ts: Date.now() });
-      return;
-    }
-    agent.note({ type: "handoff-go", id, ts: Date.now() });
-    try {
-      const repo = this.d.state.repo(proposed.repo.id);
-      if (!repo)
-        throw new UserError(`${proposed.repo.name} is no longer open in Toyon`);
-      const origin = this.d.state.requireRepo(wt.repoId);
-      const added = note?.trim() || undefined;
-      const prompt = handoffPrompt(proposed.message, added, { path: wt.path, project: origin.name, branch: wt.branch });
-      const made = await this.d.create(repo.id, prompt, {
-        ...proposed.title ? { title: proposed.title } : {},
-        mode: proposed.mode,
-        from: { kind: "worktree", ref: wt.branch, origin: { id: wt.id, repoId: wt.repoId } }
-      });
-      agent.note({
-        type: "handoff",
-        id,
-        worktreeId: made.id,
-        repoId: repo.id,
-        repoName: repo.name,
-        title: made.title,
-        ts: Date.now()
-      });
-    } catch (e) {
-      const reason = e instanceof Error ? e.message : String(e);
-      agent.note({ type: "handoff-declined", id, outcome: "failed", reason, ts: Date.now() });
-      throw e;
-    }
-  }
-  async ask(worktreeId, repoId, text) {
-    const wt = this.d.state.requireWorktree(worktreeId);
-    const repo = this.d.state.repo(repoId);
-    if (!repo)
-      throw new UserError("no such project");
-    if (repo.id === wt.repoId)
-      throw new UserError(`${repo.name} is this worktree's own project`);
-    const agent = this.d.runtime.agentFor(worktreeId);
-    if (!agent)
-      throw new UserError("worktree still starting; try again in a moment");
-    if (agent.mcpTools === null)
-      await agent.warm();
-    if (agent.mcpTools === true) {
-      agent.send(handoffAskPrompt(repo, text), { asked: { kind: "handoff", why: `continue in ${repo.name}` } });
-      return;
-    }
-    const own = text?.trim();
-    if (!own)
-      throw new UserError(`Write what ${repo.name} should do first`);
-    const r = this.propose(worktreeId, { project: repo.path, message: own }, "person");
-    if (r.isError)
-      throw new UserError(r.text);
-  }
-  landed(worktreeId) {
-    const wt = this.d.state.worktree(worktreeId);
-    if (wt?.from?.kind !== "worktree")
-      return;
-    const origin = this.d.state.worktree(wt.from.origin.id);
-    if (origin?.kind !== "worktree")
-      return;
-    const repo = this.d.state.repo(wt.repoId);
-    if (!repo)
-      return;
-    this.d.runtime.ensureAgent(origin).agent.note({
-      type: "handoff-landed",
-      worktreeId: wt.id,
-      repoName: repo.name,
-      title: wt.title,
-      ...wt.pr?.url ? { url: wt.pr.url } : {},
-      ts: Date.now()
-    });
-  }
-}
-function match(repos, q) {
-  const lower = q.toLowerCase();
-  const ladder = [
-    (r) => r.path === q,
-    (r) => r.name === q,
-    (r) => r.name.toLowerCase() === lower,
-    (r) => r.name.toLowerCase().startsWith(lower)
-  ];
-  for (const rung of ladder) {
-    const found = repos.filter(rung);
-    if (found.length > 0)
-      return found;
-  }
-  return [];
-}
-
 // ../daemon/src/worktrees/landing.ts
 var TAIL_CHARS = 400;
 var DIFF_CHARS = 2000;
@@ -32395,6 +32496,900 @@ async function recentSubjects(path, defaultBr) {
 `).filter(Boolean) : [];
 }
 
+// ../daemon/src/worktrees/pieces.ts
+import { createHash as createHash5, randomUUID as randomUUID2 } from "crypto";
+import { readFileSync as readFileSync20 } from "fs";
+import { join as join28 } from "path";
+
+// ../daemon/src/worktrees/proposals.ts
+var PER_TURN_MAX = 3;
+function proposedThisTurn(entries) {
+  let n = 0;
+  for (let i = entries.length - 1;i >= 0; i--) {
+    const e = entries[i].event;
+    if (e.type === "turn-start")
+      break;
+    if (e.type === "pieces-proposed")
+      n++;
+  }
+  return n;
+}
+function matchBy(items, q, keys) {
+  if (!q.trim())
+    return [];
+  const lower = q.toLowerCase();
+  const rungs = [
+    (v) => v === q,
+    (v) => v.toLowerCase() === lower,
+    (v) => v.toLowerCase().startsWith(lower)
+  ];
+  for (const rung of rungs) {
+    const found = items.filter((item) => keys.some((key) => rung(key(item) ?? "")));
+    if (found.length > 0)
+      return found;
+  }
+  return [];
+}
+
+// ../daemon/src/worktrees/pieces.ts
+function handedOrigin(origin, project) {
+  return {
+    id: origin.id,
+    repoId: origin.repoId,
+    branch: origin.branch,
+    title: origin.title,
+    ...project ? { project } : {}
+  };
+}
+function pieceDoc(piece) {
+  return `# ${piece.title}
+
+${piece.plan.trim()}
+`;
+}
+var PIECES_MAX = 6;
+var PLAN_MAX = 20000;
+var ATTACH_MAX = 10;
+var PROJECT_MAX = 200;
+var refused = (text) => ({ text, isError: true });
+var HELD = "Handed to the person; the list shows beside your plan and they decide where each piece goes. Ask for plan approval now.";
+var SHOWN = "Handed to the person as a card; they decide. Finish your turn.";
+function openPlanCard(entries) {
+  const open = new Map;
+  for (const { event } of entries) {
+    if (event.type === "agent-permission" && event.plan)
+      open.set(event.id, event);
+    else if (event.type === "agent-ask-end")
+      open.delete(event.id);
+  }
+  return [...open.values()].at(-1) ?? null;
+}
+function sectionText(markdown, heading) {
+  const norm = (s) => s.toLowerCase().replace(/[`*_~]/g, "").replace(/[^a-z0-9]+/g, " ").trim();
+  const want = norm(heading);
+  if (!want)
+    return null;
+  const lines = markdown.split(`
+`);
+  const heads = [];
+  for (let i = 0;i < lines.length; i++) {
+    const m = /^(#{1,6})\s+(.*)$/.exec(lines[i] ?? "");
+    const have = m ? norm(m[2] ?? "") : "";
+    if (m && have)
+      heads.push({ i, level: m[1].length, have });
+  }
+  const rungs = [
+    (have) => have === want,
+    (have) => have.includes(want),
+    (have) => have.length >= 12 && want.includes(have)
+  ];
+  for (const rung of rungs) {
+    const hit = heads.find((h) => rung(h.have));
+    if (!hit)
+      continue;
+    const { i, level } = hit;
+    let end = lines.length;
+    for (let j = i + 1;j < lines.length; j++) {
+      const n = /^(#{1,6})\s/.exec(lines[j] ?? "");
+      if (n && n[1].length <= level) {
+        end = j;
+        break;
+      }
+    }
+    const text = lines.slice(i, end).join(`
+`).trim();
+    return text.length > PLAN_MAX ? text.slice(0, PLAN_MAX) : text;
+  }
+  return null;
+}
+function hashText(text) {
+  return createHash5("sha1").update(text.trim()).digest("hex").slice(0, 16);
+}
+function heldUnshown(entries) {
+  const shown = new Set;
+  for (const { event } of entries)
+    if (event.type === "pieces-shown")
+      shown.add(event.id);
+  return openPieces(entries).find((p) => p.held && !shown.has(p.id)) ?? null;
+}
+function openPieces(entries) {
+  const open = new Map;
+  for (const { event } of entries) {
+    if (event.type === "pieces-proposed")
+      open.set(event.id, event);
+    else if (event.type === "pieces-go" || event.type === "pieces" || event.type === "pieces-declined")
+      open.delete(event.id);
+  }
+  return [...open.values()];
+}
+function listFile(entries, id) {
+  let file;
+  for (const { event } of entries) {
+    if ((event.type === "pieces-proposed" || event.type === "pieces-shown") && event.id === id && event.plan) {
+      file = event.plan;
+    } else if (event.type === "agent-permission" && event.pieces === id && event.plan)
+      file = event.plan;
+  }
+  return file;
+}
+function effectiveFate(entries, proposal, piece) {
+  let fate = piece.fate;
+  for (const { event } of entries) {
+    if (event.type === "pieces-fate" && event.id === proposal.id && event.pieceId === piece.id)
+      fate = event.fate;
+  }
+  return fate;
+}
+var LABEL = /^(image|paste|pasted text|file|element)\s+(\d+)$/i;
+var KIND_OF = {
+  image: "image",
+  paste: "paste",
+  "pasted text": "paste",
+  file: "file",
+  element: "pick"
+};
+
+class PiecesService {
+  d;
+  constructor(d) {
+    this.d = d;
+    d.hub.on("piecesDecided", (worktreeId, id, approved) => fireAndForget(worktreeId, approved ? this.act(worktreeId, id, undefined, true) : this.decline(worktreeId, id), "pieces"));
+    d.hub.on("planUnsplit", (worktreeId, markdown, planPath) => fireAndForget(worktreeId, this.read(worktreeId, markdown, planPath), "pieces read off the plan"));
+    d.hub.on("treeChanged", (worktreeId) => fireAndForget(worktreeId, this.stale(worktreeId), "pieces stale"));
+    d.hub.on("landed", (worktreeId) => fireAndForget(worktreeId, this.landed(worktreeId), "pieces after landing"));
+    d.hub.on("worktreesChanged", () => this.sweep());
+    this.sweep();
+  }
+  siblings(wt, repoId = wt.repoId) {
+    return this.d.state.worktrees.filter((w) => w.repoId === repoId && w.kind === "worktree" && w.id !== wt.id);
+  }
+  otherProjects(wt) {
+    return this.d.state.repos.filter((r) => r.id !== wt.repoId);
+  }
+  resolveProject(wt, project) {
+    const q = project.trim();
+    const others = this.otherProjects(wt);
+    if (others.length === 0)
+      return { refused: "no other project is open in Toyon." };
+    const names = others.map((r) => r.name).join(", ");
+    if (!q)
+      return { refused: `name the project. Open projects: ${names}.` };
+    const found = matchRepos(others, q);
+    if (found.length === 1)
+      return { repo: found[0] };
+    if (found.length > 1) {
+      return {
+        refused: `"${q}" names more than one open project: ${found.map((r) => r.path).join(", ")}. Say which by its path.`
+      };
+    }
+    const own = this.d.state.repo(wt.repoId);
+    if (own && matchRepos([own], q).length === 1) {
+      return { refused: `${own.name} is this worktree's own project; leave \`project\` out for a worktree here.` };
+    }
+    return { refused: `no open project is called "${q}". Open projects: ${names}.` };
+  }
+  tool(worktreeId) {
+    const wt = this.d.state.worktree(worktreeId);
+    const names = wt ? this.siblings(wt).map((w) => `${w.branch}, "${w.title}"`) : [];
+    const open = names.length ? `Open worktrees of this project you can name in \`after\` or \`to\`: ${names.join("; ")}.` : "No other worktree of this project is open right now.";
+    const projects = wt ? this.otherProjects(wt).map((r) => r.name) : [];
+    const elsewhere = projects.length ? ` Other projects open in Toyon you can name in \`project\`: ${projects.join(", ")}.` : "";
+    return {
+      name: SPLIT_TOOL,
+      description: `Hand Toyon the pieces of the work you are planning, or one piece you came across: each goes on this worktree, a new worktree of this project or of another open one, or an open worktree already on that part; the person decides on the list beside your plan. Nothing starts. ${open}${elsewhere}`,
+      inputSchema: {
+        type: "object",
+        properties: {
+          pieces: {
+            type: "array",
+            minItems: 1,
+            maxItems: PIECES_MAX,
+            items: {
+              type: "object",
+              properties: {
+                title: {
+                  type: "string",
+                  description: `A name for the piece, the way a teammate would say it: ${NAME_SHAPE}. It titles the worktree.`
+                },
+                plan: {
+                  type: "string",
+                  description: "The plan its agent builds from, in markdown that stands on its own: what is needed and why, the paths that depend on it, and what done looks like."
+                },
+                attachments: {
+                  type: "array",
+                  items: { type: "string" },
+                  description: 'The attachments from this chat the piece needs, by their labels as captioned: "Image 2", "Paste 1".'
+                },
+                where: {
+                  type: "string",
+                  enum: ["here", "worktree", "send"],
+                  description: "here: you do it in this worktree. worktree: a new worktree, of this project or of the one `project` names. send: an open worktree already working on that part."
+                },
+                after: {
+                  type: "string",
+                  description: 'worktree only: what the piece waits for before it starts: a branch, another piece of this list by its title, or "this" for your own branch.'
+                },
+                to: { type: "string", description: "send only: the open worktree it goes to, by branch or title." },
+                project: {
+                  type: "string",
+                  description: "Another project open in Toyon, by its name as listed or its path: the worktree is made there, or `to` is one of its worktrees. Leave out for this project."
+                }
+              },
+              required: ["title", "plan", "where"],
+              additionalProperties: false
+            }
+          }
+        },
+        required: ["pieces"],
+        additionalProperties: false
+      }
+    };
+  }
+  async call(worktreeId, args) {
+    const shape = `split takes { pieces: [{ title: string, plan: string, where: "here" | "worktree" | "send", attachments?: string[], after?: string, to?: string, project?: string }] }, 1 to ${PIECES_MAX} pieces.`;
+    const a = args && typeof args === "object" && !Array.isArray(args) ? args : null;
+    const list = a && Array.isArray(a.pieces) ? a.pieces : null;
+    if (!list || list.length === 0)
+      return refused(shape);
+    const pieces = [];
+    for (const raw of list) {
+      const p = raw && typeof raw === "object" && !Array.isArray(raw) ? raw : null;
+      const shaped = p && typeof p.title === "string" && typeof p.plan === "string" && (p.where === "here" || p.where === "worktree" || p.where === "send") && (p.attachments === undefined || Array.isArray(p.attachments) && p.attachments.every((l) => typeof l === "string")) && (p.after === undefined || typeof p.after === "string") && (p.to === undefined || typeof p.to === "string") && (p.project === undefined || typeof p.project === "string");
+      if (!shaped)
+        return refused(shape);
+      pieces.push({
+        title: p.title,
+        plan: p.plan,
+        where: p.where,
+        ...p.attachments ? { attachments: p.attachments } : {},
+        ...p.after !== undefined ? { after: p.after } : {},
+        ...p.to !== undefined ? { to: p.to } : {},
+        ...p.project !== undefined ? { project: p.project } : {}
+      });
+    }
+    return this.propose(worktreeId, pieces, "agent");
+  }
+  async propose(worktreeId, raw, by = "agent", read) {
+    const wt = this.d.state.worktree(worktreeId);
+    if (!wt)
+      throw new UserError("that chat is gone");
+    if (raw.length > PIECES_MAX)
+      return refused(`At most ${PIECES_MAX} pieces in one list; fold the rest into \`here\`.`);
+    const agent = this.d.runtime.ensureAgent(wt).agent;
+    const entries = agent.transcript();
+    const pieces = [];
+    for (const [i, p] of raw.entries()) {
+      const title = sentenceCase(p.title.trim());
+      const plan = p.plan.trim();
+      if (!title)
+        return refused(`Piece ${i + 1} has no title.`);
+      const over = overNameShape(title);
+      if (over)
+        return refused(`Piece ${i + 1}'s title ${over}`);
+      if (!plan)
+        return refused(`Piece ${i + 1} ("${title}") has no plan; write the plan its agent builds from.`);
+      if (plan.length > PLAN_MAX) {
+        return refused(`Piece ${i + 1}'s plan is over ${PLAN_MAX} characters; cut it to what its agent needs.`);
+      }
+      if ((p.attachments?.length ?? 0) > ATTACH_MAX) {
+        return refused(`Piece ${i + 1} names more than ${ATTACH_MAX} attachments.`);
+      }
+      if ((p.project?.length ?? 0) > PROJECT_MAX)
+        return refused(`Piece ${i + 1}'s project name is too long.`);
+      const attachments = [];
+      for (const label of p.attachments ?? []) {
+        const ref = attachmentNamed(entries, label);
+        if (!ref)
+          return refused(`This chat has no attachment "${label.trim()}"; name them as the messages caption them.`);
+        attachments.push(ref);
+      }
+      const piece = { id: `p${i + 1}`, title, plan, attachments, fate: p.where };
+      if (p.project !== undefined) {
+        if (p.where === "here")
+          return refused(`Piece ${i + 1} ("${title}") is \`here\` and names a project.`);
+        const found = this.resolveProject(wt, p.project);
+        if ("refused" in found)
+          return refused(`Piece ${i + 1} ("${title}"): ${found.refused}`);
+        piece.project = { id: found.repo.id, name: found.repo.name };
+      }
+      if (p.where !== "worktree" && p.after !== undefined) {
+        return refused(`Piece ${i + 1} ("${title}") has \`after\`, which only a \`worktree\` piece takes.`);
+      }
+      if (p.where !== "send" && p.to !== undefined) {
+        return refused(`Piece ${i + 1} ("${title}") has \`to\`, which only a \`send\` piece takes.`);
+      }
+      if (p.where === "worktree" && p.after !== undefined) {
+        const q = p.after.trim();
+        if (!q)
+          return refused(`Piece ${i + 1} ("${title}") has a blank \`after\`; name what it waits for, or leave it out.`);
+        const after = this.resolveAfter(wt, raw, i, q);
+        if ("refused" in after)
+          return refused(`Piece ${i + 1} ("${title}"): ${after.refused}`);
+        piece.after = after.after;
+      }
+      if (p.where === "send") {
+        const q = p.to?.trim() ?? "";
+        if (!q)
+          return refused(`Piece ${i + 1} ("${title}") is \`send\` and names no worktree in \`to\`.`);
+        const found = this.named(this.siblings(wt, piece.project?.id).filter((w) => !w.landed), q, piece.project?.name);
+        if ("refused" in found)
+          return refused(`Piece ${i + 1} ("${title}"): ${found.refused}`);
+        piece.to = found.worktree;
+      }
+      pieces.push(piece);
+    }
+    const waiting = heldUnshown(entries);
+    const replaced = openPieces(entries).filter((o) => by === "agent" && o.id === waiting?.id && o.by !== "toyon");
+    if (openPieces(entries).some((o) => !replaced.includes(o))) {
+      return refused("A pieces list is already waiting for the person on this chat; finish your turn.");
+    }
+    if (by === "agent" && proposedThisTurn(entries) >= PER_TURN_MAX) {
+      return refused(`${PER_TURN_MAX} proposals were made this turn already; finish your turn and let the person answer.`);
+    }
+    for (const o of replaced) {
+      agent.note({ type: "pieces-declined", id: o.id, reason: "handed over again", ts: Date.now() });
+    }
+    const held = by !== "person" && wt.mode === "plan";
+    const plan = held ? null : writePlanDocNow(wt.path, listDoc(pieces));
+    agent.note({
+      type: "pieces-proposed",
+      id: randomUUID2(),
+      pieces,
+      mode: wt.mode ?? DEFAULT_PERMISSION_MODE,
+      ...held ? { held: true } : {},
+      ...plan ? { plan } : {},
+      ...by === "toyon" ? { by: "toyon" } : {},
+      ...by === "toyon" && read ? { read } : {},
+      ts: Date.now()
+    });
+    return { text: held ? HELD : SHOWN };
+  }
+  resolveAfter(wt, raw, at, q) {
+    const bare = q.startsWith("@") ? q.slice(1) : q;
+    const titled = raw.map((p, i) => ({ i, title: p.title.trim() }));
+    const onList = matchBy(titled.filter((p) => p.i < at), bare, [(p) => p.title]);
+    if (onList.length === 1)
+      return { after: { piece: `p${onList[0].i + 1}` } };
+    if (onList.length > 1)
+      return { refused: `"${q}" names more than one piece on the list; give them different titles.` };
+    if (matchBy(titled.filter((p) => p.i >= at), bare, [(p) => p.title]).length > 0) {
+      return { refused: `"${q}" is this piece or a later one; a piece waits only for one earlier on the list.` };
+    }
+    if (bare === "this" || bare === wt.branch)
+      return { after: { id: wt.id, branch: wt.branch, title: wt.title } };
+    const found = this.named(this.siblings(wt), bare);
+    if ("refused" in found)
+      return found;
+    return { after: found.worktree };
+  }
+  named(among, q, where = "this project") {
+    const bare = q.startsWith("@") ? q.slice(1) : q;
+    const list = among.map((w) => `${w.branch}, "${w.title}"`).join("; ");
+    if (among.length === 0)
+      return { refused: `no other worktree of ${where} is open.` };
+    const found = matchBy(among, bare, [(w) => w.branch, (w) => w.title]);
+    if (found.length === 1) {
+      const w = found[0];
+      return { worktree: { id: w.id, branch: w.branch, title: w.title } };
+    }
+    if (found.length > 1) {
+      return {
+        refused: `"${q}" names more than one worktree: ${found.map((w) => w.branch).join(", ")}. Say which by its branch.`
+      };
+    }
+    return { refused: `no open worktree of ${where} is called "${q}". Open: ${list}.` };
+  }
+  fate(worktreeId, id, pieceId, fate) {
+    const wt = this.d.state.worktree(worktreeId);
+    if (!wt)
+      throw new UserError("that chat is gone");
+    const agent = this.d.runtime.ensureAgent(wt).agent;
+    const proposed = openPieces(agent.transcript()).find((p) => p.id === id);
+    if (!proposed)
+      throw new UserError("That list is not open in this chat");
+    const piece = proposed.pieces.find((p) => p.id === pieceId);
+    if (!piece)
+      throw new UserError("That piece is not on the list");
+    if (fate === "send" && !piece.to)
+      throw new UserError("That piece has no worktree to send to");
+    if (piece.fate === "send" && (fate === "here" || fate === "worktree")) {
+      throw new UserError("A piece for an open worktree is sent there or skipped");
+    }
+    agent.note({ type: "pieces-fate", id, pieceId, fate, ts: Date.now() });
+  }
+  async answer(worktreeId, id, go, note) {
+    if (!this.d.state.worktree(worktreeId))
+      throw new UserError("that chat is gone");
+    if (go)
+      await this.act(worktreeId, id, note?.trim() || undefined);
+    else
+      await this.decline(worktreeId, id);
+  }
+  async decline(worktreeId, id, reason) {
+    const wt = this.d.state.worktree(worktreeId);
+    if (!wt)
+      return;
+    const agent = this.d.runtime.ensureAgent(wt).agent;
+    if (!openPieces(agent.transcript()).some((p) => p.id === id)) {
+      return log.debug(worktreeId, `decline for a pieces list that already closed (${id})`);
+    }
+    agent.note({
+      type: "pieces-declined",
+      id,
+      ...reason ? { outcome: "failed", reason } : {},
+      ts: Date.now()
+    });
+  }
+  async act(worktreeId, id, note, tell = false) {
+    const wt = this.d.state.worktree(worktreeId);
+    if (!wt)
+      return;
+    const agent = this.d.runtime.ensureAgent(wt).agent;
+    const entries = agent.transcript();
+    const proposed = openPieces(entries).find((p) => p.id === id);
+    if (!proposed)
+      return log.debug(worktreeId, `go for a pieces list that already closed (${id})`);
+    agent.note({ type: "pieces-go", id, ts: Date.now() });
+    try {
+      const repo = this.d.state.repo(wt.repoId);
+      if (!repo)
+        throw new UserError(`${wt.title}'s project is no longer open in Toyon`);
+      const origin = this.originOf(wt, repo.name, listFile(entries, id));
+      const outcomes = [];
+      const became = new Map;
+      for (const piece of proposed.pieces) {
+        const fate = effectiveFate(entries, proposed, piece);
+        try {
+          outcomes.push(await this.actOn(wt, origin, proposed, piece, fate, note, became));
+        } catch (e) {
+          const error = e instanceof Error ? e.message : String(e);
+          log.warn(worktreeId, `piece "${piece.title}" (${fate}) failed`, e);
+          became.set(piece.id, { fate: "skip" });
+          outcomes.push({ pieceId: piece.id, fate, error });
+        }
+      }
+      agent.note({ type: "pieces", id, outcomes, ts: Date.now() });
+      if (tell && outcomes.some((o) => o.fate !== "here")) {
+        for (let i = 0;i < 30 && openPlanCard(agent.transcript()); i++)
+          await Bun.sleep(100);
+        await Bun.sleep(100);
+        agent.send(piecesActedPrompt(proposed.pieces, outcomes), {
+          asked: { kind: "pieces", why: "what the split started, so the agent builds only its own piece" },
+          keepCards: true
+        });
+      }
+    } catch (e) {
+      const reason = e instanceof Error ? e.message : String(e);
+      agent.note({ type: "pieces-declined", id, outcome: "failed", reason, ts: Date.now() });
+      throw e;
+    }
+  }
+  async read(worktreeId, markdown, planPath) {
+    const wt = this.d.state.worktree(worktreeId);
+    if (!wt)
+      return;
+    const agent = this.d.runtime.ensureAgent(wt).agent;
+    if (openPieces(agent.transcript()).length > 0)
+      return;
+    const found = await this.d.reader(wt, markdown);
+    if (!found || found.length < 2)
+      return;
+    const card = openPlanCard(agent.transcript());
+    if (!card || card.plan !== planPath || openPieces(agent.transcript()).length > 0)
+      return;
+    await this.proposeRead(wt, markdown, found);
+  }
+  async proposeRead(wt, markdown, found) {
+    const siblings = this.siblings(wt);
+    const known = (q) => q === "this" || q === wt.branch || !("refused" in this.named(siblings, q.startsWith("@") ? q.slice(1) : q));
+    const sections = new Map;
+    for (const p of found)
+      sections.set(p.section, (sections.get(p.section) ?? 0) + 1);
+    const raw = found.map((p) => {
+      const own = sections.get(p.section) === 1 ? sectionText(markdown, p.section) : null;
+      const plan = own ?? p.plan ?? sectionText(markdown, p.section) ?? `${p.title}
+
+${p.section}`;
+      const after = p.where === "worktree" && p.after && known(p.after) ? p.after : undefined;
+      return { title: p.title, plan, where: p.where, ...after ? { after } : {} };
+    });
+    const r = await this.propose(wt.id, raw, "toyon", hashText(markdown));
+    if (r.isError) {
+      log.warn(wt.id, `the list read off the plan was refused: ${r.text}`);
+      return null;
+    }
+    const agent = this.d.runtime.agentFor(wt.id);
+    return agent ? openPieces(agent.transcript()).find((p) => p.by === "toyon") ?? null : null;
+  }
+  async stale(worktreeId) {
+    const wt = this.d.state.worktree(worktreeId);
+    if (wt?.mode !== "plan")
+      return;
+    const agent = this.d.runtime.agentFor(worktreeId);
+    if (!agent)
+      return;
+    const entries = agent.transcript();
+    const open = heldUnshown(entries);
+    if (!open)
+      return;
+    if (entries.some(({ event }) => event.type === "pieces-stale" && event.id === open.id))
+      return;
+    const card = openPlanCard(entries);
+    if (!card?.plan || !card.detail)
+      return;
+    let markdown;
+    try {
+      markdown = readFileSync20(join28(wt.path, card.plan), "utf8");
+    } catch (e) {
+      log.warn(worktreeId, `could not read ${card.plan} to see whether the plan moved`, e);
+      return;
+    }
+    const moved = open.read ? hashText(markdown) !== open.read : planEdited(wt.path, card.plan, card.detail);
+    if (!moved)
+      return;
+    agent.note({ type: "pieces-stale", id: open.id, ts: Date.now() });
+    if (open.by !== "toyon")
+      return;
+    const found = await this.d.reader(wt, markdown);
+    if (!found || found.length < 2)
+      return;
+    if (openPlanCard(agent.transcript())?.id !== card.id)
+      return;
+    const pressed = new Map;
+    for (const { event } of agent.transcript()) {
+      if (event.type === "pieces-fate" && event.id === open.id) {
+        const title = open.pieces.find((p) => p.id === event.pieceId)?.title;
+        if (title)
+          pressed.set(title.toLowerCase(), event.fate);
+      }
+    }
+    agent.note({ type: "pieces-declined", id: open.id, reason: "the plan changed; read again", ts: Date.now() });
+    const fresh = await this.proposeRead(wt, markdown, found);
+    if (!fresh)
+      return;
+    for (const piece of fresh.pieces) {
+      const fate = pressed.get(piece.title.toLowerCase());
+      if (fate && fate !== piece.fate && !(fate === "send" && !piece.to)) {
+        agent.note({ type: "pieces-fate", id: fresh.id, pieceId: piece.id, fate, ts: Date.now() });
+      }
+    }
+  }
+  async ask(worktreeId, repoId, text) {
+    const wt = this.d.state.requireWorktree(worktreeId);
+    const repo = this.d.state.repo(repoId);
+    if (!repo)
+      throw new UserError("no such project");
+    const here = repo.id === wt.repoId;
+    const agent = this.d.runtime.agentFor(worktreeId);
+    if (!agent)
+      throw new UserError("worktree still starting; try again in a moment");
+    if (agent.mcpTools === null)
+      await agent.warm();
+    if (agent.mcpTools === true) {
+      agent.send(pieceAskPrompt(text, here ? undefined : repo), {
+        asked: { kind: "pieces", why: here ? "a new worktree here" : `a new worktree in ${repo.name}` }
+      });
+      return;
+    }
+    const own = text?.trim();
+    if (!own)
+      throw new UserError(`Write what ${here ? "the new worktree" : repo.name} should do first`);
+    const r = await this.propose(worktreeId, [{ title: titleFrom(own), plan: own, where: "worktree", ...here ? {} : { project: repo.path } }], "person");
+    if (r.isError)
+      throw new UserError(r.text);
+  }
+  originOf(wt, project, file) {
+    return { path: wt.path, project, branch: wt.branch, ...file ? { plan: file } : {} };
+  }
+  async actOn(wt, origin, proposed, piece, fate, note, became) {
+    const crossed = piece.project ? { repoName: piece.project.name } : {};
+    if (fate === "here" || fate === "skip") {
+      became.set(piece.id, { fate });
+      return { pieceId: piece.id, fate };
+    }
+    if (fate === "send") {
+      const target = piece.to ? this.d.state.worktree(piece.to.id) : undefined;
+      const repoId = piece.project?.id ?? wt.repoId;
+      if (target?.kind !== "worktree" || target.repoId !== repoId) {
+        throw new UserError(`"${piece.to?.title ?? "the worktree"}" is no longer open`);
+      }
+      const attachments = await this.reattachAll(wt.id, piece.attachments);
+      this.d.runtime.ensureAgent(target).agent.send(pieceSendPrompt(piece.plan, note, origin), {
+        keepCards: true,
+        ...attachments.length ? { attachments } : {},
+        handed: {
+          via: "message",
+          body: piece.plan,
+          origin: handedOrigin(wt, piece.project ? origin.project : undefined),
+          ...note ? { note } : {}
+        }
+      });
+      became.set(piece.id, { fate, worktree: { id: target.id, branch: target.branch, title: target.title } });
+      return { pieceId: piece.id, fate, worktreeId: target.id, title: target.title, ...crossed };
+    }
+    const waits = this.waitsFor(wt, piece, became);
+    if (waits) {
+      const queued = {
+        proposalId: proposed.id,
+        pieceId: piece.id,
+        title: piece.title,
+        plan: piece.plan,
+        after: waits,
+        ...piece.project ? { project: piece.project } : {},
+        attachments: piece.attachments,
+        ...note ? { note } : {},
+        queuedAt: Date.now()
+      };
+      const live = this.d.state.requireWorktree(wt.id);
+      live.queued = [...live.queued ?? [], queued];
+      this.d.state.save();
+      this.d.hub.emit("worktreesChanged");
+      became.set(piece.id, { fate, queued: true });
+      const after = "piece" in waits ? proposed.pieces.find((p) => p.id === waits.piece)?.title ?? waits.piece : waits.branch;
+      return { pieceId: piece.id, fate, after, ...crossed };
+    }
+    const made = await this.make(wt, origin, piece, note);
+    became.set(piece.id, { fate, worktree: { id: made.id, branch: made.branch, title: made.title } });
+    return { pieceId: piece.id, fate, worktreeId: made.id, title: made.title, ...crossed };
+  }
+  waitsFor(wt, piece, became) {
+    const after = piece.after;
+    if (!after)
+      return null;
+    if (!("piece" in after)) {
+      const waits = this.d.state.worktree(after.id);
+      return waits && waits.kind === "worktree" && !waits.landed ? after : null;
+    }
+    const on = became.get(after.piece);
+    if (!on)
+      return null;
+    if (on.queued)
+      return { piece: after.piece };
+    if (on.worktree)
+      return on.worktree;
+    if (on.fate === "here")
+      return { id: wt.id, branch: wt.branch, title: wt.title };
+    return null;
+  }
+  async make(origin, at, piece, note, after) {
+    const repoId = piece.project?.id ?? origin.repoId;
+    if (piece.project && !this.d.state.repo(repoId)) {
+      throw new UserError(`${piece.project.name} is no longer open in Toyon`);
+    }
+    const attachments = await this.reattachAll(origin.id, piece.attachments);
+    const mode = origin.mode === "plan" ? "auto" : origin.mode;
+    const via = piece.project ? "project" : "piece";
+    return this.d.create(repoId, piece.title, {
+      title: piece.title,
+      ...mode ? { mode } : {},
+      ...attachments.length ? { attachments } : {},
+      from: {
+        kind: "worktree",
+        ref: origin.branch,
+        origin: { id: origin.id, repoId: origin.repoId },
+        ...at.plan ? { plan: at.plan } : {},
+        ...after ? { after } : {}
+      },
+      plan: {
+        markdown: pieceDoc(piece),
+        handed: {
+          via: "plan",
+          body: piece.plan,
+          origin: handedOrigin(origin, piece.project ? at.project : undefined),
+          ...note ? { note } : {}
+        },
+        prompt: (path) => path ? handedPrompt(path, note, at, via) : `${pieceDoc(piece)}
+${handedPrompt(null, note, at, via)}`
+      },
+      cold: true
+    });
+  }
+  async reattachAll(worktreeId, refs) {
+    const out = [];
+    for (const ref of refs) {
+      const again = await this.d.attachments.reattach(worktreeId, ref);
+      if (again)
+        out.push(again);
+      else
+        log.warn(worktreeId, `a piece's attachment is gone from the store (${ref.kind} ${ref.n})`);
+    }
+    return out;
+  }
+  async landed(landedId) {
+    this.tellOrigin(landedId);
+    const madeNow = new Set;
+    for (const origin of this.d.state.worktrees) {
+      const due = origin.queued?.filter((q) => !("piece" in q.after) && q.after.id === landedId) ?? [];
+      if (due.length === 0)
+        continue;
+      const repo = this.d.state.repo(origin.repoId);
+      origin.queued = origin.queued?.filter((q) => !due.includes(q));
+      if (origin.queued?.length === 0)
+        delete origin.queued;
+      this.d.state.save();
+      this.d.hub.emit("worktreesChanged");
+      const agent = this.d.runtime.ensureAgent(origin).agent;
+      for (const q of due) {
+        try {
+          if (!repo)
+            throw new UserError("the project is no longer open in Toyon");
+          const at = this.originOf(origin, repo.name, listFile(agent.transcript(), q.proposalId));
+          const made = await this.make(origin, at, q, q.note, "piece" in q.after ? undefined : q.after);
+          agent.note({
+            type: "piece-made",
+            id: q.proposalId,
+            pieceId: q.pieceId,
+            worktreeId: made.id,
+            title: made.title,
+            ts: Date.now()
+          });
+          madeNow.add(made.id);
+          this.repoint(origin, q, { id: made.id, branch: made.branch, title: made.title });
+        } catch (e) {
+          const reason = e instanceof Error ? e.message : String(e);
+          log.warn(origin.id, `queued piece "${q.title}" could not be made`, e);
+          agent.note({ type: "piece-dropped", id: q.proposalId, pieceId: q.pieceId, reason, ts: Date.now() });
+          this.dropDependents(origin, q);
+        }
+      }
+    }
+    this.tellWaiters(landedId, madeNow);
+  }
+  repoint(origin, made, worktree) {
+    const live = this.d.state.worktree(origin.id);
+    if (!live?.queued)
+      return;
+    let changed = false;
+    for (const q of live.queued) {
+      if (q.proposalId === made.proposalId && "piece" in q.after && q.after.piece === made.pieceId) {
+        q.after = worktree;
+        changed = true;
+      }
+    }
+    if (changed) {
+      this.d.state.save();
+      this.d.hub.emit("worktreesChanged");
+    }
+  }
+  dropDependents(origin, dropped) {
+    const live = this.d.state.worktree(origin.id);
+    if (!live?.queued)
+      return;
+    const gone = live.queued.filter((q) => q.proposalId === dropped.proposalId && ("piece" in q.after) && q.after.piece === dropped.pieceId);
+    if (gone.length === 0)
+      return;
+    live.queued = live.queued.filter((q) => !gone.includes(q));
+    if (live.queued.length === 0)
+      delete live.queued;
+    this.d.state.save();
+    this.d.hub.emit("worktreesChanged");
+    const agent = this.d.runtime.ensureAgent(live).agent;
+    for (const q of gone) {
+      agent.note({
+        type: "piece-dropped",
+        id: q.proposalId,
+        pieceId: q.pieceId,
+        reason: `the piece it waited for, "${dropped.title}", was dropped`,
+        ts: Date.now()
+      });
+      this.dropDependents(live, q);
+    }
+  }
+  tellOrigin(landedId) {
+    const wt = this.d.state.worktree(landedId);
+    if (wt?.from?.kind !== "worktree")
+      return;
+    const origin = this.d.state.worktree(wt.from.origin.id);
+    if (origin?.kind !== "worktree")
+      return;
+    const repo = this.d.state.repo(wt.repoId);
+    if (!repo)
+      return;
+    this.d.runtime.ensureAgent(origin).agent.note({
+      type: "piece-landed",
+      worktreeId: wt.id,
+      repoName: repo.name,
+      title: wt.title,
+      ...wt.pr?.url ? { url: wt.pr.url } : {},
+      ...wt.repoId === origin.repoId ? { same: true } : {},
+      ts: Date.now()
+    });
+  }
+  tellWaiters(landedId, madeNow) {
+    const landed = this.d.state.worktree(landedId);
+    if (!landed)
+      return;
+    const repo = this.d.state.repo(landed.repoId);
+    if (!repo)
+      return;
+    for (const w of this.d.state.worktrees) {
+      if (w.kind !== "worktree" || w.landed || w.id === landedId || madeNow.has(w.id))
+        continue;
+      if (w.from?.kind !== "worktree" || w.from.after?.id !== landedId)
+        continue;
+      this.d.runtime.ensureAgent(w).agent.note({
+        type: "piece-landed",
+        worktreeId: landed.id,
+        repoName: repo.name,
+        title: landed.title,
+        ...landed.pr?.url ? { url: landed.pr.url } : {},
+        ...w.repoId === landed.repoId ? { same: true } : {},
+        again: true,
+        ts: Date.now()
+      });
+    }
+  }
+  sweep() {
+    let changed = false;
+    for (const origin of this.d.state.worktrees) {
+      if (!origin.queued?.length)
+        continue;
+      const live = (id) => this.d.state.worktree(id)?.kind === "worktree";
+      const gone = origin.queued.filter((q) => !("piece" in q.after) && !live(q.after.id));
+      if (gone.length === 0)
+        continue;
+      origin.queued = origin.queued.filter((q) => !gone.includes(q));
+      if (origin.queued.length === 0)
+        delete origin.queued;
+      changed = true;
+      const agent = this.d.runtime.ensureAgent(origin).agent;
+      for (const q of gone) {
+        const title = "piece" in q.after ? q.after.piece : q.after.title;
+        agent.note({
+          type: "piece-dropped",
+          id: q.proposalId,
+          pieceId: q.pieceId,
+          reason: `the worktree it waited for, "${title}", is gone`,
+          ts: Date.now()
+        });
+        this.dropDependents(origin, q);
+      }
+    }
+    if (changed) {
+      this.d.state.save();
+      this.d.hub.emit("worktreesChanged");
+    }
+  }
+}
+function matchRepos(repos, q) {
+  return matchBy(repos, q, [(r) => r.path, (r) => r.name]);
+}
+function attachmentNamed(entries, label) {
+  const m = LABEL.exec(label.trim());
+  if (!m)
+    return null;
+  const kind = KIND_OF[m[1].toLowerCase()];
+  const n = Number(m[2]);
+  for (const { event } of entries) {
+    if (event.type !== "user-message" && event.type !== "handed")
+      continue;
+    const ref = event.attachments?.find((a) => a.kind === kind && a.n === n);
+    if (ref)
+      return ref;
+  }
+  return null;
+}
+
 // ../daemon/src/worktrees/prs.ts
 var POLL_MS3 = 3 * 60000;
 
@@ -32503,7 +33498,7 @@ async function mergedBranches(repoPath, defaultBr) {
 }
 
 // ../daemon/src/worktrees/discover.ts
-import { createHash as createHash5 } from "crypto";
+import { createHash as createHash6 } from "crypto";
 import { basename as basename10 } from "path";
 
 // ../daemon/src/git/worktrees.ts
@@ -32572,7 +33567,7 @@ async function listWorktrees(repoPath) {
 
 // ../daemon/src/worktrees/discover.ts
 function discoveredId(path) {
-  return `disc-${createHash5("sha1").update(canonical(path)).digest("hex").slice(0, 12)}`;
+  return `disc-${createHash6("sha1").update(canonical(path)).digest("hex").slice(0, 12)}`;
 }
 function knownPaths(known) {
   const paths = new Set;
@@ -32755,9 +33750,9 @@ function rankRefs({ refs, merged, prs, query, defaultBranch, rowIdForPath }) {
 }
 
 // ../daemon/src/worktrees/service.ts
-import { cpSync, existsSync as existsSync36, readFileSync as readFileSync21, rmSync as rmSync8 } from "fs";
+import { cpSync, existsSync as existsSync36, readFileSync as readFileSync22, rmSync as rmSync8 } from "fs";
 import { rm as rm5 } from "fs/promises";
-import { dirname as dirname13, join as join32 } from "path";
+import { dirname as dirname13, join as join33 } from "path";
 
 // ../daemon/src/git/archive.ts
 import { rmSync as rmSync5 } from "fs";
@@ -33366,7 +34361,7 @@ function compareUrl(remoteUrl, base, branch) {
 
 // ../daemon/src/git/turn.ts
 import { copyFileSync, existsSync as existsSync33, rmSync as rmSync6 } from "fs";
-import { join as join28 } from "path";
+import { join as join29 } from "path";
 var turnRef = (worktreeId, which) => `refs/toyon/turns/${worktreeId}/${which}`;
 var SNAPSHOT_SUBJECT2 = "toyon: tree at a send";
 var queue = new Map;
@@ -33384,7 +34379,7 @@ async function treeNow(wtPath, head, dirty) {
     const dir = await git(wtPath, "rev-parse", "--absolute-git-dir");
     if (!dir.ok || !dir.out)
       return null;
-    index = join28(dir.out, "toyon-turn-index");
+    index = join29(dir.out, "toyon-turn-index");
   }
   const env = { GIT_INDEX_FILE: index };
   const writeTree = async () => {
@@ -33407,7 +34402,7 @@ async function treeNow(wtPath, head, dirty) {
   }
   synced.delete(wtPath);
   if (!existsSync33(index)) {
-    const own = join28(index, "..", "index");
+    const own = join29(index, "..", "index");
     if (existsSync33(own))
       copyFileSync(own, index);
     else if (!(await run(GIT, ["read-tree", "HEAD"], wtPath, env)).ok)
@@ -33489,8 +34484,8 @@ async function dropTurnRefs(repoPath, worktreeId) {
 }
 
 // ../daemon/src/worktrees/archive.ts
-import { existsSync as existsSync34, mkdirSync as mkdirSync9, readdirSync as readdirSync9, readFileSync as readFileSync20, renameSync as renameSync7, rmSync as rmSync7, writeFileSync as writeFileSync13 } from "fs";
-import { basename as basename11, dirname as dirname12, join as join29 } from "path";
+import { existsSync as existsSync34, mkdirSync as mkdirSync9, readdirSync as readdirSync9, readFileSync as readFileSync21, renameSync as renameSync7, rmSync as rmSync7, writeFileSync as writeFileSync13 } from "fs";
+import { basename as basename11, dirname as dirname12, join as join30 } from "path";
 class WorktreeArchive {
   dir;
   records = new Map;
@@ -33502,7 +34497,7 @@ class WorktreeArchive {
       if (!existsSync34(file))
         continue;
       try {
-        this.records.set(id, JSON.parse(readFileSync20(file, "utf8")));
+        this.records.set(id, JSON.parse(readFileSync21(file, "utf8")));
       } catch (e) {
         log.warn("archive", `skipped an unreadable record: ${file}`, e);
       }
@@ -33557,24 +34552,24 @@ class WorktreeArchive {
   planFile(id, rel) {
     if (!this.records.has(id) || !isPlanPath(rel))
       return null;
-    const file = join29(this.filesOf(id).plans, basename11(rel));
+    const file = join30(this.filesOf(id).plans, basename11(rel));
     if (!existsSync34(file))
       return null;
     try {
-      return readFileSync20(file, "utf8");
+      return readFileSync21(file, "utf8");
     } catch (e) {
       log.warn(id, `could not read its archived plan ${rel}`, e);
       return null;
     }
   }
   filesOf(id) {
-    const dir = join29(this.dir, id);
+    const dir = join30(this.dir, id);
     return {
       dir,
-      record: join29(dir, "record.json"),
-      transcript: join29(dir, "transcript.jsonl"),
-      attachments: join29(dir, "attachments"),
-      plans: join29(dir, "plans")
+      record: join30(dir, "record.json"),
+      transcript: join30(dir, "transcript.jsonl"),
+      attachments: join30(dir, "attachments"),
+      plans: join30(dir, "plans")
     };
   }
 }
@@ -33601,7 +34596,7 @@ function summarize(r, repoId, transcript) {
 function lastUsage(transcript) {
   if (!existsSync34(transcript))
     return null;
-  const lines = readFileSync20(transcript, "utf8").split(`
+  const lines = readFileSync21(transcript, "utf8").split(`
 `);
   for (let i = lines.length - 1;i >= 0; i--) {
     if (!lines[i]?.includes('"usage"'))
@@ -33617,14 +34612,16 @@ function lastUsage(transcript) {
 function firstPrompt(transcript) {
   if (!existsSync34(transcript))
     return;
-  for (const line of readFileSync20(transcript, "utf8").split(`
+  for (const line of readFileSync21(transcript, "utf8").split(`
 `)) {
-    if (!line.includes('"user-message"'))
+    if (!line.includes('"user-message"') && !line.includes('"handed"'))
       continue;
     try {
       const event = JSON.parse(line).event;
       if (event?.type === "user-message")
         return event.text.slice(0, 500);
+      if (event?.type === "handed")
+        return (event.body ?? event.text).slice(0, 500);
     } catch {}
   }
   return;
@@ -33713,7 +34710,7 @@ async function fillLandMarks(jobs, read, width = 8) {
 
 // ../daemon/src/worktrees/spare.ts
 import { existsSync as existsSync35 } from "fs";
-import { basename as basename12, join as join30 } from "path";
+import { basename as basename12, join as join31 } from "path";
 class SparePool {
   d;
   inflight = new Map;
@@ -33781,11 +34778,11 @@ class SparePool {
     return this.record(repoId, repo).then((wt) => this.warmUp(wt, repo, {}));
   }
   async record(repoId, repo) {
-    const { id, dir } = freeSlot(join30(this.d.paths.worktreesDir, repo.name));
+    const { id, dir } = freeSlot(join31(this.d.paths.worktreesDir, repo.name));
     const wt = {
       id,
       repoId,
-      path: join30(this.d.paths.worktreesDir, repo.name, dir),
+      path: join31(this.d.paths.worktreesDir, repo.name, dir),
       branch: repo.defaultBranch,
       kind: "spare",
       phase: "reserved",
@@ -33975,7 +34972,7 @@ class SparePool {
 // ../daemon/src/worktrees/treeState.ts
 import { watch as watch2 } from "fs";
 import { stat as stat5 } from "fs/promises";
-import { join as join31 } from "path";
+import { join as join32 } from "path";
 var EDIT_DELAY_MS = 150;
 var SHELL_QUIET_MS2 = 1500;
 var WATCH_DELAY_MS = 300;
@@ -34358,7 +35355,7 @@ class TreeState {
       xy: f.xy,
       ...entries.folded.has(f.path) ? { add: f.add, del: f.del } : {}
     }));
-    const stats = await Promise.all(files.slice(0, SIGNATURE_STATS).map((f) => stat5(join31(r.path, f.path)).then((s) => `${s.mtimeMs}:${s.size}`, () => "-")));
+    const stats = await Promise.all(files.slice(0, SIGNATURE_STATS).map((f) => stat5(join32(r.path, f.path)).then((s) => `${s.mtimeMs}:${s.size}`, () => "-")));
     const t0 = performance.now();
     const counts = { ...ab, ...unpushed === null ? {} : { unpushed } };
     const signature = String(Bun.hash([
@@ -34692,7 +35689,7 @@ async function deleteTree(path) {
   }
 }
 function withoutAttachments(event) {
-  if (event.type !== "user-message")
+  if (event.type !== "user-message" && event.type !== "handed")
     return event;
   const { attachments: _attachments, ...rest } = event;
   return rest;
@@ -34797,7 +35794,7 @@ class WorktreeService {
         const wt = d.state.worktree(worktreeId);
         const prompt = wt?.unnamed ? firstAskOf(d.runtime.agentFor(worktreeId)?.transcript() ?? []) : undefined;
         if (wt && prompt)
-          this.scheduleNaming(wt, prompt, wt.variant);
+          this.scheduleNaming(wt, prompt);
       }
       if (turn.end !== "asking")
         this.syncAfterTurn(worktreeId);
@@ -34812,7 +35809,7 @@ class WorktreeService {
     });
   }
   async create(repoId, prompt, opts = {}) {
-    const { variant, attachments } = opts;
+    const { attachments } = opts;
     const repo = this.d.state.requireRepo(repoId);
     const lead = opts.worktreeId ?? this.d.state.worktrees.find((w) => w.repoId === repoId && isMain(w))?.id;
     const context = (id) => {
@@ -34823,14 +35820,7 @@ class WorktreeService {
     const profile = this.checkProfile(repo, opts.profile);
     const task = taskText(prompt, attachments);
     const given = cleanTitle2(opts.title ?? "") || undefined;
-    const base = given ?? titleFrom(task);
-    const title = variant ? `${base} v${variant.index}` : base;
-    if (opts.carry && variant && variant.of > 1) {
-      throw new UserError(`only a single worktree can take the changes on ${repo.defaultBranch}`);
-    }
-    const agentPrompt = variant && variant.of >= 2 ? [prompt, variantLens(variant.index)].filter(Boolean).join(`
-
-`) : prompt;
+    const title = given ?? titleFrom(task);
     const spare = this.d.state.worktrees.find((w) => w.repoId === repoId && w.kind === "spare");
     const restart = !!spare && profile !== undefined && profile !== resolveRun(repo, spare).profile;
     let carriedIn;
@@ -34841,7 +35831,6 @@ class WorktreeService {
       mode: opts.mode,
       model: opts.model,
       effort: opts.effort,
-      variant,
       from: opts.from,
       profile,
       unnamed: given ? undefined : true
@@ -34852,7 +35841,12 @@ class WorktreeService {
       if (rt.agent.runningAgent !== null && rt.agent.runningAgent !== agent)
         await rt.agent.restart();
       carriedIn = await this.carryMain(repo, wt, !!opts.carry);
-      rt.agent.send(agentPrompt, { context: withCarry(context(wt.id), carriedIn), attachments });
+      const born = this.bornWith(wt, opts.plan);
+      rt.agent.send(born?.text ?? prompt, {
+        context: withCarry(context(wt.id), carriedIn),
+        attachments,
+        ...born ? { handed: born.handed } : {}
+      });
     });
     if (claimed) {
       const { wt } = claimed;
@@ -34876,7 +35870,7 @@ class WorktreeService {
       release?.();
       if (restart)
         this.restartProcs(wt);
-      this.nameOrAsk(wt, task, given, variant);
+      this.nameOrAsk(wt, task, given);
       if (carriedIn?.unmoved)
         throw new UserError(carriedIn.unmoved, { delivered: true });
       return wt;
@@ -34884,8 +35878,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(join32(this.d.paths.worktreesDir, repo.name));
-    const wtPath = join32(this.d.paths.worktreesDir, repo.name, dir);
+    const { id, dir } = freeSlot(join33(this.d.paths.worktreesDir, repo.name));
+    const wtPath = join33(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 = {
@@ -34900,7 +35894,6 @@ class WorktreeService {
       createdAt: Date.now(),
       promptedAt: Date.now(),
       agent,
-      ...variant ? { variant } : {},
       ...opts.from ? { from: opts.from } : {},
       ...opts.createdBy ? { createdBy: opts.createdBy } : {},
       ...profile !== undefined ? { profile } : {},
@@ -34909,16 +35902,34 @@ class WorktreeService {
       ...opts.effort ? { effort: opts.effort } : {}
     };
     const carried = await this.carryMain(repo, wt, !!opts.carry);
-    this.launch(wt, repo, repo.path);
-    this.d.runtime.ensureAgent(wt).agent.send(agentPrompt, { context: withCarry(context(id), carried), attachments });
-    this.nameOrAsk(wt, task, given, variant);
+    this.launch(wt, repo, repo.path, opts.cold ? { start: false } : {});
+    const born = this.bornWith(wt, opts.plan);
+    this.d.runtime.ensureAgent(wt).agent.send(born?.text ?? prompt, {
+      context: withCarry(context(id), carried),
+      attachments,
+      ...born ? { handed: born.handed } : {}
+    });
+    this.nameOrAsk(wt, task, given);
     if (carried.unmoved)
       throw new UserError(carried.unmoved, { delivered: true });
     return wt;
   }
-  nameOrAsk(wt, task, given, variant) {
+  bornWith(wt, plan) {
+    if (!plan)
+      return null;
+    const path = writePlanDocNow(wt.path, plan.markdown);
+    if (path) {
+      const live = this.d.state.requireWorktree(wt.id);
+      live.plan = path;
+      live.planned = true;
+      this.d.state.save();
+      this.d.hub.emit("worktreesChanged");
+    }
+    return { text: plan.prompt(path), handed: { ...plan.handed, ...path ? { path } : {} } };
+  }
+  nameOrAsk(wt, task, given) {
     if (given === undefined) {
-      this.scheduleNaming(wt, task, variant);
+      this.scheduleNaming(wt, task);
       return;
     }
     fireAndForget(wt.id, this.rename(wt.id, given), "branch for the given title");
@@ -34959,7 +35970,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) => !existsSync36(join32(wt.path, p)));
+`).filter(Boolean) : []).filter((p) => !existsSync36(join33(wt.path, p)));
       const applied = await git(wt.path, "stash", "apply", sha);
       if (applied.ok) {
         const ref = await entry();
@@ -34996,9 +36007,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 (existsSync36(join32(this.d.paths.worktreesDir, repo.name, slug)))
+    if (existsSync36(join33(this.d.paths.worktreesDir, repo.name, slug)))
       slug = `${slug}-${shortId().slice(0, 4)}`;
-    const wtPath = join32(this.d.paths.worktreesDir, repo.name, slug);
+    const wtPath = join33(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)
@@ -35167,24 +36178,14 @@ class WorktreeService {
     this.d.state.save();
     this.d.hub.emit("worktreesChanged");
   }
-  scheduleNaming(wt, prompt, variant) {
+  scheduleNaming(wt, prompt) {
     if (!prompt.trim())
       return;
-    if (variant && variant.index !== 1)
-      return;
     if (this.naming.has(wt.id))
       return;
     this.naming.add(wt.id);
     const asked = (this.d.namer ?? makeNamer(this.d.runtime))(prompt, wt);
-    const applied = variant ? asked.then(async (name) => {
-      if (!name)
-        return;
-      for (const sibling of [wt, ...siblingsOf(wt, this.d.state.worktrees)]) {
-        await this.rename(sibling.id, `${name} v${sibling.variant.index}`).catch((e) => {
-          log.warn(sibling.id, "variant rename failed", e);
-        });
-      }
-    }) : asked.then((name) => {
+    const applied = asked.then((name) => {
       if (name)
         return this.rename(wt.id, name);
     });
@@ -35274,7 +36275,7 @@ class WorktreeService {
     }
   }
   async keep(repo, wt) {
-    const index = join32(this.d.paths.archiveDir, `${wt.id}.index`);
+    const index = join33(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");
@@ -35311,10 +36312,10 @@ class WorktreeService {
       log.warn(wt.id, `its directory could not be deleted and stays at ${wt.path}`);
   }
   plansScratch(worktreeId) {
-    return join32(this.d.paths.archiveDir, `${worktreeId}.plans`);
+    return join33(this.d.paths.archiveDir, `${worktreeId}.plans`);
   }
   keepPlans(wt) {
-    const from = join32(wt.path, PLANS_DIR);
+    const from = join33(wt.path, PLANS_DIR);
     if (!existsSync36(from))
       return;
     try {
@@ -35459,7 +36460,7 @@ class WorktreeService {
   }
   archivedAttachment(archiveId, file) {
     const files = this.archive.chatFiles(archiveId);
-    return files && isAttachmentFile(file) ? join32(files.attachments, file) : null;
+    return files && isAttachmentFile(file) ? join33(files.attachments, file) : null;
   }
   archivedGit(archiveId) {
     const rec = this.archive.get(archiveId);
@@ -35515,10 +36516,9 @@ 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 = existsSync36(old.path) ? join32(dirname13(old.path), freeSlot(dirname13(old.path)).dir) : old.path;
-    const { variant: _variant, ...rest } = old;
+    const path = existsSync36(old.path) ? join33(dirname13(old.path), freeSlot(dirname13(old.path)).dir) : old.path;
     const wt = {
-      ...rest,
+      ...old,
       repoId: repo.id,
       path,
       branch: old.branch,
@@ -35554,7 +36554,7 @@ class WorktreeService {
     run.finish(0);
     this.arriving.delete(wt.id);
     wt.branch = branch;
-    move(chat.plans, join32(path, PLANS_DIR));
+    move(chat.plans, join33(path, PLANS_DIR));
     const dropped = await git(repo.path, "update-ref", "-d", archiveRef(old.id));
     if (!dropped.ok)
       log.warn(old.id, `could not drop its archive ref: ${dropped.err}`);
@@ -35670,17 +36670,6 @@ class WorktreeService {
     this.d.state.save();
     this.d.hub.emit("worktreesChanged");
   }
-  async pickVariant(worktreeId) {
-    const wt = this.d.state.worktree(worktreeId);
-    if (!wt?.variant)
-      return;
-    for (const sibling of siblingsOf(wt, this.d.state.worktrees)) {
-      await this.archiveWorktree(sibling.id).catch((e) => log.warn(sibling.id, "could not archive variant sibling", e));
-    }
-    delete wt.variant;
-    this.d.state.save();
-    this.d.hub.emit("worktreesChanged");
-  }
   async graft(targetId, sourceIds) {
     const target = this.d.state.worktree(targetId);
     if (!target)
@@ -35733,6 +36722,24 @@ class WorktreeService {
     this.d.hub.emit("worktreesChanged");
     fireAndForget(worktreeId, this.d.runtime.wake(worktreeId), "start a parked preview");
   }
+  retryPreview(worktreeId) {
+    const wt = this.d.state.worktree(worktreeId);
+    if (!wt)
+      return;
+    if (wt.parked) {
+      this.startPreview(worktreeId);
+      return;
+    }
+    const procs = this.d.runtime.get(worktreeId)?.procs;
+    const down = procs && !procs.asleep ? procs.states().filter((p) => p.status === "crashed" || p.status === "unreachable" || p.status === "stopped") : [];
+    if (down.length === 0) {
+      fireAndForget(worktreeId, this.d.runtime.wake(worktreeId), "preview asked for");
+      return;
+    }
+    for (const p of down) {
+      fireAndForget(worktreeId, this.d.runtime.restartStream(worktreeId, p.name), "preview asked for");
+    }
+  }
   async setupAndStart(wt, repo, depsSource = repo.path, opts = {}) {
     this.d.runtime.markSetup(wt.id, true);
     try {
@@ -35742,14 +36749,14 @@ class WorktreeService {
     }
   }
   async mirrorBaseIgnore(repo) {
-    const src = join32(repo.path, ".gitignore");
+    const src = join33(repo.path, ".gitignore");
     const tracked = existsSync36(src) && (await git(repo.path, "ls-files", "--", ".gitignore")).out !== "";
     const mirror = existsSync36(src) && !tracked;
-    const lines = mirror ? readFileSync21(src, "utf8").split(`
+    const lines = mirror ? readFileSync22(src, "utf8").split(`
 `).filter((l) => l.trim() !== "") : [];
     await excludeBlock(repo.path, BASE_IGNORE, lines);
   }
-  async setupThenStart(wt, repo, depsSource, { setupCommands = true }) {
+  async setupThenStart(wt, repo, depsSource, { setupCommands = true, start = true }) {
     await this.mirrorBaseIgnore(repo);
     const ceiling = timeoutFor(repo.config, "setup");
     if (this.d.cache && cachePolicy(repo.config)) {
@@ -35757,8 +36764,8 @@ class WorktreeService {
       await this.d.cache.restore(wt, repo, (line) => this.d.hub.emit("log", wt.id, "setup", line));
       run.finish(0);
     }
-    const srcNm = join32(depsSource, "node_modules");
-    const dstNm = join32(wt.path, "node_modules");
+    const srcNm = join33(depsSource, "node_modules");
+    const dstNm = join33(wt.path, "node_modules");
     if (existsSync36(srcNm) && !existsSync36(dstNm)) {
       const run = this.runs.begin(wt.id, "setup", { timeoutMs: ceiling, stage: "copying dependencies" });
       const r = await cloneTree(srcNm, dstNm);
@@ -35769,10 +36776,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 = join32(depsSource, f);
-      if (!existsSync36(src) || existsSync36(join32(wt.path, f)))
+      const src = join33(depsSource, f);
+      if (!existsSync36(src) || existsSync36(join33(wt.path, f)))
         continue;
-      const r = await run("cp", [src, join32(wt.path, f)], wt.path);
+      const r = await run("cp", [src, join33(wt.path, f)], wt.path);
       if (r.ok)
         this.d.hub.emit("log", wt.id, "setup", `copied ${f}`);
       else
@@ -35789,7 +36796,8 @@ class WorktreeService {
       } else if (code !== 0)
         this.d.hub.emit("log", wt.id, "setup", `setup failed (exit ${code}): ${cmd}`);
     }
-    await this.d.runtime.start(wt, repo);
+    if (start)
+      await this.d.runtime.start(wt, repo);
   }
   setPr(worktreeId, pr) {
     const wt = this.d.state.worktree(worktreeId);
@@ -35940,6 +36948,7 @@ ${wt.landing.body}` : s;
     await this.noteLand(repo, wt, mark);
     await this.restartFromMain(wt, baseOf(repo));
     await this.settleLanded(wt);
+    this.d.hub.emit("landed", wt.id);
   }
   async land(worktreeId, message) {
     const { wt, repo } = this.landable(worktreeId, "land");
@@ -35950,12 +36959,9 @@ ${wt.landing.body}` : s;
         return { result: moved };
       return this.landOp(wt, repo, message);
     });
-    if (out.result.ok && out.archiveIds)
-      this.noteLanded(wt, out.result.message, out.archiveIds, out.mark);
-    return {
-      result: this.fixShip(wt, out.result, baseOf(repo)),
-      ...out.archiveIds ? { archiveIds: out.archiveIds } : {}
-    };
+    if (out.result.ok && out.landed)
+      this.noteLanded(wt, out.result.message, out.mark);
+    return { result: this.fixShip(wt, out.result, baseOf(repo)) };
   }
   fixShip(wt, result, base) {
     if (result.ok)
@@ -35999,13 +37005,10 @@ ${wt.landing.body}` : s;
       return null;
     return { ok: false, message: "the agent has changed files since the check: land once its turn ends" };
   }
-  noteLanded(wt, message, archiveIds, mark) {
-    this.d.runtime.ensureAgent(wt).agent.note({ type: "landed", message, archiveIds, ...mark ? { mark } : {}, ts: Date.now() });
+  noteLanded(wt, message, mark) {
+    this.d.runtime.ensureAgent(wt).agent.note({ type: "landed", message, ...mark ? { mark } : {}, ts: Date.now() });
     this.d.hub.emit("landed", wt.id);
   }
-  siblingIds(wt) {
-    return siblingsOf(wt, this.d.state.worktrees).map((s) => s.id);
-  }
   async followBranch(wt, current) {
     if (wt.kind === "main")
       return;
@@ -36064,7 +37067,7 @@ ${wt.landing.body}` : wt.landing.subject : undefined);
     if (policy.land === "pr") {
       if (wt.pr?.state === "merged" && !prTaken(wt)) {
         const { mark, ...result } = await this.prMergedOp(wt.id, undefined, w);
-        return result.ok ? { result, archiveIds: this.siblingIds(wt), mark } : { result };
+        return result.ok ? { result, landed: true, mark } : { result };
       }
       const fetched = await this.fetchBase(wt, repo, w);
       if (!fetched.ok)
@@ -36104,7 +37107,7 @@ ${wt.landing.body}` : wt.landing.subject : undefined);
         const { mark: noted, ...r } = await this.prMergedOp(wt.id, mark, w);
         const on = `origin's ${repo.defaultBranch} has this work already`;
         const result = { ...r, message: r.ok ? `${on}; ${r.message}` : `${on}, but ${r.message}` };
-        return r.ok ? { result, archiveIds: this.siblingIds(wt), mark: noted } : { result };
+        return r.ok ? { result, landed: true, mark: noted } : { result };
       }
       const named = !suggested ? undefined : splitMessage(policy.merge === "squash" ? await squashMessage(wt.path, base, suggested, !!typed) : suggested);
       const result = await openPr({
@@ -36160,7 +37163,7 @@ ${wt.landing.body}` : wt.landing.subject : undefined);
     const did = committedHere ? "committed and merged" : "merged";
     return {
       result: { ...result, message: `${did} into ${repo.defaultBranch}` },
-      archiveIds: this.siblingIds(wt),
+      landed: true,
       mark: noted
     };
   }
@@ -36223,7 +37226,7 @@ ${wt.landing.body}` : wt.landing.subject : undefined);
     const here = followed.ok ? `${repo.defaultBranch} here ${followed.moved ? "pulled it" : "has it"}` : `${repo.defaultBranch} here was left where it is: ${followed.message}`;
     const how = { merge: "merged into", squash: "squashed onto", rebase: "rebased onto" }[method];
     const did = already ? `origin's ${repo.defaultBranch} has this work already` : `${committed ? `committed and ${how}` : how} ${repo.defaultBranch} and pushed`;
-    return { result: { ok: true, message: `${did}; ${here}` }, archiveIds: this.siblingIds(wt), mark: noted };
+    return { result: { ok: true, message: `${did}; ${here}` }, landed: true, mark: noted };
   }
   async noteLand(repo, wt, mark, opts = {}) {
     if (!mark)
@@ -36293,7 +37296,7 @@ ${wt.landing.body}` : wt.landing.subject : undefined);
     else
       log.warn(worktreeId, `landing failed: ${result.message}`);
     if (result.ok && wt)
-      this.noteLanded(wt, result.message, this.siblingIds(wt), mark);
+      this.noteLanded(wt, result.message, mark);
     return result;
   }
   async prMergedOp(worktreeId, carried, w = UNWATCHED) {
@@ -36550,6 +37553,37 @@ ${wt.landing.body}` : wt.landing.subject : undefined);
       base: baseOf(repo)
     };
   }
+  async standing(worktreeId) {
+    const wt = this.d.state.worktree(worktreeId);
+    if (!wt || wt.kind === "spare" || this.going.has(worktreeId))
+      return null;
+    const repo = this.d.state.repo(wt.repoId);
+    if (!repo)
+      return null;
+    const rec = await this.tree.refresh(worktreeId) ?? this.tree.get(worktreeId);
+    const core = rec?.core;
+    const last = wt.lands?.at(-1);
+    const pr = prStanding(wt);
+    return {
+      main: wt.kind === "main",
+      base: baseOf(repo),
+      ...core ? { dirty: core.files.length } : {},
+      ...core?.ahead === undefined ? {} : { ahead: core.ahead },
+      ...core?.behind === undefined ? {} : { behind: core.behind },
+      ...core?.unpushed === undefined ? {} : { unpushed: core.unpushed },
+      ...wt.landed ? { landed: { subjects: last?.subjects ?? [], ...last?.pr === undefined ? {} : { pr: last.pr } } } : {},
+      ...pr ? {
+        pr: {
+          number: pr.number,
+          url: pr.url,
+          state: pr.state,
+          ...pr.checks ? { checks: pr.checks } : {},
+          ...pr.review ? { review: pr.review } : {},
+          ...pr.automerge ? { automerge: pr.automerge } : {}
+        }
+      } : {}
+    };
+  }
   async turnStarted(worktreeId) {
     const wt = this.d.state.worktree(worktreeId);
     if (wt && !this.going.has(worktreeId))
@@ -36809,11 +37843,8 @@ class ArchiveSweep {
       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;
+      for (const w of maybe)
         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));
@@ -36861,17 +37892,17 @@ if (pruned > 0)
 var managed = await loadManaged();
 var paths = makePaths();
 ensureDirs(paths);
-forwardTranscripts([paths.transcriptsDir, paths.archiveDir], join33(paths.home, "transcripts-forwarded"));
+forwardTranscripts([paths.transcriptsDir, paths.archiveDir], join34(paths.home, "transcripts-forwarded"));
 var token = loadOrCreateToken(paths);
 var port = Number(process.env.TOYON_PORT ?? DAEMON_DEFAULT_PORT);
-var helperApp = join33(paths.home, DAEMON_FILES.helper);
+var helperApp = join34(paths.home, DAEMON_FILES.helper);
 var helper = helperWanted({ platform: process.platform, cloud: cloud.enabled, port, home: process.env.TOYON_HOME }) ? new Helper({
   dir: helperApp,
   stub: HELPER_STUB,
   bun: process.execPath,
   cli: CLI_ENTRY,
-  log: join33(paths.home, DAEMON_FILES.launcherLog),
-  icon: join33(SHELL_DIST, "icon.svg"),
+  log: join34(paths.home, DAEMON_FILES.launcherLog),
+  icon: join34(SHELL_DIST, "icon.svg"),
   version: package_default.version
 }) : null;
 if (helper) {
@@ -36908,8 +37939,9 @@ var readiness2 = new AgentReadiness({
   connect: async (app, spec) => spawnAcp(app, agents.launch(spec, await prepareLaunch(paths.scratchDir, spec)), paths.scratchDir, `check:${spec.id}`),
   cwd: paths.scratchDir,
   options: (id, category) => state.cachedOptions(id, category),
-  learned: (id, category, choices) => {
-    if (state.setCachedOptions(id, category, choices))
+  runs: (id, category) => state.cachedDefault(id, category),
+  learned: (id, category, choices, runs) => {
+    if (state.setCachedOptions(id, category, choices, runs))
       hub.emit("agentsChanged");
   },
   quick: (id) => {
@@ -36939,6 +37971,8 @@ var runtime = new RuntimeRegistry({
   bridgeScript: () => bridge.get(),
   pageErrors: (id) => pageErrors.ambient(id),
   turnStarting: (id) => worktrees.turnStarted(id),
+  archived: (repoId) => worktrees.archived(repoId),
+  standing: (id) => worktrees.standing(id),
   remote: () => setting.get(),
   gate: previewGate,
   viewed: (id) => idle.isViewed(id),
@@ -36975,13 +38009,15 @@ var worktrees = new WorktreeService({
 interest.onFirst((id) => worktrees.tree.watch(id));
 interest.onLast((id) => worktrees.tree.unwatch(id));
 new BackendShare({ state, hub, runtime, own: (id, names) => worktrees.ownProcs(id, names) });
-var handoff2 = new HandoffService({
+var pieces = new PiecesService({
   state,
   hub,
   runtime,
-  create: (repoId, prompt, opts) => worktrees.create(repoId, prompt, opts)
+  attachments: attachments2,
+  create: (repoId, prompt, opts) => worktrees.create(repoId, prompt, opts),
+  reader: makePiecesReader(runtime, agents, state)
 });
-tools.add(handoff2);
+tools.add(pieces);
 var turns = new TurnService({
   state,
   hub,
@@ -37149,7 +38185,7 @@ var {
     landing,
     fix,
     pageErrors,
-    handoff: handoff2,
+    pieces,
     mcp,
     themes,
     agents,
@@ -37159,7 +38195,6 @@ var {
     afterLand,
     restarter,
     update,
-    planTasks: makePlanner(agents),
     folderDialog: folderDialog()
   }
 });