@ordewell/core 0.10.2 → 0.10.4

package/dist/plan-utils.d.mts

@@ -1,6 +1,6 @@
-export { c as ApprovalBlock, d as ApprovalStatus, B as BlockingSubject, C as CHECKPOINT_TRUNCATE_LENGTH, f as CommandBlock, g as CommandStatus, h as CompactionBlock, i as ConversationInput, j as ConversationView, D as DiffRow, k as DiffRowKind, l as DiffStat, m as DisplayBlock, E as EMPTY_CONVERSATION, n as EMPTY_HOLD, o as EMPTY_RUN, p as EMPTY_TASK_LOG, G as GatedConversation, w as LocalEntry, M as MarkdownToken, x as MessageBlock, y as MessageRole, N as NOT_STARTED, z as NO_TURN, F as NewTaskFields, J as OutputPreview, P as PlanBlock, K as PlanMarkerStatus, T as PromptHold, V as RefTask, a0 as RunnerLoadedBlock, a1 as SUPERVISOR_LEVEL_LABEL, ab as SkillLoadBlock, ad as SkillToken, ae as SubagentBlock, af as SubagentChild, ag as SubagentStatus, ak as TakenPrompt, ao as TaskLogView, au as TaskRef, av as TaskRowAction, aw as TaskRowContext, ax as TaskRowIsolation, ay as TaskRowKind, az as TaskRowPlacement, aA as TaskRowSubject, aB as TaskRowUsage, aC as TaskRowView, aD as TaskStatusKind, aE as ThinkingDisplayBlock, aF as ToolBlock, aG as ToolHeadline, aH as ToolStatus, aI as TurnGate, aJ as UsageBlock, aL as aheadOfDraft, aN as approvalLabel, aQ as awaitingLabel, aR as blockedByLabel, aS as blockingFailures, aT as canMergeTasks, aU as canSetDependencies, aV as canSplitTask, aW as capConflictFiles, aZ as dependencyCandidates, a_ as dependentsNotice, a$ as dependentsOf, b0 as diffRows, b1 as diffStat, b2 as diffSummary, b4 as drainNext, b6 as followTurn, b7 as fromTranscript, b9 as hasHiddenDetail, ba as holdPrompt, bb as isTaskRunning, bc as loadedSkillTokens, bd as markAction, be as markRequestFor, bf as markdownHtml, bg as markdownTokens, bh as namedRepos, bi as newTaskFields, bj as opsEditable, bk as outputLines, bl as outputPreview, bm as parseCount, bp as pastGateConfirmation, bq as reduceConversation, bs as reduceTaskLog, bt as replayTaskLog, bu as resolveTaskRef, bv as resumeLabel, bw as resumeTime, by as runnerToolSubject, bC as skillTokens, bD as skippedLabel, bE as stopTurn, bF as summarizeToolCall, bJ as takeAt, bL as taskOrderLabel, bM as taskRef, bN as taskRefOf, bO as taskRowActions, bP as taskRowView, bQ as taskStartedNotice, bR as taskStatusKind, bT as titledRefs, bU as titledTaskRef, bV as titledTaskRefOf, bX as toolHeadline, bZ as truncateCheckpointSummary, b_ as unsendAll, b$ as unsendLatest } from './plan-utils-DL7yOuJs.mjs';
-export { A as AttemptUsage, D as DEFAULT_RUNNERS, M as ModelUsage, N as PlanUsage, O as PlannerUsage, ap as UsageLine, aq as UsageRecord, ar as UsageTotals, au as addAttemptUsage, av as addModelUsage, aw as addPlannerUsage, ax as addUsage, ay as addUsageTotals, aC as endAttemptUsage, aG as isMeasured, aK as partedPromptUsage, aL as pausedOnLimit, aM as planUsage, aN as plannerContextFill, aP as startAttemptUsage, aQ as usageLine } from './Task-AfA1m4qW.mjs';
-import './ModeResolver-CjQ7zqTN.mjs';
-import './IRunner---PfQVdc.mjs';
+export { c as ApprovalBlock, d as ApprovalStatus, B as BlockingSubject, C as CHECKPOINT_TRUNCATE_LENGTH, f as CommandBlock, g as CommandStatus, h as CompactionBlock, i as ConversationInput, j as ConversationView, D as DiffRow, k as DiffRowKind, l as DiffStat, m as DisplayBlock, E as EMPTY_CONVERSATION, n as EMPTY_HOLD, o as EMPTY_RUN, p as EMPTY_TASK_LOG, G as GatedConversation, x as LocalEntry, M as MarkdownToken, y as MessageBlock, z as MessageRole, N as NOT_STARTED, F as NO_TURN, J as NewTaskFields, P as OutputPreview, Q as PlanBlock, R as PlanMarkerStatus, V as PromptHold, X as RefTask, a2 as RunnerLoadedBlock, a4 as SUPERVISOR_LEVEL_LABEL, ae as SkillLoadBlock, ag as SkillToken, ai as SubagentBlock, aj as SubagentChild, ak as SubagentStatus, ao as TakenPrompt, as as TaskLogView, ay as TaskRef, az as TaskRowAction, aA as TaskRowContext, aB as TaskRowIsolation, aC as TaskRowKind, aD as TaskRowPlacement, aE as TaskRowSubject, aF as TaskRowUsage, aG as TaskRowView, aH as TaskStatusKind, aI as ThinkingDisplayBlock, aJ as ToolBlock, aK as ToolHeadline, aL as ToolStatus, aM as TurnGate, aN as UsageBlock, aP as WAITS_FOR_APPROVAL_LABEL, aQ as aheadOfDraft, aS as approvalLabel, aV as awaitingLabel, aW as blockedByLabel, aX as blockingFailures, aY as canMergeTasks, aZ as canSetDependencies, a_ as canSplitTask, a$ as capConflictFiles, b2 as dependencyCandidates, b3 as dependentsNotice, b4 as dependentsOf, b5 as diffRows, b6 as diffStat, b7 as diffSummary, b9 as drainNext, bb as followTurn, bc as fromTranscript, be as hasHiddenDetail, bf as holdPrompt, bg as isTaskRunning, bh as loadedSkillTokens, bi as markAction, bj as markRequestFor, bk as markdownHtml, bl as markdownTokens, bm as namedRepos, bn as newTaskFields, bo as opsEditable, bp as outputLines, bq as outputPreview, br as parseCount, bu as pastGateConfirmation, bv as reconcileApprovals, bw as reduceConversation, by as reduceTaskLog, bz as replayTaskLog, bA as resolveTaskRef, bB as resumeLabel, bC as resumeTime, bE as runnerToolSubject, bI as skillTokens, bJ as skippedLabel, bK as stopTurn, bL as summarizeToolCall, bP as takeAt, bR as taskOrderLabel, bS as taskRef, bT as taskRefOf, bU as taskRowActions, bV as taskRowView, bW as taskStartedNotice, bX as taskStatusKind, bZ as titledRefs, b_ as titledTaskRef, b$ as titledTaskRefOf, c1 as toolHeadline, c3 as truncateCheckpointSummary, c4 as unsendAll, c5 as unsendLatest } from './plan-utils-CtKceSsQ.mjs';
+export { a as AttemptUsage, D as DEFAULT_RUNNERS, M as ModelUsage, O as PlanUsage, Q as PlannerUsage, aq as UsageLine, ar as UsageRecord, as as UsageTotals, av as addAttemptUsage, aw as addModelUsage, ax as addPlannerUsage, ay as addUsage, az as addUsageTotals, aD as endAttemptUsage, aH as isMeasured, aL as partedPromptUsage, aM as pausedOnLimit, aN as planUsage, aO as plannerContextFill, aQ as startAttemptUsage, aR as usageLine } from './Task-DZs9eKgg.mjs';
+import './ModeResolver-wnTFsDnF.mjs';
+import './IRunner-NtTHQgLR.mjs';
 import 'child_process';
 import 'zod/v4';

package/dist/plan-utils.d.ts

@@ -1,6 +1,6 @@
-export { c as ApprovalBlock, d as ApprovalStatus, B as BlockingSubject, C as CHECKPOINT_TRUNCATE_LENGTH, f as CommandBlock, g as CommandStatus, h as CompactionBlock, i as ConversationInput, j as ConversationView, D as DiffRow, k as DiffRowKind, l as DiffStat, m as DisplayBlock, E as EMPTY_CONVERSATION, n as EMPTY_HOLD, o as EMPTY_RUN, p as EMPTY_TASK_LOG, G as GatedConversation, w as LocalEntry, M as MarkdownToken, x as MessageBlock, y as MessageRole, N as NOT_STARTED, z as NO_TURN, F as NewTaskFields, J as OutputPreview, P as PlanBlock, K as PlanMarkerStatus, T as PromptHold, V as RefTask, a0 as RunnerLoadedBlock, a1 as SUPERVISOR_LEVEL_LABEL, ab as SkillLoadBlock, ad as SkillToken, ae as SubagentBlock, af as SubagentChild, ag as SubagentStatus, ak as TakenPrompt, ao as TaskLogView, au as TaskRef, av as TaskRowAction, aw as TaskRowContext, ax as TaskRowIsolation, ay as TaskRowKind, az as TaskRowPlacement, aA as TaskRowSubject, aB as TaskRowUsage, aC as TaskRowView, aD as TaskStatusKind, aE as ThinkingDisplayBlock, aF as ToolBlock, aG as ToolHeadline, aH as ToolStatus, aI as TurnGate, aJ as UsageBlock, aL as aheadOfDraft, aN as approvalLabel, aQ as awaitingLabel, aR as blockedByLabel, aS as blockingFailures, aT as canMergeTasks, aU as canSetDependencies, aV as canSplitTask, aW as capConflictFiles, aZ as dependencyCandidates, a_ as dependentsNotice, a$ as dependentsOf, b0 as diffRows, b1 as diffStat, b2 as diffSummary, b4 as drainNext, b6 as followTurn, b7 as fromTranscript, b9 as hasHiddenDetail, ba as holdPrompt, bb as isTaskRunning, bc as loadedSkillTokens, bd as markAction, be as markRequestFor, bf as markdownHtml, bg as markdownTokens, bh as namedRepos, bi as newTaskFields, bj as opsEditable, bk as outputLines, bl as outputPreview, bm as parseCount, bp as pastGateConfirmation, bq as reduceConversation, bs as reduceTaskLog, bt as replayTaskLog, bu as resolveTaskRef, bv as resumeLabel, bw as resumeTime, by as runnerToolSubject, bC as skillTokens, bD as skippedLabel, bE as stopTurn, bF as summarizeToolCall, bJ as takeAt, bL as taskOrderLabel, bM as taskRef, bN as taskRefOf, bO as taskRowActions, bP as taskRowView, bQ as taskStartedNotice, bR as taskStatusKind, bT as titledRefs, bU as titledTaskRef, bV as titledTaskRefOf, bX as toolHeadline, bZ as truncateCheckpointSummary, b_ as unsendAll, b$ as unsendLatest } from './plan-utils-gpeqV-Lp.js';
-export { A as AttemptUsage, D as DEFAULT_RUNNERS, M as ModelUsage, N as PlanUsage, O as PlannerUsage, ap as UsageLine, aq as UsageRecord, ar as UsageTotals, au as addAttemptUsage, av as addModelUsage, aw as addPlannerUsage, ax as addUsage, ay as addUsageTotals, aC as endAttemptUsage, aG as isMeasured, aK as partedPromptUsage, aL as pausedOnLimit, aM as planUsage, aN as plannerContextFill, aP as startAttemptUsage, aQ as usageLine } from './Task-AfA1m4qW.js';
-import './ModeResolver-DrMU-5lw.js';
-import './IRunner-WwL-Bjqq.js';
+export { c as ApprovalBlock, d as ApprovalStatus, B as BlockingSubject, C as CHECKPOINT_TRUNCATE_LENGTH, f as CommandBlock, g as CommandStatus, h as CompactionBlock, i as ConversationInput, j as ConversationView, D as DiffRow, k as DiffRowKind, l as DiffStat, m as DisplayBlock, E as EMPTY_CONVERSATION, n as EMPTY_HOLD, o as EMPTY_RUN, p as EMPTY_TASK_LOG, G as GatedConversation, x as LocalEntry, M as MarkdownToken, y as MessageBlock, z as MessageRole, N as NOT_STARTED, F as NO_TURN, J as NewTaskFields, P as OutputPreview, Q as PlanBlock, R as PlanMarkerStatus, V as PromptHold, X as RefTask, a2 as RunnerLoadedBlock, a4 as SUPERVISOR_LEVEL_LABEL, ae as SkillLoadBlock, ag as SkillToken, ai as SubagentBlock, aj as SubagentChild, ak as SubagentStatus, ao as TakenPrompt, as as TaskLogView, ay as TaskRef, az as TaskRowAction, aA as TaskRowContext, aB as TaskRowIsolation, aC as TaskRowKind, aD as TaskRowPlacement, aE as TaskRowSubject, aF as TaskRowUsage, aG as TaskRowView, aH as TaskStatusKind, aI as ThinkingDisplayBlock, aJ as ToolBlock, aK as ToolHeadline, aL as ToolStatus, aM as TurnGate, aN as UsageBlock, aP as WAITS_FOR_APPROVAL_LABEL, aQ as aheadOfDraft, aS as approvalLabel, aV as awaitingLabel, aW as blockedByLabel, aX as blockingFailures, aY as canMergeTasks, aZ as canSetDependencies, a_ as canSplitTask, a$ as capConflictFiles, b2 as dependencyCandidates, b3 as dependentsNotice, b4 as dependentsOf, b5 as diffRows, b6 as diffStat, b7 as diffSummary, b9 as drainNext, bb as followTurn, bc as fromTranscript, be as hasHiddenDetail, bf as holdPrompt, bg as isTaskRunning, bh as loadedSkillTokens, bi as markAction, bj as markRequestFor, bk as markdownHtml, bl as markdownTokens, bm as namedRepos, bn as newTaskFields, bo as opsEditable, bp as outputLines, bq as outputPreview, br as parseCount, bu as pastGateConfirmation, bv as reconcileApprovals, bw as reduceConversation, by as reduceTaskLog, bz as replayTaskLog, bA as resolveTaskRef, bB as resumeLabel, bC as resumeTime, bE as runnerToolSubject, bI as skillTokens, bJ as skippedLabel, bK as stopTurn, bL as summarizeToolCall, bP as takeAt, bR as taskOrderLabel, bS as taskRef, bT as taskRefOf, bU as taskRowActions, bV as taskRowView, bW as taskStartedNotice, bX as taskStatusKind, bZ as titledRefs, b_ as titledTaskRef, b$ as titledTaskRefOf, c1 as toolHeadline, c3 as truncateCheckpointSummary, c4 as unsendAll, c5 as unsendLatest } from './plan-utils-POIz5d8z.js';
+export { a as AttemptUsage, D as DEFAULT_RUNNERS, M as ModelUsage, O as PlanUsage, Q as PlannerUsage, aq as UsageLine, ar as UsageRecord, as as UsageTotals, av as addAttemptUsage, aw as addModelUsage, ax as addPlannerUsage, ay as addUsage, az as addUsageTotals, aD as endAttemptUsage, aH as isMeasured, aL as partedPromptUsage, aM as pausedOnLimit, aN as planUsage, aO as plannerContextFill, aQ as startAttemptUsage, aR as usageLine } from './Task-DZs9eKgg.js';
+import './ModeResolver-Dy3Ef6p-.js';
+import './IRunner-D_UkkMbJ.js';
 import 'child_process';
 import 'zod/v4';

package/dist/plan-utils.js

@@ -39,6 +39,7 @@ __export(plan_utils_exports, {
   NOT_STARTED: () => NOT_STARTED,
   NO_TURN: () => NO_TURN,
   SUPERVISOR_LEVEL_LABEL: () => SUPERVISOR_LEVEL_LABEL,
+  WAITS_FOR_APPROVAL_LABEL: () => WAITS_FOR_APPROVAL_LABEL,
   addAttemptUsage: () => addAttemptUsage,
   addModelUsage: () => addModelUsage,
   addPlannerUsage: () => addPlannerUsage,
@@ -83,6 +84,7 @@ __export(plan_utils_exports, {
   pausedOnLimit: () => pausedOnLimit,
   planUsage: () => planUsage,
   plannerContextFill: () => plannerContextFill,
+  reconcileApprovals: () => reconcileApprovals,
   reduceConversation: () => reduceConversation,
   reduceTaskLog: () => reduceTaskLog,
   replayTaskLog: () => replayTaskLog,
@@ -190,6 +192,9 @@ function pausedOnLimit(task) {
   return task.status === "awaiting_user" && task.awaitingReason === "usage-limit";
 }
 
+// src/services/TaskOps.ts
+var import_uuid3 = require("uuid");
+
 // src/taskRow/status.ts
 var isTaskRunning = (task) => task.status === "in_progress" || task.status === "running";
 var NOT_STARTED = /* @__PURE__ */ new Set(["pending", "approved", "blocked"]);
@@ -225,6 +230,7 @@ function blockedByLabel(refs) {
 function skippedLabel(reason) {
   return reason ? `Skipped: ${reason}` : "Skipped";
 }
+var WAITS_FOR_APPROVAL_LABEL = "Waiting for your approval to start";
 function approvalLabel(count) {
   if (!count) return null;
   return count > 1 ? `Waiting for approval (${count})` : "Waiting for approval";
@@ -1115,6 +1121,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(requestApproval, kept);
+}
 function reduceConversation(view, input) {
   switch (input.type) {
     case "local_entry":
@@ -1763,6 +1776,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,
@@ -1812,6 +1826,7 @@ var EMPTY_RUN = { tasks: [], runMerge: null, handoff: null, mergeResult: null };
   NOT_STARTED,
   NO_TURN,
   SUPERVISOR_LEVEL_LABEL,
+  WAITS_FOR_APPROVAL_LABEL,
   addAttemptUsage,
   addModelUsage,
   addPlannerUsage,
@@ -1856,6 +1871,7 @@ var EMPTY_RUN = { tasks: [], runMerge: null, handoff: null, mergeResult: null };
   pausedOnLimit,
   planUsage,
   plannerContextFill,
+  reconcileApprovals,
   reduceConversation,
   reduceTaskLog,
   replayTaskLog,