@ordewell/core 0.7.0 → 0.7.2

package/dist/{chunk-LSGY7AIZ.mjs → chunk-AJ5KDO6V.mjs}

@@ -1,16 +1,25 @@
 import {
   PlanParseError,
   TASK_OPS_ENVELOPE_KEY,
-  addTaskToPlan,
-  createTask,
   escapeControlCharsInStrings,
   extractObjectsWithKey,
+  stripTrailingCommas
+} from "./chunk-H5O74L77.mjs";
+import {
+  addTaskToPlan,
+  createTask,
   flattenTasks,
+  inheritedOps,
+  opsFlag,
   removeTaskFromPlan,
   renumberTasks,
-  stripTrailingCommas,
   updateTaskInPlan
-} from "./chunk-YU4UKKKI.mjs";
+} from "./chunk-MZYZS7B3.mjs";
+import {
+  taskOrderLabel,
+  taskRef,
+  titledTaskRef
+} from "./chunk-V3JHS7AX.mjs";
 
 // src/models/Usage.ts
 function partedPromptUsage(parts) {
@@ -731,9 +740,25 @@ function endTurn(view, { reason }) {
   const closed = closeOpenBlocks({ ...view, working: false, lastTurnEnd: reason, streams: {} }, CUT[reason]);
   return reason === "interrupted" ? append(closed, (id) => settledMessage(id, "system", "Interrupted.")) : closed;
 }
-function queueMessage(view, { messageId, text: text2 }) {
-  if (view.queued.some((m) => m.id === messageId)) return view;
-  return { ...view, queued: [...view.queued, { id: messageId, text: text2 }] };
+function queueMessage(view, { messageId, text: text2, forced }) {
+  const listed = view.queued.find((m) => m.id === messageId);
+  if (forced) {
+    const rest = view.queued.filter((m) => m !== listed);
+    const at = rest.findIndex((m) => !m.forced);
+    const placed = at < 0 ? rest.length : at;
+    return { ...view, queued: [...rest.slice(0, placed), { id: messageId, text: text2, forced: true }, ...rest.slice(placed)] };
+  }
+  if (!listed) return { ...view, queued: [...view.queued, { id: messageId, text: text2 }] };
+  if (!listed.handedOver) return view;
+  return { ...view, queued: view.queued.map((m) => m === listed ? { id: m.id, text: m.text } : m) };
+}
+function handOver(view, { messageId }) {
+  const listed = view.queued.find((m) => m.id === messageId);
+  if (!listed || listed.handedOver) return view;
+  return { ...view, queued: view.queued.map((m) => m === listed ? { ...m, handedOver: true } : m) };
+}
+function deliverMidTurn(view, event) {
+  return appendOutput(unqueueMessage(view, event), null, (id) => settledMessage(id, "user", event.text));
 }
 function unqueueMessage(view, { messageId }) {
   const queued = view.queued.filter((m) => m.id !== messageId);
@@ -767,6 +792,12 @@ function reduceTaskLog(view, event) {
       return queueMessage(view, event);
     case "message_removed":
       return unqueueMessage(view, event);
+    case "message_handed_over":
+      return handOver(view, event);
+    case "message_delivered":
+      return deliverMidTurn(view, event);
+    case "message_undelivered":
+      return append(unqueueMessage(view, event), (id) => settledMessage(id, "system", `${event.text} \xB7 not delivered`));
     case "error":
       return appendOutput(view, null, (id) => settledMessage(id, "error", event.message));
     case "approval_requested":
@@ -893,6 +924,37 @@ function coerceAssignments(tasks, perRunnerAllowlist, allowedRunners, modelsByRu
   });
 }
 
+// src/taskRow/status.ts
+var isTaskRunning = (task) => task.status === "in_progress" || task.status === "running";
+var NOT_STARTED = /* @__PURE__ */ new Set(["pending", "approved", "blocked"]);
+function taskStatusKind(task) {
+  switch (task.status) {
+    case "completed":
+      return "done";
+    case "failed":
+      return "failed";
+    case "blocked":
+      return "blocked";
+    case "awaiting_user":
+      return "awaiting";
+  }
+  if (!isTaskRunning(task)) return "todo";
+  return task.status === "in_progress" && task.idleSince ? "quiet" : "running";
+}
+var AWAITING_LABELS = {
+  input: "Waiting for your input",
+  checkpoint: "Checkpoint",
+  conflict: "Merge conflict",
+  "files-changed": "Changed tracked files"
+};
+function awaitingLabel(task) {
+  return task.status === "awaiting_user" && task.awaitingReason ? AWAITING_LABELS[task.awaitingReason] : null;
+}
+function approvalLabel(count) {
+  if (!count) return null;
+  return count > 1 ? `Waiting for approval (${count})` : "Waiting for approval";
+}
+
 // src/services/TaskOps.ts
 import { v4 as uuidv4 } from "uuid";
 
@@ -934,7 +996,6 @@ function typeCoherenceCheck(target, changes) {
   }
   return { ok: true, clear: target.userSteps && target.userSteps.length > 0 ? ["userSteps"] : [] };
 }
-var NOT_STARTED = /* @__PURE__ */ new Set(["pending", "approved", "blocked"]);
 function opsCheck(tasks, target, changes) {
   if (!("ops" in changes) || !!changes.ops === !!target.ops) return null;
   if (!NOT_STARTED.has(target.status)) {
@@ -1099,7 +1160,7 @@ function updatableChanges(raw) {
   for (const key of UPDATABLE_FIELDS) {
     if (raw && key in raw) changes[key] = raw[key];
   }
-  if ("ops" in changes) changes.ops = changes.ops === true ? true : void 0;
+  if ("ops" in changes) changes.ops = opsFlag(changes.ops);
   return changes;
 }
 function findInTasks(tasks, id) {
@@ -1269,41 +1330,38 @@ function applyTaskOps(currentTasks, ops, runners, catalog) {
     }
     return { ids, bad };
   };
+  const prepareEdit = (op, opIndex, label, audience, refuseRunning = false) => {
+    const ref = resolveRef(op.taskId, originalFlatAll, flattenTasks(tasks), handleOwner, handleId, opIndex);
+    if ("error" in ref) return { error: `${label}: ${ref.error}` };
+    const target = findInTasks(tasks, ref.id);
+    if (!target) return { error: `${label}: task "${op.taskId}" no longer exists in this batch (removed, merged, or split by an earlier op)` };
+    if (refuseRunning && target.status === "in_progress") return { error: `${label}: "${target.title}" is running and cannot be re-armed` };
+    const changes = updatableChanges(op.changes);
+    if (changes.assignedRunner && !runners.includes(changes.assignedRunner)) {
+      return { error: `${label}: runner "${changes.assignedRunner}" is not in this plan's runner set [${runners.join(", ")}]` };
+    }
+    const changesForCheck = { ...changes };
+    delete changesForCheck.dependencies;
+    const check = validateTaskEdit(audience, flattenTasks(tasks), target.id, changesForCheck, catalog);
+    if (!check.ok) return { error: `${label}: ${check.error}` };
+    for (const field of check.clear ?? []) changes[field] = void 0;
+    if ("dependencies" in changes) {
+      const { ids, bad } = resolveDeps(changes.dependencies, opIndex);
+      if (bad.length) return { error: `${label}: unknown dependencies: ${bad.join(", ")}` };
+      changes.dependencies = ids.filter((id) => id !== target.id);
+    }
+    return { target, changes, check };
+  };
   for (const [i, op] of ops.entries()) {
     const label = `op ${i + 1} (${op.op})`;
     switch (op.op) {
       case "update": {
-        const ref = resolveRef(op.taskId, originalFlatAll, flattenTasks(tasks), handleOwner, handleId, i);
-        if ("error" in ref) {
-          errors.push(`${label}: ${ref.error}`);
-          break;
-        }
-        const target = findInTasks(tasks, ref.id);
-        if (!target) {
-          errors.push(`${label}: task "${op.taskId}" no longer exists in this batch (removed, merged, or split by an earlier op)`);
-          break;
-        }
-        const changes = updatableChanges(op.changes);
-        if (changes.assignedRunner && !runners.includes(changes.assignedRunner)) {
-          errors.push(`${label}: runner "${changes.assignedRunner}" is not in this plan's runner set [${runners.join(", ")}]`);
-          break;
-        }
-        const changesForCheck = { ...changes };
-        delete changesForCheck.dependencies;
-        const check = validateTaskEdit("planner", flattenTasks(tasks), target.id, changesForCheck, catalog);
-        if (!check.ok) {
-          errors.push(`${label}: ${check.error}`);
+        const prep = prepareEdit(op, i, label, "planner");
+        if ("error" in prep) {
+          errors.push(prep.error);
           break;
         }
-        for (const field of check.clear ?? []) changes[field] = void 0;
-        if ("dependencies" in changes) {
-          const { ids, bad } = resolveDeps(changes.dependencies, i);
-          if (bad.length) {
-            errors.push(`${label}: unknown dependencies: ${bad.join(", ")}`);
-            break;
-          }
-          changes.dependencies = ids.filter((id) => id !== target.id);
-        }
+        const { target, changes, check } = prep;
         if (Object.keys(changes).length === 0) {
           errors.push(`${label}: no valid changes provided`);
           break;
@@ -1400,7 +1458,7 @@ function applyTaskOps(currentTasks, ops, runners, catalog) {
           errors.push(`${label}: unknown task in merge list (already removed, merged, or split by an earlier op)`);
           break;
         }
-        const toMerge = resolved.map((t) => t).sort((a, b) => a.order - b.order);
+        const toMerge = [...new Map(resolved.map((t) => [t.id, t])).values()].sort((a, b) => a.order - b.order);
         if (toMerge.length < 2) {
           errors.push(`${label}: merge needs at least two tasks`);
           break;
@@ -1435,7 +1493,7 @@ function applyTaskOps(currentTasks, ops, runners, catalog) {
           taskMode: spec.taskMode ?? toMerge[0].taskMode,
           autonomy: spec.autonomy ?? toMerge.find((t) => t.autonomy)?.autonomy,
           sliceType: spec.sliceType ?? toMerge.find((t) => t.sliceType)?.sliceType,
-          ops: spec.ops ?? toMerge.every((t) => t.ops),
+          ops: inheritedOps(toMerge, spec.ops),
           userStoriesCovered: spec.userStoriesCovered ?? (toMerge.flatMap((t) => t.userStoriesCovered ?? []).length ? [...new Set(toMerge.flatMap((t) => t.userStoriesCovered ?? []))] : void 0)
         });
         const mergedId = mergedTask.id;
@@ -1516,7 +1574,7 @@ function applyTaskOps(currentTasks, ops, runners, catalog) {
             taskMode: spec.taskMode ?? target.taskMode,
             autonomy: spec.autonomy ?? target.autonomy,
             sliceType: spec.sliceType ?? target.sliceType,
-            ops: spec.ops ?? target.ops,
+            ops: inheritedOps([target], spec.ops),
             userStoriesCovered: spec.userStoriesCovered ?? target.userStoriesCovered
           });
           newTasks.push(nt);
@@ -1538,41 +1596,12 @@ function applyTaskOps(currentTasks, ops, runners, catalog) {
         break;
       }
       case "rearm": {
-        const ref = resolveRef(op.taskId, originalFlatAll, flattenTasks(tasks), handleOwner, handleId, i);
-        if ("error" in ref) {
-          errors.push(`${label}: ${ref.error}`);
+        const prep = prepareEdit(op, i, label, "direct", true);
+        if ("error" in prep) {
+          errors.push(prep.error);
           break;
         }
-        const target = findInTasks(tasks, ref.id);
-        if (!target) {
-          errors.push(`${label}: task "${op.taskId}" no longer exists in this batch (removed, merged, or split by an earlier op)`);
-          break;
-        }
-        if (target.status === "in_progress") {
-          errors.push(`${label}: "${target.title}" is running and cannot be re-armed`);
-          break;
-        }
-        const changes = updatableChanges(op.changes);
-        if (changes.assignedRunner && !runners.includes(changes.assignedRunner)) {
-          errors.push(`${label}: runner "${changes.assignedRunner}" is not in this plan's runner set [${runners.join(", ")}]`);
-          break;
-        }
-        const changesForCheck = { ...changes };
-        delete changesForCheck.dependencies;
-        const check = validateTaskEdit("direct", flattenTasks(tasks), target.id, changesForCheck, catalog);
-        if (!check.ok) {
-          errors.push(`${label}: ${check.error}`);
-          break;
-        }
-        for (const field of check.clear ?? []) changes[field] = void 0;
-        if ("dependencies" in changes) {
-          const { ids, bad } = resolveDeps(changes.dependencies, i);
-          if (bad.length) {
-            errors.push(`${label}: unknown dependencies: ${bad.join(", ")}`);
-            break;
-          }
-          changes.dependencies = ids.filter((id) => id !== target.id);
-        }
+        const { target, changes, check } = prep;
         tasks = updateTaskInPlan(tasks, target.id, { ...changes, status: "pending", verdict: void 0, outputSummary: void 0, awaitingReason: void 0 });
         for (const dep of flattenTasks(tasks)) {
           if (dep.status === "blocked" && dep.dependencies.includes(target.id)) {
@@ -1720,7 +1749,7 @@ function serializeTask(t) {
     ...t.ops ? { ops: true } : {}
   };
 }
-function serializeTaskStatus(t, idleSince = null, isolation = null, queued = [], awaitingApproval = 0, mergeGate = []) {
+function serializeTaskStatus(t, idleSince = null, isolation = null, queued = [], awaitingApproval = 0, mergeGate = [], checkpoint = "") {
   return {
     id: t.id,
     status: t.status,
@@ -1729,6 +1758,7 @@ function serializeTaskStatus(t, idleSince = null, isolation = null, queued = [],
     ...isolation ? { isolation } : {},
     ...t.transport ? { transport: t.transport.fallback ? { kind: t.transport.kind, fallback: t.transport.fallback } : { kind: t.transport.kind } } : {},
     ...t.status === "awaiting_user" && t.awaitingReason ? { awaitingReason: t.awaitingReason } : {},
+    ...t.status === "awaiting_user" && t.awaitingReason === "checkpoint" && checkpoint ? { checkpoint } : {},
     ...queued.length > 0 ? { queued: queued.map((m) => ({ ...m })) } : {},
     ...canContinue(t) ? { continuable: true } : {},
     ...awaitingApproval > 0 ? { awaitingApproval } : {},
@@ -2123,6 +2153,103 @@ function taskStartedNotice(title, runner) {
   return runner ? `Started "${title}" \xB7 ${runner}` : `Started "${title}"`;
 }
 
+// src/taskRow/actions.ts
+var UNSTARTED_AI = (t) => t.type === "ai" && NOT_STARTED.has(t.status);
+var QUEUED = (t) => t.status === "pending" || t.status === "approved";
+var TASK_RULES = [
+  ["cancel", (t) => t.status === "in_progress"],
+  ["skip", (t) => t.status === "blocked"],
+  ["force-start", UNSTARTED_AI],
+  // A manual task has no runner to report it done, so it can always be marked.
+  ["complete", (t) => t.status === "awaiting_user" || t.type === "user"],
+  ["uncomplete", (t) => t.status === "completed"]
+];
+var SUBTASK_RULES = [
+  ["cancel", (t) => t.status === "in_progress"],
+  ["complete", (t) => t.status === "in_progress" && t.type === "ai"],
+  ["force-start", (t) => t.type === "ai" && QUEUED(t)],
+  ["skip", QUEUED],
+  ["complete", (t) => t.status === "awaiting_user"],
+  ["uncomplete", (t) => t.status === "completed"]
+];
+function taskRowActions(task, placement = "task") {
+  const rules = placement === "subtask" ? SUBTASK_RULES : TASK_RULES;
+  return rules.filter(([, applies]) => applies(task)).map(([action]) => action);
+}
+function markAction(task) {
+  return task.status === "completed" ? "uncomplete" : "complete";
+}
+function markRequestFor(action) {
+  if (action === "complete" || action === "skip") return "complete";
+  if (action === "uncomplete") return "uncomplete";
+  return null;
+}
+function opsEditable(task) {
+  return UNSTARTED_AI(task);
+}
+
+// src/taskRow/view.ts
+var refsOf = (ids, orderOf) => ids.map((id) => {
+  const order = orderOf?.get(id);
+  return order === void 0 ? id : taskRef({ order });
+});
+var namedRepo = (repo) => repo && repo !== "." ? repo : null;
+var namedRepos = (repos) => (repos ?? []).filter((r) => r !== ".");
+var filesOf = (files) => files?.length ? capConflictFiles(files) : null;
+function taskRowView(task, context = {}) {
+  const parent = context.parent ?? void 0;
+  const isolation = task.isolation && task.isolation.state !== "none" ? task.isolation : null;
+  return {
+    orderLabel: taskOrderLabel(task, parent),
+    kind: task.type === "user" ? "user" : task.ops ? "ops" : "ai",
+    status: taskStatusKind(task),
+    running: isTaskRunning(task),
+    awaiting: awaitingLabel(task),
+    approvals: approvalLabel(task.awaitingApproval),
+    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,
+    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.orderOf) : null,
+    opsChangedFiles: task.status === "awaiting_user" && task.awaitingReason === "files-changed",
+    forcedPastGate: task.forcedPastGate?.length ? task.forcedPastGate : null,
+    dependencies: refsOf(task.dependencies, context.orderOf),
+    actions: taskRowActions(task, context.placement ?? (parent ? "subtask" : "task")),
+    mark: markAction(task),
+    opsEditable: opsEditable(task)
+  };
+}
+
+// src/taskRow/texts.ts
+function findNamed(tasks, id) {
+  for (const task of tasks) {
+    if (task.id === id) return task;
+    const nested = findNamed(task.subtasks ?? [], id);
+    if (nested) return nested;
+  }
+  return void 0;
+}
+function titledRefs(ids, tasks) {
+  return ids.map((id) => {
+    const task = findNamed(tasks, id);
+    return task ? titledTaskRef(task) : id;
+  });
+}
+function dependentsNotice(dependents) {
+  if (dependents.length === 0) return null;
+  const subject = dependents.length === 1 ? "1 task depends" : `${dependents.length} tasks depend`;
+  return `${subject} on it and will lose that dependency: ${dependents.map((t) => titledTaskRef(t)).join(", ")}.`;
+}
+function pastGateConfirmation(unmerged, subject = "This task") {
+  return `${subject} waits for Merge all: the work of ${unmerged.join(", ")} is not merged into your branch yet, so it would act without it. Starting it now is kept on the task.`;
+}
+function newTaskFields(title, prompt) {
+  const name = title.trim();
+  if (!name) return null;
+  return { title: name, description: name, prompt: prompt?.trim() ? prompt : name, type: "ai" };
+}
+
 export {
   partedPromptUsage,
   addUsage,
@@ -2150,6 +2277,11 @@ export {
   filterModelsForPrompt,
   clampThinkingEffort,
   coerceAssignments,
+  isTaskRunning,
+  NOT_STARTED,
+  taskStatusKind,
+  awaitingLabel,
+  approvalLabel,
   validateTaskEdit,
   taskOpsProtocol,
   textHasTaskOps,
@@ -2185,6 +2317,16 @@ export {
   followTurn,
   stopTurn,
   hasHiddenDetail,
-  taskStartedNotice
+  taskStartedNotice,
+  taskRowActions,
+  markAction,
+  markRequestFor,
+  opsEditable,
+  namedRepos,
+  taskRowView,
+  titledRefs,
+  dependentsNotice,
+  pastGateConfirmation,
+  newTaskFields
 };
-//# sourceMappingURL=chunk-LSGY7AIZ.mjs.map
+//# sourceMappingURL=chunk-AJ5KDO6V.mjs.map