@ordewell/core 0.10.3 → 0.10.5

package/dist/plan-utils.js

@@ -47,6 +47,8 @@ __export(plan_utils_exports, {
   addUsageTotals: () => addUsageTotals,
   aheadOfDraft: () => aheadOfDraft,
   approvalLabel: () => approvalLabel,
+  assignmentIssue: () => assignmentIssue,
+  assignmentIssueText: () => assignmentIssueText,
   awaitingLabel: () => awaitingLabel,
   blockedByLabel: () => blockedByLabel,
   blockingFailures: () => blockingFailures,
@@ -54,6 +56,7 @@ __export(plan_utils_exports, {
   canSetDependencies: () => canSetDependencies,
   canSplitTask: () => canSplitTask,
   capConflictFiles: () => capConflictFiles,
+  countedSessionCost: () => countedSessionCost,
   dependencyCandidates: () => dependencyCandidates,
   dependentsNotice: () => dependentsNotice,
   dependentsOf: () => dependentsOf,
@@ -91,6 +94,7 @@ __export(plan_utils_exports, {
   resolveTaskRef: () => resolveTaskRef,
   resumeLabel: () => resumeLabel,
   resumeTime: () => resumeTime,
+  resumedSessionWindow: () => resumedSessionWindow,
   runnerToolSubject: () => runnerToolSubject,
   skillTokens: () => skillTokens,
   skippedLabel: () => skippedLabel,
@@ -105,6 +109,7 @@ __export(plan_utils_exports, {
   taskRowView: () => taskRowView,
   taskStartedNotice: () => taskStartedNotice,
   taskStatusKind: () => taskStatusKind,
+  taskUsageSummary: () => taskUsageSummary,
   titledRefs: () => titledRefs,
   titledTaskRef: () => titledTaskRef,
   titledTaskRefOf: () => titledTaskRefOf,
@@ -195,6 +200,20 @@ function pausedOnLimit(task) {
 // src/services/TaskOps.ts
 var import_uuid3 = require("uuid");
 
+// src/services/ModelAllowlistResolver.ts
+function effectiveAllowlist(allowlist, runner, modelsByRunner) {
+  if (!allowlist || allowlist.length === 0) return void 0;
+  if (!modelsByRunner) return allowlist;
+  const own = new Set((modelsByRunner[runner] ?? []).map((m) => m.modelId));
+  const elsewhere = /* @__PURE__ */ new Set();
+  for (const [other, models] of Object.entries(modelsByRunner)) {
+    if (other === runner) continue;
+    for (const m of models ?? []) elsewhere.add(m.modelId);
+  }
+  const kept = allowlist.filter((id) => own.has(id) || !elsewhere.has(id));
+  return kept.length > 0 ? kept : void 0;
+}
+
 // src/taskRow/status.ts
 var isTaskRunning = (task) => task.status === "in_progress" || task.status === "running";
 var NOT_STARTED = /* @__PURE__ */ new Set(["pending", "approved", "blocked"]);
@@ -230,7 +249,7 @@ function blockedByLabel(refs) {
 function skippedLabel(reason) {
   return reason ? `Skipped: ${reason}` : "Skipped";
 }
-var WAITS_FOR_APPROVAL_LABEL = "Waiting for your approval to start";
+var WAITS_FOR_APPROVAL_LABEL = "Waits for your approval";
 function approvalLabel(count) {
   if (!count) return null;
   return count > 1 ? `Waiting for approval (${count})` : "Waiting for approval";
@@ -764,8 +783,21 @@ function addAttemptUsage(usage, record, now) {
   const folded = addPlannerUsage(usage, record);
   return { ...usage, ...folded, lastPromptTokens: folded.lastPromptTokens, contextWindow: folded.contextWindow, wallTimeMs: Math.max(0, Date.parse(now) - Date.parse(usage.startedAt)) };
 }
-function endAttemptUsage(usage, now) {
-  return { ...usage, endedAt: now, wallTimeMs: Math.max(0, Date.parse(now) - Date.parse(usage.startedAt)) };
+function endAttemptUsage(usage, now, runnerSessionCost, sessionId) {
+  return {
+    ...usage,
+    endedAt: now,
+    wallTimeMs: Math.max(0, Date.parse(now) - Date.parse(usage.startedAt)),
+    ...sessionId ? { sessionId } : {},
+    ...runnerSessionCost ? { runnerSessionCost } : {}
+  };
+}
+function countedSessionCost(attempts, sessionId) {
+  return [...attempts ?? []].reverse().find((usage) => usage.runnerSessionCost?.sessionId === sessionId)?.runnerSessionCost;
+}
+function resumedSessionWindow(attempts, runner, attempt, sessionId) {
+  const last = [...attempts ?? []].reverse().find((usage) => usage.attempt !== attempt && usage.runner === runner && usage.sessionId === sessionId && usage.contextWindow !== void 0);
+  return last ? { source: last.source, model: last.model, contextWindow: last.contextWindow } : void 0;
 }
 function addUsageTotals(totals, addition) {
   let next = addUsage(totals, { source: "", inputTokens: addition.inputTokens, outputTokens: addition.outputTokens, cachedInputTokens: addition.cachedInputTokens });
@@ -794,6 +826,16 @@ function planUsage(tasks) {
   }
   return result;
 }
+function taskUsageSummary(task) {
+  const attempts = task.attemptUsage ?? [];
+  const latest = attempts.at(-1);
+  const contextFill = latest ? plannerContextFill(latest) : void 0;
+  return {
+    totals: attempts.reduce((sum, attempt) => addUsageTotals(sum, attempt.totals), {}),
+    attempts: attempts.length,
+    ...contextFill ? { contextFill } : {}
+  };
+}
 
 // src/conversation/lanes.ts
 function findLastIndex(items, match) {
@@ -1116,6 +1158,7 @@ function syncTranscript(view, { plan, turnId }) {
     if (isNew && entry.kind === "wake_up") next = takePendingInputs(next, void 0, [entry.content]).view;
     if (isNew && entry.kind === "plan_generated") next = markPlan(next, entry.content, i === committed ? turnId : void 0);
     if (isNew && entry.kind === "system") next = append(next, (id) => settledMessage(id, "system", entry.content));
+    if (isNew && entry.kind === "error") next = append(next, (id) => settledMessage(id, "error", entry.content));
     if (isNew && entry.kind === "compaction") next = markCompaction(next, entry.content);
     if (latest === void 0 || entry.timestamp > latest) latest = entry.timestamp;
   }
@@ -1196,6 +1239,8 @@ function roleOf(entry) {
       return "wake_up";
     case "supervisor":
       return "supervisor";
+    case "error":
+      return "error";
     default:
       return entry.role === "user" ? "user" : "planner";
   }
@@ -1481,6 +1526,12 @@ function commandOutput(view, { text: text2 }) {
   return { ...view, blocks: replaceAt(view.blocks, i, { ...block, output: block.output ? `${block.output}
 ${text2}` : text2 }) };
 }
+function modelSwitchNotice({ from, to, plan, kept }) {
+  if (!plan) return `Model changed in the runner: ${from.label ?? from.model} \u2192 ${to.label ?? to.model}${kept ? ` (${kept})` : ""}`;
+  const planned = plan.model ? `${plan.model.label ?? plan.model.model}${plan.effort ? `, ${plan.effort}` : ""}` : void 0;
+  if (!kept) return `Model changed in the runner: ${from.label ?? from.model} \u2192 ${to.label ?? to.model}; the plan now says ${planned ?? to.label ?? to.model}`;
+  return `The runner now answers on ${to.label ?? to.model}; ${planned ? `the plan still says ${planned}` : "the plan names no model"} (${kept})`;
+}
 function appendStep(view, make) {
   const next = append(view, make);
   return sealLane(next, null, findLastIndex(next.blocks, (b) => b.type !== "usage"));
@@ -1542,6 +1593,8 @@ function reduceTaskLog(view, event) {
       return startCommand(view, event);
     case "command_output":
       return commandOutput(view, event);
+    case "model_switched":
+      return append(view, (id) => settledMessage(id, "system", modelSwitchNotice(event)));
     case "compaction":
       return appendStep(view, (id) => ({
         type: "compaction",
@@ -1752,6 +1805,31 @@ function opsEditable(task) {
   return UNSTARTED_AI(task);
 }
 
+// src/services/AssignmentScope.ts
+var OVER = /* @__PURE__ */ new Set(["completed", "skipped"]);
+function assignmentIssue(task, scope) {
+  if (task.type !== "ai" || 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);
+  if (model && allowed && !allowed.includes(model.modelId)) {
+    return { kind: "model-off-list", runner: task.assignedRunner, modelId: model.modelId, modelLabel: model.modelLabel || model.modelId };
+  }
+  return null;
+}
+function assignmentIssueText(issue) {
+  return issue.kind === "runner-off" ? `${issue.runner} is switched off` : `${issue.modelLabel} is not in the allowlist`;
+}
+function assignmentConsequence({ status, awaitingReason, resumeAt }) {
+  if (status === "failed") return "failed; a retry would run it there unless moved";
+  if (status === "awaiting_user" && awaitingReason === "usage-limit") {
+    return resumeAt ? "paused on a usage limit; resumes there at the reset unless moved" : "paused on a usage limit; a retry would run it there unless moved";
+  }
+  if (status === "awaiting_user" && (awaitingReason === "conflict" || awaitingReason === "files-changed")) return "waiting for the user; what runs next runs there unless moved";
+  if (status === "in_progress" || status === "awaiting_user") return "already running as assigned";
+  return "runs as assigned unless moved";
+}
+
 // src/taskRow/view.ts
 var refsOf = (ids, tasks) => ids.map((id) => tasks?.length ? taskRefOf(tasks, id) ?? id : id);
 var namedRepo = (repo) => repo && repo !== "." ? repo : null;
@@ -1762,13 +1840,18 @@ function blockedBy(task, tasks) {
   if (!tasks?.length || !NOT_STARTED.has(task.status)) return [];
   return blockingFailures(asBlocking(tasks)).get(task.id) ?? [];
 }
+function flagOf(task, scope) {
+  const issue = scope && task.assignedRunner !== void 0 ? assignmentIssue({ ...task, assignedRunner: task.assignedRunner }, scope) : null;
+  return issue ? { assignmentFlag: assignmentIssueText(issue), assignmentConsequence: assignmentConsequence(task) } : { assignmentFlag: null, assignmentConsequence: null };
+}
 function taskRowView(task, context = {}) {
   const parent = context.parent ?? void 0;
   const isolation = task.isolation && task.isolation.state !== "none" ? task.isolation : null;
-  const latestUsage = task.attemptUsage?.at(-1);
+  const spend = taskUsageSummary(task);
+  const latestAttempt = task.attemptUsage?.at(-1);
   const blocked = blockedBy(task, context.tasks);
   return {
-    usage: latestUsage ? { ...usageLine(latestUsage), attempt: latestUsage.attempt, wallTimeMs: latestUsage.wallTimeMs, byModel: latestUsage.byModel } : task.type === "ai" && ["completed", "failed", "in_progress", "awaiting_user"].includes(task.status) ? { totals: {}, attempt: 0, byModel: [] } : null,
+    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.ops ? "ops" : "ai",
     status: blocked.length > 0 ? "blocked" : taskStatusKind(task),
@@ -1777,6 +1860,7 @@ function taskRowView(task, context = {}) {
     resumes: resumeLabel(task, context.now),
     approvals: approvalLabel(task.awaitingApproval),
     waitsForApproval: task.waitsForApproval && NOT_STARTED.has(task.status) ? WAITS_FOR_APPROVAL_LABEL : null,
+    ...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,
@@ -1834,6 +1918,8 @@ var EMPTY_RUN = { tasks: [], runMerge: null, handoff: null, mergeResult: null };
   addUsageTotals,
   aheadOfDraft,
   approvalLabel,
+  assignmentIssue,
+  assignmentIssueText,
   awaitingLabel,
   blockedByLabel,
   blockingFailures,
@@ -1841,6 +1927,7 @@ var EMPTY_RUN = { tasks: [], runMerge: null, handoff: null, mergeResult: null };
   canSetDependencies,
   canSplitTask,
   capConflictFiles,
+  countedSessionCost,
   dependencyCandidates,
   dependentsNotice,
   dependentsOf,
@@ -1878,6 +1965,7 @@ var EMPTY_RUN = { tasks: [], runMerge: null, handoff: null, mergeResult: null };
   resolveTaskRef,
   resumeLabel,
   resumeTime,
+  resumedSessionWindow,
   runnerToolSubject,
   skillTokens,
   skippedLabel,
@@ -1892,6 +1980,7 @@ var EMPTY_RUN = { tasks: [], runMerge: null, handoff: null, mergeResult: null };
   taskRowView,
   taskStartedNotice,
   taskStatusKind,
+  taskUsageSummary,
   titledRefs,
   titledTaskRef,
   titledTaskRefOf,