@ordewell/cli 0.11.2 → 0.12.0

package/dist/main.js

@@ -25,7 +25,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 
 // src/main.ts
 var import_path8 = require("path");
-var import_core56 = require("@ordewell/core");
+var import_core60 = require("@ordewell/core");
 
 // src/utils/env.ts
 var import_fs = require("fs");
@@ -108,6 +108,9 @@ function moveAutonomyToSettings() {
   }
 }
 
+// src/help.ts
+var import_core3 = require("@ordewell/core");
+
 // src/runnerNames.ts
 var import_core2 = require("@ordewell/core");
 function manifests() {
@@ -156,6 +159,7 @@ Tasks (<id> is an order number or a task ID):
   ordewell remove-task <id>       Remove a task from the current plan
   ordewell complete <id>          Mark a task complete (alias: mark-complete; asks first, --yes skips the question)
   ordewell uncomplete <id>        Mark a completed task not done (asks first, --yes skips the question)
+  ordewell revert <id>            Take a landed task's work back off the integration branch (lists what goes with it, asks first, --yes skips the question)
   ordewell skip <id>              Skip a task: nothing it did lands, dependents go ahead
   ordewell force-start <id>       Approve a task and start it now, or once its dependencies finish (asks past a merge gate)
   ordewell run-task <id>          Run only one task
@@ -187,7 +191,7 @@ Planner, models and runners:
   ordewell automerge [on|off]     (headless) Merge at merge gates and at the end of a run; /settings covers it
   ordewell trailer [on|off]       (headless) End Ordewell's commits with "Planned-with: Ordewell"; set only here or in settings.json
   ordewell autorun [on|off]       (headless) Start each plan the planner submits, without review; /settings covers it
-  ordewell parallel [<n>]         (headless) How many AI tasks run at once, a live run included; /settings covers it
+${import_core3.DELEGATION_OFFERED ? "  ordewell delegation [off|<tokens>]  (headless) Whether a plan may delegate, and a tree's token budget; /settings covers it\n" : ""}  ordewell parallel [<n>]         (headless) How many AI tasks run at once, a live run included; /settings covers it
   ordewell refresh                Re-check runners; reread settings and cached models
   ordewell models                 List every provider's catalog (works without a server)
 
@@ -296,6 +300,9 @@ Environment:
   ORDEWELL_EFFECT_ALLOW      Script tasks the planner may run unasked, comma-separated rules matched
                              against each whole command, flags included: "git push origin feature/*".
                              Every command must be covered; none is by default
+  ORDEWELL_NOTIFY_COMMAND    A command to run when something new waits on you, as a JSON array:
+                             '["program", "arg"]'. No shell; the escalation is in
+                             ORDEWELL_ESCALATION_ID, _KIND, _TASK and _REASON. A workspace cannot set it
   ORDEWELL_PORT              Daemon port CLI commands target (default: 3742)
   ORDEWELL_DIRENV            false: agents skip the project's direnv .envrc
   ORDEWELL_RESEARCH_ENABLED  true (default) or false
@@ -310,7 +317,7 @@ var import_os = require("os");
 var import_path2 = require("path");
 var import_http = __toESM(require("http"));
 var import_net = require("net");
-var import_core3 = require("@ordewell/core");
+var import_core4 = require("@ordewell/core");
 
 // src/utils/args.ts
 function inlineValue(arg, name) {
@@ -374,7 +381,7 @@ function positionals(args) {
 // src/daemon.ts
 var DEFAULT_PORT = 3742;
 function configDir() {
-  return (0, import_core3.globalDataDir)();
+  return (0, import_core4.globalDataDir)();
 }
 function oldConfigDir() {
   return (0, import_path2.join)((0, import_os.homedir)(), ".config", "ordewell");
@@ -396,12 +403,12 @@ function readPidFile(file) {
   }
 }
 async function daemonInfo(port) {
-  const token = (0, import_core3.readDaemonToken)(port);
+  const token = (0, import_core4.readDaemonToken)(port);
   try {
     const res = await httpGet(
       `http://127.0.0.1:${port}/api/server`,
       2e3,
-      token ? { Authorization: (0, import_core3.bearerHeaderValue)(token) } : {}
+      token ? { Authorization: (0, import_core4.bearerHeaderValue)(token) } : {}
     );
     if (res.status !== 200) return { kind: "unverifiable" };
     const parsed = JSON.parse(res.data);
@@ -443,12 +450,12 @@ function getWebServerPath() {
   );
 }
 async function isDaemonRunning(port = DEFAULT_PORT) {
-  const token = (0, import_core3.readDaemonToken)(port);
+  const token = (0, import_core4.readDaemonToken)(port);
   try {
     const res = await httpGet(
       `http://127.0.0.1:${port}/api/workspaces`,
       2e3,
-      token ? { Authorization: (0, import_core3.bearerHeaderValue)(token) } : {}
+      token ? { Authorization: (0, import_core4.bearerHeaderValue)(token) } : {}
     );
     return res.status === 200 || res.status === 401;
   } catch {
@@ -514,7 +521,7 @@ async function stopDaemon(port = DEFAULT_PORT) {
       (0, import_fs2.unlinkSync)(pidFile);
     } catch {
     }
-    (0, import_core3.clearDaemonToken)(port);
+    (0, import_core4.clearDaemonToken)(port);
     console.error(`Removed an unreadable PID file for port ${port}. Is the server running?`);
     return false;
   }
@@ -530,7 +537,7 @@ async function stopDaemon(port = DEFAULT_PORT) {
       (0, import_fs2.unlinkSync)(pidFile);
     } catch {
     }
-    (0, import_core3.clearDaemonToken)(port);
+    (0, import_core4.clearDaemonToken)(port);
     console.log("Server was not running (stale PID removed).");
     return true;
   }
@@ -597,7 +604,7 @@ function resolvePort(args = []) {
 // src/apiClient.ts
 var import_http2 = __toESM(require("http"));
 var import_ws = __toESM(require("ws"));
-var import_core4 = require("@ordewell/core");
+var import_core5 = require("@ordewell/core");
 var DEFAULT_HTTP_TIMEOUT_MS = 15 * 60 * 1e3;
 var daemonAgent = new import_http2.default.Agent({ keepAlive: true, timeout: 0 });
 var DaemonError = class extends Error {
@@ -675,7 +682,7 @@ var ApiClient = class _ApiClient {
    * A missing file is not an error here — the daemon's own 401 names the path.
    */
   token() {
-    return (0, import_core4.readDaemonToken)(this.port);
+    return (0, import_core5.readDaemonToken)(this.port);
   }
   /**
    * A daemon holds only the sessions adopted since it started, so after a
@@ -727,7 +734,7 @@ var ApiClient = class _ApiClient {
         agent: daemonAgent,
         headers: {
           ...body ? { "Content-Type": "application/json" } : {},
-          ...token ? { Authorization: (0, import_core4.bearerHeaderValue)(token) } : {}
+          ...token ? { Authorization: (0, import_core5.bearerHeaderValue)(token) } : {}
         },
         ...idleBoundMs !== void 0 ? { timeout: idleBoundMs } : {}
       };
@@ -754,7 +761,7 @@ var ApiClient = class _ApiClient {
       req.end();
     });
   }
-  async generatePlan(goal, runners2, workspace, sessionId = (0, import_core4.mintSessionId)()) {
+  async generatePlan(goal, runners2, workspace, sessionId = (0, import_core5.mintSessionId)()) {
     const route = `/api/plans/${sessionId}/generate`;
     const { plan, models, modelsByRunner, notes } = planOf(await this.turn("POST", route, "Plan generation failed", {
       goal,
@@ -820,6 +827,15 @@ var ApiClient = class _ApiClient {
   execute(sessionId, command) {
     return this.call("POST", `/api/plans/${sessionId}/execute-command`, "Command failed", command);
   }
+  /** What waits on a person now (ADR-0053). */
+  async escalations(sessionId) {
+    const res = await this.call("GET", `/api/plans/${sessionId}/escalations`, "Could not read what waits on you");
+    return res.escalations;
+  }
+  /** Answer an escalation by its id; a stale one is a {@link DaemonError} saying so. `confirmed` is the user's yes to the option's `confirm`. */
+  answerEscalation(sessionId, answer) {
+    return this.call("POST", `/api/plans/${sessionId}/escalations/answer`, "Could not answer", answer);
+  }
   /** Keep what waits on the planner's usage limit from being sent at the reset; `cancelled` is false when nothing waited. */
   cancelPlannerResend(sessionId) {
     return this.call("POST", `/api/plans/${sessionId}/converse/resend/cancel`, "Cancel resend failed");
@@ -902,6 +918,10 @@ var ApiClient = class _ApiClient {
     const res = await this.call("GET", `/api/plans/${sessionId}/tasks/${encodeURIComponent(taskId)}/merge-gate`, "Could not read the merge gate");
     return res.mergeGate ?? [];
   }
+  /** What reverting a task would do now (ADR-0054), which the user confirms before `execute` sends `revert_task`. */
+  revertPreview(sessionId, taskId) {
+    return this.call("GET", `/api/plans/${sessionId}/tasks/${encodeURIComponent(taskId)}/revert-preview`, "Could not read what the revert would take");
+  }
   async reviewRunDiff(sessionId) {
     const res = await this.call("GET", `/api/plans/${sessionId}/isolation/diff`, "Could not read the diff");
     return res.diff;
@@ -980,7 +1000,7 @@ var ApiClient = class _ApiClient {
     const token = this.token();
     const socket = new import_ws.default(
       `ws://127.0.0.1:${this.port}/ws/session/${sessionId}`,
-      token ? (0, import_core4.tokenSubprotocols)(token) : void 0
+      token ? (0, import_core5.tokenSubprotocols)(token) : void 0
     );
     socket.on("unexpected-response", (_req, res) => {
       const chunks = [];
@@ -1160,26 +1180,26 @@ var ApiClient = class _ApiClient {
 var import_readline2 = require("readline");
 
 // src/utils/tasks.ts
-var import_core5 = require("@ordewell/core");
+var import_core6 = require("@ordewell/core");
 function allTasksOf(plan) {
   const tasks = plan?.pendingTasks || plan?.tasks || [];
   const executionLog = plan?.executionLog || [];
-  return (0, import_core5.rejoinPlanTree)(tasks, executionLog);
+  return (0, import_core6.rejoinPlanTree)(tasks, executionLog);
 }
 function resolveTaskId(plan, identifier) {
-  return (0, import_core5.resolveUserTaskRef)(allTasksOf(plan), identifier)?.id;
+  return (0, import_core6.resolveUserTaskRef)(allTasksOf(plan), identifier)?.id;
 }
 
 // src/utils/session.ts
 var import_fs3 = require("fs");
 var import_path3 = require("path");
-var import_core6 = require("@ordewell/core");
+var import_core7 = require("@ordewell/core");
 var LAST_SESSION_FILENAME = "last-session.json";
 function lastSessionFile(workspace) {
-  return (0, import_path3.join)((0, import_core6.getStateDir)(workspace), LAST_SESSION_FILENAME);
+  return (0, import_path3.join)((0, import_core7.getStateDir)(workspace), LAST_SESSION_FILENAME);
 }
 function saveLastSession(sessionId, goal, runners2, workspace) {
-  const dir = (0, import_core6.getStateDir)(workspace);
+  const dir = (0, import_core7.getStateDir)(workspace);
   if (!(0, import_fs3.existsSync)(dir)) (0, import_fs3.mkdirSync)(dir, { recursive: true });
   (0, import_fs3.writeFileSync)(
     lastSessionFile(workspace),
@@ -1201,14 +1221,14 @@ function expandSessionId(id, workspace) {
   if (id.startsWith(SESSION_PREFIX)) return id;
   let files;
   try {
-    files = (0, import_fs3.readdirSync)((0, import_path3.join)((0, import_core6.getStateDir)(workspace), "sessions")).filter((f) => f.endsWith(".json"));
+    files = (0, import_fs3.readdirSync)((0, import_path3.join)((0, import_core7.getStateDir)(workspace), "sessions")).filter((f) => f.endsWith(".json"));
   } catch {
     return id;
   }
   const matches = /* @__PURE__ */ new Set();
   for (const file of files) {
     try {
-      const full = JSON.parse((0, import_fs3.readFileSync)((0, import_path3.join)((0, import_core6.getStateDir)(workspace), "sessions", file), "utf8"))?.meta?.id;
+      const full = JSON.parse((0, import_fs3.readFileSync)((0, import_path3.join)((0, import_core7.getStateDir)(workspace), "sessions", file), "utf8"))?.meta?.id;
       if (typeof full === "string" && (full.endsWith(id) || full.slice(SESSION_PREFIX.length).startsWith(id))) matches.add(full);
     } catch {
     }
@@ -1283,7 +1303,7 @@ ${describeApproval(event)}
 }
 
 // src/commands/researchLog.ts
-var import_core7 = require("@ordewell/core");
+var import_core8 = require("@ordewell/core");
 var OUTCOME_MARK = {
   success: "\u2713",
   failure: "\u2717",
@@ -1295,7 +1315,7 @@ var RESULT_CHARS = 160;
 var VERBOSE_RESULT_CHARS = 600;
 var THINKING_CHARS = 300;
 function summarize(tool, args, toolLabel) {
-  const { name, keyArg } = (0, import_core7.toolHeadline)(tool, args, toolLabel);
+  const { name, keyArg } = (0, import_core8.toolHeadline)(tool, args, toolLabel);
   return `${name}(${keyArg})`;
 }
 function oneLine(text, max) {
@@ -1311,9 +1331,9 @@ function formatStepLine(event, options = {}) {
     const step2 = event.step;
     if (!step2) return null;
     const mark = OUTCOME_MARK[step2.outcome] ?? "\u2713";
-    const sealed = step2.tool === "bash" && (0, import_core7.ranSealed)(step2.result ?? "");
+    const sealed = step2.tool === "bash" && (0, import_core8.ranSealed)(step2.result ?? "");
     const summary = `${summarize(step2.tool, step2.args, step2.toolLabel)}${sealed ? " [sealed]" : ""}`;
-    const result = oneLine((0, import_core7.withoutSealedMark)(step2.result ?? ""), options.verbose ? VERBOSE_RESULT_CHARS : RESULT_CHARS);
+    const result = oneLine((0, import_core8.withoutSealedMark)(step2.result ?? ""), options.verbose ? VERBOSE_RESULT_CHARS : RESULT_CHARS);
     const indent = event.subagentId ? "  \u21B3 " : "";
     return result ? `${indent}${mark} ${summary} \u2192 ${result}` : `${indent}${mark} ${summary}`;
   }
@@ -1347,7 +1367,7 @@ function createStepLog(options = {}) {
 }
 
 // src/commands/plan.ts
-var import_core9 = require("@ordewell/core");
+var import_core10 = require("@ordewell/core");
 
 // src/commands/shared.ts
 var import_readline = require("readline");
@@ -1398,7 +1418,7 @@ function normalizeCatalog(result) {
 }
 
 // src/commands/shared.ts
-var import_core8 = require("@ordewell/core");
+var import_core9 = require("@ordewell/core");
 async function connect(subArgs, injected) {
   return injected ?? new ApiClient(await ensureDaemon(resolvePort(subArgs)));
 }
@@ -1416,7 +1436,7 @@ function headlessSignedOut(message) {
   );
 }
 function headlessPlannerRefusal(err) {
-  return err instanceof DaemonError && err.plannerNotReady ? (0, import_core8.describePlannerNotReady)(err.plannerNotReady, import_core8.HEADLESS_CLI_COMMANDS) : null;
+  return err instanceof DaemonError && err.plannerNotReady ? (0, import_core9.describePlannerNotReady)(err.plannerNotReady, import_core9.HEADLESS_CLI_COMMANDS) : null;
 }
 function lostReplyHint(err, sessionId) {
   if (deliveryOf(err) !== "unknown") return null;
@@ -1564,16 +1584,16 @@ Plan: ${tasks.length} task${tasks.length === 1 ? "" : "s"} (${aiCount} AI${scrip
   for (const t of tasks) {
     const typeIcon = t.type === "user" ? "[MAN]" : t.type === "script" ? "[SCR]" : t.ops ? "[OPS]" : t.research ? "[RES]" : "[ AI]";
     const deps = t.dependencies?.length ? ` \u2190 ${t.dependencies.join(", ")}` : "";
-    console.log(`  ${(0, import_core9.taskOrderLabel)(t).padStart(2)}. ${typeIcon} ${t.title}${modelSuffix(t)}${deps}`);
+    console.log(`  ${(0, import_core10.taskOrderLabel)(t).padStart(2)}. ${typeIcon} ${t.title}${modelSuffix(t)}${deps}`);
     if (t.type === "script") {
-      for (const line of (0, import_core9.scriptTaskText)({ ...t, type: "script" }).split("\n")) console.log(line ? `        ${line.replace(/\t/g, "    ")}` : "");
+      for (const line of (0, import_core10.scriptTaskText)({ ...t, type: "script" }).split("\n")) console.log(line ? `        ${line.replace(/\t/g, "    ")}` : "");
     }
-    const loop = (0, import_core9.taskRowView)({ id: t.id, order: t.order, status: t.status ?? "pending", type: t.type === "user" || t.type === "script" ? t.type : "ai", dependencies: t.dependencies ?? [], loop: t.loop, loopRound: t.loopRound }, { tasks }).loop;
-    if (loop) console.log(`        \u21BB ${(0, import_core9.loopRowParts)(loop).join(" \xB7 ")}`);
+    const loop = (0, import_core10.taskRowView)({ id: t.id, order: t.order, status: t.status ?? "pending", type: t.type === "user" || t.type === "script" ? t.type : "ai", dependencies: t.dependencies ?? [], loop: t.loop, loopRound: t.loopRound }, { tasks }).loop;
+    if (loop) console.log(`        \u21BB ${(0, import_core10.loopRowParts)(loop).join(" \xB7 ")}`);
     for (const sub of t.subtasks || []) {
       const subTypeIcon = sub.type === "user" ? "[MAN]" : "[ AI]";
       const subDeps = sub.dependencies?.length ? ` \u2190 ${sub.dependencies.join(", ")}` : "";
-      console.log(`    ${(0, import_core9.taskOrderLabel)(sub, t)}. ${subTypeIcon} ${sub.title}${modelSuffix(sub)}${subDeps}`);
+      console.log(`    ${(0, import_core10.taskOrderLabel)(sub, t)}. ${subTypeIcon} ${sub.title}${modelSuffix(sub)}${subDeps}`);
     }
   }
   if (manCount > 0) {
@@ -1637,7 +1657,7 @@ async function handlePlan(subArgs, deps = {}) {
     runners2 = runnerFlags;
   }
   console.error(`Generating plan for: "${goal}"...`);
-  const sessionId = (0, import_core9.mintSessionId)();
+  const sessionId = (0, import_core10.mintSessionId)();
   const isTty = !!process.stderr.isTTY;
   let lastLineLength = 0;
   const stepLog = createStepLog({ verbose });
@@ -1750,9 +1770,9 @@ ${note}`);
 }
 
 // src/utils/output.ts
-var import_core10 = require("@ordewell/core");
+var import_core11 = require("@ordewell/core");
 function iconFor(status) {
-  switch ((0, import_core10.taskStatusKind)({ status })) {
+  switch ((0, import_core11.taskStatusKind)({ status })) {
     case "done":
       return "\x1B[32m\u2713\x1B[0m";
     case "running":
@@ -1772,12 +1792,12 @@ function iconFor(status) {
 }
 
 // src/commands/run.ts
-var import_core12 = require("@ordewell/core");
+var import_core13 = require("@ordewell/core");
 
 // src/commands/taskHandoff.ts
-var import_core11 = require("@ordewell/core");
+var import_core12 = require("@ordewell/core");
 function taskHandoffLines(handoff, indent) {
-  const preview = (0, import_core11.handoffPreviewLines)(handoff);
+  const preview = (0, import_core12.handoffPreviewLines)(handoff);
   const [first = "", ...body] = preview;
   if (!handoff.summary.trim() || handoff.commit) return [`${indent}\u21B3 Handoff`, ...preview.map((line) => `${indent}${line}`)];
   return [`${indent}\u21B3 Handoff: ${first}`, ...body.map((line) => `${indent}${line}`)];
@@ -1790,12 +1810,12 @@ function loopNote(task, all) {
   if (task.loop) {
     const check2 = { id: task.id, status: task.status, loop: task.loop, loopRound: task.loopRound, ...task.verdict ? { verdict: task.verdict } : {} };
     const halted = task.loop.body.some((id) => ["failed", "skipped"].includes(all.find((t) => t.id === id)?.status ?? ""));
-    const state = (0, import_core12.loopCheckState)(check2, !halted);
-    return { text: (0, import_core12.loopCheckLabel)(check2, state), repeating: state === "repeating" };
+    const state = (0, import_core13.loopCheckState)(check2, !halted && !task.loopStranded);
+    return { text: (0, import_core13.loopCheckLabel)(check2, state), repeating: state === "repeating" };
   }
   const check = all.find((t) => t.loop?.body.includes(task.id));
   if (!check?.loop) return null;
-  return { text: (0, import_core12.loopBodyLabel)(refOf(check.id), (0, import_core12.loopBodyRound)({ status: check.status, loopRound: check.loopRound }, task.status), check.loop.maxRounds), repeating: false };
+  return { text: (0, import_core13.loopBodyLabel)(refOf(check.id), (0, import_core13.loopBodyRound)({ status: check.status, loopRound: check.loopRound }, task.status), check.loop.maxRounds), repeating: false };
 }
 function resolveSessionId(subArgs) {
   const explicit = flag(subArgs, "--session-id");
@@ -1824,10 +1844,11 @@ async function followExecution(api, sessionId, start, onBlocked) {
       const loop = loopNote(t, entries);
       const icon = iconFor(loop?.repeating ? "pending" : t.status);
       const verdict = t.verdict ? `: ${t.verdict.outcome.toUpperCase()}: ${t.verdict.reason.slice(0, 60)}` : "";
-      const waits = t.waitsForApproval ? `: ${inLine(import_core12.WAITS_FOR_APPROVAL_LABEL)}: \`ordewell force-start <id>\` approves it, \`ordewell run\` approves all` : "";
+      const waits = t.waitsForApproval ? `: ${inLine(import_core13.WAITS_FOR_APPROVAL_LABEL)}: \`ordewell force-start <id>\` approves it, \`ordewell run\` approves all` : "";
       lines.push(`  ${icon} ${refOf(t.id)}${t.type === "script" ? " [SCR]" : t.research ? " [RES]" : ""} ${t.status}${verdict}${waits}${loop ? ` \xB7 \u21BB ${inLine(loop.text)}` : ""}`);
-      if (t.holdReason) lines.push(`      ${(0, import_core12.holdLabel)(t.holdReason)}`);
-      if (t.status === "skipped") lines.push(`      ${(0, import_core12.skippedLabel)(t.skipReason ?? null)}`);
+      if (t.holdReason) lines.push(`      ${(0, import_core13.holdLabel)(t.holdReason)}`);
+      if (t.isolation?.state === "conflict" && t.isolation.repairWaits) lines.push(`      ${(0, import_core13.repairWaitLabel)(t.isolation.repairWaits)}`);
+      if (t.status === "skipped") lines.push(`      ${(0, import_core13.skippedLabel)(t.skipReason ?? null)}`);
       if (t.handoff && (t.status === "completed" || t.status === "failed")) lines.push(...taskHandoffLines(t.handoff, "      "));
     }
     const output = lines.join("\n");
@@ -1853,11 +1874,11 @@ async function followExecution(api, sessionId, start, onBlocked) {
   });
   const stream = api.streamExecution(sessionId, (event) => {
     if (event.type === "task_started") {
-      process.stderr.write(`\xB7 ${(0, import_core12.taskStartedNotice)(event.title, event.runner)}
+      process.stderr.write(`\xB7 ${(0, import_core13.taskStartedNotice)(event.title, event.runner)}
 `);
     }
     if (event.type === "checkpoint") {
-      process.stderr.write(`\xB7 Checkpoint: ${event.taskTitle}: ${(0, import_core12.truncateCheckpointSummary)(event.summary)}: \`ordewell checkpoint <id> approve|reject [reason]\` answers it
+      process.stderr.write(`\xB7 Checkpoint: ${event.taskTitle}: ${(0, import_core13.truncateCheckpointSummary)(event.summary)}: \`ordewell checkpoint <id> approve|reject [reason]\` answers it
 `);
     }
     if (event.type === "status_update" && event.tasks) {
@@ -1888,10 +1909,10 @@ Done. ${summary.completed || 0} completed, ${summary.failed || 0} failed, ${summ
     }
     if (event.type === "isolation_handoff") {
       const n = event.landed.length;
-      const where = (0, import_core12.isRepoGroup)(event) ? ` in ${event.repos.map((r) => r.path).join(", ")}` : "";
+      const where = (0, import_core13.isRepoGroup)(event) ? ` in ${event.repos.map((r) => r.path).join(", ")}` : "";
       console.log(`
-Run finished on ${(0, import_core12.handoffBranchName)(event)}${where}: ${n} task${n === 1 ? "" : "s"} landed.`);
-      if ((0, import_core12.isRepoGroup)(event)) for (const line of (0, import_core12.repoResultLines)(event)) console.log(`  ${line}`);
+Run finished on ${(0, import_core13.handoffBranchName)(event)}${where}: ${n} task${n === 1 ? "" : "s"} landed.`);
+      if ((0, import_core13.isRepoGroup)(event)) for (const line of (0, import_core13.repoResultLines)(event)) console.log(`  ${line}`);
       if (event.deferredTo === "supervisor") console.log("  The supervisor may merge it.");
       console.log("  `ordewell handoff review|merge|discard|cleanup` to land it.");
     }
@@ -1925,7 +1946,7 @@ function printScriptBodies(plan) {
   for (const t of allTasksOf(plan)) {
     if (t.type !== "script" || t.status === "completed" || t.status === "skipped") continue;
     console.log(`  Script ${refOf(t.id)} "${t.title}":`);
-    for (const line of (0, import_core12.scriptTaskText)(t).split("\n")) console.log(line ? `        ${line.replace(/\t/g, "    ")}` : "");
+    for (const line of (0, import_core13.scriptTaskText)(t).split("\n")) console.log(line ? `        ${line.replace(/\t/g, "    ")}` : "");
   }
 }
 async function handleRun(subArgs, injectedApi) {
@@ -1954,7 +1975,7 @@ async function handleRun(subArgs, injectedApi) {
 }
 
 // src/tui/blocks.ts
-var import_core14 = require("@ordewell/core");
+var import_core15 = require("@ordewell/core");
 
 // ../../node_modules/ansi-regex/index.js
 function ansiRegex({ onlyFirst = false } = {}) {
@@ -2367,9 +2388,9 @@ var style = {
 };
 
 // src/tui/markdown.ts
-var import_core13 = require("@ordewell/core");
+var import_core14 = require("@ordewell/core");
 function renderMarkdown(source, cols) {
-  return blocks((0, import_core13.markdownTokens)(source), { room: Math.max(1, cols), base: [] });
+  return blocks((0, import_core14.markdownTokens)(source), { room: Math.max(1, cols), base: [] });
 }
 function closeOf(tokens, open) {
   const { level } = tokens[open];
@@ -2629,7 +2650,7 @@ function messageLines(block2, cols) {
 }
 function reportUpdateLines(block2, cols, detailAll) {
   const shown = shownText(block2.text);
-  const items = (0, import_core14.wakeUpItems)(sanitize(shown.text));
+  const items = (0, import_core15.wakeUpItems)(sanitize(shown.text));
   if (!items.some((item) => item.kind === "report")) return null;
   const rows = [style.yellow(`\u21AF Run update:`)];
   for (const item of items) {
@@ -2639,11 +2660,11 @@ function reportUpdateLines(block2, cols, detailAll) {
     }
     rows.push(...wrap(`- task ${item.task} ended, with this report:`, Math.max(1, cols - 2)).map((line) => style.yellow(`  ${line}`)));
     const room = Math.max(1, cols - 4);
-    const shownLines = detailAll ? item.lines : item.lines.slice(0, import_core14.REPORT_PREVIEW_LINES);
+    const shownLines = detailAll ? item.lines : item.lines.slice(0, import_core15.REPORT_PREVIEW_LINES);
     rows.push(...shownLines.flatMap((line) => wrap(line, room)).map((line) => `    ${line}`));
     const hidden = item.lines.length - shownLines.length;
     if (hidden > 0) rows.push(style.grey(`    \u2026 +${countOf(hidden, "line")} of the report (ctrl+o to expand)`));
-    else if (detailAll && item.lines.length > import_core14.REPORT_PREVIEW_LINES) rows.push(style.grey("    \u2026 (ctrl+o to collapse)"));
+    else if (detailAll && item.lines.length > import_core15.REPORT_PREVIEW_LINES) rows.push(style.grey("    \u2026 (ctrl+o to collapse)"));
   }
   if (shown.hiddenChars > 0) rows.push(textCutNote(shown.hiddenChars));
   return rows;
@@ -2653,7 +2674,7 @@ function onBand(rows, cols) {
   return style.enabled ? band.map((row) => style.band(pad(row, cols))) : band;
 }
 function skillPaintedLines(text, skills, room) {
-  const tokens = (0, import_core14.loadedSkillTokens)(text, skills);
+  const tokens = (0, import_core15.loadedSkillTokens)(text, skills);
   return wrapLines(text, room).map(({ line, start }) => {
     let painted = "";
     let at = 0;
@@ -2747,7 +2768,7 @@ function headLines(output, maxLines, maxChars) {
   return lines;
 }
 function shownOutput(output, maxLines, maxChars) {
-  if (output.length <= FULL_OUTPUT_MAX) return (0, import_core14.outputPreview)(output, maxLines);
+  if (output.length <= FULL_OUTPUT_MAX) return (0, import_core15.outputPreview)(output, maxLines);
   const lines = headLines(output, maxLines, maxChars);
   const total = output.length === 0 ? 0 : lineCountOf(output) + 1;
   return { lines, hiddenLineCount: Math.max(0, total - lines.length) };
@@ -2849,7 +2870,7 @@ var DIFF_PAINT = {
 var DIFF_SIGN = { added: "+", removed: "-", context: " ", gap: "" };
 function diffLines(block2, diff, room, detailAll) {
   const bounded = diffOutput(block2.output);
-  const rows = (0, import_core14.diffRows)(bounded.text);
+  const rows = (0, import_core15.diffRows)(bounded.text);
   const gutter = Math.max(0, ...rows.map((row) => String(row.line ?? "").length));
   const draw = (row) => {
     const text = row.kind === "gap" ? `${" ".repeat(gutter)} \u22EE` : `${String(row.line ?? "").padStart(gutter)} ${DIFF_SIGN[row.kind]} ${sanitize(row.text)}`;
@@ -2861,7 +2882,7 @@ function diffLines(block2, diff, room, detailAll) {
     ...hidden > 0 ? [style.grey(`\u2026 +${countOf(hidden, "line")} (ctrl+o to expand)`)] : [],
     ...bounded.hiddenLineCount > 0 ? [style.grey(`\u2026 +${countOf(bounded.hiddenLineCount, "line")} not shown`)] : []
   ];
-  return [(0, import_core14.diffSummary)(diff), ...shown.flatMap(draw), ...more];
+  return [(0, import_core15.diffSummary)(diff), ...shown.flatMap(draw), ...more];
 }
 function toolLines(block2, cols, detailAll) {
   const room = Math.max(1, cols - OUTPUT_INDENT.length);
@@ -2901,7 +2922,7 @@ function subagentLines(block2, cols, detailAll) {
 function approvalLine(block2, cols) {
   const [mark, paint] = block2.status === "pending" ? ["?", style.yellow] : block2.status === "granted" ? ["\u2713", style.green] : block2.status === "withdrawn" ? ["\xB7", style.grey] : ["\u2298", style.yellow];
   const note = block2.note ? `: \u201C${firstLine(block2.note)}\u201D` : "";
-  const line = `${mark} ${(0, import_core14.approvalStatusText)(block2)} \xB7 ${(0, import_core14.approvalKindText)(block2.kind)}: ${firstLine(block2.subject)}${note}`;
+  const line = `${mark} ${(0, import_core15.approvalStatusText)(block2)} \xB7 ${(0, import_core15.approvalKindText)(block2.kind)}: ${firstLine(block2.subject)}${note}`;
   return `${paint(mark)}${truncate(line, cols).slice(mark.length)}`;
 }
 var SETTLED_BODY_LINES = 20;
@@ -2958,7 +2979,7 @@ function runnerCommandLines(block2, cols, detailAll) {
 }
 function compactionLines(block2, cols, detailAll) {
   const hint = block2.summary && !detailAll ? " (ctrl+o for the summary)" : "";
-  const head = style.grey(truncate(`\u2261 ${(0, import_core14.compactionText)(block2)}${hint}`, cols));
+  const head = style.grey(truncate(`\u2261 ${(0, import_core15.compactionText)(block2)}${hint}`, cols));
   if (!block2.summary || !detailAll) return [head];
   const room = Math.max(1, cols - OUTPUT_INDENT.length);
   return [head, ...underHeader(block2.summary.trim().split("\n").flatMap((line) => wrap(sanitize(line), room)).map(style.grey))];
@@ -2995,7 +3016,7 @@ var HANDOFF_INDENT = "  ";
 var FINDING_INDENT = "      ";
 function findingHeadLines(f, cols) {
   const id = sanitize(f.id);
-  const severity = (0, import_core14.severityLabel)(f.severity);
+  const severity = (0, import_core15.severityLabel)(f.severity);
   const label = `${id} \xB7 ${severity} \xB7 `;
   const room = Math.max(1, cols - width(HANDOFF_INDENT) - width(label));
   return wrap(sanitize(f.title), room).map((line, i) => i === 0 ? `${HANDOFF_INDENT}${style.grey(id)} \xB7 ${SEVERITY_PAINT[f.severity](severity)} \xB7 ${line}` : `${HANDOFF_INDENT}${" ".repeat(width(label))}${line}`);
@@ -3003,7 +3024,7 @@ function findingHeadLines(f, cols) {
 function findingLines(f, cols) {
   const room = Math.max(1, cols - FINDING_INDENT.length);
   const detail = f.detail ? sanitize(f.detail).replace(/\n+$/, "").split("\n").flatMap((line) => wrap(line, room)).map((line) => `${FINDING_INDENT}${line}`) : [];
-  const evidence = f.evidence?.length ? wrap(`Evidence: ${f.evidence.map((e) => sanitize((0, import_core14.handoffReferenceText)(e))).join("; ")}`, room).map((line) => `${FINDING_INDENT}${style.grey(line)}`) : [];
+  const evidence = f.evidence?.length ? wrap(`Evidence: ${f.evidence.map((e) => sanitize((0, import_core15.handoffReferenceText)(e))).join("; ")}`, room).map((line) => `${FINDING_INDENT}${style.grey(line)}`) : [];
   return [...findingHeadLines(f, cols), ...detail, ...evidence];
 }
 function handoffArtifactLines(block2, cols) {
@@ -3012,14 +3033,14 @@ function handoffArtifactLines(block2, cols) {
   const room = Math.max(1, cols - FINDING_INDENT.length - 2);
   const rows = [`${HANDOFF_INDENT}${style.grey("Artifacts:")}`];
   for (const artifact of artifacts) {
-    const [first, ...rest] = wrap(sanitize((0, import_core14.handoffReferenceText)(artifact)), room);
+    const [first, ...rest] = wrap(sanitize((0, import_core15.handoffReferenceText)(artifact)), room);
     rows.push(`${FINDING_INDENT}- ${first}`, ...rest.map((line) => `${FINDING_INDENT}  ${line}`));
   }
   return rows;
 }
 function handoffPatchLines(block2, cols) {
   const room = Math.max(1, cols - FINDING_INDENT.length);
-  return (0, import_core14.savedPatchViews)(block2.handoff).flatMap((patch) => [
+  return (0, import_core15.savedPatchViews)(block2.handoff).flatMap((patch) => [
     ...wrap(`Patch: ${patch.changes}, ${patch.base}`, Math.max(1, cols - HANDOFF_INDENT.length)).map((line, i) => `${HANDOFF_INDENT}${i === 0 ? style.grey(line) : line}`),
     ...wrap(patch.saved, room).map((line) => `${FINDING_INDENT}${style.grey(line)}`),
     ...patch.flags.flatMap((flag2) => wrap(flag2, room).map((line) => `${FINDING_INDENT}${style.grey(line)}`))
@@ -3027,7 +3048,7 @@ function handoffPatchLines(block2, cols) {
 }
 function handoffReportLines(report, cols, detailAll) {
   const all = sanitize(report).replace(/\n+$/, "").split("\n");
-  const shown = detailAll ? all : all.slice(0, import_core14.REPORT_PREVIEW_LINES);
+  const shown = detailAll ? all : all.slice(0, import_core15.REPORT_PREVIEW_LINES);
   const room = Math.max(1, cols - FINDING_INDENT.length);
   const rows = [
     `${HANDOFF_INDENT}${style.grey("Report:")}`,
@@ -3035,13 +3056,13 @@ function handoffReportLines(report, cols, detailAll) {
   ];
   const hidden = all.length - shown.length;
   if (hidden > 0) rows.push(style.grey(`${FINDING_INDENT}\u2026 +${countOf(hidden, "line")} of the report (ctrl+o to expand)`));
-  else if (detailAll && all.length > import_core14.REPORT_PREVIEW_LINES) rows.push(style.grey(`${FINDING_INDENT}\u2026 (ctrl+o to collapse)`));
+  else if (detailAll && all.length > import_core15.REPORT_PREVIEW_LINES) rows.push(style.grey(`${FINDING_INDENT}\u2026 (ctrl+o to collapse)`));
   return rows;
 }
 function handoffLines(block2, cols, detailAll) {
   const { handoff } = block2;
-  const severity = (0, import_core14.worstSeverity)(handoff.findings);
-  const summary = handoff.findingCount > 0 ? `${(0, import_core14.handoffFindingsText)(handoff.findingCount)}${severity ? ` \xB7 ${(0, import_core14.severityLabel)(severity).toLowerCase()}` : ""}` : null;
+  const severity = (0, import_core15.worstSeverity)(handoff.findings);
+  const summary = handoff.findingCount > 0 ? `${(0, import_core15.handoffFindingsText)(handoff.findingCount)}${severity ? ` \xB7 ${(0, import_core15.severityLabel)(severity).toLowerCase()}` : ""}` : null;
   const rows = [`${style.brand("\u25C6")} ${style.bold("Handoff")}${summary ? style.grey(` \xB7 ${summary}`) : ""}`];
   if (handoff.commit) {
     const room = Math.max(1, cols - HANDOFF_INDENT.length);
@@ -3062,7 +3083,7 @@ function handoffLines(block2, cols, detailAll) {
   return rows;
 }
 function planLine(block2, cols) {
-  const text = (0, import_core14.planMarkerParts)(block2).join(" \xB7 ");
+  const text = (0, import_core15.planMarkerParts)(block2).join(" \xB7 ");
   return `${style.brand("\u25C7")}${truncate(`\u25C7 ${text}`, cols).slice(1)}`;
 }
 function blockLines(block2, cols, detailAll) {
@@ -3114,9 +3135,9 @@ function conversationLines(blocks2, cols, detailAll, answering) {
 }
 function tokenLine(blocks2, cols, limits = []) {
   const usage = blocks2[blocks2.length - 1];
-  const context = usage?.type === "usage" ? (0, import_core14.contextMeterText)(usage.contextFill) : null;
-  const cost = usage?.type === "usage" ? (0, import_core14.usageText)({ totals: usage.totals }) : null;
-  const text = [context ? `Planner ${context}` : null, ...limits.map(import_core14.accountLimitsText), cost].filter(Boolean).join(" \xB7 ");
+  const context = usage?.type === "usage" ? (0, import_core15.contextMeterText)(usage.contextFill) : null;
+  const cost = usage?.type === "usage" ? (0, import_core15.usageText)({ totals: usage.totals }) : null;
+  const text = [context ? `Planner ${context}` : null, ...limits.map(import_core15.accountLimitsText), cost].filter(Boolean).join(" \xB7 ");
   return text ? style.grey(truncate(sanitize(text).replace(/\n/g, " "), cols)) : null;
 }
 function assignmentFlagText(row) {
@@ -3125,7 +3146,7 @@ function assignmentFlagText(row) {
 
 // src/commands/status.ts
 var import_fs4 = require("fs");
-var import_core15 = require("@ordewell/core");
+var import_core16 = require("@ordewell/core");
 async function handleStatus(subArgs, injectedApi) {
   const sessionId = flag(subArgs, "--session-id");
   const workspace = flag(subArgs, "--workspace") || process.cwd();
@@ -3193,42 +3214,49 @@ async function assignmentScope(api) {
 }
 function printOneSession(sessionId, meta, plan, runnerScope, run) {
   const allTasks = allTasksOf(plan);
-  const everyTask = (0, import_core15.flattenTasks)(allTasks);
-  const { blocked, repeating } = (0, import_core15.planBlocks)(everyTask.map((t) => ({ ...t, subtasks: [], dependencies: t.dependencies ?? [] })));
+  const everyTask = (0, import_core16.flattenTasks)(allTasks);
+  const { blocked, repeating } = (0, import_core16.planBlocks)(everyTask.map((t) => ({ ...t, subtasks: [], dependencies: t.dependencies ?? [] })));
   const holds = /* @__PURE__ */ new Map();
-  for (const { task } of (0, import_core15.walkPlan)(run?.tasks ?? [])) {
+  const repairs = /* @__PURE__ */ new Map();
+  const stranded = /* @__PURE__ */ new Set();
+  for (const { task } of (0, import_core16.walkPlan)(run?.tasks ?? [])) {
     if (task.holdReason) holds.set(task.id, task.holdReason);
+    if (task.loopStranded) stranded.add(task.id);
+    if (task.isolation?.state === "conflict" && task.isolation.repairWaits) repairs.set(task.id, (0, import_core16.repairWaitLabel)(task.isolation.repairWaits));
   }
-  const count = (status) => everyTask.filter((t) => t.status === status && !(status === "failed" && repeating.has(t.id)) || status === "blocked" && blocked.has(t.id)).length;
+  if (!run) for (const id of repeating) stranded.add(id);
+  const goesOn = (id) => repeating.has(id) && !stranded.has(id);
+  const count = (status) => everyTask.filter((t) => t.status === status && !(status === "failed" && goesOn(t.id)) || status === "blocked" && blocked.has(t.id)).length;
   console.log(`Session:  ${sessionId}`);
   console.log(`Goal:     ${meta.goal}`);
   console.log(`Runner:   ${(meta.runners || []).join(", ")}  |  Status: ${meta.status}`);
   console.log(`Phase:    ${plan?.phase || "unknown"}  |  Created: ${meta.createdAt}`);
-  const isolation = (0, import_core15.isolationViewOfPlan)(plan);
-  if (isolation) console.log(`Base:     ${(0, import_core15.handoffBaseLine)(isolation.handoff, 8)}`);
+  const isolation = (0, import_core16.isolationViewOfPlan)(plan);
+  if (isolation) console.log(`Base:     ${(0, import_core16.handoffBaseLine)(isolation.handoff, 8)}`);
   console.log(`Tasks:    ${everyTask.length} total  |  ${count("completed")} done  |  ${count("failed")} failed  |  ${count("in_progress")} running  |  ${count("blocked")} blocked  |  ${count("skipped")} skipped
 `);
-  const total = (0, import_core15.tasksTotalText)(allTasks);
+  const total = (0, import_core16.tasksTotalText)(allTasks);
   if (total) console.log(total);
   const record = servedApprovalRecord(plan);
   const approval = (row, ref) => row.waitsForApproval ? `${row.waitsForApproval}: \`ordewell force-start ${ref}\` approves it, \`ordewell run\` approves all` : null;
   for (const t of allTasks) {
     const model = t.assignedModel ? ` (${t.assignedModel.modelLabel})` : "";
     const shortId = (t.id ?? "").slice(-8);
-    const row = (0, import_core15.taskRowView)({ ...t, dependencies: t.dependencies ?? [], waitsForApproval: (0, import_core15.waitsForApproval)(t, record), holdReason: holds.get(t.id) }, { tasks: allTasks, runnerScope });
-    const icon = iconFor(blocked.has(t.id) ? "blocked" : repeating.has(t.id) ? "pending" : t.status);
-    console.log(`  ${(0, import_core15.taskOrderLabel)(t).padStart(2)}. ${icon} [${shortId}]${row.kind === "script" ? " [SCR]" : row.research ? " [RES]" : ""} ${t.title}${model}`);
+    const row = (0, import_core16.taskRowView)({ ...t, dependencies: t.dependencies ?? [], waitsForApproval: (0, import_core16.waitsForApproval)(t, record), holdReason: holds.get(t.id), loopStranded: stranded.has(t.id) }, { tasks: allTasks, runnerScope });
+    const icon = iconFor(blocked.has(t.id) ? "blocked" : goesOn(t.id) ? "pending" : t.status);
+    console.log(`  ${(0, import_core16.taskOrderLabel)(t).padStart(2)}. ${icon} [${shortId}]${row.kind === "script" ? " [SCR]" : row.research ? " [RES]" : ""} ${t.title}${model}`);
     if (t.type === "script") {
-      for (const line of (0, import_core15.scriptTaskText)(t).split("\n")) console.log(line ? `      ${line.replace(/\t/g, "    ")}` : "");
+      for (const line of (0, import_core16.scriptTaskText)(t).split("\n")) console.log(line ? `      ${line.replace(/\t/g, "    ")}` : "");
     }
-    const waiting = approval(row, (0, import_core15.taskOrderLabel)(t));
+    const waiting = approval(row, (0, import_core16.taskOrderLabel)(t));
     if (waiting) console.log(`      ${waiting}`);
-    if (row.holdReason) console.log(`      ${(0, import_core15.holdLabel)(row.holdReason)}`);
+    if (row.holdReason) console.log(`      ${(0, import_core16.holdLabel)(row.holdReason)}`);
+    if (repairs.has(t.id)) console.log(`      ${repairs.get(t.id)}`);
     if (row.assignmentFlag) console.log(`      \u26A0 ${assignmentFlagText(row)}`);
-    if (row.blockedBy) console.log(`      ${(0, import_core15.blockedByLabel)(row.blockedBy)}`);
-    if (row.loop) console.log(`      \u21BB ${(0, import_core15.loopRowParts)(row.loop).join(" \xB7 ")}`);
-    if (row.status === "skipped") console.log(`      ${(0, import_core15.skippedLabel)(row.skipReason)}`);
-    const usage = row.usage && (0, import_core15.usageText)(row.usage);
+    if (row.blockedBy) console.log(`      ${(0, import_core16.blockedByLabel)(row.blockedBy)}`);
+    if (row.loop) console.log(`      \u21BB ${(0, import_core16.loopRowParts)(row.loop).join(" \xB7 ")}`);
+    if (row.status === "skipped") console.log(`      ${(0, import_core16.skippedLabel)(row.skipReason)}`);
+    const usage = row.usage && (0, import_core16.usageText)(row.usage);
     if (usage) console.log(`      ${usage}`);
     if (t.handoff && (t.status === "completed" || t.status === "failed")) {
       for (const line of taskHandoffLines(t.handoff, "      ")) console.log(line);
@@ -3237,15 +3265,16 @@ function printOneSession(sessionId, meta, plan, runnerScope, run) {
       const subIcon = iconFor(blocked.has(sub.id) ? "blocked" : sub.status);
       const subModel = sub.assignedModel ? ` (${sub.assignedModel.modelLabel})` : "";
       const subShortId = (sub.id ?? "").slice(-8);
-      console.log(`    ${(0, import_core15.taskOrderLabel)(sub, t)}. ${subIcon} [${subShortId}] ${sub.title}${subModel}`);
-      const subRow = (0, import_core15.taskRowView)({ ...sub, dependencies: sub.dependencies ?? [], waitsForApproval: (0, import_core15.waitsForApproval)(sub, record), holdReason: holds.get(sub.id) }, { parent: t, tasks: allTasks, runnerScope });
-      const subWaiting = approval(subRow, (0, import_core15.taskOrderLabel)(sub, t));
+      console.log(`    ${(0, import_core16.taskOrderLabel)(sub, t)}. ${subIcon} [${subShortId}] ${sub.title}${subModel}`);
+      const subRow = (0, import_core16.taskRowView)({ ...sub, dependencies: sub.dependencies ?? [], waitsForApproval: (0, import_core16.waitsForApproval)(sub, record), holdReason: holds.get(sub.id) }, { parent: t, tasks: allTasks, runnerScope });
+      const subWaiting = approval(subRow, (0, import_core16.taskOrderLabel)(sub, t));
       if (subWaiting) console.log(`        ${subWaiting}`);
-      if (subRow.holdReason) console.log(`        ${(0, import_core15.holdLabel)(subRow.holdReason)}`);
+      if (subRow.holdReason) console.log(`        ${(0, import_core16.holdLabel)(subRow.holdReason)}`);
+      if (repairs.has(sub.id)) console.log(`        ${repairs.get(sub.id)}`);
       if (subRow.assignmentFlag) console.log(`        \u26A0 ${assignmentFlagText(subRow)}`);
-      if (subRow.blockedBy) console.log(`        ${(0, import_core15.blockedByLabel)(subRow.blockedBy)}`);
-      if (subRow.status === "skipped") console.log(`        ${(0, import_core15.skippedLabel)(subRow.skipReason)}`);
-      const subUsage = subRow.usage && (0, import_core15.usageText)(subRow.usage);
+      if (subRow.blockedBy) console.log(`        ${(0, import_core16.blockedByLabel)(subRow.blockedBy)}`);
+      if (subRow.status === "skipped") console.log(`        ${(0, import_core16.skippedLabel)(subRow.skipReason)}`);
+      const subUsage = subRow.usage && (0, import_core16.usageText)(subRow.usage);
       if (subUsage) console.log(`        ${subUsage}`);
       if (sub.handoff && (sub.status === "completed" || sub.status === "failed")) {
         for (const line of taskHandoffLines(sub.handoff, "        ")) console.log(line);
@@ -3304,28 +3333,28 @@ async function handleWeb(subArgs) {
 }
 
 // src/commands/models.ts
-var import_core18 = require("@ordewell/core");
+var import_core19 = require("@ordewell/core");
 
 // src/commands/model.ts
-var import_core17 = require("@ordewell/core");
+var import_core18 = require("@ordewell/core");
 
 // src/plannerModelSwitch.ts
-var import_core16 = require("@ordewell/core");
+var import_core17 = require("@ordewell/core");
 function plannerSwitchRecall(settings) {
   if (settings.switchRecall) return settings.switchRecall;
   const model = settings.orchestratorModel;
   return model ? { model, effort: settings.plannerThinkingEffort, source: "remembered" } : { model: "", effort: "", source: "none" };
 }
 function vendorModelRefusal(provider, model, pickPlanner) {
-  const meta = (0, import_core16.getProviderMeta)(provider);
-  if (!(0, import_core16.runnerForProvider)(provider) || !meta || !(0, import_core16.isVendorModelFor)(meta.id, model)) return null;
+  const meta = (0, import_core17.getProviderMeta)(provider);
+  if (!(0, import_core17.runnerForProvider)(provider) || !meta || !(0, import_core17.isVendorModelFor)(meta.id, model)) return null;
   return `${model} is a vendor's model, which ${meta.label} cannot run. To plan with that vendor, switch planner with ${pickPlanner}.`;
 }
 function uninstalledPlannerRefusal(provider, installed, pickPlanner) {
-  const runner = (0, import_core16.runnerForProvider)(provider);
+  const runner = (0, import_core17.runnerForProvider)(provider);
   if (!runner || installed.includes(runner)) return null;
-  const agents = import_core16.CLI_PROVIDERS.filter((id) => installed.includes((0, import_core16.runnerForProvider)(id) ?? ""));
-  const label = (0, import_core16.getProviderMeta)(provider)?.label ?? provider;
+  const agents = import_core17.CLI_PROVIDERS.filter((id) => installed.includes((0, import_core17.runnerForProvider)(id) ?? ""));
+  const label = (0, import_core17.getProviderMeta)(provider)?.label ?? provider;
   return agents.length > 0 ? `${label} is not installed or not on PATH. Installed coding agents: ${agents.join(", ")}. Switch with ${pickPlanner}.` : `${label} is not installed or not on PATH, and no other coding agent is. Install one, or plan with an API provider through ${pickPlanner}.`;
 }
 
@@ -3344,7 +3373,7 @@ async function handleModel(subArgs, injectedApi) {
   if (!modelId) fail(USAGE);
   const settings = await api.getSettings();
   const provider = typeof settings.aiProvider === "string" ? settings.aiProvider : "";
-  const runner = (0, import_core17.runnerForProvider)(provider);
+  const runner = (0, import_core18.runnerForProvider)(provider);
   if (runner) {
     const known = (await fetchCatalog(api)).models.filter((m) => m.runners?.includes(runner));
     if (known.length > 0 && !known.some((m) => m.id === modelId)) {
@@ -3353,7 +3382,7 @@ async function handleModel(subArgs, injectedApi) {
         `Run \`ordewell model\` to see what ${runner} offers.`
       );
     }
-    const refusal = known.length === 0 ? vendorModelRefusal(provider, modelId, import_core17.HEADLESS_CLI_COMMANDS.pickPlanner) : null;
+    const refusal = known.length === 0 ? vendorModelRefusal(provider, modelId, import_core18.HEADLESS_CLI_COMMANDS.pickPlanner) : null;
     if (refusal) fail(refusal);
   }
   const settled = await api.updateSettings({ orchestratorModel: modelId });
@@ -3369,7 +3398,7 @@ async function showModels(api) {
   const [settings, catalog] = await Promise.all([api.getSettings(), fetchCatalog(api)]);
   const provider = typeof settings.aiProvider === "string" ? settings.aiProvider : "";
   const current = typeof settings.orchestratorModel === "string" ? settings.orchestratorModel : "";
-  const runner = (0, import_core17.runnerForProvider)(provider);
+  const runner = (0, import_core18.runnerForProvider)(provider);
   const options = runner ? catalog.models.filter((m) => m.runners?.includes(runner)) : catalog.orchestratorModels;
   console.log(`
 Planner model: ${current || "(backend default)"}`);
@@ -3403,8 +3432,8 @@ async function handleModels(subArgs) {
     const rest = subArgs.filter((_, i) => i !== setIdx && i !== setIdx + 1);
     return handleModel(["set", subArgs[setIdx + 1], ...rest]);
   }
-  const config = new import_core18.EnvConfig();
-  const providers = (0, import_core18.configuredProviders)(config);
+  const config = new import_core19.EnvConfig();
+  const providers = (0, import_core19.configuredProviders)(config);
   if (providers.length === 0) {
     console.error("No providers configured. Set an API key for a provider, e.g.:");
     console.error("  OPENROUTER_API_KEY=...   (OpenRouter)");
@@ -3413,19 +3442,19 @@ async function handleModels(subArgs) {
     console.error("  OPENAI_COMPATIBLE_BASE_URL=...  (self-hosted / OpenAI-compatible)");
     process.exit(1);
   }
-  const { apiKeys, baseUrls } = (0, import_core18.collectProviderCredentials)(config);
+  const { apiKeys, baseUrls } = (0, import_core19.collectProviderCredentials)(config);
   let models;
   let errors;
   try {
-    const result = await (0, import_core18.fetchAllProviderModels)({ apiKeys, baseUrls });
-    models = (0, import_core18.toOrchestratorOptions)(result.models, import_core18.ORCHESTRATOR_SHORTCUTS);
+    const result = await (0, import_core19.fetchAllProviderModels)({ apiKeys, baseUrls });
+    models = (0, import_core19.toOrchestratorOptions)(result.models, import_core19.ORCHESTRATOR_SHORTCUTS);
     errors = result.errors;
   } catch (err) {
     console.error(`Failed to fetch models: ${err instanceof Error ? err.message : String(err)}`);
     process.exit(1);
     return;
   }
-  const providerLabel = (p) => (0, import_core18.getProviderMeta)(p)?.label ?? p;
+  const providerLabel = (p) => (0, import_core19.getProviderMeta)(p)?.label ?? p;
   console.log(
     `
 Available models (${models.length}) across ${providers.length} configured provider(s):`
@@ -3466,7 +3495,7 @@ ${providerLabel(provider)}`);
 
 // src/commands/setup.ts
 var import_fs6 = require("fs");
-var import_core19 = require("@ordewell/core");
+var import_core20 = require("@ordewell/core");
 function handleSetup(subArgs) {
   const modelIdx = subArgs.indexOf("--model");
   const chosenModel = modelIdx !== -1 ? subArgs[modelIdx + 1] : null;
@@ -3538,13 +3567,13 @@ function handleSetup(subArgs) {
 # STEPFUN_API_KEY=...
 # SILICONFLOW_API_KEY=...
 `;
-  (0, import_core19.writePrivateFile)(envFile, content);
+  (0, import_core20.writePrivateFile)(envFile, content);
   console.log(`Wrote: ${envFile}`);
   console.log("Review and edit the file, then run: ordewell tui");
 }
 
 // src/commands/skills.ts
-var import_core20 = require("@ordewell/core");
+var import_core21 = require("@ordewell/core");
 var import_path5 = require("path");
 function invocation(skill) {
   if (skill.userInvocable && skill.modelInvocable) return "both";
@@ -3557,22 +3586,22 @@ function handleSkills(subArgs) {
     fail("Usage: ordewell skills [--workspace /path] [--json]");
   }
   const workspace = (0, import_path5.resolve)(flag(subArgs, "--workspace") || process.cwd());
-  const catalog = (0, import_core20.createSkillsService)(workspace, new import_core20.EnvConfig().workspaceRepos).readCatalog();
+  const catalog = (0, import_core21.createSkillsService)(workspace, new import_core21.EnvConfig().workspaceRepos).readCatalog();
   const skills = catalog.skills.map((skill) => ({
     name: skill.name,
     scope: skill.source,
     appliesTo: skill.appliesTo,
     invocation: invocation(skill),
-    path: (0, import_core20.abbreviateHome)(skill.path)
+    path: (0, import_core21.abbreviateHome)(skill.path)
   }));
   const shadowed = catalog.shadowed.map(({ skill, shadowedBy }) => ({
     name: skill.name,
-    path: (0, import_core20.abbreviateHome)(skill.path),
-    shadowedBy: { scope: shadowedBy.source, path: (0, import_core20.abbreviateHome)(shadowedBy.path) }
+    path: (0, import_core21.abbreviateHome)(skill.path),
+    shadowedBy: { scope: shadowedBy.source, path: (0, import_core21.abbreviateHome)(shadowedBy.path) }
   }));
   const invalid = catalog.invalid.map((skill) => ({
     name: skill.name,
-    path: (0, import_core20.abbreviateHome)(skill.path),
+    path: (0, import_core21.abbreviateHome)(skill.path),
     reason: skill.reason
   }));
   if (hasFlag(subArgs, "--json")) {
@@ -3687,10 +3716,10 @@ async function handleShow(args, api) {
 }
 
 // src/commands/mark-complete.ts
-var import_core22 = require("@ordewell/core");
+var import_core23 = require("@ordewell/core");
 
 // src/commands/task-control.ts
-var import_core21 = require("@ordewell/core");
+var import_core22 = require("@ordewell/core");
 async function sessionAndRef(subArgs, usage, injectedApi) {
   const workspace = flag(subArgs, "--workspace") || process.cwd();
   let sessionId = flag(subArgs, "--session-id");
@@ -3735,7 +3764,7 @@ async function confirmPastGate(subArgs, api, sessionId, ref, confirm2) {
   const unmerged = await api.getMergeGate(sessionId, ref).catch(() => []);
   if (unmerged.length === 0) return false;
   if (hasFlag(subArgs, "--yes")) return true;
-  const question = `${(0, import_core21.pastGateConfirmation)(unmerged.map((d) => (0, import_core21.titledTaskRef)(d)))} Start it anyway?`;
+  const question = `${(0, import_core22.pastGateConfirmation)(unmerged.map((d) => (0, import_core22.titledTaskRef)(d)))} Start it anyway?`;
   if (!await confirm2(question)) fail("Not started: nothing was changed. Pass --yes to start it without a prompt.");
   return true;
 }
@@ -3750,7 +3779,7 @@ function makeHandler(action, command = action) {
         const pastGate = PASSES_GATE.has(action) ? await confirmPastGate(subArgs, api, sessionId, ref, confirm2) : false;
         const control = pastGate && action === "run" ? "force-start" : action;
         try {
-          const { message } = await api.execute(sessionId, (0, import_core21.taskActionCommand)(control, ref));
+          const { message } = await api.execute(sessionId, (0, import_core22.taskActionCommand)(control, ref));
           console.log(message);
         } catch (err) {
           console.error(`Failed to ${control} task: ${err.message}`);
@@ -3807,17 +3836,17 @@ var handleCancel = makeHandler("cancel");
 
 // src/commands/mark-complete.ts
 async function overrideCommand(direction, subArgs, api, sessionId, ref, confirm2) {
-  const command = (0, import_core22.taskActionCommand)(direction, ref);
-  if (hasFlag(subArgs, "--yes")) return (0, import_core22.confirmedOverride)(command);
+  const command = (0, import_core23.taskActionCommand)(direction, ref);
+  if (hasFlag(subArgs, "--yes")) return (0, import_core23.confirmedOverride)(command);
   const live = await api.getSession(sessionId, flag(subArgs, "--workspace") || process.cwd()).catch(() => null);
   const tasks = live ? allTasksOf(live.plan) : [];
-  const task = (0, import_core22.resolveUserTaskRef)(tasks, ref);
-  if (!task || !(0, import_core22.overrideNeedsConfirmation)(task)) return command;
-  const label = `task ${(0, import_core22.titledTaskRefOf)(tasks, task.id) ?? ref}`;
-  if (live?.run?.activity?.advancesOnItsOwn) fail((0, import_core22.manualOverrideStopFirst)(direction, label));
-  const question = `${(0, import_core22.manualOverrideConfirmation)(direction, label)} Go ahead?`;
+  const task = (0, import_core23.resolveUserTaskRef)(tasks, ref);
+  if (!task || !(0, import_core23.overrideNeedsConfirmation)(task)) return command;
+  const label = `task ${(0, import_core23.titledTaskRefOf)(tasks, task.id) ?? ref}`;
+  if (live?.run?.activity?.advancesOnItsOwn) fail((0, import_core23.manualOverrideStopFirst)(direction, label));
+  const question = `${(0, import_core23.manualOverrideConfirmation)(direction, label)} Go ahead?`;
   if (!await confirm2(question)) fail("Nothing was changed. Pass --yes to confirm without a prompt.");
-  return (0, import_core22.confirmedOverride)(command, task.status);
+  return (0, import_core23.confirmedOverride)(command, task.status);
 }
 async function handleMarkComplete(subArgs, api, confirm2 = askYesNo) {
   await withTaskRef(
@@ -3860,7 +3889,7 @@ async function handleSkip(subArgs, api) {
     api,
     async (client, sessionId, ref) => {
       try {
-        const done = await client.execute(sessionId, (0, import_core22.taskActionCommand)("skip", ref, flag(subArgs, "--reason")));
+        const done = await client.execute(sessionId, (0, import_core23.taskActionCommand)("skip", ref, flag(subArgs, "--reason")));
         console.log(done.message);
       } catch (err) {
         console.error(`Failed to skip task: ${err.message}`);
@@ -3870,6 +3899,32 @@ async function handleSkip(subArgs, api) {
   );
 }
 
+// src/commands/revert.ts
+var import_core24 = require("@ordewell/core");
+async function handleRevert(subArgs, api, confirm2 = askYesNo) {
+  await withTaskRef(
+    subArgs,
+    "Usage: ordewell revert <task-id-or-order> [--session-id <id>] [--workspace /path] [--yes]",
+    api,
+    async (client, sessionId, ref) => {
+      try {
+        const preview = await client.revertPreview(sessionId, ref);
+        if (!preview.revertible) fail(preview.message);
+        console.log(`${import_core24.revertEffect}
+${preview.tasks.map((t) => `  ${(0, import_core24.revertListLine)(t)}`).join("\n")}`);
+        if (!hasFlag(subArgs, "--yes") && !await confirm2("Revert these?")) {
+          fail("Nothing was changed. Pass --yes to confirm without a prompt.");
+        }
+        const done = await client.execute(sessionId, { command: "revert_task", task: ref, confirmed: true, seen: preview.tasks.map((t) => t.taskId) });
+        console.log(done.message);
+      } catch (err) {
+        console.error(`Failed to revert task: ${err.message}`);
+        process.exit(1);
+      }
+    }
+  );
+}
+
 // src/commands/add-task.ts
 var import_plan_utils = require("@ordewell/core/plan-utils");
 async function handleAddTask(subArgs, injectedApi) {
@@ -4119,17 +4174,17 @@ async function handleResend(subArgs, injectedApi) {
 }
 
 // src/commands/handoff.ts
-var import_core25 = require("@ordewell/core");
+var import_core27 = require("@ordewell/core");
 
 // src/tui/transcript.ts
-var import_core23 = require("@ordewell/core");
+var import_core25 = require("@ordewell/core");
 function show(state, { view: conversation, gate: turnGate }) {
   const gated = turnGate === state.turnGate ? state : { ...state, turnGate };
   if (conversation === state.conversation) return gated;
   return { ...gated, conversation };
 }
 function fold(state, input) {
-  return show(state, { view: (0, import_core23.reduceConversation)(state.conversation, input), gate: state.turnGate });
+  return show(state, { view: (0, import_core25.reduceConversation)(state.conversation, input), gate: state.turnGate });
 }
 function say(state, role, text, followTail = true) {
   const said = fold(state, { type: "local_entry", role, text });
@@ -4137,10 +4192,10 @@ function say(state, role, text, followTail = true) {
   return said.conversation.nextId > state.conversation.nextId ? { ...said, scroll: 0 } : said;
 }
 function hear(state, message) {
-  return show(state, (0, import_core23.followTurn)(state.conversation, state.turnGate, message));
+  return show(state, (0, import_core25.followTurn)(state.conversation, state.turnGate, message));
 }
 function cutTurn(state) {
-  return show(state, (0, import_core23.stopTurn)(state.conversation, state.turnGate));
+  return show(state, (0, import_core25.stopTurn)(state.conversation, state.turnGate));
 }
 function endRunningCompactions(state, outcome) {
   let next = state;
@@ -4158,7 +4213,7 @@ function wiped(view) {
 }
 
 // src/tui/handoff.ts
-var import_core24 = require("@ordewell/core");
+var import_core26 = require("@ordewell/core");
 var HANDOFF_ACTIONS = [
   { id: "review", label: "Review diff", hint: "the branch against the commit it forked from" },
   { id: "merge", label: "Merge", hint: "into the branch you have checked out (asks first)" },
@@ -4166,7 +4221,7 @@ var HANDOFF_ACTIONS = [
   { id: "cleanup", label: "Clean up", hint: "remove worktrees and task branches, keep this branch" }
 ];
 function handoffActions(handoff) {
-  if (!(0, import_core24.isRepoGroup)(handoff)) return HANDOFF_ACTIONS;
+  if (!(0, import_core26.isRepoGroup)(handoff)) return HANDOFF_ACTIONS;
   return [
     { id: "review", label: "Review diff", hint: "each repository's branch against the commit it forked from" },
     { id: "merge", label: "Merge all", hint: "every repository's branch into what you have checked out there (asks first)" },
@@ -4191,14 +4246,14 @@ function handoffCommand(state, arg) {
 }
 function handoffArrived(state, handoff) {
   const landed = handoff.landed.length;
-  const where = (0, import_core24.isRepoGroup)(handoff) ? ` in ${reposOf(handoff)}` : "";
-  const branch = (0, import_core24.handoffBranchName)(handoff);
+  const where = (0, import_core26.isRepoGroup)(handoff) ? ` in ${reposOf(handoff)}` : "";
+  const branch = (0, import_core26.handoffBranchName)(handoff);
   const tasks = `${landed} task${landed === 1 ? "" : "s"} landed`;
   const received = { ...state, handoff };
   if (handoff.deferredTo === "supervisor") {
     return say(received, "system", `Run finished on ${branch}${where}: ${tasks}. The supervisor may merge it; /handoff to review it yourself.`);
   }
-  const returned = state.handoff?.deferredTo === "supervisor" && (0, import_core24.handoffBranchName)(state.handoff) === branch;
+  const returned = state.handoff?.deferredTo === "supervisor" && (0, import_core26.handoffBranchName)(state.handoff) === branch;
   const told = say(
     received,
     "system",
@@ -4215,7 +4270,7 @@ function runHandoffAction(state, id) {
     case "review":
       return { state, effects: [{ type: "isolationReviewDiff", sessionId }] };
     case "cleanup":
-      return { state: closed, effects: [{ type: "isolationCleanup", sessionId, branch: (0, import_core24.handoffBranchName)(handoff) }] };
+      return { state: closed, effects: [{ type: "isolationCleanup", sessionId, branch: (0, import_core26.handoffBranchName)(handoff) }] };
     case "merge":
       if (midRun(state)) {
         return {
@@ -4223,8 +4278,8 @@ function runHandoffAction(state, id) {
             ...state,
             overlay: {
               kind: "confirm",
-              title: (0, import_core24.isRepoGroup)(handoff) ? "Merge what has landed into your branches?" : "Merge what has landed into your branch?",
-              message: `Merge ${(0, import_core24.handoffBranchName)(handoff)} as it stands now into ${(0, import_core24.mergeTarget)(handoff)}.${(0, import_core24.checkoutRule)(handoff)} The run goes on: tasks waiting for Merge all start once it has merged, and later tasks land on the same branch for the next Merge all. A merge that conflicts is aborted, and your ${(0, import_core24.isRepoGroup)(handoff) ? "trees stay" : "tree stays"} as ${(0, import_core24.isRepoGroup)(handoff) ? "they were" : "it was"}.${(0, import_core24.repairedNotice)(handoff)}`,
+              title: (0, import_core26.isRepoGroup)(handoff) ? "Merge what has landed into your branches?" : "Merge what has landed into your branch?",
+              message: `Merge ${(0, import_core26.handoffBranchName)(handoff)} as it stands now into ${(0, import_core26.mergeTarget)(handoff)}.${(0, import_core26.checkoutRule)(handoff)} The run goes on: tasks waiting for Merge all start once it has merged, and later tasks land on the same branch for the next Merge all. A merge that conflicts is aborted, and your ${(0, import_core26.isRepoGroup)(handoff) ? "trees stay" : "tree stays"} as ${(0, import_core26.isRepoGroup)(handoff) ? "they were" : "it was"}.${(0, import_core26.repairedNotice)(handoff)}`,
               action: { kind: "merge-run" }
             }
           },
@@ -4234,15 +4289,15 @@ function runHandoffAction(state, id) {
       return {
         state: {
           ...state,
-          overlay: (0, import_core24.isRepoGroup)(handoff) ? {
+          overlay: (0, import_core26.isRepoGroup)(handoff) ? {
             kind: "confirm",
             title: "Merge all into your branches?",
-            message: `Merge ${(0, import_core24.handoffBranchName)(handoff)} into ${(0, import_core24.mergeTarget)(handoff)}.${(0, import_core24.checkoutRule)(handoff)} It checks every repository first and merges none unless every repository can take it; on git older than 2.38 it goes repository by repository and stops at the first that fails. A merge that conflicts is aborted, and your trees stay as they were. Once every repository has merged, the run's worktrees and branches are removed unless a task still has work in its worktree that has not landed: then the run stays, and so does that work.${(0, import_core24.repairedNotice)(handoff)}`,
+            message: `Merge ${(0, import_core26.handoffBranchName)(handoff)} into ${(0, import_core26.mergeTarget)(handoff)}.${(0, import_core26.checkoutRule)(handoff)} It checks every repository first and merges none unless every repository can take it; on git older than 2.38 it goes repository by repository and stops at the first that fails. A merge that conflicts is aborted, and your trees stay as they were. Once every repository has merged, the run's worktrees and branches are removed unless a task still has work in its worktree that has not landed: then the run stays, and so does that work.${(0, import_core26.repairedNotice)(handoff)}`,
             action: { kind: "merge-run" }
           } : {
             kind: "confirm",
             title: "Merge into your branch?",
-            message: `Merge ${(0, import_core24.handoffBranchName)(handoff)} into ${(0, import_core24.mergeTarget)(handoff)}.${(0, import_core24.checkoutRule)(handoff)} If it conflicts the merge is aborted and your tree stays as it was. Once it has merged, the run's worktrees and branches are removed unless a task still has work in its worktree that has not landed: then the run stays, and so does that work.${(0, import_core24.repairedNotice)(handoff)}`,
+            message: `Merge ${(0, import_core26.handoffBranchName)(handoff)} into ${(0, import_core26.mergeTarget)(handoff)}.${(0, import_core26.checkoutRule)(handoff)} If it conflicts the merge is aborted and your tree stays as it was. Once it has merged, the run's worktrees and branches are removed unless a task still has work in its worktree that has not landed: then the run stays, and so does that work.${(0, import_core26.repairedNotice)(handoff)}`,
             action: { kind: "merge-run" }
           }
         },
@@ -4255,7 +4310,7 @@ function runHandoffAction(state, id) {
           overlay: {
             kind: "confirm",
             title: "Discard this run?",
-            message: `Removes the run's worktrees and task branches and deletes ${(0, import_core24.handoffBranchName)(handoff)}${(0, import_core24.isRepoGroup)(handoff) ? ` in ${reposOf(handoff)}` : ""}. Tasks keep their status: mark one not done if you did not keep its work.`,
+            message: `Removes the run's worktrees and task branches and deletes ${(0, import_core26.handoffBranchName)(handoff)}${(0, import_core26.isRepoGroup)(handoff) ? ` in ${reposOf(handoff)}` : ""}. Tasks keep their status: mark one not done if you did not keep its work.`,
             action: { kind: "discard-run" }
           }
         },
@@ -4268,19 +4323,19 @@ function confirmedHandoff(state, kind) {
   const handoff = currentHandoff(state);
   if (!state.sessionId || !handoff) return { state: closed, effects: [] };
   const { sessionId } = state;
-  const repaired = (0, import_core24.repairedLanded)(handoff);
+  const repaired = (0, import_core26.repairedLanded)(handoff);
   const effect = kind === "merge-run" ? {
     type: "isolationMerge",
     sessionId,
-    branch: (0, import_core24.handoffBranchName)(handoff),
-    ...(0, import_core24.isRepoGroup)(handoff) ? { group: true } : {},
+    branch: (0, import_core26.handoffBranchName)(handoff),
+    ...(0, import_core26.isRepoGroup)(handoff) ? { group: true } : {},
     ...repaired.length > 0 ? { repaired } : {}
-  } : { type: "isolationDiscard", sessionId, branch: (0, import_core24.handoffBranchName)(handoff) };
+  } : { type: "isolationDiscard", sessionId, branch: (0, import_core26.handoffBranchName)(handoff) };
   return { state: closed, effects: [effect] };
 }
 function showDiff(state, diff) {
   const handoff = currentHandoff(state);
-  if (diff.trim() === "") return say(state, "system", `Nothing differs from ${handoff ? (0, import_core24.handoffBaseLine)(handoff, 8) : "the base commit"}.`);
+  if (diff.trim() === "") return say(state, "system", `Nothing differs from ${handoff ? (0, import_core26.handoffBaseLine)(handoff, 8) : "the base commit"}.`);
   const index = state.overlay?.kind === "handoff" ? state.overlay.index : 0;
   const lines = sanitize(diff.replace(/\t/g, "    ")).split("\n");
   return { ...state, overlay: { kind: "handoff", index, diff: { lines, scroll: 0 } } };
@@ -4354,11 +4409,11 @@ async function handleHandoff(subArgs, injectedApi, confirm2 = askYesNo) {
   }
   if (!HANDOFF_ACTIONS.some((a) => a.id === action)) fail(`Unknown handoff action "${action}".`, USAGE4);
   const { api, sessionId, plan } = await adopted(subArgs, injectedApi);
-  const handoff = (0, import_core25.isolationViewOfPlan)(plan)?.handoff;
+  const handoff = (0, import_core27.isolationViewOfPlan)(plan)?.handoff;
   if (!handoff) fail("This session has no isolated run to hand off.");
-  const branch = (0, import_core25.handoffBranchName)(handoff);
-  const group = (0, import_core25.isRepoGroup)(handoff);
-  if (group) for (const line of (0, import_core25.repoResultLines)(handoff)) console.error(line);
+  const branch = (0, import_core27.handoffBranchName)(handoff);
+  const group = (0, import_core27.isRepoGroup)(handoff);
+  if (group) for (const line of (0, import_core27.repoResultLines)(handoff)) console.error(line);
   const asked = hasFlag(subArgs, "--yes");
   const confirmed = async (question) => {
     if (asked || await confirm2(question)) return;
@@ -4374,12 +4429,12 @@ async function handleHandoff(subArgs, injectedApi, confirm2 = askYesNo) {
   switch (action) {
     case "review": {
       const diff = await attempt(() => api.reviewRunDiff(sessionId));
-      console.log(diff.trim() === "" ? `Nothing differs from ${(0, import_core25.handoffBaseLine)(handoff, 8)}.` : diff);
+      console.log(diff.trim() === "" ? `Nothing differs from ${(0, import_core27.handoffBaseLine)(handoff, 8)}.` : diff);
       return;
     }
     case "merge": {
-      await confirmed((group ? `Merge ${branch} into ${(0, import_core25.mergeTarget)(handoff)}? Nothing is merged unless every repository can take it${(0, import_core25.checkoutRule)(handoff) ? " and is on that branch" : ""}; once a finished run has merged everything, its worktrees and branches are removed.` : `Merge ${branch} into ${(0, import_core25.mergeTarget)(handoff)}?${(0, import_core25.checkoutRule)(handoff)} Once a finished run has merged everything, its worktrees and branches are removed.`) + (0, import_core25.repairedNotice)(handoff));
-      const { ok, message } = (0, import_core25.mergeOutcome)(await attempt(() => api.mergeRun(sessionId)), branch, group, (0, import_core25.repairedLanded)(handoff));
+      await confirmed((group ? `Merge ${branch} into ${(0, import_core27.mergeTarget)(handoff)}? Nothing is merged unless every repository can take it${(0, import_core27.checkoutRule)(handoff) ? " and is on that branch" : ""}; once a finished run has merged everything, its worktrees and branches are removed.` : `Merge ${branch} into ${(0, import_core27.mergeTarget)(handoff)}?${(0, import_core27.checkoutRule)(handoff)} Once a finished run has merged everything, its worktrees and branches are removed.`) + (0, import_core27.repairedNotice)(handoff));
+      const { ok, message } = (0, import_core27.mergeOutcome)(await attempt(() => api.mergeRun(sessionId)), branch, group, (0, import_core27.repairedLanded)(handoff));
       if (ok) console.log(message);
       else fail(message);
       return;
@@ -4397,7 +4452,7 @@ async function handleHandoff(subArgs, injectedApi, confirm2 = askYesNo) {
 }
 
 // src/commands/planner.ts
-var import_core26 = require("@ordewell/core");
+var import_core28 = require("@ordewell/core");
 async function handlePlanner(subArgs, injectedApi) {
   const api = await connect(subArgs, injectedApi);
   const [wanted] = positionals(subArgs);
@@ -4406,13 +4461,13 @@ async function handlePlanner(subArgs, injectedApi) {
     return;
   }
   const provider = wanted.toLowerCase();
-  const meta = (0, import_core26.getProviderMeta)(provider);
+  const meta = (0, import_core28.getProviderMeta)(provider);
   if (!meta) {
     fail(`Unknown planner: ${provider}`, "Run `ordewell planner` with no arguments to see the list.");
   }
-  if ((0, import_core26.isCliProvider)(provider)) {
+  if ((0, import_core28.isCliProvider)(provider)) {
     const installed = (await api.getRunners()).runners.map((r) => r.id);
-    const refusal = uninstalledPlannerRefusal(provider, installed, import_core26.HEADLESS_CLI_COMMANDS.pickPlanner);
+    const refusal = uninstalledPlannerRefusal(provider, installed, import_core28.HEADLESS_CLI_COMMANDS.pickPlanner);
     if (refusal) fail(refusal);
   }
   const settings = await persistEnv(api, { AI_PROVIDER: provider });
@@ -4420,10 +4475,10 @@ async function handlePlanner(subArgs, injectedApi) {
   writeEnv({ ORCHESTRATOR_MODEL: recall2.model, ORDEWELL_PLANNER_EFFORT: recall2.effort });
   const catalog = await fetchCatalog(api);
   console.log(
-    (0, import_core26.isCliProvider)(provider) ? `Planning with ${meta.label}: no API key needed, it uses that agent's own subscription.` : `Planner set to ${meta.label}.`
+    (0, import_core28.isCliProvider)(provider) ? `Planning with ${meta.label}: no API key needed, it uses that agent's own subscription.` : `Planner set to ${meta.label}.`
   );
   console.log(plannerModelLine(recall2));
-  if ((0, import_core26.isApiProvider)(provider) && !catalog.providers.includes(provider)) {
+  if ((0, import_core28.isApiProvider)(provider) && !catalog.providers.includes(provider)) {
     console.log(`  No ${meta.apiKeyEnvVar} configured yet: set one with \`ordewell key set ${provider} <key>\`.`);
   }
 }
@@ -4441,15 +4496,15 @@ async function showPlanners(api) {
   const [settings, catalog] = await Promise.all([api.getSettings(), fetchCatalog(api)]);
   const current = typeof settings.aiProvider === "string" ? settings.aiProvider : "";
   console.log("\nCoding agents (no API key; they use their own subscription)");
-  for (const id of import_core26.CLI_PROVIDERS) {
-    const runner = (0, import_core26.runnerForProvider)(id);
+  for (const id of import_core28.CLI_PROVIDERS) {
+    const runner = (0, import_core28.runnerForProvider)(id);
     const discovered = runner ? catalog.models.some((m) => m.runners?.includes(runner)) : false;
-    console.log(`  ${marker(id === current)} ${id.padEnd(14)} ${(0, import_core26.getProviderMeta)(id)?.label ?? id}${discovered ? "" : "  (not detected)"}`);
+    console.log(`  ${marker(id === current)} ${id.padEnd(14)} ${(0, import_core28.getProviderMeta)(id)?.label ?? id}${discovered ? "" : "  (not detected)"}`);
   }
   console.log("\nAPI providers");
-  for (const id of import_core26.PROVIDER_PRIORITY) {
+  for (const id of import_core28.PROVIDER_PRIORITY) {
     const configured = catalog.providers.includes(id);
-    const meta = (0, import_core26.getProviderMeta)(id);
+    const meta = (0, import_core28.getProviderMeta)(id);
     console.log(`  ${marker(id === current)} ${id.padEnd(14)} ${meta.label}${configured ? "" : `  (no ${meta.apiKeyEnvVar})`}`);
   }
   console.log(`
@@ -4466,7 +4521,7 @@ async function handlePlannerEffort(subArgs, injectedApi) {
   const provider = typeof settings.aiProvider === "string" ? settings.aiProvider : "";
   const modelId = typeof settings.orchestratorModel === "string" ? settings.orchestratorModel : "";
   const currentEffort = typeof settings.plannerThinkingEffort === "string" ? settings.plannerThinkingEffort : "";
-  const runner = (0, import_core26.runnerForProvider)(provider);
+  const runner = (0, import_core28.runnerForProvider)(provider);
   if (!runner) {
     fail(
       "Thinking effort applies to a coding-agent planner.",
@@ -4506,7 +4561,7 @@ async function handlePlannerEffort(subArgs, injectedApi) {
 }
 
 // src/commands/parallel.ts
-var import_core27 = require("@ordewell/core");
+var import_core29 = require("@ordewell/core");
 var USAGE5 = "Usage: ordewell parallel [<number of tasks, 1 or more>]";
 async function handleParallel(subArgs, injectedApi) {
   const [wanted] = positionals(subArgs);
@@ -4516,18 +4571,19 @@ async function handleParallel(subArgs, injectedApi) {
     console.log(`Up to ${String(settings.maxParallel ?? "?")} AI tasks run at once. Change with: ordewell parallel <n>`);
     return;
   }
-  const limit = (0, import_core27.parseMaxParallel)(wanted);
+  const limit = (0, import_core29.parseMaxParallel)(wanted);
   if (limit === null) fail(`"${wanted}" is not a number of tasks (1 or more).`, USAGE5);
   await persistEnv(api, { ORDEWELL_MAX_PARALLEL: String(limit) });
   console.log(`Up to ${limit} AI task${limit === 1 ? "" : "s"} now run at once.`);
 }
 
 // src/commands/runSettings.ts
-var import_core28 = require("@ordewell/core");
+var import_core30 = require("@ordewell/core");
 var SUPERVISOR_USAGE = "Usage: ordewell supervisor [off|watch|act] \xB7 ordewell supervisor retries <n> \xB7 ordewell supervisor reads <n>";
 var AUTOMERGE_USAGE = "Usage: ordewell automerge [on|off]";
 var TRAILER_USAGE = "Usage: ordewell trailer [on|off]";
 var AUTORUN_USAGE = "Usage: ordewell autorun [on|off]";
+var DELEGATION_USAGE = "Usage: ordewell delegation [off|<tokens>]";
 async function save(api, changes) {
   await api.updateRunSettings(changes);
 }
@@ -4535,28 +4591,28 @@ async function handleSupervisor(subArgs, injectedApi) {
   const [arg, value] = positionals(subArgs);
   let changes = null;
   if (arg === "off" || arg === "watch" || arg === "act") changes = { supervisorLevel: arg };
-  else if (arg === "retries") changes = maybe((0, import_core28.parseCount)(value, 0), (n) => ({ supervisorRetryLimit: n }));
-  else if (arg === "reads") changes = maybe((0, import_core28.parseCount)(value, 1), (n) => ({ wakeUpReadBudget: n }));
+  else if (arg === "retries") changes = maybe((0, import_core30.parseCount)(value, 0), (n) => ({ supervisorRetryLimit: n }));
+  else if (arg === "reads") changes = maybe((0, import_core30.parseCount)(value, 1), (n) => ({ wakeUpReadBudget: n }));
   if (arg !== void 0 && changes === null) fail(SUPERVISOR_USAGE);
   const api = await connect(subArgs, injectedApi);
   if (!changes) {
-    console.log((0, import_core28.supervisorSummary)((await api.getSettings()).run));
+    console.log((0, import_core30.supervisorSummary)((await api.getSettings()).run));
     console.log(`  ${SUPERVISOR_USAGE}`);
     return;
   }
   await save(api, changes);
-  if (changes.supervisorLevel) console.log(`Supervisor: ${import_core28.SUPERVISOR_LEVEL_LABEL[changes.supervisorLevel]}, for new sessions.`);
-  if (changes.supervisorLevel === "act") console.log(import_core28.ACT_RISK);
+  if (changes.supervisorLevel) console.log(`Supervisor: ${import_core30.SUPERVISOR_LEVEL_LABEL[changes.supervisorLevel]}, for new sessions.`);
+  if (changes.supervisorLevel === "act") console.log(import_core30.ACT_RISK);
   if (changes.supervisorRetryLimit !== void 0) console.log(`Supervisor retry limit: ${changes.supervisorRetryLimit} per task.`);
   if (changes.wakeUpReadBudget !== void 0) console.log(`Wake-up read budget: ${changes.wakeUpReadBudget} reads.`);
 }
 async function handleAutomerge(subArgs, injectedApi) {
   const [arg] = positionals(subArgs);
-  const enabled = arg === void 0 ? null : (0, import_core28.parseSwitch)(arg);
+  const enabled = arg === void 0 ? null : (0, import_core30.parseSwitch)(arg);
   if (arg !== void 0 && enabled === null) fail(AUTOMERGE_USAGE);
   const api = await connect(subArgs, injectedApi);
   if (enabled === null) {
-    console.log((0, import_core28.automergeSummary)((await api.getSettings()).run));
+    console.log((0, import_core30.automergeSummary)((await api.getSettings()).run));
     console.log(`  ${AUTOMERGE_USAGE}`);
     return;
   }
@@ -4565,37 +4621,54 @@ async function handleAutomerge(subArgs, injectedApi) {
 }
 async function handleTrailer(subArgs, injectedApi) {
   const [arg] = positionals(subArgs);
-  const enabled = arg === void 0 ? null : (0, import_core28.parseSwitch)(arg);
+  const enabled = arg === void 0 ? null : (0, import_core30.parseSwitch)(arg);
   if (arg !== void 0 && enabled === null) fail(TRAILER_USAGE);
   const api = await connect(subArgs, injectedApi);
   if (enabled === null) {
-    console.log((0, import_core28.trailerSummary)((await api.getSettings()).run));
+    console.log((0, import_core30.trailerSummary)((await api.getSettings()).run));
     console.log(`  ${TRAILER_USAGE}`);
     return;
   }
   await save(api, { plannedWithTrailer: enabled });
-  console.log(`${import_core28.PLANNED_WITH_LABEL}: ${enabled ? "on" : "off"}, from each session's next commit.`);
+  console.log(`${import_core30.PLANNED_WITH_LABEL}: ${enabled ? "on" : "off"}, from each session's next commit.`);
 }
 async function handleAutorun(subArgs, injectedApi) {
   const [arg] = positionals(subArgs);
-  const enabled = arg === void 0 ? null : (0, import_core28.parseSwitch)(arg);
+  const enabled = arg === void 0 ? null : (0, import_core30.parseSwitch)(arg);
   if (arg !== void 0 && enabled === null) fail(AUTORUN_USAGE);
   const api = await connect(subArgs, injectedApi);
   if (enabled === null) {
-    console.log((0, import_core28.autorunSummary)((await api.getSettings()).run));
+    console.log((0, import_core30.autorunSummary)((await api.getSettings()).run));
     console.log(`  ${AUTORUN_USAGE}`);
     return;
   }
   await save(api, { autorun: enabled });
   console.log(`Autorun: ${enabled ? "on: each plan the planner submits starts at once" : "off: plans wait for your review"}.`);
-  if (enabled) console.log(import_core28.AUTORUN_RISK);
+  if (enabled) console.log(import_core30.AUTORUN_RISK);
+}
+async function handleDelegation(subArgs, injectedApi) {
+  const [arg] = positionals(subArgs);
+  const tokens = arg === void 0 ? null : (0, import_core30.parseDelegation)(arg);
+  if (arg !== void 0 && tokens === null) fail(DELEGATION_USAGE);
+  const api = await connect(subArgs, injectedApi);
+  if (tokens === null) {
+    console.log((0, import_core30.delegationSummary)((await api.getSettings()).run));
+    console.log(`  ${DELEGATION_USAGE}`);
+    return;
+  }
+  await save(api, { delegationTokens: tokens });
+  console.log(`${(0, import_core30.delegationSummary)({ ...(await api.getSettings()).run, delegationTokens: tokens })}, for new sessions.`);
+  if (tokens > 0) console.log(import_core30.DELEGATION_RISK);
 }
 function maybe(n, wrap2) {
   return n === null ? null : wrap2(n);
 }
 
+// src/commands/registry.ts
+var import_core59 = require("@ordewell/core");
+
 // src/commands/key.ts
-var import_core29 = require("@ordewell/core");
+var import_core31 = require("@ordewell/core");
 var USAGE6 = "Usage: ordewell key [list | set <provider> <key>]";
 async function handleKey(subArgs, injectedApi) {
   const [action, provider, ...keyParts] = positionals(subArgs);
@@ -4606,8 +4679,8 @@ async function handleKey(subArgs, injectedApi) {
   if (action !== "set") {
     const catalog = await fetchCatalog(api);
     console.log("\nAPI provider keys\n");
-    for (const id2 of import_core29.PROVIDER_PRIORITY) {
-      const meta2 = (0, import_core29.getProviderMeta)(id2);
+    for (const id2 of import_core31.PROVIDER_PRIORITY) {
+      const meta2 = (0, import_core31.getProviderMeta)(id2);
       const configured = catalog.providers.includes(id2);
       console.log(`  ${configured ? "\u2713" : " "} ${id2.padEnd(14)} ${meta2.apiKeyEnvVar.padEnd(28)} ${meta2.label}`);
     }
@@ -4617,10 +4690,10 @@ async function handleKey(subArgs, injectedApi) {
   }
   if (!provider) fail(USAGE6);
   const id = provider.toLowerCase();
-  if (!(0, import_core29.isApiProvider)(id)) {
+  if (!(0, import_core31.isApiProvider)(id)) {
     fail(`Unknown provider: ${provider}`, "Run `ordewell key` to see the list.");
   }
-  const meta = (0, import_core29.getProviderMeta)(id);
+  const meta = (0, import_core31.getProviderMeta)(id);
   const key = keyParts.join(" ").trim();
   if (!key) fail(`Usage: ordewell key set ${id} <key>`);
   await persistEnv(api, { [meta.apiKeyEnvVar]: key });
@@ -4628,7 +4701,7 @@ async function handleKey(subArgs, injectedApi) {
 }
 
 // src/commands/runners.ts
-var import_core30 = require("@ordewell/core");
+var import_core32 = require("@ordewell/core");
 var USAGE7 = "Usage: ordewell runners [<runner-id> on|off]";
 async function handleRunners(subArgs, injectedApi) {
   const [runner, toggle] = positionals(subArgs);
@@ -4639,7 +4712,7 @@ async function handleRunners(subArgs, injectedApi) {
     for (const r of state2.runners) {
       console.log(`  ${r.enabled ? "\u2713" : " "} ${r.id.padEnd(14)} ${r.name}${r.enabled ? "" : "  (disabled)"}`);
     }
-    const notice = (0, import_core30.codexSandboxNotice)((await fetchCatalog(api).catch(() => null))?.modesByRunner);
+    const notice = (0, import_core32.codexSandboxNotice)((await fetchCatalog(api).catch(() => null))?.modesByRunner);
     if (notice) console.log(`
   ${notice.line}
   ${notice.docs}`);
@@ -4660,17 +4733,17 @@ async function handleRunners(subArgs, injectedApi) {
 var AUTO_USAGE = "Usage: ordewell auto [full|guarded]";
 function handleAuto(subArgs) {
   const [arg] = positionals(subArgs);
-  const settings = new import_core30.SettingsService();
+  const settings = new import_core32.SettingsService();
   const current = settings.autonomousMode();
   if (!arg) {
-    console.log(`Autonomy level: ${(0, import_core30.autonomyLevelLabel)(current)}`);
+    console.log(`Autonomy level: ${(0, import_core32.autonomyLevelLabel)(current)}`);
     console.log(`  ${AUTO_USAGE}`);
     return;
   }
-  const enabled = (0, import_core30.parseAutonomyLevel)(arg);
+  const enabled = (0, import_core32.parseAutonomyLevel)(arg);
   if (enabled === null) fail(AUTO_USAGE);
   settings.setAutonomousMode(enabled);
-  console.log(settings.autonomousModeOverridden() ? `${(0, import_core30.autonomyLevelLabel)(enabled)} is saved, but ORDEWELL_AUTONOMOUS_MODE in the environment decides the level until it is unset.` : `Autonomy level: ${(0, import_core30.autonomyLevelLabel)(enabled)} for new plans.`);
+  console.log(settings.autonomousModeOverridden() ? `${(0, import_core32.autonomyLevelLabel)(enabled)} is saved, but ORDEWELL_AUTONOMOUS_MODE in the environment decides the level until it is unset.` : `Autonomy level: ${(0, import_core32.autonomyLevelLabel)(enabled)} for new plans.`);
 }
 async function handleRefresh(subArgs, injectedApi) {
   const api = await connect(subArgs, injectedApi);
@@ -4701,7 +4774,7 @@ async function handleApprove(subArgs, injectedApi) {
 }
 
 // src/commands/task-assign.ts
-var import_core32 = require("@ordewell/core");
+var import_core34 = require("@ordewell/core");
 var import_plan_utils4 = require("@ordewell/core/plan-utils");
 
 // src/tui/taskAssignment.ts
@@ -4743,7 +4816,7 @@ function modesForTask(modesByRunner, task) {
 
 // src/tui/state.ts
 var import_plan_utils3 = require("@ordewell/core/plan-utils");
-var import_core31 = require("@ordewell/core");
+var import_core33 = require("@ordewell/core");
 
 // src/tui/editor.ts
 function emptyEditor() {
@@ -4904,7 +4977,6 @@ function queuedTarget(tv) {
   for (let i = queued.length - 1; i >= 0; i--) if (!queued[i].forced) return i;
   return -1;
 }
-var anyTaskRunning = (state) => state.tasks.some(import_core31.isTaskRunning);
 var plannerInFlight = (state) => state.planner !== "idle";
 var planPaneOpen = (state) => state.focus === "plan" && !state.overlay && (!!state.taskEditor || !!state.expandedTaskId);
 function planRows(state) {
@@ -4929,10 +5001,10 @@ function waitingCheckpoint(task) {
   return task?.status === "awaiting_user" && task.awaitingReason === "checkpoint" ? task.checkpoint : void 0;
 }
 function continuesTask(task) {
-  return task ? (0, import_core31.logContinues)(task) : false;
+  return task ? (0, import_core33.logContinues)(task) : false;
 }
 function resumesTask(task) {
-  return task ? (0, import_core31.logResumes)(task) : false;
+  return task ? (0, import_core33.logResumes)(task) : false;
 }
 function findTask(tasks, id) {
   return (0, import_plan_utils3.taskPlacement)(tasks, id)?.task;
@@ -4941,10 +5013,10 @@ function scriptTaskView(state) {
   return state.taskView ? findTask(state.tasks, state.taskView.taskId)?.type === "script" : false;
 }
 function refFor(state, task) {
-  return (0, import_core31.taskRefOf)(state.tasks, task.id) ?? (0, import_core31.taskRef)(task);
+  return (0, import_core33.taskRefOf)(state.tasks, task.id) ?? (0, import_core33.taskRef)(task);
 }
 function titledRefFor(state, task) {
-  return (0, import_core31.titledTaskRefOf)(state.tasks, task.id) ?? (0, import_core31.titledTaskRef)(task);
+  return (0, import_core33.titledTaskRefOf)(state.tasks, task.id) ?? (0, import_core33.titledTaskRef)(task);
 }
 function asRunTasks(tasks) {
   return tasks.map((task) => ({ ...task, subtasks: asRunTasks(task.subtasks ?? []) }));
@@ -4952,7 +5024,7 @@ function asRunTasks(tasks) {
 function seedRun(overrides) {
   if (overrides.run) return overrides.run;
   return {
-    ...import_core31.EMPTY_RUN,
+    ...import_core33.EMPTY_RUN,
     tasks: asRunTasks(overrides.tasks ?? []),
     handoff: overrides.handoff ?? null,
     runMerge: overrides.runMerge ? { waitingAtGate: overrides.runMerge.waitingAtGate, paused: overrides.runMerge.paused, repos: overrides.runMerge.handoff.repos, landed: overrides.runMerge.handoff.landed } : null
@@ -4961,11 +5033,11 @@ function seedRun(overrides) {
 function initialState(overrides = {}) {
   return {
     editor: emptyEditor(),
-    conversation: import_core31.EMPTY_CONVERSATION,
+    conversation: import_core33.EMPTY_CONVERSATION,
     accountLimits: [],
     servedModels: {},
     taskView: null,
-    turnGate: import_core31.NO_TURN,
+    turnGate: import_core33.NO_TURN,
     detailAll: false,
     status: "idle",
     planner: "idle",
@@ -4991,16 +5063,17 @@ function initialState(overrides = {}) {
     plannerProvider: "",
     plannerEffort: "",
     plannerModels: {},
-    maxParallel: import_core31.DEFAULT_MAX_PARALLEL,
+    maxParallel: import_core33.DEFAULT_MAX_PARALLEL,
     configuredProviders: [],
     allowlist: {},
     autonomous: false,
-    runSettings: { ...import_core31.RUN_SETTINGS_DEFAULTS },
+    runSettings: { ...import_core33.RUN_SETTINGS_DEFAULTS },
     runSettingsKnown: false,
     settingsRead: 0,
     runSettingsRead: 0,
     plannerKnown: false,
     runnersKnown: false,
+    plannerDetecting: false,
     providersKnown: false,
     isolationPreview: void 0,
     isolationPreviewRead: 0,
@@ -5016,7 +5089,7 @@ function initialState(overrides = {}) {
     plannerPause: null,
     overlay: null,
     pendingApprovals: [],
-    queuedPrompts: import_core31.EMPTY_HOLD,
+    queuedPrompts: import_core33.EMPTY_HOLD,
     stopArmed: false,
     stopArmToken: 0,
     stopRequested: false,
@@ -5026,6 +5099,7 @@ function initialState(overrides = {}) {
     cols: 80,
     exiting: false,
     spinnerFrame: 0,
+    now: 0,
     ...overrides,
     run: seedRun(overrides)
   };
@@ -5152,7 +5226,7 @@ Mode \xB7 ${namedOf(tasks, task)}${task.assignedRunner ? ` (${task.assignedRunne
       for (const m of modes) {
         console.log(`  ${m.id === task.taskMode ? "*" : " "} ${m.id.padEnd(14)} ${m.label}${m.unavailable ? ": unavailable on this host" : m.description ? `: ${m.description}` : ""}`);
       }
-      const notice = (0, import_core32.codexSandboxNotice)(catalog.modesByRunner);
+      const notice = (0, import_core34.codexSandboxNotice)(catalog.modesByRunner);
       if (notice) console.log(`
   ${notice.line}
   ${notice.docs}`);
@@ -5202,7 +5276,7 @@ var SKILLS_USAGE = "Usage: ordewell task-skills <task-id-or-order> [<name> [<nam
 async function handleTaskSkills(subArgs, injectedApi) {
   await withTask(subArgs, SKILLS_USAGE, injectedApi, async (api, sessionId, task, tasks, value) => {
     if (task.type !== "ai") fail("Manual tasks do not run an executor, so they take no skills.");
-    const catalog = (0, import_core32.createSkillsService)(flag(subArgs, "--workspace") || process.cwd(), new import_core32.EnvConfig().workspaceRepos).listSkills().filter((s) => s.appliesTo === "task");
+    const catalog = (0, import_core34.createSkillsService)(flag(subArgs, "--workspace") || process.cwd(), new import_core34.EnvConfig().workspaceRepos).listSkills().filter((s) => s.appliesTo === "task");
     if (!value) {
       console.log(`
 Skills \xB7 ${namedOf(tasks, task)}
@@ -5249,10 +5323,10 @@ ${namedOf(tasks, task)} is ${task.ops ? "an ops task: it runs in your checkout o
 // src/tui/index.ts
 var import_child_process4 = require("child_process");
 var import_path7 = require("path");
-var import_core55 = require("@ordewell/core");
+var import_core58 = require("@ordewell/core");
 
 // src/tui/slash.ts
-var import_core33 = require("@ordewell/core");
+var import_core35 = require("@ordewell/core");
 var SLASH_COMMANDS = [
   // Planning. There is deliberately no `/plan`: typing the goal *is* the way to
   // start planning, and an alias for it only shadowed `/planner` on completion.
@@ -5265,6 +5339,7 @@ var SLASH_COMMANDS = [
   { name: "add-task", usage: "/add-task <title>", description: "Add a task to the current plan", category: "tasks" },
   { name: "remove-task", usage: "/remove-task <id>", description: "Remove a task from the plan", category: "tasks" },
   { name: "complete", usage: "/complete <id>", description: "Mark a task complete (asks first)", category: "tasks" },
+  { name: "revert", usage: "/revert <id>", description: "Take a task's landed work back off the integration branch (asks first)", category: "tasks" },
   { name: "uncomplete", usage: "/uncomplete <id>", description: "Mark a completed task not done (asks first)", category: "tasks" },
   { name: "skip", usage: "/skip <id>", description: "Skip a task", category: "tasks" },
   { name: "retry", usage: "/retry <id>", description: "Re-run a failed task", category: "tasks" },
@@ -5273,6 +5348,7 @@ var SLASH_COMMANDS = [
   { name: "continue", usage: "/continue <id> <message>", description: "Continue a finished task in its saved runner session, with your message", category: "tasks" },
   { name: "open", usage: "/open <id>", description: "Open a started task's chat: its view, and the keys that answer its checkpoint or tool request", category: "tasks" },
   { name: "checkpoint", usage: "/checkpoint <id> approve|reject [reason]", description: "Answer the checkpoint a task waits at: approve lets it go on, reject tells it why not", category: "tasks" },
+  { name: "inbox", usage: "/inbox", description: "List everything waiting on you, and answer it or open its task", category: "tasks" },
   { name: "task-runner", usage: "/task-runner <id> [runner]", description: "Choose or set a task's executor (re-picks its model and mode)", category: "tasks" },
   { name: "task-model", usage: "/task-model <id> [model]", description: "Choose or set a task's executor model", category: "tasks" },
   { name: "task-effort", usage: "/task-effort <id> [level]", description: "Choose or set a task's thinking effort", category: "tasks" },
@@ -5286,7 +5362,7 @@ var SLASH_COMMANDS = [
   { name: "allowlist", usage: "/allowlist [set <runner> <ids> | clear <runner>]", description: "Limit which models a runner may use", category: "models" },
   { name: "runners", usage: "/runners [<id> on|off]", description: `Enable or disable runners (${runnerIdList()})`, category: "models" },
   { name: "login", usage: "/login [<runner>]", description: "Sign the active coding agent in, or the one named, in this terminal", category: "models" },
-  { name: "settings", usage: "/settings", description: "Run settings: autonomy, supervisor, merging, autorun and parallel tasks", category: "models" },
+  { name: "settings", usage: "/settings", description: `Run settings: autonomy, supervisor, merging, autorun, parallel tasks${import_core35.DELEGATION_OFFERED ? " and delegation" : ""}`, category: "models" },
   { name: "refresh", usage: "/refresh", description: "Re-check runners; reread settings and cached models", category: "models" },
   // Sessions
   { name: "sessions", usage: "/sessions", description: "List saved sessions", category: "session" },
@@ -5386,7 +5462,7 @@ function parseRunnerCommand(text) {
   return match ? { name: match[1], args: (match[2] ?? "").trim() } : null;
 }
 function runnerCommandFor(commands, name) {
-  return (0, import_core33.findRunnerCommand)(commands, name) ?? (0, import_core33.findRunnerCommand)(commands, name.toLowerCase());
+  return (0, import_core35.findRunnerCommand)(commands, name) ?? (0, import_core35.findRunnerCommand)(commands, name.toLowerCase());
 }
 function composerCompletions(token, runner) {
   if (runner) return token.start === 0 ? runner.filter((c) => c.name.toLowerCase().startsWith(token.name)).map((c) => c.name) : [];
@@ -5398,7 +5474,7 @@ function tokenCompletions(token) {
 }
 
 // src/tui/accountLimits.ts
-var import_core34 = require("@ordewell/core");
+var import_core36 = require("@ordewell/core");
 function assignmentKey(task) {
   return `${task.assignedRunner}\0${task.assignedModel?.modelId ?? ""}`;
 }
@@ -5412,7 +5488,7 @@ function observeTaskServedModel(state, action) {
     state.taskView?.taskId === task.id ? state.taskView.attempts.at(-1) ?? 0 : 0
   );
   if (action.attempt < latest) return state;
-  const model = (0, import_core34.lastServedModel)(action.events);
+  const model = (0, import_core36.lastServedModel)(action.events);
   if (!model && action.attempt === before?.attempt) return state;
   const served = { attempt: action.attempt, ...model ? { model, assignment: assignmentKey(task) } : {} };
   return { ...state, servedModels: { ...state.servedModels, [task.id]: served } };
@@ -5474,10 +5550,10 @@ function chatEditorRoomFor(state, active) {
 }
 
 // src/tui/layout.ts
-var import_core37 = require("@ordewell/core");
+var import_core39 = require("@ordewell/core");
 
 // src/tui/reducers/pickers.ts
-var import_core35 = require("@ordewell/core");
+var import_core37 = require("@ordewell/core");
 var import_plan_utils5 = require("@ordewell/core/plan-utils");
 var DEFAULT_EFFORT = "__runner_default__";
 function picker(title, items, action, extra = {}) {
@@ -5502,13 +5578,13 @@ function modelDetail(m) {
   return [m.provider, m.pricing].filter(Boolean).join(" \xB7 ") || void 0;
 }
 function plannerModelItems(state, provider, selectedId) {
-  const runner = (0, import_core35.runnerForProvider)(provider);
+  const runner = (0, import_core37.runnerForProvider)(provider);
   if (!runner) {
     const failed = Object.entries(state.providerErrors ?? {});
     const unavailable = failed.length === 0 ? [] : [{
       id: "",
       label: "Some providers are unavailable",
-      detail: `\u26A0 ${failed.map(([id]) => (0, import_core35.getProviderMeta)(id)?.label ?? id).join(", ")}: key or fetch failed`,
+      detail: `\u26A0 ${failed.map(([id]) => (0, import_core37.getProviderMeta)(id)?.label ?? id).join(", ")}: key or fetch failed`,
       disabled: true
     }];
     return [
@@ -5528,11 +5604,11 @@ function plannerModelItems(state, provider, selectedId) {
   return items.length > 0 ? items : [{ id: "", label: `No ${runner} models discovered yet`, detail: "run /refresh", disabled: true }];
 }
 function plannerHarnessModel(state, provider, modelId) {
-  const runner = (0, import_core35.runnerForProvider)(provider);
+  const runner = (0, import_core37.runnerForProvider)(provider);
   return runner ? state.models.find((m) => m.id === modelId && m.runners?.includes(runner)) : void 0;
 }
 function plannerEffortItems(state, provider, modelId, selectedEffort) {
-  if (!(0, import_core35.runnerForProvider)(provider)) {
+  if (!(0, import_core37.runnerForProvider)(provider)) {
     return [{ id: "", label: "Thinking effort applies to a coding-agent planner", detail: "switch with /planner", disabled: true }];
   }
   const model = plannerHarnessModel(state, provider, modelId);
@@ -5644,12 +5720,12 @@ function pickerItemsFor(state, action) {
 function plannerItems(state) {
   const installed = new Map(state.runners.map((runner) => [runner.id, runner]));
   const usability = {};
-  for (const id of import_core35.CLI_PROVIDERS) {
-    const runner = (0, import_core35.runnerForProvider)(id);
+  for (const id of import_core37.CLI_PROVIDERS) {
+    const runner = (0, import_core37.runnerForProvider)(id);
     const known = installed.get(runner);
     usability[runner] = known ? { usable: true, ...known.auth ? { auth: known.auth } : {} } : { usable: false, reason: "CLI not installed or not on PATH" };
   }
-  const offered2 = (0, import_core35.plannerBackendEntries)(usability, state.configuredProviders).filter((entry) => entry.usable);
+  const offered2 = (0, import_core37.plannerBackendEntries)(usability, state.configuredProviders).filter((entry) => entry.usable);
   if (offered2.length === 0) {
     return [{ id: "", label: "No planner available", detail: `install a coding agent (${runnerNamesOr()}) or add a key with /key`, disabled: true }];
   }
@@ -5680,7 +5756,7 @@ function cliVersion() {
 }
 
 // src/tui/planKeys.ts
-var import_core36 = require("@ordewell/core");
+var import_core38 = require("@ordewell/core");
 var PLAN_KEYS = {
   move: { keys: "up / down", meaning: "move between tasks", group: "Navigation" },
   scroll: { keys: "pgup / pgdn", meaning: "scroll the plan", group: "Navigation" },
@@ -5704,16 +5780,16 @@ var PLAN_KEYS = {
     meaning: "start the task, approving it if it waits for you; it starts once its dependencies finish",
     group: "Run",
     // Added after the plan was approved, it waits for this key; the row says the same.
-    hint: (task) => task && (0, import_core36.taskRowView)(task).waitsForApproval ? "f approve" : "f start"
+    hint: (task) => task && (0, import_core38.taskRowView)(task).waitsForApproval ? "f approve" : "f start"
   },
   runPlan: { keys: "E", meaning: "run the whole plan", group: "Run", hint: "E run plan" },
   stop: { keys: "S", meaning: "stop the run", group: "Run", hint: "S stop" },
   cancel: {
     keys: "c",
-    meaning: "cancel the task's runner, or keep a task paused on a usage limit from resuming on its own",
+    meaning: "cancel the task's runner, withdraw a conflict repair waiting to start, or keep a task paused on a usage limit from resuming on its own",
     group: "Run",
     // `c` cancels the resume while the task has one; it has no runner to cancel then.
-    hint: (task) => task && (0, import_core36.resumeLabel)(task) ? "c don't resume" : "c cancel"
+    hint: (task) => task && (0, import_core38.resumeLabel)(task) ? "c don't resume" : task && (0, import_core38.taskRowView)(task).repairWaiting ? "c stop repair" : "c cancel"
   },
   resume: { keys: "r", meaning: "resume a task paused on a usage limit now, once the limit has reset", group: "Run", hint: "r resume now" },
   resolve: { keys: "x", meaning: "resolve a merge conflict", group: "Run", hint: "x resolve conflict" },
@@ -5723,7 +5799,7 @@ var PLAN_KEYS = {
     meaning: "mark the task done, or take it back",
     group: "Status",
     // `m` toggles, so the hint names the direction it will go for this task.
-    hint: (task) => task && (0, import_core36.markAction)(task) === "uncomplete" ? "m undone" : "m done"
+    hint: (task) => task && (0, import_core38.markAction)(task) === "uncomplete" ? "m undone" : "m done"
   },
   skip: { keys: "s", meaning: "skip the task: none of its work lands, and what depends on it goes ahead", group: "Status", hint: "s skip" },
   remove: { keys: "d", meaning: "remove the task", group: "Status" },
@@ -5750,9 +5826,10 @@ function hintOf(id, task) {
 }
 function taskKeyIds(task, runActive) {
   if (!task) return ["add"];
-  const row = (0, import_core36.taskRowView)(task);
+  const row = (0, import_core38.taskRowView)(task);
   const chat = (...ids) => row.chatAvailable ? ids : ids.filter((id) => id !== "log");
-  if (row.conflict) return chat("resolve", "log");
+  if (row.conflict) return row.conflict.resolver ? chat("log") : chat("resolve", "log");
+  if (row.repairWaiting) return chat("cancel", "log");
   if (row.actions.includes("resume-now") || row.resumes) {
     return chat(...row.actions.includes("resume-now") ? ["resume"] : [], ...row.resumes ? ["cancel"] : [], "skip", "log");
   }
@@ -5780,7 +5857,7 @@ function planFooterHints(task, runActive) {
 }
 
 // src/tui/layout.ts
-var import_core38 = require("@ordewell/core");
+var import_core40 = require("@ordewell/core");
 var CHROME_ROWS = 1;
 var COMPOSER_WINDOW_CHARS = 8 * 1024;
 var COMPOSER_BAND_ROWS = 2;
@@ -5827,7 +5904,7 @@ function footerHints(state) {
     }
     return [...escHint ? [escHint] : [], ...planFooterHints(selected, state.status === "executing")];
   }
-  const detailHint = (0, import_core38.hasHiddenDetail)(state.taskView ? state.taskView.view.blocks : state.conversation.blocks) ? [state.detailAll ? "ctrl-o collapse all" : "ctrl-o expand all"] : [];
+  const detailHint = (0, import_core40.hasHiddenDetail)(state.taskView ? state.taskView.view.blocks : state.conversation.blocks) ? [state.detailAll ? "ctrl-o collapse all" : "ctrl-o expand all"] : [];
   return [
     "/help",
     ...checkpointHints,
@@ -5902,12 +5979,13 @@ function logHeaderTask(task) {
     resumeAt: task?.resumeAt ?? null,
     idleSince: task?.idleSince ?? null,
     continuable: task?.continuable === true,
+    ...task?.isolation?.state === "conflict" && task.isolation.repairWaits ? { repairWaits: task.isolation.repairWaits } : {},
     attemptUsage: task?.attemptUsage ?? []
   };
 }
 function logHeader(state, tv) {
   const task = findTask(state.tasks, tv.taskId);
-  return (0, import_core38.taskLogHeaderView)(logHeaderTask(task), tv, task?.awaitingApproval ?? 0, tv.attempt);
+  return (0, import_core40.taskLogHeaderView)(logHeaderTask(task), tv, task?.awaitingApproval ?? 0, tv.attempt);
 }
 function taskHeaderLines(state, tv, cols) {
   const task = findTask(state.tasks, tv.taskId);
@@ -5915,7 +5993,7 @@ function taskHeaderLines(state, tv, cols) {
   const parts = [
     `\u2192 Task ${task ? refFor(state, task).slice(1) : "?"}`,
     task?.title ?? "(task removed)",
-    (task && (0, import_core38.assignedRunnerOf)(task)) ?? "",
+    (task && (0, import_core40.assignedRunnerOf)(task)) ?? "",
     task ? inRow(header.state.label) : "",
     header.resumes ? inRow(header.resumes) : ""
   ].filter(Boolean);
@@ -5933,31 +6011,44 @@ function taskHeaderLines(state, tv, cols) {
 function stopHint(state) {
   return plannerInFlight(state) && state.stopArmed ? "Press Esc again to stop" : "";
 }
-var DOT_TICKS = 4;
 var SPINNER_CYCLE = 40;
 function runnerStoppable(state) {
   const tv = state.taskView;
-  if (!tv || !chatActivity(state)?.busy) return false;
+  const activity = chatActivity(state);
+  if (!tv || !(activity?.busy || activity?.quiet)) return false;
   if (scriptTaskView(state)) return false;
   const task = findTask(state.tasks, tv.taskId);
   return !task?.awaitingApproval && !waitingApproval(tv);
 }
+function animating(state) {
+  return state.tasks.some((t) => (0, import_core40.taskStatusKind)(t) === "running") || !!chatActivity(state)?.busy;
+}
+function activityTime(state, now) {
+  return (0, import_core40.elapsedSince)(chatActivity(state)?.since, now);
+}
 function chatActivity(state) {
   const tv = state.taskView;
   if (!tv) {
     if (state.status === "starting") return { label: "Starting the plan\u2026", busy: true };
     if (!plannerInFlight(state)) return null;
-    const label = state.planner === "condensing" ? "Condensing\u2026" : state.planner === "compacting" ? "Compacting\u2026" : state.planner === "awaiting" ? "Waiting for the planner\u2026" : "Planning\u2026";
-    return { label, busy: true };
+    const label = state.plannerDetecting ? DETECTING : state.planner === "condensing" ? "Condensing\u2026" : state.planner === "compacting" ? "Compacting\u2026" : state.planner === "awaiting" ? "Waiting for the planner\u2026" : "Planning\u2026";
+    const since = state.turnGate.open !== null ? state.turnGate.openedAt : void 0;
+    return since ? { label, busy: true, since } : { label, busy: true };
   }
   const own = findTask(state.tasks, tv.taskId);
   const task = state.tasks.find((t) => t.subtasks?.some((s) => s.id === tv.taskId)) ?? own;
   if (!task) return null;
-  const attaching = (0, import_core38.attachingLabel)(task);
+  const attaching = (0, import_core40.attachingLabel)(task);
   if (attaching) return { label: `${attaching}\u2026`, busy: true };
-  if ((0, import_core31.isTaskRunning)(task) || own && (0, import_core31.isTaskRunning)(own)) return { label: "Working\u2026", busy: true };
+  if ((0, import_core33.isTaskRunning)(task) || own && (0, import_core33.isTaskRunning)(own)) {
+    const running2 = (0, import_core33.isTaskRunning)(task) ? task : own;
+    const archived = tv.attempts.length > 0 && tv.attempt < Math.max(...tv.attempts);
+    const activity = running2 && (0, import_core40.taskActivity)({ ...tv.view, archived }, running2);
+    if (!activity) return null;
+    return activity.busy ? activity : { ...activity, quiet: true };
+  }
   const at = task.status === "awaiting_user" && task.awaitingReason === "usage-limit" && task.resumeAt ? new Date(task.resumeAt) : null;
-  if (at && !Number.isNaN(at.getTime())) return { label: `paused \xB7 resumes ${(0, import_core38.resumeTime)(at)}`, busy: false };
+  if (at && !Number.isNaN(at.getTime())) return { label: `paused \xB7 resumes ${(0, import_core40.resumeTime)(at)}`, busy: false };
   return null;
 }
 function runHints(state) {
@@ -5967,6 +6058,10 @@ function runHints(state) {
   return state.runMerge?.paused ? ["paused for Merge all: /handoff merge", "paused \xB7 /handoff merge", "merge paused"] : [];
 }
 var runHint = (state) => runHints(state)[0] ?? "";
+function inboxHint(state) {
+  const waiting = state.run.escalations?.length ?? 0;
+  return waiting > 0 ? `${waiting} waiting: /inbox` : "";
+}
 function packHints(hints, cols) {
   const lines = [];
   let current = "";
@@ -6016,7 +6111,7 @@ function plannerResendRow(state, cols) {
   const at = plannerResend ? new Date(plannerResend.at) : null;
   if (!plannerResend || !at || Number.isNaN(at.getTime())) return [];
   const whose = plannerResend.runner ? `${plannerResend.runner}'s` : "the planner's";
-  return [style.yellow(truncate(`\u23F8 Resending at ${(0, import_core38.resumeTime)(at)}, once ${whose} usage limit resets \xB7 /resend cancel keeps it for your next message`, cols))];
+  return [style.yellow(truncate(`\u23F8 Resending at ${(0, import_core40.resumeTime)(at)}, once ${whose} usage limit resets \xB7 /resend cancel keeps it for your next message`, cols))];
 }
 function plannerPauseRow(state, cols) {
   const { plannerPause } = state;
@@ -6024,18 +6119,18 @@ function plannerPauseRow(state, cols) {
   return [style.yellow(truncate(`\u23F8 Planner paused: its context does not fit ${plannerPause.model}'s window \xB7 /compact retry attempts recovery \xB7 /stop drops the turn`, cols))];
 }
 var tokenRow = (state, blocks2, cols) => {
-  const runner = (0, import_core38.runnerForProvider)(state.plannerProvider);
-  const limits = (0, import_core38.accountLimitsOf)(state.accountLimits, runner ?? void 0, state.orchestratorModel);
+  const runner = (0, import_core40.runnerForProvider)(state.plannerProvider);
+  const limits = (0, import_core40.accountLimitsOf)(state.accountLimits, runner ?? void 0, state.orchestratorModel);
   const line = tokenLine(blocks2, cols, limits);
   return line ? [line] : [];
 };
 function taskUsageFooter(state, tv, cols) {
   const task = findTask(state.tasks, tv.taskId);
-  const limits = (0, import_core38.accountLimitsOf)(state.accountLimits, task && (0, import_core38.assignedRunnerOf)(task), task && taskServedModel(state, task)).map(import_core38.accountLimitsText).filter(Boolean).join(" \xB7 ");
+  const limits = (0, import_core40.accountLimitsOf)(state.accountLimits, task && (0, import_core40.assignedRunnerOf)(task), task && taskServedModel(state, task)).map(import_core40.accountLimitsText).filter(Boolean).join(" \xB7 ");
   const rows = logHeader(state, tv).usage;
   const text = rows.map((row, index) => {
     if (!limits || index !== rows.length - 1) return row.text;
-    const context = (0, import_core38.contextMeterText)(row.contextFill);
+    const context = (0, import_core40.contextMeterText)(row.contextFill);
     return context ? row.text.replace(context, `${context} \xB7 ${limits}`) : `${limits} \xB7 ${row.text}`;
   });
   if (text.length === 0 && limits) text.push(limits);
@@ -6122,22 +6217,23 @@ function chatScrollMax(state) {
 }
 function plannerSetup(state) {
   const provider = state.plannerProvider;
-  const registration = (0, import_core38.getProviderMeta)(provider);
+  const registration = (0, import_core40.getProviderMeta)(provider);
   if (!registration) return { label: "not set", ready: false };
-  const runner = (0, import_core38.runnerForProvider)(provider);
-  const ready = runner ? state.runners.some((r) => r.id === runner) : (0, import_core38.isApiProvider)(provider) && state.configuredProviders.includes(provider);
+  const runner = (0, import_core40.runnerForProvider)(provider);
+  const ready = runner ? state.runners.some((r) => r.id === runner) : (0, import_core40.isApiProvider)(provider) && state.configuredProviders.includes(provider);
   return { label: registration.label, ready };
 }
 var SETUP_KEY_COLS = 10;
 var SETUP_VALUE_COLS = 32;
 function runSettingsValue(state) {
   if (!state.runSettingsKnown) return style.grey("\u2026");
-  const { supervisorLevel, mergeAtGatesAutomatically, autorun } = state.runSettings;
-  const level = `supervisor ${import_core37.SUPERVISOR_LEVEL_LABEL[supervisorLevel]}`;
+  const { supervisorLevel, mergeAtGatesAutomatically, autorun, delegationTokens } = state.runSettings;
+  const level = `supervisor ${import_core39.SUPERVISOR_LEVEL_LABEL[supervisorLevel]}`;
   return [
     supervisorLevel === "act" ? style.yellow(level) : level,
     `auto-merge ${mergeAtGatesAutomatically ? "on" : "off"}`,
-    autorun ? style.yellow("autorun on") : "autorun off"
+    autorun ? style.yellow("autorun on") : "autorun off",
+    ...import_core39.DELEGATION_OFFERED && delegationTokens > 0 ? [style.yellow("delegation on")] : []
   ].join(" \xB7 ");
 }
 function plannerEffortLabel(state) {
@@ -6222,7 +6318,7 @@ function isolationPreviewLines(state, cols) {
   if (!preview) {
     return [head, ...wrap(style.grey(CHECKING_REPOSITORIES), room), ""];
   }
-  const notice = (0, import_core38.describeIsolationPreview)(preview);
+  const notice = (0, import_core40.describeIsolationPreview)(preview);
   const important = preview.status === "dirty" || preview.status === "failed";
   const summary = important ? style.yellow(notice.summary) : notice.summary;
   return [
@@ -6236,7 +6332,7 @@ function isolationPreviewLines(state, cols) {
 }
 function signedOutPlannerLines(state, cols) {
   if (!state.plannerKnown || !state.runnersKnown) return [];
-  const planned = (0, import_core38.runnerForProvider)(state.plannerProvider);
+  const planned = (0, import_core40.runnerForProvider)(state.plannerProvider);
   const flagged = state.runners.filter(signedOutWithLogin);
   const active = flagged.find((row) => row.id === planned);
   const room = Math.max(1, cols - 1);
@@ -6246,7 +6342,7 @@ function signedOutPlannerLines(state, cols) {
   ));
 }
 function plannerRowValue(state, label) {
-  const alarm = state.runners.find((row) => row.id === (0, import_core38.runnerForProvider)(state.plannerProvider));
+  const alarm = state.runners.find((row) => row.id === (0, import_core40.runnerForProvider)(state.plannerProvider));
   const paint = alarm && signedOutWithLogin(alarm) ? style.red : (text) => text;
   const effort = plannerEffortLabel(state);
   const model = state.orchestratorModel ? paint(state.orchestratorModel) : style.yellow("no model");
@@ -6314,10 +6410,11 @@ var STATUS_ICON = {
   quiet: "~",
   todo: "\xB7"
 };
+var QUIET_MARK = STATUS_ICON.quiet;
 var inRow = (label) => label.charAt(0).toLowerCase() + label.slice(1);
 function planLayout(state, rows, cols) {
   const done = state.tasks.filter((t) => t.status === "completed").length;
-  const totalUsage = (0, import_core38.tasksTotalText)(state.tasks);
+  const totalUsage = (0, import_core40.tasksTotalText)(state.tasks);
   const unmerged = state.runMerge?.handoff.landed.length ?? 0;
   const count = `${done}/${state.tasks.length}`;
   const hints = runHints(state);
@@ -6403,7 +6500,7 @@ function modelsByRunnerOf(models) {
 function taskLines(state, planRow, index, cols) {
   const { task, parent } = planRow;
   const runnerScope = state.runners.length > 0 ? { enabledRunners: state.runners.filter((r) => r.enabled).map((r) => r.id), allowlist: state.allowlist, models: modelsByRunnerOf(state.models) } : void 0;
-  const row = (0, import_core38.taskRowView)(task, { parent, tasks: state.tasks, modes: modesForTask(state.modesByRunner, task), runnerScope });
+  const row = (0, import_core40.taskRowView)(task, { parent, tasks: state.tasks, modes: modesForTask(state.modesByRunner, task), runnerScope });
   const selected = state.focus === "plan" && index === state.selectedTask;
   const expanded = state.expandedTaskId === task.id;
   const rawIcon = row.status === "running" ? SPINNER[state.spinnerFrame % SPINNER.length] : STATUS_ICON[row.status];
@@ -6442,7 +6539,12 @@ function taskLines(state, planRow, index, cols) {
   if (row.conflict) {
     const where = row.conflict.repo ? ` in ${row.conflict.repo}` : "";
     const files = row.conflict.files ? ` (${row.conflict.files})` : "";
-    lines.push(...statusLines(style.red, "\u26A0", `merge conflict${where}${files}: its work is kept on its own branch`, cols, bodyPad));
+    const held = row.conflict.resolver ? `task ${row.conflict.resolver} is resolving it` : "its work is kept on its own branch";
+    lines.push(...statusLines(style.red, "\u26A0", `merge conflict${where}${files}: ${held}`, cols, bodyPad));
+  }
+  if (row.repairWaiting) {
+    const files = row.repairWaiting.files ? ` (${row.repairWaiting.files})` : "";
+    lines.push(...statusLines(style.yellow, "\u23F8", `${inRow(row.repairWaiting.label)}${files}`, cols, bodyPad));
   }
   if (row.repairing) {
     const files = row.repairing.files ? ` in ${row.repairing.files}` : "";
@@ -6459,13 +6561,13 @@ function taskLines(state, planRow, index, cols) {
     lines.push(...statusLines(style.yellow, "\u23F8", `${inRow(row.waitsForApproval)} \xB7 f approves it \xB7 /run approves all`, cols, bodyPad));
   }
   if (row.holdReason) {
-    lines.push(...statusLines(style.yellow, "\u23F8", `${inRow((0, import_core38.holdLabel)(row.holdReason))} \xB7 retry or f start when ready`, cols, bodyPad));
+    lines.push(...statusLines(style.yellow, "\u23F8", `${inRow((0, import_core40.holdLabel)(row.holdReason))} \xB7 retry or f start when ready`, cols, bodyPad));
   }
   if (row.blockedBy) {
-    lines.push(...statusLines(style.red, "\u2298", `${inRow((0, import_core38.blockedByLabel)(row.blockedBy))}: runs once ${row.blockedBy.length === 1 ? "it is retried and passes" : "they are retried and pass"}`, cols, bodyPad));
+    lines.push(...statusLines(style.red, "\u2298", `${inRow((0, import_core40.blockedByLabel)(row.blockedBy))}: runs once ${row.blockedBy.length === 1 ? "it is retried and passes" : "they are retried and pass"}`, cols, bodyPad));
   }
   if (row.status === "skipped") {
-    lines.push(...statusLines(style.grey, "\xBB", `${inRow((0, import_core38.skippedLabel)(row.skipReason))}: nothing of it landed; m done lands its kept work`, cols, bodyPad));
+    lines.push(...statusLines(style.grey, "\xBB", `${inRow((0, import_core40.skippedLabel)(row.skipReason))}: nothing of it landed; m done lands its kept work`, cols, bodyPad));
   }
   const resumable = row.actions.includes("resume-now");
   if (row.resumes) {
@@ -6482,11 +6584,11 @@ function taskLines(state, planRow, index, cols) {
   let editorLine;
   if (expanded) {
     if (row.handoff) {
-      lines.push(...taskText("Handoff", (0, import_core38.handoffPeekParts)(row.handoff).map(sanitize).join(" \xB7 "), cols, bodyPad));
+      lines.push(...taskText("Handoff", (0, import_core40.handoffPeekParts)(row.handoff).map(sanitize).join(" \xB7 "), cols, bodyPad));
     }
     if (skills) lines.push(style.grey(truncate(`${bodyPad}skills: ${skills}`, cols)));
     if (effort || mode) lines.push(style.grey(truncate(`${bodyPad}${[effort, mode].filter(Boolean).join(" \xB7 ")}`, cols)));
-    lines.push(style.grey(`${bodyPad}${STATUS_WORD[(0, import_core38.taskStatusKind)(task)]}`));
+    lines.push(style.grey(`${bodyPad}${STATUS_WORD[(0, import_core40.taskStatusKind)(task)]}`));
     if (task.isolation && task.isolation.state !== "none" && task.isolation.branch) {
       lines.push(...taskText("Branch", task.isolation.branch, cols, bodyPad));
       if (row.repos.length > 0) lines.push(...taskText("Repos", row.repos.join(", "), cols, bodyPad));
@@ -6501,7 +6603,7 @@ function taskLines(state, planRow, index, cols) {
       lines.push(...taskText("Ops", "Runs in your checkout, not a worktree, once the work it depends on is merged. O makes it a change task.", cols, bodyPad));
     }
     if (row.kind === "script") {
-      lines.push(...taskText("Script", (0, import_core38.scriptTaskText)(task).replace(/\t/g, "    "), cols, bodyPad));
+      lines.push(...taskText("Script", (0, import_core40.scriptTaskText)(task).replace(/\t/g, "    "), cols, bodyPad));
       lines.push(...taskText("Ops", "Runs in your checkout with no model, once the work it depends on is merged.", cols, bodyPad));
     }
     if (row.forcedPastGate) {
@@ -6545,7 +6647,7 @@ var LOOP_PAINT = {
 };
 function loopLines(loop, cols, pad2) {
   const paint = loop.role === "body" ? style.cyan : LOOP_PAINT[loop.state];
-  return statusLines(paint, "\u21BB", (0, import_core38.loopRowParts)(loop).map(inRow).join(" \xB7 "), cols, pad2);
+  return statusLines(paint, "\u21BB", (0, import_core40.loopRowParts)(loop).map(inRow).join(" \xB7 "), cols, pad2);
 }
 function statusLines(paint, glyph, text, cols, pad2) {
   const lead = `${pad2}${glyph} `;
@@ -6688,8 +6790,8 @@ function helpScrollMax(state) {
 }
 
 // src/tui/render.ts
-var import_core39 = require("@ordewell/core");
-var import_core40 = require("@ordewell/core");
+var import_core41 = require("@ordewell/core");
+var import_core42 = require("@ordewell/core");
 function render(state) {
   const { rows, cols } = state;
   const rowsForBody = bodyRows(state);
@@ -6791,15 +6893,16 @@ function settingsBadge(state) {
 }
 function runSettingsBadge(state) {
   if (!state.runSettingsKnown) return style.grey("run settings \u2026");
-  const { supervisorLevel, mergeAtGatesAutomatically, autorun } = state.runSettings;
+  const { supervisorLevel, mergeAtGatesAutomatically, autorun, delegationTokens } = state.runSettings;
   const paint = (text, warn) => warn ? style.yellow(text) : style.grey(text);
   const run = state.status === "executing" ? state.runSupervisor : null;
-  const actual = run?.unsupervised ? "unsupervised" : run && run.level !== supervisorLevel ? import_core40.SUPERVISOR_LEVEL_LABEL[run.level] : null;
-  const level = `supervisor ${import_core40.SUPERVISOR_LEVEL_LABEL[supervisorLevel]}${actual ? ` \u2192 ${actual}` : ""}`;
+  const actual = run?.unsupervised ? "unsupervised" : run && run.level !== supervisorLevel ? import_core42.SUPERVISOR_LEVEL_LABEL[run.level] : null;
+  const level = `supervisor ${import_core42.SUPERVISOR_LEVEL_LABEL[supervisorLevel]}${actual ? ` \u2192 ${actual}` : ""}`;
   return [
     paint(level, supervisorLevel === "act"),
     ...mergeAtGatesAutomatically ? [style.grey("auto-merge")] : [],
-    ...autorun ? [style.yellow("autorun")] : []
+    ...autorun ? [style.yellow("autorun")] : [],
+    ...import_core42.DELEGATION_OFFERED && delegationTokens > 0 ? [style.yellow("delegation")] : []
   ].join(style.grey(" \xB7 "));
 }
 function scrolledBackMark(state) {
@@ -6818,13 +6921,18 @@ function statusText(state, cols, panes) {
   if (armed) return truncate(style.red(armed), cols);
   const activity = chatActivity(state);
   const hint = !panes.plan || panes.plan.rows === 0 ? runHint(state) : "";
-  const notes = [mark, activity && !activity.busy ? activity.label : "", hint, state.toast].filter(Boolean).join(" \xB7 ");
-  if (activity?.busy) {
-    const lit = Math.floor(state.spinnerFrame / DOT_TICKS) % 2 === 0;
-    const dot = lit ? style.brand("\u25CF") : style.grey("\u25CF");
+  const inbox = inboxHint(state);
+  const notes = [mark, activity && !activity.busy ? activity.label : "", hint, inbox, state.toast].filter(Boolean).join(" \xB7 ");
+  if (activity?.busy || activity?.quiet) {
+    const glyph = activity.busy ? SPINNER[state.spinnerFrame % SPINNER.length] : QUIET_MARK;
     const scrolled = mark ? style.grey(`${mark} \xB7 `) : "";
     const stop = runnerStoppable(state) ? " \xB7 ctrl-x to stop" : "";
-    return truncate(`${scrolled}${dot} ${activity.label}${stop}`, cols);
+    const elapsed = (0, import_core41.elapsedSince)(activity.since, state.now);
+    const time = elapsed ? ` ${elapsed}` : "";
+    const room = Math.max(1, cols - width(scrolled) - width(glyph) - 1 - width(time) - width(stop));
+    const label = truncate(sanitize(activity.label).replace(/\s+/g, " ").trim(), room);
+    const count = inbox && width(label) + width(inbox) + 3 <= room ? style.grey(` \xB7 ${inbox}`) : "";
+    return truncate(`${scrolled}${style.brand(glyph)} ${label}${time}${count}${stop}`, cols);
   }
   return notes ? truncate(style.grey(notes), cols) : "";
 }
@@ -6883,10 +6991,10 @@ function composerLines(state, view) {
   const continuation = " ".repeat(width(prompt));
   if (!lines || !view) {
     const visible = text.replace(/\n/g, "\xB6").replace(/\t/g, " ");
-    const painted = paintSpans(visible, 0, highlightSpans(text, state.taskView ? (0, import_core39.taskLogCommands)(state.taskView.view) : null));
+    const painted = paintSpans(visible, 0, highlightSpans(text, state.taskView ? (0, import_core41.taskLogCommands)(state.taskView.view) : null));
     return [prompt + painted + suggest(state, room - width(visible))];
   }
-  const spans = highlightSpans(view.text, state.taskView ? (0, import_core39.taskLogCommands)(state.taskView.view) : null);
+  const spans = highlightSpans(view.text, state.taskView ? (0, import_core41.taskLogCommands)(state.taskView.view) : null);
   const { line: lineIndex, col } = cursorInLines(lines, cursor - view.base, view.text.length);
   return lines.map(({ line: raw, start: base }, i) => {
     const prefix = i === 0 ? prompt : continuation;
@@ -6905,7 +7013,7 @@ function suggest(state, room) {
   if (state.focus === "plan" || room <= 2) return "";
   const token = activeToken(state.editor.text, state.editor.cursor);
   if (!token) return "";
-  const matches = composerCompletions(token, state.taskView ? (0, import_core39.taskLogCommands)(state.taskView.view) : null);
+  const matches = composerCompletions(token, state.taskView ? (0, import_core41.taskLogCommands)(state.taskView.view) : null);
   if (matches.length === 0) return "";
   const names = matches.join(" ");
   return style.bandGrey(`  ${truncate(names, Math.max(0, room - 2))}`);
@@ -6971,23 +7079,23 @@ function renderHandoff(state, overlay, rows, cols) {
     const { lines, scroll } = overlay.diff;
     const shown = lines.slice(scroll, scroll + room).map((line) => paintDiffLine(truncate(line, Math.max(1, cols - 2))));
     const more = scroll + room < lines.length ? "\u2191\u2193 pgup/pgdn scroll \xB7 " : "";
-    return frame(`Diff: ${(0, import_core39.handoffBranchName)(handoff)}`, [...shown, "", style.grey(`${more}enter or esc goes back`)], rows, cols);
+    return frame(`Diff: ${(0, import_core41.handoffBranchName)(handoff)}`, [...shown, "", style.grey(`${more}enter or esc goes back`)], rows, cols);
   }
   const landed = handoff.landed.length === 0 ? [style.grey("Nothing landed on it.")] : handoff.landed.map((task) => {
-    const repaired = task.repairedFiles?.length ? style.yellow(`: repaired (${(0, import_core39.capConflictFiles)(task.repairedFiles)})`) : "";
-    return `  ${style.green("\u2713")} ${(0, import_core39.titledTaskRefOf)(state.tasks, task.taskId) ?? (0, import_core39.titledTaskRef)(task)}${repaired}`;
+    const repaired = task.repairedFiles?.length ? style.yellow(`: repaired (${(0, import_core41.capConflictFiles)(task.repairedFiles)})`) : "";
+    return `  ${style.green("\u2713")} ${(0, import_core41.titledTaskRefOf)(state.tasks, task.taskId) ?? (0, import_core41.titledTaskRef)(task)}${repaired}`;
   });
   const actions = handoffActions(handoff).map((action, index) => {
     const active = index === overlay.index;
     const caret = active ? style.brand("\u276F") : " ";
     return `${caret} ${active ? style.bold(action.label) : action.label}${style.grey(`: ${action.hint}`)}`;
   });
-  const perRepo = (0, import_core39.isRepoGroup)(handoff) ? ["Per repository:", ...handoff.repos.map((repo, i) => `  ${repo.landed.length > 0 ? style.green("\u2713") : style.grey("\xB7")} ${(0, import_core39.repoResultLines)(handoff)[i]}`), ""] : [];
+  const perRepo = (0, import_core41.isRepoGroup)(handoff) ? ["Per repository:", ...handoff.repos.map((repo, i) => `  ${repo.landed.length > 0 ? style.green("\u2713") : style.grey("\xB7")} ${(0, import_core41.repoResultLines)(handoff)[i]}`), ""] : [];
   return frame(
     "Run handoff",
     [
-      `Branch  ${style.brand((0, import_core39.handoffBranchName)(handoff))}`,
-      style.grey(`Forked from ${(0, import_core39.handoffBaseLine)(handoff, 12)}`),
+      `Branch  ${style.brand((0, import_core41.handoffBranchName)(handoff))}`,
+      style.grey(`Forked from ${(0, import_core41.handoffBaseLine)(handoff, 12)}`),
       "",
       ...perRepo,
       "Landed on it, in plan order:",
@@ -7149,13 +7257,13 @@ function frame(title, body, rows, cols) {
 }
 
 // src/tui/reducer.ts
-var import_core52 = require("@ordewell/core");
+var import_core55 = require("@ordewell/core");
 
 // src/tui/reducers/overlays.ts
-var import_core51 = require("@ordewell/core");
+var import_core53 = require("@ordewell/core");
 
 // src/tui/reducers/approvals.ts
-var import_core41 = require("@ordewell/core");
+var import_core43 = require("@ordewell/core");
 
 // src/tui/reducers/shared.ts
 function step(state, effects = []) {
@@ -7294,7 +7402,7 @@ function syncApprovals(state, waiting) {
   const ids = new Set(waiting.map((request) => request.id));
   const open = state.overlay?.kind === "approval" ? [state.overlay.request] : [];
   const answered = [...open, ...state.pendingApprovals].filter((request) => !ids.has(request.id));
-  const dropped = answered.reduce((current, request) => dropApproval(current, request.id), { ...state, conversation: (0, import_core41.reconcileApprovals)(state.conversation, waiting) });
+  const dropped = answered.reduce((current, request) => dropApproval(current, request.id), { ...state, conversation: (0, import_core43.reconcileApprovals)(state.conversation, waiting) });
   return waiting.reduce((current, { id, kind, subject, scope, detail, body }) => kind === "runner_tool" ? current : enqueueApproval(current, { id, kind, subject, scope, ...detail ? { detail } : {}, ...body ? { body } : {} }), dropped);
 }
 function showNextApproval(state) {
@@ -7319,10 +7427,10 @@ function scrollApproval(state, overlay, key) {
 }
 
 // src/tui/reducers/commands.ts
-var import_core50 = require("@ordewell/core");
+var import_core52 = require("@ordewell/core");
 
 // src/tui/reducers/plannerStepper.ts
-var import_core42 = require("@ordewell/core");
+var import_core44 = require("@ordewell/core");
 var offered = (items) => new Set(items.filter((i) => !i.disabled).map((i) => i.id));
 function preferredModel(state, provider) {
   const listed = offered(plannerModelItems(state, provider, ""));
@@ -7370,11 +7478,11 @@ var plannerStepper = {
     const model = plannerModelItems(state, provider, "").find((m) => m.id === modelId);
     const level = plannerEffortItems(state, provider, modelId, "").find((e) => e.id === effort);
     const parts = [
-      (0, import_core42.getProviderMeta)(provider)?.label ?? provider,
+      (0, import_core44.getProviderMeta)(provider)?.label ?? provider,
       model?.label ?? modelId,
       ...effort ? [effortLabel(level?.label ?? effort)] : []
     ];
-    const active = state.runners.find((row) => row.id === (0, import_core42.runnerForProvider)(provider));
+    const active = state.runners.find((row) => row.id === (0, import_core44.runnerForProvider)(provider));
     const noticeLevel = active && signedOutWithLogin(active) ? "error" : void 0;
     return step({
       ...state,
@@ -7386,8 +7494,284 @@ var plannerStepper = {
   }
 };
 
+// src/tui/reducers/taskView.ts
+var import_core45 = require("@ordewell/core");
+function openTaskView(state, sessionId, taskId) {
+  const task = findTask(state.tasks, taskId);
+  if (!task) return fail3(state, `No task ${taskId} in this plan.`);
+  if (!(0, import_core45.taskRowView)(task).chatAvailable) {
+    return fail3(state, "This task hasn\u2019t started yet. Its chat becomes available when it starts.");
+  }
+  const taskView = {
+    taskId,
+    ...import_core45.EMPTY_TASK_LOG_FOLLOW,
+    queuedIndex: null
+  };
+  return step({ ...state, taskView, focus: "chat", scroll: 0 }, [{ type: "openTaskLog", sessionId, taskId }]);
+}
+function continueTaskStep(state, sessionId, taskId, text) {
+  const opened = state.taskView?.taskId === taskId ? step({ ...state, taskView: { ...state.taskView, followLatest: true } }) : openTaskView(state, sessionId, taskId);
+  const watch = state.status !== "executing";
+  return step(opened.state, [...opened.effects, { type: "continueTask", sessionId, taskId, text, ...watch ? { watch: true } : {} }]);
+}
+function clampQueueIndex(tv) {
+  if (tv.queuedIndex === null) return tv;
+  if (tv.view.queued.length === 0) return { ...tv, queuedIndex: null };
+  const max = tv.view.queued.length - 1;
+  return tv.queuedIndex <= max ? tv : { ...tv, queuedIndex: max };
+}
+function taskLogAbandoned(state) {
+  const tv = state.taskView;
+  if (!tv || tv.loaded) return state;
+  return { ...state, taskView: clampQueueIndex({ ...tv, ...(0, import_core45.followTaskLog)(tv, { type: "loaded", attempt: tv.attempt, events: [], abandoned: true }) }) };
+}
+function taskLogArrived(state, action) {
+  state = observeTaskServedModel(state, action);
+  const tv = state.taskView;
+  if (!tv || tv.taskId !== action.taskId) return state;
+  const next = (0, import_core45.followTaskLog)(tv, { ...action, type: "live" });
+  return { ...state, taskView: next === tv ? tv : clampQueueIndex({ ...tv, ...next }) };
+}
+function announceApprovals(state, action) {
+  if (state.taskView?.taskId === action.taskId) return state;
+  const task = findTask(state.tasks, action.taskId);
+  const way = task ? `tab to the plan, select task ${refFor(state, task)} and press enter (or /open ${refFor(state, task)})` : "tab to the plan, select it and press enter";
+  const spoken = action.events.reduce((s, event) => event.type === "approval_requested" && !event.decided ? say(s, "system", `Task ${task ? refFor(state, task) : "?"} waits for approval: ${(0, import_core45.runnerToolSubject)(event.tool, event.args)}: ${way}, then ctrl-y allows or ctrl-g denies`) : s, state);
+  return spoken !== state ? { ...spoken, scroll: state.scroll } : spoken;
+}
+function announceCheckpoint(state, action) {
+  const task = findTask(state.tasks, action.taskId) ?? state.tasks.find((t) => t.title === action.title);
+  const label = task ? `Task ${refFor(state, task)}` : action.title;
+  const where = task ? `tab to the plan, select task ${refFor(state, task)} and press enter (or /open ${refFor(state, task)}) to answer` : "tab to the plan, select it and press enter to answer";
+  const spoken = say(state, "system", `${label} asks: ${(0, import_core45.truncateCheckpointSummary)(action.summary)}: ${where}`);
+  return { ...spoken, scroll: state.scroll };
+}
+function taskLogLoaded(state, action) {
+  state = observeTaskServedModel(state, action);
+  const tv = state.taskView;
+  if (!tv || tv.taskId !== action.taskId) return state;
+  return { ...state, taskView: clampQueueIndex({ ...tv, ...(0, import_core45.followTaskLog)(tv, { ...action, type: "loaded" }) }) };
+}
+function answerApproval(state, tv, sessionId, decision) {
+  const approval = waitingApproval(tv);
+  if (!approval?.approvalId) return step(say(state, "system", "Nothing is waiting for approval."));
+  if (decision === "allowForTask" && !approval.allowForTask) {
+    return step(say(state, "system", "The runner offered no grant for the rest of this task: ctrl-y allows this call."));
+  }
+  const note = decision === "deny" ? state.editor.text.trim() : "";
+  const answer = decision === "deny" ? { decision, ...note ? { note } : {} } : { decision };
+  const next = note ? { ...state, editor: { ...state.editor, text: "", cursor: 0 } } : state;
+  return step(next, [{ type: "answerTaskApproval", sessionId, approvalId: approval.approvalId, answer }]);
+}
+function answerCheckpoint(state, sessionId, taskId, answer, reason = "") {
+  const task = findTask(state.tasks, taskId);
+  if (!waitingCheckpoint(task)) return step(say(state, "system", `Task ${task?.order ?? taskId} is not waiting at a checkpoint.`));
+  const note = answer === "reject" ? reason.trim() : "";
+  return step(state, [{ type: "answerTaskCheckpoint", sessionId, taskId, answer, ...note ? { reason: note } : {} }]);
+}
+function answerWaiting(state, tv, sessionId, decision) {
+  if (waitingApproval(tv) || !waitingCheckpoint(findTask(state.tasks, tv.taskId))) return answerApproval(state, tv, sessionId, decision);
+  if (decision === "allow") return answerCheckpoint(state, sessionId, tv.taskId, "approve");
+  const answered = answerCheckpoint(state, sessionId, tv.taskId, "reject", state.editor.text);
+  return state.editor.text.trim() ? { ...answered, state: { ...answered.state, editor: { ...answered.state.editor, text: "", cursor: 0 } } } : answered;
+}
+function sendNow(state, tv, sessionId) {
+  const text = state.editor.text.trim();
+  if (text) {
+    const task = findTask(state.tasks, tv.taskId);
+    if (continuesTask(task)) {
+      return step(say(state, "system", resumesTask(task) ? "The task is paused on a usage limit, so there is no turn to interrupt: enter resumes it." : "The task has finished, so there is no turn to interrupt: enter continues it."));
+    }
+    return step({ ...state, editor: commit(state.editor) }, [{ type: "forceSendTaskMessage", sessionId, taskId: tv.taskId, text }]);
+  }
+  const queued = tv.view.queued[queuedTarget(tv)];
+  if (!queued) return step(say(state, "system", "Nothing to send now: type a message, or pick a queued one with ctrl-n/ctrl-p."));
+  return step({ ...state, taskView: { ...tv, queuedIndex: null } }, [
+    { type: "forceSendQueuedTaskMessage", sessionId, taskId: tv.taskId, messageId: queued.id }
+  ]);
+}
+function handleTaskViewKey(state, key) {
+  const tv = state.taskView;
+  if (!tv || !state.sessionId) return null;
+  if (key.name === "alt-left" || key.name === "alt-right") {
+    const index = tv.attempts.indexOf(tv.loadingAttempt ?? tv.attempt);
+    if (index < 0) return null;
+    const target = key.name === "alt-left" ? index - 1 : index + 1;
+    const attempt = tv.attempts[target];
+    if (attempt === void 0) {
+      return step(say(state, "system", target < 0 ? "This is the first attempt." : "This is the latest attempt."));
+    }
+    return step(
+      { ...state, taskView: { ...tv, ...(0, import_core45.followTaskLog)(tv, { type: "picked", attempt }) } },
+      [{ type: "loadTaskAttempt", sessionId: state.sessionId, taskId: tv.taskId, attempt }]
+    );
+  }
+  if (scriptTaskView(state)) return null;
+  if (key.name === "ctrl-r") {
+    const queued = tv.view.queued[queuedTarget(tv)];
+    if (!queued) return step(say(state, "system", "No queued message to remove."));
+    if (queued.handedOver) return step(say(state, "system", "The runner already has that message; it can no longer be taken back."));
+    return step(state, [{ type: "removeTaskMessage", sessionId: state.sessionId, taskId: tv.taskId, messageId: queued.id }]);
+  }
+  if (key.name === "ctrl-s") return sendNow(state, tv, state.sessionId);
+  if (key.name === "ctrl-x") {
+    const task = findTask(state.tasks, tv.taskId);
+    if (task && (0, import_core45.resumeLabel)(task)) return step(state, [{ type: "taskAction", sessionId: state.sessionId, taskId: tv.taskId, action: "cancel-resume" }]);
+    return step(state, [{ type: "interruptTask", sessionId: state.sessionId, taskId: tv.taskId }]);
+  }
+  if (key.name === "ctrl-y") return answerWaiting(state, tv, state.sessionId, "allow");
+  if (key.name === "ctrl-t") return answerApproval(state, tv, state.sessionId, "allowForTask");
+  if (key.name === "ctrl-g") return answerWaiting(state, tv, state.sessionId, "deny");
+  if (key.name === "ctrl-n" || key.name === "ctrl-p") {
+    const count = tv.view.queued.length;
+    if (count === 0) return null;
+    const delta = key.name === "ctrl-n" ? 1 : -1;
+    const from = queuedTarget(tv);
+    const queuedIndex = from < 0 ? count - 1 : Math.max(0, Math.min(count - 1, from + delta));
+    return step({ ...state, taskView: { ...tv, queuedIndex } });
+  }
+  return null;
+}
+
+// src/tui/reducers/inbox.ts
+var SPAWNS_RUNNER = /* @__PURE__ */ new Set(["retry", "resume", "continue", "force-start", "run"]);
+var OPEN_TASK = "__open-task";
+var NOTHING = "Nothing is waiting on you.";
+var GONE = "That is no longer waiting on you: the list changed. Run /inbox to see what is.";
+var listOf = (state) => state.run.escalations ?? [];
+var find = (state, id) => listOf(state).find((e) => e.id === id);
+var oneLine3 = (state, text) => truncate(sanitize(text).replace(/\s+/g, " ").trim(), Math.max(1, state.cols));
+var labelOf = (state, e) => e.task ? oneLine3(state, `${e.task.ref} ${e.task.title}`) : "The run";
+function inboxItems(state) {
+  return listOf(state).map((e) => ({ id: e.id, label: labelOf(state, e), detail: oneLine3(state, e.reason) }));
+}
+function optionDetail(option) {
+  if (option.confirm) return "asks first";
+  if (option.note === "required") return "needs a note";
+  if (option.note === "optional") return "takes a note";
+  return void 0;
+}
+function answerItems(state, e) {
+  const options = e.options.map((o) => ({ id: o.id, label: o.label, detail: optionDetail(o) }));
+  return e.task ? [...options, { id: OPEN_TASK, label: "Open the task", detail: oneLine3(state, `${e.task.ref} ${e.task.title}`) }] : options;
+}
+function inboxPicker(state, index = 0) {
+  return {
+    title: "Waiting on you",
+    items: inboxItems(state),
+    filter: "",
+    index,
+    multi: false,
+    chosen: [],
+    filterable: false,
+    action: { kind: "inbox" }
+  };
+}
+function answerPicker(state, e) {
+  return {
+    title: labelOf(state, e),
+    hint: oneLine3(state, e.reason),
+    items: answerItems(state, e),
+    filter: "",
+    index: 0,
+    multi: false,
+    chosen: [],
+    filterable: false,
+    action: { kind: "inbox-answer", escalationId: e.id }
+  };
+}
+function openInbox(state) {
+  if (listOf(state).length === 0) return step(say(state, "system", NOTHING));
+  return step({ ...state, overlay: { kind: "picker", picker: inboxPicker(state) } });
+}
+function chooseEscalation(state, id) {
+  const e = find(state, id);
+  if (!e) return gone(state);
+  return step({ ...state, overlay: { kind: "picker", picker: answerPicker(state, e) } });
+}
+function chooseAnswer(state, escalationId, itemId) {
+  const e = find(state, escalationId);
+  if (!e) return gone(state);
+  const closed = { ...state, overlay: null };
+  if (itemId === OPEN_TASK) {
+    return e.task && state.sessionId ? openTaskView(closed, state.sessionId, e.task.id) : step(closed);
+  }
+  const option = e.options.find((o) => o.id === itemId);
+  if (!option) return gone(state);
+  if (option.note) {
+    return step({
+      ...state,
+      overlay: {
+        kind: "prompt",
+        title: `${option.label}: ${oneLine3(state, e.reason)}`,
+        hint: option.note === "required" ? "A note is required. Enter sends it, esc cancels." : "A note is optional: enter alone sends none, esc cancels.",
+        value: "",
+        action: { kind: "escalation-note", escalationId, option: option.id, required: option.note === "required", ...option.confirm ? { confirm: option.confirm } : {} }
+      }
+    });
+  }
+  return option.confirm ? askFirst(state, escalationId, option) : submit(closed, escalationId, option.id);
+}
+function noteEntered(state, action, note) {
+  if (!note && action.required) return step(state);
+  const closed = { ...state, overlay: null };
+  const option = find(state, action.escalationId)?.options.find((o) => o.id === action.option);
+  if (!option) return gone(closed);
+  return option.confirm ? askFirst(state, action.escalationId, option, note) : submit(closed, action.escalationId, option.id, note);
+}
+function askFirst(state, escalationId, option, note) {
+  return step({
+    ...state,
+    overlay: {
+      kind: "confirm",
+      title: `${option.label}?`,
+      message: sanitize(option.confirm ?? ""),
+      action: { kind: "answer-escalation", escalationId, option: option.id, ...note ? { note } : {} }
+    }
+  });
+}
+function confirmedAnswer(state, escalationId, option, note) {
+  return submit({ ...state, overlay: null }, escalationId, option, note, true);
+}
+function submit(state, escalationId, option, note, confirmed) {
+  if (!state.sessionId) return fail3(state, "No active plan.");
+  if (!find(state, escalationId)) return fail3(state, GONE);
+  const effect = {
+    type: "answerEscalation",
+    sessionId: state.sessionId,
+    id: escalationId,
+    option,
+    ...note ? { note } : {},
+    ...confirmed ? { confirmed } : {},
+    ...SPAWNS_RUNNER.has(option) && state.status !== "executing" ? { watch: true } : {}
+  };
+  return step(state, [effect]);
+}
+function gone(state) {
+  const refused = fail3(state, GONE).state;
+  return step(listOf(state).length === 0 ? { ...refused, overlay: null } : { ...refused, overlay: { kind: "picker", picker: inboxPicker(state) } });
+}
+function refillInbox(state) {
+  const overlay = state.overlay;
+  if (overlay?.kind !== "picker") return state;
+  const { action } = overlay.picker;
+  if (action.kind !== "inbox" && action.kind !== "inbox-answer") return state;
+  if (action.kind === "inbox") {
+    if (listOf(state).length === 0) return say({ ...state, overlay: null }, "system", NOTHING);
+    const kept2 = overlay.picker.items[overlay.picker.index]?.id;
+    const index2 = Math.max(0, listOf(state).findIndex((e2) => e2.id === kept2));
+    return { ...state, overlay: { kind: "picker", picker: { ...inboxPicker(state, index2) } } };
+  }
+  const e = find(state, action.escalationId);
+  if (!e) return gone(state).state;
+  const kept = overlay.picker.items[overlay.picker.index]?.id;
+  const items = answerItems(state, e);
+  const index = Math.max(0, items.findIndex((i) => i.id === kept));
+  return { ...state, overlay: { kind: "picker", picker: { ...answerPicker(state, e), index } } };
+}
+
 // src/tui/reducers/stepper.ts
-var import_core43 = require("@ordewell/core");
+var import_core46 = require("@ordewell/core");
 function openStepper(state, definition) {
   const { choices, lists } = settle(state, definition, {});
   const first = lists.findIndex((list2) => list2 !== null);
@@ -7410,7 +7794,7 @@ function handleStepperKey(state, stepper, key) {
   const reopen = (next) => step({ ...state, overlay: { kind: "stepper", stepper: next } });
   const { definition, current, entry, choices } = stepper;
   const def = definition.steps[current];
-  const typed = def.number && entry ? (0, import_core43.parseCount)(entry.text, def.number.min) : null;
+  const typed = def.number && entry ? (0, import_core46.parseCount)(entry.text, def.number.min) : null;
   const { lists } = settle(state, definition, choices);
   const items = matchingItems(stepper.items, stepper.filter);
   const before = lastIndexBefore(lists, current);
@@ -7483,7 +7867,7 @@ function settle(state, definition, wanted) {
   const lists = definition.steps.map((def) => {
     if (def.skip?.(state, { ...choices })) return null;
     if (def.number) {
-      choices[def.id] = String((0, import_core43.parseCount)(wanted[def.id], def.number.min) ?? def.number.current(state, { ...choices }));
+      choices[def.id] = String((0, import_core46.parseCount)(wanted[def.id], def.number.min) ?? def.number.current(state, { ...choices }));
       return [];
     }
     const items = def.items(state, { ...choices });
@@ -7522,149 +7906,10 @@ function lastIndexBefore(lists, index) {
 }
 
 // src/tui/reducers/planPane.ts
-var import_core46 = require("@ordewell/core");
-
-// src/tui/reducers/taskView.ts
-var import_core44 = require("@ordewell/core");
-function openTaskView(state, sessionId, taskId) {
-  const task = findTask(state.tasks, taskId);
-  if (!task) return fail3(state, `No task ${taskId} in this plan.`);
-  if (!(0, import_core44.taskRowView)(task).chatAvailable) {
-    return fail3(state, "This task hasn\u2019t started yet. Its chat becomes available when it starts.");
-  }
-  const taskView = {
-    taskId,
-    ...import_core44.EMPTY_TASK_LOG_FOLLOW,
-    queuedIndex: null
-  };
-  return step({ ...state, taskView, focus: "chat", scroll: 0 }, [{ type: "openTaskLog", sessionId, taskId }]);
-}
-function continueTaskStep(state, sessionId, taskId, text) {
-  const opened = state.taskView?.taskId === taskId ? step({ ...state, taskView: { ...state.taskView, followLatest: true } }) : openTaskView(state, sessionId, taskId);
-  const watch = state.status !== "executing";
-  return step(opened.state, [...opened.effects, { type: "continueTask", sessionId, taskId, text, ...watch ? { watch: true } : {} }]);
-}
-function clampQueueIndex(tv) {
-  if (tv.queuedIndex === null) return tv;
-  if (tv.view.queued.length === 0) return { ...tv, queuedIndex: null };
-  const max = tv.view.queued.length - 1;
-  return tv.queuedIndex <= max ? tv : { ...tv, queuedIndex: max };
-}
-function taskLogAbandoned(state) {
-  const tv = state.taskView;
-  if (!tv || tv.loaded) return state;
-  return { ...state, taskView: clampQueueIndex({ ...tv, ...(0, import_core44.followTaskLog)(tv, { type: "loaded", attempt: tv.attempt, events: [], abandoned: true }) }) };
-}
-function taskLogArrived(state, action) {
-  state = observeTaskServedModel(state, action);
-  const tv = state.taskView;
-  if (!tv || tv.taskId !== action.taskId) return state;
-  const next = (0, import_core44.followTaskLog)(tv, { ...action, type: "live" });
-  return { ...state, taskView: next === tv ? tv : clampQueueIndex({ ...tv, ...next }) };
-}
-function announceApprovals(state, action) {
-  if (state.taskView?.taskId === action.taskId) return state;
-  const task = findTask(state.tasks, action.taskId);
-  const way = task ? `tab to the plan, select task ${refFor(state, task)} and press enter (or /open ${refFor(state, task)})` : "tab to the plan, select it and press enter";
-  const spoken = action.events.reduce((s, event) => event.type === "approval_requested" && !event.decided ? say(s, "system", `Task ${task ? refFor(state, task) : "?"} waits for approval: ${(0, import_core44.runnerToolSubject)(event.tool, event.args)}: ${way}, then ctrl-y allows or ctrl-g denies`) : s, state);
-  return spoken !== state ? { ...spoken, scroll: state.scroll } : spoken;
-}
-function announceCheckpoint(state, action) {
-  const task = findTask(state.tasks, action.taskId) ?? state.tasks.find((t) => t.title === action.title);
-  const label = task ? `Task ${refFor(state, task)}` : action.title;
-  const where = task ? `tab to the plan, select task ${refFor(state, task)} and press enter (or /open ${refFor(state, task)}) to answer` : "tab to the plan, select it and press enter to answer";
-  const spoken = say(state, "system", `${label} asks: ${(0, import_core44.truncateCheckpointSummary)(action.summary)}: ${where}`);
-  return { ...spoken, scroll: state.scroll };
-}
-function taskLogLoaded(state, action) {
-  state = observeTaskServedModel(state, action);
-  const tv = state.taskView;
-  if (!tv || tv.taskId !== action.taskId) return state;
-  return { ...state, taskView: clampQueueIndex({ ...tv, ...(0, import_core44.followTaskLog)(tv, { ...action, type: "loaded" }) }) };
-}
-function answerApproval(state, tv, sessionId, decision) {
-  const approval = waitingApproval(tv);
-  if (!approval?.approvalId) return step(say(state, "system", "Nothing is waiting for approval."));
-  if (decision === "allowForTask" && !approval.allowForTask) {
-    return step(say(state, "system", "The runner offered no grant for the rest of this task: ctrl-y allows this call."));
-  }
-  const note = decision === "deny" ? state.editor.text.trim() : "";
-  const answer = decision === "deny" ? { decision, ...note ? { note } : {} } : { decision };
-  const next = note ? { ...state, editor: { ...state.editor, text: "", cursor: 0 } } : state;
-  return step(next, [{ type: "answerTaskApproval", sessionId, approvalId: approval.approvalId, answer }]);
-}
-function answerCheckpoint(state, sessionId, taskId, answer, reason = "") {
-  const task = findTask(state.tasks, taskId);
-  if (!waitingCheckpoint(task)) return step(say(state, "system", `Task ${task?.order ?? taskId} is not waiting at a checkpoint.`));
-  const note = answer === "reject" ? reason.trim() : "";
-  return step(state, [{ type: "answerTaskCheckpoint", sessionId, taskId, answer, ...note ? { reason: note } : {} }]);
-}
-function answerWaiting(state, tv, sessionId, decision) {
-  if (waitingApproval(tv) || !waitingCheckpoint(findTask(state.tasks, tv.taskId))) return answerApproval(state, tv, sessionId, decision);
-  if (decision === "allow") return answerCheckpoint(state, sessionId, tv.taskId, "approve");
-  const answered = answerCheckpoint(state, sessionId, tv.taskId, "reject", state.editor.text);
-  return state.editor.text.trim() ? { ...answered, state: { ...answered.state, editor: { ...answered.state.editor, text: "", cursor: 0 } } } : answered;
-}
-function sendNow(state, tv, sessionId) {
-  const text = state.editor.text.trim();
-  if (text) {
-    const task = findTask(state.tasks, tv.taskId);
-    if (continuesTask(task)) {
-      return step(say(state, "system", resumesTask(task) ? "The task is paused on a usage limit, so there is no turn to interrupt: enter resumes it." : "The task has finished, so there is no turn to interrupt: enter continues it."));
-    }
-    return step({ ...state, editor: commit(state.editor) }, [{ type: "forceSendTaskMessage", sessionId, taskId: tv.taskId, text }]);
-  }
-  const queued = tv.view.queued[queuedTarget(tv)];
-  if (!queued) return step(say(state, "system", "Nothing to send now: type a message, or pick a queued one with ctrl-n/ctrl-p."));
-  return step({ ...state, taskView: { ...tv, queuedIndex: null } }, [
-    { type: "forceSendQueuedTaskMessage", sessionId, taskId: tv.taskId, messageId: queued.id }
-  ]);
-}
-function handleTaskViewKey(state, key) {
-  const tv = state.taskView;
-  if (!tv || !state.sessionId) return null;
-  if (key.name === "alt-left" || key.name === "alt-right") {
-    const index = tv.attempts.indexOf(tv.loadingAttempt ?? tv.attempt);
-    if (index < 0) return null;
-    const target = key.name === "alt-left" ? index - 1 : index + 1;
-    const attempt = tv.attempts[target];
-    if (attempt === void 0) {
-      return step(say(state, "system", target < 0 ? "This is the first attempt." : "This is the latest attempt."));
-    }
-    return step(
-      { ...state, taskView: { ...tv, ...(0, import_core44.followTaskLog)(tv, { type: "picked", attempt }) } },
-      [{ type: "loadTaskAttempt", sessionId: state.sessionId, taskId: tv.taskId, attempt }]
-    );
-  }
-  if (scriptTaskView(state)) return null;
-  if (key.name === "ctrl-r") {
-    const queued = tv.view.queued[queuedTarget(tv)];
-    if (!queued) return step(say(state, "system", "No queued message to remove."));
-    if (queued.handedOver) return step(say(state, "system", "The runner already has that message; it can no longer be taken back."));
-    return step(state, [{ type: "removeTaskMessage", sessionId: state.sessionId, taskId: tv.taskId, messageId: queued.id }]);
-  }
-  if (key.name === "ctrl-s") return sendNow(state, tv, state.sessionId);
-  if (key.name === "ctrl-x") {
-    const task = findTask(state.tasks, tv.taskId);
-    if (task && (0, import_core44.resumeLabel)(task)) return step(state, [{ type: "taskAction", sessionId: state.sessionId, taskId: tv.taskId, action: "cancel-resume" }]);
-    return step(state, [{ type: "interruptTask", sessionId: state.sessionId, taskId: tv.taskId }]);
-  }
-  if (key.name === "ctrl-y") return answerWaiting(state, tv, state.sessionId, "allow");
-  if (key.name === "ctrl-t") return answerApproval(state, tv, state.sessionId, "allowForTask");
-  if (key.name === "ctrl-g") return answerWaiting(state, tv, state.sessionId, "deny");
-  if (key.name === "ctrl-n" || key.name === "ctrl-p") {
-    const count = tv.view.queued.length;
-    if (count === 0) return null;
-    const delta = key.name === "ctrl-n" ? 1 : -1;
-    const from = queuedTarget(tv);
-    const queuedIndex = from < 0 ? count - 1 : Math.max(0, Math.min(count - 1, from + delta));
-    return step({ ...state, taskView: { ...tv, queuedIndex } });
-  }
-  return null;
-}
+var import_core48 = require("@ordewell/core");
 
 // src/tui/reducers/taskEdits.ts
-var import_core45 = require("@ordewell/core");
+var import_core47 = require("@ordewell/core");
 var import_plan_utils6 = require("@ordewell/core/plan-utils");
 var noExecutor = (task, manual, script) => (0, import_plan_utils6.noExecutorRefusal)(task.type, manual, script);
 function openTaskRunnerPicker(state, task) {
@@ -7779,7 +8024,7 @@ function openTaskModePicker(state, task) {
       overlay: {
         kind: "picker",
         picker: picker(`Mode \xB7 ${refFor(state, task)}`, pickerItemsFor(state, action), action, {
-          hint: [`Modes declared by ${task.assignedRunner}.`, (0, import_core45.codexSandboxNotice)(state.modesByRunner)?.line].filter(Boolean).join(" ")
+          hint: [`Modes declared by ${task.assignedRunner}.`, (0, import_core47.codexSandboxNotice)(state.modesByRunner)?.line].filter(Boolean).join(" ")
         })
       }
     }
@@ -7959,9 +8204,9 @@ var PLAN_SHORTCUTS = {
   f: "force-start",
   s: "skip"
 };
-var SPAWNS_RUNNER = ["force-start", "retry", "resume-now"];
+var SPAWNS_RUNNER2 = ["force-start", "retry", "resume-now"];
 function taskActionEffect(state, sessionId, taskId, action, confirmed) {
-  const watch = SPAWNS_RUNNER.includes(action) && state.status !== "executing";
+  const watch = SPAWNS_RUNNER2.includes(action) && state.status !== "executing";
   return {
     type: "taskAction",
     sessionId,
@@ -7972,15 +8217,15 @@ function taskActionEffect(state, sessionId, taskId, action, confirmed) {
   };
 }
 function confirmMark(state, task, direction, shortcut) {
-  const needsYes = (0, import_core46.overrideNeedsConfirmation)(task);
+  const needsYes = (0, import_core48.overrideNeedsConfirmation)(task);
   if (!state.sessionId) return fail3(state, "No active plan.");
   if (!needsYes && !shortcut) return step(state, [taskActionEffect(state, state.sessionId, task.id, direction)]);
   const activity = state.run.activity;
   if (needsYes && activity?.advancesOnItsOwn) {
-    return fail3(state, (0, import_core46.manualOverrideStopFirst)(direction, `task ${titledRefFor(state, task)}`));
+    return fail3(state, (0, import_core48.manualOverrideStopFirst)(direction, `task ${titledRefFor(state, task)}`));
   }
   const label = `task ${titledRefFor(state, task)}`;
-  const message = needsYes ? (0, import_core46.manualOverrideConfirmation)(direction, label) : direction === "complete" ? `Mark ${label} done? It is your own sign-off: what depends on it can start.` : `Mark ${label} not done? Your sign-off is taken back and it waits until you retry or start it.`;
+  const message = needsYes ? (0, import_core48.manualOverrideConfirmation)(direction, label) : direction === "complete" ? `Mark ${label} done? It is your own sign-off: what depends on it can start.` : `Mark ${label} not done? Your sign-off is taken back and it waits until you retry or start it.`;
   return step({
     ...state,
     overlay: {
@@ -8033,11 +8278,11 @@ function handlePlanKey(state, key) {
   if (!state.sessionId || key.name !== "char") return step(state);
   if (key.char === "E") return startPlan(state, state.sessionId);
   if (key.char === "S") return step(state, [{ type: "stopExecution", sessionId: state.sessionId }]);
-  const shortcut = key.char === "c" && (0, import_core46.resumeLabel)(task) ? "cancel-resume" : PLAN_SHORTCUTS[key.char ?? ""];
+  const shortcut = key.char === "c" && (0, import_core48.resumeLabel)(task) ? "cancel-resume" : PLAN_SHORTCUTS[key.char ?? ""];
   if (key.char === "r") {
-    return (0, import_core46.taskRowActions)(task).includes("resume-now") ? step(state, [taskActionEffect(state, state.sessionId, task.id, "resume-now")]) : step(state);
+    return (0, import_core48.taskRowActions)(task).includes("resume-now") ? step(state, [taskActionEffect(state, state.sessionId, task.id, "resume-now")]) : step(state);
   }
-  if (key.char === "m") return confirmMark(state, task, (0, import_core46.markAction)(task), true);
+  if (key.char === "m") return confirmMark(state, task, (0, import_core48.markAction)(task), true);
   const action = shortcut;
   if (action === "force-start" && task.mergeGate?.length) return confirmForceStartPastGate(state, task);
   if (action) {
@@ -8046,7 +8291,7 @@ function handlePlanKey(state, key) {
   if (key.char === "O") return toggleTaskOps(state, task, row.parent !== null);
   if (key.char === "d") return confirmRemoveTask(state, task);
   if (key.char === "x" && task.isolation?.state === "conflict") {
-    return step(state, [{ type: "resolveConflict", sessionId: state.sessionId, taskId: task.id }]);
+    return step(state, [{ type: "resolveConflict", sessionId: state.sessionId, taskId: task.id, ...state.status === "executing" ? {} : { watch: true } }]);
   }
   if (key.char === "R") return openTaskRunnerPicker(state, task);
   if (key.char === "o") return openTaskModelPicker(state, task);
@@ -8078,9 +8323,9 @@ function commitTaskEdit(state, task, editor) {
 }
 
 // src/tui/reducers/turnQueue.ts
-var import_core47 = require("@ordewell/core");
+var import_core49 = require("@ordewell/core");
 function drainQueue(state, settled) {
-  const next = (0, import_core47.drainNext)(state.queuedPrompts);
+  const next = (0, import_core49.drainNext)(state.queuedPrompts);
   const ended = disarmStop({ ...settled, stopRequested: false, forceSendPending: null });
   if (!next) return step(ended);
   const spoken = say(ended, "user", next.text);
@@ -8095,7 +8340,7 @@ function restoreForced(state) {
   if (!forced) return state;
   const cleared = { ...state, forceSendPending: null };
   if (forced.queueIndex === void 0) {
-    const text = (0, import_core47.aheadOfDraft)(forced.text, state.editor.text);
+    const text = (0, import_core49.aheadOfDraft)(forced.text, state.editor.text);
     return { ...cleared, editor: { ...state.editor, text, cursor: text.length } };
   }
   const queued = [...state.queuedPrompts];
@@ -8111,15 +8356,15 @@ function stopPlanning(state, sessionId) {
   return step(queueToEditor(cutTurn({ ...dismissed, stopArmed: false, stopRequested: true, forceSendPending: null })), [{ type: "cancelPlanning", sessionId }]);
 }
 function queueToEditor(state) {
-  const all = (0, import_core47.unsendAll)(state.queuedPrompts);
+  const all = (0, import_core49.unsendAll)(state.queuedPrompts);
   if (!all) return state;
-  const text = (0, import_core47.aheadOfDraft)(all.text, state.editor.text);
+  const text = (0, import_core49.aheadOfDraft)(all.text, state.editor.text);
   return { ...state, queuedPrompts: all.rest, editor: { ...state.editor, text, cursor: all.text.length } };
 }
 function unsendLatest(state) {
-  const latest = (0, import_core47.unsendLatest)(state.queuedPrompts);
+  const latest = (0, import_core49.unsendLatest)(state.queuedPrompts);
   if (!latest) return step(state);
-  const text = (0, import_core47.aheadOfDraft)(latest.text, state.editor.text);
+  const text = (0, import_core49.aheadOfDraft)(latest.text, state.editor.text);
   return step({
     ...state,
     queuedPrompts: latest.rest,
@@ -8135,7 +8380,7 @@ function forceSendPlanner(state) {
       { type: "forceSendPlannerMessage", sessionId: state.sessionId, message: text }
     ]);
   }
-  const latest = (0, import_core47.unsendLatest)(state.queuedPrompts);
+  const latest = (0, import_core49.unsendLatest)(state.queuedPrompts);
   if (!latest) return step(say(state, "system", "Nothing to send now: type a message, or queue one with enter."));
   const forced = { text: latest.text, queueIndex: latest.rest.length };
   return step({ ...state, queuedPrompts: latest.rest, stopRequested: false, forceSendPending: forced }, [
@@ -8151,7 +8396,7 @@ function plannerEscape(state) {
 }
 
 // src/tui/reducers/incoming.ts
-var import_core48 = require("@ordewell/core");
+var import_core50 = require("@ordewell/core");
 var planText = (value, fallback = "") => sanitize(String(value ?? fallback));
 var planLabel = (value, fallback = "") => planText(value, fallback).replace(/\n+/g, " ");
 var asRecord = (value) => typeof value === "object" && value !== null ? value : {};
@@ -8206,7 +8451,7 @@ function runTaskToView(t) {
       ...Array.isArray(model.availableVariants) ? { availableVariants: model.availableVariants.map((variant) => planLabel(variant)) } : {}
     } : void 0,
     isolation: t.isolation,
-    awaitingReason: t.status === "awaiting_user" && (0, import_core48.isAwaitingReason)(t.awaitingReason) ? t.awaitingReason : void 0,
+    awaitingReason: t.status === "awaiting_user" && (0, import_core50.isAwaitingReason)(t.awaitingReason) ? t.awaitingReason : void 0,
     ...t.status === "awaiting_user" && t.awaitingReason === "usage-limit" && typeof t.resumeAt === "string" ? { resumeAt: t.resumeAt } : {},
     ...t.status === "skipped" && typeof t.skipReason === "string" ? { skipReason: sanitize(t.skipReason) } : {},
     checkpoint: typeof t.checkpoint === "string" ? sanitize(t.checkpoint) : void 0,
@@ -8214,6 +8459,7 @@ function runTaskToView(t) {
     awaitingApproval: t.awaitingApproval,
     ...t.waitsForApproval === true ? { waitsForApproval: true } : {},
     ...typeof t.holdReason === "string" && t.holdReason.trim() ? { holdReason: sanitize(t.holdReason) } : {},
+    ...t.loopStranded === true ? { loopStranded: true } : {},
     ...t.ops === true ? { ops: true } : {},
     ...t.research === true ? { research: true } : {},
     // Drawn through the same sanitize/wrap as any other plan text; keeping the
@@ -8233,13 +8479,13 @@ function supervisorOfRun(runSettings) {
   const unsupervised = typeof runSettings.unsupervised === "string" ? runSettings.unsupervised : void 0;
   return {
     runSupervisor: {
-      level: (0, import_core48.isSupervisorLevel)(runSettings.supervisorLevel) ? runSettings.supervisorLevel : "off",
+      level: (0, import_core50.isSupervisorLevel)(runSettings.supervisorLevel) ? runSettings.supervisorLevel : "off",
       ...unsupervised ? { unsupervised } : {}
     }
   };
 }
 function withRun(state, run) {
-  return {
+  return refillInbox({
     ...state,
     run,
     tasks: run.tasks.map(runTaskToView),
@@ -8247,10 +8493,10 @@ function withRun(state, run) {
     runMerge: run.runMerge ? { waitingAtGate: run.runMerge.waitingAtGate, paused: run.runMerge.paused, handoff: { repos: run.runMerge.repos, landed: run.runMerge.landed } } : null,
     runAutoMerge: run.runSettings?.mergeAtGatesAutomatically ?? null,
     ...supervisorOfRun(run.runSettings)
-  };
+  });
 }
 function foldRun(state, input) {
-  const run = (0, import_core48.reduceRun)(state.run, input);
+  const run = (0, import_core50.reduceRun)(state.run, input);
   return run === state.run ? state : withRun(state, run);
 }
 function applySettings(state, settings, applyRun = true) {
@@ -8269,6 +8515,7 @@ function applySettings(state, settings, applyRun = true) {
 }
 function followSession(state, message) {
   const heard = hear(state, message);
+  if (message.type === "planner_turn_started") return { ...heard, plannerDetecting: false };
   if (message.type === "approval_request") {
     const { id, kind, subject, scope, detail, body } = message;
     if (kind === "runner_tool") return heard;
@@ -8278,7 +8525,7 @@ function followSession(state, message) {
 }
 
 // src/tui/reducers/settings.ts
-var import_core49 = require("@ordewell/core");
+var import_core51 = require("@ordewell/core");
 var SUPERVISOR_DETAIL = {
   off: "The planner speaks only when you write",
   watch: "The planner follows your runs and suggests what to do",
@@ -8293,7 +8540,7 @@ var supervisorOff = (_state, choices) => choices.supervisor === "off";
 var SETTINGS = {
   title: "Settings",
   afterSave: "stay",
-  hint: "Supervisor, automerge and autorun apply to this session; your last change is the default for new ones. Autonomy and Parallel tasks apply to every session.",
+  hint: `${import_core51.DELEGATION_OFFERED ? "Supervisor, automerge, autorun and delegation" : "Supervisor, automerge and autorun"} apply to this session; your last change is the default for new ones. Autonomy and Parallel tasks apply to every session.`,
   steps: [
     {
       id: "autonomy",
@@ -8303,7 +8550,7 @@ var SETTINGS = {
         {
           id: "guarded",
           label: "Guarded",
-          detail: [`New plans run tasks in each runner's safer mode`, (0, import_core49.codexSandboxNotice)(state.modesByRunner)?.line].filter(Boolean).join(" \xB7 "),
+          detail: [`New plans run tasks in each runner's safer mode`, (0, import_core51.codexSandboxNotice)(state.modesByRunner)?.line].filter(Boolean).join(" \xB7 "),
           selected: !state.autonomous
         }
       ]
@@ -8313,7 +8560,7 @@ var SETTINGS = {
       label: "Supervisor",
       items: (state) => ["off", "watch", "act"].map((level) => ({
         id: level,
-        label: import_core49.SUPERVISOR_LEVEL_LABEL[level],
+        label: import_core51.SUPERVISOR_LEVEL_LABEL[level],
         detail: SUPERVISOR_DETAIL[level],
         selected: state.runSettings.supervisorLevel === level
       }))
@@ -8348,7 +8595,14 @@ var SETTINGS = {
       label: "Parallel",
       hint: "How many AI tasks run at once, a live run included",
       number: { min: 1, current: (state) => state.maxParallel }
-    }
+    },
+    // Not offered until a delegated task exists (ADR-0055 D21).
+    ...import_core51.DELEGATION_OFFERED ? [{
+      id: "delegation",
+      label: "Delegation",
+      hint: "The token budget of a tree of plans; 0 keeps delegation off",
+      number: { min: 0, current: (state) => state.runSettings.delegationTokens }
+    }] : []
   ],
   save: saveChoices
 };
@@ -8360,12 +8614,12 @@ function saveChoices(state, choices) {
   const autonomous = choices.autonomy === "full";
   if (autonomous !== state.autonomous) {
     save2.autonomous = autonomous;
-    changed.push(`Autonomy ${(0, import_core49.autonomyLevelLabel)(autonomous)}`);
+    changed.push(`Autonomy ${(0, import_core51.autonomyLevelLabel)(autonomous)}`);
   }
   const level = choices.supervisor;
   if (level !== state.runSettings.supervisorLevel) {
     run.supervisorLevel = level;
-    changed.push(`Supervisor ${import_core49.SUPERVISOR_LEVEL_LABEL[level]}`);
+    changed.push(`Supervisor ${import_core51.SUPERVISOR_LEVEL_LABEL[level]}`);
   }
   if (choices.retries !== void 0 && Number(choices.retries) !== state.runSettings.supervisorRetryLimit) {
     run.supervisorRetryLimit = Number(choices.retries);
@@ -8386,9 +8640,15 @@ function saveChoices(state, choices) {
     save2.maxParallel = parallel;
     changed.push(`Parallel ${parallel}`);
   }
+  const delegationTokens = Number(choices.delegation);
+  if (choices.delegation !== void 0 && delegationTokens !== state.runSettings.delegationTokens) {
+    run.delegationTokens = delegationTokens;
+    changed.push(delegationTokens > 0 ? `Delegation on, ${delegationTokens} tokens` : "Delegation off");
+  }
   if (changed.length === 0) return step(state);
   const effect = { ...save2, message: `Settings: ${changed.join(" \xB7 ")}` };
-  const risks = [...run.supervisorLevel === "act" ? [import_core49.ACT_RISK] : [], ...run.autorun ? [import_core49.AUTORUN_RISK] : []];
+  const delegationOn = state.runSettings.delegationTokens === 0 && (run.delegationTokens ?? 0) > 0;
+  const risks = [...run.supervisorLevel === "act" ? [import_core51.ACT_RISK] : [], ...run.autorun ? [import_core51.AUTORUN_RISK] : [], ...delegationOn ? [import_core51.DELEGATION_RISK] : []];
   if (risks.length === 0) return saveSettings(state, effect);
   return step({
     ...state,
@@ -8500,6 +8760,8 @@ function runCommand(state, parsed) {
       });
     case "open":
       return taskCommand(state, args[0], (sessionId, taskId) => openTaskView(state, sessionId, taskId));
+    case "inbox":
+      return openInbox(state);
     case "checkpoint":
       return taskCommand(state, args[0], (sessionId, taskId) => {
         const answer = args[1]?.toLowerCase();
@@ -8508,6 +8770,8 @@ function runCommand(state, parsed) {
         if (answer === "approve" && reason) return fail3(state, "Approving takes no note: reject with a reason to tell the task something.");
         return answerCheckpoint(state, sessionId, taskId, answer, reason);
       });
+    case "revert":
+      return taskCommand(state, args[0], (sessionId, taskId) => step(state, [{ type: "previewRevert", sessionId, taskId }]));
     case "task-runner":
       return taskRunnerCommand(state, args);
     case "task-model":
@@ -8577,8 +8841,8 @@ function newSession(state) {
     goal: "",
     taskView: null,
     planApproved: false,
-    conversation: import_core50.EMPTY_CONVERSATION,
-    turnGate: import_core50.NO_TURN,
+    conversation: import_core52.EMPTY_CONVERSATION,
+    turnGate: import_core52.NO_TURN,
     selectedTask: 0,
     expandedTaskId: null,
     taskEditor: null,
@@ -8591,16 +8855,16 @@ function newSession(state) {
     // Prompts belong to the session that raised them; the old planner is gone
     // and its pending requests deny on their own timeout.
     pendingApprovals: [],
-    queuedPrompts: import_core50.EMPTY_HOLD,
+    queuedPrompts: import_core52.EMPTY_HOLD,
     stopArmed: false,
     forceSendPending: null,
     overlay: state.overlay?.kind === "approval" ? null : state.overlay
-  }, import_core50.EMPTY_RUN), closeEffects);
+  }, import_core52.EMPTY_RUN), closeEffects);
 }
 function setPlanner(state, args) {
   if (args[0]) {
     const id = args[0].toLowerCase();
-    if (!(0, import_core50.isPlannerBackend)(id)) {
+    if (!(0, import_core52.isPlannerBackend)(id)) {
       return fail3(state, `Unknown planner: ${id}. Run /planner with no arguments to see the list.`);
     }
     return step(state, [{ type: "setPlanner", provider: id }]);
@@ -8611,7 +8875,7 @@ function setPlanner(state, args) {
 function setKey(state, args) {
   if (args[0] === "set" && args[1]) {
     const provider = args[1].toLowerCase();
-    if (!(0, import_core50.isApiProvider)(provider)) {
+    if (!(0, import_core52.isApiProvider)(provider)) {
       return fail3(state, `Unknown provider: ${provider}. Run /key with no arguments to see the list.`);
     }
     if (!args[2]) {
@@ -8622,16 +8886,16 @@ function setKey(state, args) {
     }
     return step(state, [{ type: "setApiKey", provider, key: args.slice(2).join(" ") }]);
   }
-  const items = import_core50.PROVIDER_PRIORITY.map((id) => ({
+  const items = import_core52.PROVIDER_PRIORITY.map((id) => ({
     id,
-    label: (0, import_core50.getProviderMeta)(id).label,
-    detail: (0, import_core50.getProviderMeta)(id).apiKeyEnvVar,
+    label: (0, import_core52.getProviderMeta)(id).label,
+    detail: (0, import_core52.getProviderMeta)(id).apiKeyEnvVar,
     selected: state.configuredProviders.includes(id)
   }));
   return step({ ...state, overlay: { kind: "picker", picker: picker("API provider key", items, { kind: "set-key" }) } });
 }
 function keyPrompt(provider) {
-  const meta = (0, import_core50.getProviderMeta)(provider);
+  const meta = (0, import_core52.getProviderMeta)(provider);
   return {
     kind: "prompt",
     title: `${meta.label} API key`,
@@ -8711,13 +8975,13 @@ function login(state, args) {
     return step(say(state, "system", "Still checking which coding agents are installed. Try /login again in a moment."), [{ type: "loadRunners" }]);
   }
   const named = args.join(" ").trim();
-  const runner = named ? matchRunner(state, named) : (0, import_core50.runnerForProvider)(state.plannerProvider);
+  const runner = named ? matchRunner(state, named) : (0, import_core52.runnerForProvider)(state.plannerProvider);
   if (!runner) {
     return step(say(state, "system", named ? `No installed coding agent matches "${named}". ${signInHint(state)}` : `The active planner is not a coding agent, so there is no agent to sign in. ${signInHint(state)}`));
   }
   const row = state.runners.find((r) => r.id === runner);
   if (!row) {
-    const label = (0, import_core50.getProviderMeta)(state.plannerProvider)?.label ?? runner;
+    const label = (0, import_core52.getProviderMeta)(state.plannerProvider)?.label ?? runner;
     return step(say(state, "system", `${label} is not installed, so there is nothing to sign in. /runners lists what is.`));
   }
   const command = row.auth?.loginCommand;
@@ -8838,9 +9102,14 @@ function runConfirm(state, overlay) {
     const { taskId, direction, seen } = overlay.action;
     const task = state.sessionId ? findTask(state.tasks, taskId) : void 0;
     if (!state.sessionId || !task) return fail3(closed, "That task is no longer in the plan: nothing was changed.");
-    return step(closed, [taskActionEffect(closed, state.sessionId, taskId, direction, (0, import_core51.overrideNeedsConfirmation)(task) ? { seen } : void 0)]);
+    return step(closed, [taskActionEffect(closed, state.sessionId, taskId, direction, (0, import_core53.overrideNeedsConfirmation)(task) ? { seen } : void 0)]);
+  }
+  if (overlay.action.kind === "revert-task") {
+    if (!state.sessionId) return step(closed);
+    return step(closed, [{ type: "revertTask", sessionId: state.sessionId, taskId: overlay.action.taskId, seen: overlay.action.seen }]);
   }
   if (overlay.action.kind === "save-settings") return answerSaveSettings(state, overlay.action, true);
+  if (overlay.action.kind === "answer-escalation") return confirmedAnswer(state, overlay.action.escalationId, overlay.action.option, overlay.action.note);
   if (overlay.action.kind === "merge-run" || overlay.action.kind === "discard-run") {
     return confirmedHandoff(state, overlay.action.kind);
   }
@@ -8868,6 +9137,7 @@ function handlePromptKey(state, overlay, key) {
   if (key.name === "enter") {
     const value2 = overlay.value.trim();
     const closed = { ...state, overlay: null };
+    if (overlay.action.kind === "escalation-note") return noteEntered(state, overlay.action, value2);
     if (!value2) return step(closed);
     if (overlay.action.kind === "api-key") {
       return step(closed, [{ type: "setApiKey", provider: overlay.action.provider, key: value2 }]);
@@ -8944,12 +9214,16 @@ function choose2(state, picker2, item) {
   switch (picker2.action.kind) {
     case "load-session":
       return step(closed, [{ type: "loadSession", sessionId: item.id }]);
+    case "inbox":
+      return chooseEscalation(state, item.id);
+    case "inbox-answer":
+      return chooseAnswer(state, picker2.action.escalationId, item.id);
     case "rewind":
       return pickRewindTarget(state, Number(item.id));
     case "delete-session":
       return step(closed, [{ type: "deleteSession", sessionId: item.id }]);
     case "set-key":
-      return (0, import_core51.isApiProvider)(item.id) ? step({ ...state, overlay: keyPrompt(item.id) }) : step(closed);
+      return (0, import_core53.isApiProvider)(item.id) ? step({ ...state, overlay: keyPrompt(item.id) }) : step(closed);
     case "choose-allowlist-runner": {
       const action = { kind: "set-allowlist", runner: item.id };
       const items = pickerItemsFor(state, action);
@@ -9005,6 +9279,24 @@ function choose2(state, picker2, item) {
   }
 }
 
+// src/tui/reducers/revert.ts
+var import_core54 = require("@ordewell/core");
+function revertPreviewed(state, taskId, preview) {
+  if (!preview.revertible) return fail3(state, sanitize(preview.message));
+  const asked = preview.tasks.find((t) => t.taskId === taskId) ?? preview.tasks.at(-1);
+  const lines = preview.tasks.map((t) => `  ${sanitize((0, import_core54.revertListLine)(t))}`);
+  return step({
+    ...state,
+    overlay: {
+      kind: "confirm",
+      title: `Revert ${asked ? `${(0, import_core54.revertTaskRef)(asked)} ${sanitize(asked.title)}` : "this task"}?`,
+      message: import_core54.revertEffect,
+      note: ["Reverting:", ...lines].join("\n"),
+      action: { kind: "revert-task", taskId, seen: preview.tasks.map((t) => t.taskId) }
+    }
+  });
+}
+
 // src/tui/reducers/compaction.ts
 var running = (state) => state.conversation.blocks.some((b) => b.type === "compaction" && b.status === "running");
 function followCompaction(state, message) {
@@ -9048,7 +9340,7 @@ function reduceAction(state, action) {
     // (`task-1`), so nothing of the last one's — a merge gate, a checkpoint, its
     // tasks — may carry over into this.
     case "sessionStarted":
-      return step(withRun({ ...state, sessionId: action.sessionId, goal: action.goal, accountLimits: [], servedModels: {}, taskView: null, status: "idle" }, import_core52.EMPTY_RUN));
+      return step(withRun({ ...state, sessionId: action.sessionId, goal: action.goal, accountLimits: [], servedModels: {}, taskView: null, status: "idle" }, import_core55.EMPTY_RUN));
     // A loaded session is a different one: the turn the old one had out, the
     // prompts held behind it and a stop armed against it are not this one's.
     // Nor is an open prompt editor: task ids repeat across plans, so the
@@ -9069,15 +9361,15 @@ function reduceAction(state, action) {
         planner: "idle",
         plannerPause: null,
         plannerResend: null,
-        turnGate: import_core52.NO_TURN,
+        turnGate: import_core55.NO_TURN,
         pendingApprovals: [],
-        queuedPrompts: import_core52.EMPTY_HOLD,
+        queuedPrompts: import_core55.EMPTY_HOLD,
         stopArmed: false,
         stopRequested: false,
         forceSendPending: null,
         overlay: state.overlay?.kind === "approval" ? null : state.overlay,
         runSettingsKnown: false
-      }, import_core52.EMPTY_RUN));
+      }, import_core55.EMPTY_RUN));
     // The daemon registers a session before its opening turn runs, and drops it
     // itself when it refuses the turn or the goal is discarded; any other
     // failure it answered leaves no conversation a reply could continue, so the
@@ -9097,20 +9389,20 @@ function reduceAction(state, action) {
         status: "idle",
         plannerPause: null,
         plannerResend: null,
-        turnGate: import_core52.NO_TURN,
+        turnGate: import_core55.NO_TURN,
         pendingApprovals: [],
         stopArmed: false,
         forceSendPending: null,
         overlay: state.overlay?.kind === "approval" ? null : state.overlay,
         runSettingsKnown: action.unreached ? state.runSettingsKnown : false
-      }, import_core52.EMPTY_RUN));
+      }, import_core55.EMPTY_RUN));
     // Deleting the session on screen stops it in the daemon; a view left on it
     // would answer every next message with a session-not-found.
     case "sessionDeleted":
       return action.sessionId === state.sessionId ? newSession(state) : step(state);
     case "chatRestored":
       if (stale(state, action.sessionId)) return step(state);
-      return step({ ...state, conversation: (0, import_core52.fromTranscript)(action.history, action.researchLog, action.plannerUsage, action.pendingTurns), scroll: 0 });
+      return step({ ...state, conversation: (0, import_core55.fromTranscript)(action.history, action.researchLog, action.plannerUsage, action.pendingTurns), scroll: 0 });
     case "planRefreshed":
       if (stale(state, action.sessionId)) return step(state);
       return step(showPlan(state, action.plan));
@@ -9126,7 +9418,7 @@ function reduceAction(state, action) {
         return step({ ...settled, forceSendPending: null });
       }
       if (state.forceSendPending) return step({ ...settled, planner: "planning", forceSendPending: null });
-      return drainQueue(state, settled);
+      return drainQueue(state, { ...settled, turnGate: (0, import_core55.closeTurn)(settled.turnGate) });
     }
     // The call that carried the turn's reply died, so nothing will say the turn
     // is over but the daemon. The prompts held behind it, and the turn itself,
@@ -9153,7 +9445,7 @@ function reduceAction(state, action) {
         const gate = action.plannerTurnId === state.turnGate.open ? state.turnGate : { open: action.plannerTurnId, stopped: null };
         return step(showPlan({ ...state, turnGate: gate }, action.plan));
       }
-      const redrawn = reduceAction({ ...state, turnGate: import_core52.NO_TURN }, action.chat).state;
+      const redrawn = reduceAction({ ...state, turnGate: import_core55.NO_TURN }, action.chat).state;
       const settled = reduceAction(redrawn, { type: "planUpdated", plan: action.plan, sessionId: action.sessionId });
       if (state.planner === "joined") return settled;
       return { ...settled, state: say(settled.state, "system", `The reply to your last message was lost on the way${because(action.reason)}; this is what the server holds.`) };
@@ -9171,6 +9463,7 @@ function reduceAction(state, action) {
     case "sessionMessage": {
       if (stale(state, action.sessionId)) return step(state);
       if (action.message.type === "planner_compaction") return followCompaction(state, action.message);
+      if (action.message.type === "planner_detection") return step({ ...state, plannerDetecting: action.message.waiting });
       const next = followSession(state, action.message);
       const { sessionId } = state;
       const gateClosed = action.message.type === "planner_turn_ended" && next.turnGate.open === null;
@@ -9205,15 +9498,15 @@ function reduceAction(state, action) {
     case "taskStarted": {
       if (stale(state, action.sessionId)) return step(state);
       const existing = findTask(state.tasks, action.taskId);
-      if (existing && (0, import_core31.isTaskRunning)(existing)) return step(state);
+      if (existing && (0, import_core33.isTaskRunning)(existing)) return step(state);
       const folded = foldRun(state, {
         type: "task_started",
         taskId: action.taskId,
         order: action.order ?? 0,
         title: action.title,
-        runner: action.runner ?? import_core52.DEFAULT_RUNNERS[0]
+        runner: action.runner ?? import_core55.DEFAULT_RUNNERS[0]
       });
-      const spoken = say(folded, "system", (0, import_core52.taskStartedNotice)(action.title, action.runner));
+      const spoken = say(folded, "system", (0, import_core55.taskStartedNotice)(action.title, action.runner));
       return step({ ...spoken, status: "executing" });
     }
     case "taskCheckpoint":
@@ -9231,7 +9524,8 @@ function reduceAction(state, action) {
         tasks: action.tasks,
         ...action.runMerge !== void 0 ? { runMerge: action.runMerge } : {},
         ...action.usage !== void 0 ? { usage: action.usage } : {},
-        ...action.activity !== void 0 ? { activity: action.activity } : {}
+        ...action.activity !== void 0 ? { activity: action.activity } : {},
+        ...action.escalations !== void 0 ? { escalations: action.escalations } : {}
       });
       const status = runStatus(next, next.tasks);
       return step({ ...next, status });
@@ -9266,7 +9560,7 @@ function reduceAction(state, action) {
         completed: state.tasks.filter((t) => t.status === "completed").length,
         total: state.tasks.length,
         failed: state.tasks.filter((t) => t.status === "failed").length,
-        blocked: (0, import_core52.blockingFailures)(state.tasks).size,
+        blocked: (0, import_core55.blockingFailures)(state.tasks).size,
         skipped: state.tasks.filter((t) => t.status === "skipped").length
       };
       const failures = `${failed > 0 ? ` \xB7 ${failed} failed` : ""}${blocked ? ` \xB7 ${blocked} blocked` : ""}${skipped ? ` \xB7 ${skipped} skipped` : ""}`;
@@ -9334,6 +9628,8 @@ function reduceAction(state, action) {
       ));
     case "sessionsLoaded":
       return step(refillPicker({ ...state, sessions: action.sessions }, ["load-session", "delete-session"]));
+    case "revertPreviewed":
+      return stale(state, action.sessionId) ? step(state) : revertPreviewed(state, action.taskId, action.preview);
     case "rewindTargetsLoaded":
       if (stale(state, action.sessionId)) return step(state);
       if (action.pick !== void 0) return pickRewindTarget({ ...state, rewindTargets: action.targets }, action.pick);
@@ -9353,16 +9649,16 @@ function reduceAction(state, action) {
         taskEditor: null,
         status: "idle",
         planner: "idle",
-        turnGate: import_core52.NO_TURN,
+        turnGate: import_core55.NO_TURN,
         planApproved: false,
         pendingApprovals: [],
-        queuedPrompts: import_core52.EMPTY_HOLD,
+        queuedPrompts: import_core55.EMPTY_HOLD,
         stopArmed: false,
         stopRequested: false,
         forceSendPending: null,
         overlay: state.overlay?.kind === "approval" ? null : state.overlay,
         runSettingsKnown: false
-      }, import_core52.EMPTY_RUN));
+      }, import_core55.EMPTY_RUN));
     // The rewound message comes back as a draft to edit and resend, so it lands
     // as if just typed: history is not being browsed, and nothing is parked.
     case "inputPrefilled":
@@ -9418,7 +9714,7 @@ function reduceAction(state, action) {
         status: state.status === "starting" ? "idle" : state.status
       };
       if (!plannerInFlight(state)) return step(reported);
-      return drainQueue(state, reported);
+      return drainQueue(state, { ...reported, turnGate: (0, import_core55.closeTurn)(reported.turnGate) });
     }
     // As `failed`: an opening that let itself go asks on the welcome it left,
     // never over a session loaded meanwhile.
@@ -9427,6 +9723,7 @@ function reduceAction(state, action) {
       return step({
         ...state,
         planner: "idle",
+        turnGate: plannerInFlight(state) ? (0, import_core55.closeTurn)(state.turnGate) : state.turnGate,
         overlay: {
           kind: "confirm",
           title: "Initialize new workspace?",
@@ -9459,7 +9756,7 @@ function reduceAction(state, action) {
     // Whether there is anything to animate is the app loop's call (it owns the
     // timer); a tick that arrives simply advances the frame.
     case "spinnerTick":
-      return step({ ...state, spinnerFrame: (state.spinnerFrame + (action.by ?? 1)) % SPINNER_CYCLE });
+      return step({ ...state, spinnerFrame: (state.spinnerFrame + 1) % SPINNER_CYCLE });
     // The scheduled expiry of an armed stop; a token that is no longer the live
     // arm is a stale timer (the user disarmed and re-armed in between) and is
     // ignored, so it cannot cut a newer arm short.
@@ -9501,7 +9798,7 @@ function runStatus(state, tasks) {
   const activity = state.run.activity;
   if (activity?.starting) return "starting";
   if (activity?.running) return "executing";
-  if (tasks.some(import_core31.isTaskRunning)) return "executing";
+  if (tasks.some(import_core33.isTaskRunning)) return "executing";
   if (tasks.some((t) => t.status === "awaiting_user") || state.runMerge?.paused) return "executing";
   return "idle";
 }
@@ -9533,7 +9830,7 @@ function handleKey2(state, key) {
   if (key.name === "wheelignored") return step(state);
   if (key.name === "tab" && state.focus === "chat") {
     const token = activeToken(state.editor.text, state.editor.cursor);
-    const matches = token ? composerCompletions(token, state.taskView ? (0, import_core52.taskLogCommands)(state.taskView.view) : null) : [];
+    const matches = token ? composerCompletions(token, state.taskView ? (0, import_core55.taskLogCommands)(state.taskView.view) : null) : [];
     if (token && matches.length > 0) {
       const { text: full } = state.editor;
       const completed = `/${matches[0]} `;
@@ -9554,9 +9851,9 @@ function handleKey2(state, key) {
       return scroll2 !== null ? scrollChat(state, scroll2) : step(state);
     }
   }
-  if (key.name === "enter") return submit(state);
+  if (key.name === "enter") return submit2(state);
   if (key.name === "ctrl-s") {
-    return (plannerInFlight(state) || state.turnGate.open !== null) && !builtInCommand(state.editor.text) ? forceSendPlanner(state) : submit(state);
+    return (plannerInFlight(state) || state.turnGate.open !== null) && !builtInCommand(state.editor.text) ? forceSendPlanner(state) : submit2(state);
   }
   if (key.name === "escape") return step({ ...state, editor: { ...state.editor, text: "", cursor: 0 } });
   const scroll = scrollDelta(key, state, "chat");
@@ -9570,7 +9867,7 @@ function builtInCommand(text) {
   const known = command && findCommand(command.name);
   return command && known && known.source !== "skill" ? command : null;
 }
-function submit(state) {
+function submit2(state) {
   const text = state.editor.text.trim();
   if (!text) return step(state);
   const cleared = { ...state, editor: commit(state.editor) };
@@ -9579,7 +9876,7 @@ function submit(state) {
     const taskId = state.taskView.taskId;
     const task = findTask(state.tasks, taskId);
     const command = parseRunnerCommand(text);
-    const offered2 = (0, import_core52.taskLogCommands)(state.taskView.view);
+    const offered2 = (0, import_core55.taskLogCommands)(state.taskView.view);
     if (command && offered2.length > 0 && !runnerCommandFor(offered2, command.name)) {
       const notice = `/${command.name} is not a command ${task?.assignedRunner ?? "the runner"} offers this task: type / to see them.`;
       return step({ ...cleared, taskView: { ...state.taskView, notice } });
@@ -9598,7 +9895,7 @@ function submit(state) {
   const builtIn = builtInCommand(text);
   if (builtIn) return runCommand(cleared, builtIn);
   if (plannerInFlight(state)) {
-    return step({ ...cleared, queuedPrompts: (0, import_core52.holdPrompt)(state.queuedPrompts, text) });
+    return step({ ...cleared, queuedPrompts: (0, import_core55.holdPrompt)(state.queuedPrompts, text) });
   }
   const spoken = say(cleared, "user", text);
   const effect = state.sessionId ? { type: "sendMessage", sessionId: state.sessionId, message: text } : { type: "startConversation", goal: text };
@@ -9618,15 +9915,9 @@ var FRAME_INTERVAL_MS = 33;
 function createApp(deps) {
   let state = initialState(deps.initial);
   let exited = false;
-  let dotTicks = 0;
+  let shownTime = "";
   const spinnerInterval = setInterval(() => {
-    if (anyTaskRunning(state)) {
-      dispatch({ type: "spinnerTick" });
-      return;
-    }
-    if (style.enabled && chatActivity(state)?.busy && ++dotTicks % DOT_TICKS === 0) {
-      dispatch({ type: "spinnerTick", by: DOT_TICKS });
-    }
+    if (animating(state) || activityTime(state, Date.now()) !== shownTime) dispatch({ type: "spinnerTick" });
   }, 200);
   let renderPending = false;
   let renderTimer = null;
@@ -9640,7 +9931,8 @@ function createApp(deps) {
     }
     renderPending = false;
     lastPaint = Date.now();
-    deps.draw(render(state));
+    shownTime = activityTime(state, lastPaint);
+    deps.draw(render({ ...state, now: lastPaint }));
   }
   function paintKey() {
     if (keyBurst) {
@@ -9712,7 +10004,7 @@ function createApp(deps) {
 
 // src/tui/effects.ts
 var import_child_process3 = require("child_process");
-var import_core53 = require("@ordewell/core");
+var import_core56 = require("@ordewell/core");
 
 // src/tui/inbound.ts
 var CONVERSATION_TYPES = /* @__PURE__ */ new Set([
@@ -9732,6 +10024,7 @@ var CONVERSATION_TYPES = /* @__PURE__ */ new Set([
   "planner_usage",
   "planner_liveness",
   "planner_compaction",
+  "planner_detection",
   "approval_request",
   "approval_settled",
   "approval_decided",
@@ -10029,6 +10322,7 @@ function dispatchLifecycle(dispatch, event, sessionId) {
         ...event.runMerge ? { runMerge: event.runMerge } : {},
         ...event.usage ? { usage: event.usage } : {},
         ...event.activity ? { activity: event.activity } : {},
+        ...event.escalations ? { escalations: event.escalations } : {},
         sessionId
       });
       return;
@@ -10234,14 +10528,35 @@ async function perform(effect, deps) {
     }
     case "taskAction": {
       const { sessionId, taskId, action } = effect;
-      const command = (0, import_core53.taskActionCommand)(action, taskId);
-      const request = () => api.execute(sessionId, effect.confirmed ? (0, import_core53.confirmedOverride)(command, effect.confirmed.seen) : command);
+      const command = (0, import_core56.taskActionCommand)(action, taskId);
+      const request = () => api.execute(sessionId, effect.confirmed ? (0, import_core56.confirmedOverride)(command, effect.confirmed.seen) : command);
       await (effect.watch ? withExecutionStream(deps, sessionId, request) : request());
       await refreshPlan(deps, sessionId);
       return;
     }
+    case "previewRevert":
+      dispatch({ type: "revertPreviewed", sessionId: effect.sessionId, taskId: effect.taskId, preview: await api.revertPreview(effect.sessionId, effect.taskId) });
+      return;
+    // A refusal at this point (a plan that changed, a conflict) comes back as the failure the seam worded.
+    case "revertTask": {
+      const { message } = await api.execute(effect.sessionId, { command: "revert_task", task: effect.taskId, confirmed: true, seen: effect.seen });
+      await refreshPlan(deps, effect.sessionId);
+      dispatch({ type: "notice", message });
+      return;
+    }
+    case "answerEscalation": {
+      const { sessionId, id, option, note, confirmed } = effect;
+      let said = "";
+      const request = async () => {
+        said = (await api.answerEscalation(sessionId, { id, option, ...note ? { note } : {}, ...confirmed ? { confirmed } : {} })).message;
+      };
+      await (effect.watch ? withExecutionStream(deps, sessionId, request) : request());
+      await refreshPlan(deps, sessionId);
+      if (said) dispatch({ type: "notice", message: said });
+      return;
+    }
     case "addTask": {
-      const fields = (0, import_core53.newTaskFields)(effect.title);
+      const fields = (0, import_core56.newTaskFields)(effect.title);
       if (!fields) return;
       await api.addTask(effect.sessionId, { ...fields });
       await refreshPlan(deps, effect.sessionId);
@@ -10331,11 +10646,11 @@ async function perform(effect, deps) {
       await api.execute(effect.sessionId, { command: "interrupt_task", task: effect.taskId });
       return;
     case "setPlanner": {
-      const meta = (0, import_core53.getProviderMeta)(effect.provider);
+      const meta = (0, import_core56.getProviderMeta)(effect.provider);
       if (!meta) throw new Error(`Unknown planner: ${effect.provider}`);
-      if ((0, import_core53.isCliProvider)(effect.provider)) {
+      if ((0, import_core56.isCliProvider)(effect.provider)) {
         const installed = ((await api.getRunners()).runners ?? []).map((r) => r.id);
-        const refusal = uninstalledPlannerRefusal(effect.provider, installed, import_core53.TERMINAL_UI_COMMANDS.pickPlanner);
+        const refusal = uninstalledPlannerRefusal(effect.provider, installed, import_core56.TERMINAL_UI_COMMANDS.pickPlanner);
         if (refusal) throw new Error(refusal);
       }
       const env = { AI_PROVIDER: effect.provider };
@@ -10345,7 +10660,7 @@ async function perform(effect, deps) {
       dispatchSettings(deps, { aiProvider: effect.provider, orchestratorModel: recall2.model, plannerThinkingEffort: recall2.effort });
       dispatch({
         type: "notice",
-        message: `${(0, import_core53.isCliProvider)(effect.provider) ? `Planning with ${meta.label}: no API key needed.` : `Planner set to ${meta.label}.`} ${plannerModelNotice(recall2)}`
+        message: `${(0, import_core56.isCliProvider)(effect.provider) ? `Planning with ${meta.label}: no API key needed.` : `Planner set to ${meta.label}.`} ${plannerModelNotice(recall2)}`
       });
       await loadModels(deps);
       return;
@@ -10364,7 +10679,7 @@ async function perform(effect, deps) {
       return;
     }
     case "setApiKey": {
-      const meta = (0, import_core53.isApiProvider)(effect.provider) ? (0, import_core53.getProviderMeta)(effect.provider) : void 0;
+      const meta = (0, import_core56.isApiProvider)(effect.provider) ? (0, import_core56.getProviderMeta)(effect.provider) : void 0;
       if (!meta) throw new Error(`Unknown provider: ${effect.provider}`);
       await api.updateSettings({ env: { [meta.apiKeyEnvVar]: effect.key } });
       deps.setEnvVar(meta.apiKeyEnvVar, effect.key);
@@ -10552,7 +10867,7 @@ async function perform(effect, deps) {
     // cleared the run up and says so on the stream (`run_closed`); one
     // mid-run leaves the run going (ADR-0020).
     case "isolationMerge": {
-      const { ok, message } = (0, import_core53.mergeOutcome)(await api.mergeRun(effect.sessionId), effect.branch, effect.group === true, effect.repaired ?? []);
+      const { ok, message } = (0, import_core56.mergeOutcome)(await api.mergeRun(effect.sessionId), effect.branch, effect.group === true, effect.repaired ?? []);
       dispatch({ type: ok ? "notice" : "failed", message });
       return;
     }
@@ -10573,11 +10888,15 @@ async function perform(effect, deps) {
       await refreshPlan(deps, sessionId);
       return;
     }
-    case "resolveConflict":
-      await api.resolveConflictAsTask(effect.sessionId, effect.taskId);
-      await refreshPlan(deps, effect.sessionId);
-      dispatch({ type: "notice", message: "Added a task that merges the conflicted branch by hand. Run it with E (run plan); when it lands, the conflicted task lands through it." });
+    // A refusal, a second resolver among them, comes back in the daemon's words.
+    case "resolveConflict": {
+      const { sessionId, taskId } = effect;
+      const request = () => api.resolveConflictAsTask(sessionId, taskId);
+      await (effect.watch ? withExecutionStream(deps, sessionId, request) : request());
+      await refreshPlan(deps, sessionId);
+      dispatch({ type: "notice", message: "Added a task that merges the conflicted branch by hand. It starts once a slot is free; when it lands, the conflicted task lands through it." });
       return;
+    }
     case "deleteSession": {
       const { ok } = await api.deleteSession(effect.sessionId, workspace);
       await loadSessions(deps);
@@ -10630,7 +10949,7 @@ async function saveMaxParallel(deps, limit) {
 function copySelection(deps, text) {
   if (!text) return;
   const lines = text.split("\n").length;
-  const command = (0, import_core53.clipboardCopyCommand)(deps.hasBin);
+  const command = (0, import_core56.clipboardCopyCommand)(deps.hasBin);
   if (command) {
     try {
       (deps.pipeToClipboard ?? pipeToClipboardDefault)(command, text);
@@ -10857,7 +11176,7 @@ function turnReplies(plan) {
   const replies = [];
   for (let i = history.length - 1; i >= 0; i--) {
     const entry = history[i];
-    if ((0, import_core53.isUserMessage)(entry)) break;
+    if ((0, import_core56.isUserMessage)(entry)) break;
     if (entry.role === "assistant" && entry.kind === void 0) {
       const { content, timestamp, runs } = entry;
       replies.unshift({ content, ...timestamp ? { timestamp } : {}, ...runs ? { runs } : {} });
@@ -11293,9 +11612,9 @@ function openTerminal(options) {
 }
 
 // src/versionCheck.ts
-var import_core54 = require("@ordewell/core");
+var import_core57 = require("@ordewell/core");
 function startCliVersionCheck(show3, options = {}) {
-  return (0, import_core54.startVersionCheck)({ version: cliVersion(), ...options, ...show3 });
+  return (0, import_core57.startVersionCheck)({ version: cliVersion(), ...options, ...show3 });
 }
 var writeLine = (line) => console.error(line);
 var toStderr = { onNotice: writeLine, onUpdate: writeLine };
@@ -11303,7 +11622,7 @@ var toStderr = { onNotice: writeLine, onUpdate: writeLine };
 // src/tui/index.ts
 var DAEMON_STOP_GRACE_MS = 3e3;
 async function runLogin(start, command, cwd, env) {
-  const plan = await (0, import_core55.planDirectLaunch)(command[0], command.slice(1));
+  const plan = await (0, import_core58.planDirectLaunch)(command[0], command.slice(1));
   return new Promise((resolve6, reject) => {
     const child = start(plan.file, plan.args, {
       stdio: "inherit",
@@ -11322,7 +11641,7 @@ async function handleTui(subArgs, options = {}) {
   }
   const workspace = (0, import_path7.resolve)(flag(subArgs, "--workspace") || process.cwd());
   try {
-    (0, import_core55.assertWorkspaceExists)(workspace);
+    (0, import_core58.assertWorkspaceExists)(workspace);
   } catch {
     console.error(
       `Workspace "${workspace}" does not exist.
@@ -11331,7 +11650,7 @@ cd into a directory that exists, or pass --workspace <path> naming one that does
     );
     process.exit(1);
   }
-  const discoveredSkills = (0, import_core55.createSkillsService)(workspace, new import_core55.EnvConfig().workspaceRepos).listSkills();
+  const discoveredSkills = (0, import_core58.createSkillsService)(workspace, new import_core58.EnvConfig().workspaceRepos).listSkills();
   registerSkillCommands(discoveredSkills);
   const taskSkills = discoveredSkills.filter((s) => s.appliesTo === "task").map((s) => ({ name: s.name, description: s.description }));
   const explicitPort = flag(subArgs, "--port") || process.env.ORDEWELL_PORT;
@@ -11350,7 +11669,7 @@ cd into a directory that exists, or pass --workspace <path> naming one that does
     },
     onUpdate: (line) => app.dispatch({ type: "notice", message: line })
   });
-  const settings = new import_core55.SettingsService();
+  const settings = new import_core58.SettingsService();
   const app = createApp({
     // The level the daemon plans with: the saved one, unless the environment overrides it (ADR-0030).
     // The run settings are seeded from the same file because the first frame is
@@ -11373,13 +11692,13 @@ cd into a directory that exists, or pass --workspace <path> naming one that does
       workspace,
       port,
       dispatch: (action) => app.dispatch(action),
-      newSessionId: () => (0, import_core55.mintSessionId)(),
+      newSessionId: () => (0, import_core58.mintSessionId)(),
       setEnvVar: (key, value) => {
         writeEnvVar(findEnvFile(), key, value);
         process.env[key] = value;
       },
       saveAutonomy: (enabled) => {
-        const settings2 = new import_core55.SettingsService();
+        const settings2 = new import_core58.SettingsService();
         settings2.setAutonomousMode(enabled);
         return { overridden: settings2.autonomousModeOverridden() };
       },
@@ -11394,7 +11713,7 @@ cd into a directory that exists, or pass --workspace <path> naming one that does
       login: async (command) => {
         let handedOver = false;
         try {
-          const env = (0, import_core55.withPath)(process.env, await (0, import_core55.augmentedPath)(), await (0, import_core55.workspaceEnvOf)(workspace));
+          const env = (0, import_core58.withPath)(process.env, await (0, import_core58.augmentedPath)(), await (0, import_core58.workspaceEnvOf)(workspace));
           loginRunning = true;
           handedOver = true;
           terminal?.suspend();
@@ -11505,12 +11824,15 @@ var COMMANDS = {
   automerge: handleAutomerge,
   trailer: handleTrailer,
   autorun: handleAutorun,
+  // Not offered until a delegated task exists (ADR-0055 D21).
+  ...import_core59.DELEGATION_OFFERED ? { delegation: handleDelegation } : {},
   refresh: handleRefresh,
   setup: handleSetup,
   skills: handleSkills,
   "mark-complete": handleMarkComplete,
   complete: handleMarkComplete,
   uncomplete: handleUncomplete,
+  revert: handleRevert,
   skip: handleSkip,
   "run-task": handleRunTask,
   "force-start": handleForceStart,
@@ -11539,7 +11861,7 @@ var COMMANDS = {
 // src/main.ts
 var TUI_FLAGS = /* @__PURE__ */ new Set(["--workspace", "--port"]);
 async function main() {
-  (0, import_core56.migrateOldConfigDir)();
+  (0, import_core60.migrateOldConfigDir)();
   moveAutonomyToSettings();
   loadEnvFile();
   const argv = process.argv.slice(2);