toyon 0.19.0 → 0.20.0

package/dist/daemon.js

@@ -12,6 +12,7 @@ var TOOL_SEARCH = "ToolSearch";
 var ASK_TOOL = "AskUserQuestion";
 var TOYON_MCP_SERVER = "toyon";
 var SPLIT_TOOL = "split";
+var WORKTREES_TOOL = "worktrees";
 function coalesce(entries) {
   const out = [];
   for (const entry of entries) {
@@ -45,6 +46,15 @@ function isWrittenKind(kind) {
 function writingCall(call, input) {
   return (isWrittenKind(call.kind) || call.name === ASK_TOOL || call.name === TOOL_SEARCH) && emptyInput(input);
 }
+var MCP_NAME = /^(?:mcp__(.+?)__(.+)|([A-Za-z0-9_-]+)\/([A-Za-z0-9_-]+))$/;
+function mcpTool(name) {
+  const m = MCP_NAME.exec(name);
+  if (!m)
+    return null;
+  const server = m[1] ?? m[3] ?? "";
+  const tool = m[2] ?? m[4] ?? "";
+  return { server, tool: tool.replace(/[_-]+/g, " ").trim() };
+}
 function emptyInput(input) {
   if (!input || typeof input !== "object")
     return true;
@@ -117,6 +127,35 @@ function railOrder(rows) {
 
 // ../shared/src/archiveRule.ts
 var ARCHIVE_KEEP_RECENT = 5;
+function heldBy(w, f) {
+  const c = f.counts(w.id);
+  if (c.dirty === undefined || c.ahead === undefined)
+    return "its changes are not counted yet";
+  if (c.dirty > 0)
+    return "it has uncommitted changes";
+  if (c.ahead > 0)
+    return "it has commits not on main";
+  if (f.drafted(w.id))
+    return "unsent text waits in its composer";
+  if (f.pending(w.id))
+    return "its agent is still busy";
+  const end = w.lastTurn?.end;
+  if (!end)
+    return "its agent has not run yet";
+  if (end === "stopped")
+    return "its last turn was stopped";
+  if (end === "failed")
+    return "its last turn failed";
+  if (end === "asking")
+    return "its agent is waiting on an answer";
+  if (isUnseen(w))
+    return "its last reply is unread";
+  if (w.planned)
+    return "it showed a plan";
+  if (w.pr?.state === "open")
+    return "its pull request is still open";
+  return null;
+}
 function archiveReason(wt, f) {
   if (!nothingToKeep(wt, f))
     return null;
@@ -129,16 +168,11 @@ var UNOPENED = "not opened in ";
 function nothingToKeep(w, f) {
   if (w.kind !== "worktree" || !hasOwnBranch(w))
     return false;
-  if (w.lastTurn?.end !== "done" || isUnseen(w))
-    return false;
-  if (w.planned || w.pr?.state === "open")
-    return false;
-  if (f.viewed(w.id) || f.pending(w.id) || f.drafted(w.id))
+  if (f.viewed(w.id))
     return false;
   if (f.now - (w.viewedAt ?? w.createdAt) < f.afterMs)
     return false;
-  const c = f.counts(w.id);
-  return c.dirty === 0 && c.ahead === 0;
+  return heldBy(w, f) === null;
 }
 function rowsAhead(wt, rows) {
   const tasks = railOrder(rows.filter((w) => w.kind === "worktree").map((worktree) => ({ worktree })));
@@ -6586,7 +6620,7 @@ ${text.slice(text.length - (CONTEXT_CHARS - HEAD_CHARS))}`;
 }
 
 // ../shared/src/protocol/limits.ts
-var PROTOCOL_VERSION = 129;
+var PROTOCOL_VERSION = 133;
 var PAGE_ERROR_MAX_CHARS = 2000;
 var PAGE_TITLE_MAX_CHARS = 1000;
 var FILE_MAX_CHARS = 5000000;
@@ -6948,6 +6982,7 @@ var clientMsgSchema = discriminatedUnion("t", [
   object({ t: literal("reveal"), worktreeId: id, path: relPath.optional() }),
   object({ t: literal("reveal-path"), path: relPath }),
   object({ t: literal("reveal-attachment"), worktreeId: id, file: string2().min(1).max(120) }),
+  object({ t: literal("reveal-transcript"), worktreeId: id }),
   object({ t: literal("stop-agent"), worktreeId: id }),
   object({ t: literal("seen"), worktreeId: id }),
   object({ t: literal("mark-unread"), worktreeId: id }),
@@ -8518,7 +8553,7 @@ async function turnRemoteOff(ts, daemonPort, file, was) {
 // ../daemon/package.json
 var package_default = {
   name: "@toyon/daemon",
-  version: "0.19.0",
+  version: "0.20.0",
   private: true,
   type: "module",
   main: "src/index.ts",
@@ -14372,7 +14407,13 @@ var DENIED_COMMANDS = [
   "git branch -D",
   "git branch -d",
   "git branch --delete",
-  "git worktree",
+  "git worktree add",
+  "git worktree remove",
+  "git worktree move",
+  "git worktree prune",
+  "git worktree lock",
+  "git worktree unlock",
+  "git worktree repair",
   "gh pr create",
   "gh pr merge"
 ];
@@ -14422,6 +14463,17 @@ function opencodeEnv() {
   };
 }
 
+// ../daemon/src/agent/quick.ts
+function quickModelFor(spec, offered, current) {
+  const quick = spec.quickModel;
+  if (typeof quick === "function")
+    return quick(offered, current);
+  return quick && offered.includes(quick) ? quick : undefined;
+}
+function quickModelNamed(name) {
+  return (offered) => offered.includes(name) ? name : offered.find((id) => id.includes(name));
+}
+
 // ../daemon/src/agent/sandbox.ts
 import { existsSync as existsSync8, mkdirSync as mkdirSync5, readFileSync as readFileSync7, renameSync, writeFileSync as writeFileSync4 } from "fs";
 import { homedir as homedir2, tmpdir } from "os";
@@ -14754,7 +14806,7 @@ var BUILTIN_AGENTS = [
     systemPrompt: "meta-append",
     modes: { plan: "plan", build: "default" },
     sideMeta: { claudeCode: { options: { tools: [], persistSession: false } } },
-    quickModel: "haiku",
+    quickModel: quickModelNamed("haiku"),
     loginHint: "Claude is not logged in"
   },
   {
@@ -15571,6 +15623,65 @@ function unifiedDiff(oldText, newText, context = 3) {
 `);
 }
 
+// ../daemon/src/agent/acp/wakeup.ts
+var WAKEUP_TOOL = "ScheduleWakeup";
+var MIN_DELAY_S = 60;
+var MAX_DELAY_S = 3600;
+var GRACE_MS2 = 60000;
+function wakeupAt(name, input, now = Date.now()) {
+  if (name !== WAKEUP_TOOL)
+    return null;
+  const rec = input && typeof input === "object" ? input : null;
+  if (!rec || rec.stop === true)
+    return null;
+  const delay = rec.delaySeconds;
+  if (typeof delay !== "number" || !Number.isFinite(delay))
+    return null;
+  return now + Math.min(MAX_DELAY_S, Math.max(MIN_DELAY_S, delay)) * 1000;
+}
+
+class Wakeups {
+  deps;
+  held = new Map;
+  constructor(deps) {
+    this.deps = deps;
+  }
+  get size() {
+    return this.held.size;
+  }
+  get next() {
+    let next = null;
+    for (const w of this.held.values())
+      if (next === null || w.until < next)
+        next = w.until;
+    return next;
+  }
+  start(toolId, until) {
+    const wait = Math.max(0, until - Date.now()) + (this.deps.graceMs ?? GRACE_MS2);
+    const timer = setTimeout(() => this.finish(toolId, "no turn came; the row stops waiting", false), wait);
+    timer.unref?.();
+    this.held.set(toolId, { until, timer });
+    this.deps.onChange?.();
+  }
+  wake(how) {
+    for (const toolId of [...this.held.keys()])
+      this.finish(toolId, how, false);
+  }
+  endAll(reason) {
+    for (const toolId of [...this.held.keys()])
+      this.finish(toolId, reason, true);
+  }
+  finish(toolId, output, isError) {
+    const w = this.held.get(toolId);
+    if (!w)
+      return;
+    clearTimeout(w.timer);
+    this.held.delete(toolId);
+    this.deps.note({ type: "tool-end", toolId, output, isError });
+    this.deps.onChange?.();
+  }
+}
+
 // ../daemon/src/agent/acp/map.ts
 function spawnOf(meta) {
   const claude = asRecord2(asRecord2(meta).claudeCode);
@@ -15598,7 +15709,10 @@ function toolSearchTitle(rawInput) {
   const names = /^select:(.*)$/.exec(query.trim());
   if (!names)
     return `looked for a tool: ${query.trim()}`;
-  const loaded = (names[1] ?? "").split(",").map((s) => s.trim()).filter(Boolean).join(", ");
+  const loaded = (names[1] ?? "").split(",").map((s) => s.trim()).filter(Boolean).map((s) => {
+    const mcp = mcpTool(s);
+    return mcp ? `${mcp.server} ${mcp.tool}` : s;
+  }).join(", ");
   return loaded ? `loaded ${loaded}` : "";
 }
 var TOYON_TOOL = new RegExp(`^(?:mcp__${TOYON_MCP_SERVER}__|${TOYON_MCP_SERVER}/)([A-Za-z0-9_-]+)$`);
@@ -15676,7 +15790,7 @@ function abandoned(memos, parent, opening = false) {
   }
   return out;
 }
-function mapUpdate(update, memos, tag, sink, background) {
+function mapUpdate(update, memos, tag, sink, background, wakeup) {
   switch (update.sessionUpdate) {
     case "agent_message_chunk": {
       const { parentToolId } = spawnOf(update._meta);
@@ -15723,7 +15837,7 @@ function mapUpdate(update, memos, tag, sink, background) {
         ...spawn
       });
       if (update.status === "completed" || update.status === "failed")
-        out.push(endOf(update.toolCallId, memo, update.status, sink, background));
+        out.push(endOf(update.toolCallId, memo, update.status, sink, background, wakeup));
       return out;
     }
     case "tool_call_update": {
@@ -15780,7 +15894,7 @@ function mapUpdate(update, memos, tag, sink, background) {
       if (update.rawOutput !== undefined)
         memo.rawOutput = update.rawOutput;
       if ((update.status === "completed" || update.status === "failed") && !memo.ended) {
-        out.push(endOf(update.toolCallId, memo, update.status, sink, background));
+        out.push(endOf(update.toolCallId, memo, update.status, sink, background, wakeup));
       }
       return out;
     }
@@ -15811,7 +15925,7 @@ function textOf(content, tag, what) {
   log.debug(tag, `acp: dropping non-text ${what} block (${content.type})`);
   return null;
 }
-function endOf(toolId, memo, status, sink, background) {
+function endOf(toolId, memo, status, sink, background, wakeup) {
   memo.ended = true;
   const output = summarizeToolOutput(memo.content, memo.rawOutput);
   if (status === "completed" && memo.kind === "execute" && background) {
@@ -15819,6 +15933,13 @@ function endOf(toolId, memo, status, sink, background) {
     if (start && background(toolId, start, memo.input))
       return { type: "tool-update", toolId, background: true };
   }
+  if (status === "completed" && wakeup) {
+    const until = wakeupAt(memo.name || memo.title, memo.input);
+    if (until !== null) {
+      wakeup(toolId, until);
+      return { type: "tool-update", toolId, background: true, until };
+    }
+  }
   const images = sink ? toolImages(memo.content, sink) : [];
   const detached = status === "completed" && !!memo.spawns && spawnDetached(wholeText(memo.content, memo.rawOutput));
   return {
@@ -16012,10 +16133,10 @@ 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 `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.",
+  "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, before you start on your own pieces, never at the end of the turn: a sibling's agent then works while you do, and the user sees the card at once. 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 (with `after` naming a branch or a piece of the list your own work must wait for, which Toyon then shows under the box until it lands), `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, as soon as you see it rather than when your own work is done; 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 push`, delete branches, or create pull requests, and never offer to; shipping is handled by the Toyon UI. Never add, remove, move or prune worktrees; Toyon owns them. Listing them with `git worktree list` is fine.",
   "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.",
   "Keep the scope tight: do the asked task well, then stop. A follow-up the user might want later is a sentence in your reply, not a question.",
   "When the work is done and the only thing left is whether to do something you recommend, do not end your turn on a prose offer waiting for a yes. Ask it with your question tool when you have one: one question, two options with the recommended one first, each saying what it changes, and typed text allowed so the answer can carry instructions. The card is the first thing the user reads, before any prose of yours, so the question itself states what you propose and why in a sentence or two; a question that is only the yes-or-no leaves them guessing what it is. Ask this way only where you would otherwise have stopped and waited; never to confirm work already asked for.",
@@ -16023,6 +16144,7 @@ var SYSTEM_APPEND = [
   "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.",
+  "To find which worktree of this project worked on a topic, a ticket or a feature, or to see what is open and what was archived, call the `worktrees` tool when you have one: it lists them by title and branch with where each chat is on disk, and with a `query` it keeps only those whose title, branch or chat mention it. `git worktree list` knows neither titles nor chats, so it cannot answer that.",
   '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.",
@@ -16166,7 +16288,7 @@ function piecesActedPrompt(pieces, outcomes) {
   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 here = outcomes.filter((o) => o.fate === "here").map((o) => o.after ? `${titled(o.pieceId)} (once ${o.after} lands)` : 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 = [];
@@ -16203,8 +16325,11 @@ function pieceAskPrompt(text, project) {
   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) {
+function pieceLandedContext(title, project, url, same, again, awaited) {
   const where = url ? ` (${url})` : "";
+  if (awaited) {
+    return `The branch your own piece waited for, "${title}", has landed on this project's main${where}; that piece can go ahead now, and Toyon rebases onto main when this lands.`;
+  }
   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.`;
   }
@@ -16227,6 +16352,10 @@ function archivedFate(a) {
     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 siblingParagraph(s) {
+  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.`;
+  return 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}`;
+}
 function worktreeContext(text, siblings) {
   const out = [];
   const said = new Set;
@@ -16237,8 +16366,7 @@ function worktreeContext(text, siblings) {
     if (!named.test(text))
       continue;
     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}`);
+    out.push(siblingParagraph(s));
   }
   return out;
 }
@@ -16478,14 +16606,6 @@ class Transcript {
   }
 }
 
-// ../daemon/src/agent/quick.ts
-function quickModelFor(spec, offered, current) {
-  const quick = spec.quickModel;
-  if (typeof quick === "function")
-    return quick(offered, current);
-  return quick && offered.includes(quick) ? quick : undefined;
-}
-
 // ../daemon/src/agent/acp/ask.ts
 async function askOnce(ctx, a) {
   const meta = a.spec.systemPrompt === "meta-append";
@@ -16761,6 +16881,7 @@ class AcpSession {
   reaper = null;
   own = null;
   tasks;
+  wakeups;
   asking = 0;
   asks = new Map;
   openCards = new Set;
@@ -16776,10 +16897,15 @@ class AcpSession {
     this.log = new Transcript(transcriptPathFor(d.transcriptsDir, d.worktreeId), d.worktreeId);
     this.tasks = new BackgroundTasks({
       note: (e) => this.emit(e),
-      onEnd: () => this.maybeArmReaper(),
+      onEnd: () => this.holdingChanged(),
       ...d.taskPollMs !== undefined ? { pollMs: d.taskPollMs } : {},
       ...d.claudeConfigDir !== undefined ? { configDir: d.claudeConfigDir } : {}
     });
+    this.wakeups = new Wakeups({
+      note: (e) => this.emit(e),
+      onChange: () => this.holdingChanged(),
+      ...d.wakeupGraceMs !== undefined ? { graceMs: d.wakeupGraceMs } : {}
+    });
     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;
@@ -16863,8 +16989,7 @@ class AcpSession {
         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") {
+          if (this.proposed(pieces)?.by === "toyon") {
             this.note({
               type: "pieces-declined",
               id: pieces,
@@ -16892,9 +17017,7 @@ class AcpSession {
       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);
+    const plan = this.d.onPiecesShown?.(id, this.proposed(id)?.pieces ?? []);
     this.emit({ type: "pieces-shown", id, ...typeof plan === "string" ? { plan } : {}, ts: Date.now() });
   }
   get commands() {
@@ -17003,6 +17126,16 @@ class AcpSession {
   get stopping() {
     return this.turn?.stopping ?? false;
   }
+  get holding() {
+    return this.tasks.size + this.wakeups.size;
+  }
+  get wakes() {
+    return this.wakeups.next;
+  }
+  holdingChanged() {
+    this.d.onHolding?.();
+    this.maybeArmReaper();
+  }
   setStopping(on) {
     const turn = this.turn;
     if (!turn || turn.stopping === on)
@@ -17150,6 +17283,7 @@ class AcpSession {
   }
   async drain() {
     this.endOwn("end_turn");
+    this.wakeups.wake("a message came first");
     this.turn = { open: false, stopping: false };
     this.clearReaper();
     this.setStatus("working");
@@ -17406,8 +17540,9 @@ class AcpSession {
       const e = entries[i].event;
       if (isMessage(e))
         break;
-      if (e.type === "piece-landed")
-        out.unshift(pieceLandedContext(e.title, e.repoName, e.url, e.same, e.again));
+      if (e.type === "piece-landed") {
+        out.unshift(pieceLandedContext(e.title, e.repoName, e.url, e.same, e.again, e.awaited));
+      }
     }
     return out;
   }
@@ -17445,6 +17580,7 @@ class AcpSession {
         this.d.mcp?.close();
         this.cancelAsks();
         this.tasks.endAll("the agent stopped, and the command with it");
+        this.wakeups.endAll("the agent stopped before it woke");
         this.endOwn("interrupted");
       }
     });
@@ -17647,7 +17783,12 @@ class AcpSession {
           this.d.onOptionChanged?.(category, opt.current);
       }
     }
-    const events = mapUpdate(params.update, live.tools, this.d.worktreeId, (file, bytes) => fireAndForget(this.d.worktreeId, this.d.attachments.putToolImage(this.d.worktreeId, file, bytes), "tool image"), (toolId, start, input) => this.tasks.start(toolId, start, input));
+    const events = mapUpdate(params.update, live.tools, this.d.worktreeId, (file, bytes) => fireAndForget(this.d.worktreeId, this.d.attachments.putToolImage(this.d.worktreeId, file, bytes), "tool image"), (toolId, start, input) => {
+      const taken = this.tasks.start(toolId, start, input);
+      if (taken)
+        this.holdingChanged();
+      return taken;
+    }, (toolId, until) => this.wakeups.start(toolId, until));
     this.forward(live, events);
     this.holdInput(live, params.update);
   }
@@ -17750,9 +17891,23 @@ class AcpSession {
       }
       if (plan && approved && planPath)
         return this.sayPlanEdited(detail, planPath).then(() => res);
+      if (plan && !approved && decided && this.proposed(decided)?.by !== "toyon") {
+        return this.sayPiecesDeclined().then(() => res);
+      }
       return res;
     });
   }
+  proposed(id) {
+    const list = this.log.entries.findLast(({ event }) => event.type === "pieces-proposed" && event.id === id)?.event;
+    return list?.type === "pieces-proposed" ? list : undefined;
+  }
+  async sayPiecesDeclined() {
+    try {
+      await this.deliver("The pieces list you handed over went back with the plan. Hand over a list again with `split` before you ask for approval.");
+    } catch (e) {
+      log.warn(this.d.worktreeId, "the declined list was not sent", e);
+    }
+  }
   async sayPlanEdited(proposed, path) {
     try {
       if (!await this.d.planEdited?.(path, proposed))
@@ -17845,6 +18000,7 @@ class AcpSession {
         return;
       this.own = { open: new Set, settle: null };
       this.clearReaper();
+      this.wakeups.wake("woke");
       this.emit({ type: "turn-start", ts: Date.now() });
       this.syncStatus();
     }
@@ -17874,7 +18030,7 @@ class AcpSession {
     this.maybeArmReaper();
   }
   quiet() {
-    return !this.running && !this.own && !this.asking && this.asks.size === 0 && this.tasks.size === 0;
+    return !this.running && !this.own && !this.asking && this.asks.size === 0 && this.holding === 0;
   }
   maybeArmReaper() {
     if (this.quiet() && this.conn && !this.stopped)
@@ -17900,6 +18056,7 @@ class AcpSession {
   async dropConn(why) {
     this.cancelAsks();
     this.tasks.endAll("the agent stopped, and the command with it");
+    this.wakeups.endAll("the agent stopped before it woke");
     const conn = this.conn;
     this.conn = null;
     this.live = null;
@@ -19221,6 +19378,7 @@ function defaultAgent(wt, d, preview, onProcess) {
     onEvent: (event, seq) => d.hub.emit("agent", wt.id, seq, event),
     onStatus: (status) => d.hub.emit("agentStatus", wt.id, status),
     onStopping: () => d.hub.emit("agentStopping", wt.id),
+    onHolding: () => d.hub.emit("agentHolding", wt.id),
     beforeTurn: async () => d.turnStarting?.(wt.id),
     onAuth: (agentId, o) => d.readiness?.observe(agentId, o),
     onLimits: (agentId, limits) => d.readiness?.observeLimits(agentId, limits),
@@ -21019,8 +21177,13 @@ function humanMs(ms) {
 
 // ../daemon/src/core/awake.ts
 var WAIT_MS = 30 * 60000;
+var BRIDGE_MS = 60000;
+var CARRIED_ENV = "TOYON_KEEP_AWAKE_CARRIED";
+function hasIdleSleep(raw, platform) {
+  return raw !== "off" && platform === "darwin";
+}
 function idleSleepAssertion(raw, platform = process.platform) {
-  if (raw === "off" || platform !== "darwin")
+  if (!hasIdleSleep(raw, platform))
     return null;
   return () => {
     const child = spawn3("/usr/bin/caffeinate", ["-i", "-w", String(process.pid)], { stdio: "ignore" });
@@ -21031,6 +21194,22 @@ function idleSleepAssertion(raw, platform = process.platform) {
     };
   };
 }
+function idleSleepBridge(raw, platform = process.platform) {
+  if (!hasIdleSleep(raw, platform))
+    return null;
+  return (ms) => {
+    const child = spawn3("/usr/bin/caffeinate", ["-i", "-t", String(Math.ceil(ms / 1000))], {
+      stdio: "ignore",
+      detached: true
+    });
+    child.on("error", (e) => log.warn("awake", "caffeinate did not start, so the Mac may sleep during the restart", e));
+    child.unref();
+  };
+}
+function carryEnv(env, held) {
+  const { [CARRIED_ENV]: _stale, ...rest } = env;
+  return held ? { ...rest, [CARRIED_ENV]: "1" } : rest;
+}
 
 class KeepAwake {
   d;
@@ -21046,6 +21225,10 @@ class KeepAwake {
     this.d = d;
     this.waitMs = d.waitMs ?? WAIT_MS;
     this.now = d.now ?? Date.now;
+    if (d.carried && d.assert) {
+      this.remoteLeftAt = this.now();
+      log.info("awake", `the last daemon was holding off idle sleep; holding on for ${humanMs(this.waitMs)} unless a device comes back`);
+    }
     d.hub.on("agentStatus", (_id, status) => {
       if (status === "waiting")
         this.waitingAt = this.now();
@@ -21067,10 +21250,14 @@ class KeepAwake {
     this.remote = n;
     this.reconsider();
   }
-  stop() {
+  stop(opts = {}) {
+    const held = this.release !== null;
     this.gone = true;
     this.disarm();
+    if (held && opts.handoff)
+      this.d.bridge?.(BRIDGE_MS);
     this.hold(false);
+    return held;
   }
   reconsider() {
     if (this.gone || !this.d.assert)
@@ -21655,12 +21842,12 @@ async function replacementRuns() {
     reason: `the bun Toyon runs on did not start (${process.execPath}: ${why}); an install may still be writing it`
   };
 }
-function respawn(logFile) {
+function respawn(logFile, env = process.env) {
   const logFd = openLog(logFile);
   const child = spawn4(process.execPath, process.argv.slice(1), {
     detached: true,
     stdio: ["ignore", logFd, logFd],
-    env: { ...process.env }
+    env: { ...env }
   });
   child.on("error", (e) => log.warn("daemon", `the replacement did not start: ${e.message}`));
   child.unref();
@@ -29809,6 +29996,9 @@ var handlers = {
       throw new UserError("that attachment is no longer on this machine");
     s.files.revealPath(path);
   },
+  "reveal-transcript"(msg, _ctx, s) {
+    s.files.revealPath(s.worktrees.transcriptPath(msg.worktreeId));
+  },
   async "discard-files"(msg, _ctx, s) {
     try {
       for (const path of msg.paths)
@@ -30572,6 +30762,51 @@ function createFetch(opts) {
   };
 }
 
+// ../daemon/src/server/rows.ts
+var rowsStampOf = (rowsJson, trunksJson) => Bun.hash(`{"rows":[${rowsJson.join(",")}],"trunks":${trunksJson}}`).toString(16);
+
+class Published {
+  byId = new Map;
+  ids = [];
+  trunks = {};
+  trunksJson = "{}";
+  stampNow = "";
+  current() {
+    return { rows: this.ids.map((id) => this.byId.get(id).row), trunks: this.trunks, stamp: this.stampNow };
+  }
+  publish(next) {
+    const seen = new Map;
+    const ids = [];
+    const jsons = [];
+    const changed = [];
+    for (const row of next.rows) {
+      const json = JSON.stringify(row);
+      ids.push(row.id);
+      jsons.push(json);
+      if (this.byId.get(row.id)?.json !== json)
+        changed.push(row);
+      seen.set(row.id, { row, json });
+    }
+    const trunksJson = JSON.stringify(next.trunks);
+    const trunksMoved = trunksJson !== this.trunksJson;
+    const orderMoved = ids.length !== this.ids.length || ids.some((id, i) => id !== this.ids[i]);
+    this.byId = seen;
+    this.ids = ids;
+    this.trunks = next.trunks;
+    this.trunksJson = trunksJson;
+    this.stampNow = rowsStampOf(jsons, trunksJson);
+    if (changed.length === 0 && !trunksMoved && !orderMoved)
+      return null;
+    return {
+      t: "worktrees",
+      ids,
+      rows: changed,
+      ...trunksMoved ? { trunks: next.trunks } : {},
+      stamp: this.stampNow
+    };
+  }
+}
+
 // ../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 ?? ""])]));
@@ -30725,6 +30960,22 @@ function startServer(opts) {
     agents: s.agents.adapters(),
     sockets: [...sockets].map((ws) => ({ subs: [...ws.data.subs], sent: ws.data.sent, bytes: ws.data.bytes }))
   });
+  const published = new Published;
+  const sendRows = (frame) => {
+    const json = JSON.stringify(frame);
+    for (const ws of sockets)
+      if (ws.data.helloed)
+        raw(ws, json);
+  };
+  const publishRows = () => {
+    try {
+      const frame = published.publish(s.worktrees.snapshot());
+      if (frame)
+        sendRows(frame);
+    } catch (e) {
+      log.warn("ws", "worktrees broadcast failed", e);
+    }
+  };
   let statusesQueued = false;
   const worktreesChanged = () => {
     if (statusesQueued)
@@ -30732,20 +30983,16 @@ function startServer(opts) {
     statusesQueued = true;
     setTimeout(() => {
       statusesQueued = false;
-      try {
-        const { rows, trunks } = s.worktrees.snapshot();
-        broadcast({ t: "worktrees", rows, trunks, stamp: stampOf({ rows, trunks }) });
-      } catch (e) {
-        log.warn("ws", "worktrees broadcast failed", e);
-      }
+      publishRows();
     }, 0);
   };
   s.hub.on("worktreesChanged", worktreesChanged);
   s.hub.on("agentStatus", worktreesChanged);
   s.hub.on("agentStopping", worktreesChanged);
+  s.hub.on("agentHolding", worktreesChanged);
+  s.hub.on("proc", worktreesChanged);
   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 }));
   s.hub.on("agent", (worktreeId, seq, event) => sendTo(worktreeId, { t: "agent", worktreeId, seq, event }));
   s.hub.on("queue", (worktreeId, items) => sendTo(worktreeId, { t: "queue", worktreeId, items }));
@@ -30814,15 +31061,19 @@ function startServer(opts) {
   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 (known = null) => {
+  const helloReads = async () => {
     await s.update.refresh();
-    const { rows, trunks } = s.worktrees.snapshot();
+    return { registry: await s.update.registry(), gitIdentity: await s.repos.gitIdentity() };
+  };
+  const helloNow = (read, known) => {
+    publishRows();
+    const { rows, trunks } = published.current();
     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(),
+      registry: read.registry,
       protocol: PROTOCOL_VERSION,
       ...parts,
       stamps: stampsOf(parts),
@@ -30839,7 +31090,7 @@ function startServer(opts) {
       machines: s.state.machines,
       letIn: s.state.letIn,
       knocks: opts.knocks.pending(),
-      gitIdentity: await s.repos.gitIdentity(),
+      gitIdentity: read.gitIdentity,
       pending: s.repos.pending,
       self: s.self.get(),
       update: s.update.get(),
@@ -30887,7 +31138,7 @@ function startServer(opts) {
       }),
       managed: { source: opts.managed.source, hash: opts.managed.hash },
       preview: (id) => s.runtime.get(id)?.proxy?.handler ?? null,
-      bootstrap: helloFrame,
+      bootstrap: async () => helloNow(await helloReads(), null),
       manifestGround: () => s.themes.current().colors.surface1,
       open: (path) => s.opens.open(path),
       restart: (now) => s.restarter.request({ now }),
@@ -30912,7 +31163,9 @@ function startServer(opts) {
         }
         sockets.add(ws);
         link(ws);
-        send(ws, await helloFrame(ws.data.known ?? null));
+        const read = await helloReads();
+        send(ws, helloNow(read, ws.data.known ?? null));
+        ws.data.helloed = true;
         fireAndForget("agents", s.agents.retryFailed(), "agent install retry");
         for (const o of s.opens.takePending())
           send(ws, openedFrame(o));
@@ -32496,6 +32749,146 @@ async function recentSubjects(path, defaultBr) {
 `).filter(Boolean) : [];
 }
 
+// ../daemon/src/worktrees/lookup.ts
+import { readFile as readFile3 } from "fs/promises";
+var ARCHIVED_MAX = 20;
+var ASKED_MAX = 200;
+
+class WorktreeLookup {
+  d;
+  constructor(d) {
+    this.d = d;
+  }
+  tool(worktreeId) {
+    const wt = this.d.state.worktree(worktreeId);
+    const open = wt ? this.siblings(wt).length : 0;
+    const gone = wt ? this.d.archived(wt.repoId).length : 0;
+    return {
+      name: WORKTREES_TOOL,
+      description: `List the other worktrees of this project, open and archived, by title and branch, with where each chat is on disk and what it was about. Call it to find which worktree worked on a topic, a ticket or a feature, or to see what else is open. Right now ${open} other ${open === 1 ? "worktree is" : "worktrees are"} open and ${gone} ${gone === 1 ? "is" : "are"} archived. Without a query the open ones are listed and the newest ${ARCHIVED_MAX} archived; with one, only the worktrees whose title, branch or chat mention every word of it.`,
+      inputSchema: {
+        type: "object",
+        properties: {
+          query: {
+            type: "string",
+            description: "Words to look for, such as a ticket key, a product name or a feature: a worktree is listed when its title, branch or what the person wrote in its chat contains every word, in any case. Leave it out to list everything."
+          }
+        }
+      }
+    };
+  }
+  async call(worktreeId, args) {
+    const wt = this.d.state.worktree(worktreeId);
+    if (!wt)
+      return { text: "unknown worktree", isError: true };
+    const raw = args && typeof args === "object" ? args.query : undefined;
+    const query = typeof raw === "string" ? raw.trim() : "";
+    const words = query.toLowerCase().split(/\s+/).filter(Boolean);
+    const open = await Promise.all(this.siblings(wt).map((w) => this.read(w)));
+    const archived = await Promise.all(this.d.archived(wt.repoId).map((a) => this.readArchived(a)));
+    open.sort((a, b) => b.active - a.active);
+    if (words.length === 0) {
+      const shown = [...open, ...archived.slice(0, ARCHIVED_MAX)];
+      const more = archived.length - ARCHIVED_MAX;
+      const head = `${open.length} other ${open.length === 1 ? "worktree" : "worktrees"} of this project ${open.length === 1 ? "is" : "are"} open and ${archived.length} ${archived.length === 1 ? "is" : "are"} archived.`;
+      const tail = more > 0 ? `
+
+${more} older archived ${more === 1 ? "worktree is" : "worktrees are"} not listed; pass a query to search them.` : "";
+      return { text: shown.length ? `${head}
+
+${shown.map((c) => row(c, [])).join(`
+
+`)}${tail}` : head };
+    }
+    const hits = [...open, ...archived].filter((c) => matches(c, words));
+    if (hits.length === 0) {
+      return {
+        text: `No worktree of this project matches "${query}". Searched ${open.length} open and ${archived.length} archived by title, branch and what the person wrote in each chat.`
+      };
+    }
+    return {
+      text: `${hits.length} ${hits.length === 1 ? "worktree" : "worktrees"} of this project ${hits.length === 1 ? "matches" : "match"} "${query}".
+
+${hits.map((c) => row(c, words)).join(`
+
+`)}`
+    };
+  }
+  siblings(wt) {
+    return this.d.state.worktrees.filter((w) => w.repoId === wt.repoId && w.id !== wt.id && w.kind === "worktree");
+  }
+  async read(w) {
+    const transcript = transcriptPathFor(this.d.transcriptsDir, w.id);
+    const said = await userMessages(transcript);
+    return {
+      sibling: { branch: w.branch, title: w.title, path: w.path, transcript },
+      said,
+      active: said.at(-1)?.ts ?? w.createdAt
+    };
+  }
+  async readArchived(a) {
+    const said = await userMessages(a.transcript);
+    return {
+      sibling: {
+        branch: a.branch,
+        title: a.title,
+        path: a.path,
+        transcript: a.transcript,
+        archived: { at: a.archivedAt, landed: a.landed, restorable: a.restorable }
+      },
+      said,
+      prompt: a.prompt,
+      active: said.at(-1)?.ts ?? a.archivedAt
+    };
+  }
+}
+async function userMessages(transcript) {
+  let text;
+  try {
+    text = await readFile3(transcript, "utf8");
+  } catch {
+    return [];
+  }
+  const out = [];
+  for (const line of text.split(`
+`)) {
+    if (!line.includes('"user-message"'))
+      continue;
+    try {
+      const e = JSON.parse(line)?.event;
+      if (e?.type === "user-message" && typeof e.text === "string")
+        out.push({ text: e.text, ts: Number(e.ts) || 0 });
+    } catch {}
+  }
+  return out;
+}
+function matches(c, words) {
+  const corpus = [c.sibling.title, c.sibling.branch, c.prompt ?? "", ...c.said.map((s) => s.text)].join(`
+`).toLowerCase();
+  return words.every((w) => corpus.includes(w));
+}
+function row(c, words) {
+  const parts = [siblingParagraph(c.sibling)];
+  const first = c.said[0]?.text ?? c.prompt;
+  if (first)
+    parts.push(`The person first asked: "${clip2(first)}"${first.length > ASKED_MAX ? " (cut there)." : ""}`);
+  if (c.said.length > 0)
+    parts.push(`They last wrote there on ${dayOf(c.active)}.`);
+  if (words.length > 0 && c.said.length > 0) {
+    const mentioning = c.said.filter((s) => {
+      const t = s.text.toLowerCase();
+      return words.some((w) => t.includes(w));
+    }).length;
+    if (mentioning > 0)
+      parts.push(`${mentioning} of their ${c.said.length} messages mention the query.`);
+  }
+  return parts.join(" ");
+}
+function clip2(text) {
+  const one = text.replace(/\s+/g, " ").trim();
+  return one.length > ASKED_MAX ? one.slice(0, ASKED_MAX).trimEnd() : one;
+}
+
 // ../daemon/src/worktrees/pieces.ts
 import { createHash as createHash5, randomUUID as randomUUID2 } from "crypto";
 import { readFileSync as readFileSync20 } from "fs";
@@ -32554,6 +32947,7 @@ 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.";
+var SHOWN_HERE = "Handed to the person as a card. This worktree holds no work yet, so the card leads with doing it here; they decide. Finish your turn.";
 function openPlanCard(entries) {
   const open = new Map;
   for (const { event } of entries) {
@@ -32727,7 +33121,7 @@ class PiecesService {
                 },
                 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.'
+                  description: 'worktree: what the piece waits for before it starts: a branch, another piece of this list by its title, or "this" for your own branch. here: what your own work on the piece waits for, a branch or another piece of this list; Toyon shows the wait under the box until it lands.'
                 },
                 to: { type: "string", description: "send only: the open worktree it goes to, by branch or title." },
                 project: {
@@ -32812,19 +33206,35 @@ class PiecesService {
           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.after !== undefined) {
+        return refused(`Piece ${i + 1} ("${title}") has \`after\`, which a \`send\` piece does not take.`);
       }
       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) {
+      if (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);
+        const after = this.resolveAfter(wt, raw, i, q, p.where === "here");
         if ("refused" in after)
           return refused(`Piece ${i + 1} ("${title}"): ${after.refused}`);
+        if (p.where === "here" && !("piece" in after.after) && after.after.id === wt.id) {
+          return refused(`Piece ${i + 1} ("${title}") is \`here\` and waits for its own branch.`);
+        }
+        if (p.where === "here" && "piece" in after.after) {
+          const on = raw[Number(after.after.piece.slice(1)) - 1];
+          const onTitle = sentenceCase(on.title.trim());
+          if (on.where === "here") {
+            return refused(`Piece ${i + 1} ("${title}") waits for "${onTitle}", which is \`here\` too and lands with it.`);
+          }
+          const back = on.after?.trim() ?? "";
+          const bare = back.startsWith("@") ? back.slice(1) : back;
+          const onOrigin = bare !== "" && (bare === "this" || bare === wt.branch || raw.some((o) => o.where === "here" && matchBy([o], bare, [(x) => x.title.trim()]).length > 0));
+          if (onOrigin) {
+            return refused(`Piece ${i + 1} ("${title}") waits for "${onTitle}", which waits for this branch: a cycle.`);
+          }
+        }
         piece.after = after.after;
       }
       if (p.where === "send") {
@@ -32850,6 +33260,9 @@ class PiecesService {
       agent.note({ type: "pieces-declined", id: o.id, reason: "handed over again", ts: Date.now() });
     }
     const held = by !== "person" && wt.mode === "plan";
+    const here = by === "agent" && !held && this.offerHere(wt, pieces);
+    if (here)
+      pieces[0].fate = "here";
     const plan = held ? null : writePlanDocNow(wt.path, listDoc(pieces));
     agent.note({
       type: "pieces-proposed",
@@ -32862,18 +33275,30 @@ class PiecesService {
       ...by === "toyon" && read ? { read } : {},
       ts: Date.now()
     });
-    return { text: held ? HELD : SHOWN };
+    return { text: held ? HELD : here ? SHOWN_HERE : SHOWN };
   }
-  resolveAfter(wt, raw, at, q) {
+  offerHere(wt, pieces) {
+    if (pieces.length !== 1)
+      return false;
+    const p = pieces[0];
+    if (p.fate !== "worktree" || p.project || p.to || p.after)
+      return false;
+    const counts = this.d.counts(wt.id);
+    return counts?.dirty === 0 && counts.ahead === 0;
+  }
+  resolveAfter(wt, raw, at, q, anywhere = false) {
     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]);
+    const onList = matchBy(titled.filter((p) => anywhere ? p.i !== at : 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.` };
+    const rest = matchBy(titled.filter((p) => anywhere ? p.i === at : p.i >= at), bare, [(p) => p.title]);
+    if (rest.length > 0) {
+      return {
+        refused: anywhere ? `"${q}" is this piece itself.` : `"${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 } };
@@ -32912,6 +33337,13 @@ class PiecesService {
       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");
+    const after = piece.after;
+    if (fate === "worktree" && after && "piece" in after) {
+      const at = proposed.pieces.findIndex((p) => p.id === pieceId);
+      if (proposed.pieces.findIndex((p) => p.id === after.piece) > at) {
+        throw new UserError("That piece waits for one later on the list, so it is done here or skipped");
+      }
+    }
     if (piece.fate === "send" && (fate === "here" || fate === "worktree")) {
       throw new UserError("A piece for an open worktree is sent there or skipped");
     }
@@ -32969,6 +33401,7 @@ class PiecesService {
         }
       }
       agent.note({ type: "pieces", id, outcomes, ts: Date.now() });
+      this.recordAwaits(wt.id, entries, proposed, became);
       if (tell && outcomes.some((o) => o.fate !== "here")) {
         for (let i = 0;i < 30 && openPlanCard(agent.transcript()); i++)
           await Bun.sleep(100);
@@ -33105,7 +33538,9 @@ ${p.section}`;
     const crossed = piece.project ? { repoName: piece.project.name } : {};
     if (fate === "here" || fate === "skip") {
       became.set(piece.id, { fate });
-      return { pieceId: piece.id, fate };
+      const waits = fate === "here" ? piece.after : undefined;
+      const after = !waits ? undefined : ("piece" in waits) ? proposed.pieces.find((p) => p.id === waits.piece)?.title ?? waits.piece : waits.branch;
+      return { pieceId: piece.id, fate, ...after ? { after } : {} };
     }
     if (fate === "send") {
       const target = piece.to ? this.d.state.worktree(piece.to.id) : undefined;
@@ -33152,6 +33587,23 @@ ${p.section}`;
     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 };
   }
+  recordAwaits(originId, entries, proposed, became) {
+    const awaits = [];
+    for (const piece of proposed.pieces) {
+      const after = piece.after;
+      if (!after || effectiveFate(entries, proposed, piece) !== "here")
+        continue;
+      const w = "piece" in after ? became.get(after.piece)?.worktree : after;
+      if (w && !awaits.some((a) => a.id === w.id))
+        awaits.push(w);
+    }
+    if (awaits.length === 0)
+      return;
+    const live = this.d.state.requireWorktree(originId);
+    live.awaits = [...(live.awaits ?? []).filter((a) => !awaits.some((b) => b.id === a.id)), ...awaits];
+    this.d.state.save();
+    this.d.hub.emit("worktreesChanged");
+  }
   waitsFor(wt, piece, became) {
     const after = piece.after;
     if (!after)
@@ -33216,7 +33668,10 @@ ${handedPrompt(null, note, at, via)}`
     return out;
   }
   async landed(landedId) {
-    this.tellOrigin(landedId);
+    const told = new Set;
+    const origin = this.tellOrigin(landedId);
+    if (origin)
+      told.add(origin);
     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) ?? [];
@@ -33253,7 +33708,38 @@ ${handedPrompt(null, note, at, via)}`
         }
       }
     }
-    this.tellWaiters(landedId, madeNow);
+    for (const id of this.tellWaiters(landedId, madeNow))
+      told.add(id);
+    this.tellAwaiting(landedId, told);
+  }
+  tellAwaiting(landedId, told) {
+    const landed = this.d.state.worktree(landedId);
+    const repo = landed ? this.d.state.repo(landed.repoId) : undefined;
+    let changed = false;
+    for (const w of this.d.state.worktrees) {
+      if (!w.awaits?.some((a) => a.id === landedId))
+        continue;
+      w.awaits = w.awaits.filter((a) => a.id !== landedId);
+      if (w.awaits.length === 0)
+        delete w.awaits;
+      changed = true;
+      if (!landed || !repo || w.kind !== "worktree" || told.has(w.id))
+        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 } : {},
+        awaited: true,
+        ts: Date.now()
+      });
+    }
+    if (changed) {
+      this.d.state.save();
+      this.d.hub.emit("worktreesChanged");
+    }
   }
   repoint(origin, made, worktree) {
     const live = this.d.state.worktree(origin.id);
@@ -33298,13 +33784,13 @@ ${handedPrompt(null, note, at, via)}`
   tellOrigin(landedId) {
     const wt = this.d.state.worktree(landedId);
     if (wt?.from?.kind !== "worktree")
-      return;
+      return null;
     const origin = this.d.state.worktree(wt.from.origin.id);
     if (origin?.kind !== "worktree")
-      return;
+      return null;
     const repo = this.d.state.repo(wt.repoId);
     if (!repo)
-      return;
+      return null;
     this.d.runtime.ensureAgent(origin).agent.note({
       type: "piece-landed",
       worktreeId: wt.id,
@@ -33314,19 +33800,22 @@ ${handedPrompt(null, note, at, via)}`
       ...wt.repoId === origin.repoId ? { same: true } : {},
       ts: Date.now()
     });
+    return origin.id;
   }
   tellWaiters(landedId, madeNow) {
     const landed = this.d.state.worktree(landedId);
     if (!landed)
-      return;
+      return [];
     const repo = this.d.state.repo(landed.repoId);
     if (!repo)
-      return;
+      return [];
+    const told = [];
     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;
+      told.push(w.id);
       this.d.runtime.ensureAgent(w).agent.note({
         type: "piece-landed",
         worktreeId: landed.id,
@@ -33338,6 +33827,7 @@ ${handedPrompt(null, note, at, via)}`
         ts: Date.now()
       });
     }
+    return told;
   }
   sweep() {
     let changed = false;
@@ -35705,7 +36195,7 @@ var idsOf = (rows, trunks) => [
   ...rows.map((r) => r.id),
   ...Object.values(trunks).map((t) => t.id)
 ];
-var heldBy = (found) => `${found.name} is held by another tool${found.lockReason ? `: ${found.lockReason}` : ""}`;
+var heldBy2 = (found) => `${found.name} is held by another tool${found.lockReason ? `: ${found.lockReason}` : ""}`;
 var commandLine = (args) => args.map((a) => /^[\w./:=@,+-]+$/.test(a) ? a : JSON.stringify(a.split(`
 `, 1)[0])).join(" ");
 
@@ -35821,7 +36311,7 @@ class WorktreeService {
     const task = taskText(prompt, attachments);
     const given = cleanTitle2(opts.title ?? "") || undefined;
     const title = given ?? titleFrom(task);
-    const spare = this.d.state.worktrees.find((w) => w.repoId === repoId && w.kind === "spare");
+    const spare = opts.cold ? undefined : this.d.state.worktrees.find((w) => w.repoId === repoId && w.kind === "spare");
     const restart = !!spare && profile !== undefined && profile !== resolveRun(repo, spare).profile;
     let carriedIn;
     let release;
@@ -35835,7 +36325,7 @@ class WorktreeService {
       profile,
       unnamed: given ? undefined : true
     };
-    const claimed = await this.spare.claim(repoId, title, opts.worktreeId, stamps, async (wt) => {
+    const prepare = async (wt) => {
       const rt = this.d.runtime.ensureAgent(wt);
       release = rt.agent.hold();
       if (rt.agent.runningAgent !== null && rt.agent.runningAgent !== agent)
@@ -35847,7 +36337,8 @@ class WorktreeService {
         attachments,
         ...born ? { handed: born.handed } : {}
       });
-    });
+    };
+    const claimed = spare ? await this.spare.claim(repoId, title, opts.worktreeId, stamps, prepare) : null;
     if (claimed) {
       const { wt } = claimed;
       const rt = this.d.runtime.ensureAgent(wt);
@@ -36064,7 +36555,7 @@ class WorktreeService {
     const target = canonical(r.path);
     const pushed = this.discoveredById(worktreeId);
     if (pushed?.locked)
-      throw new UserError(heldBy(pushed));
+      throw new UserError(heldBy2(pushed));
     if (!r.branch)
       throw new UserError(`${r.name} is detached: check out a branch in it first`);
     const enclosing = [...this.d.state.repos, ...this.d.state.worktrees].find((w) => isInside(target, canonical(w.path)));
@@ -36091,7 +36582,7 @@ class WorktreeService {
       await withRepoLock(repo.path, async () => {
         const found = await this.requireDiscovered(repoId, repo.path, target, wt.id);
         if (found.locked)
-          throw new UserError(heldBy(found));
+          throw new UserError(heldBy2(found));
         if (!found.branch)
           throw new UserError(`${found.name} is detached: check out a branch in it first`);
         wt.branch = found.branch;
@@ -36960,7 +37451,7 @@ ${wt.landing.body}` : s;
       return this.landOp(wt, repo, message);
     });
     if (out.result.ok && out.landed)
-      this.noteLanded(wt, out.result.message, out.mark);
+      this.noteLanded(wt, out.result.message, out.mark, out.url);
     return { result: this.fixShip(wt, out.result, baseOf(repo)) };
   }
   fixShip(wt, result, base) {
@@ -37005,8 +37496,14 @@ ${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, mark) {
-    this.d.runtime.ensureAgent(wt).agent.note({ type: "landed", message, ...mark ? { mark } : {}, ts: Date.now() });
+  noteLanded(wt, message, mark, url) {
+    this.d.runtime.ensureAgent(wt).agent.note({
+      type: "landed",
+      message,
+      ...mark ? { mark } : {},
+      ...url ? { url } : {},
+      ts: Date.now()
+    });
     this.d.hub.emit("landed", wt.id);
   }
   async followBranch(wt, current) {
@@ -37067,7 +37564,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, landed: true, mark } : { result };
+        return result.ok ? { result, landed: true, mark, url: wt.pr.url } : { result };
       }
       const fetched = await this.fetchBase(wt, repo, w);
       if (!fetched.ok)
@@ -37107,7 +37604,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, landed: true, mark: noted } : { result };
+        return r.ok ? { result, landed: true, mark: noted, url: wt.pr?.url } : { result };
       }
       const named = !suggested ? undefined : splitMessage(policy.merge === "squash" ? await squashMessage(wt.path, base, suggested, !!typed) : suggested);
       const result = await openPr({
@@ -37296,7 +37793,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, mark);
+      this.noteLanded(wt, result.message, mark, wt.pr?.url);
     return result;
   }
   async prMergedOp(worktreeId, carried, w = UNWATCHED) {
@@ -37662,6 +38159,16 @@ ${wt.landing.body}` : wt.landing.subject : undefined);
     }
     return this.d.state.requireWorktree(worktreeId);
   }
+  writtenTranscript(worktreeId) {
+    const path = transcriptPathFor(this.d.paths.transcriptsDir, worktreeId);
+    return existsSync36(path) ? path : undefined;
+  }
+  transcriptPath(id) {
+    const path = this.d.state.worktree(id) ? this.writtenTranscript(id) : this.archive.chatFiles(id)?.transcript;
+    if (!path || !existsSync36(path))
+      throw new UserError("nothing has been written to this chat yet");
+    return path;
+  }
   async send(worktreeId, msg) {
     await this.archivingNow(worktreeId);
     if (!this.d.state.worktree(worktreeId) && this.hasArchived(worktreeId)) {
@@ -37755,6 +38262,8 @@ ${wt.landing.body}` : wt.landing.subject : undefined);
         borrowed: rt?.borrowed.size ? [...rt.borrowed] : undefined,
         agent: rt?.agent.status ?? "idle",
         stopping: rt?.agent.stopping || undefined,
+        background: rt?.agent.holding || undefined,
+        wakes: rt?.agent.wakes ?? undefined,
         login: !!rt?.login,
         ahead,
         behind,
@@ -37763,7 +38272,7 @@ ${wt.landing.body}` : wt.landing.subject : undefined);
         queued: rt?.agent.queueLength || undefined,
         unseen: isUnseen(wt) || undefined,
         usage: this.usageFor(wt.id),
-        transcript: transcriptPathFor(this.d.paths.transcriptsDir, wt.id),
+        transcript: this.writtenTranscript(wt.id),
         sessionId: this.d.state.session(wt.id),
         shipping: this.ops.get(wt.id),
         syncQueued: this.syncQueued.has(wt.id) || undefined
@@ -38015,9 +38524,11 @@ var pieces = new PiecesService({
   runtime,
   attachments: attachments2,
   create: (repoId, prompt, opts) => worktrees.create(repoId, prompt, opts),
+  counts: (id) => worktrees.tree.counts(id),
   reader: makePiecesReader(runtime, agents, state)
 });
 tools.add(pieces);
+tools.add(new WorktreeLookup({ state, transcriptsDir: paths.transcriptsDir, archived: (repoId) => worktrees.archived(repoId) }));
 var turns = new TurnService({
   state,
   hub,
@@ -38127,6 +38638,8 @@ var keepAwake = new KeepAwake({
   hub,
   demand: () => runtime.demand(),
   assert: idleSleepAssertion(process.env.TOYON_KEEP_AWAKE),
+  bridge: idleSleepBridge(process.env.TOYON_KEEP_AWAKE),
+  carried: process.env[CARRIED_ENV] === "1",
   mode: () => state.keepAwake,
   answerable: () => setting.get() !== null
 });
@@ -38259,7 +38772,7 @@ async function shutdown(signal, opts = {}) {
   shuttingDown = true;
   log.info("daemon", `${signal}: stopping dev servers`);
   idleExit.stop();
-  keepAwake.stop();
+  const heldAwake = keepAwake.stop({ handoff: opts.respawn === true });
   tailnet.stop();
   idle.shutdown();
   landing.stop();
@@ -38280,7 +38793,7 @@ async function shutdown(signal, opts = {}) {
     await Bun.sleep(250);
     log.info("daemon", "starting the replacement");
     try {
-      respawn(paths.logFile);
+      respawn(paths.logFile, carryEnv(process.env, heldAwake));
     } catch (e) {
       log.error("daemon", "the replacement did not start; run `toyon` to start it again", e);
       process.exit(1);