@ordewell/core 0.11.3 → 0.12.1

package/dist/plan-utils.js

@@ -32,6 +32,7 @@ var plan_utils_exports = {};
 __export(plan_utils_exports, {
   CHECKPOINT_TRUNCATE_LENGTH: () => CHECKPOINT_TRUNCATE_LENGTH,
   DEFAULT_RUNNERS: () => DEFAULT_RUNNERS,
+  DELEGATION_OFFERED: () => DELEGATION_OFFERED,
   EMPTY_CONVERSATION: () => EMPTY_CONVERSATION,
   EMPTY_HOLD: () => EMPTY_HOLD,
   EMPTY_RUN: () => EMPTY_RUN,
@@ -43,6 +44,8 @@ __export(plan_utils_exports, {
   PLANNED_WITH_LABEL: () => PLANNED_WITH_LABEL,
   REPORT_PREVIEW_LINES: () => REPORT_PREVIEW_LINES,
   SEVERITY_LABEL: () => SEVERITY_LABEL,
+  STALLED_LABEL: () => STALLED_LABEL,
+  STOPPING_LABEL: () => STOPPING_LABEL,
   SUPERVISOR_LEVEL_LABEL: () => SUPERVISOR_LEVEL_LABEL,
   WAITS_FOR_APPROVAL_LABEL: () => WAITS_FOR_APPROVAL_LABEL,
   accountLimitPercentText: () => accountLimitPercentText,
@@ -50,6 +53,7 @@ __export(plan_utils_exports, {
   accountLimitsOf: () => accountLimitsOf,
   accountLimitsText: () => accountLimitsText,
   accountLimitsTitle: () => accountLimitsTitle,
+  activityLabel: () => activityLabel,
   addAttemptUsage: () => addAttemptUsage,
   addModelUsage: () => addModelUsage,
   addPlannerUsage: () => addPlannerUsage,
@@ -77,12 +81,14 @@ __export(plan_utils_exports, {
   cardEditable: () => cardEditable,
   checkOf: () => checkOf,
   clampThinkingEffort: () => clampThinkingEffort,
+  closeTurn: () => closeTurn,
   compactionText: () => compactionText,
   confirmedOverride: () => confirmedOverride,
   contextMeterText: () => contextMeterText,
   contextMeterTitle: () => contextMeterTitle,
   costText: () => costText,
   countedSessionCost: () => countedSessionCost,
+  delegatedRowView: () => delegatedRowView,
   dependencyCandidates: () => dependencyCandidates,
   dependentsNotice: () => dependentsNotice,
   dependentsOf: () => dependentsOf,
@@ -93,10 +99,12 @@ __export(plan_utils_exports, {
   diffSummary: () => diffSummary,
   drainNext: () => drainNext,
   editableWhileRunning: () => editableWhileRunning,
+  elapsedSince: () => elapsedSince,
   endAttemptUsage: () => endAttemptUsage,
   followTaskLog: () => followTaskLog,
   followTurn: () => followTurn,
   formatCost: () => formatCost,
+  formatElapsed: () => formatElapsed,
   formatTokenCount: () => formatTokenCount,
   fromTranscript: () => fromTranscript,
   handoffBaseLine: () => handoffBaseLine,
@@ -107,6 +115,7 @@ __export(plan_utils_exports, {
   hasAccountLimits: () => hasAccountLimits,
   hasHiddenDetail: () => hasHiddenDetail,
   hasLongReport: () => hasLongReport,
+  heldWords: () => heldWords,
   holdLabel: () => holdLabel,
   holdPrompt: () => holdPrompt,
   isFileEditTool: () => isFileEditTool,
@@ -130,10 +139,12 @@ __export(plan_utils_exports, {
   markdownHtml: () => markdownHtml,
   markdownTokens: () => markdownTokens,
   mergeOutcome: () => mergeOutcome,
+  mergePastChecksConfirmation: () => mergePastChecksConfirmation,
   modelCostTitle: () => modelCostTitle,
   namedRepos: () => namedRepos,
   newTaskFields: () => newTaskFields,
   noExecutorRefusal: () => noExecutorRefusal,
+  onOneLine: () => onOneLine,
   opsEditable: () => opsEditable,
   outOfRounds: () => outOfRounds,
   outputLines: () => outputLines,
@@ -152,6 +163,7 @@ __export(plan_utils_exports, {
   reconcileApprovals: () => reconcileApprovals,
   reduceConversation: () => reduceConversation,
   reduceTaskLog: () => reduceTaskLog,
+  repairWaitLabel: () => repairWaitLabel,
   repairedLanded: () => repairedLanded,
   repairedNotice: () => repairedNotice,
   repeatingChecks: () => repeatingChecks,
@@ -163,6 +175,9 @@ __export(plan_utils_exports, {
   resumeLabel: () => resumeLabel,
   resumeTime: () => resumeTime,
   resumedSessionWindow: () => resumedSessionWindow,
+  revertEffect: () => revertEffect,
+  revertListLine: () => revertListLine,
+  revertTaskRef: () => revertTaskRef,
   runHoldsEditors: () => runHoldsEditors,
   runnerToolSubject: () => runnerToolSubject,
   savedPatchView: () => savedPatchView,
@@ -171,13 +186,16 @@ __export(plan_utils_exports, {
   severityLabel: () => severityLabel,
   skillTokens: () => skillTokens,
   skippedLabel: () => skippedLabel,
+  spentTokens: () => spentTokens,
   startAttemptUsage: () => startAttemptUsage,
   stopTurn: () => stopTurn,
   subagentCostTitle: () => subagentCostTitle,
   subtreeIds: () => subtreeIds,
+  subtreeView: () => subtreeView,
   summarizeToolCall: () => summarizeToolCall,
   takeAt: () => takeAt,
   taskActionCommand: () => taskActionCommand,
+  taskActivity: () => taskActivity,
   taskChatAvailable: () => taskChatAvailable,
   taskLogCommands: () => taskLogCommands,
   taskLogHeaderView: () => taskLogHeaderView,
@@ -390,9 +408,11 @@ function taskStatusKind(task) {
   if (!isTaskRunning(task)) return "todo";
   return task.status === "in_progress" && task.idleSince ? "quiet" : "running";
 }
+var STALLED_LABEL = "Stalled";
 var AWAITING_LABELS = {
   input: "Waiting for your input",
   checkpoint: "Checkpoint",
+  "question-lost": "Question lost in a restart",
   conflict: "Merge conflict",
   "files-changed": "Changed tracked files",
   "usage-limit": "Paused on a usage limit"
@@ -400,6 +420,14 @@ var AWAITING_LABELS = {
 function awaitingLabel(task) {
   return task.status === "awaiting_user" && task.awaitingReason ? AWAITING_LABELS[task.awaitingReason] : null;
 }
+var REPAIR_WAIT_LABELS = {
+  slot: "Repair waits for a free slot",
+  planner: "Repair waits for the planner's turn to end",
+  "usage-limit": "Repair waits for its runner's usage limit to reset"
+};
+function repairWaitLabel(wait) {
+  return REPAIR_WAIT_LABELS[wait];
+}
 function blockedByLabel(refs) {
   return `Blocked by ${refs.join(", ")}`;
 }
@@ -569,10 +597,25 @@ function loopRemovalRefusal(task) {
   return task.loop ? `"${task.title}" is a loop's check: remove its body tasks first, or drop its loop ("loop": null), so they do not run on their own` : null;
 }
 function loopReshapeRefusal(tasks, target, action) {
+  if (target.type === "delegated") return `"${target.title}" is a delegated task and cannot be ${action}: remove it and add what should replace it`;
   if (target.loop) return `"${target.title}" is a loop's check and cannot be ${action}: drop its loop first ("loop": null)`;
   return checkOf(tasks, target.id) ? `"${target.title}" is in a loop's body and cannot be ${action}: take it out of the loop first` : null;
 }
 
+// src/models/lineBreaks.ts
+var BREAKS = "\\n\\v\\f\\r\\u0085\\u2028\\u2029";
+var LINE_BREAK = new RegExp(`\\r\\n|[${BREAKS}]`);
+var ONE_LINE = new RegExp(`^[^${BREAKS}]*$`);
+function splitLines(text2) {
+  return text2.split(LINE_BREAK);
+}
+function quotedLine(text2) {
+  return JSON.stringify(text2).replace(/[\u0085\u2028\u2029]/g, (char) => `\\u${char.charCodeAt(0).toString(16).padStart(4, "0")}`);
+}
+function onOneLine(text2) {
+  return ONE_LINE.test(text2) ? text2 : quotedLine(text2);
+}
+
 // src/services/PlannedTask.ts
 function findCycle(tasks) {
   return findDependencyCycle(tasks);
@@ -1023,7 +1066,8 @@ function truncateCheckpointSummary(summary) {
 
 // src/services/conflictFiles.ts
 function capConflictFiles(files, max = 5) {
-  return files.length <= max ? files.join(", ") : `${files.slice(0, max).join(", ")}, +${files.length - max} more`;
+  const named = files.map(onOneLine);
+  return named.length <= max ? named.join(", ") : `${named.slice(0, max).join(", ")}, +${named.length - max} more`;
 }
 
 // src/services/mergeResultNotice.ts
@@ -1171,10 +1215,33 @@ function handoffBaseLine(handoff, length) {
 function repoResultLines(handoff) {
   return handoff.repos.map(({ path, landed }) => `${path}: ${landed.length === 0 ? "nothing to merge" : `${landed.length} task${landed.length === 1 ? "" : "s"} landed`}`);
 }
+function mergePastChecksConfirmation(checks) {
+  return `This merges work no check has passed: ${checks.join(", ")} ${checks.length === 1 ? "has" : "have"} not.`;
+}
 
 // src/services/runSettingsText.ts
 var SUPERVISOR_LEVEL_LABEL = { off: "Off", watch: "Watch", act: "Act" };
 var PLANNED_WITH_LABEL = "Planned-with line in commits Ordewell writes";
+var DELEGATION_ENV = "ORDEWELL_DELEGATION";
+function delegationSwitchedOn({ env, moduleDir, exists }) {
+  if (env !== "1" || moduleDir === null) return false;
+  const parts = moduleDir.split(/[\\/]/);
+  if (parts.includes("node_modules")) return false;
+  const packages = parts.lastIndexOf("packages");
+  if (packages < 1) return false;
+  const root = parts.slice(0, packages).join("/");
+  return exists(`${root}/.git`) && exists(`${root}/packages/core/package.json`);
+}
+function placeHere(variable) {
+  const fs = typeof process === "undefined" ? void 0 : process.getBuiltinModule?.("fs");
+  if (!fs) return { env: void 0, moduleDir: null, exists: () => false };
+  const file = typeof __filename !== "undefined" ? __filename : new URL(
+    // @ts-expect-error - import.meta is only valid under an ESM module setting; see builtinSkills.ts
+    __filename
+  ).pathname;
+  return { env: process.env[variable], moduleDir: file.replace(/[\\/][^\\/]*$/, ""), exists: (path) => fs.existsSync(path) };
+}
+var DELEGATION_OFFERED = delegationSwitchedOn(placeHere(DELEGATION_ENV));
 function parseCount(arg, min) {
   if (arg === void 0 || !/^\d+$/.test(arg)) return null;
   const n = Number(arg);
@@ -1183,18 +1250,21 @@ function parseCount(arg, min) {
 
 // src/models/Usage.ts
 function partedPromptUsage(parts) {
-  const reported = [parts.uncached, parts.cacheRead, parts.cacheWrite].filter((n) => n !== void 0);
+  const reported2 = [parts.uncached, parts.cacheRead, parts.cacheWrite].filter((n) => n !== void 0);
   return {
-    ...reported.length > 0 ? { inputTokens: reported.reduce((a, b) => a + b, 0) } : {},
+    ...reported2.length > 0 ? { inputTokens: reported2.reduce((a, b) => a + b, 0) } : {},
     ...parts.cacheRead !== void 0 ? { cachedInputTokens: parts.cacheRead } : {}
   };
 }
 var TOKEN_FIELDS = ["inputTokens", "outputTokens", "cachedInputTokens"];
+function spentTokens({ inputTokens, outputTokens }) {
+  return (inputTokens ?? 0) + (outputTokens ?? 0);
+}
 function addUsage(totals, record) {
   const next = { ...totals };
   for (const field of TOKEN_FIELDS) {
-    const reported = record[field];
-    if (reported !== void 0) next[field] = (totals[field] ?? 0) + reported;
+    const reported2 = record[field];
+    if (reported2 !== void 0) next[field] = (totals[field] ?? 0) + reported2;
   }
   if (record.reportedCost) {
     const { amount, currency } = record.reportedCost;
@@ -1338,7 +1408,7 @@ function planUsage(tasks) {
 function taskUsageSummary(task) {
   const attempts = task.attemptUsage ?? [];
   const latest = attempts.at(-1);
-  const contextFill = latest ? plannerContextFill(latest) : void 0;
+  const contextFill = latest && task.type !== "delegated" ? plannerContextFill(latest) : void 0;
   return {
     totals: attempts.reduce((sum, attempt) => addUsageTotals(sum, attempt.totals), {}),
     attempts: attempts.length,
@@ -2176,17 +2246,17 @@ function answered(block, decision, note) {
 function decideApproval2(view, { approvalId, decision, note }) {
   return settleApproval2(view, approvalId, (block) => answered(block, decision, note));
 }
-function startTurn(view, { message, messageId, from, forced }) {
+function startTurn(view, { message, messageId, from, forced, startedAt }) {
   const queued = messageId ? view.queued.filter((m) => m.id !== messageId) : view.queued;
-  const working = { ...view, queued, working: true, latestText: void 0 };
+  const working = { ...view, queued, working: true, turnStartedAt: startedAt, latestText: void 0 };
   return message ? append(working, (id) => ({ ...sentMessage(id, message, from), ...forced ? { forced: true } : {} })) : working;
 }
 function sentMessage(id, text2, from) {
   return from === "ordewell" ? settledMessage(id, "system", `Ordewell: ${text2}`) : settledMessage(id, "user", text2);
 }
-function startCommand(view, { name, args, messageId }) {
+function startCommand(view, { name, args, messageId, startedAt }) {
   const queued = messageId ? view.queued.filter((m) => m.id !== messageId) : view.queued;
-  return append({ ...view, queued, working: true, latestText: void 0 }, (id) => ({
+  return append({ ...view, queued, working: true, turnStartedAt: startedAt, latestText: void 0 }, (id) => ({
     type: "command",
     id,
     name,
@@ -2221,7 +2291,7 @@ function endTurn2(view, { reason }) {
   const i = runningCommand(view);
   const command = view.blocks[i];
   const settled = command?.type === "command" ? { ...view, blocks: replaceAt(view.blocks, i, { ...command, status: COMMAND_END[reason] }) } : view;
-  const closed = closeOpenBlocks({ ...settled, working: false, lastTurnEnd: reason, streams: {}, latestText: void 0 }, CUT[reason]);
+  const closed = closeOpenBlocks({ ...settled, working: false, turnStartedAt: void 0, lastTurnEnd: reason, streams: {}, latestText: void 0 }, CUT[reason]);
   return reason === "interrupted" ? append(closed, (id) => settledMessage(id, "system", "Interrupted.")) : closed;
 }
 function queueMessage(view, { messageId, text: text2, forced, from }) {
@@ -2271,7 +2341,7 @@ function endScriptStep(view, event) {
   const passed = event.code === 0 && !event.signal && event.error === void 0;
   const i = runningScriptStep(view);
   const block = view.blocks[i];
-  const ended = { ...view, working: false };
+  const ended = { ...view, working: false, turnStartedAt: void 0 };
   if (block?.type !== "tool") return append(ended, (id) => settledMessage(id, "system", status));
   const output = block.output.trim() ? `${block.output.replace(/\n+$/, "")}
 ${status}` : status;
@@ -2368,7 +2438,7 @@ function reduceTaskLog(view, event) {
     case "handoff":
       return showHandoff(view, event);
     case "runner_ended":
-      return closeOpenBlocks({ ...endOpenCalls(view), working: false, streams: {}, latestText: void 0 }, "stopped");
+      return closeOpenBlocks({ ...endOpenCalls(view), working: false, turnStartedAt: void 0, streams: {}, latestText: void 0 }, "stopped");
     default:
       return view;
   }
@@ -2377,6 +2447,61 @@ function replayTaskLog(events, from = EMPTY_TASK_LOG) {
   return events.reduce(reduceTaskLog, from);
 }
 
+// src/conversation/activity.ts
+function activityLabel(view) {
+  for (let i = view.blocks.length - 1; i >= 0; i--) {
+    const label = openLabel(view.blocks[i], view);
+    if (label) return label;
+  }
+  return "Working\u2026";
+}
+function isAtWork(view) {
+  if (view.working !== false) return true;
+  if (view.blocks.some((b) => b.type === "subagent" && b.status === "running")) return true;
+  return view.lastTurnEnd === void 0 && view.blocks.some((b) => openLabel(b, view) !== null);
+}
+function openLabel(block, view) {
+  switch (block.type) {
+    case "thinking":
+      return block.streaming ? "Thinking\u2026" : null;
+    case "message":
+      return block.streaming ? "Writing\u2026" : null;
+    case "tool": {
+      if (block.status !== "pending") return null;
+      const { name, keyArg } = block.headline;
+      return keyArg ? `Running ${name}(${keyArg})\u2026` : `Running ${name}\u2026`;
+    }
+    case "subagent": {
+      if (block.status !== "running") return null;
+      const running = view.blocks.filter((b) => b.type === "subagent" && b.status === "running");
+      return running.length > 1 ? `${running.length} subagents running\u2026` : `Subagent: ${block.brief}\u2026`;
+    }
+    default:
+      return null;
+  }
+}
+function taskActivity(view, task) {
+  if (!isTaskRunning(task) || view.archived) return null;
+  if (task.awaitingApproval || view.blocks.some((b) => b.type === "approval" && b.status === "pending")) return null;
+  const since = view.turnStartedAt ? { since: view.turnStartedAt } : {};
+  if (taskStatusKind(task) === "quiet") return { label: STALLED_LABEL, busy: false, ...since };
+  if (!isAtWork(view)) return null;
+  return { label: activityLabel(view), busy: true, ...since };
+}
+
+// src/conversation/elapsed.ts
+function formatElapsed(ms) {
+  if (!Number.isFinite(ms) || ms < 0) return "";
+  const seconds = Math.floor(ms / 1e3);
+  if (seconds < 60) return `${seconds}s`;
+  const minutes = Math.floor(seconds / 60);
+  if (minutes < 60) return `${minutes}m ${String(seconds % 60).padStart(2, "0")}s`;
+  return `${Math.floor(minutes / 60)}h ${String(minutes % 60).padStart(2, "0")}m`;
+}
+function elapsedSince(startedAt, now) {
+  return startedAt === void 0 ? "" : formatElapsed(now - Date.parse(startedAt));
+}
+
 // src/models/Handoff.ts
 var SEVERITY_LABEL = {
   blocker: "Blocker",
@@ -2395,16 +2520,23 @@ function worstSeverity(findings) {
   }
   return worst;
 }
+var ROOT_NODE = "root";
+function nodeText(node) {
+  return node.startsWith(`${ROOT_NODE}/`) ? node.slice(ROOT_NODE.length + 1) : node;
+}
+function findingRefText(task, ref) {
+  return `${task}${ref.attempt !== void 0 ? `@${ref.attempt}` : ""}${ref.finding ? `/${ref.finding}` : ""}`;
+}
 function handoffReferenceText(ref, taskName = () => void 0) {
   switch (ref.kind) {
     case "file":
-      return `${ref.line !== void 0 ? `${ref.path}:${ref.line}` : ref.path}${ref.resolved === true ? "" : " (unresolved)"}`;
+      return `${onOneLine(ref.line !== void 0 ? `${ref.path}:${ref.line}` : ref.path)}${ref.resolved === true ? "" : " (unresolved)"}`;
     case "commit":
-      return `commit ${ref.sha}${ref.repo ? ` in ${ref.repo}` : ""}${ref.resolved === true ? "" : " (unresolved)"}`;
+      return `commit ${ref.sha}${ref.repo ? ` in ${onOneLine(ref.repo)}` : ""}${ref.resolved === true ? "" : " (unresolved)"}`;
     case "task":
-      return `task ${taskName(ref.task) ?? ref.task}${ref.finding ? ` ${ref.finding}` : ""}`;
+      return onOneLine(findingRefText(ref.label !== void 0 ? `${nodeText(ref.node ?? ROOT_NODE)}:${ref.label}` : taskName(ref.task) ?? ref.task, ref));
     case "url":
-      return ref.url;
+      return onOneLine(ref.url);
     case "patch":
       return patchText(ref);
   }
@@ -2424,7 +2556,7 @@ function byteSize(bytes) {
 }
 function patchFlagText(flag) {
   const more = flag.count - flag.paths.length;
-  return `${FLAG_WORDS[flag.kind]}: ${counted(flag.count, "file")}${flag.paths.length ? ` (${flag.paths.join(", ")}${more > 0 ? `, +${more} more` : ""})` : ""}`;
+  return `${FLAG_WORDS[flag.kind]}: ${counted(flag.count, "file")}${flag.paths.length ? ` (${flag.paths.map(onOneLine).join(", ")}${more > 0 ? `, +${more} more` : ""})` : ""}`;
 }
 function patchChangesText(patch) {
   const binary = patch.binary > 0 ? `, ${patch.binary} binary` : "";
@@ -2455,6 +2587,9 @@ function savedPatchViews(handoff) {
 function savedPatchView(handoff) {
   return savedPatchViews(handoff)[0] ?? null;
 }
+function heldWords(text2) {
+  return splitLines(text2).map((line) => line ? `  ${line}` : line);
+}
 
 // src/conversation/labels.ts
 var APPROVAL_KIND_TEXT = {
@@ -2579,18 +2714,18 @@ function cutOff(gate, input) {
   return turnId === void 0 || turnId === gate.stopped;
 }
 function withGate(live2, gate) {
-  return gate.open === live2.gate.open && gate.stopped === live2.gate.stopped ? live2 : { ...live2, gate };
+  return gate.open === live2.gate.open && gate.stopped === live2.gate.stopped && gate.openedAt === live2.gate.openedAt ? live2 : { ...live2, gate };
 }
 function followTurn(view, gate, input) {
   const live2 = { view, gate };
   if (input.type === "planner_turn_started") {
-    return withGate({ view: reduceConversation(view, input), gate }, { open: input.turnId, stopped: null });
+    return withGate({ view: reduceConversation(view, input), gate }, { open: input.turnId, stopped: null, ...input.startedAt ? { openedAt: input.startedAt } : {} });
   }
   if (cutOff(gate, input)) {
     return input.type === "planner_turn_ended" ? withGate(live2, { ...gate, stopped: null }) : live2;
   }
   const next = { view: reduceConversation(view, input), gate };
-  return input.type === "planner_turn_ended" && input.turnId === gate.open ? withGate(next, { ...gate, open: null }) : next;
+  return input.type === "planner_turn_ended" && input.turnId === gate.open ? withGate(next, { open: null, stopped: gate.stopped }) : next;
 }
 function stopTurn(view, gate) {
   if (gate.open === null) return { view, gate };
@@ -2599,9 +2734,16 @@ function stopTurn(view, gate) {
     gate: { open: null, stopped: gate.open }
   };
 }
+function closeTurn(gate) {
+  return gate.open === null ? gate : { open: null, stopped: gate.stopped };
+}
 
 // src/services/WakePolicy.ts
 var REPORT_LEAD = ", whose result you asked for, has ended.";
+var RIDE_ALONG_CHARS = 120;
+var LEFT_OUT_EVENTS = 8;
+var LEFT_OUT_ROOM = 100 + LEFT_OUT_EVENTS * (RIDE_ALONG_CHARS + 1);
+var UNKNOWN_CACHE_TTL_MS = 5 * 6e4;
 
 // src/conversation/wakeUp.ts
 var DIGEST_HEAD = "Run update:";
@@ -2755,8 +2897,9 @@ var PAUSED = (t) => t.status === "awaiting_user" && t.awaitingReason === "usage-
 var RESUMES = (t) => PAUSED(t) && !!t.resumeAt;
 var RESUMABLE = (t) => PAUSED(t) && t.continuable === true;
 var HOLDS_UP = (t) => t.status === "failed" || t.status === "blocked" || t.status === "awaiting_user";
+var STOPPABLE = (t) => t.status === "in_progress" || !!t.repairWaits;
 var TASK_RULES = [
-  ["cancel", (t) => t.status === "in_progress"],
+  ["cancel", STOPPABLE],
   ["resume-now", RESUMABLE],
   ["cancel-resume", RESUMES],
   ["skip", HOLDS_UP],
@@ -2767,7 +2910,7 @@ var TASK_RULES = [
   ["uncomplete", (t) => t.status === "completed"]
 ];
 var SUBTASK_RULES = [
-  ["cancel", (t) => t.status === "in_progress"],
+  ["cancel", STOPPABLE],
   ["resume-now", RESUMABLE],
   ["cancel-resume", RESUMES],
   ["complete", (t) => t.status === "in_progress" && t.type === "ai"],
@@ -2818,11 +2961,11 @@ function opsEditable(task) {
 
 // src/services/AssignmentScope.ts
 function assignedRunnerOf(task) {
-  return task.type === "ai" ? task.assignedRunner || void 0 : void 0;
+  return task.type === "ai" || task.type === "delegated" ? task.assignedRunner || void 0 : void 0;
 }
 var OVER = /* @__PURE__ */ new Set(["completed", "skipped"]);
 function assignmentIssue(task, scope) {
-  if (task.type !== "ai" || OVER.has(task.status)) return null;
+  if (task.type !== "ai" && task.type !== "delegated" || OVER.has(task.status)) return null;
   if (!scope.enabledRunners.includes(task.assignedRunner)) return { kind: "runner-off", runner: task.assignedRunner };
   const model = task.assignedModel;
   const allowed = effectiveAllowlist(scope.allowlist[task.assignedRunner], task.assignedRunner, scope.models);
@@ -2844,6 +2987,54 @@ function assignmentConsequence({ status, awaitingReason, resumeAt }) {
   return "runs as assigned unless moved";
 }
 
+// src/taskRow/delegated.ts
+var STOPPING_LABEL = "Stopping: its child plan is still winding down.";
+function countsText({ completed, running, waiting, pending, failed, skipped }) {
+  const total = completed + running + waiting + pending + failed + skipped;
+  const said = [[running, "running"], [waiting, "waiting"], [failed, "failed"], [skipped, "skipped"]];
+  return [`${completed} of ${total} done`, ...said.filter(([n]) => n > 0).map(([n, word]) => `${n} ${word}`)].join(", ");
+}
+function reported(handoff) {
+  const counts = handoff?.subtree?.counts;
+  return counts && { completed: counts.done, running: 0, waiting: 0, pending: counts.blocked, failed: counts.failed, skipped: counts.skipped };
+}
+function delegatedRowView(task) {
+  if (task.type !== "delegated") return null;
+  const { delegation } = task;
+  const counts = delegation?.tasks ?? reported(task.handoff);
+  return {
+    goal: task.goal?.trim() || null,
+    tokens: delegation?.tokens ? `${formatTokenCount(delegation.tokens.left)} of ${formatTokenCount(delegation.tokens.budget)} tokens left` : null,
+    counts: counts ? countsText(counts) : null,
+    stopping: delegation?.stopping ? STOPPING_LABEL : null
+  };
+}
+var SEVERITIES = ["blocker", "major", "minor", "info"];
+function itemView({ ref, finding }) {
+  return {
+    reference: ref ? handoffReferenceText(ref) : null,
+    heading: `${finding.id} \xB7 ${severityLabel(finding.severity)} \xB7 ${onOneLine(finding.title)}`,
+    ...finding.detail ? { detail: finding.detail } : {}
+  };
+}
+function subtreeView(subtree) {
+  const { counts, findings, outsideScope } = subtree;
+  const ran = [["done", counts.done], ["failed", counts.failed], ["blocked", counts.blocked], ["skipped", counts.skipped]].filter(([, n]) => n > 0).map(([word, n]) => `${n} ${word}`).join(", ");
+  const found = SEVERITIES.filter((severity) => findings[severity] > 0).map((severity) => `${findings[severity]} ${severity}`).join(", ");
+  const summary = [
+    ran || "nothing ran",
+    ...counts.commits > 0 ? [`${counts.commits} commit${counts.commits === 1 ? "" : "s"}`] : [],
+    `${formatTokenCount(counts.tokens)} tokens`,
+    found ? `${found} finding${SEVERITIES.reduce((n, s) => n + findings[s], 0) === 1 ? "" : "s"} below` : "no findings below"
+  ].join(" \xB7 ");
+  return {
+    summary,
+    outsideScope: outsideScope && outsideScope.count > 0 ? `Changed outside its declared scope: ${outsideScope.paths.map(onOneLine).join(", ")}${outsideScope.count > outsideScope.paths.length ? ` (+${outsideScope.count - outsideScope.paths.length} more)` : ""}` : null,
+    open: subtree.open.map(itemView),
+    promoted: subtree.promoted.map(itemView)
+  };
+}
+
 // src/taskRow/loop.ts
 function loopCheckState(check, goesOn) {
   switch (check.status) {
@@ -2914,17 +3105,23 @@ function blockedBy(task, reading) {
   if (!reading || !NOT_STARTED.has(task.status)) return [];
   return reading.blocks.blocked.get(task.id) ?? [];
 }
+function strandedDetail(check, dependencies, reading) {
+  const status = (id) => reading?.tasks.find((t) => t.id === id)?.status;
+  const landed = reading && check.loop.body.every((id) => status(id) === "completed");
+  const finished = dependencies.every((id) => [void 0, "completed", "skipped"].includes(status(id)));
+  return landed && finished ? `Nothing runs it now: start it for round ${loopRoundOf(check) + 1} of ${check.loop.maxRounds}` : "Nothing runs it now: execute the plan and the loop goes on";
+}
 function loopOf(task, reading) {
   const tasks = reading?.tasks;
   if (task.loop) {
     const check2 = { id: task.id, status: task.status, loop: task.loop, loopRound: task.loopRound, ...task.verdict ? { verdict: task.verdict } : {} };
-    const state = loopCheckState(check2, reading ? reading.blocks.repeating.has(task.id) : true);
+    const state = loopCheckState(check2, !task.loopStranded && (reading ? reading.blocks.repeating.has(task.id) : true));
     const body = refsOf(task.loop.body, tasks);
     const halted = reading ? task.loop.body.filter((id) => {
       const status = reading.tasks.find((t) => t.id === id)?.status;
       return status === "failed" || status === "skipped" || reading.blocks.blocked.has(id);
     }) : [];
-    const detail = state === "repeating" ? `Found problems: runs again once ${body.join(", ")} ${body.length === 1 ? "has" : "have"} landed` : state === "stopped" ? `${refsOf(halted, tasks).join(", ")} did not pass: retry ${halted.length === 1 ? "it" : "them"} and the loop goes on` : null;
+    const detail = state === "repeating" ? `Found problems: runs again once ${body.join(", ")} ${body.length === 1 ? "has" : "have"} landed` : state === "stopped" ? task.loopStranded ? strandedDetail(check2, task.dependencies, reading) : `${refsOf(halted, tasks).join(", ")} did not pass: retry ${halted.length === 1 ? "it" : "them"} and the loop goes on` : null;
     return { role: "check", state, label: loopCheckLabel(check2, state), detail, body };
   }
   const owner = reading && checkOf(reading.tasks, task.id);
@@ -2958,9 +3155,10 @@ function taskRowView(task, context = {}) {
   const blocked = blockedBy(task, reading);
   const loop = loopOf(task, reading);
   return {
+    delegated: delegatedRowView(task),
     usage: latestAttempt ? { totals: spend.totals, ...spend.contextFill ? { contextFill: spend.contextFill } : {}, attempt: latestAttempt.attempt } : task.type === "ai" && ["completed", "failed", "in_progress", "awaiting_user"].includes(task.status) ? { totals: {}, attempt: 0 } : null,
     orderLabel: taskOrderLabel(task, parent),
-    kind: task.type === "user" ? "user" : task.type === "script" ? "script" : task.ops ? "ops" : "ai",
+    kind: task.type === "user" ? "user" : task.type === "script" ? "script" : task.type === "delegated" ? "delegated" : task.ops ? "ops" : "ai",
     // Between rounds a check waits for its fix as a task waits for its dependencies, and is no failure (ADR-0045 L3).
     status: blocked.length > 0 ? "blocked" : loop?.role === "check" && loop.state === "repeating" ? "todo" : taskStatusKind(task),
     running: isTaskRunning(task),
@@ -2977,7 +3175,8 @@ function taskRowView(task, context = {}) {
     ...flagOf(task, context.runnerScope),
     autonomous: task.type === "ai" && context.modes?.find((m) => m.id === task.taskMode)?.autonomous === true,
     repos: namedRepos(isolation?.repos),
-    conflict: isolation?.state === "conflict" ? { repo: namedRepo(isolation.conflictRepo), files: filesOf(isolation.conflictFiles) } : null,
+    conflict: isolation?.state === "conflict" && !isolation.repairWaits ? { repo: namedRepo(isolation.conflictRepo), files: filesOf(isolation.conflictFiles), resolver: isolation.resolver ? refsOf([isolation.resolver], context.tasks)[0] : null } : null,
+    repairWaiting: isolation?.state === "conflict" && isolation.repairWaits ? { label: repairWaitLabel(isolation.repairWaits), files: filesOf(isolation.conflictFiles) } : null,
     repairing: isolation?.state === "repairing" ? { files: filesOf(isolation.conflictFiles), attempt: isolation.repair ?? null } : null,
     repaired: isolation?.repairedFiles?.length ? { files: capConflictFiles(isolation.repairedFiles), landed: isolation.state === "integrated" } : null,
     mergeGate: task.mergeGate?.length ? refsOf(task.mergeGate, context.tasks) : null,
@@ -2989,7 +3188,9 @@ function taskRowView(task, context = {}) {
     handoff: handoffOf(task),
     dependencies: refsOf(task.dependencies, context.tasks),
     // A block read off the plan offers what a stored one does: Skip among them.
-    actions: taskRowActions(blocked.length > 0 ? { ...task, status: "blocked" } : task, context.placement ?? (parent ? "subtask" : "task")),
+    actions: taskRowActions({ ...task, ...blocked.length > 0 ? { status: "blocked" } : {}, ...isolation?.repairWaits ? { repairWaits: isolation.repairWaits } : {} }, context.placement ?? (parent ? "subtask" : "task")),
+    // Read off the mark itself: a task with merges left and no record has state `none`.
+    revertible: task.isolation?.revertible === true,
     mark: markAction(task),
     opsEditable: opsEditable(task)
   };
@@ -3005,7 +3206,7 @@ var STATE_LABEL = {
   done: "Done",
   failed: "Failed",
   running: "Running",
-  quiet: "Stalled",
+  quiet: STALLED_LABEL,
   awaiting: "Waiting for your input",
   blocked: "Blocked",
   skipped: "Skipped",
@@ -3022,6 +3223,7 @@ function stateOf(task, follow, approvals) {
     return { kind: task.awaitingReason === "checkpoint" ? "checkpoint" : "awaiting", label: awaitingLabel(task) ?? STATE_LABEL.awaiting };
   }
   if (task.status === "blocked") return { kind: "blocked", label: STATE_LABEL.blocked };
+  if (task.repairWaits) return { kind: "todo", label: repairWaitLabel(task.repairWaits) };
   if (follow.view.lastTurnEnd === "failed") return { kind: "failed", label: "Turn failed" };
   if (follow.view.lastTurnEnd === "interrupted") return { kind: "todo", label: "Interrupted" };
   const kind = taskStatusKind(task);
@@ -3063,7 +3265,8 @@ function taskLogCommands(view) {
 }
 function logContinues(task) {
   const finished = task.status === "completed" || task.status === "failed" || task.status === "skipped";
-  return task.continuable === true && (finished || task.status === "awaiting_user" && task.awaitingReason === "usage-limit");
+  const childLeft = task.type === "delegated" && (task.status === "pending" || task.awaitingReason === "question-lost");
+  return task.continuable === true && (finished || childLeft || task.status === "awaiting_user" && task.awaitingReason === "usage-limit");
 }
 function logResumes(task) {
   return task.continuable === true && task.status === "awaiting_user" && task.awaitingReason === "usage-limit";
@@ -3101,6 +3304,14 @@ function pastGateConfirmation(unmerged, subject = "This task") {
 function manualOverrideConfirmation(direction, label) {
   return direction === "complete" ? `Mark ${label} complete? You vouch for its work although no passing verdict said it was done. Any changes it kept may land in your run, and the tasks that depend on it are released to start on a future run.` : `Mark ${label} not done? This clears its completion and holds it until you retry or start it. The work it did stays where it is, and tasks that already ran on its result are not undone.`;
 }
+var revertEffect = "Its landed work comes off the integration branch, newest first, and each task listed is held as not started until you retry it. Nothing in your own branch changes.";
+function revertTaskRef(task) {
+  return task.ref ?? `#${task.order}`;
+}
+function revertListLine(task) {
+  const repos = task.repos.length === 1 && task.repos[0] === "." ? "" : ` (${task.repos.join(", ")})`;
+  return `${revertTaskRef(task)} ${task.title}${repos}${task.dependent ? " (goes with it)" : ""}`;
+}
 function manualOverrideStopFirst(direction, label) {
   return `${label.charAt(0).toUpperCase()}${label.slice(1)} cannot be marked ${direction === "complete" ? "complete" : "not done"} while the plan is starting, running or waiting to resume, because the run could still move it on. Stop the run first, and mark it once everything has stopped.`;
 }
@@ -3114,7 +3325,7 @@ function noExecutorRefusal(type, manual, script) {
 }
 
 // src/services/runView.ts
-var EMPTY_RUN = { tasks: [], runMerge: null, handoff: null, mergeResult: null, activity: IDLE_ACTIVITY };
+var EMPTY_RUN = { tasks: [], runMerge: null, handoff: null, mergeResult: null, activity: IDLE_ACTIVITY, escalations: [] };
 
 // src/models/AccountLimits.ts
 function hasAccountLimits(snapshot) {
@@ -3169,6 +3380,7 @@ function accountLimitsTitle(snapshot, time) {
 0 && (module.exports = {
   CHECKPOINT_TRUNCATE_LENGTH,
   DEFAULT_RUNNERS,
+  DELEGATION_OFFERED,
   EMPTY_CONVERSATION,
   EMPTY_HOLD,
   EMPTY_RUN,
@@ -3180,6 +3392,8 @@ function accountLimitsTitle(snapshot, time) {
   PLANNED_WITH_LABEL,
   REPORT_PREVIEW_LINES,
   SEVERITY_LABEL,
+  STALLED_LABEL,
+  STOPPING_LABEL,
   SUPERVISOR_LEVEL_LABEL,
   WAITS_FOR_APPROVAL_LABEL,
   accountLimitPercentText,
@@ -3187,6 +3401,7 @@ function accountLimitsTitle(snapshot, time) {
   accountLimitsOf,
   accountLimitsText,
   accountLimitsTitle,
+  activityLabel,
   addAttemptUsage,
   addModelUsage,
   addPlannerUsage,
@@ -3214,12 +3429,14 @@ function accountLimitsTitle(snapshot, time) {
   cardEditable,
   checkOf,
   clampThinkingEffort,
+  closeTurn,
   compactionText,
   confirmedOverride,
   contextMeterText,
   contextMeterTitle,
   costText,
   countedSessionCost,
+  delegatedRowView,
   dependencyCandidates,
   dependentsNotice,
   dependentsOf,
@@ -3230,10 +3447,12 @@ function accountLimitsTitle(snapshot, time) {
   diffSummary,
   drainNext,
   editableWhileRunning,
+  elapsedSince,
   endAttemptUsage,
   followTaskLog,
   followTurn,
   formatCost,
+  formatElapsed,
   formatTokenCount,
   fromTranscript,
   handoffBaseLine,
@@ -3244,6 +3463,7 @@ function accountLimitsTitle(snapshot, time) {
   hasAccountLimits,
   hasHiddenDetail,
   hasLongReport,
+  heldWords,
   holdLabel,
   holdPrompt,
   isFileEditTool,
@@ -3267,10 +3487,12 @@ function accountLimitsTitle(snapshot, time) {
   markdownHtml,
   markdownTokens,
   mergeOutcome,
+  mergePastChecksConfirmation,
   modelCostTitle,
   namedRepos,
   newTaskFields,
   noExecutorRefusal,
+  onOneLine,
   opsEditable,
   outOfRounds,
   outputLines,
@@ -3289,6 +3511,7 @@ function accountLimitsTitle(snapshot, time) {
   reconcileApprovals,
   reduceConversation,
   reduceTaskLog,
+  repairWaitLabel,
   repairedLanded,
   repairedNotice,
   repeatingChecks,
@@ -3300,6 +3523,9 @@ function accountLimitsTitle(snapshot, time) {
   resumeLabel,
   resumeTime,
   resumedSessionWindow,
+  revertEffect,
+  revertListLine,
+  revertTaskRef,
   runHoldsEditors,
   runnerToolSubject,
   savedPatchView,
@@ -3308,13 +3534,16 @@ function accountLimitsTitle(snapshot, time) {
   severityLabel,
   skillTokens,
   skippedLabel,
+  spentTokens,
   startAttemptUsage,
   stopTurn,
   subagentCostTitle,
   subtreeIds,
+  subtreeView,
   summarizeToolCall,
   takeAt,
   taskActionCommand,
+  taskActivity,
   taskChatAvailable,
   taskLogCommands,
   taskLogHeaderView,