toyon 0.24.0 → 0.25.0

package/dist/daemon.js

@@ -2,7 +2,7 @@
 // ../daemon/src/index.ts
 import { rmSync as rmSync10, writeFileSync as writeFileSync14 } from "fs";
 import { homedir as homedir15 } from "os";
-import { dirname as dirname16, join as join37 } from "path";
+import { dirname as dirname17, join as join37 } from "path";
 import { fileURLToPath } from "url";
 
 // ../shared/src/protocol/events.ts
@@ -14,6 +14,7 @@ var TOYON_MCP_SERVER = "toyon";
 var HANDOFF_TOOL = "handoff";
 var WORKTREES_TOOL = "worktrees";
 var OWN_TOOL = "own";
+var STOP_TOOL = "stop";
 function coalesce(entries) {
   const out = [];
   for (const entry of entries) {
@@ -6787,7 +6788,7 @@ ${text.slice(text.length - (CONTEXT_CHARS - HEAD_CHARS))}`;
 }
 
 // ../shared/src/protocol/limits.ts
-var PROTOCOL_VERSION = 149;
+var PROTOCOL_VERSION = 151;
 var PAGE_ERROR_MAX_CHARS = 2000;
 var PAGE_TITLE_MAX_CHARS = 1000;
 var FILE_MAX_CHARS = 5000000;
@@ -7216,6 +7217,8 @@ var clientMsgSchema = discriminatedUnion("t", [
   object({ t: literal("continue"), worktreeId: id }),
   object({ t: literal("reveal"), worktreeId: id, path: relPath.optional() }),
   object({ t: literal("reveal-path"), path: relPath }),
+  object({ t: literal("copy-file"), worktreeId: id, path: relPath }),
+  object({ t: literal("copy-file-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 }),
@@ -8844,7 +8847,7 @@ async function turnRemoteOff(ts, daemonPort, file, was) {
 // ../daemon/package.json
 var package_default = {
   name: "@toyon/daemon",
-  version: "0.24.0",
+  version: "0.25.0",
   private: true,
   type: "module",
   main: "src/index.ts",
@@ -12766,10 +12769,18 @@ function envLevel() {
 }
 var threshold = LEVELS[envLevel()];
 var BUGS = [TypeError, RangeError, ReferenceError, SyntaxError];
+function details(e) {
+  const d = e.data?.details;
+  return typeof d === "string" && d ? `: ${d.split(`
+`)[0]}` : "";
+}
 function fmtError(level, e) {
-  const line = `${e.name}: ${e.message}`;
+  const head = `${e.name}: ${e.message}`;
+  const line = head + details(e);
   const whole = level === "error" || threshold <= LEVELS.debug || BUGS.some((c) => e instanceof c);
-  return whole ? e.stack ?? line : line;
+  if (!whole || !e.stack)
+    return line;
+  return e.stack.startsWith(head) ? line + e.stack.slice(head.length) : e.stack;
 }
 function fmtExtra(level, extra) {
   if (extra === undefined)
@@ -13657,6 +13668,13 @@ function isAuthRequired(e) {
   return e instanceof RequestError && e.code === -32000;
 }
 
+// ../daemon/src/agent/acp/errors.ts
+function errorWords(e) {
+  const details = e instanceof RequestError ? e.data?.details : undefined;
+  const message = typeof details === "string" && details ? details : e instanceof Error ? e.message : String(e);
+  return message.replace(/^Internal error: /, "");
+}
+
 // ../daemon/src/agent/acp/options.ts
 var OPTION_FIELDS = { model: "model", thought_level: "effort" };
 var OPTION_CATEGORIES = Object.keys(OPTION_FIELDS);
@@ -13846,7 +13864,7 @@ class AgentReadiness {
       }
       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)}`);
+          log.debug(tag, `session/close failed: ${errorWords(e)}`);
         });
       }
     } catch (e) {
@@ -13913,16 +13931,15 @@ class AgentReadiness {
     } catch (e) {
       if (e instanceof UserError)
         throw e;
-      throw new UserError(`${spec.name} could not be signed out: ${e instanceof Error ? e.message : String(e)}`);
+      throw new UserError(`${spec.name} could not be signed out: ${errorWords(e)}`);
     } finally {
       await link.kill();
     }
   }
 }
 function firstLine(e) {
-  const details = e instanceof RequestError ? e.data?.details : undefined;
-  const message = typeof details === "string" ? details : e instanceof Error ? e.message : String(e);
-  return message.replace(/^Internal error: /, "").split(`
+  const message = errorWords(e);
+  return message.split(`
 `)[0] ?? message;
 }
 function sameLimits(a, b) {
@@ -14929,7 +14946,7 @@ var BUILTIN_AGENTS = [
     run: {
       kind: "npm-bin",
       pkg: "@toyon-dev/claude-agent-acp",
-      version: "0.99.1-toyon.1",
+      version: "0.106.0-toyon.1",
       forkOf: "@agentclientprotocol/claude-agent-acp",
       bin: "claude-agent-acp"
     },
@@ -15124,8 +15141,14 @@ class AgentRegistry {
     }
     if (!this.packageName(spec))
       return { reason: `no build for ${this.host.platform} ${this.host.arch}` };
-    if (this.installed(spec))
-      return { reason: boxed };
+    if (this.installed(spec)) {
+      const owed = boxed || this.installing.has(spec.id) ? undefined : this.installErrors.get(spec.id);
+      const runs = owed ? this.installedVersion(spec) : null;
+      if (!owed || !runs || runs === spec.run.version)
+        return { reason: boxed };
+      const behind = { runs, pinned: spec.run.version };
+      return { reason: null, install: { failed: owed.why, ...owed.held ? { held: true } : {}, behind } };
+    }
     if (this.installing.has(spec.id))
       return { reason: "installing" };
     const failed = this.installErrors.get(spec.id);
@@ -15697,6 +15720,13 @@ function backgroundStart(input, output) {
   const m = STARTED.exec(output);
   return m ? { taskId: m[1], file: m[2] } : null;
 }
+var STOP_TOOL2 = "TaskStop";
+function stoppedTask(name, input) {
+  if (name !== STOP_TOOL2)
+    return null;
+  const id = input && typeof input === "object" ? input.task_id : undefined;
+  return typeof id === "string" ? id : null;
+}
 function spawnDetached(output) {
   return output.includes("Async agent launched successfully");
 }
@@ -15721,7 +15751,7 @@ function taskEnd(text, toolId) {
   return { status, exit: exit === undefined ? null : Number(exit) };
 }
 var POLL_MS = 500;
-var DEFAULT_BASH_TIMEOUT_MS = 120000;
+var BACKGROUND_LIMIT_MS = 2 * 60 * 60000;
 var GRACE_MS = 60000;
 var READ_CHUNK = 1 << 20;
 var CARRY = 4000;
@@ -15735,14 +15765,13 @@ class BackgroundTasks {
   get size() {
     return this.watched.size;
   }
-  start(toolId, start, input) {
+  start(toolId, start) {
     const logPath = sessionLogFor(start.file, this.deps.configDir);
     if (!logPath)
       return false;
-    const timeout = input?.timeout;
-    const ceiling = (typeof timeout === "number" ? timeout : DEFAULT_BASH_TIMEOUT_MS) + (this.deps.graceMs ?? GRACE_MS);
     const w = {
       toolId,
+      taskId: start.taskId,
       file: start.file,
       log: logPath,
       read: 0,
@@ -15751,13 +15780,20 @@ class BackgroundTasks {
       decoder: new TextDecoder,
       text: "",
       truncated: false,
-      ceiling: Date.now() + ceiling,
+      ceiling: Date.now() + (this.deps.waitMs ?? BACKGROUND_LIMIT_MS + GRACE_MS),
       timer: null
     };
     this.watched.set(toolId, w);
     this.schedule(w);
     return true;
   }
+  stop(taskId) {
+    for (const w of [...this.watched.values()]) {
+      if (w.taskId !== taskId)
+        continue;
+      fireAndForget("background", this.finish(w, null, "the agent stopped it", true), `ending ${w.toolId}`);
+    }
+  }
   endAll(reason) {
     for (const w of [...this.watched.values()]) {
       fireAndForget("background", this.finish(w, null, reason, true), `ending ${w.toolId}`);
@@ -16080,7 +16116,7 @@ function abandoned(memos, parent, opening = false) {
   }
   return out;
 }
-function mapUpdate(update, memos, tag, sink, background, wakeup) {
+function mapUpdate(update, memos, tag, sink, background, wakeup, stopped) {
   switch (update.sessionUpdate) {
     case "agent_message_chunk": {
       const { parentToolId } = spawnOf(update._meta);
@@ -16127,7 +16163,7 @@ function mapUpdate(update, memos, tag, sink, background, wakeup) {
         ...spawn
       });
       if (update.status === "completed" || update.status === "failed")
-        out.push(endOf(update.toolCallId, memo, update.status, sink, background, wakeup));
+        out.push(endOf(update.toolCallId, memo, update.status, sink, background, wakeup, stopped));
       return out;
     }
     case "tool_call_update": {
@@ -16184,7 +16220,7 @@ function mapUpdate(update, memos, tag, sink, background, wakeup) {
       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, wakeup));
+        out.push(endOf(update.toolCallId, memo, update.status, sink, background, wakeup, stopped));
       }
       return out;
     }
@@ -16215,14 +16251,19 @@ function textOf(content, tag, what) {
   log.debug(tag, `acp: dropping non-text ${what} block (${content.type})`);
   return null;
 }
-function endOf(toolId, memo, status, sink, background, wakeup) {
+function endOf(toolId, memo, status, sink, background, wakeup, stopped) {
   memo.ended = true;
   const output = summarizeToolOutput(memo.content, memo.rawOutput);
   if (status === "completed" && memo.kind === "execute" && background) {
     const start = backgroundStart(memo.input, output);
-    if (start && background(toolId, start, memo.input))
+    if (start && background(toolId, start))
       return { type: "tool-update", toolId, background: true };
   }
+  if (status === "completed" && stopped) {
+    const taskId = stoppedTask(memo.name || memo.title, memo.input);
+    if (taskId !== null)
+      stopped(taskId);
+  }
   if (status === "completed" && wakeup) {
     const name = memo.name || memo.title;
     const until = wakeupAt(name, memo.input);
@@ -16477,6 +16518,7 @@ var SYSTEM_APPEND = [
   "`@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.",
+  "To stop the turn of a worktree made from a piece you handed off, when the user drops or pauses that work, call the `stop` tool when you have one, with the reason: it interrupts that turn and nothing else, and that chat says who stopped it and why. Stopping any other worktree, and archiving one, is the user's to do in Toyon; say so rather than looking for another way to reach its agent.",
   "To run a command this worktree still reaches on main here, call the `own` tool when you have one, before you edit what that command runs on; Toyon would switch it on the edit anyway, and calling first means the server is up when the edit lands.",
   `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", "api": {"cmd": "uv run uvicorn app.main:app --port $PORT", "setup": ["uv sync"], "remotes": {"stage": "https://api.stage.example.com"}}}, "check": "bun run check"}: 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, and check (optional) runs after each of your turns and must pass before the work can land. A run command may take the object form: cmd is the command; a command whose folder Toyon can place in the tree (or whose paths are listed) runs once in the main checkout and every worktree's page reaches it at its <NAME>_URL until the worktree changes those files, when it starts its own; "from": "copy" makes every worktree run its own and "from": "trunk" makes main run it whatever the paths say, with no change flipping a command that names no folder; its setup and teardown run in a worktree before it first runs that command there and when the worktree goes; remotes names addresses the page may point it at instead. The paragraph attached to each message says which commands this worktree reaches on main. 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.",
@@ -16641,16 +16683,22 @@ function handoffActedPrompt(pieces, outcomes, by = "plan", note) {
     const acted = parts.length ? `: ${parts.join("; ")}` : "";
     const siblings = started.length || queued.length || sent.length ? " The siblings read the list at its path in this worktree; never do their pieces yourself." : "";
     const said = note ? ` The person added: ${note}` : "";
-    return `The person answered the handoff card, and Toyon acted on the pieces you handed over${acted}. ${own}${said}${siblings}`;
+    return `The person answered the handoff card, and Toyon acted on the pieces you handed over${acted}. ${own}${siblings}${said}`;
   }
   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 handoffDeclinedPrompt(pieces, note) {
-  const titles = pieces.map((p) => `"${p.title}"`).join(", ");
-  return `The person answered the handoff card with not now: nothing on the list you handed over (${titles}) was started, and none of it is yours to do from that list. They added: ${note}
+  return `${handoffDeclinedContext(pieces)} They added: ${note}
 
 Read that as the word on what to change. Hand over a new list with the handoff tool if a split still fits, or go on without one.`;
 }
+function handoffDeclinedContext(pieces, failed) {
+  const titles = pieces.map((p) => `"${p.title}"`).join(", ");
+  if (failed === undefined) {
+    return `The person answered the handoff card with not now: nothing on the list you handed over (${titles}) was started, and none of it is yours to do from that list.`;
+  }
+  return `Toyon could not finish acting on the list you handed over (${titles}): ${failed.replace(/\.$/, "")}. A piece may not have started; say so, and hand it over again if the split still fits.`;
+}
 function sentFromLine(path, by) {
   const who = by ? `, where ${by} was working` : "";
   return `This message was sent from a terminal in ${path} with \`toyon send\`${who}.`;
@@ -16675,29 +16723,30 @@ 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 \`handoff\` tool: one piece, \`where\` set to \`worktree\` and \`project\` to "${project.path}", with a title (${NAME_SHAPE}) 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 \`handoff\` tool: one piece, \`where\` set to \`worktree\`, with a title (${NAME_SHAPE}) 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, 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.`;
-  }
-  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.`;
+var chatAt = (transcript) => `Its chat is at ${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.`;
+function pieceLandedContext(landed, chat) {
+  const { title } = landed;
+  const where = landed.url ? ` (${landed.url})` : "";
+  const what = landed.subjects?.length ? ` What landed: ${landed.subjects.map((s) => `"${s}"`).join("; ")}.` : "";
+  const read = chat ? ` ${chatAt(chat)} Read its agent's last replies there when what it checked or left undone matters here.` : "";
+  const said = landed.awaited ? `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.` : landed.again ? `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.` : landed.sent ? `The worktree this one sent a piece to, "${title}"${landed.same ? "" : ` in ${landed.repoName}`}, has landed on ${landed.same ? "this project's" : "that project's"} main${where}; the landing is that worktree's own, so check that it holds the piece before anything here relies on it.` : landed.same ? `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.` : `The work this worktree handed off to ${landed.repoName}, "${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.`;
+  return said + what + read;
 }
 function pieceWakePrompt(landed) {
   const quoted = (xs) => xs.map((x) => `"${x}"`).join(", ");
   const sentences = landed.map((l) => {
     const where = l.url ? ` (${l.url})` : "";
     const main = l.project ? `main in the project ${l.project}` : "this project's main";
+    if (l.handed)
+      return `The work this worktree handed off, "${l.title}" (${l.branch}), has landed on ${main}${where}.`;
+    if (l.sent)
+      return `The worktree this one sent a piece to, "${l.title}" (${l.branch}), has landed on ${main}${where}; check that the landing holds the piece.`;
     const own = l.pieces.length === 0 ? "your own piece" : `your own ${l.pieces.length === 1 ? "piece" : "pieces"} ${quoted(l.pieces)}`;
     return `The branch ${own} waited for, "${l.title}" (${l.branch}), has landed on ${main}${where}.`;
   });
-  const pieces = [...new Set(landed.flatMap((l) => l.pieces))];
-  const build = pieces.length === 0 ? "Do the piece that waited here now, and only that." : `Do ${quoted(pieces)} here now, and only ${pieces.length === 1 ? "that" : "those"}.`;
+  const waited = landed.filter((l) => !l.handed && !l.sent);
+  const pieces = [...new Set(waited.flatMap((l) => l.pieces))];
+  const build = waited.length === 0 ? `Nothing here was set to wait for ${landed.length === 1 ? "it" : "them"}. If something here depends on what landed, such as a pinned version or a copy patched by hand, bring it in line now, and only that; otherwise change nothing. Then say in a line or two what landed and what you did with it.` : pieces.length === 0 ? "Do the piece that waited here now, and only that." : `Do ${quoted(pieces)} here now, and only ${pieces.length === 1 ? "that" : "those"}.`;
   const titles = quoted(landed.map((l) => l.title));
   const here = landed.some((l) => !l.project);
   const commits = `What ${titles} landed is readable on main now${here ? ", and Toyon rebases onto main when this lands" : ""}.`;
@@ -16718,7 +16767,7 @@ function archivedFate(a) {
   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.`;
+  const chat = chatAt(s.transcript);
   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) {
@@ -17074,16 +17123,22 @@ async function askRun(ctx, a, opened) {
     if (a.quick) {
       const model = readOptions(s.configOptions).get("model");
       const quick = model && quickModelFor(a.spec, model.ids, model.current);
-      if (model && quick) {
-        if (model.current !== quick) {
+      let onQuick = !!quick && model?.current === quick;
+      if (model && quick && !onQuick) {
+        try {
           await ctx.request(methods.agent.session.setConfigOption, {
             sessionId: s.sessionId,
             configId: model.id,
             value: quick
           });
+          onQuick = true;
+        } catch (e) {
+          log.warn(a.tag, `ask: ${a.spec.id} would not move to its quick model ${quick}`, e);
         }
-      } else if (a.quick === "require") {
-        log.debug(a.tag, `ask: ${a.spec.id} offers no quick model; not asked`);
+      } else if (model && !quick)
+        noteNotOffered(a, model.ids);
+      if (!onQuick && a.quick === "require") {
+        log.debug(a.tag, `ask: ${a.spec.id} has no quick model to run on; not asked`);
         return null;
       }
     }
@@ -17121,9 +17176,20 @@ ${a.prompt}`;
     fireAndForget(a.tag, cleanUp(ctx, a, s.sessionId), "ask: clean up side session");
   }
 }
+var notOffered = new Set;
+function noteNotOffered(a, offered) {
+  const named = a.spec.quickModel;
+  if (typeof named !== "string")
+    return;
+  const key = `${a.spec.id} ${named}`;
+  if (notOffered.has(key))
+    return;
+  notOffered.add(key);
+  log.warn(a.tag, `ask: ${a.spec.id} does not offer its quick model ${named}; it offers ${offered.join(", ")}`);
+}
 async function cleanUp(ctx, a, sessionId) {
   const quietly = (what) => (e) => {
-    log.debug(a.tag, `ask: session/${what} failed: ${e instanceof Error ? e.message : String(e)}`);
+    log.debug(a.tag, `ask: session/${what} failed: ${errorWords(e)}`);
   };
   if (a.caps.close)
     await ctx.request(methods.agent.session.close, { sessionId }).catch(quietly("close"));
@@ -17300,7 +17366,7 @@ function steerOutcome(value) {
 // ../daemon/src/agent/acp/wire.ts
 var FLAG_NAMES = ["noStartSignal", "cutCallUnreported", "backgroundFinish", "modelIdOffList"];
 var CLAUDE = {
-  at: "0.99.1-toyon.1",
+  at: "0.106.0-toyon.1",
   gaps: {
     partialInput: {
       gap: "A call's input arrives one top-level field at a time, as `tool_call_update`s carrying `rawInput` and " + "nothing else, and nothing marks a refine partial or the last one whole. The whole input of a read " + "or a plain command arrives the same way.",
@@ -17323,12 +17389,12 @@ var CLAUDE = {
     steerPriority: {
       gap: "The adapter picks the SDK priority of a steered message: `now`, which aborts the step the CLI is on " + "(since CLI 2.1.286 a foreground tool moves to the background instead), and `later` only while a " + "card is open, which waits for the generation after the tool result. Toyon cannot ask for `next`, " + "between steps, which is what a message sent mid-turn means.",
       here: 'session.ts asks for `priority: "next"` under `_meta.steering` on every steer, which the fork honours ' + "(upstream ignores the key and keeps `now`), and sends a card's follow-up (an image, a note, the " + "edited plan) before the card's reply resolves so it lands on `later`. No flag: the ask and the " + "ordering are harmless either way.",
-      upstream: "Asked upstream twice, agentclientprotocol/claude-agent-acp#1175 and #1350 (the better shape, " + "`_meta.steering.priority`), both unreviewed; still `now` at 0.99.1. The fork pin carries #1350 " + "(`pr/1350-steer-priority`) until one lands; back #1350 rather than open a third. The steering " + "extension itself says nothing about the running step.",
+      upstream: "Asked upstream twice, agentclientprotocol/claude-agent-acp#1175 and #1350 (the better shape, " + "`_meta.steering.priority`), both unreviewed; still `now` at 0.106.0. The fork pin carries #1350 " + "(`pr/1350-steer-priority`) until one lands; back #1350 rather than open a third. The steering " + "extension itself says nothing about the running step.",
       open: false
     },
     backgroundFinish: {
       gap: "A command sent to the background returns at once with a task id and an output path, and the wire " + "never mentions it again.",
-      here: "background.ts tails the output file into the row and reads the finish off Claude Code's own session " + "log, on four strings toyon does not own. Flag: the sink mapUpdate keeps a background row open through.",
+      here: "background.ts tails the output file into the row and reads the finish off Claude Code's own session " + "log, on four strings toyon does not own. A task the agent stops gets no notice there, and its row " + "ends on the TaskStop call naming it. Flag: the sink mapUpdate keeps a background row open through.",
       upstream: "Shipped: `async_task_spawned`, `async_task_progress`, `async_task_state_update` and " + "`_session/async_task/stop`, but only to a client declaring `_meta.jetbrains.air.capabilities` with " + "`asyncTasks` at initialize; no AIR-only key reaches any other client. Ask for a neutral capability, " + "or declare that meta.",
       open: true
     },
@@ -17363,9 +17429,9 @@ var CLAUDE = {
       open: true
     },
     authStatusMeta: {
-      gap: "Which credential the agent runs on arrives as `_auth/status_update`, advertised under " + "`agentCapabilities._meta.authStatus`, with no request method.",
-      here: "authstatus.ts. No flag.",
-      upstream: "Interim extension, on both builtin adapters; first-class fields when the RFD lands.",
+      gap: "Which credential the agent runs on arrives as `_auth/status_update`, advertised under " + "`agentCapabilities._meta.authStatus`, with no request method. Since 0.104.0 the same identity is " + "also pushed as ACP's own `auth/status_update` and answered on `auth/status` (`auth.status`).",
+      here: "authstatus.ts reads the private one. The daemon's SDK has no `auth/status_update`, so that push " + "meets no handler and is dropped. No flag.",
+      upstream: "Interim extension, on both builtin adapters. Claude's first-class method has shipped; reading it " + "comes with an SDK that carries it.",
       open: true
     },
     steeringMeta: {
@@ -17381,7 +17447,7 @@ var CLAUDE = {
       open: true
     },
     droppedUpdates: {
-      gap: "Updates toyon gets and does not read: `plan` and `plan_update` (the task list), `compaction_update`, " + "`current_mode_update` beyond the plan check, `promptSuggestions` under `session_info_update._meta`, " + "and the title the adapter generates for the session. `notice` is withheld because toyon does not " + "declare `clientCapabilities.session.notices`.",
+      gap: "Updates toyon gets and does not read: `plan` (the task list; `plan_update` and `plan_removed` go " + "to a client declaring `clientCapabilities.plan`), `compaction_update`, " + "`current_mode_update` beyond the plan check, `promptSuggestions` under `session_info_update._meta`, " + "and the title the adapter generates for the session. `notice` is withheld because toyon does not " + "declare `clientCapabilities.session.notices`.",
       here: "map.ts drops them at its default arm; session.ts reads the mode update for plan only. No flag.",
       upstream: "Shipped. Each is daemon work to read, not an ask.",
       open: true
@@ -17970,16 +18036,19 @@ class AcpSession {
       this.steered.splice(at, 1);
     return at >= 0;
   }
-  stop() {
+  stop(by) {
     this.cancelAsks();
     if (!this.running) {
       if (this.own && this.live) {
         const { conn, sessionId } = this.live;
         fireAndForget(this.d.worktreeId, conn.ctx.notify(methods.agent.session.cancel, { sessionId }), "cancel");
-        this.endOwn("interrupted");
+        this.endOwn("interrupted", by);
+        return true;
       }
-      return;
+      return false;
     }
+    if (by && this.turn && !this.turn.stopping)
+      this.turn.by = by;
     this.setStopping(true);
     if (this.steered.length > 0) {
       for (const item of this.steered)
@@ -17992,6 +18061,7 @@ class AcpSession {
     if (live) {
       fireAndForget(this.d.worktreeId, live.conn.ctx.notify(methods.agent.session.cancel, { sessionId: live.sessionId }), "cancel");
     }
+    return true;
   }
   async close() {
     this.stopped = true;
@@ -18077,11 +18147,11 @@ class AcpSession {
     if (!turn?.open)
       return;
     turn.open = false;
-    this.turnOver(stopReason);
+    this.turnOver(stopReason, stopReason === "interrupted" ? turn.by : undefined);
     this.setStopping(false);
   }
-  turnOver(stopReason) {
-    this.emit({ type: "turn-end", stopReason, ts: Date.now() });
+  turnOver(stopReason, by) {
+    this.emit({ type: "turn-end", stopReason, ...by ? { by } : {}, ts: Date.now() });
     this.showHeld();
   }
   async ask(system, prompt, opts = {}) {
@@ -18144,7 +18214,7 @@ class AcpSession {
         ...apiKey ? { _meta: { "api-key": { apiKey } } } : {}
       });
     } catch (e) {
-      throw new UserError(`${conn.spec.name} login failed: ${e instanceof Error ? e.message : String(e)}`);
+      throw new UserError(`${conn.spec.name} login failed: ${errorWords(e)}`);
     }
     this.loggedIn();
     return { kind: "done" };
@@ -18191,12 +18261,12 @@ class AcpSession {
   rejectedCredential(e) {
     if (!this.conn?.authMethods.length)
       return false;
-    return REJECTED_CREDENTIAL_RE.test(e instanceof Error ? e.message : String(e));
+    return REJECTED_CREDENTIAL_RE.test(errorWords(e));
   }
   describe(e) {
     if (isAuthRequired(e))
       return this.conn?.spec.loginHint ?? this.d.spec().loginHint;
-    const message = (e instanceof Error ? e.message : String(e)).replace(/^Internal error: /, "");
+    const message = errorWords(e);
     return /connection closed/i.test(message) ? this.conn?.link.exitInfo() ?? message : message;
   }
   async record({ text, attachments, handed }) {
@@ -18261,10 +18331,10 @@ class AcpSession {
       this.d.preview?.(),
       this.d.tier?.(),
       this.d.pageErrors?.(),
-      ...this.landedSince()
+      ...this.heardSince()
     ]);
   }
-  landedSince() {
+  heardSince() {
     const entries = this.log.entries;
     let i = entries.length - 1;
     while (i >= 0 && !isMessage(entries[i].event))
@@ -18274,12 +18344,31 @@ 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, e.awaited));
-      }
+      const said = e.type === "piece-landed" ? pieceLandedContext(e, this.d.chatOf?.(e.worktreeId)) : this.cardAnswered(e);
+      if (said)
+        out.unshift(said);
     }
     return out;
   }
+  cardAnswered(e) {
+    if (e.type !== "handoff" && e.type !== "handoff-declined")
+      return;
+    const list = this.proposed(e.id);
+    if (!list || this.mcpTools === false)
+      return;
+    if (e.type === "handoff-declined" && e.outcome === "failed")
+      return handoffDeclinedContext(list.pieces, e.reason);
+    const withPlan = list.held && !this.log.entries.some(({ event }) => event.type === "handoff-shown" && event.id === e.id);
+    if (withPlan)
+      return;
+    if (e.type === "handoff-declined") {
+      return e.note || e.reason ? undefined : handoffDeclinedContext(list.pieces);
+    }
+    if (e.outcomes.some((o) => o.fate === "here" && !o.after))
+      return;
+    const go = this.log.entries.findLast(({ event }) => event.type === "handoff-go" && event.id === e.id)?.event;
+    return handoffActedPrompt(list.pieces, e.outcomes, "card", go?.type === "handoff-go" ? go.note : undefined);
+  }
   ensureConn(why) {
     if (this.conn)
       return Promise.resolve(this.conn);
@@ -18546,12 +18635,12 @@ class AcpSession {
         }
       }
     }
-    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"), wireFlags(live.conn.spec.id).backgroundFinish ? (toolId, start, input) => {
-      const taken = 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"), wireFlags(live.conn.spec.id).backgroundFinish ? (toolId, start) => {
+      const taken = this.tasks.start(toolId, start);
       if (taken)
         this.holdingChanged();
       return taken;
-    } : undefined, (toolId, until) => until === null ? this.wakeups.stop() : this.wakeups.start(toolId, until));
+    } : undefined, (toolId, until) => until === null ? this.wakeups.stop() : this.wakeups.start(toolId, until), (taskId) => this.tasks.stop(taskId));
     this.forward(live, events);
     this.holdInput(live, params.update);
   }
@@ -18798,13 +18887,13 @@ class AcpSession {
     t.unref?.();
     this.own.settle = t;
   }
-  endOwn(stopReason) {
+  endOwn(stopReason, by) {
     if (!this.own)
       return;
     if (this.own.settle)
       clearTimeout(this.own.settle);
     this.own = null;
-    this.turnOver(stopReason);
+    this.turnOver(stopReason, by);
     this.syncStatus();
     this.maybeArmReaper();
   }
@@ -21128,30 +21217,57 @@ function startForward(opts) {
 var MAC_PRESSURE_CRITICAL = 4;
 var AVAILABLE_FLOOR = 0.15;
 var PAGING_FLOOR_BPS = 16 * 2 ** 20;
+var HARD_PAGING_BPS = 4 * PAGING_FLOOR_BPS;
 var paging = [];
+var readers = { darwin, linux };
 var unsupportedLogged = false;
-async function memoryTight() {
-  const signal = process.platform === "darwin" ? await darwin() : process.platform === "linux" ? await linux() : null;
-  if (signal === null && !unsupportedLogged) {
-    unsupportedLogged = true;
-    log.warn("memory", `no memory pressure reading on ${process.platform}; nothing sleeps for memory`);
+var failures = 0;
+async function memoryTight(read = readers[process.platform]) {
+  if (!read) {
+    if (!unsupportedLogged) {
+      unsupportedLogged = true;
+      log.warn("memory", `no memory pressure reading on ${process.platform}; nothing sleeps for memory`);
+    }
+    return null;
   }
-  return signal;
+  const reading = await read();
+  if ("failed" in reading) {
+    if (failures++ === 0) {
+      log.warn("memory", `memory reading failed: ${reading.failed}; nothing sleeps for memory until it reads again`);
+    }
+    return null;
+  }
+  if (failures > 0) {
+    log.info("memory", `memory reads again after ${failures} failed ${failures === 1 ? "check" : "checks"}`);
+    failures = 0;
+  }
+  return reading;
 }
+var SYSCTL_NAMES = [
+  "kern.memorystatus_vm_pressure_level",
+  "kern.memorystatus_level",
+  "vm.compressor.pages_compressed",
+  "vm.compressor.pages_compressed_limit",
+  "vm.compressor.segment.total",
+  "vm.compressor.segment.limit"
+];
 async function darwin() {
-  const [r, v] = await Promise.all([
-    run("sysctl", ["-n", "kern.memorystatus_vm_pressure_level", "kern.memorystatus_level"], "/"),
-    run("vm_stat", [], "/")
-  ]);
-  if (!r.ok)
-    return null;
-  const [level, available] = r.out.split(/\s+/).map(Number);
-  if (level === undefined || available === undefined || Number.isNaN(level) || Number.isNaN(available))
-    return null;
+  const [r, v] = await Promise.all([run("sysctl", ["-n", ...SYSCTL_NAMES], "/"), run("vm_stat", [], "/")]);
+  const read = parseSysctl(r.out);
+  if (!read)
+    return { failed: `sysctl: ${r.err || "nothing to read in what it printed"}` };
   const sample = v.ok ? parseVmStat(v.out, Date.now()) : null;
   if (sample)
     paging = [...paging, sample].slice(-3);
-  return darwinSignal(level, available, sustainedPaging(paging));
+  return darwinSignal(read.level, read.available, sustainedPaging(paging), read.compressor);
+}
+function parseSysctl(text) {
+  const [level, available, pages, pageLimit, segments, segmentLimit] = text.split(`
+`).map((line) => /^\d+$/.test(line.trim()) ? Number(line) : undefined);
+  if (level === undefined || available === undefined)
+    return null;
+  const known = pages !== undefined && segments !== undefined && !!pageLimit && !!segmentLimit;
+  return { level, available, compressor: known ? Math.max(pages / pageLimit, segments / segmentLimit) : null };
 }
 function parseVmStat(text, at) {
   const pageSize = text.match(/page size of (\d+) bytes/);
@@ -21175,20 +21291,24 @@ function sustainedPaging(samples) {
   }
   return Math.min(...rates);
 }
-function darwinSignal(level, available, pagingBps = null) {
+function darwinSignal(level, available, pagingBps = null, compressor = null) {
   const pressure = level === 1 ? "normal" : level === 2 ? "warn" : level === MAC_PRESSURE_CRITICAL ? "critical" : `level ${level}`;
   const swapping = pagingBps === null ? "" : `, swapping out ${Math.round(pagingBps / 2 ** 20)} MB/s`;
+  const full = compressor === null ? "" : `, compressor ${Math.round(compressor * 100)}% full`;
+  const share = available / 100;
+  const room = compressor === null ? 1 : 1 - compressor;
   return {
-    tight: level === MAC_PRESSURE_CRITICAL || available < AVAILABLE_FLOOR * 100 || pagingBps !== null && pagingBps >= PAGING_FLOOR_BPS,
-    why: `memory pressure ${pressure} with ${available}% available${swapping}`
+    tight: level === MAC_PRESSURE_CRITICAL || share < AVAILABLE_FLOOR || room < AVAILABLE_FLOOR || pagingBps !== null && pagingBps >= PAGING_FLOOR_BPS,
+    hard: level === MAC_PRESSURE_CRITICAL || share <= AVAILABLE_FLOOR / 2 || room <= AVAILABLE_FLOOR / 2 || pagingBps !== null && pagingBps >= HARD_PAGING_BPS,
+    why: `memory pressure ${pressure} with ${available}% available${swapping}${full}`
   };
 }
 async function linux() {
   let text;
   try {
     text = await Bun.file("/proc/meminfo").text();
-  } catch {
-    return null;
+  } catch (e) {
+    return { failed: `/proc/meminfo: ${e instanceof Error ? e.message : e}` };
   }
   const field = (name) => {
     const m = text.match(new RegExp(`^${name}:\\s+(\\d+)`, "m"));
@@ -21197,9 +21317,13 @@ async function linux() {
   const total = field("MemTotal");
   const available = field("MemAvailable");
   if (!total || available === null)
-    return null;
-  const percent = Math.round(available / total * 100);
-  return { tight: available / total < AVAILABLE_FLOOR, why: `${percent}% of memory available` };
+    return { failed: "/proc/meminfo names no MemTotal or MemAvailable" };
+  const share = available / total;
+  return {
+    tight: share < AVAILABLE_FLOOR,
+    hard: share <= AVAILABLE_FLOOR / 2,
+    why: `${Math.round(share * 100)}% of memory available`
+  };
 }
 async function sampleCosts(pgids) {
   const costs = new Map;
@@ -22232,6 +22356,7 @@ function defaultAgent(wt, d, preview, onProcess) {
         archived: { at: a.archivedAt, landed: a.landed, restorable: a.restorable }
       }))
     ]),
+    chatOf: (id) => d.chatFile?.(id),
     onProcess,
     spec,
     connect: (app, spec, prepared) => spawnAcp(app, d.agents.launch(spec, prepared), wt.path, wt.id),
@@ -22608,6 +22733,9 @@ class RuntimeRegistry {
   agentFor(id) {
     return this.runtimes.get(id)?.agent;
   }
+  transcriptOf(id) {
+    return (this.runtimes.get(id) ?? this.stopping.get(id))?.agent.transcript();
+  }
   ensureAgent(wt) {
     const existing = this.runtimes.get(wt.id);
     if (existing)
@@ -23573,13 +23701,14 @@ function lacksQuickModel(spec, state) {
   const offered = state.cachedOptions(spec.id, "model");
   return offered.length > 0 && !offered.some((m) => m.id === quick);
 }
+var PLAN_READ_CHARS = 40000;
 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.",
+  "Below is a plan. List the parts of the work the plan itself means to be built apart from the rest: a step or section it marks as its own branch, a sibling worktree, a follow-up, or independent work, and work it puts off until after this one, to a later branch or a plan of its own, even where that is one sentence or one item of a list of what the plan leaves out. Something the plan only rules out, with no word that it is built later, is not a part. When you list any part, also list what the plan builds in this worktree, as one part.",
+  `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, or of the section that names it, "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 or comes after it}.`,
+  "Reply with an empty array when the plan is one piece of work with no part set apart or put off.",
   `Plan:
-${markdown.slice(0, 12000)}`
+${markdown.slice(0, PLAN_READ_CHARS)}`
 ].join(`
 `);
 function parsePieces(text) {
@@ -23839,6 +23968,7 @@ function sleepMsFrom(raw, inCloud) {
 }
 var DEFAULT_SLEEP_MS = sleepMsFrom(process.env.TOYON_PROC_SLEEP_MS, cloud.enabled);
 var PRESSURE_EVERY_MS = 15000;
+var HARD_PICKS = 3;
 var COSTS_EVERY_MS = 60000;
 var STAGGER_MS = 3000;
 
@@ -23849,6 +23979,10 @@ class IdlePolicy {
   queue = [];
   draining = false;
   drained = [];
+  checking = false;
+  freeing = null;
+  eases = [];
+  putDown = new Set;
   sleepMs;
   now;
   constructor(d) {
@@ -23978,14 +24112,44 @@ class IdlePolicy {
     return out;
   }
   async checkPressure() {
-    const signal = await (this.d.memory ?? memoryTight)();
-    if (!signal?.tight)
-      return;
-    const pick = this.d.state.worktrees.filter((w) => this.candidate(w.id) && this.awakeProcs(w.id)).sort((a, b) => this.entry(a.id).activeAt - this.entry(b.id).activeAt)[0];
-    if (!pick)
+    if (this.checking)
       return;
-    log.info("idle", `${signal.why}; ${pick.id} is the least recently used`);
-    this.sleep(pick.id, "short of memory");
+    this.checking = true;
+    try {
+      const signal = await (this.d.memory ?? memoryTight)();
+      const picks = signal?.tight ? this.d.state.worktrees.filter((w) => this.candidate(w.id) && this.awakeProcs(w.id)).sort((a, b) => this.entry(a.id).activeAt - this.entry(b.id).activeAt).slice(0, signal.hard || this.eases.length > 0 ? HARD_PICKS : 1) : [];
+      if (!signal?.tight)
+        this.putDown.clear();
+      if (signal && picks.some((p) => !this.putDown.has(p.id)))
+        this.freeing = signal;
+      else {
+        this.freeing = null;
+        this.letGo();
+      }
+      for (const pick of picks) {
+        log.info("idle", `${signal?.why}; ${pick.id} is the least recently used`);
+        this.putDown.add(pick.id);
+        this.sleep(pick.id, "short of memory");
+      }
+    } catch (e) {
+      this.freeing = null;
+      this.letGo();
+      throw e;
+    } finally {
+      this.checking = false;
+    }
+  }
+  short() {
+    return this.freeing?.why ?? null;
+  }
+  eased() {
+    if (!this.freeing)
+      return Promise.resolve();
+    return new Promise((r) => this.eases.push(r));
+  }
+  letGo() {
+    for (const go of this.eases.splice(0))
+      go();
   }
   async sampleCosts() {
     this.recordViewed();
@@ -27132,7 +27296,7 @@ function looksBinary(text) {
 // ../daemon/src/files/service.ts
 import { spawn as spawn5 } from "child_process";
 import { lstat as lstat2, stat as stat3, unlink } from "fs/promises";
-import { join as join24 } from "path";
+import { dirname as dirname10, join as join24 } from "path";
 
 // ../daemon/src/git/forge.ts
 function githubRepoUrl(remoteUrl) {
@@ -28021,7 +28185,21 @@ class FileService {
     child.on("error", () => {});
     child.unref();
   }
+  async clip(worktreeId, path) {
+    const target = resolveInside(this.require(worktreeId).path, path);
+    if (!await stat3(target).catch(() => null))
+      throw new UserError(`${path} is no longer there`);
+    await this.clipPath(target);
+  }
+  async clipPath(target) {
+    if (process.platform !== "darwin")
+      throw new UserError("copying a file is only available on macOS");
+    const r = await run("osascript", [...CLIP_FILE.flatMap((line) => ["-e", line]), target], dirname10(target));
+    if (!r.ok)
+      throw new UserError(`the file was not copied: ${r.err.trim() || `osascript exited ${r.exit}`}`);
+  }
 }
+var CLIP_FILE = ["on run argv", "set the clipboard to (POSIX file (item 1 of argv))", "end run"];
 
 // ../daemon/src/files/open.ts
 var PENDING_MS = 30000;
@@ -28659,7 +28837,7 @@ class AfterLand {
 // ../daemon/src/repos/registry.ts
 import { existsSync as existsSync28, mkdirSync as mkdirSync8, rmSync as rmSync5, writeFileSync as writeFileSync11 } from "fs";
 import { homedir as homedir10 } from "os";
-import { basename as basename9, dirname as dirname10, join as join25 } from "path";
+import { basename as basename9, dirname as dirname11, join as join25 } from "path";
 
 // ../daemon/src/git/base.ts
 async function resolveBase(repoPath, defaultBranch, route) {
@@ -28930,7 +29108,7 @@ class RepoRegistry {
       await excludeFromGit(repo.path, rel);
     const file = join25(repo.path, rel);
     try {
-      mkdirSync8(dirname10(file), { recursive: true });
+      mkdirSync8(dirname11(file), { recursive: true });
       writeFileSync11(file, configText(repo.path, rel, config));
     } catch (e) {
       log.warn(repoId, `could not write ${rel}`, e);
@@ -30481,6 +30659,7 @@ async function withSlot(key, max, fn) {
 
 // ../daemon/src/runs/service.ts
 var DETACHED_POLL_MS = 5000;
+var SHORT_OF_MEMORY = "short of memory";
 
 class RunService {
   d;
@@ -30491,9 +30670,10 @@ class RunService {
   }
   begin(worktreeId, kind, opts) {
     const key = keyOf2(worktreeId, kind);
+    const memory = opts.memory ? this.d.memory : undefined;
     const run = {
       kind,
-      status: opts.queued || opts.slot ? "queued" : "running",
+      status: opts.queued || opts.slot || memory?.short() ? "queued" : "running",
       since: Date.now(),
       timeoutMs: opts.timeoutMs,
       ...opts.stage ? { stage: opts.stage } : {}
@@ -30510,6 +30690,30 @@ class RunService {
       run.since = Date.now();
       this.write(worktreeId, run);
     };
+    const stage = (text) => {
+      if (!mine() || run.stage === text)
+        return;
+      if (text)
+        run.stage = text;
+      else
+        delete run.stage;
+      this.write(worktreeId, run);
+    };
+    const roomy = async () => {
+      const why = memory?.short();
+      if (!memory || !why)
+        return mine();
+      const was = run.stage;
+      const since = Date.now();
+      log.info(worktreeId, `${kind} waits for memory: ${why}`);
+      stage(SHORT_OF_MEMORY);
+      await memory.eased();
+      if (!mine())
+        return false;
+      log.info(worktreeId, `${kind} starts after ${describeDuration(Date.now() - since)} waiting for memory`);
+      stage(was);
+      return true;
+    };
     let admitted = Promise.resolve(true);
     if (opts.slot) {
       let admit = () => {};
@@ -30519,8 +30723,8 @@ class RunService {
       const held = new Promise((r) => {
         live.release = r;
       });
-      fireAndForget(worktreeId, withSlot(opts.slot.key, opts.slot.max, () => {
-        if (!mine()) {
+      fireAndForget(worktreeId, withSlot(opts.slot.key, opts.slot.max, async () => {
+        if (!mine() || !await roomy()) {
           admit(false);
           return;
         }
@@ -30528,6 +30732,12 @@ class RunService {
         admit(true);
         return held;
       }), `${kind} slot`);
+    } else if (run.status === "queued" && !opts.queued) {
+      admitted = roomy().then((ok) => {
+        if (ok)
+          start();
+        return ok;
+      });
     }
     return {
       admitted,
@@ -30539,15 +30749,7 @@ class RunService {
         run.pid = pgid;
         this.write(worktreeId, run);
       },
-      stage: (text) => {
-        if (!mine() || run.stage === text)
-          return;
-        if (text)
-          run.stage = text;
-        else
-          delete run.stage;
-        this.write(worktreeId, run);
-      },
+      stage,
       finish: (exit) => {
         if (!mine())
           return;
@@ -31567,6 +31769,15 @@ function backfillOf(entries, since) {
 }
 var handlers = {
   async subscribe(msg, ctx, s) {
+    const going = s.worktrees.archivingTranscript(msg.worktreeId);
+    if (going) {
+      if (!ctx.subscribe(msg.worktreeId))
+        return;
+      ctx.reply({ t: "backfill", worktreeId: msg.worktreeId, ...backfillOf(going, msg.since), log: [] });
+      ctx.reply({ t: "queue", worktreeId: msg.worktreeId, items: [] });
+      ctx.reply({ t: "agent-commands", worktreeId: msg.worktreeId, commands: [] });
+      return;
+    }
     const r = s.worktrees.readable(msg.worktreeId);
     if (!r) {
       const kept = s.worktrees.archivedTranscript(msg.worktreeId);
@@ -31837,7 +32048,7 @@ var handlers = {
   },
   async redraft(msg, _ctx, s) {
     const r = s.worktrees.readable(msg.worktreeId);
-    const events = r?.wt ? s.runtime.ensureAgent(r.wt).agent.transcript() : s.worktrees.archivedTranscript(msg.worktreeId) ?? [];
+    const events = s.worktrees.archivingTranscript(msg.worktreeId) ?? (r?.wt ? s.runtime.ensureAgent(r.wt).agent.transcript() : s.worktrees.archivedTranscript(msg.worktreeId) ?? []);
     const event = events.find((e) => e.seq === msg.seq)?.event;
     if (event?.type !== "user-message")
       throw new UserError("that message is no longer in this chat");
@@ -31862,6 +32073,12 @@ var handlers = {
   async "reveal-path"(msg, _ctx, s) {
     s.files.revealPath(await s.opens.where(msg.path));
   },
+  async "copy-file"(msg, _ctx, s) {
+    await s.files.clip(msg.worktreeId, msg.path);
+  },
+  async "copy-file-path"(msg, _ctx, s) {
+    await s.files.clipPath(await s.opens.where(msg.path));
+  },
   async "reveal-attachment"(msg, _ctx, s) {
     const path = await s.attachments.locate(msg.worktreeId, msg.file, (file) => s.worktrees.archivedAttachment(msg.worktreeId, file));
     if (!path)
@@ -33271,7 +33488,7 @@ function startServer(opts) {
 // ../daemon/src/themes/store.ts
 import { existsSync as existsSync32, readdirSync as readdirSync8, readFileSync as readFileSync18, statSync as statSync11, writeFileSync as writeFileSync12 } from "fs";
 import { homedir as homedir13 } from "os";
-import { basename as basename10, dirname as dirname11, join as join29, resolve as resolve11 } from "path";
+import { basename as basename10, dirname as dirname12, join as join29, resolve as resolve11 } from "path";
 var home = homedir13();
 var defaultExtensionDirs = [
   join29(home, ".vscode", "extensions"),
@@ -33377,7 +33594,7 @@ function readVscodeTheme(file, depth = 0) {
     throw new ThemeImportError(`${file}: not a JSON object`);
   const t = json;
   if (typeof t.include === "string" && depth < 5) {
-    const parent = readVscodeTheme(resolve11(dirname11(file), t.include), depth + 1);
+    const parent = readVscodeTheme(resolve11(dirname12(file), t.include), depth + 1);
     return {
       ...parent,
       ...t,
@@ -33928,10 +34145,10 @@ import { join as join30 } from "path";
 
 // ../daemon/src/core/clone.ts
 import { mkdir as mkdir4, rm as rm4 } from "fs/promises";
-import { dirname as dirname12 } from "path";
+import { dirname as dirname13 } from "path";
 async function cloneTree(src, dst) {
   const started = Date.now();
-  await mkdir4(dirname12(dst), { recursive: true });
+  await mkdir4(dirname13(dst), { recursive: true });
   const attempts = [
     ["clonefile", ["-Rc", src, dst]],
     ["reflink", ["-R", "--reflink=auto", src, dst]],
@@ -33939,7 +34156,7 @@ async function cloneTree(src, dst) {
   ];
   let error = "";
   for (const [how, args] of attempts) {
-    const r = await run("cp", args, dirname12(dst));
+    const r = await run("cp", args, dirname13(dst));
     if (r.ok)
       return { ok: true, how, ms: Date.now() - started };
     error = r.err.split(`
@@ -34521,6 +34738,19 @@ function handedOrigin(origin, project) {
     ...project ? { project } : {}
   };
 }
+function pieceLanded(landed, repo, to, mark, why = {}) {
+  return {
+    type: "piece-landed",
+    worktreeId: landed.id,
+    repoName: repo.name,
+    title: landed.title,
+    ...landed.pr?.url ? { url: landed.pr.url } : {},
+    ...mark?.subjects.length ? { subjects: mark.subjects } : {},
+    ...to.repoId === landed.repoId ? { same: true } : {},
+    ...why,
+    ts: Date.now()
+  };
+}
 var PIECES_MAX = 6;
 var PLAN_MAX = 20000;
 var ATTACH_MAX = 10;
@@ -34606,6 +34836,7 @@ function parsePieces2(args) {
 }
 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_AWAY = "Handed to the person as a card; they decide, and none of it is yours unless Toyon says they kept it here. Do not wait for their answer: go on with the work you already have that does not depend on it, and finish your turn when that is done.";
 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;
@@ -34739,6 +34970,14 @@ var KIND_OF = {
   file: "file",
   element: "pick"
 };
+function wokeBy(landed, repo, to) {
+  return {
+    title: landed.title,
+    branch: landed.branch,
+    ...landed.pr?.url ? { url: landed.pr.url } : {},
+    ...to.repoId === landed.repoId ? {} : { project: repo.name }
+  };
+}
 
 class HandoffService {
   d;
@@ -34748,13 +34987,18 @@ class HandoffService {
     d.hub.on("handoffDecided", (worktreeId, id, approved) => fireAndForget(worktreeId, approved ? this.act(worktreeId, id, undefined, true) : this.decline(worktreeId, id), "handoff"));
     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("landed", (worktreeId, mark) => fireAndForget(worktreeId, this.landed(worktreeId, mark), "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);
   }
+  takesSend(w) {
+    if (!w.landed)
+      return true;
+    return (this.d.counts(w.id)?.dirty ?? 0) > 0 || isBusy(this.d.runtime.agentFor(w.id)?.status);
+  }
   otherProjects(wt) {
     return this.d.state.repos.filter((r) => r.id !== wt.repoId);
   }
@@ -34782,7 +35026,8 @@ class HandoffService {
   }
   tool(worktreeId) {
     const wt = this.d.state.worktree(worktreeId);
-    const names = wt ? this.siblings(wt).map((w) => `${w.branch}, "${w.title}"`) : [];
+    const open = wt ? this.siblings(wt).filter((w) => this.takesSend(w)) : [];
+    const names = open.map((w) => `${w.branch}, "${w.title}"`);
     const projects = wt ? this.otherProjects(wt).map((r) => r.name) : [];
     return handoffTool(names, projects);
   }
@@ -34881,7 +35126,8 @@ class HandoffService {
         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);
+        const all = this.siblings(wt, piece.project?.id);
+        const found = this.named(all.filter((w) => this.takesSend(w)), q, piece.project?.name, all.filter((w) => !this.takesSend(w)));
         if ("refused" in found)
           return refused(`Piece ${i + 1} ("${title}"): ${found.refused}`);
         piece.to = found.worktree;
@@ -34924,7 +35170,8 @@ class HandoffService {
       }
     }
     const shown = cut.length ? `${sentenceCase(cut.join("; "))}. ` : "";
-    return { text: shown + (held ? HELD : here ? SHOWN_HERE : SHOWN) };
+    const own = pieces.some((p) => p.fate === "here");
+    return { text: shown + (held ? HELD : here ? SHOWN_HERE : own ? SHOWN : SHOWN_AWAY) };
   }
   offerHere(wt, pieces) {
     if (pieces.length !== 1)
@@ -34956,12 +35203,20 @@ class HandoffService {
       return found;
     return { after: found.worktree };
   }
-  named(among, q, where = "this project") {
+  named(among, q, where = "this project", done = []) {
     const bare = q.startsWith("@") ? q.slice(1) : q;
     const list = among.map((w) => `${w.branch}, "${w.title}"`).join("; ");
+    const keys = [(w) => w.branch, (w) => w.title];
+    const found = matchBy(among, bare, keys);
+    const landed = found.length === 0 ? matchBy(done, bare, keys) : [];
+    if (landed.length > 0) {
+      const names = landed.map((w) => `"${w.title}" (${w.branch})`).join(", ");
+      return {
+        refused: `${names} landed and ${landed.length === 1 ? "holds" : "hold"} no new work, so no piece is sent there; a \`worktree\` piece starts a new one.`
+      };
+    }
     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 } };
@@ -35223,6 +35478,7 @@ ${p.section}`;
         }
       });
       this.d.prompted(target.id);
+      this.recordSender(target, wt.id);
       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 };
     }
@@ -35287,6 +35543,12 @@ ${p.section}`;
       });
     });
   }
+  recordSender(target, senderId) {
+    if (target.senders?.includes(senderId))
+      return;
+    target.senders = [...target.senders ?? [], senderId];
+    this.d.state.save();
+  }
   recordAwaits(originId, awaits) {
     if (awaits.length === 0)
       return;
@@ -35371,11 +35633,12 @@ ${handedPrompt(null, note, at, via)}`
     }
     return out;
   }
-  async landed(landedId) {
+  async landed(landedId, mark) {
     const told = new Set;
-    const origin = this.tellOrigin(landedId);
+    const origin = this.tellOrigin(landedId, mark);
     if (origin)
       told.add(origin);
+    const senders = this.tellSenders(landedId, told, mark);
     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) ?? [];
@@ -35414,17 +35677,40 @@ ${handedPrompt(null, note, at, via)}`
         }
       }
     }
-    for (const id of this.tellWaiters(landedId, madeNow))
+    for (const id of this.tellWaiters(landedId, madeNow, mark))
       told.add(id);
-    this.tellAwaiting(landedId, told);
+    const awaited = this.tellAwaiting(landedId, told, mark);
+    const woken = origin && !awaited.has(origin) && this.wakeHanded(origin, landedId) ? origin : null;
+    for (const id of senders)
+      if (id !== woken && !awaited.has(id))
+        this.wakeHanded(id, landedId, true);
+  }
+  wakeHanded(toId, landedId, sent = false) {
+    const to = this.d.state.worktree(toId);
+    const landed = this.d.state.worktree(landedId);
+    const repo = landed ? this.d.state.repo(landed.repoId) : undefined;
+    if (to?.kind !== "worktree" || !landed || !repo)
+      return false;
+    if (to.awaits?.length || !this.takesSend(to))
+      return false;
+    if (!sent && (landed.lands?.length ?? 0) > 1)
+      return false;
+    this.wake(to, this.d.runtime.ensureAgent(to).agent, {
+      ...wokeBy(landed, repo, to),
+      pieces: [],
+      ...sent ? { sent: true } : { handed: true }
+    });
+    return true;
   }
-  tellAwaiting(landedId, told) {
+  tellAwaiting(landedId, told, mark) {
     const landed = this.d.state.worktree(landedId);
     const repo = landed ? this.d.state.repo(landed.repoId) : undefined;
+    const awaited = new Set;
     let changed = false;
     for (const w of this.d.state.worktrees) {
       if (!w.awaits?.some((a) => a.id === landedId))
         continue;
+      awaited.add(w.id);
       const pieces = w.awaits.filter((a) => a.id === landedId).flatMap((a) => a.pieces ?? []);
       w.awaits = w.awaits.filter((a) => a.id !== landedId);
       if (w.awaits.length === 0)
@@ -35433,32 +35719,16 @@ ${handedPrompt(null, note, at, via)}`
       if (!landed || !repo || w.kind !== "worktree")
         continue;
       const agent = this.d.runtime.ensureAgent(w).agent;
-      if (!told.has(w.id)) {
-        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 (!w.landed) {
-        this.wake(w, agent, {
-          title: landed.title,
-          branch: landed.branch,
-          ...landed.pr?.url ? { url: landed.pr.url } : {},
-          ...w.repoId === landed.repoId ? {} : { project: repo.name },
-          pieces
-        });
-      }
+      if (!told.has(w.id))
+        agent.note(pieceLanded(landed, repo, w, mark, { awaited: true }));
+      if (this.takesSend(w))
+        this.wake(w, agent, { ...wokeBy(landed, repo, w), pieces });
     }
     if (changed) {
       this.d.state.save();
       this.d.hub.emit("worktreesChanged");
     }
+    return awaited;
   }
   wake(w, agent, woke) {
     const pending = this.wakes.get(w.id);
@@ -35470,19 +35740,14 @@ ${handedPrompt(null, note, at, via)}`
       const landed = this.wakes.get(w.id) ?? [];
       this.wakes.delete(w.id);
       const live = this.d.state.worktree(w.id);
-      if (live?.kind !== "worktree" || live.landed)
+      if (live?.kind !== "worktree" || !this.takesSend(live))
         return;
       if (agent.transcript().slice(mark).some((e) => isMessage(e.event)))
         return;
       const titles = landed.map((l) => `"${l.title}"`).join(", ");
       const pieces = new Set(landed.flatMap((l) => l.pieces));
-      agent.send(pieceWakePrompt(landed), {
-        asked: {
-          kind: "handoff",
-          why: `${titles} landed, so the agent starts the ${pieces.size === 1 ? "piece" : "pieces"} that waited`
-        },
-        keepCards: true
-      });
+      const why = landed.every((l) => l.handed || l.sent) ? `${titles} landed, so the agent takes up what it handed off` : `${titles} landed, so the agent starts the ${pieces.size === 1 ? "piece" : "pieces"} that waited`;
+      agent.send(pieceWakePrompt(landed), { asked: { kind: "handoff", why }, keepCards: true });
     }), "piece woken");
   }
   repoint(origin, made, worktree) {
@@ -35525,7 +35790,7 @@ ${handedPrompt(null, note, at, via)}`
       this.dropDependents(live, q);
     }
   }
-  tellOrigin(landedId) {
+  tellOrigin(landedId, mark) {
     const wt = this.d.state.worktree(landedId);
     if (wt?.from?.kind !== "worktree")
       return null;
@@ -35535,18 +35800,10 @@ ${handedPrompt(null, note, at, via)}`
     const repo = this.d.state.repo(wt.repoId);
     if (!repo)
       return null;
-    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()
-    });
+    this.d.runtime.ensureAgent(origin).agent.note(pieceLanded(wt, repo, origin, mark));
     return origin.id;
   }
-  tellWaiters(landedId, madeNow) {
+  tellWaiters(landedId, madeNow, mark) {
     const landed = this.d.state.worktree(landedId);
     if (!landed)
       return [];
@@ -35560,19 +35817,33 @@ ${handedPrompt(null, note, at, via)}`
       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,
-        repoName: repo.name,
-        title: landed.title,
-        ...landed.pr?.url ? { url: landed.pr.url } : {},
-        ...w.repoId === landed.repoId ? { same: true } : {},
-        again: true,
-        ts: Date.now()
-      });
+      this.d.runtime.ensureAgent(w).agent.note(pieceLanded(landed, repo, w, mark, { again: true }));
     }
     return told;
   }
+  tellSenders(landedId, told, mark) {
+    const wt = this.d.state.worktree(landedId);
+    if (!wt?.senders)
+      return [];
+    const senders = wt.senders;
+    delete wt.senders;
+    this.d.state.save();
+    const repo = this.d.state.repo(wt.repoId);
+    if (!repo)
+      return [];
+    const open = [];
+    for (const id of senders) {
+      const sender = this.d.state.worktree(id);
+      if (sender?.kind !== "worktree")
+        continue;
+      open.push(id);
+      if (told.has(id) || sender.awaits?.some((a) => a.id === landedId))
+        continue;
+      told.add(id);
+      this.d.runtime.ensureAgent(sender).agent.note(pieceLanded(wt, repo, sender, mark, { sent: true }));
+    }
+    return open;
+  }
   sweep() {
     let changed = false;
     for (const origin of this.d.state.worktrees) {
@@ -35859,7 +36130,8 @@ ${verdict.body}` : verdict.subject;
       this.d.runs.drop(worktreeId, "check");
       const run = this.d.runs.begin(worktreeId, "check", {
         timeoutMs: ceiling,
-        slot: { key: repo.path, max: CHECK_SLOTS }
+        slot: { key: repo.path, max: CHECK_SLOTS },
+        memory: true
       });
       if (!await run.admitted)
         return;
@@ -35939,7 +36211,7 @@ ${verdict.body}` : verdict.subject;
     this.judging.delete(worktreeId);
     if (verdict)
       this.recapTurn(worktreeId, verdict);
-    log.info(worktreeId, `landing: check ${check}${landing.why ? ", doubted" : ""}${opts.ask ? "" : ", check only"}, ${Date.now() - started}ms${waited > 100 ? ` (waited ${waited}ms for a check slot)` : ""}`);
+    log.info(worktreeId, `landing: check ${check}${landing.why ? ", doubted" : ""}${opts.ask ? "" : ", check only"}, ${Date.now() - started}ms${waited > 100 ? ` (waited ${waited}ms to start)` : ""}`);
     this.d.worktrees.setLanding(worktreeId, landing);
     if (command && check === "fail" && ran && typeof ran.exit === "number" && !opts.quiet)
       this.d.hub.emit("checkFailed", worktreeId, { toolId: ran.toolId, command, text: ran.text });
@@ -36145,7 +36417,7 @@ function clip2(text) {
 
 // ../daemon/src/worktrees/outside.ts
 import { stat as stat6 } from "fs/promises";
-import { basename as basename12, dirname as dirname13, resolve as resolve12 } from "path";
+import { basename as basename12, dirname as dirname14, resolve as resolve12 } from "path";
 
 // ../daemon/src/worktrees/discover.ts
 import { createHash as createHash6 } from "crypto";
@@ -36318,7 +36590,7 @@ class OutsideSend {
     const gitDir = common.ok && common.out ? canonical(common.out) : null;
     if (!gitDir || basename12(gitDir) !== ".git")
       throw new UserError(`${raw} keeps its repository apart from its checkout`);
-    return { path, top, mainPath: dirname13(gitDir) };
+    return { path, top, mainPath: dirname14(gitDir) };
   }
   async start(repoId, text, context, carry) {
     const repo = this.d.state.requireRepo(repoId);
@@ -36843,7 +37115,7 @@ function rankRefs({ refs, merged, prs, query, defaultBranch, rowIdForPath }) {
 // ../daemon/src/worktrees/service.ts
 import { cpSync, existsSync as existsSync38, readFileSync as readFileSync22, rmSync as rmSync9 } from "fs";
 import { rm as rm6 } from "fs/promises";
-import { dirname as dirname15, join as join36 } from "path";
+import { dirname as dirname16, join as join36 } from "path";
 
 // ../daemon/src/git/archive.ts
 import { rmSync as rmSync6 } from "fs";
@@ -37091,7 +37363,7 @@ async function dropTurnRefs(repoPath, worktreeId) {
 
 // ../daemon/src/worktrees/archive.ts
 import { existsSync as existsSync35, mkdirSync as mkdirSync9, readdirSync as readdirSync9, readFileSync as readFileSync21, renameSync as renameSync7, rmSync as rmSync8, writeFileSync as writeFileSync13 } from "fs";
-import { basename as basename13, dirname as dirname14, join as join33 } from "path";
+import { basename as basename13, dirname as dirname15, join as join33 } from "path";
 class WorktreeArchive {
   dir;
   records = new Map;
@@ -37235,7 +37507,7 @@ function firstPrompt(transcript) {
 function move(from, to) {
   if (!existsSync35(from))
     return;
-  mkdirSync9(dirname14(to), { recursive: true });
+  mkdirSync9(dirname15(to), { recursive: true });
   rmSync8(to, { recursive: true, force: true });
   renameSync7(from, to);
 }
@@ -37886,9 +38158,11 @@ class Ship {
     if (f)
       this.setLanded(wt, landedNow(wt, f));
   }
-  async settleLanded(wt) {
+  async settleLanded(wt, noted) {
     const repo = this.d.state.repo(wt.repoId);
     const f = wt.kind === "main" || !repo ? null : await this.landedFacts(wt);
+    if (noted)
+      wt.lands = [...wt.lands ?? [], noted];
     delete wt.landing;
     let held;
     if (f && repo) {
@@ -37987,7 +38261,11 @@ ${wt.landing.body}` : s;
         const where = cwd === wt.path ? "git" : `git -C ${cwd}`;
         const commit = args[0] === "commit";
         const ceiling = commit ? timeoutFor(repo.config, "commit") : STEP_TIMEOUT_MS;
-        const handle = commit ? this.d.runs.begin(wt.id, "commit", { timeoutMs: ceiling }) : null;
+        const handle = commit ? this.d.runs.begin(wt.id, "commit", { timeoutMs: ceiling, memory: true }) : null;
+        if (handle && !await handle.admitted) {
+          const err = "a newer commit took its place";
+          return { ok: false, out: "", err, exit: err, text: "" };
+        }
         const run = (onText, signal) => stepRun(cwd, args, onText, signal, {
           timeoutMs: ceiling,
           ...handle ? { onSpawn: handle.spawned } : {},
@@ -38087,7 +38365,7 @@ ${wt.landing.body}` : s;
         ts: Date.now()
       });
     }
-    this.d.hub.emit("landed", wt.id);
+    this.d.hub.emit("landed", wt.id, o.mark);
   }
   async followBranch(wt, current) {
     if (wt.kind === "main")
@@ -38322,13 +38600,13 @@ ${wt.landing.body}` : s;
     return { result: { ok: true, message: `${did}; ${here}` }, landed: true, ...settled };
   }
   async settle(wt, repo, mark, opts = {}) {
-    const noted = await this.noteLand(repo, wt, mark, opts);
+    const noted = await this.landMark(repo, wt, mark, opts);
     if (!opts.stay)
       await this.restartFromMain(wt, baseOf(repo));
     this.d.tree.invalidateAll();
-    return { mark: noted, held: await this.settleLanded(wt) };
+    return { mark: noted, held: await this.settleLanded(wt, noted) };
   }
-  async noteLand(repo, wt, mark, opts = {}) {
+  async landMark(repo, wt, mark, opts = {}) {
     if (!mark)
       return;
     const n = wt.lands?.length ?? 0;
@@ -38337,15 +38615,12 @@ ${wt.landing.body}` : s;
       log.warn(wt.id, `could not keep the commits it landed: ${pinned.err}`);
       return;
     }
-    const noted = {
+    return {
       ...mark,
       at: Date.now(),
       ...opts.pr ? { pr: opts.pr.number } : {},
       subjects: await this.landedWhat(repo, wt, mark, opts)
     };
-    wt.lands = [...wt.lands ?? [], noted];
-    this.d.state.save();
-    return noted;
   }
   async landedWhat(repo, wt, mark, opts) {
     if (opts.pr?.title)
@@ -40269,6 +40544,11 @@ class WorktreeService {
   archivingNow(worktreeId) {
     return this.archiving.get(worktreeId);
   }
+  archivingTranscript(worktreeId) {
+    if (!this.archiving.has(worktreeId))
+      return null;
+    return this.d.runtime.transcriptOf(worktreeId) ?? new Transcript(this.chatFiles(worktreeId).transcript, worktreeId).entries;
+  }
   async discardWorktree(worktreeId) {
     const wt = this.d.state.worktree(worktreeId);
     if (!wt || !(canArchive(wt) || wt.kind === "spare"))
@@ -40305,6 +40585,8 @@ class WorktreeService {
         rmSync9(this.plansScratch(wt.id), { recursive: true, force: true });
         throw e;
       }
+      if (this.d.watches)
+        fireAndForget(worktreeId, this.d.watches.drop(wt.path), "watchman watch drop");
       if (hasOwnBranch(wt)) {
         const r = await git(repo.path, "branch", "-D", wt.branch);
         if (!r.ok)
@@ -40386,7 +40668,7 @@ class WorktreeService {
       throw new Error(`git worktree remove --force ${wt.path} failed (${r.exit}): ${r.err}`);
     if (await deleteTree(wt.path))
       return;
-    await run("chmod", ["-R", "u+w", wt.path], dirname15(wt.path));
+    await run("chmod", ["-R", "u+w", wt.path], dirname16(wt.path));
     if (!await deleteTree(wt.path))
       log.warn(wt.id, `its directory could not be deleted and stays at ${wt.path}`);
   }
@@ -40574,6 +40856,9 @@ class WorktreeService {
     return this.d.state.repo(rec.worktree.repoId) ?? this.d.state.repos.find((r) => r.path === rec.repoPath);
   }
   async restore(archiveId, createdBy, message) {
+    const going = this.archivingNow(archiveId);
+    if (going)
+      await going.catch(() => {});
     const running = this.restoring.get(archiveId);
     const live = running ? await running : this.d.state.worktree(archiveId);
     if (live) {
@@ -40603,7 +40888,7 @@ class WorktreeService {
       throw new UserError(`${old.title} was archived without its commits, so there is nothing to restore`);
     if (rec.auto)
       log.info(old.id, `restoring a worktree that archived itself (${rec.auto})`);
-    const path = existsSync38(old.path) ? join36(dirname15(old.path), freeSlot(dirname15(old.path)).dir) : old.path;
+    const path = existsSync38(old.path) ? join36(dirname16(old.path), freeSlot(dirname16(old.path)).dir) : old.path;
     const wt = {
       ...old,
       repoId: repo.id,
@@ -41184,9 +41469,13 @@ class WorktreeService {
     const path = transcriptPathFor(this.d.paths.transcriptsDir, worktreeId);
     return existsSync38(path) ? path : undefined;
   }
-  transcriptPath(id) {
+  chatFile(id) {
     const path = this.d.state.worktree(id) ? this.writtenTranscript(id) : this.archive.chatFiles(id)?.transcript;
-    if (!path || !existsSync38(path))
+    return path && existsSync38(path) ? path : undefined;
+  }
+  transcriptPath(id) {
+    const path = this.chatFile(id);
+    if (!path)
       throw new UserError("nothing has been written to this chat yet");
     return path;
   }
@@ -41330,6 +41619,100 @@ class WorktreeService {
   }
 }
 
+// ../daemon/src/worktrees/stop.ts
+var REASON_MAX = 300;
+var SHAPE = "stop takes { worktree: string, reason: string }.";
+var refused4 = (text) => ({ text, isError: true });
+
+class StopTool {
+  d;
+  constructor(d) {
+    this.d = d;
+  }
+  tool(worktreeId) {
+    const wt = this.d.state.worktree(worktreeId);
+    const made = wt ? this.made(wt) : [];
+    const running = made.filter((w) => this.running(w));
+    const now = made.length === 0 ? "Right now no open worktree was made from a piece of this chat's work." : running.length === 0 ? "Right now none of the worktrees made from this chat's pieces is running a turn." : `Right now you can stop: ${running.map((w) => this.named(wt, w)).join("; ")}.`;
+    return {
+      name: STOP_TOOL,
+      description: `Stop the turn a worktree made from a piece you handed off is running, when its work should not go on: the person said to drop or pause it, or what it builds on changed. It is the stop the person presses and nothing more: the worktree, its files and its chat stay, that chat says this one stopped it and why, and the person can send it on from there. It does not archive or remove the worktree, which is the person's to do in Toyon, and it reaches only worktrees made from this chat's pieces, never one a piece was sent into. ${now}`,
+      inputSchema: {
+        type: "object",
+        properties: {
+          worktree: { type: "string", description: "The worktree to stop, by its branch or its title." },
+          reason: {
+            type: "string",
+            description: `Why, in a sentence of at most ${REASON_MAX} characters: the person reads it on that chat's stopped row.`
+          }
+        },
+        required: ["worktree", "reason"],
+        additionalProperties: false
+      }
+    };
+  }
+  call(worktreeId, args) {
+    const a = args && typeof args === "object" && !Array.isArray(args) ? args : null;
+    if (!a || typeof a.worktree !== "string" || typeof a.reason !== "string")
+      return refused4(SHAPE);
+    const wt = this.d.state.worktree(worktreeId);
+    if (!wt)
+      return refused4("unknown worktree");
+    const reason = a.reason.trim();
+    if (!reason)
+      return refused4("Say why in `reason`: the person reads it on that chat's stopped row.");
+    if (reason.length > REASON_MAX) {
+      return refused4(`The reason is over ${REASON_MAX} characters; say it in a sentence.`);
+    }
+    const q = a.worktree.trim();
+    const bare = q.startsWith("@") ? q.slice(1) : q;
+    if (!bare)
+      return refused4("Name the worktree to stop, by its branch or its title.");
+    const made = this.made(wt);
+    const keys = [(w) => w.branch, (w) => w.title];
+    const found = matchBy(made, bare, keys);
+    if (found.length > 1) {
+      return refused4(`"${q}" names more than one worktree: ${found.map((w) => w.branch).join(", ")}. Say which by its branch.`);
+    }
+    const target = found[0];
+    if (!target) {
+      if (bare === "this" || matchBy([wt], bare, keys).length > 0) {
+        return refused4("That is this worktree; end your own turn by finishing it.");
+      }
+      const other = matchBy(this.d.state.worktrees.filter((w) => w.id !== wt.id && w.kind === "worktree" && !made.includes(w)), bare, keys)[0];
+      if (other) {
+        return refused4(`"${other.title}" (${other.branch}) was not made from a piece of this chat's work, so it is the person's to stop. Tell them, and name it.`);
+      }
+      return refused4(made.length === 0 ? "No open worktree was made from a piece of this chat's work, so there is nothing here to stop." : `No worktree made from this chat's pieces is called "${q}". Those open: ${made.map((w) => this.named(wt, w)).join("; ")}.`);
+    }
+    const name = `"${target.title}" (${target.branch})`;
+    const agent = this.d.agentFor(target.id);
+    if (!agent || !this.running(target))
+      return refused4(`${name} is not running a turn; there is nothing to stop.`);
+    if (agent.stopping)
+      return refused4(`${name} is stopping already.`);
+    const waiting = agent.queueLength;
+    const project = target.repoId === wt.repoId ? undefined : this.d.state.repo(wt.repoId)?.name;
+    if (!agent.stop({ origin: handedOrigin(wt, project), reason })) {
+      return refused4(`${name} is not running a turn; there is nothing to stop.`);
+    }
+    const next = waiting > 0 ? ` ${waiting === 1 ? "A message" : `${waiting} messages`} already waiting in that chat ${waiting === 1 ? "goes" : "go"} next, as after any stop.` : "";
+    return {
+      text: `${name} is stopping its turn. Its chat says this one stopped it and why; its worktree and files stay as they are, and the person can send it on or archive it in Toyon.${next}`
+    };
+  }
+  made(wt) {
+    return this.d.state.worktrees.filter((w) => w.kind === "worktree" && w.id !== wt.id && w.from?.kind === "worktree" && w.from.origin.id === wt.id);
+  }
+  running(w) {
+    return isBusy(this.d.agentFor(w.id)?.status);
+  }
+  named(wt, w) {
+    const repo = wt && w.repoId !== wt.repoId ? this.d.state.repo(w.repoId) : undefined;
+    return `${w.branch}, "${w.title}"${repo ? ` in ${repo.name}` : ""}`;
+  }
+}
+
 // ../daemon/src/worktrees/sweep.ts
 var ARCHIVE_AFTER_MS = 2 * 60 * 60000;
 var SWEEP_EVERY_MS = 10 * 60000;
@@ -41415,11 +41798,65 @@ class ArchiveSweep {
   }
 }
 
+// ../daemon/src/worktrees/watchman.ts
+import { existsSync as existsSync39 } from "fs";
+var NO_SERVER = ["--no-spawn", "--no-local"];
+var TIMEOUT_MS2 = 5000;
+
+class WatchmanWatches {
+  d;
+  bin;
+  constructor(d) {
+    this.d = d;
+  }
+  async drop(path) {
+    if (existsSync39(path))
+      return;
+    const gone = canonical(path);
+    if (!within2(gone, canonical(this.d.root)))
+      return;
+    await this.del((root) => within2(root, gone));
+  }
+  async sweep() {
+    await this.del((root) => !existsSync39(root));
+  }
+  async del(dead) {
+    const home = canonical(this.d.root);
+    let dropped = 0;
+    for (const root of await this.roots()) {
+      if (root === home || !within2(root, home) || !dead(root))
+        continue;
+      if ((await this.ask("watch-del", root))?.ok)
+        dropped++;
+    }
+    if (dropped > 0)
+      log.info("watchman", `dropped ${dropped} ${dropped === 1 ? "watch" : "watches"} whose worktree is gone`);
+  }
+  async roots() {
+    const r = await this.ask("watch-list");
+    if (!r?.ok)
+      return [];
+    try {
+      const roots = JSON.parse(r.out).roots;
+      return Array.isArray(roots) ? roots.filter((p) => typeof p === "string") : [];
+    } catch {
+      return [];
+    }
+  }
+  async ask(...command) {
+    if (this.bin === undefined)
+      this.bin = (this.d.which ?? Bun.which)("watchman");
+    if (!this.bin)
+      return null;
+    return (this.d.run ?? run)(this.bin, [...NO_SERVER, ...command], this.d.root, undefined, { timeoutMs: TIMEOUT_MS2 });
+  }
+}
+
 // ../daemon/src/index.ts
 process.on("unhandledRejection", (e) => log.error("daemon", "unhandled rejection", e));
 process.on("uncaughtException", (e) => log.error("daemon", "uncaught exception", e));
 log.info("daemon", `toyon ${package_default.version} on bun ${Bun.version}, pid ${process.pid}, ${process.argv[1]}`);
-var here = dirname16(fileURLToPath(import.meta.url));
+var here = dirname17(fileURLToPath(import.meta.url));
 var {
   shellDist: SHELL_DIST,
   bridgeJs: BRIDGE_JS,
@@ -41513,6 +41950,7 @@ var runtime = new RuntimeRegistry({
   pageErrors: (id) => pageErrors.ambient(id),
   turnStarting: (id) => worktrees.turnStarted(id),
   archived: (repoId) => worktrees.archived(repoId),
+  chatFile: (id) => worktrees.chatFile(id),
   standing: (id) => worktrees.standing(id),
   tier: (id) => worktrees.tierStanding(id),
   remote: () => setting.get(),
@@ -41528,9 +41966,14 @@ var drafts = new DraftStore({
   hub,
   uploads
 });
-var runs = new RunService({ state, hub });
+var runs = new RunService({
+  state,
+  hub,
+  memory: { short: () => idle.short(), eased: () => idle.eased() }
+});
 var exec = new ExecService({ state, runtime, shipping: (id) => worktrees.shippingOf(id) });
 var cache = new ArtifactCache({ paths, state, hub });
+var watches = new WatchmanWatches({ root: paths.worktreesDir });
 var fix = new FixService({ state, hub, runtime });
 var interest = new Interest;
 var worktrees = new WorktreeService({
@@ -41547,7 +41990,8 @@ var worktrees = new WorktreeService({
   pageErrors: (id) => pageErrors.ambient(id),
   interested: (id) => interest.isSubscribed(id),
   shown: (id) => idle.isShown(id),
-  message: (wt) => landing.message(wt.id)
+  message: (wt) => landing.message(wt.id),
+  watches
 });
 interest.onFirst((id) => worktrees.tree.watch(id));
 interest.onLast((id) => worktrees.tree.unwatch(id));
@@ -41571,6 +42015,7 @@ var handoff2 = new HandoffService({
 tools.add(handoff2);
 tools.add(new WorktreeLookup({ state, transcriptsDir: paths.transcriptsDir, archived: (repoId) => worktrees.archived(repoId) }));
 tools.add(new OwnTool({ state, own: (id, names) => worktrees.ownProcs(id, names, { by: "agent" }) }));
+tools.add(new StopTool({ state, agentFor: (id) => runtime.agentFor(id) }));
 var turns = new TurnService({
   state,
   hub,
@@ -41829,6 +42274,7 @@ idle.boot();
 runs.boot();
 landing.boot();
 fireAndForget("cache", cache.sweep(), "cache sweep");
+fireAndForget("watchman", watches.sweep(), "watchman sweep");
 fireAndForget("agents", agents.installMissing().then(() => readiness2.checkMissing()), "agent adapter install");
 var repoArg = process.argv[2];
 if (repoArg) {