@ordewell/core 0.10.9 → 0.10.10

package/dist/plan-utils.mjs

@@ -24,6 +24,9 @@ import {
   canMergeTasks,
   canSplitTask,
   capConflictFiles,
+  contextMeterText,
+  contextMeterTitle,
+  costText,
   countedSessionCost,
   dependentsNotice,
   diffRows,
@@ -33,6 +36,8 @@ import {
   endAttemptUsage,
   followTaskLog,
   followTurn,
+  formatCost,
+  formatTokenCount,
   fromTranscript,
   hasHiddenDetail,
   holdPrompt,
@@ -42,6 +47,7 @@ import {
   markRequestFor,
   markdownHtml,
   markdownTokens,
+  modelCostTitle,
   namedRepos,
   newTaskFields,
   opsEditable,
@@ -63,6 +69,7 @@ import {
   skippedLabel,
   startAttemptUsage,
   stopTurn,
+  subagentCostTitle,
   summarizeToolCall,
   takeAt,
   taskRowActions,
@@ -70,16 +77,18 @@ import {
   taskStartedNotice,
   taskStatusKind,
   taskUsageSummary,
+  tasksTotalText,
   titledRefs,
   toolHeadline,
   truncateCheckpointSummary,
   unsendAll,
   unsendLatest,
-  usageLine
-} from "./chunk-O6LQU3W6.mjs";
+  usageLine,
+  usageText
+} from "./chunk-ESKK5I4F.mjs";
 import {
   clampThinkingEffort
-} from "./chunk-H7QX32BH.mjs";
+} from "./chunk-24EL4Z2W.mjs";
 import {
   DEFAULT_RUNNERS,
   canSetDependencies,
@@ -98,7 +107,7 @@ import {
   titledTaskRef,
   titledTaskRefOf,
   walkPlan
-} from "./chunk-EEE2GBLG.mjs";
+} from "./chunk-PFH7WFIB.mjs";
 export {
   CHECKPOINT_TRUNCATE_LENGTH,
   DEFAULT_RUNNERS,
@@ -128,6 +137,9 @@ export {
   canSplitTask,
   capConflictFiles,
   clampThinkingEffort,
+  contextMeterText,
+  contextMeterTitle,
+  costText,
   countedSessionCost,
   dependencyCandidates,
   dependentsNotice,
@@ -139,6 +151,8 @@ export {
   endAttemptUsage,
   followTaskLog,
   followTurn,
+  formatCost,
+  formatTokenCount,
   fromTranscript,
   hasHiddenDetail,
   holdPrompt,
@@ -149,6 +163,7 @@ export {
   markRequestFor,
   markdownHtml,
   markdownTokens,
+  modelCostTitle,
   namedRepos,
   newTaskFields,
   opsEditable,
@@ -174,6 +189,7 @@ export {
   skippedLabel,
   startAttemptUsage,
   stopTurn,
+  subagentCostTitle,
   subtreeIds,
   summarizeToolCall,
   takeAt,
@@ -186,6 +202,7 @@ export {
   taskStartedNotice,
   taskStatusKind,
   taskUsageSummary,
+  tasksTotalText,
   titledRefs,
   titledTaskRef,
   titledTaskRefOf,
@@ -194,6 +211,7 @@ export {
   unsendAll,
   unsendLatest,
   usageLine,
+  usageText,
   walkPlan
 };
 //# sourceMappingURL=plan-utils.mjs.map

package/dist/{runSettingsText-rLoYQlUH.d.mts → runSettingsText-C1i9wBG1.d.mts}

@@ -1,6 +1,6 @@
-import { ai as Task, a4 as RunnerId, aq as TaskSnapshot, b as AwaitingReason, av as UsageRecord, a5 as RunnerSessionCost, d as DiscoveredModel, af as SkillsService, aa as SkillInfo, Z as RepoGroupLayout, I as IWorktreeIsolation, w as IsolationRun, k as IsolationHandoff, J as PlanIsolation, x as IsolationTaskRecord, al as TaskIsolation, H as IsolationView, S as PrepareIntent, V as PreviousWork, s as IsolationOutcome, X as RepairEvidence, at as TreeSnapshot, aj as TaskDiffRead, ak as TaskDiffResult, r as IsolationMergeResult, ax as Verdict, ap as TaskSkillSnapshot, ao as TaskSkillNotice, ag as SubagentOutcome, L as LegacyPlanState, C as ConversationMessage, ac as SkillLoadNotice, P as PendingPlanTurn, a as AttemptUsage, a3 as RunSettings, O as PlanUsage, Y as ReplyRun, M as ModelUsage, aw as UsageTotals, f as ExecutionRecord, a0 as ResearchStep, K as PlanState, $ as ResearchProgress, _ as ResearchLogEntry, ab as SkillLoad, N as PlanStatus, ah as SupervisorLevel, a1 as ResearchStepOutcome, R as PlannerUsage, am as TaskIsolationState, as as TaskUsageSummary } from './Task-hFfRS9rN.mjs';
-import { N as IRunnerSession, K as IConfig, aL as TaskMessageFrom, ax as RunnerModelRef, ap as RunnerCommand, au as RunnerMcpServer, aE as StructuredTurnEnd, j as ApprovalDecision, aD as StructuredEvent, ah as QueuedTaskMessage, k as ApprovalKind, q as ApprovalSource, M as IRunner, ay as RunnerRegistry, J as IApproval, aU as ToolOutcome, d as AgentProcessDeps, a as AgentAdapter, a4 as OrdewellMcpServer, L as IFileSystem, aV as UsageLimitSignal, ac as PlannerToolHandler, p as ApprovalRequest, i as ApprovalAnswer, f as AiProvider, a3 as OrchestratorOption, a9 as PlannerBackendId } from './IFileSystem-C9W5mRYA.mjs';
-import { R as RunnerModeInfo } from './ModeResolver-C1PN5FYG.mjs';
+import { am as Task, a7 as RunnerId, au as TaskSnapshot, b as AwaitingReason, az as UsageRecord, a8 as RunnerSessionCost, f as DiscoveredModel, aj as SkillsService, ae as SkillInfo, $ as RepoGroupLayout, I as IWorktreeIsolation, y as IsolationRun, m as IsolationHandoff, N as PlanIsolation, z as IsolationTaskRecord, ap as TaskIsolation, K as IsolationView, U as PrepareIntent, X as PreviousWork, u as IsolationOutcome, Z as RepairEvidence, ax as TreeSnapshot, an as TaskDiffRead, ao as TaskDiffResult, t as IsolationMergeResult, aB as Verdict, at as TaskSkillSnapshot, as as TaskSkillNotice, ak as SubagentOutcome, L as LegacyPlanState, c as ConversationMessage, ag as SkillLoadNotice, P as PendingPlanTurn, a as AttemptUsage, a6 as RunSettings, R as PlanUsage, _ as ReplyRun, a9 as SessionBilling, M as ModelUsage, aA as UsageTotals, C as ContextFill, h as ExecutionRecord, a3 as ResearchStep, O as PlanState, a2 as ResearchProgress, a1 as ResearchLogEntry, af as SkillLoad, Q as PlanStatus, al as SupervisorLevel, a4 as ResearchStepOutcome, T as PlannerUsage, aq as TaskIsolationState, aw as TaskUsageSummary } from './Task-CfBM0wkV.mjs';
+import { N as IRunnerSession, K as IConfig, aL as TaskMessageFrom, ax as RunnerModelRef, ap as RunnerCommand, au as RunnerMcpServer, aE as StructuredTurnEnd, j as ApprovalDecision, aD as StructuredEvent, ah as QueuedTaskMessage, k as ApprovalKind, q as ApprovalSource, M as IRunner, ay as RunnerRegistry, J as IApproval, aU as ToolOutcome, d as AgentProcessDeps, a as AgentAdapter, a4 as OrdewellMcpServer, L as IFileSystem, aV as UsageLimitSignal, ac as PlannerToolHandler, p as ApprovalRequest, i as ApprovalAnswer, f as AiProvider, a3 as OrchestratorOption, a9 as PlannerBackendId } from './IFileSystem-1PqRCjhu.mjs';
+import { R as RunnerModeInfo } from './ModeResolver-6TQXVsde.mjs';
 
 type NotificationAction = {
     label: string;
@@ -1426,21 +1426,19 @@ type SessionMessage =
 /**
  * The planner's running usage for the session, subagents included, emitted
  * after a model call reports usage. `totals` already contains every
- * `bySubagent` entry. `contextFill` is the last planner prompt against the
- * model's window, omitted when the window is unknown. Cost appears only as
- * reported by a provider or runner (see `UsageRecord`).
+ * `bySubagent` entry. `contextFill` is the context the main model's last
+ * call left, with its window when known; omitted before a call was measured.
+ * Cost appears only as reported by a provider or runner (see `UsageRecord`).
  */
  | {
     type: 'planner_usage';
+    sessionBilling?: SessionBilling;
     byModel?: ModelUsage[];
     model?: string;
     turnId?: string;
     totals: UsageTotals;
     bySubagent?: Record<string, UsageTotals>;
-    contextFill?: {
-        usedTokens: number;
-        windowTokens: number;
-    };
+    contextFill?: ContextFill;
 }
 /**
  * A subagent began work on `brief`. Emitted by the planner backend that
@@ -1870,6 +1868,10 @@ declare class TaskOrchestrator {
     private store;
     private output;
     private attempts;
+    /** Bumped by every plan load: an ended attempt's wind-down belongs to the scope before it. */
+    private planScope;
+    /** Each task's runners still winding down once stopped: a continue waits for them (ADR-0018, L1). */
+    private windDowns;
     private verifier;
     /** Changed only by start, stop, a plan load, a usage-limit pause, a move off the limit, and {@link settleRun}. */
     private runState;
@@ -2507,6 +2509,18 @@ declare class TaskOrchestrator {
      * load reset the whole verifier themselves.
      */
     private endAttempt;
+    /**
+     * Let the attempt's runner go the way it ends a turn (ADR-0018, L1): it
+     * winds down on its own time, bounded by its interrupt grace, and nothing
+     * here waits on it but a continue of the same task.
+     */
+    private stopRunner;
+    /**
+     * An ended attempt's runner is gone: the count its session ended on is the
+     * one a continue of that session counts from. One still current is ended
+     * with that count instead.
+     */
+    private woundDown;
     /** Kept on the task once the attempt ends, so a continue can resume it after a reload (ADR-0018, K1). */
     private saveNativeSession;
     private endAllAttempts;
@@ -4544,17 +4558,14 @@ interface RunnerLoadedBlock {
     commands: readonly RunnerCommand[];
     mcpServers: readonly RunnerMcpServer[];
 }
-/** The token line. There is at most one, and it is always the last block. */
+/** The usage line (context and cost). Token counts ride in `totals` but are not drawn. There is at most one, and it is always the last block. */
 interface UsageBlock {
     byModel?: ModelUsage[];
     model?: string;
     type: 'usage';
     id: string;
     totals: UsageTotals;
-    contextFill?: {
-        usedTokens: number;
-        windowTokens: number;
-    };
+    contextFill?: ContextFill;
     bySubagent?: Record<string, UsageTotals>;
 }
 

package/dist/{runSettingsText-CGKX3aeV.d.ts → runSettingsText-CWNrmF5U.d.ts}

@@ -1,6 +1,6 @@
-import { ai as Task, a4 as RunnerId, aq as TaskSnapshot, b as AwaitingReason, av as UsageRecord, a5 as RunnerSessionCost, d as DiscoveredModel, af as SkillsService, aa as SkillInfo, Z as RepoGroupLayout, I as IWorktreeIsolation, w as IsolationRun, k as IsolationHandoff, J as PlanIsolation, x as IsolationTaskRecord, al as TaskIsolation, H as IsolationView, S as PrepareIntent, V as PreviousWork, s as IsolationOutcome, X as RepairEvidence, at as TreeSnapshot, aj as TaskDiffRead, ak as TaskDiffResult, r as IsolationMergeResult, ax as Verdict, ap as TaskSkillSnapshot, ao as TaskSkillNotice, ag as SubagentOutcome, L as LegacyPlanState, C as ConversationMessage, ac as SkillLoadNotice, P as PendingPlanTurn, a as AttemptUsage, a3 as RunSettings, O as PlanUsage, Y as ReplyRun, M as ModelUsage, aw as UsageTotals, f as ExecutionRecord, a0 as ResearchStep, K as PlanState, $ as ResearchProgress, _ as ResearchLogEntry, ab as SkillLoad, N as PlanStatus, ah as SupervisorLevel, a1 as ResearchStepOutcome, R as PlannerUsage, am as TaskIsolationState, as as TaskUsageSummary } from './Task-hFfRS9rN.js';
-import { N as IRunnerSession, K as IConfig, aL as TaskMessageFrom, ax as RunnerModelRef, ap as RunnerCommand, au as RunnerMcpServer, aE as StructuredTurnEnd, j as ApprovalDecision, aD as StructuredEvent, ah as QueuedTaskMessage, k as ApprovalKind, q as ApprovalSource, M as IRunner, ay as RunnerRegistry, J as IApproval, aU as ToolOutcome, d as AgentProcessDeps, a as AgentAdapter, a4 as OrdewellMcpServer, L as IFileSystem, aV as UsageLimitSignal, ac as PlannerToolHandler, p as ApprovalRequest, i as ApprovalAnswer, f as AiProvider, a3 as OrchestratorOption, a9 as PlannerBackendId } from './IFileSystem-B8qRNC_6.js';
-import { R as RunnerModeInfo } from './ModeResolver-CaPnoU8N.js';
+import { am as Task, a7 as RunnerId, au as TaskSnapshot, b as AwaitingReason, az as UsageRecord, a8 as RunnerSessionCost, f as DiscoveredModel, aj as SkillsService, ae as SkillInfo, $ as RepoGroupLayout, I as IWorktreeIsolation, y as IsolationRun, m as IsolationHandoff, N as PlanIsolation, z as IsolationTaskRecord, ap as TaskIsolation, K as IsolationView, U as PrepareIntent, X as PreviousWork, u as IsolationOutcome, Z as RepairEvidence, ax as TreeSnapshot, an as TaskDiffRead, ao as TaskDiffResult, t as IsolationMergeResult, aB as Verdict, at as TaskSkillSnapshot, as as TaskSkillNotice, ak as SubagentOutcome, L as LegacyPlanState, c as ConversationMessage, ag as SkillLoadNotice, P as PendingPlanTurn, a as AttemptUsage, a6 as RunSettings, R as PlanUsage, _ as ReplyRun, a9 as SessionBilling, M as ModelUsage, aA as UsageTotals, C as ContextFill, h as ExecutionRecord, a3 as ResearchStep, O as PlanState, a2 as ResearchProgress, a1 as ResearchLogEntry, af as SkillLoad, Q as PlanStatus, al as SupervisorLevel, a4 as ResearchStepOutcome, T as PlannerUsage, aq as TaskIsolationState, aw as TaskUsageSummary } from './Task-CfBM0wkV.js';
+import { N as IRunnerSession, K as IConfig, aL as TaskMessageFrom, ax as RunnerModelRef, ap as RunnerCommand, au as RunnerMcpServer, aE as StructuredTurnEnd, j as ApprovalDecision, aD as StructuredEvent, ah as QueuedTaskMessage, k as ApprovalKind, q as ApprovalSource, M as IRunner, ay as RunnerRegistry, J as IApproval, aU as ToolOutcome, d as AgentProcessDeps, a as AgentAdapter, a4 as OrdewellMcpServer, L as IFileSystem, aV as UsageLimitSignal, ac as PlannerToolHandler, p as ApprovalRequest, i as ApprovalAnswer, f as AiProvider, a3 as OrchestratorOption, a9 as PlannerBackendId } from './IFileSystem-lTRL_G9Z.js';
+import { R as RunnerModeInfo } from './ModeResolver-CoJAJD-f.js';
 
 type NotificationAction = {
     label: string;
@@ -1426,21 +1426,19 @@ type SessionMessage =
 /**
  * The planner's running usage for the session, subagents included, emitted
  * after a model call reports usage. `totals` already contains every
- * `bySubagent` entry. `contextFill` is the last planner prompt against the
- * model's window, omitted when the window is unknown. Cost appears only as
- * reported by a provider or runner (see `UsageRecord`).
+ * `bySubagent` entry. `contextFill` is the context the main model's last
+ * call left, with its window when known; omitted before a call was measured.
+ * Cost appears only as reported by a provider or runner (see `UsageRecord`).
  */
  | {
     type: 'planner_usage';
+    sessionBilling?: SessionBilling;
     byModel?: ModelUsage[];
     model?: string;
     turnId?: string;
     totals: UsageTotals;
     bySubagent?: Record<string, UsageTotals>;
-    contextFill?: {
-        usedTokens: number;
-        windowTokens: number;
-    };
+    contextFill?: ContextFill;
 }
 /**
  * A subagent began work on `brief`. Emitted by the planner backend that
@@ -1870,6 +1868,10 @@ declare class TaskOrchestrator {
     private store;
     private output;
     private attempts;
+    /** Bumped by every plan load: an ended attempt's wind-down belongs to the scope before it. */
+    private planScope;
+    /** Each task's runners still winding down once stopped: a continue waits for them (ADR-0018, L1). */
+    private windDowns;
     private verifier;
     /** Changed only by start, stop, a plan load, a usage-limit pause, a move off the limit, and {@link settleRun}. */
     private runState;
@@ -2507,6 +2509,18 @@ declare class TaskOrchestrator {
      * load reset the whole verifier themselves.
      */
     private endAttempt;
+    /**
+     * Let the attempt's runner go the way it ends a turn (ADR-0018, L1): it
+     * winds down on its own time, bounded by its interrupt grace, and nothing
+     * here waits on it but a continue of the same task.
+     */
+    private stopRunner;
+    /**
+     * An ended attempt's runner is gone: the count its session ended on is the
+     * one a continue of that session counts from. One still current is ended
+     * with that count instead.
+     */
+    private woundDown;
     /** Kept on the task once the attempt ends, so a continue can resume it after a reload (ADR-0018, K1). */
     private saveNativeSession;
     private endAllAttempts;
@@ -4544,17 +4558,14 @@ interface RunnerLoadedBlock {
     commands: readonly RunnerCommand[];
     mcpServers: readonly RunnerMcpServer[];
 }
-/** The token line. There is at most one, and it is always the last block. */
+/** The usage line (context and cost). Token counts ride in `totals` but are not drawn. There is at most one, and it is always the last block. */
 interface UsageBlock {
     byModel?: ModelUsage[];
     model?: string;
     type: 'usage';
     id: string;
     totals: UsageTotals;
-    contextFill?: {
-        usedTokens: number;
-        windowTokens: number;
-    };
+    contextFill?: ContextFill;
     bySubagent?: Record<string, UsageTotals>;
 }
 

package/dist/testing.d.mts

@@ -1,5 +1,5 @@
-import { N as IRunnerSession, ah as QueuedTaskMessage, aE as StructuredTurnEnd, aD as StructuredEvent, aJ as TaskCompleteArgs, r as CheckpointAnswer, aL as TaskMessageFrom, ap as RunnerCommand, O as InvokedCommand, j as ApprovalDecision, K as IConfig, L as IFileSystem } from './IFileSystem-C9W5mRYA.mjs';
-import { h as IntegrationDisposal, a5 as RunnerSessionCost, I as IWorktreeIsolation, j as IsolationAvailability, r as IsolationMergeResult, at as TreeSnapshot, a6 as SetupFailure, t as IsolationPruneResult, u as IsolationRemoval, s as IsolationOutcome, X as RepairEvidence, w as IsolationRun, ai as Task, T as PreparedTask, k as IsolationHandoff } from './Task-hFfRS9rN.mjs';
+import { N as IRunnerSession, ah as QueuedTaskMessage, aE as StructuredTurnEnd, aD as StructuredEvent, aJ as TaskCompleteArgs, r as CheckpointAnswer, aL as TaskMessageFrom, ap as RunnerCommand, O as InvokedCommand, j as ApprovalDecision, K as IConfig, L as IFileSystem } from './IFileSystem-1PqRCjhu.mjs';
+import { j as IntegrationDisposal, a8 as RunnerSessionCost, I as IWorktreeIsolation, l as IsolationAvailability, t as IsolationMergeResult, ax as TreeSnapshot, aa as SetupFailure, v as IsolationPruneResult, w as IsolationRemoval, u as IsolationOutcome, Z as RepairEvidence, y as IsolationRun, am as Task, V as PreparedTask, m as IsolationHandoff } from './Task-CfBM0wkV.mjs';
 import 'child_process';
 import 'zod/v4';
 
@@ -37,9 +37,14 @@ declare class FakeRunnerSession implements IRunnerSession {
     private completeCbs;
     private checkpointHandler;
     constructor(id?: string, taskId?: string, sessionId?: string | null);
+    /** `stop()` was asked for: the runner winds its turn down, still reporting, until {@link emitExit}. */
+    stopped: boolean;
+    private markGone;
+    private readonly gone;
     onOutput(cb: (text: string) => void): void;
     onExit(cb: (code: number) => void): void;
     kill(): void;
+    stop(): Promise<void>;
     getOutput(): string;
     emitOutput(text: string): void;
     emitExit(code: number): void;

package/dist/testing.d.ts

@@ -1,5 +1,5 @@
-import { N as IRunnerSession, ah as QueuedTaskMessage, aE as StructuredTurnEnd, aD as StructuredEvent, aJ as TaskCompleteArgs, r as CheckpointAnswer, aL as TaskMessageFrom, ap as RunnerCommand, O as InvokedCommand, j as ApprovalDecision, K as IConfig, L as IFileSystem } from './IFileSystem-B8qRNC_6.js';
-import { h as IntegrationDisposal, a5 as RunnerSessionCost, I as IWorktreeIsolation, j as IsolationAvailability, r as IsolationMergeResult, at as TreeSnapshot, a6 as SetupFailure, t as IsolationPruneResult, u as IsolationRemoval, s as IsolationOutcome, X as RepairEvidence, w as IsolationRun, ai as Task, T as PreparedTask, k as IsolationHandoff } from './Task-hFfRS9rN.js';
+import { N as IRunnerSession, ah as QueuedTaskMessage, aE as StructuredTurnEnd, aD as StructuredEvent, aJ as TaskCompleteArgs, r as CheckpointAnswer, aL as TaskMessageFrom, ap as RunnerCommand, O as InvokedCommand, j as ApprovalDecision, K as IConfig, L as IFileSystem } from './IFileSystem-lTRL_G9Z.js';
+import { j as IntegrationDisposal, a8 as RunnerSessionCost, I as IWorktreeIsolation, l as IsolationAvailability, t as IsolationMergeResult, ax as TreeSnapshot, aa as SetupFailure, v as IsolationPruneResult, w as IsolationRemoval, u as IsolationOutcome, Z as RepairEvidence, y as IsolationRun, am as Task, V as PreparedTask, m as IsolationHandoff } from './Task-CfBM0wkV.js';
 import 'child_process';
 import 'zod/v4';
 
@@ -37,9 +37,14 @@ declare class FakeRunnerSession implements IRunnerSession {
     private completeCbs;
     private checkpointHandler;
     constructor(id?: string, taskId?: string, sessionId?: string | null);
+    /** `stop()` was asked for: the runner winds its turn down, still reporting, until {@link emitExit}. */
+    stopped: boolean;
+    private markGone;
+    private readonly gone;
     onOutput(cb: (text: string) => void): void;
     onExit(cb: (code: number) => void): void;
     kill(): void;
+    stop(): Promise<void>;
     getOutput(): string;
     emitOutput(text: string): void;
     emitExit(code: number): void;

package/dist/testing.js

@@ -154,6 +154,12 @@ var FakeRunnerSession = class {
   eventCbs = [];
   completeCbs = [];
   checkpointHandler = null;
+  /** `stop()` was asked for: the runner winds its turn down, still reporting, until {@link emitExit}. */
+  stopped = false;
+  markGone;
+  gone = new Promise((resolve) => {
+    this.markGone = resolve;
+  });
   onOutput(cb) {
     this.outputCbs.push(cb);
   }
@@ -163,6 +169,10 @@ var FakeRunnerSession = class {
   kill() {
     this.killed = true;
   }
+  stop() {
+    this.stopped = true;
+    return this.gone;
+  }
   getOutput() {
     return this.output;
   }
@@ -172,6 +182,7 @@ var FakeRunnerSession = class {
   }
   emitExit(code) {
     for (const cb of this.exitCbs) cb(code);
+    this.markGone();
   }
   write(text) {
     this.written.push(text);