@ordewell/core 0.10.9 → 0.10.11

package/dist/parsing.mjs

@@ -1,12 +1,12 @@
 import {
   parsePlanJson
-} from "./chunk-LTHKFBKM.mjs";
+} from "./chunk-KWS3VEER.mjs";
 import {
   PlanParseError,
   extractJsonObject,
   stripModelNoise
-} from "./chunk-H7QX32BH.mjs";
-import "./chunk-EEE2GBLG.mjs";
+} from "./chunk-24EL4Z2W.mjs";
+import "./chunk-PFH7WFIB.mjs";
 
 // src/services/PartialPlanParser.ts
 function parsePartialPlan(partial) {

package/dist/plan-utils.d.mts

@@ -1,9 +1,9 @@
-export { e as ApprovalBlock, g as ApprovalStatus, l as AssignmentIssue, m as AssignmentScope, B as BlockingSubject, p as CHECKPOINT_TRUNCATE_LENGTH, u as CommandBlock, w as CommandStatus, y as CompactionBlock, H as ConversationInput, L as ConversationView, P as DiffRow, Q as DiffRowKind, R as DiffStat, S as DisplayBlock, T as EMPTY_CONVERSATION, U as EMPTY_HOLD, V as EMPTY_RUN, W as EMPTY_TASK_LOG, X as EMPTY_TASK_LOG_FOLLOW, a0 as GatedConversation, af as LocalEntry, ag as MarkdownToken, aj as MessageBlock, ak as MessageRole, am as NOT_STARTED, an as NO_TURN, ao as NewTaskFields, au as OutputPreview, ay as PlanBlock, az as PlanMarkerStatus, aU as PromptHold, aW as RefTask, b8 as RunnerLoadedBlock, bb as SUPERVISOR_LEVEL_LABEL, bt as SkillLoadBlock, bu as SkillToken, bz as SubagentBlock, bA as SubagentChild, bB as SubagentStatus, bL as TakenPrompt, bP as TaskLogBatch, bR as TaskLogFollow, bS as TaskLogFollowInput, bU as TaskLogView, b$ as TaskPlacement, c3 as TaskRef, c4 as TaskRowAction, c5 as TaskRowContext, c6 as TaskRowIsolation, c7 as TaskRowKind, c8 as TaskRowPlacement, c9 as TaskRowSubject, ca as TaskRowUsage, cb as TaskRowView, cd as TaskStatusKind, ce as ThinkingDisplayBlock, cf as ToolBlock, cg as ToolHeadline, ch as ToolStatus, ci as TreeTask, cj as TurnGate, ck as UsageBlock, cm as WAITS_FOR_APPROVAL_LABEL, ct as aheadOfDraft, cv as approvalLabel, cw as assignmentIssue, cx as assignmentIssueText, cA as awaitingLabel, cB as blockedByLabel, cC as blockingFailures, cD as canMergeTasks, cE as canSetDependencies, cF as canSplitTask, cG as capConflictFiles, cK as dependencyCandidates, cL as dependentsNotice, cM as dependentsOf, cO as diffRows, cP as diffStat, cQ as diffSummary, cS as drainNext, cU as followTaskLog, cV as followTurn, cW as fromTranscript, cY as hasHiddenDetail, cZ as holdPrompt, c_ as isTaskRunning, c$ as loadedSkillTokens, d0 as markAction, d1 as markRequestFor, d2 as markdownHtml, d3 as markdownTokens, d4 as namedRepos, d5 as newTaskFields, d6 as opsEditable, d7 as outputLines, d8 as outputPreview, d9 as parseCount, dd as pastGateConfirmation, di as reconcileApprovals, dj as reduceConversation, dl as reduceTaskLog, dn as replayTaskLog, dq as resolveTaskRef, dr as resolveUserTaskRef, ds as resumeLabel, dt as resumeTime, dv as runnerToolSubject, dz as skillTokens, dA as skippedLabel, dB as stopTurn, dC as subtreeIds, dD as summarizeToolCall, dH as takeAt, dJ as taskOrderLabel, dK as taskPlacement, dM as taskRef, dN as taskRefOf, dO as taskRowActions, dP as taskRowView, dQ as taskStartedNotice, dR as taskStatusKind, dU as titledRefs, dV as titledTaskRef, dW as titledTaskRefOf, dY as toolHeadline, d_ as truncateCheckpointSummary, d$ as unsendAll, e0 as unsendLatest, e1 as walkPlan } from './runSettingsText-rLoYQlUH.mjs';
-export { a as AttemptUsage, D as DEFAULT_RUNNERS, M as ModelUsage, O as PlanUsage, R as PlannerUsage, a5 as RunnerSessionCost, as as TaskUsageSummary, au as UsageLine, av as UsageRecord, aw as UsageTotals, az as addAttemptUsage, aA as addModelUsage, aB as addPlannerUsage, aC as addUsage, aD as addUsageTotals, aE as countedSessionCost, aI as endAttemptUsage, aM as isMeasured, aQ as partedPromptUsage, aR as pausedOnLimit, aS as planUsage, aT as plannerContextFill, aV as resumedSessionWindow, aW as startAttemptUsage, aX as taskUsageSummary, aY as usageLine } from './Task-hFfRS9rN.mjs';
-import './IFileSystem-C9W5mRYA.mjs';
+export { e as ApprovalBlock, g as ApprovalStatus, l as AssignmentIssue, m as AssignmentScope, B as BlockingSubject, p as CHECKPOINT_TRUNCATE_LENGTH, u as CommandBlock, w as CommandStatus, y as CompactionBlock, H as ConversationInput, L as ConversationView, P as DiffRow, Q as DiffRowKind, R as DiffStat, S as DisplayBlock, T as EMPTY_CONVERSATION, U as EMPTY_HOLD, V as EMPTY_RUN, W as EMPTY_TASK_LOG, X as EMPTY_TASK_LOG_FOLLOW, a0 as GatedConversation, af as LocalEntry, ag as MarkdownToken, aj as MessageBlock, ak as MessageRole, am as NOT_STARTED, an as NO_TURN, ao as NewTaskFields, au as OutputPreview, ay as PlanBlock, az as PlanMarkerStatus, aU as PromptHold, aW as RefTask, b8 as RunnerLoadedBlock, bb as SUPERVISOR_LEVEL_LABEL, bt as SkillLoadBlock, bu as SkillToken, bz as SubagentBlock, bA as SubagentChild, bB as SubagentStatus, bL as TakenPrompt, bP as TaskLogBatch, bR as TaskLogFollow, bS as TaskLogFollowInput, bU as TaskLogView, b$ as TaskPlacement, c3 as TaskRef, c4 as TaskRowAction, c5 as TaskRowContext, c6 as TaskRowIsolation, c7 as TaskRowKind, c8 as TaskRowPlacement, c9 as TaskRowSubject, ca as TaskRowUsage, cb as TaskRowView, cd as TaskStatusKind, ce as ThinkingDisplayBlock, cf as ToolBlock, cg as ToolHeadline, ch as ToolStatus, ci as TreeTask, cj as TurnGate, ck as UsageBlock, cm as WAITS_FOR_APPROVAL_LABEL, ct as aheadOfDraft, cv as approvalLabel, cw as assignmentIssue, cx as assignmentIssueText, cA as awaitingLabel, cB as blockedByLabel, cC as blockingFailures, cD as canMergeTasks, cE as canSetDependencies, cF as canSplitTask, cG as capConflictFiles, cK as dependencyCandidates, cL as dependentsNotice, cM as dependentsOf, cO as diffRows, cP as diffStat, cQ as diffSummary, cS as drainNext, cU as followTaskLog, cV as followTurn, cW as fromTranscript, cY as hasHiddenDetail, cZ as holdPrompt, c_ as isTaskRunning, c$ as loadedSkillTokens, d0 as markAction, d1 as markRequestFor, d2 as markdownHtml, d3 as markdownTokens, d4 as namedRepos, d5 as newTaskFields, d6 as opsEditable, d7 as outputLines, d8 as outputPreview, d9 as parseCount, dd as pastGateConfirmation, di as reconcileApprovals, dj as reduceConversation, dl as reduceTaskLog, dn as replayTaskLog, dq as resolveTaskRef, dr as resolveUserTaskRef, ds as resumeLabel, dt as resumeTime, dv as runnerToolSubject, dz as skillTokens, dA as skippedLabel, dB as stopTurn, dC as subtreeIds, dD as summarizeToolCall, dH as takeAt, dJ as taskOrderLabel, dK as taskPlacement, dM as taskRef, dN as taskRefOf, dO as taskRowActions, dP as taskRowView, dQ as taskStartedNotice, dR as taskStatusKind, dU as titledRefs, dV as titledTaskRef, dW as titledTaskRefOf, dY as toolHeadline, d_ as truncateCheckpointSummary, d$ as unsendAll, e0 as unsendLatest, e1 as walkPlan } from './runSettingsText-Jb_efnI4.mjs';
+export { a as AttemptUsage, C as ContextFill, d as CostProvenance, D as DEFAULT_RUNNERS, M as ModelUsage, R as PlanUsage, T as PlannerUsage, a0 as ReportedWindow, a8 as RunnerSessionCost, a9 as SessionBilling, aw as TaskUsageSummary, ay as UsageLine, az as UsageRecord, aA as UsageTotals, aD as addAttemptUsage, aE as addModelUsage, aF as addPlannerUsage, aG as addUsage, aH as addUsageTotals, aI as contextMeterText, aJ as contextMeterTitle, aK as costText, aL as countedSessionCost, aP as endAttemptUsage, aS as formatCost, aT as formatTokenCount, aV as isMeasured, aZ as modelCostTitle, a_ as partedPromptUsage, a$ as pausedOnLimit, b0 as planUsage, b1 as plannerContextFill, b3 as resumedSessionWindow, b4 as startAttemptUsage, b5 as subagentCostTitle, b6 as taskUsageSummary, b7 as tasksTotalText, b8 as usageLine, b9 as usageText } from './Task-CfBM0wkV.mjs';
+import './IFileSystem-1PqRCjhu.mjs';
 import 'child_process';
 import 'zod/v4';
-import './ModeResolver-C1PN5FYG.mjs';
+import './ModeResolver-6TQXVsde.mjs';
 
 /**
  * The one rule for an effort and a model: the effort a task keeps on a model,

package/dist/plan-utils.d.ts

@@ -1,9 +1,9 @@
-export { e as ApprovalBlock, g as ApprovalStatus, l as AssignmentIssue, m as AssignmentScope, B as BlockingSubject, p as CHECKPOINT_TRUNCATE_LENGTH, u as CommandBlock, w as CommandStatus, y as CompactionBlock, H as ConversationInput, L as ConversationView, P as DiffRow, Q as DiffRowKind, R as DiffStat, S as DisplayBlock, T as EMPTY_CONVERSATION, U as EMPTY_HOLD, V as EMPTY_RUN, W as EMPTY_TASK_LOG, X as EMPTY_TASK_LOG_FOLLOW, a0 as GatedConversation, af as LocalEntry, ag as MarkdownToken, aj as MessageBlock, ak as MessageRole, am as NOT_STARTED, an as NO_TURN, ao as NewTaskFields, au as OutputPreview, ay as PlanBlock, az as PlanMarkerStatus, aU as PromptHold, aW as RefTask, b8 as RunnerLoadedBlock, bb as SUPERVISOR_LEVEL_LABEL, bt as SkillLoadBlock, bu as SkillToken, bz as SubagentBlock, bA as SubagentChild, bB as SubagentStatus, bL as TakenPrompt, bP as TaskLogBatch, bR as TaskLogFollow, bS as TaskLogFollowInput, bU as TaskLogView, b$ as TaskPlacement, c3 as TaskRef, c4 as TaskRowAction, c5 as TaskRowContext, c6 as TaskRowIsolation, c7 as TaskRowKind, c8 as TaskRowPlacement, c9 as TaskRowSubject, ca as TaskRowUsage, cb as TaskRowView, cd as TaskStatusKind, ce as ThinkingDisplayBlock, cf as ToolBlock, cg as ToolHeadline, ch as ToolStatus, ci as TreeTask, cj as TurnGate, ck as UsageBlock, cm as WAITS_FOR_APPROVAL_LABEL, ct as aheadOfDraft, cv as approvalLabel, cw as assignmentIssue, cx as assignmentIssueText, cA as awaitingLabel, cB as blockedByLabel, cC as blockingFailures, cD as canMergeTasks, cE as canSetDependencies, cF as canSplitTask, cG as capConflictFiles, cK as dependencyCandidates, cL as dependentsNotice, cM as dependentsOf, cO as diffRows, cP as diffStat, cQ as diffSummary, cS as drainNext, cU as followTaskLog, cV as followTurn, cW as fromTranscript, cY as hasHiddenDetail, cZ as holdPrompt, c_ as isTaskRunning, c$ as loadedSkillTokens, d0 as markAction, d1 as markRequestFor, d2 as markdownHtml, d3 as markdownTokens, d4 as namedRepos, d5 as newTaskFields, d6 as opsEditable, d7 as outputLines, d8 as outputPreview, d9 as parseCount, dd as pastGateConfirmation, di as reconcileApprovals, dj as reduceConversation, dl as reduceTaskLog, dn as replayTaskLog, dq as resolveTaskRef, dr as resolveUserTaskRef, ds as resumeLabel, dt as resumeTime, dv as runnerToolSubject, dz as skillTokens, dA as skippedLabel, dB as stopTurn, dC as subtreeIds, dD as summarizeToolCall, dH as takeAt, dJ as taskOrderLabel, dK as taskPlacement, dM as taskRef, dN as taskRefOf, dO as taskRowActions, dP as taskRowView, dQ as taskStartedNotice, dR as taskStatusKind, dU as titledRefs, dV as titledTaskRef, dW as titledTaskRefOf, dY as toolHeadline, d_ as truncateCheckpointSummary, d$ as unsendAll, e0 as unsendLatest, e1 as walkPlan } from './runSettingsText-CGKX3aeV.js';
-export { a as AttemptUsage, D as DEFAULT_RUNNERS, M as ModelUsage, O as PlanUsage, R as PlannerUsage, a5 as RunnerSessionCost, as as TaskUsageSummary, au as UsageLine, av as UsageRecord, aw as UsageTotals, az as addAttemptUsage, aA as addModelUsage, aB as addPlannerUsage, aC as addUsage, aD as addUsageTotals, aE as countedSessionCost, aI as endAttemptUsage, aM as isMeasured, aQ as partedPromptUsage, aR as pausedOnLimit, aS as planUsage, aT as plannerContextFill, aV as resumedSessionWindow, aW as startAttemptUsage, aX as taskUsageSummary, aY as usageLine } from './Task-hFfRS9rN.js';
-import './IFileSystem-B8qRNC_6.js';
+export { e as ApprovalBlock, g as ApprovalStatus, l as AssignmentIssue, m as AssignmentScope, B as BlockingSubject, p as CHECKPOINT_TRUNCATE_LENGTH, u as CommandBlock, w as CommandStatus, y as CompactionBlock, H as ConversationInput, L as ConversationView, P as DiffRow, Q as DiffRowKind, R as DiffStat, S as DisplayBlock, T as EMPTY_CONVERSATION, U as EMPTY_HOLD, V as EMPTY_RUN, W as EMPTY_TASK_LOG, X as EMPTY_TASK_LOG_FOLLOW, a0 as GatedConversation, af as LocalEntry, ag as MarkdownToken, aj as MessageBlock, ak as MessageRole, am as NOT_STARTED, an as NO_TURN, ao as NewTaskFields, au as OutputPreview, ay as PlanBlock, az as PlanMarkerStatus, aU as PromptHold, aW as RefTask, b8 as RunnerLoadedBlock, bb as SUPERVISOR_LEVEL_LABEL, bt as SkillLoadBlock, bu as SkillToken, bz as SubagentBlock, bA as SubagentChild, bB as SubagentStatus, bL as TakenPrompt, bP as TaskLogBatch, bR as TaskLogFollow, bS as TaskLogFollowInput, bU as TaskLogView, b$ as TaskPlacement, c3 as TaskRef, c4 as TaskRowAction, c5 as TaskRowContext, c6 as TaskRowIsolation, c7 as TaskRowKind, c8 as TaskRowPlacement, c9 as TaskRowSubject, ca as TaskRowUsage, cb as TaskRowView, cd as TaskStatusKind, ce as ThinkingDisplayBlock, cf as ToolBlock, cg as ToolHeadline, ch as ToolStatus, ci as TreeTask, cj as TurnGate, ck as UsageBlock, cm as WAITS_FOR_APPROVAL_LABEL, ct as aheadOfDraft, cv as approvalLabel, cw as assignmentIssue, cx as assignmentIssueText, cA as awaitingLabel, cB as blockedByLabel, cC as blockingFailures, cD as canMergeTasks, cE as canSetDependencies, cF as canSplitTask, cG as capConflictFiles, cK as dependencyCandidates, cL as dependentsNotice, cM as dependentsOf, cO as diffRows, cP as diffStat, cQ as diffSummary, cS as drainNext, cU as followTaskLog, cV as followTurn, cW as fromTranscript, cY as hasHiddenDetail, cZ as holdPrompt, c_ as isTaskRunning, c$ as loadedSkillTokens, d0 as markAction, d1 as markRequestFor, d2 as markdownHtml, d3 as markdownTokens, d4 as namedRepos, d5 as newTaskFields, d6 as opsEditable, d7 as outputLines, d8 as outputPreview, d9 as parseCount, dd as pastGateConfirmation, di as reconcileApprovals, dj as reduceConversation, dl as reduceTaskLog, dn as replayTaskLog, dq as resolveTaskRef, dr as resolveUserTaskRef, ds as resumeLabel, dt as resumeTime, dv as runnerToolSubject, dz as skillTokens, dA as skippedLabel, dB as stopTurn, dC as subtreeIds, dD as summarizeToolCall, dH as takeAt, dJ as taskOrderLabel, dK as taskPlacement, dM as taskRef, dN as taskRefOf, dO as taskRowActions, dP as taskRowView, dQ as taskStartedNotice, dR as taskStatusKind, dU as titledRefs, dV as titledTaskRef, dW as titledTaskRefOf, dY as toolHeadline, d_ as truncateCheckpointSummary, d$ as unsendAll, e0 as unsendLatest, e1 as walkPlan } from './runSettingsText-C5uv2axI.js';
+export { a as AttemptUsage, C as ContextFill, d as CostProvenance, D as DEFAULT_RUNNERS, M as ModelUsage, R as PlanUsage, T as PlannerUsage, a0 as ReportedWindow, a8 as RunnerSessionCost, a9 as SessionBilling, aw as TaskUsageSummary, ay as UsageLine, az as UsageRecord, aA as UsageTotals, aD as addAttemptUsage, aE as addModelUsage, aF as addPlannerUsage, aG as addUsage, aH as addUsageTotals, aI as contextMeterText, aJ as contextMeterTitle, aK as costText, aL as countedSessionCost, aP as endAttemptUsage, aS as formatCost, aT as formatTokenCount, aV as isMeasured, aZ as modelCostTitle, a_ as partedPromptUsage, a$ as pausedOnLimit, b0 as planUsage, b1 as plannerContextFill, b3 as resumedSessionWindow, b4 as startAttemptUsage, b5 as subagentCostTitle, b6 as taskUsageSummary, b7 as tasksTotalText, b8 as usageLine, b9 as usageText } from './Task-CfBM0wkV.js';
+import './IFileSystem-lTRL_G9Z.js';
 import 'child_process';
 import 'zod/v4';
-import './ModeResolver-CaPnoU8N.js';
+import './ModeResolver-CoJAJD-f.js';
 
 /**
  * The one rule for an effort and a model: the effort a task keeps on a model,

package/dist/plan-utils.js

@@ -58,6 +58,9 @@ __export(plan_utils_exports, {
   canSplitTask: () => canSplitTask,
   capConflictFiles: () => capConflictFiles,
   clampThinkingEffort: () => clampThinkingEffort,
+  contextMeterText: () => contextMeterText,
+  contextMeterTitle: () => contextMeterTitle,
+  costText: () => costText,
   countedSessionCost: () => countedSessionCost,
   dependencyCandidates: () => dependencyCandidates,
   dependentsNotice: () => dependentsNotice,
@@ -69,6 +72,8 @@ __export(plan_utils_exports, {
   endAttemptUsage: () => endAttemptUsage,
   followTaskLog: () => followTaskLog,
   followTurn: () => followTurn,
+  formatCost: () => formatCost,
+  formatTokenCount: () => formatTokenCount,
   fromTranscript: () => fromTranscript,
   hasHiddenDetail: () => hasHiddenDetail,
   holdPrompt: () => holdPrompt,
@@ -79,6 +84,7 @@ __export(plan_utils_exports, {
   markRequestFor: () => markRequestFor,
   markdownHtml: () => markdownHtml,
   markdownTokens: () => markdownTokens,
+  modelCostTitle: () => modelCostTitle,
   namedRepos: () => namedRepos,
   newTaskFields: () => newTaskFields,
   opsEditable: () => opsEditable,
@@ -104,6 +110,7 @@ __export(plan_utils_exports, {
   skippedLabel: () => skippedLabel,
   startAttemptUsage: () => startAttemptUsage,
   stopTurn: () => stopTurn,
+  subagentCostTitle: () => subagentCostTitle,
   subtreeIds: () => subtreeIds,
   summarizeToolCall: () => summarizeToolCall,
   takeAt: () => takeAt,
@@ -116,6 +123,7 @@ __export(plan_utils_exports, {
   taskStartedNotice: () => taskStartedNotice,
   taskStatusKind: () => taskStatusKind,
   taskUsageSummary: () => taskUsageSummary,
+  tasksTotalText: () => tasksTotalText,
   titledRefs: () => titledRefs,
   titledTaskRef: () => titledTaskRef,
   titledTaskRefOf: () => titledTaskRefOf,
@@ -124,6 +132,7 @@ __export(plan_utils_exports, {
   unsendAll: () => unsendAll,
   unsendLatest: () => unsendLatest,
   usageLine: () => usageLine,
+  usageText: () => usageText,
   walkPlan: () => walkPlan
 });
 module.exports = __toCommonJS(plan_utils_exports);
@@ -801,25 +810,66 @@ function addUsage(totals, record) {
   }
   if (record.reportedCost) {
     const { amount, currency } = record.reportedCost;
-    next.reportedCost = { ...totals.reportedCost, [currency]: (totals.reportedCost?.[currency] ?? 0) + amount };
+    const provenance = record.reportedCost.kind || record.sessionBilling ? {
+      kind: record.reportedCost.kind ?? "unknown",
+      billing: record.sessionBilling?.type ?? "unknown",
+      ...record.reportedCost.basis ? { basis: record.reportedCost.basis } : {}
+    } : void 0;
+    addCost(next, currency, amount, provenance);
   }
   return next;
 }
+function addCost(totals, currency, amount, provenance) {
+  const hadCost = totals.reportedCost?.[currency] !== void 0;
+  const previous = totals.costProvenance?.[currency];
+  totals.reportedCost = { ...totals.reportedCost, [currency]: (totals.reportedCost?.[currency] ?? 0) + amount };
+  if (!previous && !provenance) return;
+  const unknown = { kind: "unknown", billing: "unknown" };
+  const a = previous ?? unknown;
+  const b = provenance ?? unknown;
+  const merged = !hadCost ? b : {
+    kind: a.kind === "estimate" || b.kind === "estimate" ? "estimate" : a.kind === "billed" && b.kind === "billed" ? "billed" : "unknown",
+    billing: a.billing === b.billing ? a.billing : "mixed",
+    ...a.basis && a.basis === b.basis ? { basis: a.basis } : {}
+  };
+  totals.costProvenance = { ...totals.costProvenance, [currency]: merged };
+}
 function addPlannerUsage(usage, record) {
-  const next = { ...usage, totals: addUsage(usage.totals, record), byModel: addModelUsage(usage.byModel ?? [], record) };
+  if (record.compacted) {
+    if (record.subagentId || record.aggregate) return usage;
+    const next2 = { ...usage };
+    if (record.source !== void 0) next2.source = record.source;
+    if (record.model !== void 0) {
+      if (record.source !== usage.source || record.model !== usage.model) delete next2.contextWindow;
+      next2.model = record.model;
+    }
+    if (record.contextTokens !== void 0) next2.lastPromptTokens = record.contextTokens;
+    else delete next2.lastPromptTokens;
+    if (record.contextWindow !== void 0) next2.contextWindow = record.contextWindow > 0 ? record.contextWindow : void 0;
+    return next2;
+  }
+  if (record.sessionBilling && !record.reportedCost && record.inputTokens === void 0 && record.outputTokens === void 0 && record.cachedInputTokens === void 0 && record.contextWindow === void 0) {
+    return record.subagentId ? usage : { ...usage, sessionBilling: record.sessionBilling, source: record.source };
+  }
+  record = { ...record, sessionBilling: record.sessionBilling ?? (usage.source === void 0 || record.source === usage.source ? usage.sessionBilling : void 0) };
+  const next = { ...usage, ...!record.subagentId && record.sessionBilling ? { sessionBilling: record.sessionBilling } : {}, totals: addUsage(usage.totals, record), byModel: addModelUsage(usage.byModel ?? [], record) };
   if (record.subagentId) {
     next.bySubagent = { ...usage.bySubagent, [record.subagentId]: addUsage(usage.bySubagent?.[record.subagentId] ?? {}, record) };
     return next;
   }
-  if (!record.aggregate) {
-    if (record.source !== usage.source || record.model !== usage.model) {
-      delete next.lastPromptTokens;
-      delete next.contextWindow;
-    }
-    next.source = record.source;
-    next.model = record.model;
+  if (record.aggregate) {
+    if (record.source !== usage.source && !record.sessionBilling) delete next.sessionBilling;
+    return next;
+  }
+  if (record.source !== usage.source || record.model !== usage.model) {
+    delete next.lastPromptTokens;
+    delete next.contextWindow;
   }
-  if (record.inputTokens !== void 0) next.lastPromptTokens = record.inputTokens;
+  if (record.source !== usage.source && !record.sessionBilling) delete next.sessionBilling;
+  next.source = record.source;
+  next.model = record.model;
+  const used = record.contextTokens ?? record.inputTokens;
+  if (used !== void 0) next.lastPromptTokens = used;
   if (record.contextWindow !== void 0) next.contextWindow = record.contextWindow > 0 ? record.contextWindow : void 0;
   return next;
 }
@@ -830,6 +880,7 @@ function usageLine(usage) {
   const contextFill = plannerContextFill(usage);
   return {
     totals: usage.totals,
+    ...usage.sessionBilling ? { sessionBilling: usage.sessionBilling } : {},
     ...usage.byModel ? { byModel: usage.byModel } : {},
     ...usage.model ? { model: usage.model } : {},
     ...usage.bySubagent ? { bySubagent: usage.bySubagent } : {},
@@ -837,8 +888,8 @@ function usageLine(usage) {
   };
 }
 function plannerContextFill(usage) {
-  if (usage.lastPromptTokens === void 0 || usage.contextWindow === void 0 || usage.contextWindow <= 0) return void 0;
-  return { usedTokens: usage.lastPromptTokens, windowTokens: usage.contextWindow };
+  if (usage.lastPromptTokens === void 0) return void 0;
+  return { usedTokens: usage.lastPromptTokens, ...usage.contextWindow !== void 0 && usage.contextWindow > 0 ? { windowTokens: usage.contextWindow } : {} };
 }
 function addModelUsage(models, record) {
   const index = models.findIndex((m) => m.source === record.source && m.model === record.model);
@@ -850,13 +901,14 @@ function startAttemptUsage(attempt, runner, startedAt) {
 }
 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)) };
+  return { ...usage, ...folded, lastPromptTokens: folded.lastPromptTokens, contextWindow: folded.contextWindow, wallTimeMs: Math.max(0, Date.parse(usage.endedAt ?? now) - Date.parse(usage.startedAt)) };
 }
 function endAttemptUsage(usage, now, runnerSessionCost, sessionId) {
+  const endedAt = usage.endedAt ?? now;
   return {
     ...usage,
-    endedAt: now,
-    wallTimeMs: Math.max(0, Date.parse(now) - Date.parse(usage.startedAt)),
+    endedAt,
+    wallTimeMs: Math.max(0, Date.parse(endedAt) - Date.parse(usage.startedAt)),
     ...sessionId ? { sessionId } : {},
     ...runnerSessionCost ? { runnerSessionCost } : {}
   };
@@ -869,8 +921,8 @@ function resumedSessionWindow(attempts, runner, attempt, sessionId) {
   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 });
-  for (const [currency, amount] of Object.entries(addition.reportedCost ?? {})) next = addUsage(next, { source: "", reportedCost: { currency, amount } });
+  const next = addUsage(totals, { source: "", inputTokens: addition.inputTokens, outputTokens: addition.outputTokens, cachedInputTokens: addition.cachedInputTokens });
+  for (const [currency, amount] of Object.entries(addition.reportedCost ?? {})) addCost(next, currency, amount, addition.costProvenance?.[currency]);
   return next;
 }
 function planUsage(tasks) {
@@ -905,6 +957,71 @@ function taskUsageSummary(task) {
     ...contextFill ? { contextFill } : {}
   };
 }
+function formatTokenCount(n) {
+  if (n < 1e3) return String(n);
+  if (n < 1e4) return `${(n / 1e3).toFixed(1).replace(/\.0$/, "")}k`;
+  if (n < 999500) return `${Math.round(n / 1e3)}k`;
+  return `${(n / 1e6).toFixed(1).replace(/\.0$/, "")}M`;
+}
+function formatCost(currency, amount) {
+  const value = amount >= 1 ? amount.toFixed(2) : (([whole, frac = ""]) => `${whole}.${frac.padEnd(2, "0")}`)(amount.toFixed(4).replace(/0+$/, "").split("."));
+  return currency.toLowerCase() === "usd" ? `$${value}` : `${value} ${currency.toUpperCase()}`;
+}
+function contextMeterText(fill) {
+  if (!fill) return null;
+  const used = `ctx ${formatTokenCount(fill.usedTokens)}`;
+  if (!fill.windowTokens) return used;
+  const share = fill.usedTokens / fill.windowTokens * 100;
+  return `${used} (${share < 1 ? "<1" : Math.round(share)}%)`;
+}
+function contextMeterTitle(fill) {
+  const used = fill.usedTokens.toLocaleString("en-US");
+  return fill.windowTokens ? `${used} of ${fill.windowTokens.toLocaleString("en-US")} tokens` : `${used} tokens`;
+}
+function costParts(totals) {
+  const rank = (currency) => currency.toLowerCase() === "usd" ? "" : currency.toUpperCase();
+  return Object.entries(totals.reportedCost ?? {}).sort(([a], [b]) => rank(a).localeCompare(rank(b))).map(([currency, amount]) => {
+    const provenance = totals.costProvenance?.[currency];
+    const equivalent = provenance?.billing === "subscription";
+    return `${provenance?.kind === "estimate" || equivalent ? "\u2248" : ""}${formatCost(currency, amount)}${equivalent ? " API-equivalent" : ""}`;
+  });
+}
+function costText(totals) {
+  const parts = costParts(totals);
+  return parts.length > 0 ? parts.join(" \xB7 ") : null;
+}
+function usageText(usage) {
+  const parts = [contextMeterText(usage.contextFill), costText(usage.totals)].filter((p) => p !== null);
+  return parts.length > 0 ? parts.join(" \xB7 ") : null;
+}
+function modelCostTitle(byModel) {
+  const lines2 = byModel.flatMap((m) => {
+    const cost = costParts(m.totals);
+    const descriptions = [...new Set(Object.values(m.totals.costProvenance ?? {}).map((p) => {
+      const source = m.source === "claude-code" ? "Claude Code" : m.source === "opencode" ? "OpenCode" : m.source === "openrouter" ? "OpenRouter" : m.source;
+      const basis = p.basis === "list" ? " at list price" : p.basis === "managed" ? " at managed price" : "";
+      const kind = p.kind === "estimate" ? `${source}'s estimate${basis}` : p.kind === "billed" ? `Amount billed by ${source}` : "Reported cost";
+      return `${kind}${p.billing === "subscription" ? "; not billed on a subscription" : ""}`;
+    }))];
+    return cost.length > 0 ? [`${m.source} / ${m.model ?? "unattributed"}: ${cost.join(" \xB7 ")}${descriptions.length ? ` \u2014 ${descriptions.join("; ")}` : ""}`] : [];
+  });
+  return lines2.length > 0 ? lines2.join("\n") : void 0;
+}
+function subagentCostTitle(bySubagent) {
+  return Object.entries(bySubagent).map(([id, totals]) => `${id}: ${costParts(totals).join(" \xB7 ") || "reported no cost"}`).join("\n");
+}
+function runnersOf(tasks) {
+  return tasks.flatMap((task) => [...task.attemptUsage ?? [], ...runnersOf(task.subtasks ?? [])]);
+}
+function tasksTotalText(tasks) {
+  const attempts = runnersOf(tasks);
+  if (attempts.length === 0) return null;
+  const costed = (a) => Object.keys(a.totals.reportedCost ?? {}).length > 0;
+  const costless = [...new Set(attempts.filter((a) => a.endedAt !== void 0 && isMeasured(a.totals)).map((a) => a.runner))].filter((runner) => !attempts.some((a) => a.runner === runner && costed(a)));
+  const note = costless.length === 0 ? [] : [`${costless.length === 1 ? costless[0] : `${costless.slice(0, -1).join(", ")} and ${costless.at(-1)}`} ${costless.length === 1 ? "reports" : "report"} no cost`];
+  const parts = [...costParts(planUsage(tasks).totals), ...note];
+  return parts.length > 0 ? `Tasks total: ${parts.join(" \xB7 ")}` : null;
+}
 
 // src/conversation/lanes.ts
 function findLastIndex(items, match) {
@@ -1047,7 +1164,7 @@ function openTurn(view, { turnId, prompt = "", skills = [], wakeUps = [], forced
   wakeUps = wakeUps.slice(adopted.wakeUps);
   if (wakeUps.length === 0) return adopted.prompt || prompt === "" && adopted.wakeUps > 0 ? view : promptLine(view, turnId, prompt, skills, forced);
   const said = prompt === "" || adopted.prompt ? view : promptLine(view, turnId, prompt, skills, forced);
-  const at = prompt === "" ? said.blocks.length : findLastIndex(said.blocks, (b) => b.type === "message" && b.role === "user" && b.turnId === turnId);
+  const at = prompt === "" ? said.blocks.length - (said.blocks.at(-1)?.type === "usage" ? 1 : 0) : findLastIndex(said.blocks, (b) => b.type === "message" && b.role === "user" && b.turnId === turnId);
   const updates = wakeUps.map((text2, n) => settledMessage(`b${said.nextId + n}`, "wake_up", text2, turnId));
   return { ...said, blocks: [...said.blocks.slice(0, at), ...updates, ...said.blocks.slice(at)], nextId: said.nextId + updates.length };
 }
@@ -2080,6 +2197,9 @@ var EMPTY_RUN = { tasks: [], runMerge: null, handoff: null, mergeResult: null };
   canSplitTask,
   capConflictFiles,
   clampThinkingEffort,
+  contextMeterText,
+  contextMeterTitle,
+  costText,
   countedSessionCost,
   dependencyCandidates,
   dependentsNotice,
@@ -2091,6 +2211,8 @@ var EMPTY_RUN = { tasks: [], runMerge: null, handoff: null, mergeResult: null };
   endAttemptUsage,
   followTaskLog,
   followTurn,
+  formatCost,
+  formatTokenCount,
   fromTranscript,
   hasHiddenDetail,
   holdPrompt,
@@ -2101,6 +2223,7 @@ var EMPTY_RUN = { tasks: [], runMerge: null, handoff: null, mergeResult: null };
   markRequestFor,
   markdownHtml,
   markdownTokens,
+  modelCostTitle,
   namedRepos,
   newTaskFields,
   opsEditable,
@@ -2126,6 +2249,7 @@ var EMPTY_RUN = { tasks: [], runMerge: null, handoff: null, mergeResult: null };
   skippedLabel,
   startAttemptUsage,
   stopTurn,
+  subagentCostTitle,
   subtreeIds,
   summarizeToolCall,
   takeAt,
@@ -2138,6 +2262,7 @@ var EMPTY_RUN = { tasks: [], runMerge: null, handoff: null, mergeResult: null };
   taskStartedNotice,
   taskStatusKind,
   taskUsageSummary,
+  tasksTotalText,
   titledRefs,
   titledTaskRef,
   titledTaskRefOf,
@@ -2146,6 +2271,7 @@ var EMPTY_RUN = { tasks: [], runMerge: null, handoff: null, mergeResult: null };
   unsendAll,
   unsendLatest,
   usageLine,
+  usageText,
   walkPlan
 });
 //# sourceMappingURL=plan-utils.js.map