@ordewell/core 0.10.2 → 0.10.3

package/dist/{chunk-UQGR3UCA.mjs → chunk-FH6M5QZG.mjs}

@@ -1,11 +1,12 @@
 import {
   NOT_STARTED,
+  WAITS_FOR_APPROVAL_LABEL,
   approvalLabel,
   awaitingLabel,
   isTaskRunning,
   resumeLabel,
   taskStatusKind
-} from "./chunk-3LNZDBCX.mjs";
+} from "./chunk-A57ITQE7.mjs";
 import {
   pausedOnLimit,
   rejoinPlanTree,
@@ -13,7 +14,7 @@ import {
   taskRefOf,
   titledTaskRef,
   titledTaskRefOf
-} from "./chunk-CIL3BQIF.mjs";
+} from "./chunk-SM6BV6XS.mjs";
 
 // src/models/Usage.ts
 function partedPromptUsage(parts) {
@@ -800,78 +801,20 @@ function replayTaskLog(events, from = EMPTY_TASK_LOG) {
   return events.reduce(reduceTaskLog, from);
 }
 
-// src/services/conflictFiles.ts
-function capConflictFiles(files, max = 5) {
-  return files.length <= max ? files.join(", ") : `${files.slice(0, max).join(", ")}, +${files.length - max} more`;
-}
-
-// src/services/researchStepSummary.ts
-function ellipsize(text2, max) {
-  const oneLine2 = text2.replace(/\s+/g, " ").trim();
-  return oneLine2.length > max ? `${oneLine2.slice(0, max)}\u2026` : oneLine2;
-}
-function summarizeToolCall(tool, argsJson, toolLabel) {
-  const display = toolLabel?.trim() || tool;
-  if (tool === "agent_tool") {
-    try {
-      const args = JSON.parse(argsJson);
-      const hint = args.path ?? args.file_path ?? args.filePath ?? args.pattern ?? args.query ?? args.url ?? args.command;
-      if (hint) return `${display} ${ellipsize(String(hint), 50)}`;
-    } catch {
-    }
-    return display;
-  }
-  if (tool === "spawn_research_agent") {
-    try {
-      const args = JSON.parse(argsJson);
-      const prompt = typeof args.prompt === "string" ? args.prompt : "";
-      const oneLine2 = prompt.replace(/\s+/g, " ").trim();
-      return `spawn: "${oneLine2.slice(0, 60)}${oneLine2.length > 60 ? "\u2026" : ""}"`;
-    } catch {
-      return "spawn_research_agent";
-    }
-  }
-  try {
-    const args = JSON.parse(argsJson);
-    if (tool === "find_symbol" && args.symbol) {
-      return `find_symbol ${args.symbol}${args.language ? ` [${args.language}]` : ""}`;
-    }
-    if (tool === "web_search" && args.query) {
-      return `web_search "${ellipsize(String(args.query), 50)}"`;
-    }
-    if (tool === "fetch" && args.url) {
-      return `fetch ${ellipsize(String(args.url), 60)}`;
-    }
-    if (tool === "glob" && args.pattern) {
-      return `glob ${ellipsize(String(args.pattern), 50)}`;
-    }
-    if (tool === "grep" && args.pattern) {
-      const mode = args.output_mode && args.output_mode !== "content" ? ` (${args.output_mode})` : "";
-      const scope = args.include ? ` in ${args.include}` : "";
-      return `grep ${ellipsize(String(args.pattern), 40)}${scope}${mode}`;
-    }
-    const path = args.filePath || args.file_path || args.path;
-    if (path) {
-      const basename = String(path).split("/").pop() || String(path);
-      return `${display} ${basename}`;
-    }
-    if (args.pattern) {
-      return `${display} ${args.pattern}`;
-    }
-    if (args.command) {
-      return `bash: ${String(args.command).slice(0, 40)}`;
-    }
-  } catch {
+// src/services/continuation.ts
+function continuability(task) {
+  const refuse = (reason) => ({ ok: false, reason: `Task "${task.title}" cannot be continued: ${reason}` });
+  if (task.type !== "ai") return refuse("it is not run by an agent.");
+  if (task.status === "awaiting_user" && task.awaitingReason === "conflict") {
+    return refuse("its work is waiting on a merge conflict. Resolve or repair the conflict instead.");
   }
-  return display;
+  const finished = task.status === "completed" || task.status === "failed" || task.status === "skipped";
+  if (!finished && !pausedOnLimit(task)) return refuse("only a completed, failed or skipped task, or one paused on a usage limit, can be.");
+  if (!task.runnerSessionId) return refuse("its runner left no saved session to resume. Use Retry instead.");
+  return { ok: true, sessionId: task.runnerSessionId };
 }
-function classifyOutcome(success, output) {
-  if (!success) {
-    if (/^(Command|Fetch|Web search) refused:/.test(output) || /is not available\. You are a read-only research subagent/.test(output)) return "refused";
-    if (/not approved/i.test(output) || /^Access denied:/.test(output) || /needs user approval/i.test(output)) return "denied";
-    return "failure";
-  }
-  return "success";
+function canContinue(task) {
+  return continuability(task).ok;
 }
 
 // src/services/blocking.ts
@@ -912,40 +855,6 @@ function blockingFailures(tasks) {
   return blocked;
 }
 
-// src/services/continuation.ts
-function continuability(task) {
-  const refuse = (reason) => ({ ok: false, reason: `Task "${task.title}" cannot be continued: ${reason}` });
-  if (task.type !== "ai") return refuse("it is not run by an agent.");
-  if (task.status === "awaiting_user" && task.awaitingReason === "conflict") {
-    return refuse("its work is waiting on a merge conflict. Resolve or repair the conflict instead.");
-  }
-  const finished = task.status === "completed" || task.status === "failed" || task.status === "skipped";
-  if (!finished && !pausedOnLimit(task)) return refuse("only a completed, failed or skipped task, or one paused on a usage limit, can be.");
-  if (!task.runnerSessionId) return refuse("its runner left no saved session to resume. Use Retry instead.");
-  return { ok: true, sessionId: task.runnerSessionId };
-}
-function canContinue(task) {
-  return continuability(task).ok;
-}
-
-// src/services/runSettingsText.ts
-var SUPERVISOR_LEVEL_LABEL = { off: "Off", watch: "Watch", act: "Act" };
-var plural = (n, one, many) => `${n} ${n === 1 ? one : many}`;
-var onOff = (value) => value ? "on" : "off";
-var supervisorSummary = (run) => `Supervisor: ${SUPERVISOR_LEVEL_LABEL[run.supervisorLevel]}, ${plural(run.supervisorRetryLimit, "retry", "retries")} per task, ${plural(run.wakeUpReadBudget, "read", "reads")} per wake-up`;
-var automergeSummary = (run) => `Merge automatically (gates, end of run): ${onOff(run.mergeAtGatesAutomatically)}`;
-var autorunSummary = (run) => `Autorun: ${onOff(run.autorun)}`;
-var ACT_RISK = "Tasks it adds run too, ops tasks included, which can act on real systems unattended.";
-var AUTORUN_RISK = "Plans start without review, ops tasks included, which can act on real systems unattended. In Full, the planner may also start tasks it adds later.";
-function parseSwitch(arg) {
-  return arg === "on" ? true : arg === "off" ? false : null;
-}
-function parseCount(arg, min) {
-  if (arg === void 0 || !/^\d+$/.test(arg)) return null;
-  const n = Number(arg);
-  return n >= min ? n : null;
-}
-
 // src/services/SessionMessage.ts
 function serializeTask(t) {
   return {
@@ -974,7 +883,7 @@ function serializeTask(t) {
     ...t.addedBy ? { addedBy: t.addedBy } : {}
   };
 }
-function serializeTaskStatus(t, idleSince = null, isolation = null, queued = [], awaitingApproval = 0, mergeGate = [], checkpoint = "") {
+function serializeTaskStatus(t, idleSince = null, isolation = null, queued = [], awaitingApproval = 0, mergeGate = [], checkpoint = "", waitsForApproval = false) {
   return {
     id: t.id,
     status: t.status,
@@ -990,7 +899,8 @@ function serializeTaskStatus(t, idleSince = null, isolation = null, queued = [],
     ...canContinue(t) ? { continuable: true } : {},
     ...awaitingApproval > 0 ? { awaitingApproval } : {},
     ...mergeGate.length > 0 ? { mergeGate: [...mergeGate] } : {},
-    ...t.forcedPastGate?.length ? { forcedPastGate: [...t.forcedPastGate] } : {}
+    ...t.forcedPastGate?.length ? { forcedPastGate: [...t.forcedPastGate] } : {},
+    ...waitsForApproval ? { waitsForApproval: true } : {}
   };
 }
 function surfaceConversation(history) {
@@ -1045,10 +955,102 @@ function truncateCheckpointSummary(summary) {
   return firstLine.slice(0, CHECKPOINT_TRUNCATE_LENGTH - 1) + "\u2026";
 }
 
+// src/services/conflictFiles.ts
+function capConflictFiles(files, max = 5) {
+  return files.length <= max ? files.join(", ") : `${files.slice(0, max).join(", ")}, +${files.length - max} more`;
+}
+
+// src/services/researchStepSummary.ts
+function ellipsize(text2, max) {
+  const oneLine2 = text2.replace(/\s+/g, " ").trim();
+  return oneLine2.length > max ? `${oneLine2.slice(0, max)}\u2026` : oneLine2;
+}
+function summarizeToolCall(tool, argsJson, toolLabel) {
+  const display = toolLabel?.trim() || tool;
+  if (tool === "agent_tool") {
+    try {
+      const args = JSON.parse(argsJson);
+      const hint = args.path ?? args.file_path ?? args.filePath ?? args.pattern ?? args.query ?? args.url ?? args.command;
+      if (hint) return `${display} ${ellipsize(String(hint), 50)}`;
+    } catch {
+    }
+    return display;
+  }
+  if (tool === "spawn_research_agent") {
+    try {
+      const args = JSON.parse(argsJson);
+      const prompt = typeof args.prompt === "string" ? args.prompt : "";
+      const oneLine2 = prompt.replace(/\s+/g, " ").trim();
+      return `spawn: "${oneLine2.slice(0, 60)}${oneLine2.length > 60 ? "\u2026" : ""}"`;
+    } catch {
+      return "spawn_research_agent";
+    }
+  }
+  try {
+    const args = JSON.parse(argsJson);
+    if (tool === "find_symbol" && args.symbol) {
+      return `find_symbol ${args.symbol}${args.language ? ` [${args.language}]` : ""}`;
+    }
+    if (tool === "web_search" && args.query) {
+      return `web_search "${ellipsize(String(args.query), 50)}"`;
+    }
+    if (tool === "fetch" && args.url) {
+      return `fetch ${ellipsize(String(args.url), 60)}`;
+    }
+    if (tool === "glob" && args.pattern) {
+      return `glob ${ellipsize(String(args.pattern), 50)}`;
+    }
+    if (tool === "grep" && args.pattern) {
+      const mode = args.output_mode && args.output_mode !== "content" ? ` (${args.output_mode})` : "";
+      const scope = args.include ? ` in ${args.include}` : "";
+      return `grep ${ellipsize(String(args.pattern), 40)}${scope}${mode}`;
+    }
+    const path = args.filePath || args.file_path || args.path;
+    if (path) {
+      const basename = String(path).split("/").pop() || String(path);
+      return `${display} ${basename}`;
+    }
+    if (args.pattern) {
+      return `${display} ${args.pattern}`;
+    }
+    if (args.command) {
+      return `bash: ${String(args.command).slice(0, 40)}`;
+    }
+  } catch {
+  }
+  return display;
+}
+function classifyOutcome(success, output) {
+  if (!success) {
+    if (/^(Command|Fetch|Web search) refused:/.test(output) || /is not available\. You are a read-only research subagent/.test(output)) return "refused";
+    if (/not approved/i.test(output) || /^Access denied:/.test(output) || /needs user approval/i.test(output)) return "denied";
+    return "failure";
+  }
+  return "success";
+}
+
+// src/services/runSettingsText.ts
+var SUPERVISOR_LEVEL_LABEL = { off: "Off", watch: "Watch", act: "Act" };
+var plural = (n, one, many) => `${n} ${n === 1 ? one : many}`;
+var onOff = (value) => value ? "on" : "off";
+var supervisorSummary = (run) => `Supervisor: ${SUPERVISOR_LEVEL_LABEL[run.supervisorLevel]}, ${plural(run.supervisorRetryLimit, "retry", "retries")} per task, ${plural(run.wakeUpReadBudget, "read", "reads")} per wake-up`;
+var automergeSummary = (run) => `Merge automatically (gates, end of run): ${onOff(run.mergeAtGatesAutomatically)}`;
+var autorunSummary = (run) => `Autorun: ${onOff(run.autorun)}`;
+var ACT_RISK = "Tasks it adds run too, ops tasks included, which can act on real systems unattended.";
+var AUTORUN_RISK = "Plans start without review, ops tasks included, which can act on real systems unattended. In Full, the planner may also start tasks it adds later.";
+function parseSwitch(arg) {
+  return arg === "on" ? true : arg === "off" ? false : null;
+}
+function parseCount(arg, min) {
+  if (arg === void 0 || !/^\d+$/.test(arg)) return null;
+  const n = Number(arg);
+  return n >= min ? n : null;
+}
+
 // src/services/runView.ts
 var EMPTY_RUN = { tasks: [], runMerge: null, handoff: null, mergeResult: null };
-function split({ verdict, idleSince, isolation, checkpoint, queued, continuable, awaitingApproval, mergeGate, forcedPastGate, ...plan }) {
-  return { plan, status: { verdict, idleSince, isolation, checkpoint, queued, continuable, awaitingApproval, mergeGate, forcedPastGate } };
+function split({ verdict, idleSince, isolation, checkpoint, queued, continuable, awaitingApproval, mergeGate, forcedPastGate, waitsForApproval, ...plan }) {
+  return { plan, status: { verdict, idleSince, isolation, checkpoint, queued, continuable, awaitingApproval, mergeGate, forcedPastGate, waitsForApproval } };
 }
 function refresh(previous, tasks) {
   const held = /* @__PURE__ */ new Map();
@@ -1150,6 +1152,8 @@ function reduceRun(view, input) {
       const tasks = changeTask(view.tasks, input.taskId, (task) => input.type === "task_started" ? startTask(task) : patchTask(task, input.changes));
       return tasks === view.tasks ? view : { ...view, tasks };
     }
+    case "plan_edit_held":
+      return { ...view, heldEdit: input.held ?? void 0 };
     case "isolation_handoff":
       return { ...view, handoff: handoffOf(input) };
     case "isolation_merge":
@@ -1400,6 +1404,13 @@ function syncTranscript(view, { plan, turnId }) {
   }
   return next === view && latest === view.transcriptAt ? view : { ...next, transcriptAt: latest };
 }
+function reconcileApprovals(view, waiting) {
+  const ids = new Set(waiting.map((request) => request.id));
+  const answered2 = (block) => block.type === "approval" && block.status === "pending" && block.approvalId !== void 0 && !ids.has(block.approvalId);
+  const kept = view.blocks.some(answered2) ? { ...view, blocks: view.blocks.filter((block) => !answered2(block)) } : view;
+  const carded = new Set(kept.blocks.flatMap((block) => block.type === "approval" && block.approvalId ? [block.approvalId] : []));
+  return waiting.filter((request) => !carded.has(request.id)).reduce(requestApproval2, kept);
+}
 function reduceConversation(view, input) {
   switch (input.type) {
     case "local_entry":
@@ -1746,6 +1757,7 @@ function taskRowView(task, context = {}) {
     awaiting: awaitingLabel(task),
     resumes: resumeLabel(task, context.now),
     approvals: approvalLabel(task.awaitingApproval),
+    waitsForApproval: task.waitsForApproval && NOT_STARTED.has(task.status) ? WAITS_FOR_APPROVAL_LABEL : null,
     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,
@@ -1810,12 +1822,21 @@ export {
   runnerToolSubject,
   reduceTaskLog,
   replayTaskLog,
+  continuability,
+  canContinue,
+  blockingFailures,
+  serializeTask,
+  serializeTaskStatus,
+  surfaceTask,
+  surfacePlan,
+  surfacePlanState,
+  serializePlan,
+  executionSummary,
+  CHECKPOINT_TRUNCATE_LENGTH,
+  truncateCheckpointSummary,
   capConflictFiles,
   summarizeToolCall,
   classifyOutcome,
-  blockingFailures,
-  continuability,
-  canContinue,
   SUPERVISOR_LEVEL_LABEL,
   supervisorSummary,
   automergeSummary,
@@ -1824,17 +1845,10 @@ export {
   AUTORUN_RISK,
   parseSwitch,
   parseCount,
-  serializeTask,
-  serializeTaskStatus,
-  surfacePlan,
-  surfacePlanState,
-  serializePlan,
-  executionSummary,
-  CHECKPOINT_TRUNCATE_LENGTH,
-  truncateCheckpointSummary,
   EMPTY_RUN,
   reduceRun,
   EMPTY_CONVERSATION,
+  reconcileApprovals,
   reduceConversation,
   fromTranscript,
   EMPTY_HOLD,
@@ -1862,4 +1876,4 @@ export {
   pastGateConfirmation,
   newTaskFields
 };
-//# sourceMappingURL=chunk-UQGR3UCA.mjs.map
+//# sourceMappingURL=chunk-FH6M5QZG.mjs.map