@ordewell/cli 0.6.4 → 0.7.1

package/dist/main.js

@@ -24,7 +24,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 
 // src/main.ts
-var import_core34 = require("@ordewell/core");
+var import_core37 = require("@ordewell/core");
 
 // src/utils/env.ts
 var import_fs = require("fs");
@@ -121,6 +121,7 @@ Tasks (<id> is an order number or a task ID):
   ordewell run-task <id>          Run only one task
   ordewell retry <id>             Re-run a failed task
   ordewell continue <id> <msg>    Continue a finished task in its saved runner session
+  ordewell checkpoint <id> approve|reject [reason]  Answer the checkpoint a task waits at
   ordewell cancel <id>            Kill a running task
   ordewell terminal <id>          Open a real terminal attached to a task's runner
 
@@ -139,7 +140,7 @@ Planner, models and runners:
   ordewell key [set <p> <key>]    Show which providers have a key, or store one
   ordewell runners [<id> on|off]  Enable or disable runners (claude-code, opencode, codex)
   ordewell allowlist set|clear|show       Limit which models a runner may use
-  ordewell auto [full|auto]       Autonomy level for new sessions: Full auto or Auto
+  ordewell auto [full|guarded]    Autonomy level for new sessions: Full or Guarded
   ordewell transport [terminal|structured]   Structured (default) or terminal task transport, from the next run
   ordewell parallel [<n>]         How many AI tasks run at once (default 3; applies to a live run)
   ordewell refresh                Re-discover runners and model catalogs
@@ -160,6 +161,12 @@ TUI options:
   --workspace /path   Workspace directory (default: cwd)
   --port N            Target a daemon on port N
 
+TUI task view keys (t on a structured task; /help in the TUI lists them all):
+  ctrl-s              Send now: interrupt the running step and deliver the composer text next
+                      (with the composer empty, the selected queued message)
+  ctrl-n / ctrl-p     Select a queued message; ctrl-r removes it
+  ctrl-x              Interrupt the running turn
+
 Plan options:
   --goal "text"       Task description (required)
   --runner <id>       Runner to use (repeatable; default: all enabled runners)
@@ -213,7 +220,7 @@ Environment:
   ORDEWELL_PLANNER_EFFORT    Thinking effort for a coding-agent planner
   ORCHESTRATOR_MODEL         Default: deepseek/deepseek-v4-flash
   OPENROUTER_BASE_URL        Default: https://openrouter.ai/api/v1
-  ORDEWELL_AUTONOMOUS_MODE   true: Full auto, false: Auto, for new sessions (see "ordewell auto")
+  ORDEWELL_AUTONOMOUS_MODE   true: Full, false: Guarded, for new sessions (see "ordewell auto")
   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
@@ -610,6 +617,25 @@ var ApiClient = class _ApiClient {
     }
     return res.data;
   }
+  /** Force send: interrupt the task's running turn and deliver `text` next, ahead of anything queued (ADR-0023, F1). */
+  async forceSendTaskMessage(sessionId, taskId, text) {
+    const res = await this.httpRequest("POST", `/api/plans/${sessionId}/tasks/${taskId}/messages/now`, { text });
+    if (res.status !== 200) {
+      throw new Error(res.data?.error || "Send now failed");
+    }
+    return res.data;
+  }
+  /** Force send a message still queued; `sent` is false once the runner already has it. */
+  async forceSendQueuedTaskMessage(sessionId, taskId, messageId) {
+    const res = await this.httpRequest(
+      "POST",
+      `/api/plans/${sessionId}/tasks/${taskId}/messages/${encodeURIComponent(messageId)}/now`
+    );
+    if (res.status !== 200) {
+      throw new Error(res.data?.error || "Send now failed");
+    }
+    return res.data;
+  }
   /** Continue a finished structured task in its saved session, with `text` as its next turn. */
   async continueTask(sessionId, taskId, text) {
     const res = await this.httpRequest("POST", `/api/plans/${sessionId}/tasks/${taskId}/continue`, { text });
@@ -636,6 +662,26 @@ var ApiClient = class _ApiClient {
     }
     return res.data;
   }
+  /** Let a task go on from the checkpoint it waits at; refused, with the reason, when none waits. */
+  async approveTaskCheckpoint(sessionId, taskId) {
+    const res = await this.httpRequest("POST", `/api/plans/${sessionId}/tasks/${taskId}/checkpoint/approve`);
+    if (res.status !== 200) {
+      throw new Error(res.data?.error || "Approve checkpoint failed");
+    }
+    return res.data;
+  }
+  /** Turn a task back at its checkpoint; `reason` is what the agent is told. */
+  async rejectTaskCheckpoint(sessionId, taskId, reason) {
+    const res = await this.httpRequest(
+      "POST",
+      `/api/plans/${sessionId}/tasks/${taskId}/checkpoint/reject`,
+      reason ? { reason } : {}
+    );
+    if (res.status !== 200) {
+      throw new Error(res.data?.error || "Reject checkpoint failed");
+    }
+    return res.data;
+  }
   async addTask(sessionId, task) {
     const res = await this.httpRequest("POST", `/api/plans/${sessionId}/tasks`, task);
     if (res.status !== 200) {
@@ -1528,9 +1574,6 @@ function repoResultLines(handoff) {
     return `${path}: ${n === 0 ? "nothing to merge" : `${n} task${n === 1 ? "" : "s"} landed`}`;
   });
 }
-function taskRepoNames(isolation) {
-  return (isolation?.repos ?? []).filter((r) => r !== ".");
-}
 function mergeOutcome(result, branch, group, repaired = []) {
   const ok = result.outcome === "merged";
   if (!group && result.outcome === "conflict") {
@@ -1717,7 +1760,7 @@ async function followExecution(api, sessionId, start, onBlocked) {
 `);
     }
     if (event.type === "checkpoint") {
-      process.stderr.write(`\xB7 Checkpoint \u2014 ${event.taskTitle}: ${(0, import_core9.truncateCheckpointSummary)(event.summary)}
+      process.stderr.write(`\xB7 Checkpoint \u2014 ${event.taskTitle}: ${(0, import_core9.truncateCheckpointSummary)(event.summary)} \u2014 \`ordewell checkpoint <id> approve|reject [reason]\` answers it
 `);
     }
     if (event.type === "status_update" && event.tasks) {
@@ -2345,6 +2388,7 @@ async function handleTransport(subArgs, api) {
 }
 
 // src/commands/task-control.ts
+var import_core15 = require("@ordewell/core");
 var PAST_TENSE = {
   run: "Task started.",
   "force-start": "Task force-started.",
@@ -2387,7 +2431,7 @@ async function confirmPastGate(subArgs, api, sessionId, taskId, confirm) {
   if (hasFlag(subArgs, "--yes")) return;
   const unmerged = await api.getMergeGate(sessionId, taskId).catch(() => []);
   if (unmerged.length === 0) return;
-  const question = `This task waits for Merge all: the work of ${unmerged.map((d) => `#${d.order} ${d.title}`).join(", ")} is not merged into your branch yet, so it would act without it. Starting it now is kept on the task. Start it anyway?`;
+  const question = `${(0, import_core15.pastGateConfirmation)(unmerged.map((d) => (0, import_core15.titledTaskRef)(d)))} Start it anyway?`;
   if (!await confirm(question)) fail("Not started \u2014 nothing was changed. Pass --yes to start it without a prompt.");
 }
 function makeHandler(action, command = action) {
@@ -2427,6 +2471,30 @@ async function handleContinue(subArgs, injectedApi) {
     }
   });
 }
+async function handleCheckpoint(subArgs, injectedApi) {
+  const usage = "Usage: ordewell checkpoint <task-id-or-order> approve|reject [reason] [--session-id <id>] [--workspace /path]";
+  const [, answer, ...words] = positionals(subArgs);
+  const reason = words.join(" ").trim();
+  if (answer !== "approve" && answer !== "reject") {
+    console.error(usage);
+    process.exit(1);
+  }
+  if (answer === "approve" && reason) {
+    console.error(`Approving takes no note \u2014 reject with a reason to tell the task something.
+${usage}`);
+    process.exit(1);
+  }
+  await withResolvedTask(subArgs, usage, injectedApi, async (api, sessionId, taskId) => {
+    try {
+      if (answer === "approve") await api.approveTaskCheckpoint(sessionId, taskId);
+      else await api.rejectTaskCheckpoint(sessionId, taskId, reason || void 0);
+      console.log(answer === "approve" ? "Checkpoint approved." : "Checkpoint rejected.");
+    } catch (err) {
+      console.error(`Failed to ${answer} checkpoint: ${err.message}`);
+      process.exit(1);
+    }
+  });
+}
 var handleRunTask = makeHandler("run", "run-task");
 var handleForceStart = makeHandler("force-start");
 var handleRetry = makeHandler("retry");
@@ -2676,24 +2744,24 @@ async function handleRewind(subArgs, injectedApi) {
 }
 
 // src/tui/transcript.ts
-var import_core15 = require("@ordewell/core");
+var import_core16 = 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_core15.reduceConversation)(state.conversation, input), gate: state.turnGate });
+  return show(state, { view: (0, import_core16.reduceConversation)(state.conversation, input), gate: state.turnGate });
 }
 function say(state, role, text) {
   const said = fold(state, { type: "local_entry", role, text });
   return said.conversation.nextId > state.conversation.nextId ? { ...said, scroll: 0 } : said;
 }
 function hear(state, message) {
-  return show(state, (0, import_core15.followTurn)(state.conversation, state.turnGate, message));
+  return show(state, (0, import_core16.followTurn)(state.conversation, state.turnGate, message));
 }
 function cutTurn(state) {
-  return show(state, (0, import_core15.stopTurn)(state.conversation, state.turnGate));
+  return show(state, (0, import_core16.stopTurn)(state.conversation, state.turnGate));
 }
 function wiped(view) {
   return { ...view, blocks: view.blocks.filter((b) => b.type === "usage") };
@@ -2919,12 +2987,12 @@ function runHandoffAction(state, id) {
           overlay: isRepoGroup(handoff) ? {
             kind: "confirm",
             title: "Merge all into your branches?",
-            message: `Merge ${handoffBranch(handoff)} into whatever each of ${reposWithWork(handoff).join(", ")} has checked out. Ordewell never does this on its own. 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.${repairedNotice(handoff)}`,
+            message: `Merge ${handoffBranch(handoff)} into whatever each of ${reposWithWork(handoff).join(", ")} has checked out. Ordewell never does this on its own. 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 \u2014 unless a task still has work in its worktree that has not landed: then the run stays, and so does that work.${repairedNotice(handoff)}`,
             action: { kind: "merge-run" }
           } : {
             kind: "confirm",
             title: "Merge into your branch?",
-            message: `Merge ${handoffBranch(handoff)} into whatever you have checked out. Ordewell never does this on its own. 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.${repairedNotice(handoff)}`,
+            message: `Merge ${handoffBranch(handoff)} into whatever you have checked out. Ordewell never does this on its own. 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 \u2014 unless a task still has work in its worktree that has not landed: then the run stays, and so does that work.${repairedNotice(handoff)}`,
             action: { kind: "merge-run" }
           }
         },
@@ -3107,7 +3175,7 @@ async function handleHandoff(subArgs, injectedApi, confirm = askYesNo) {
 }
 
 // src/commands/planner.ts
-var import_core16 = require("@ordewell/core");
+var import_core17 = require("@ordewell/core");
 
 // src/plannerModelSwitch.ts
 function describePlannerSwitch(settings, provider) {
@@ -3126,7 +3194,7 @@ function rememberedModelFor(settings, provider) {
 }
 
 // src/commands/planner.ts
-var KNOWN_PROVIDERS = Object.keys(import_core16.ALL_PROVIDERS);
+var KNOWN_PROVIDERS = Object.keys(import_core17.ALL_PROVIDERS);
 async function handlePlanner(subArgs, injectedApi) {
   const api = await connect(subArgs, injectedApi);
   const [wanted] = positionals(subArgs);
@@ -3141,13 +3209,13 @@ async function handlePlanner(subArgs, injectedApi) {
   const settings = await persistEnv(api, { AI_PROVIDER: provider });
   const recall2 = describePlannerSwitch(settings, provider);
   writeEnv({ ORCHESTRATOR_MODEL: recall2.model, ORDEWELL_PLANNER_EFFORT: recall2.effort });
-  const meta = import_core16.ALL_PROVIDERS[provider];
+  const meta = import_core17.ALL_PROVIDERS[provider];
   const catalog = await fetchCatalog(api);
   console.log(
-    (0, import_core16.isCliProvider)(provider) ? `Planning with ${meta.label} \u2014 no API key needed, it uses that agent's own subscription.` : `Planner set to ${meta.label}.`
+    (0, import_core17.isCliProvider)(provider) ? `Planning with ${meta.label} \u2014 no API key needed, it uses that agent's own subscription.` : `Planner set to ${meta.label}.`
   );
   console.log(plannerModelLine(recall2));
-  if (!(0, import_core16.isCliProvider)(provider) && !catalog.providers.includes(provider)) {
+  if (!(0, import_core17.isCliProvider)(provider) && !catalog.providers.includes(provider)) {
     console.log(`  No ${meta.apiKeyEnvVar} configured yet \u2014 set one with \`ordewell key set ${provider} <key>\`.`);
   }
 }
@@ -3165,15 +3233,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 \u2014 they use their own subscription)");
-  for (const id of import_core16.CLI_PROVIDERS) {
-    const runner = (0, import_core16.runnerForProvider)(id);
+  for (const id of import_core17.CLI_PROVIDERS) {
+    const runner = (0, import_core17.runnerForProvider)(id);
     const discovered = runner ? catalog.models.some((m) => m.runners?.includes(runner)) : false;
-    console.log(`  ${marker(id === current)} ${id.padEnd(14)} ${import_core16.ALL_PROVIDERS[id].label}${discovered ? "" : "  (not detected)"}`);
+    console.log(`  ${marker(id === current)} ${id.padEnd(14)} ${import_core17.ALL_PROVIDERS[id].label}${discovered ? "" : "  (not detected)"}`);
   }
   console.log("\nAPI providers");
-  for (const id of import_core16.PROVIDER_PRIORITY) {
+  for (const id of import_core17.PROVIDER_PRIORITY) {
     const configured = catalog.providers.includes(id);
-    const meta = import_core16.ALL_PROVIDERS[id];
+    const meta = import_core17.ALL_PROVIDERS[id];
     console.log(`  ${marker(id === current)} ${id.padEnd(14)} ${meta.label}${configured ? "" : `  (no ${meta.apiKeyEnvVar})`}`);
   }
   console.log(`
@@ -3190,7 +3258,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_core16.runnerForProvider)(provider);
+  const runner = (0, import_core17.runnerForProvider)(provider);
   if (!runner) {
     fail(
       "Thinking effort applies to a coding-agent planner.",
@@ -3230,7 +3298,7 @@ async function handlePlannerEffort(subArgs, injectedApi) {
 }
 
 // src/commands/parallel.ts
-var import_core17 = require("@ordewell/core");
+var import_core18 = require("@ordewell/core");
 var USAGE5 = "Usage: ordewell parallel [<number of tasks, 1 or more>]";
 async function handleParallel(subArgs, injectedApi) {
   const [wanted] = positionals(subArgs);
@@ -3240,14 +3308,14 @@ 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_core17.parseMaxParallel)(wanted);
+  const limit = (0, import_core18.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/key.ts
-var import_core18 = require("@ordewell/core");
+var import_core19 = require("@ordewell/core");
 var USAGE6 = "Usage: ordewell key [list | set <provider> <key>]";
 async function handleKey(subArgs, injectedApi) {
   const [action, provider, ...keyParts] = positionals(subArgs);
@@ -3258,8 +3326,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_core18.PROVIDER_PRIORITY) {
-      const meta2 = import_core18.ALL_PROVIDERS[id2];
+    for (const id2 of import_core19.PROVIDER_PRIORITY) {
+      const meta2 = import_core19.ALL_PROVIDERS[id2];
       const configured = catalog.providers.includes(id2);
       console.log(`  ${configured ? "\u2713" : " "} ${id2.padEnd(14)} ${meta2.apiKeyEnvVar.padEnd(28)} ${meta2.label}`);
     }
@@ -3269,7 +3337,7 @@ async function handleKey(subArgs, injectedApi) {
   }
   if (!provider) fail(USAGE6);
   const id = provider.toLowerCase();
-  const meta = import_core18.ALL_PROVIDERS[id];
+  const meta = import_core19.ALL_PROVIDERS[id];
   if (!meta) {
     fail(`Unknown provider: ${provider}`, "Run `ordewell key` to see the list.");
   }
@@ -3280,7 +3348,7 @@ async function handleKey(subArgs, injectedApi) {
 }
 
 // src/commands/runners.ts
-var import_core19 = require("@ordewell/core");
+var import_core20 = require("@ordewell/core");
 var USAGE7 = "Usage: ordewell runners [<runner-id> on|off]";
 async function handleRunners(subArgs, injectedApi) {
   const [runner, toggle] = positionals(subArgs);
@@ -3305,21 +3373,21 @@ async function handleRunners(subArgs, injectedApi) {
   await api.setRunnerEnabled(runner, enabled);
   console.log(`${runner} ${enabled ? "enabled" : "disabled"}.`);
 }
-var AUTO_USAGE = "Usage: ordewell auto [full|auto]";
+var AUTO_USAGE = "Usage: ordewell auto [full|guarded]";
 function handleAuto(subArgs) {
   const [arg] = positionals(subArgs);
   const currentRaw = process.env.ORDEWELL_AUTONOMOUS_MODE;
   const current = currentRaw !== "false" && currentRaw !== "0";
   if (!arg) {
-    console.log(`Autonomy level: ${(0, import_core19.autonomyLevelLabel)(current)}`);
+    console.log(`Autonomy level: ${(0, import_core20.autonomyLevelLabel)(current)}`);
     console.log(`  ${AUTO_USAGE}`);
     return;
   }
-  const enabled = (0, import_core19.parseAutonomyLevel)(arg);
+  const enabled = (0, import_core20.parseAutonomyLevel)(arg);
   if (enabled === null) fail(AUTO_USAGE);
   writeEnvVar(findEnvFile(), "ORDEWELL_AUTONOMOUS_MODE", String(enabled));
   process.env.ORDEWELL_AUTONOMOUS_MODE = String(enabled);
-  console.log(`Autonomy level: ${(0, import_core19.autonomyLevelLabel)(enabled)} for new sessions.`);
+  console.log(`Autonomy level: ${(0, import_core20.autonomyLevelLabel)(enabled)} for new sessions.`);
 }
 async function handleRefresh(subArgs, injectedApi) {
   const api = await connect(subArgs, injectedApi);
@@ -3351,7 +3419,7 @@ async function handleApprove(subArgs, injectedApi) {
 // src/tui/terminalLauncher.ts
 var import_child_process3 = require("child_process");
 var import_util = require("util");
-var import_core20 = require("@ordewell/core");
+var import_core21 = require("@ordewell/core");
 var execFileAsync = (0, import_util.promisify)(import_child_process3.execFile);
 var defaultExecFile = async (command, args) => {
   const { stdout, stderr } = await execFileAsync(command, args);
@@ -3371,16 +3439,16 @@ var defaultWhich = (bin) => {
 async function openTaskTerminal(port, planSessionId, taskId, deps = {}) {
   const platform = deps.platform ?? process.platform;
   const env = deps.env ?? process.env;
-  const hasTmuxImpl = deps.hasTmuxImpl ?? import_core20.hasTmux;
+  const hasTmuxImpl = deps.hasTmuxImpl ?? import_core21.hasTmux;
   const execFileImpl = deps.execFileImpl ?? defaultExecFile;
   const spawnImpl = deps.spawnImpl ?? defaultSpawn;
   const which = deps.which ?? defaultWhich;
   if (!hasTmuxImpl()) {
     return { ok: false, message: "No terminal window for this task: tmux is not installed. Install tmux to get one for terminal-transport tasks; a structured task has its log view instead." };
   }
-  const session = (0, import_core20.tmuxSessionName)(port);
-  const socket = (0, import_core20.tmuxSocketName)(port);
-  const base = (0, import_core20.tmuxWindowName)(taskId, planSessionId);
+  const session = (0, import_core21.tmuxSessionName)(port);
+  const socket = (0, import_core21.tmuxSocketName)(port);
+  const base = (0, import_core21.tmuxWindowName)(taskId, planSessionId);
   let windows;
   try {
     const { stdout } = await execFileImpl("tmux", ["-L", socket, "list-windows", "-t", session, "-F", "#{window_name}"]);
@@ -3529,7 +3597,7 @@ async function handleTaskRunner(subArgs, injectedApi) {
     const state = await api.getRunners();
     if (!runner) {
       console.log(`
-Runner \xB7 #${task.order} ${task.title}
+Runner \xB7 ${(0, import_plan_utils.titledTaskRef)(task)}
 `);
       for (const r of state.runners) {
         console.log(`  ${r.id === task.assignedRunner ? "*" : " "} ${r.id.padEnd(14)} ${r.name}${r.enabled ? "" : "  (not enabled for planning)"}`);
@@ -3542,7 +3610,7 @@ Runner \xB7 #${task.order} ${task.title}
       fail(`Unknown runner: ${runner}`, `This daemon knows: ${state.runners.map((r) => r.id).join(", ")}`);
     }
     await api.updateTask(sessionId, task.id, { assignedRunner: runner });
-    console.log(`Task #${task.order} runner set to ${runner} \u2014 its model, effort and mode were re-picked for it.`);
+    console.log(`Task ${(0, import_plan_utils.taskRef)(task)} runner set to ${runner} \u2014 its model, effort and mode were re-picked for it.`);
   });
 }
 var MODEL_USAGE = "Usage: ordewell task-model <task-id-or-order> [<model-id>] [--session-id <id>]";
@@ -3552,7 +3620,7 @@ async function handleTaskModel(subArgs, injectedApi) {
     const options = modelsForTask(catalog.models, task);
     if (!modelId) {
       console.log(`
-Model \xB7 #${task.order} ${task.title}${task.assignedRunner ? ` (${task.assignedRunner})` : ""}
+Model \xB7 ${(0, import_plan_utils.titledTaskRef)(task)}${task.assignedRunner ? ` (${task.assignedRunner})` : ""}
 `);
       if (options.length === 0) console.log("  No models discovered for this runner \u2014 try `ordewell refresh`.");
       for (const m of options) {
@@ -3575,7 +3643,7 @@ Model \xB7 #${task.order} ${task.title}${task.assignedRunner ? ` (${task.assigne
       assignedModel,
       thinkingEffort: assignedModel.thinkingEffort ?? null
     });
-    console.log(`Task #${task.order} model set to ${model.label}.`);
+    console.log(`Task ${(0, import_plan_utils.taskRef)(task)} model set to ${model.label}.`);
     if (task.assignedModel?.thinkingEffort && !assignedModel.thinkingEffort) {
       console.log(`  ${model.label} does not expose "${task.assignedModel.thinkingEffort}", so the effort went back to the runner default.`);
     }
@@ -3589,7 +3657,7 @@ async function handleTaskEffort(subArgs, injectedApi) {
     const current = task.assignedModel?.thinkingEffort;
     if (!level) {
       console.log(`
-Thinking effort \xB7 #${task.order} ${task.title}
+Thinking effort \xB7 ${(0, import_plan_utils.titledTaskRef)(task)}
 `);
       console.log(`  ${current ? " " : "*"} default        Let the executor choose`);
       for (const v of variants) {
@@ -3614,7 +3682,7 @@ Thinking effort \xB7 #${task.order} ${task.title}
       assignedModel: task.assignedModel ? { ...task.assignedModel, thinkingEffort } : void 0,
       thinkingEffort: thinkingEffort ?? null
     });
-    console.log(`Task #${task.order} thinking effort set to ${thinkingEffort ?? "runner default"}.`);
+    console.log(`Task ${(0, import_plan_utils.taskRef)(task)} thinking effort set to ${thinkingEffort ?? "runner default"}.`);
   });
 }
 var MODE_USAGE = "Usage: ordewell task-mode <task-id-or-order> [<mode>] [--session-id <id>]";
@@ -3624,7 +3692,7 @@ async function handleTaskMode(subArgs, injectedApi) {
     const modes = modesForTask(catalog.modesByRunner, task);
     if (!mode) {
       console.log(`
-Mode \xB7 #${task.order} ${task.title}${task.assignedRunner ? ` (${task.assignedRunner})` : ""}
+Mode \xB7 ${(0, import_plan_utils.titledTaskRef)(task)}${task.assignedRunner ? ` (${task.assignedRunner})` : ""}
 `);
       if (modes.length === 0) {
         console.log("  This task has no runner, or its runner declares no modes.");
@@ -3643,7 +3711,7 @@ Mode \xB7 #${task.order} ${task.title}${task.assignedRunner ? ` (${task.assigned
       );
     }
     await api.updateTask(sessionId, task.id, { taskMode: chosen.id });
-    console.log(`Task #${task.order} mode set to ${chosen.label}.`);
+    console.log(`Task ${(0, import_plan_utils.taskRef)(task)} mode set to ${chosen.label}.`);
   });
 }
 var DEPS_USAGE = "Usage: ordewell task-deps <task-id-or-order> [<id,id,\u2026>|none] [--session-id <id>]";
@@ -3652,14 +3720,14 @@ async function handleTaskDeps(subArgs, injectedApi) {
     const candidates = (0, import_plan_utils.dependencyCandidates)(tasks, task.id);
     if (!value) {
       console.log(`
-Dependencies \xB7 #${task.order} ${task.title}
+Dependencies \xB7 ${(0, import_plan_utils.titledTaskRef)(task)}
 `);
       if (candidates.length === 0) {
-        console.log(`  Nothing runs before #${task.order}, so it has no possible dependencies.`);
+        console.log(`  Nothing runs before ${(0, import_plan_utils.taskRef)(task)}, so it has no possible dependencies.`);
       }
       for (const c of candidates) {
         const chosen = task.dependencies.includes(c.id);
-        console.log(`  ${chosen ? "*" : " "} ${c.id}  #${c.order} ${c.title}${c.status === "completed" ? "  (already completed)" : ""}`);
+        console.log(`  ${chosen ? "*" : " "} ${c.id}  ${(0, import_plan_utils.titledTaskRef)(c)}${c.status === "completed" ? "  (already completed)" : ""}`);
       }
       console.log(`
   * = current. ${DEPS_USAGE}`);
@@ -3669,7 +3737,7 @@ Dependencies \xB7 #${task.order} ${task.title}
     const check = (0, import_plan_utils.canSetDependencies)(tasks, task.id, dependencies);
     if (!check.ok) fail(check.error ?? "Invalid dependencies.");
     await api.updateTask(sessionId, task.id, { dependencies });
-    console.log(dependencies.length > 0 ? `Task #${task.order} now depends on ${dependencies.length} task${dependencies.length === 1 ? "" : "s"}.` : `Task #${task.order} no longer depends on anything.`);
+    console.log(dependencies.length > 0 ? `Task ${(0, import_plan_utils.taskRef)(task)} now depends on ${dependencies.length} task${dependencies.length === 1 ? "" : "s"}.` : `Task ${(0, import_plan_utils.taskRef)(task)} no longer depends on anything.`);
   });
 }
 var OPS_USAGE = "Usage: ordewell task-ops <task-id-or-order> [on|off] [--session-id <id>]";
@@ -3677,7 +3745,7 @@ async function handleTaskOps(subArgs, injectedApi) {
   await withTask(subArgs, OPS_USAGE, injectedApi, async (api, sessionId, task, tasks, value) => {
     if (!value) {
       console.log(`
-#${task.order} ${task.title} is ${task.ops ? "an ops task: it runs in your checkout once the work it depends on is merged" : "a change task: it runs in its own worktree"}.`);
+${(0, import_plan_utils.titledTaskRef)(task)} is ${task.ops ? "an ops task: it runs in your checkout once the work it depends on is merged" : "a change task: it runs in its own worktree"}.`);
       console.log(`
   ${OPS_USAGE}`);
       return;
@@ -3687,12 +3755,12 @@ async function handleTaskOps(subArgs, injectedApi) {
     if (task.type !== "ai") fail("Only an AI task can be an ops task \u2014 a manual task already runs outside any worktree.");
     if (!tasks.some((t) => t.id === task.id)) fail("A subtask runs with its parent; make the parent an ops task instead.");
     await api.updateTask(sessionId, task.id, { ops: to === "on" });
-    console.log(to === "on" ? `Task #${task.order} is an ops task: it runs in your checkout once the work it depends on is merged.` : `Task #${task.order} is a change task: it runs in its own worktree.`);
+    console.log(to === "on" ? `Task ${(0, import_plan_utils.taskRef)(task)} is an ops task: it runs in your checkout once the work it depends on is merged.` : `Task ${(0, import_plan_utils.taskRef)(task)} is a change task: it runs in its own worktree.`);
   });
 }
 
 // src/tui/index.ts
-var import_core33 = require("@ordewell/core");
+var import_core36 = require("@ordewell/core");
 
 // src/tui/editor.ts
 function emptyEditor() {
@@ -3841,6 +3909,7 @@ var SLASH_COMMANDS = [
   { name: "cancel", usage: "/cancel <id>", description: "Kill a running task", category: "tasks" },
   { name: "force-start", usage: "/force-start <id>", description: "Start a task now, ignoring dependencies", category: "tasks" },
   { name: "continue", usage: "/continue <id> <message>", description: "Continue a finished task in its saved runner session, with your message", 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: "terminal", usage: "/terminal <id>", description: "Open a task: its OS terminal, or a structured task's live log", 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" },
@@ -3855,7 +3924,7 @@ var SLASH_COMMANDS = [
   { name: "key", usage: "/key [set <provider> <key>]", description: "Configure API provider keys", category: "models" },
   { 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 (claude-code, opencode, codex)", category: "models" },
-  { name: "auto", usage: "/auto [full|auto]", description: "Autonomy level for new plans: Full auto or Auto", category: "models" },
+  { name: "auto", usage: "/auto [full|guarded]", description: "Autonomy level for new plans: Full or Guarded", category: "models" },
   { name: "transport", usage: "/transport [terminal|structured]", description: "Drive tasks through each runner's protocol (structured) or a terminal, from the next run", category: "models" },
   { name: "parallel", usage: "/parallel [<n>]", description: "How many AI tasks run at once (applies to a live run)", category: "models" },
   { name: "refresh", usage: "/refresh", description: "Re-discover runners and model catalogs", category: "models" },
@@ -3941,7 +4010,7 @@ function tokenCompletions(token) {
 }
 
 // src/tui/blocks.ts
-var import_core21 = require("@ordewell/core");
+var import_core22 = require("@ordewell/core");
 
 // src/tui/markdown.ts
 function renderMarkdown(source, cols) {
@@ -4119,6 +4188,17 @@ function commandMark(block) {
   if (block.status === "pending") return style.grey("\u25CB");
   return (unsettledOutcome(block)?.paint ?? style.green)("\u25CF");
 }
+var PATH_LIKE = /^(?![a-z][a-z0-9+.-]*:\/\/)\S*\/\S*$/i;
+function truncatePath(path, max) {
+  if (width(path) <= max) return path;
+  let tail = "";
+  for (const char of Array.from(path).reverse()) {
+    if (width(char + tail) > max - 1) break;
+    tail = char + tail;
+  }
+  const slash = tail.indexOf("/");
+  return `\u2026${slash > 0 ? tail.slice(slash) : tail}`;
+}
 function commandHeader(block, cols, detailAll) {
   const name = sanitize(block.headline.name);
   const keyArg = sanitize(block.headline.keyArg);
@@ -4127,7 +4207,8 @@ function commandHeader(block, cols, detailAll) {
   }
   const open = `\u25CF ${name}(`;
   const room = cols - width(open) - 1;
-  const text = room > 1 ? `${open}${truncate(keyArg, room)})` : truncate(`${open}${keyArg})`, cols);
+  const cut = PATH_LIKE.test(keyArg) ? truncatePath(keyArg, room) : truncate(keyArg, room);
+  const text = room > 1 ? `${open}${cut})` : truncate(`${open}${keyArg})`, cols);
   return [`${commandMark(block)}${text.slice(1)}`];
 }
 function argumentLines(args) {
@@ -4149,24 +4230,46 @@ function resultLines(block, room, detailAll) {
   const fit2 = (line) => detailAll ? wrap(line, room) : [truncate(line, room)];
   const outcome = unsettledOutcome(block);
   if (outcome) {
-    const [reason, ...rest] = (0, import_core21.outputLines)(block.output).map(sanitize);
+    const [reason, ...rest] = (0, import_core22.outputLines)(block.output).map(sanitize);
     const status = fit2(reason ? `${outcome.label}: ${reason}` : outcome.label).map(outcome.paint);
     return detailAll ? [...status, ...rest.flatMap(fit2).map(style.grey)] : status;
   }
   if (detailAll) {
-    const lines2 = (0, import_core21.outputLines)(block.output).map(sanitize);
+    const lines2 = (0, import_core22.outputLines)(block.output).map(sanitize);
     const note = lines2.length > PREVIEW_LINES ? ["\u2026 (ctrl+o to collapse)"] : [];
     return lines2.length > 0 ? [...lines2.flatMap(fit2), ...note].map(style.grey) : [style.grey("(no output)")];
   }
-  const { lines, hiddenLineCount } = (0, import_core21.outputPreview)(block.output, PREVIEW_LINES);
+  const { lines, hiddenLineCount } = (0, import_core22.outputPreview)(block.output, PREVIEW_LINES);
   if (lines.length === 0) return [style.grey("(no output)")];
   const more = hiddenLineCount > 0 ? [`\u2026 +${countOf(hiddenLineCount, "line")} (ctrl+o to expand)`] : [];
   return [...lines.map(sanitize), ...more].map((line) => style.grey(truncate(line, room)));
 }
+var DIFF_PREVIEW_ROWS = 10;
+var DIFF_PAINT = {
+  added: style.green,
+  removed: style.red,
+  context: style.grey,
+  gap: style.grey
+};
+var DIFF_SIGN = { added: "+", removed: "-", context: " ", gap: "" };
+function diffLines(block, diff, room, detailAll) {
+  const rows = (0, import_core22.diffRows)(block.output);
+  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)}`;
+    return (detailAll ? wrap(text, room) : [truncate(text, room)]).map(DIFF_PAINT[row.kind]);
+  };
+  const shown = detailAll ? rows : rows.slice(0, DIFF_PREVIEW_ROWS);
+  const hidden = rows.length - shown.length;
+  const more = hidden > 0 ? [style.grey(`\u2026 +${countOf(hidden, "line")} (ctrl+o to expand)`)] : [];
+  return [(0, import_core22.diffSummary)(diff), ...shown.flatMap(draw), ...more];
+}
 function toolLines(block, cols, detailAll) {
   const room = Math.max(1, cols - OUTPUT_INDENT.length);
-  const args = detailAll ? argumentLines(block.args).flatMap((line) => wrap(line, room)).map((line) => OUTPUT_INDENT + style.grey(line)) : [];
-  return [...commandHeader(block, cols, detailAll), ...args, ...underHeader(resultLines(block, room, detailAll))];
+  const diff = block.diff && block.status === "ok" ? block.diff : null;
+  const args = detailAll && !diff ? argumentLines(block.args).flatMap((line) => wrap(line, room)).map((line) => OUTPUT_INDENT + style.grey(line)) : [];
+  const result = diff ? diffLines(block, diff, room, detailAll) : resultLines(block, room, detailAll);
+  return [...commandHeader(block, cols, detailAll), ...args, ...underHeader(result)];
 }
 var SUBAGENT_PAINT = {
   running: style.yellow,
@@ -4215,6 +4318,19 @@ function approvalLine(block, cols) {
   const line = `${mark} ${status} \xB7 ${APPROVAL_KIND[block.kind]}: ${firstLine(block.subject)}${note}`;
   return `${paint(mark)}${truncate(line, cols).slice(mark.length)}`;
 }
+function approvalKeysLine(block, cols) {
+  const keys = ["ctrl-y allow", ...block.allowForTask ? ["ctrl-t allow for task"] : [], "ctrl-g deny (composer text is the note)"];
+  return style.grey(truncate(`  ${keys.join(" \xB7 ")}`, cols));
+}
+function checkpointCardLines(order, question, cols, approvalFirst) {
+  const room = Math.max(1, cols - 2);
+  const keys = approvalFirst ? "answer the tool request above first (ctrl-y / ctrl-g), then ctrl-y approves \xB7 ctrl-g rejects (composer text is the reason)" : "ctrl-y approve \xB7 ctrl-g reject (composer text is the reason)";
+  return [
+    truncate(`${style.accent("\u25C6")} ${style.bold(`Task ${order} asks`)}`, cols),
+    ...wrap(sanitize(question).trim(), room).map((line) => `  ${line}`),
+    ...wrap(keys, room).map((line) => style.grey(`  ${line}`))
+  ];
+}
 function planLine(block, cols) {
   const count = block.taskCount === void 0 ? "" : ` (${countOf(block.taskCount, "task")})`;
   const text = block.status === "building" ? "Building plan\u2026" : `Plan ${block.status}${count}`;
@@ -4247,11 +4363,13 @@ function drawn(block, cols, detailAll) {
   drawnBlocks.set(block, { cols, detailAll, lines });
   return lines;
 }
-function conversationLines(blocks, cols, detailAll) {
+function conversationLines(blocks, cols, detailAll, answering) {
   const lines = [];
   for (const block of blocks) {
     if (block.type === "usage") continue;
-    lines.push(...drawn(block, cols, detailAll), "");
+    lines.push(...drawn(block, cols, detailAll));
+    if (block === answering) lines.push(approvalKeysLine(block, cols));
+    lines.push("");
   }
   return lines;
 }
@@ -4279,7 +4397,7 @@ function tokenLine(blocks, cols) {
 }
 
 // src/tui/state.ts
-var import_core22 = require("@ordewell/core");
+var import_core23 = require("@ordewell/core");
 var SKILL_IDS = ["tdd", "verify"];
 function noSkills() {
   return { tdd: false, verify: false };
@@ -4291,8 +4409,7 @@ function visibleItems(picker2) {
     (i) => i.id.toLowerCase().includes(filter) || i.label.toLowerCase().includes(filter) || (i.detail ?? "").toLowerCase().includes(filter)
   );
 }
-var isTaskRunning = (task) => task.status === "in_progress" || task.status === "running";
-var anyTaskRunning = (state) => state.tasks.some(isTaskRunning);
+var anyTaskRunning = (state) => state.tasks.some(import_core23.isTaskRunning);
 var plannerInFlight = (state) => state.status === "planning" || state.status === "researching";
 function planRows(state) {
   const rows = [];
@@ -4312,6 +4429,9 @@ function selectedPlanRow(state) {
 function waitingApproval(tv) {
   return tv.view.blocks.find((b) => b.type === "approval" && b.status === "pending" && b.approvalId !== void 0);
 }
+function waitingCheckpoint(task) {
+  return task?.status === "awaiting_user" && task.awaitingReason === "checkpoint" ? task.checkpoint : void 0;
+}
 function continuesTask(task) {
   return task?.continuable === true && (task.status === "completed" || task.status === "failed");
 }
@@ -4326,9 +4446,9 @@ function findTask(tasks, id) {
 function initialState(overrides = {}) {
   return {
     editor: emptyEditor(),
-    conversation: import_core22.EMPTY_CONVERSATION,
+    conversation: import_core23.EMPTY_CONVERSATION,
     taskView: null,
-    turnGate: import_core22.NO_TURN,
+    turnGate: import_core23.NO_TURN,
     detailAll: false,
     status: "idle",
     busyLabel: "",
@@ -4353,7 +4473,7 @@ function initialState(overrides = {}) {
     orchestratorModel: "",
     plannerProvider: "",
     plannerEffort: "",
-    maxParallel: import_core22.DEFAULT_MAX_PARALLEL,
+    maxParallel: import_core23.DEFAULT_MAX_PARALLEL,
     configuredProviders: [],
     allowlist: {},
     autonomous: true,
@@ -4365,7 +4485,7 @@ function initialState(overrides = {}) {
     gate: null,
     overlay: null,
     pendingApprovals: [],
-    queuedPrompts: import_core22.EMPTY_HOLD,
+    queuedPrompts: import_core23.EMPTY_HOLD,
     stopArmed: false,
     stopArmToken: 0,
     stopRequested: false,
@@ -4413,7 +4533,7 @@ function chatEditorRoomFor(state, active) {
 }
 
 // src/tui/layout.ts
-var import_core23 = require("@ordewell/core");
+var import_core24 = require("@ordewell/core");
 var CHROME_ROWS = 4;
 function chatInputWrap(state) {
   const active = state.focus === "chat" && !state.overlay;
@@ -4422,7 +4542,7 @@ function chatInputWrap(state) {
 }
 function footerHints(state) {
   const selected = selectedPlanRow(state)?.task;
-  const markHint = selected?.status === "completed" ? "m undone" : "m done";
+  const markHint = selected && (0, import_core24.markAction)(selected) === "uncomplete" ? "m undone" : "m done";
   const resolveHint = selected?.isolation?.state === "conflict" ? ["x resolve conflict"] : [];
   const planning = plannerInFlight(state) && !state.taskView;
   const escHint = !planning ? null : state.queuedPrompts.length > 0 ? "esc unsend" : "esc \xD72 stop planning";
@@ -4453,7 +4573,7 @@ function footerHints(state) {
       "tab chat"
     ];
   }
-  const detailHint = (0, import_core23.hasHiddenDetail)(state.taskView ? state.taskView.view.blocks : state.conversation.blocks) ? [state.detailAll ? "ctrl-o collapse all" : "ctrl-o expand all"] : [];
+  const detailHint = (0, import_core24.hasHiddenDetail)(state.taskView ? state.taskView.view.blocks : state.conversation.blocks) ? [state.detailAll ? "ctrl-o collapse all" : "ctrl-o expand all"] : [];
   return [
     "/help",
     "tab plan",
@@ -4474,20 +4594,25 @@ function queuedBubble(text, cols) {
 function taskQueuedRows(state, cols) {
   const tv = state.taskView;
   if (!tv) return [];
-  return tv.view.queued.flatMap((message, i) => queuedTaskBubble(message.text, i === tv.queuedIndex, cols));
+  return tv.view.queued.flatMap((message, i) => queuedTaskBubble(message, i === tv.queuedIndex, cols));
+}
+function queuedTaskTag({ handedOver, forced }, selected) {
+  if (forced) return " \xB7 sending now";
+  if (handedOver) return " \xB7 handed over";
+  return selected ? " \xB7 queued \xB7 ctrl-r removes" : " \xB7 queued";
 }
-function queuedTaskBubble(text, selected, cols) {
+function queuedTaskBubble(message, selected, cols) {
+  const { text } = message;
   const marker2 = selected ? style.accent("\u276F") : style.grey("\u25C7");
-  const tag = selected ? " \xB7 queued \xB7 ctrl-r removes" : " \xB7 queued";
+  const tag = queuedTaskTag(message, selected);
   const room = Math.max(1, cols - width(`\u276F \u25C7  ${tag}`));
   return wrap(text, room).map((line, i) => i === 0 ? truncate(`${marker2} ${selected ? style.bold(line) : line}${style.grey(tag)}`, cols) : truncate(`  ${line}`, cols));
 }
 function taskActivity(task, working) {
-  if (task?.awaitingApproval) return approvalLabel(task.awaitingApproval);
+  const approvals = (0, import_core24.approvalLabel)(task?.awaitingApproval);
+  if (approvals) return inRow(approvals);
   if (working) return "working";
-  if (task?.status === "awaiting_user") {
-    return task.awaitingReason ? AWAITING_LABEL[task.awaitingReason] : "waiting for your input";
-  }
+  if (task?.status === "awaiting_user") return inRow((0, import_core24.awaitingLabel)(task) ?? "Waiting for your input");
   return task?.status ?? "";
 }
 function taskHeaderLines(state, tv, cols) {
@@ -4499,7 +4624,8 @@ function taskHeaderLines(state, tv, cols) {
     taskActivity(task, tv.view.working)
   ].filter(Boolean);
   const approval = waitingApproval(tv);
-  const hint = approval ? ["ctrl-y allow", ...approval.allowForTask ? ["ctrl-t allow for task"] : [], "ctrl-g deny (composer text is the note)"] : ["ctrl-r remove queued", "ctrl-x interrupt"];
+  const hint = approval ? ["ctrl-y allow", ...approval.allowForTask ? ["ctrl-t allow for task"] : [], "ctrl-g deny (composer text is the note)"] : waitingCheckpoint(task) ? ["ctrl-y approve", "ctrl-g reject (composer text is the reason)", "ctrl-x interrupt"] : ["ctrl-r remove queued", "ctrl-x interrupt", "ctrl-s send now"];
+  if (approval && waitingCheckpoint(task)) hint.push("then the checkpoint");
   const index = tv.attempts.indexOf(tv.attempt);
   if (tv.attempts.length > 1) hint.push(`alt\u2190/\u2192 attempt ${index >= 0 ? index + 1 : 1}/${tv.attempts.length}`);
   hint.push("esc back");
@@ -4532,10 +4658,10 @@ function bodyRows(state) {
   return Math.max(0, state.rows - CHROME_ROWS - input - footer + 2);
 }
 var chatBodyMemo = null;
-function chatBodyLines(blocks, cols, detailAll) {
+function chatBodyLines(blocks, cols, detailAll, answering) {
   const memo = chatBodyMemo;
   if (memo && memo.blocks === blocks && memo.cols === cols && memo.detailAll === detailAll) return memo.lines;
-  const lines = conversationLines(blocks, cols, detailAll);
+  const lines = conversationLines(blocks, cols, detailAll, answering);
   chatBodyMemo = { blocks, cols, detailAll, lines };
   return lines;
 }
@@ -4543,7 +4669,10 @@ function chatLayout(state, rows, cols) {
   const tv = state.taskView;
   const blocks = tv ? tv.view.blocks : state.conversation.blocks;
   const welcome = !tv && state.tasks.length === 0;
-  const body = chatBodyLines(blocks, cols, state.detailAll);
+  const checkpoint = tv ? waitingCheckpoint(findTask(state.tasks, tv.taskId)) : void 0;
+  const card = tv && checkpoint ? checkpointCardLines(findTask(state.tasks, tv.taskId)?.order ?? 0, checkpoint, cols, waitingApproval(tv) !== void 0) : [];
+  const answering = chatBodyLines(blocks, cols, state.detailAll, tv ? waitingApproval(tv) : void 0);
+  const body = card.length > 0 ? [...answering, ...card] : answering;
   const transcript = !welcome ? body : body.length === 0 ? welcomeLines(state, cols) : [...welcomeLines(state, cols), "", ...body];
   const bubbles = tv ? taskQueuedRows(state, cols) : queuedPromptRows(state, cols);
   const lines = [...transcript, ...bubbles.length > 0 ? ["", ...bubbles] : []];
@@ -4558,9 +4687,9 @@ function chatScrollMax(state) {
 }
 function plannerSetup(state) {
   const provider = state.plannerProvider;
-  const registration = import_core23.ALL_PROVIDERS[provider];
+  const registration = import_core24.ALL_PROVIDERS[provider];
   if (!registration) return { label: "not set", ready: false };
-  const runner = (0, import_core23.runnerForProvider)(provider);
+  const runner = (0, import_core24.runnerForProvider)(provider);
   const ready = runner ? state.runners.some((r) => r.id === runner) : state.configuredProviders.includes(provider);
   return { label: registration.label, ready };
 }
@@ -4647,45 +4776,34 @@ function welcomeLines(state, cols) {
   return lines;
 }
 var SPINNER = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
-var STATUS_MARK = {
-  completed: style.green,
+var STATUS_PAINT = {
+  done: style.green,
   running: style.yellow,
-  in_progress: style.yellow,
+  quiet: style.cyan,
   failed: style.red,
   blocked: style.red,
-  awaiting_user: style.yellow,
-  cancelled: style.grey,
-  skipped: style.grey
+  awaiting: style.yellow,
+  todo: (text) => text
 };
 var STATUS_ICON = {
-  completed: "\u2713",
+  done: "\u2713",
   failed: "\u2717",
   blocked: "!",
-  awaiting_user: "?",
-  cancelled: "\u2212",
-  skipped: "\u2212",
-  approved: "\xB7",
-  pending: "\xB7"
+  awaiting: "?",
+  quiet: "~",
+  todo: "\xB7"
 };
-var AWAITING_LABEL = {
-  input: "waiting for your input",
-  checkpoint: "checkpoint",
-  conflict: "merge conflict",
-  "files-changed": "changed tracked files"
-};
-function approvalLabel(count) {
-  return count > 1 ? `waiting for approval (${count})` : "waiting for approval";
-}
-var IDLE_ICON = "~";
+var inRow = (label) => label.charAt(0).toLowerCase() + label.slice(1);
 var FIRST_ROW_LINE = 2;
 function planLayout(state, rows, cols) {
   const done = state.tasks.filter((t) => t.status === "completed").length;
   const lines = [style.bold(`Plan ${done}/${state.tasks.length}`), ""];
   const rowSpans = [];
+  const orderOf = new Map(state.tasks.map((task) => [task.id, task.order]));
   let editorLine;
   planRows(state).forEach((row, i) => {
     const taskStart = lines.length;
-    const renderedTask = taskLines(state, row, i, cols);
+    const renderedTask = taskLines(state, row, i, cols, orderOf);
     if (row.task.id === state.expandedTaskId && renderedTask.editorLine !== void 0) {
       editorLine = taskStart + renderedTask.editorLine;
     }
@@ -4741,18 +4859,16 @@ function planScrollExtent(state) {
   }
   return planLayout(state, bodyRows(state), cols);
 }
-function taskLines(state, row, index, cols) {
-  const { task, parent } = row;
+function taskLines(state, planRow, index, cols, orderOf) {
+  const { task, parent } = planRow;
+  const row = (0, import_core24.taskRowView)(task, { parent, orderOf, modes: modesForTask(state.modesByRunner, task) });
   const selected = state.focus === "plan" && index === state.selectedTask;
   const expanded = state.expandedTaskId === task.id;
-  const running = isTaskRunning(task);
-  const idle = running && task.status === "in_progress" && task.idleSince != null;
-  const paint = idle ? style.cyan : STATUS_MARK[task.status] ?? ((t) => t);
-  const rawIcon = idle ? IDLE_ICON : running ? SPINNER[state.spinnerFrame % SPINNER.length] : STATUS_ICON[task.status] ?? "\xB7";
-  const icon = paint(rawIcon);
-  const kind = running ? style.yellow("RUN") : task.type === "user" ? style.yellow("MAN") : task.ops ? style.magenta("OPS") : style.grey(" AI");
+  const rawIcon = row.status === "running" ? SPINNER[state.spinnerFrame % SPINNER.length] : STATUS_ICON[row.status];
+  const icon = STATUS_PAINT[row.status](rawIcon);
+  const kind = row.running ? style.yellow("RUN") : row.kind === "user" ? style.yellow("MAN") : row.kind === "ops" ? style.magenta("OPS") : style.grey(" AI");
   const caret = selected ? style.cyan("\u276F") : " ";
-  const orderLabel = parent ? (0, import_core23.taskOrderLabel)(task, parent) : String(task.order).padStart(2);
+  const orderLabel = parent ? row.orderLabel : row.orderLabel.padStart(2);
   const indent = parent ? "  " : "";
   const head = `${indent}${caret} ${icon} ${orderLabel} ${kind} `;
   const titleRoom = Math.max(1, cols - width(head));
@@ -4769,59 +4885,52 @@ function taskLines(state, row, index, cols) {
   });
   const model = task.assignedModel?.modelLabel ?? (task.type === "ai" ? "default model" : "");
   const effort = task.type === "ai" ? `effort: ${task.assignedModel?.thinkingEffort ?? "default"}` : "";
-  const modeInfo = task.type === "ai" ? modesForTask(state.modesByRunner, task).find((m) => m.id === task.taskMode) : void 0;
-  const mode = task.type === "ai" ? `mode: ${task.taskMode ?? "default"}${modeInfo?.autonomous ? style.yellow(" \u26A1") : ""}` : "";
+  const mode = task.type === "ai" ? `mode: ${task.taskMode ?? "default"}${row.autonomous ? style.yellow(" \u26A1") : ""}` : "";
   const runner = task.assignedRunner ?? "";
   const bodyPad = parent ? "      " : "    ";
   const structured = task.transport?.kind === "structured";
-  const waiting = task.status === "awaiting_user" && task.awaitingReason ? AWAITING_LABEL[task.awaitingReason] : "";
-  const activity = task.awaitingApproval ? `${approvalLabel(task.awaitingApproval)} \u2014 t opens it` : idle ? structured ? "quiet" : "quiet \u2014 t opens its terminal" : running ? "working" : waiting;
+  const activity = row.approvals ? `${inRow(row.approvals)} \u2014 t opens it` : row.status === "quiet" ? structured ? "quiet" : "quiet \u2014 t opens its terminal" : row.running ? "working" : row.awaiting ? inRow(row.awaiting) : "";
   const meta = [activity, runner, structured ? "structured" : "", model].filter(Boolean).join(" \xB7 ");
   if (meta) lines.push(style.grey(truncate(`${bodyPad}${meta}`, cols)));
   if (task.transport?.fallback) lines.push(style.yellow(truncate(`${bodyPad}terminal: ${task.transport.fallback}`, cols)));
   if (effort || mode) lines.push(style.grey(truncate(`${bodyPad}${[effort, mode].filter(Boolean).join(" \xB7 ")}`, cols)));
-  if (task.isolation?.state === "conflict") {
-    const where = task.isolation.conflictRepo && task.isolation.conflictRepo !== "." ? ` in ${task.isolation.conflictRepo}` : "";
-    const files = task.isolation.conflictFiles?.length ? ` (${(0, import_core23.capConflictFiles)(task.isolation.conflictFiles)})` : "";
+  if (row.conflict) {
+    const where = row.conflict.repo ? ` in ${row.conflict.repo}` : "";
+    const files = row.conflict.files ? ` (${row.conflict.files})` : "";
     lines.push(style.red(truncate(`${bodyPad}\u26A0 merge conflict${where}${files} \u2014 its work is kept on its own branch`, cols)));
   }
-  if (task.isolation?.state === "repairing") {
-    const files = task.isolation.conflictFiles?.length ? ` in ${(0, import_core23.capConflictFiles)(task.isolation.conflictFiles)}` : "";
-    const attempt = task.isolation.repair ? ` (attempt ${task.isolation.repair.attempt}/${task.isolation.repair.limit})` : "";
+  if (row.repairing) {
+    const files = row.repairing.files ? ` in ${row.repairing.files}` : "";
+    const attempt = row.repairing.attempt ? ` (attempt ${row.repairing.attempt.attempt}/${row.repairing.attempt.limit})` : "";
     lines.push(style.yellow(truncate(`${bodyPad}\u21BB repairing conflict${files}${attempt}`, cols)));
   }
-  if (task.mergeGate?.length) {
-    const deps = task.mergeGate.map((id) => {
-      const dep = state.tasks.find((t) => t.id === id);
-      return dep ? `#${dep.order}` : id;
-    });
-    lines.push(style.yellow(truncate(`${bodyPad}\u23F8 waits for Merge all \u2014 ${deps.join(", ")} not merged into your branch yet`, cols)));
+  if (row.mergeGate) {
+    lines.push(style.yellow(truncate(`${bodyPad}\u23F8 waits for Merge all \u2014 ${row.mergeGate.join(", ")} not merged into your branch yet`, cols)));
   }
-  if (task.status === "awaiting_user" && task.awaitingReason === "files-changed") {
+  if (row.opsChangedFiles) {
     lines.push(style.yellow(truncate(`${bodyPad}\u26A0 an ops task changed tracked files \u2014 check them, then m done or /retry`, cols)));
   }
-  if (task.isolation?.state === "integrated" && task.isolation.repairedFiles?.length) {
-    lines.push(style.grey(truncate(`${bodyPad}\u21BB landed after repairing conflict in ${(0, import_core23.capConflictFiles)(task.isolation.repairedFiles)}`, cols)));
+  if (row.repaired?.landed) {
+    lines.push(style.grey(truncate(`${bodyPad}\u21BB landed after repairing conflict in ${row.repaired.files}`, cols)));
   }
   let editorLine;
   if (expanded) {
     lines.push(style.grey(`${bodyPad}${task.status.replace(/_/g, " ")}`));
     if (task.isolation && task.isolation.state !== "none" && task.isolation.branch) {
       lines.push(...taskText("Branch", task.isolation.branch, cols, bodyPad));
-      const repos = taskRepoNames(task.isolation);
-      if (repos.length > 0) lines.push(...taskText("Repos", repos.join(", "), cols, bodyPad));
+      if (row.repos.length > 0) lines.push(...taskText("Repos", row.repos.join(", "), cols, bodyPad));
       if (task.isolation.state !== "integrated" && task.isolation.worktree) {
         lines.push(...taskText("Worktree", task.isolation.worktree, cols, bodyPad));
       }
     }
-    if (task.ops) {
+    if (row.kind === "ops") {
       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 (task.forcedPastGate?.length) {
-      lines.push(...taskText("Forced", `Started before the work of ${task.forcedPastGate.join(", ")} was merged into your branch.`, cols, bodyPad));
+    if (row.forcedPastGate) {
+      lines.push(...taskText("Forced", `Started before the work of ${row.forcedPastGate.join(", ")} was merged into your branch.`, cols, bodyPad));
     }
-    if (modeInfo?.autonomous) {
-      lines.push(...taskText("Autonomy", "Runs without permission prompts (Full auto). Change the level with /auto.", cols, bodyPad));
+    if (row.autonomous) {
+      lines.push(...taskText("Autonomy", "Runs without permission prompts (Full). Change the level with /auto.", cols, bodyPad));
     }
     const editableSeed = task.prompt ?? task.description ?? task.title;
     if (task.description && task.description !== task.title && task.description !== editableSeed) {
@@ -4834,10 +4943,8 @@ function taskLines(state, row, index, cols) {
       editorLine = lines.length + 1 + cp.line;
       lines.push(...taskPromptLines(wrapped, cp, bodyPad));
     }
-    if (task.dependencies.length > 0) {
-      const orderById = new Map(state.tasks.map((candidate) => [candidate.id, candidate.order]));
-      const dependencies = task.dependencies.map((id) => orderById.has(id) ? `#${orderById.get(id)}` : id).join(", ");
-      lines.push(...taskText("Depends on", dependencies, cols, bodyPad));
+    if (row.dependencies.length > 0) {
+      lines.push(...taskText("Depends on", row.dependencies.join(", "), cols, bodyPad));
     }
     lines.push(style.grey(`${bodyPad}enter save \xB7 esc cancel`));
     lines.push(style.grey(truncate(`${bodyPad}then R runner \xB7 o model \xB7 e effort \xB7 M mode \xB7 D deps`, cols)));
@@ -4884,7 +4991,13 @@ function helpLayout(rows, cols) {
     style.grey("tab switches panes \xB7 pgup/pgdn scroll \xB7 ctrl-o toggles full detail \xB7 esc takes back a queued prompt, otherwise esc twice stops \xB7 ctrl-l clears \xB7 ctrl-c quits")
   );
   body.push(
-    style.grey("in a task view (t or /terminal on a structured task): ctrl-r removes the selected queued message \xB7 ctrl-x interrupts \xB7 ctrl-y allows a tool request \xB7 ctrl-t allows it for the task \xB7 ctrl-g denies it, with the composer text as the note \xB7 alt\u2190/\u2192 changes attempt \xB7 esc returns")
+    "",
+    style.bold("In a task view (t or /terminal on a structured task)"),
+    style.grey("  ctrl-s sends now: interrupts the running step, then delivers the composer text \u2014 or, with it empty, the selected queued message"),
+    style.grey("  ctrl-n/ctrl-p select a queued message \xB7 ctrl-r removes it \xB7 ctrl-x interrupts"),
+    style.grey("  ctrl-y allows a tool request (its keys sit under it) \xB7 ctrl-t allows it for the task \xB7 ctrl-g denies it, with the composer text as the note"),
+    style.grey("  at a checkpoint, ctrl-y approves and ctrl-g rejects, with the composer text as the reason \xB7 /checkpoint <id> approve|reject [reason] from anywhere"),
+    style.grey("  alt\u2190/\u2192 changes attempt \xB7 esc returns")
   );
   const lines = body.map((line) => truncate(line, Math.max(1, cols - 2)));
   const room = Math.max(1, rows - 2);
@@ -4895,7 +5008,7 @@ function helpScrollMax(state) {
 }
 
 // src/tui/render.ts
-var import_core24 = require("@ordewell/core");
+var import_core25 = require("@ordewell/core");
 function render(state) {
   const { rows, cols } = state;
   const rowsForBody = bodyRows(state);
@@ -4990,7 +5103,7 @@ function renderSkills(state, cols) {
   const badges = SKILL_IDS.map(
     (id) => state.skills[id] ? style.green(`\u25CF ${id}`) : style.grey(`\u25CB ${id}`)
   );
-  const auto = state.autonomous ? style.yellow("\u25CF Full auto") : style.green("\u25CF Auto");
+  const auto = state.autonomous ? style.yellow("\u25CF Full") : style.green("\u25CF Guarded");
   const terminal = state.runnerTransport === "terminal" ? [style.yellow("\u25CF terminal")] : [];
   return truncate([...badges, auto, ...terminal].join(" "), cols);
 }
@@ -5160,8 +5273,8 @@ function renderHandoff(state, overlay, rows, cols) {
     return frame(`Diff \u2014 ${handoffBranch(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(` \u2014 repaired (${(0, import_core24.capConflictFiles)(task.repairedFiles)})`) : "";
-    return `  ${style.green("\u2713")} #${task.order} ${task.title}${repaired}`;
+    const repaired = task.repairedFiles?.length ? style.yellow(` \u2014 repaired (${(0, import_core25.capConflictFiles)(task.repairedFiles)})`) : "";
+    return `  ${style.green("\u2713")} ${(0, import_core25.titledTaskRef)(task)}${repaired}`;
   });
   const actions = handoffActions(handoff).map((action, index) => {
     const active = index === overlay.index;
@@ -5250,7 +5363,10 @@ function frame(title, body, rows, cols) {
 }
 
 // src/tui/reducer.ts
-var import_core30 = require("@ordewell/core");
+var import_core33 = require("@ordewell/core");
+
+// src/tui/reducers/overlays.ts
+var import_core31 = require("@ordewell/core");
 
 // src/tui/reducers/shared.ts
 function step(state, effects = []) {
@@ -5299,10 +5415,10 @@ function handleApprovalKey(state, overlay, key) {
 }
 
 // src/tui/reducers/commands.ts
-var import_core28 = require("@ordewell/core");
+var import_core30 = require("@ordewell/core");
 
 // src/tui/reducers/pickers.ts
-var import_core25 = require("@ordewell/core");
+var import_core26 = require("@ordewell/core");
 var import_plan_utils2 = require("@ordewell/core/plan-utils");
 var DEFAULT_EFFORT = "__runner_default__";
 function picker(title, items, action, extra = {}) {
@@ -5321,11 +5437,11 @@ function modelDetail(m) {
 function providerErrorHint(state) {
   const failed = Object.keys(state.providerErrors ?? {});
   if (failed.length === 0) return void 0;
-  const names = failed.map((p) => import_core25.ALL_PROVIDERS[p]?.label ?? p);
+  const names = failed.map((p) => import_core26.ALL_PROVIDERS[p]?.label ?? p);
   return `\u26A0 Unavailable (key or fetch failed): ${names.join(", ")} \u2014 showing working providers only.`;
 }
 function plannerModelItems(state) {
-  const runner = (0, import_core25.runnerForProvider)(state.plannerProvider);
+  const runner = (0, import_core26.runnerForProvider)(state.plannerProvider);
   if (!runner) return state.orchestratorModels.map((m) => ({ id: m.id, label: m.label, detail: modelDetail(m) }));
   const items = state.models.filter((m) => m.runners?.includes(runner)).map((m) => ({
     id: m.id,
@@ -5339,7 +5455,7 @@ function plannerModelItems(state) {
   return items.length > 0 ? items : [{ id: "", label: `No ${runner} models discovered yet`, detail: "run /refresh", disabled: true }];
 }
 function plannerEffortItems(state) {
-  const runner = (0, import_core25.runnerForProvider)(state.plannerProvider);
+  const runner = (0, import_core26.runnerForProvider)(state.plannerProvider);
   if (!runner) {
     return [{ id: "", label: "Thinking effort applies to a coding-agent planner", detail: "switch with /planner", disabled: true }];
   }
@@ -5403,7 +5519,7 @@ function pickerItemsFor(state, action) {
   if (action.kind === "set-task-deps") {
     return (0, import_plan_utils2.dependencyCandidates)(state.tasks, action.taskId).map((candidate) => ({
       id: candidate.id,
-      label: `#${candidate.order} ${candidate.title}`,
+      label: (0, import_core26.titledTaskRef)(candidate),
       detail: candidate.status === "completed" ? "already completed" : void 0
     }));
   }
@@ -5448,26 +5564,29 @@ function pickerItemsFor(state, action) {
 }
 function plannerItems(state) {
   const installed = new Set(state.runners.map((r) => r.id));
-  const agents = import_core25.CLI_PROVIDERS.map((id) => {
-    const runner = (0, import_core25.runnerForProvider)(id);
+  const agents = import_core26.CLI_PROVIDERS.map((id) => {
+    const runner = (0, import_core26.runnerForProvider)(id);
     const ready = installed.has(runner);
     return {
       id,
-      label: import_core25.ALL_PROVIDERS[id].label,
+      label: import_core26.ALL_PROVIDERS[id].label,
       detail: ready ? "coding agent \xB7 no API key needed" : "CLI not installed or not on PATH",
       selected: state.plannerProvider === id,
       disabled: !ready
     };
   });
-  const vendors = import_core25.PROVIDER_PRIORITY.filter((id) => state.configuredProviders.includes(id)).map((id) => ({
+  const vendors = import_core26.PROVIDER_PRIORITY.filter((id) => state.configuredProviders.includes(id)).map((id) => ({
     id,
-    label: import_core25.ALL_PROVIDERS[id].label,
-    detail: import_core25.ALL_PROVIDERS[id].apiKeyEnvVar,
+    label: import_core26.ALL_PROVIDERS[id].label,
+    detail: import_core26.ALL_PROVIDERS[id].apiKeyEnvVar,
     selected: state.plannerProvider === id
   }));
   return vendors.length > 0 ? [...agents, ...vendors] : [...agents, { id: "", label: "No API providers configured", detail: "add a key with /key", disabled: true }];
 }
 
+// src/tui/reducers/planPane.ts
+var import_core28 = require("@ordewell/core");
+
 // src/tui/reducers/pointer.ts
 var WHEEL_NOTCH = 3;
 function pageNotch(viewport) {
@@ -5544,13 +5663,13 @@ function handleMouseSelect(state, key) {
 }
 
 // src/tui/reducers/taskView.ts
-var import_core26 = require("@ordewell/core");
+var import_core27 = require("@ordewell/core");
 function openTaskView(state, sessionId, taskId) {
   const task = findTask(state.tasks, taskId);
   if (!task) return step(say(state, "system", `No task ${taskId} in this plan.`));
   const taskView = {
     taskId,
-    view: import_core26.EMPTY_TASK_LOG,
+    view: import_core27.EMPTY_TASK_LOG,
     attempts: [],
     attempt: 0,
     pending: [],
@@ -5583,13 +5702,13 @@ function applyLive(tv, attempt, events) {
     }
     next = {
       ...next,
-      view: import_core26.EMPTY_TASK_LOG,
+      view: import_core27.EMPTY_TASK_LOG,
       attempt,
       attempts: next.attempts.includes(attempt) ? next.attempts : [...next.attempts, attempt]
     };
   }
   if (attempt < next.attempt) return next;
-  return clampQueueIndex({ ...next, view: events.reduce(import_core26.reduceTaskLog, next.view) });
+  return clampQueueIndex({ ...next, view: events.reduce(import_core27.reduceTaskLog, next.view) });
 }
 function taskLogAbandoned(state) {
   const tv = state.taskView;
@@ -5609,15 +5728,22 @@ function taskLogArrived(state, action) {
 function announceApprovals(state, action) {
   if (state.taskView?.taskId === action.taskId) return state;
   const task = findTask(state.tasks, action.taskId);
-  const spoken = action.events.reduce((s, event) => event.type === "approval_requested" ? say(s, "system", `\xB7 Task ${task?.order ?? "?"} waits for approval: ${(0, import_core26.runnerToolSubject)(event.tool, event.args)} \u2014 t on it to answer`) : s, state);
+  const spoken = action.events.reduce((s, event) => event.type === "approval_requested" ? say(s, "system", `\xB7 Task ${task?.order ?? "?"} waits for approval: ${(0, import_core27.runnerToolSubject)(event.tool, event.args)} \u2014 t on it, then ctrl-y to allow or ctrl-g to deny`) : 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 ${task.order}` : action.title;
+  const where = task?.transport?.kind === "structured" ? "t on it to answer" : `/checkpoint ${task?.order ?? "<id>"} approve|reject to answer`;
+  const spoken = say(state, "system", `\xB7 ${label} asks: ${(0, import_core27.truncateCheckpointSummary)(action.summary)} \u2014 ${where}`);
+  return { ...spoken, scroll: state.scroll };
+}
 function taskLogLoaded(state, action) {
   const tv = state.taskView;
   if (!tv || tv.taskId !== action.taskId) return state;
   const loaded = action.attempt >= 1 ? {
     ...tv,
-    view: (0, import_core26.replayTaskLog)(action.events),
+    view: (0, import_core27.replayTaskLog)(action.events),
     attempts: action.attempts ?? tv.attempts,
     attempt: action.attempt
   } : { ...tv, attempts: action.attempts ?? tv.attempts };
@@ -5639,6 +5765,29 @@ function answerApproval(state, tv, sessionId, 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) {
+    if (continuesTask(findTask(state.tasks, tv.taskId))) return step(say(state, "system", "The task has finished, so there is no turn to interrupt \u2014 enter continues it."));
+    return step({ ...state, editor: commit(state.editor) }, [{ type: "forceSendTaskMessage", sessionId, taskId: tv.taskId, text }]);
+  }
+  const queued = tv.view.queued[tv.queuedIndex];
+  if (!queued) return step(say(state, "system", "Nothing to send now: type a message, or pick a queued one with ctrl-n/ctrl-p."));
+  if (queued.handedOver) return step(say(state, "system", "The runner already has that message; it reads it after its current step."));
+  return step(state, [{ type: "forceSendQueuedTaskMessage", sessionId, taskId: tv.taskId, messageId: queued.id }]);
+}
 function handleTaskViewKey(state, key) {
   const tv = state.taskView;
   if (!tv || !state.sessionId) return null;
@@ -5658,14 +5807,16 @@ function handleTaskViewKey(state, key) {
   if (key.name === "ctrl-r") {
     const queued = tv.view.queued[tv.queuedIndex];
     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") {
     return step(state, [{ type: "interruptTask", sessionId: state.sessionId, taskId: tv.taskId }]);
   }
-  if (key.name === "ctrl-y") return answerApproval(state, tv, state.sessionId, "allow");
+  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 answerApproval(state, tv, state.sessionId, "deny");
+  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;
@@ -5686,7 +5837,7 @@ function openTaskRunnerPicker(state, task) {
       ...state,
       overlay: {
         kind: "picker",
-        picker: picker(`Runner \xB7 #${task.order} ${task.title}`, pickerItemsFor(state, action), action, {
+        picker: picker(`Runner \xB7 ${(0, import_plan_utils3.titledTaskRef)(task)}`, pickerItemsFor(state, action), action, {
           hint: "Changing the runner re-picks this task model, effort and mode for it."
         })
       }
@@ -5694,14 +5845,12 @@ function openTaskRunnerPicker(state, task) {
   );
 }
 function confirmRemoveTask(state, task) {
-  const dependents = (0, import_plan_utils3.dependentsOf)(state.tasks, task.id);
-  const named = dependents.map((t) => `#${t.order} ${t.title}`).join(", ");
   return step({
     ...state,
     overlay: {
       kind: "confirm",
-      title: `Remove #${task.order} ${task.title}?`,
-      message: dependents.length > 0 ? `${dependents.length === 1 ? "1 task depends" : `${dependents.length} tasks depend`} on it and will lose that dependency: ${named}.` : "This cannot be undone.",
+      title: `Remove ${(0, import_plan_utils3.titledTaskRef)(task)}?`,
+      message: (0, import_plan_utils3.dependentsNotice)((0, import_plan_utils3.dependentsOf)(state.tasks, task.id)) ?? "This cannot be undone.",
       action: { kind: "remove-task", taskId: task.id }
     }
   });
@@ -5710,26 +5859,22 @@ function toggleTaskOps(state, task, subtask, to = !task.ops) {
   if (!state.sessionId) return fail3(state, "No active plan.");
   if (task.type !== "ai") return fail3(state, "Only an AI task can be an ops task \u2014 a manual task already runs outside any worktree.");
   if (subtask) return fail3(state, "A subtask runs with its parent; make the parent an ops task instead.");
-  if (!!task.ops === to) return fail3(state, `#${task.order} is already ${to ? "an ops" : "a change"} task.`);
+  if (!!task.ops === to) return fail3(state, `${(0, import_plan_utils3.taskRef)(task)} is already ${to ? "an ops" : "a change"} task.`);
   return step(state, [{
     type: "updateTask",
     sessionId: state.sessionId,
     taskId: task.id,
     changes: { ops: to },
-    message: to ? `Task #${task.order} is an ops task: it runs in your checkout once the work it depends on is merged.` : `Task #${task.order} is a change task: it runs in its own worktree.`
+    message: to ? `Task ${(0, import_plan_utils3.taskRef)(task)} is an ops task: it runs in your checkout once the work it depends on is merged.` : `Task ${(0, import_plan_utils3.taskRef)(task)} is a change task: it runs in its own worktree.`
   }]);
 }
 function confirmForceStartPastGate(state, task) {
-  const named = (task.mergeGate ?? []).map((id) => {
-    const dep = findTask(state.tasks, id);
-    return dep ? `#${dep.order} ${dep.title}` : id;
-  });
   return step({
     ...state,
     overlay: {
       kind: "confirm",
-      title: `Force start #${task.order} ${task.title}?`,
-      message: `It waits for Merge all: the work of ${named.join(", ")} is not merged into your branch yet, so it would act without it. Starting it now is kept on the task.`,
+      title: `Force start ${(0, import_plan_utils3.titledTaskRef)(task)}?`,
+      message: (0, import_plan_utils3.pastGateConfirmation)((0, import_plan_utils3.titledRefs)(task.mergeGate ?? [], state.tasks), "It"),
       action: { kind: "force-start-gated", taskId: task.id }
     }
   });
@@ -5737,12 +5882,12 @@ function confirmForceStartPastGate(state, task) {
 function openTaskDepsPicker(state, task) {
   const action = { kind: "set-task-deps", taskId: task.id };
   const items = pickerItemsFor(state, action);
-  if (items.length === 0) return fail3(state, `Nothing runs before #${task.order}, so it has no possible dependencies.`);
+  if (items.length === 0) return fail3(state, `Nothing runs before ${(0, import_plan_utils3.taskRef)(task)}, so it has no possible dependencies.`);
   return step({
     ...state,
     overlay: {
       kind: "picker",
-      picker: picker(`Depends on \xB7 #${task.order} ${task.title}`, items, action, {
+      picker: picker(`Depends on \xB7 ${(0, import_plan_utils3.titledTaskRef)(task)}`, items, action, {
         hint: "Only tasks earlier in the plan can be dependencies.",
         multi: true,
         chosen: task.dependencies.filter((id) => items.some((i) => i.id === id))
@@ -5762,7 +5907,7 @@ function openTaskModePicker(state, task) {
       ...state,
       overlay: {
         kind: "picker",
-        picker: picker(`Mode \xB7 #${task.order}`, pickerItemsFor(state, action), action, {
+        picker: picker(`Mode \xB7 ${(0, import_plan_utils3.taskRef)(task)}`, pickerItemsFor(state, action), action, {
           hint: `Modes declared by ${task.assignedRunner}.`
         })
       }
@@ -5777,7 +5922,7 @@ function openTaskModelPicker(state, task) {
       ...state,
       overlay: {
         kind: "picker",
-        picker: picker(`Model \xB7 #${task.order} ${task.title}`, pickerItemsFor(state, action), action, {
+        picker: picker(`Model \xB7 ${(0, import_plan_utils3.titledTaskRef)(task)}`, pickerItemsFor(state, action), action, {
           hint: task.assignedRunner ? `Showing models discovered for ${task.assignedRunner}.` : "Choose the model this task will run with."
         })
       }
@@ -5794,7 +5939,7 @@ function openTaskEffortPicker(state, task) {
       ...state,
       overlay: {
         kind: "picker",
-        picker: picker(`Thinking effort \xB7 #${task.order}`, pickerItemsFor(state, action), action, {
+        picker: picker(`Thinking effort \xB7 ${(0, import_plan_utils3.taskRef)(task)}`, pickerItemsFor(state, action), action, {
           hint: `${task.assignedModel.modelLabel} \xB7 choose runner default or a supported effort`
         })
       }
@@ -5811,7 +5956,7 @@ function assignTaskModel(state, sessionId, task, model) {
     // JSON drops `undefined`; null is intentional here so changing models can
     // also clear a stale legacy top-level effort on the persisted task.
     changes: { assignedModel, thinkingEffort: assignedModel.thinkingEffort ?? null },
-    message: `Task #${task.order} model set to ${model.label}.`
+    message: `Task ${(0, import_plan_utils3.taskRef)(task)} model set to ${model.label}.`
   }]);
 }
 function assignTaskRunner(state, sessionId, task, runner, runnerLabel) {
@@ -5820,7 +5965,7 @@ function assignTaskRunner(state, sessionId, task, runner, runnerLabel) {
     sessionId,
     taskId: task.id,
     changes: { assignedRunner: runner },
-    message: `Task #${task.order} runner set to ${runnerLabel}.`
+    message: `Task ${(0, import_plan_utils3.taskRef)(task)} runner set to ${runnerLabel}.`
   }]);
 }
 function assignTaskMode(state, sessionId, task, mode, modeLabel) {
@@ -5829,7 +5974,7 @@ function assignTaskMode(state, sessionId, task, mode, modeLabel) {
     sessionId,
     taskId: task.id,
     changes: { taskMode: mode },
-    message: `Task #${task.order} mode set to ${modeLabel}.`
+    message: `Task ${(0, import_plan_utils3.taskRef)(task)} mode set to ${modeLabel}.`
   }]);
 }
 function assignTaskEffort(state, sessionId, task, thinkingEffort) {
@@ -5839,7 +5984,7 @@ function assignTaskEffort(state, sessionId, task, thinkingEffort) {
     sessionId,
     taskId: task.id,
     changes: { assignedModel, thinkingEffort: thinkingEffort ?? null },
-    message: `Task #${task.order} thinking effort set to ${thinkingEffort ?? "runner default"}.`
+    message: `Task ${(0, import_plan_utils3.taskRef)(task)} thinking effort set to ${thinkingEffort ?? "runner default"}.`
   }]);
 }
 function taskModelCommand(state, args) {
@@ -5941,9 +6086,6 @@ function taskActionEffect(state, sessionId, taskId, action) {
   const watch = SPAWNS_RUNNER.includes(action) && state.status !== "executing";
   return watch ? { type: "taskAction", sessionId, taskId, action, watch: true } : { type: "taskAction", sessionId, taskId, action };
 }
-function markAction(task) {
-  return task.status === "completed" ? "uncomplete" : "complete";
-}
 function handlePlanKey(state, key) {
   const editingTask = state.expandedTaskId ? findTask(state.tasks, state.expandedTaskId) : void 0;
   if (editingTask && state.taskEditor) return handleTaskEditKey(state, editingTask, state.taskEditor, key);
@@ -5978,7 +6120,7 @@ function handlePlanKey(state, key) {
   if (!state.sessionId || key.name !== "char") return step(state);
   if (key.char === "E") return step(state, [{ type: "execute", sessionId: state.sessionId }]);
   if (key.char === "S") return step(state, [{ type: "stopExecution", sessionId: state.sessionId }]);
-  const action = key.char === "m" ? markAction(task) : PLAN_SHORTCUTS[key.char ?? ""];
+  const action = key.char === "m" ? (0, import_core28.markAction)(task) : PLAN_SHORTCUTS[key.char ?? ""];
   if (action === "force-start" && task.mergeGate?.length) return confirmForceStartPastGate(state, task);
   if (action) {
     return step(state, [taskActionEffect(state, state.sessionId, task.id, action)]);
@@ -6013,14 +6155,14 @@ function commitTaskEdit(state, task, editor) {
     sessionId: state.sessionId,
     taskId: task.id,
     changes: { prompt },
-    message: `Task #${task.order} prompt updated.`
+    message: `Task ${(0, import_core28.taskRef)(task)} prompt updated.`
   }]);
 }
 
 // src/tui/reducers/turnQueue.ts
-var import_core27 = require("@ordewell/core");
+var import_core29 = require("@ordewell/core");
 function drainQueue(state, settled) {
-  const next = (0, import_core27.drainNext)(state.queuedPrompts);
+  const next = (0, import_core29.drainNext)(state.queuedPrompts);
   const ended = disarmStop({ ...settled, stopRequested: false });
   if (!next) return step(ended);
   const spoken = say(ended, "user", next.text);
@@ -6039,14 +6181,14 @@ function stopPlanning(state, sessionId) {
   return step(queueToEditor(cutTurn({ ...dismissed, stopArmed: false, stopRequested: true })), [{ type: "cancelPlanning", sessionId }]);
 }
 function queueToEditor(state) {
-  const all = (0, import_core27.unsendAll)(state.queuedPrompts);
+  const all = (0, import_core29.unsendAll)(state.queuedPrompts);
   if (!all) return state;
   return { ...state, queuedPrompts: all.rest, editor: { ...state.editor, text: all.text, cursor: all.text.length } };
 }
 function unsendLatest(state) {
-  const latest = (0, import_core27.unsendLatest)(state.queuedPrompts);
+  const latest = (0, import_core29.unsendLatest)(state.queuedPrompts);
   if (!latest) return step(state);
-  const text = (0, import_core27.aheadOfDraft)(latest.text, state.editor.text);
+  const text = (0, import_core29.aheadOfDraft)(latest.text, state.editor.text);
   return step({
     ...state,
     queuedPrompts: latest.rest,
@@ -6063,7 +6205,7 @@ function plannerEscape(state) {
 }
 
 // src/tui/reducers/commands.ts
-var KNOWN_PROVIDERS2 = Object.keys(import_core28.ALL_PROVIDERS);
+var KNOWN_PROVIDERS2 = Object.keys(import_core30.ALL_PROVIDERS);
 function runCommand(state, { name, args }) {
   if (!findCommand(name)) {
     return fail3(state, `Unknown command: /${name} \u2014 type /help to see what's available.`);
@@ -6150,6 +6292,14 @@ function runCommand(state, { name, args }) {
         if (!text) return fail3(state, "Usage: /continue <id> <message>");
         return continueTaskStep(state, sessionId, taskId, text);
       });
+    case "checkpoint":
+      return taskCommand(state, args[0], (sessionId, taskId) => {
+        const answer = args[1]?.toLowerCase();
+        const reason = args.slice(2).join(" ").trim();
+        if (answer !== "approve" && answer !== "reject") return fail3(state, "Usage: /checkpoint <id> approve|reject [reason]");
+        if (answer === "approve" && reason) return fail3(state, "Approving takes no note \u2014 reject with a reason to tell the task something.");
+        return answerCheckpoint(state, sessionId, taskId, answer, reason);
+      });
     case "task-runner":
       return taskRunnerCommand(state, args);
     case "task-model":
@@ -6221,8 +6371,8 @@ function newSession(state) {
     taskView: null,
     tasks: [],
     planApproved: false,
-    conversation: import_core28.EMPTY_CONVERSATION,
-    turnGate: import_core28.NO_TURN,
+    conversation: import_core30.EMPTY_CONVERSATION,
+    turnGate: import_core30.NO_TURN,
     selectedTask: 0,
     expandedTaskId: null,
     taskEditor: null,
@@ -6233,14 +6383,14 @@ 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_core28.EMPTY_HOLD,
+    queuedPrompts: import_core30.EMPTY_HOLD,
     stopArmed: false,
     overlay: state.overlay?.kind === "approval" ? null : state.overlay
   }, closeEffects);
 }
 function setModel(state, args) {
   if (args[0] === "set" && args[1]) {
-    const runner = (0, import_core28.runnerForProvider)(state.plannerProvider);
+    const runner = (0, import_core30.runnerForProvider)(state.plannerProvider);
     const known = runner ? modelsForRunner(state.models, runner) : [];
     if (runner && known.length > 0 && !known.some((m) => m.id === args[1])) {
       return fail3(state, `${args[1]} was not discovered for ${runner}.`);
@@ -6313,16 +6463,16 @@ function setKey(state, args) {
     }
     return step(state, [{ type: "setApiKey", provider, key: args.slice(2).join(" ") }]);
   }
-  const items = import_core28.PROVIDER_PRIORITY.map((id) => ({
+  const items = import_core30.PROVIDER_PRIORITY.map((id) => ({
     id,
-    label: import_core28.ALL_PROVIDERS[id].label,
-    detail: import_core28.ALL_PROVIDERS[id].apiKeyEnvVar,
+    label: import_core30.ALL_PROVIDERS[id].label,
+    detail: import_core30.ALL_PROVIDERS[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 = import_core28.ALL_PROVIDERS[provider];
+  const meta = import_core30.ALL_PROVIDERS[provider];
   return {
     kind: "prompt",
     title: `${meta.label} API key`,
@@ -6399,19 +6549,19 @@ function runners(state, args) {
 }
 function setMaxParallel(state, arg) {
   if (!arg) return step(say(state, "system", `Up to ${state.maxParallel} AI task${state.maxParallel === 1 ? "" : "s"} run at once \u2014 /parallel <n> changes it.`));
-  const limit = (0, import_core28.parseMaxParallel)(arg);
+  const limit = (0, import_core30.parseMaxParallel)(arg);
   if (limit === null) return fail3(state, "Usage: /parallel [<number of tasks, 1 or more>]");
   return step({ ...state, maxParallel: limit }, [{ type: "setMaxParallel", limit }]);
 }
 function setAutonomous(state, arg) {
-  if (arg === void 0) return step(say(state, "system", `Autonomy level: ${(0, import_core28.autonomyLevelLabel)(state.autonomous)} \u2014 /auto full or /auto auto changes it for new plans.`));
-  const enabled = (0, import_core28.parseAutonomyLevel)(arg);
-  if (enabled === null) return fail3(state, "Usage: /auto [full|auto]");
+  if (arg === void 0) return step(say(state, "system", `Autonomy level: ${(0, import_core30.autonomyLevelLabel)(state.autonomous)} \u2014 /auto full or /auto guarded changes it for new plans.`));
+  const enabled = (0, import_core30.parseAutonomyLevel)(arg);
+  if (enabled === null) return fail3(state, "Usage: /auto [full|guarded]");
   return step({ ...state, autonomous: enabled }, [{ type: "setAutonomous", enabled }]);
 }
 function setTransport(state, arg) {
   const value = arg?.toLowerCase() ?? (state.runnerTransport === "structured" ? "terminal" : "structured");
-  if (!(0, import_core28.isRunnerTransport)(value)) return fail3(state, "Usage: /transport [terminal|structured]");
+  if (!(0, import_core30.isRunnerTransport)(value)) return fail3(state, "Usage: /transport [terminal|structured]");
   return step(state, [{ type: "setTransport", transport: value }]);
 }
 function setMouseCapture(state, arg) {
@@ -6588,7 +6738,7 @@ function choose(state, picker2, item) {
       sessionId: state.sessionId,
       taskId: task.id,
       changes: { dependencies: picker2.chosen },
-      message: picker2.chosen.length > 0 ? `Task #${task.order} now depends on ${picker2.chosen.length} task${picker2.chosen.length === 1 ? "" : "s"}.` : `Task #${task.order} no longer depends on anything.`
+      message: picker2.chosen.length > 0 ? `Task ${(0, import_core31.taskRef)(task)} now depends on ${picker2.chosen.length} task${picker2.chosen.length === 1 ? "" : "s"}.` : `Task ${(0, import_core31.taskRef)(task)} no longer depends on anything.`
     }]);
   }
   if (!item) return step(state);
@@ -6665,7 +6815,7 @@ function choose(state, picker2, item) {
 }
 
 // src/tui/reducers/incoming.ts
-var import_core29 = require("@ordewell/core");
+var import_core32 = 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 : {};
@@ -6696,7 +6846,7 @@ function toTaskView2(t, index) {
     prompt: typeof t.prompt === "string" ? sanitize(t.prompt) : void 0,
     type: t.type === "user" ? "user" : "ai",
     status: planLabel(t.status, "pending"),
-    awaitingReason: t.status === "awaiting_user" && (0, import_core29.isAwaitingReason)(t.awaitingReason) ? t.awaitingReason : void 0,
+    awaitingReason: t.status === "awaiting_user" && (0, import_core32.isAwaitingReason)(t.awaitingReason) ? t.awaitingReason : void 0,
     dependencies: Array.isArray(t.dependencies) ? t.dependencies.map((id) => planLabel(id)) : [],
     assignedRunner: typeof t.assignedRunner === "string" ? planLabel(t.assignedRunner) : void 0,
     taskMode: typeof t.taskMode === "string" ? planLabel(t.taskMode) : void 0,
@@ -6729,12 +6879,12 @@ function applySettings(state, settings) {
     plannerProvider: typeof settings.aiProvider === "string" ? settings.aiProvider : state.plannerProvider,
     plannerEffort: typeof settings.plannerThinkingEffort === "string" ? settings.plannerThinkingEffort : state.plannerEffort,
     maxParallel: typeof settings.maxParallel === "number" ? settings.maxParallel : state.maxParallel,
-    runnerTransport: (0, import_core29.isRunnerTransport)(settings.runnerTransport) ? settings.runnerTransport : state.runnerTransport,
+    runnerTransport: (0, import_core32.isRunnerTransport)(settings.runnerTransport) ? settings.runnerTransport : state.runnerTransport,
     allowlist: settings.modelAllowlist && typeof settings.modelAllowlist === "object" ? settings.modelAllowlist : state.allowlist
   };
 }
 function runLabel(tasks, gate = null) {
-  const running = tasks.filter(isTaskRunning);
+  const running = tasks.filter(import_core23.isTaskRunning);
   if (running.length > 0) {
     const [first] = running;
     const name = first.assignedRunner ? `${first.title} \xB7 ${first.assignedRunner}` : first.title;
@@ -6800,13 +6950,13 @@ function reduceAction(state, action) {
         goal: "",
         taskView: null,
         pendingApprovals: [],
-        queuedPrompts: import_core30.EMPTY_HOLD,
+        queuedPrompts: import_core33.EMPTY_HOLD,
         stopArmed: false,
         overlay: state.overlay?.kind === "approval" ? null : state.overlay
       });
     case "chatRestored":
       if (stale(state, action.sessionId)) return step(state);
-      return step({ ...state, conversation: (0, import_core30.fromTranscript)(action.history, action.researchLog, action.plannerUsage), scroll: 0 });
+      return step({ ...state, conversation: (0, import_core33.fromTranscript)(action.history, action.researchLog, action.plannerUsage), scroll: 0 });
     case "planUpdated": {
       if (stale(state, action.sessionId)) return step(state);
       const isolation = isolationOfPlan(action.plan);
@@ -6853,14 +7003,17 @@ function reduceAction(state, action) {
     case "taskStarted": {
       if (stale(state, action.sessionId)) return step(state);
       const existing = findTask(state.tasks, action.taskId);
-      if (existing && isTaskRunning(existing)) return step(state);
-      const tasks = state.tasks.map((t) => t.id === action.taskId && !isTaskRunning(t) ? { ...t, status: "in_progress" } : t);
-      const spoken = say(state, "system", (0, import_core30.taskStartedNotice)(action.title, action.runner));
+      if (existing && (0, import_core23.isTaskRunning)(existing)) return step(state);
+      const tasks = state.tasks.map((t) => t.id === action.taskId && !(0, import_core23.isTaskRunning)(t) ? { ...t, status: "in_progress" } : t);
+      const spoken = say(state, "system", (0, import_core33.taskStartedNotice)(action.title, action.runner));
       return step({ ...spoken, tasks, status: "executing", busyLabel: runLabel(tasks) });
     }
+    case "taskCheckpoint":
+      if (stale(state, action.sessionId)) return step(state);
+      return step(announceCheckpoint(state, action));
     case "taskStatus": {
       if (stale(state, action.sessionId) || !state.tasks.some((t) => t.id === action.taskId)) return step(state);
-      const tasks = state.tasks.map((t) => t.id === action.taskId ? { ...t, status: action.status, awaitingReason: void 0 } : t);
+      const tasks = state.tasks.map((t) => t.id === action.taskId ? { ...t, status: action.status, awaitingReason: void 0, checkpoint: void 0 } : t);
       const status = runStatus(state, tasks);
       return step({ ...state, status, tasks, busyLabel: status === "executing" ? runLabel(tasks, state.gate) : state.busyLabel });
     }
@@ -6875,13 +7028,14 @@ function reduceAction(state, action) {
         const isolation = update.isolation ?? t.isolation;
         const transport = update.transport;
         const awaitingReason = update.awaitingReason;
+        const checkpoint = update.checkpoint;
         const continuable = update.continuable === true;
         const awaitingApproval = update.awaitingApproval;
         const mergeGate = update.mergeGate;
         const forcedPastGate = update.forcedPastGate;
-        if (update.status !== t.status || idleSince !== (t.idleSince ?? null) || !sameIsolation(isolation, t.isolation) || !sameTransport(transport, t.transport) || awaitingReason !== t.awaitingReason || continuable !== (t.continuable ?? false) || awaitingApproval !== t.awaitingApproval || !sameList(mergeGate, t.mergeGate) || !sameList(forcedPastGate, t.forcedPastGate)) {
+        if (update.status !== t.status || idleSince !== (t.idleSince ?? null) || !sameIsolation(isolation, t.isolation) || !sameTransport(transport, t.transport) || awaitingReason !== t.awaitingReason || checkpoint !== t.checkpoint || continuable !== (t.continuable ?? false) || awaitingApproval !== t.awaitingApproval || !sameList(mergeGate, t.mergeGate) || !sameList(forcedPastGate, t.forcedPastGate)) {
           changed = true;
-          return { ...t, status: update.status, idleSince, isolation, transport, awaitingReason, continuable, awaitingApproval, mergeGate, forcedPastGate };
+          return { ...t, status: update.status, idleSince, isolation, transport, awaitingReason, checkpoint, continuable, awaitingApproval, mergeGate, forcedPastGate };
         }
         return t;
       });
@@ -6964,7 +7118,7 @@ function reduceAction(state, action) {
         busyLabel: "",
         planApproved: false,
         pendingApprovals: [],
-        queuedPrompts: import_core30.EMPTY_HOLD,
+        queuedPrompts: import_core33.EMPTY_HOLD,
         stopArmed: false,
         overlay: state.overlay?.kind === "approval" ? null : state.overlay
       });
@@ -7031,7 +7185,7 @@ function sameGate(a, b) {
   return a.paused === b.paused && JSON.stringify(a.handoff) === JSON.stringify(b.handoff);
 }
 function runStatus(state, tasks) {
-  if (tasks.some(isTaskRunning)) return "executing";
+  if (tasks.some(import_core23.isTaskRunning)) return "executing";
   if (tasks.some((t) => t.status === "awaiting_user") || state.gate?.paused) return "executing";
   return plannerInFlight(state) ? state.status : "idle";
 }
@@ -7100,7 +7254,7 @@ function submit(state) {
     return step(cleared, [{ type: "sendTaskMessage", sessionId: state.sessionId, taskId, text }]);
   }
   if (plannerInFlight(state)) {
-    return step({ ...cleared, queuedPrompts: (0, import_core30.holdPrompt)(state.queuedPrompts, text) });
+    return step({ ...cleared, queuedPrompts: (0, import_core33.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 };
@@ -7160,10 +7314,10 @@ function createApp(deps) {
 
 // src/tui/effects.ts
 var import_child_process4 = require("child_process");
-var import_core32 = require("@ordewell/core");
+var import_core35 = require("@ordewell/core");
 
 // src/tui/inbound.ts
-var import_core31 = require("@ordewell/core");
+var import_core34 = require("@ordewell/core");
 var CONVERSATION_TYPES = /* @__PURE__ */ new Set([
   "planner_message",
   "planner_turn_started",
@@ -7378,7 +7532,8 @@ function dispatchLifecycle(dispatch, event, sessionId) {
           idleSince: task.idleSince ?? null,
           isolation: task.isolation,
           transport: task.transport,
-          awaitingReason: (0, import_core31.isAwaitingReason)(task.awaitingReason) ? task.awaitingReason : void 0,
+          awaitingReason: (0, import_core34.isAwaitingReason)(task.awaitingReason) ? task.awaitingReason : void 0,
+          ...typeof task.checkpoint === "string" && task.checkpoint ? { checkpoint: sanitize(task.checkpoint) } : {},
           ...task.continuable ? { continuable: true } : {},
           awaitingApproval: typeof task.awaitingApproval === "number" && task.awaitingApproval > 0 ? task.awaitingApproval : void 0,
           ...task.mergeGate?.length ? { mergeGate: task.mergeGate.map(String) } : {},
@@ -7392,10 +7547,10 @@ function dispatchLifecycle(dispatch, event, sessionId) {
     case "task_started":
       dispatch({ type: "taskStarted", taskId: String(event.taskId), title: String(event.title ?? event.taskId), runner: event.runner, sessionId });
       return;
-    // The extension shows these in its checkpoint panel; here they are
-    // transcript lines, which is the TUI's equivalent surface.
+    // The extension shows these in its checkpoint panel; here they are a
+    // transcript line, and the task view carries the card that answers them.
     case "checkpoint":
-      dispatch({ type: "notice", message: `\xB7 Checkpoint \u2014 ${event.taskTitle}: ${(0, import_core31.truncateCheckpointSummary)(event.summary)}` });
+      dispatch({ type: "taskCheckpoint", taskId: String(event.taskId), title: String(event.taskTitle), summary: event.summary, sessionId });
       return;
     case "review_needed":
       dispatch({ type: "notice", message: "Plan needs your sign-off \u2014 /approve to continue." });
@@ -7553,20 +7708,18 @@ async function perform(effect, deps) {
       return;
     case "taskAction": {
       const { sessionId, taskId, action } = effect;
-      const request = action === "complete" || action === "skip" ? () => api.markTaskComplete(sessionId, taskId) : action === "uncomplete" ? () => api.markTaskIncomplete(sessionId, taskId) : () => api.taskControl(sessionId, taskId, action);
+      const request = action === "cancel" || action === "retry" || action === "force-start" ? () => api.taskControl(sessionId, taskId, action) : (0, import_core35.markRequestFor)(action) === "uncomplete" ? () => api.markTaskIncomplete(sessionId, taskId) : () => api.markTaskComplete(sessionId, taskId);
       await (effect.watch ? withExecutionStream(deps, sessionId, request) : request());
       await refreshPlan(deps, sessionId);
       return;
     }
-    case "addTask":
-      await api.addTask(effect.sessionId, {
-        title: effect.title,
-        description: effect.title,
-        prompt: effect.title,
-        type: "ai"
-      });
+    case "addTask": {
+      const fields = (0, import_core35.newTaskFields)(effect.title);
+      if (!fields) return;
+      await api.addTask(effect.sessionId, { ...fields });
       await refreshPlan(deps, effect.sessionId);
       return;
+    }
     case "updateTask":
       await api.updateTask(effect.sessionId, effect.taskId, effect.changes);
       await refreshPlan(deps, effect.sessionId);
@@ -7593,6 +7746,13 @@ async function perform(effect, deps) {
       }
       return;
     }
+    // The card goes when the daemon's next status says the task left the
+    // checkpoint; a refusal (settled elsewhere, withdrawn) surfaces as the
+    // failure the daemon words.
+    case "answerTaskCheckpoint":
+      if (effect.answer === "approve") await api.approveTaskCheckpoint(effect.sessionId, effect.taskId);
+      else await api.rejectTaskCheckpoint(effect.sessionId, effect.taskId, effect.reason);
+      return;
     // A task with a saved log ran structured, whatever its `transport` says
     // after a reload; it has no tmux window, so open the log rather than fail.
     case "openTaskTerminal": {
@@ -7642,6 +7802,16 @@ async function perform(effect, deps) {
       if (!removed) dispatch({ type: "notice", message: "That message was already delivered to the task." });
       return;
     }
+    // The task log shows the forced message at the head of the queue, then
+    // the interrupt, then the turn it opens; nothing to dispatch here.
+    case "forceSendTaskMessage":
+      await api.forceSendTaskMessage(effect.sessionId, effect.taskId, effect.text);
+      return;
+    case "forceSendQueuedTaskMessage": {
+      const { sent } = await api.forceSendQueuedTaskMessage(effect.sessionId, effect.taskId, effect.messageId);
+      if (!sent) dispatch({ type: "notice", message: "The runner already has that message; it reads it after its current step." });
+      return;
+    }
     case "interruptTask":
       await api.interruptTask(effect.sessionId, effect.taskId);
       dispatch({ type: "notice", message: "Interrupting the task\u2026" });
@@ -7665,7 +7835,7 @@ async function perform(effect, deps) {
       dispatch({ type: "notice", message: `Orchestrator model set to ${effect.modelId}.` });
       return;
     case "setPlanner": {
-      const meta = import_core32.ALL_PROVIDERS[effect.provider];
+      const meta = import_core35.ALL_PROVIDERS[effect.provider];
       if (!meta) throw new Error(`Unknown planner: ${effect.provider}`);
       const env = { AI_PROVIDER: effect.provider };
       const settings = await api.updateSettings({ env });
@@ -7677,7 +7847,7 @@ async function perform(effect, deps) {
       });
       dispatch({
         type: "notice",
-        message: `${(0, import_core32.isCliProvider)(effect.provider) ? `Planning with ${meta.label} \u2014 no API key needed.` : `Planner set to ${meta.label}.`} ${plannerModelNotice(recall2)}`
+        message: `${(0, import_core35.isCliProvider)(effect.provider) ? `Planning with ${meta.label} \u2014 no API key needed.` : `Planner set to ${meta.label}.`} ${plannerModelNotice(recall2)}`
       });
       await loadModels(deps);
       return;
@@ -7689,7 +7859,7 @@ async function perform(effect, deps) {
       dispatch({ type: "notice", message: `Planner effort set to ${effect.effort || "the runner default"}.` });
       return;
     case "setApiKey": {
-      const meta = import_core32.ALL_PROVIDERS[effect.provider];
+      const meta = import_core35.ALL_PROVIDERS[effect.provider];
       if (!meta) throw new Error(`Unknown provider: ${effect.provider}`);
       await api.updateSettings({ env: { [meta.apiKeyEnvVar]: effect.key } });
       deps.setEnvVar(meta.apiKeyEnvVar, effect.key);
@@ -7727,7 +7897,7 @@ async function perform(effect, deps) {
       return;
     case "setAutonomous":
       deps.setEnvVar("ORDEWELL_AUTONOMOUS_MODE", String(effect.enabled));
-      dispatch({ type: "notice", message: `Autonomy level: ${(0, import_core32.autonomyLevelLabel)(effect.enabled)} for new plans.` });
+      dispatch({ type: "notice", message: `Autonomy level: ${(0, import_core35.autonomyLevelLabel)(effect.enabled)} for new plans.` });
       return;
     case "setMouseCapture":
       deps.setMouseCapture(effect.enabled);
@@ -7861,7 +8031,7 @@ function osc52(text) {
 function copySelection(deps, text) {
   if (!text) return;
   const lines = text.split("\n").length;
-  const command = (0, import_core32.clipboardCopyCommand)(deps.hasBin);
+  const command = (0, import_core35.clipboardCopyCommand)(deps.hasBin);
   if (command) {
     try {
       (deps.pipeToClipboard ?? pipeToClipboardDefault)(command, text);
@@ -7978,6 +8148,7 @@ var CONTROL2 = {
   "": "ctrl-o",
   "": "ctrl-p",
   "": "ctrl-r",
+  "": "ctrl-s",
   "": "ctrl-t",
   "": "ctrl-u",
   "": "ctrl-w",
@@ -8251,7 +8422,7 @@ async function handleTui(subArgs) {
   }
   const workspace = flag(subArgs, "--workspace") || process.cwd();
   try {
-    (0, import_core33.assertWorkspaceExists)(workspace);
+    (0, import_core36.assertWorkspaceExists)(workspace);
   } catch {
     console.error(
       `Workspace "${workspace}" does not exist.
@@ -8260,7 +8431,7 @@ cd into a directory that exists, or pass --workspace <path> naming one that does
     );
     process.exit(1);
   }
-  registerSkillCommands((0, import_core33.createSkillsService)(workspace).listSkills());
+  registerSkillCommands((0, import_core36.createSkillsService)(workspace).listSkills());
   const explicitPort = flag(subArgs, "--port") || process.env.ORDEWELL_PORT;
   const targetPort = explicitPort ? resolvePort(subArgs) : await findFreePort();
   const { port, owned: ownedAtLaunch } = await ensureDaemonOwned(targetPort, { detached: false });
@@ -8277,7 +8448,7 @@ cd into a directory that exists, or pass --workspace <path> naming one that does
       workspace,
       port,
       dispatch: (action) => app.dispatch(action),
-      newSessionId: () => (0, import_core33.mintSessionId)(),
+      newSessionId: () => (0, import_core36.mintSessionId)(),
       setEnvVar: (key, value) => {
         writeEnvVar(findEnvFile(), key, value);
         process.env[key] = value;
@@ -8368,6 +8539,7 @@ var COMMANDS = {
   "retry": handleRetry,
   "cancel": handleCancel,
   continue: handleContinue,
+  checkpoint: handleCheckpoint,
   "add-task": handleAddTask,
   "remove-task": handleRemoveTask,
   "task-runner": handleTaskRunner,
@@ -8401,7 +8573,7 @@ function cliVersion() {
 // src/main.ts
 var TUI_FLAGS = /* @__PURE__ */ new Set(["--workspace", "--port"]);
 async function main() {
-  (0, import_core34.migrateOldConfigDir)();
+  (0, import_core37.migrateOldConfigDir)();
   loadEnvFile();
   const argv = process.argv.slice(2);
   if (TUI_FLAGS.has(argv[0] ?? "")) argv.unshift("tui");