@ordewell/core 0.10.8 → 0.10.10

package/dist/{IFileSystem-C4_mpfze.d.ts → IFileSystem-1PqRCjhu.d.mts}

@@ -1,5 +1,5 @@
 import { ChildProcess } from 'child_process';
-import { a4 as RunnerId, av as UsageRecord, ag as SubagentOutcome, a5 as RunnerSessionCost, d as DiscoveredModel, ap as TaskSkillSnapshot } from './Task-C0o4i3Nn.js';
+import { a7 as RunnerId, az as UsageRecord, ak as SubagentOutcome, a8 as RunnerSessionCost, f as DiscoveredModel, at as TaskSkillSnapshot } from './Task-CfBM0wkV.mjs';
 import { z } from 'zod/v4';
 
 /**
@@ -1153,7 +1153,7 @@ type AgentEvent =
     success: boolean;
     subagentId?: string;
 }
-/** One model call's usage, as the agent reported it — never estimated. */
+/** Usage and session billing facts as the agent reported them — never priced by Ordewell. */
  | {
     type: 'usage';
     record: UsageRecord;
@@ -1427,6 +1427,8 @@ interface AgentAdapter {
     sessionCost?(): RunnerSessionCost | null;
     /** Kill the process and release its resources. Idempotent. */
     dispose(): void;
+    /** Whether the process has ended, for any reason. One that has can take no further turn. */
+    readonly exited: boolean;
     /**
      * Whether the Ordewell MCP server passed in the start options' `mcp` is
      * connected, as the runner itself reports it (ADR-0022, S4). Absent on an
@@ -1464,6 +1466,12 @@ interface TaskModeAgentAdapter extends AgentAdapter {
      * within `timeoutMs`, and the caller must fall back to killing it.
      */
     interrupt(timeoutMs: number): Promise<boolean>;
+    /**
+     * Tell the process nothing more is coming, once its turn has closed, so it
+     * ends by itself and keeps what it saves on the way out. The process exit
+     * reports its end. Absent on a runner whose process is only ever killed.
+     */
+    endInput?(): void;
     /**
      * Registers the listener for what the agent does after a turn has ended and
      * before the next message — a turn it opens itself when background work
@@ -1783,7 +1791,17 @@ interface IRunnerSession {
     taskId: string;
     onOutput(callback: (text: string) => void): void;
     onExit(callback: (code: number) => void): void;
+    /** End the process at once. {@link stop} is how an attempt that is over lets it go. */
     kill(): void;
+    /**
+     * End the session the way its runner ends a turn (ADR-0018, L1): nothing
+     * more is sent, a turn still open is interrupted and given the interrupt
+     * grace to close — so what the runner reports as it closes, its cost and a
+     * last call's usage, still reaches {@link onEvent} — then the process ends,
+     * by itself where its runner can, killed once the grace runs out. Resolves
+     * once it is gone, after {@link onExit}; at once when it already is.
+     */
+    stop(): Promise<void>;
     getOutput(): string;
     write(text: string): void;
     /** `working` while a turn runs; `idle` between turns, waiting for a message. */
@@ -1908,7 +1926,9 @@ interface IRunner {
         /** Something the user should know about how the spawn went that did not stop it — a respawn, most often. */
         onNotice?: (message: string) => void;
     }): Promise<IRunnerSession>;
-    stop(sessionId: string): void;
+    /** Wind one session down ({@link IRunnerSession.stop}); resolves once its process is gone. */
+    stop(sessionId: string): Promise<void>;
+    /** Wind every session down at once, as {@link stop} does one. */
     stopAll(): void;
     activeCount: number;
 }

package/dist/{IFileSystem-DUgeWWQN.d.mts → IFileSystem-lTRL_G9Z.d.ts}

@@ -1,5 +1,5 @@
 import { ChildProcess } from 'child_process';
-import { a4 as RunnerId, av as UsageRecord, ag as SubagentOutcome, a5 as RunnerSessionCost, d as DiscoveredModel, ap as TaskSkillSnapshot } from './Task-C0o4i3Nn.mjs';
+import { a7 as RunnerId, az as UsageRecord, ak as SubagentOutcome, a8 as RunnerSessionCost, f as DiscoveredModel, at as TaskSkillSnapshot } from './Task-CfBM0wkV.js';
 import { z } from 'zod/v4';
 
 /**
@@ -1153,7 +1153,7 @@ type AgentEvent =
     success: boolean;
     subagentId?: string;
 }
-/** One model call's usage, as the agent reported it — never estimated. */
+/** Usage and session billing facts as the agent reported them — never priced by Ordewell. */
  | {
     type: 'usage';
     record: UsageRecord;
@@ -1427,6 +1427,8 @@ interface AgentAdapter {
     sessionCost?(): RunnerSessionCost | null;
     /** Kill the process and release its resources. Idempotent. */
     dispose(): void;
+    /** Whether the process has ended, for any reason. One that has can take no further turn. */
+    readonly exited: boolean;
     /**
      * Whether the Ordewell MCP server passed in the start options' `mcp` is
      * connected, as the runner itself reports it (ADR-0022, S4). Absent on an
@@ -1464,6 +1466,12 @@ interface TaskModeAgentAdapter extends AgentAdapter {
      * within `timeoutMs`, and the caller must fall back to killing it.
      */
     interrupt(timeoutMs: number): Promise<boolean>;
+    /**
+     * Tell the process nothing more is coming, once its turn has closed, so it
+     * ends by itself and keeps what it saves on the way out. The process exit
+     * reports its end. Absent on a runner whose process is only ever killed.
+     */
+    endInput?(): void;
     /**
      * Registers the listener for what the agent does after a turn has ended and
      * before the next message — a turn it opens itself when background work
@@ -1783,7 +1791,17 @@ interface IRunnerSession {
     taskId: string;
     onOutput(callback: (text: string) => void): void;
     onExit(callback: (code: number) => void): void;
+    /** End the process at once. {@link stop} is how an attempt that is over lets it go. */
     kill(): void;
+    /**
+     * End the session the way its runner ends a turn (ADR-0018, L1): nothing
+     * more is sent, a turn still open is interrupted and given the interrupt
+     * grace to close — so what the runner reports as it closes, its cost and a
+     * last call's usage, still reaches {@link onEvent} — then the process ends,
+     * by itself where its runner can, killed once the grace runs out. Resolves
+     * once it is gone, after {@link onExit}; at once when it already is.
+     */
+    stop(): Promise<void>;
     getOutput(): string;
     write(text: string): void;
     /** `working` while a turn runs; `idle` between turns, waiting for a message. */
@@ -1908,7 +1926,9 @@ interface IRunner {
         /** Something the user should know about how the spawn went that did not stop it — a respawn, most often. */
         onNotice?: (message: string) => void;
     }): Promise<IRunnerSession>;
-    stop(sessionId: string): void;
+    /** Wind one session down ({@link IRunnerSession.stop}); resolves once its process is gone. */
+    stop(sessionId: string): Promise<void>;
+    /** Wind every session down at once, as {@link stop} does one. */
     stopAll(): void;
     activeCount: number;
 }

package/dist/{ModeResolver-4qNjxcDs.d.mts → ModeResolver-6TQXVsde.d.mts}

@@ -1,4 +1,4 @@
-import { a4 as RunnerId } from './Task-C0o4i3Nn.mjs';
+import { a7 as RunnerId } from './Task-CfBM0wkV.mjs';
 
 interface RunnerModeInfo {
     id: string;

package/dist/{ModeResolver-DGK2rWHE.d.ts → ModeResolver-CoJAJD-f.d.ts}

@@ -1,4 +1,4 @@
-import { a4 as RunnerId } from './Task-C0o4i3Nn.js';
+import { a7 as RunnerId } from './Task-CfBM0wkV.js';
 
 interface RunnerModeInfo {
     id: string;

package/dist/{Task-C0o4i3Nn.d.mts → Task-CfBM0wkV.d.mts}

@@ -125,8 +125,9 @@ interface IsolationTaskRecord {
     repairedFiles?: string[];
     /**
      * Set once the task's landed work is in the checked-out HEAD of every repo
-     * it changed — merged into the user's branch, by Merge all or by hand. What
-     * a merge gate waits for (ADR-0020).
+     * it changed — merged into the user's branch, by Merge all or by hand — or
+     * can no longer be merged there, its integration branch gone. What a merge
+     * gate waits for (ADR-0020).
      */
     inHead?: true;
 }
@@ -502,7 +503,9 @@ interface IWorktreeIsolation {
     /**
      * Mark the landed tasks whose work the checked-out HEAD now contains in
      * every repo they changed (`git merge-base --is-ancestor`), and return their
-     * ids. Only adds marks: a task found merged stays merged.
+     * ids. A repo whose integration branch is gone counts as containing it: no
+     * Merge all could bring that work in. Only adds marks: a task found merged
+     * stays merged.
      */
     findInHead(run: IsolationRun): Promise<string[]>;
     /**
@@ -548,6 +551,16 @@ interface IWorktreeIsolation {
     sweep(run: IsolationRun): Promise<void>;
 }
 
+/** How the runner says this session is paid for; absent means it has not said. */
+interface SessionBilling {
+    type: 'subscription' | 'api-key';
+    plan?: string;
+}
+interface CostProvenance {
+    kind: 'estimate' | 'billed' | 'unknown';
+    billing: SessionBilling['type'] | 'unknown' | 'mixed';
+    basis?: 'list' | 'managed';
+}
 /**
  * What one model call consumed, as its provider or runner reported it. Shared
  * by the planner's usage line (#49) and per-attempt task usage (#26): a record
@@ -569,22 +582,47 @@ interface UsageRecord {
     cachedInputTokens?: number;
     /**
      * Filled only from a provider's or runner's own report, never from a price
-     * table or an estimate: prices go stale, and a subscription runner has no
+     * table kept in Ordewell: prices go stale, and a subscription runner has no
      * per-token price at all. No report means no cost, not a guessed one.
      */
     reportedCost?: {
         amount: number;
         currency: string;
+        kind?: 'estimate' | 'billed';
+        basis?: 'list' | 'managed';
     };
+    sessionBilling?: SessionBilling;
     /**
      * The model's context window: as the runner or provider reported it, or,
      * when it reported none, from that runner's or provider's own model listing
      * (`ContextWindowFill`). Never from a table kept in Ordewell.
      */
     contextWindow?: number;
+    /**
+     * What the main model's context holds once this call is done, counted the
+     * way its runner's own UI counts it, so the meter reads what the user would
+     * see there. Runners differ, and no sum of the measures above can tell.
+     * A measure of the meter only: no total adds it. Absent, the meter reads the
+     * prompt.
+     */
+    contextTokens?: number;
+    /**
+     * The runner reset the main model's context outside a call — a compaction,
+     * or a `/clear`: no call, so the record measures nothing but `contextTokens`,
+     * the size it reported the context left at, if it did. It may name the model
+     * the new context belongs to; a record that names none is about whichever
+     * runs now.
+     */
+    compacted?: true;
     /** Set when a subagent made the call; its usage still counts toward the total. */
     subagentId?: string;
 }
+/** A model's window as its reporter stated it: what a plan saves of its session's windows (`SessionWindows`). */
+interface ReportedWindow {
+    source: string;
+    model: string;
+    contextWindow: number;
+}
 /**
  * A running sum of {@link UsageRecord}s. A measure stays absent until some
  * record reports it. Cost is kept per currency: two runners may bill in
@@ -595,6 +633,7 @@ interface UsageTotals {
     outputTokens?: number;
     cachedInputTokens?: number;
     reportedCost?: Record<string, number>;
+    costProvenance?: Record<string, CostProvenance>;
 }
 /**
  * The input side of a call whose provider reports its prompt in parts — the
@@ -614,9 +653,12 @@ declare function addUsage(totals: UsageTotals, record: UsageRecord): UsageTotals
  * What the planner has consumed over a session (#49). `totals` includes every
  * `bySubagent` entry. `lastPromptTokens` and `contextWindow` track the
  * planner's own calls only — a subagent runs its own model, whose window says
- * nothing about the planner's.
+ * nothing about the planner's. `lastPromptTokens` is the context the last call
+ * left (its `contextTokens`, else its prompt), under the name saved sessions
+ * already hold it by.
  */
 interface PlannerUsage {
+    sessionBilling?: SessionBilling;
     totals: UsageTotals;
     bySubagent?: Record<string, UsageTotals>;
     byModel?: ModelUsage[];
@@ -626,31 +668,35 @@ interface PlannerUsage {
     contextWindow?: number;
 }
 declare function addPlannerUsage(usage: PlannerUsage, record: UsageRecord): PlannerUsage;
-/** Whether any measure was reported: a token line of nothing but blanks says nothing. */
+/** Whether any measure was reported: a usage line of nothing but blanks says nothing. */
 declare function isMeasured(totals: UsageTotals): boolean;
-/** What the token line shows of a ledger — live from its broadcast, or reloaded from the saved one. */
+/**
+ * The main model's context: what its last call left in it, against its window
+ * when that is known. A window of 0 is not known.
+ */
+interface ContextFill {
+    usedTokens: number;
+    windowTokens?: number;
+}
+/** What the usage line draws of a ledger — live from its broadcast, or reloaded from the saved one. */
 interface UsageLine {
+    sessionBilling?: SessionBilling;
     byModel?: ModelUsage[];
     model?: string;
     totals: UsageTotals;
     bySubagent?: Record<string, UsageTotals>;
-    contextFill?: {
-        usedTokens: number;
-        windowTokens: number;
-    };
+    contextFill?: ContextFill;
 }
 declare function usageLine(usage: PlannerUsage): UsageLine;
 /**
- * The last planner prompt against its window, or undefined while either is
- * unknown. `usedTokens` is the prompt total as reported, cached tokens
+ * The main model's context as its last call left it, or undefined before one
+ * was measured and after a compaction that reported no size. `usedTokens` is
+ * what that call stated as its context, else its prompt total, cached tokens
  * included: a cached token still occupies the window, so subtracting the
- * cached share would understate how full the context is. A window of 0 is
- * treated as unknown — never guessed.
+ * cached share would understate how full the context is. The window rides
+ * along only when known; a window of 0 is treated as unknown — never guessed.
  */
-declare function plannerContextFill(usage: PlannerUsage): {
-    usedTokens: number;
-    windowTokens: number;
-} | undefined;
+declare function plannerContextFill(usage: PlannerUsage): ContextFill | undefined;
 interface ModelUsage {
     source: string;
     model?: string;
@@ -680,7 +726,9 @@ interface AttemptUsage extends PlannerUsage {
     runnerSessionCost?: RunnerSessionCost;
 }
 declare function startAttemptUsage(attempt: number, runner: string, startedAt: string): AttemptUsage;
+/** What its runner reports as it winds down after the attempt ended is added without moving its end. */
 declare function addAttemptUsage(usage: AttemptUsage, record: UsageRecord, now: string): AttemptUsage;
+/** An attempt ends once; ended again once its runner wound down, it only takes the count that runner ended on. */
 declare function endAttemptUsage(usage: AttemptUsage, now: string, runnerSessionCost?: RunnerSessionCost, sessionId?: string): AttemptUsage;
 /** The count a continue of `sessionId` starts from: the one its latest attempt in that session ended with. */
 declare function countedSessionCost(attempts: readonly AttemptUsage[] | undefined, sessionId: string): RunnerSessionCost | undefined;
@@ -713,12 +761,38 @@ declare function planUsage(tasks: readonly UsageTask[]): PlanUsage;
 interface TaskUsageSummary {
     totals: UsageTotals;
     attempts: number;
-    contextFill?: {
-        usedTokens: number;
-        windowTokens: number;
-    };
+    contextFill?: ContextFill;
 }
 declare function taskUsageSummary(task: Pick<UsageTask, 'attemptUsage'>): TaskUsageSummary;
+/** `950`, `1.5k`, `61k`, `261k`, `1.2M`. */
+declare function formatTokenCount(n: number): string;
+/** Two decimals from 1 up and up to four below it: a call can cost a fraction of a cent, a session several dollars. */
+declare function formatCost(currency: string, amount: number): string;
+/** `ctx 61k (6%)`, `ctx 61k` while the window is unknown, nothing before a call was measured. */
+declare function contextMeterText(fill: ContextFill | undefined): string | null;
+/** Exact counts for the meter's hover. */
+declare function contextMeterTitle(fill: ContextFill): string;
+/** The cost per currency as reported, joined by ` · `; null when none was reported. */
+declare function costText(totals: UsageTotals): string | null;
+/** The meter, then the cost, joined by ` · `; null when neither is known. */
+declare function usageText(usage: {
+    totals: UsageTotals;
+    contextFill?: ContextFill;
+}): string | null;
+/** Each runner/model's reported cost for the cost's hover, leaving out models with none. */
+declare function modelCostTitle(byModel: readonly ModelUsage[]): string | undefined;
+/** Each subagent's reported cost for the subagent count's hover, or that it reported none. */
+declare function subagentCostTitle(bySubagent: Readonly<Record<string, UsageTotals>>): string;
+/**
+ * `Tasks total: $3.20 · codex reports no cost`: the cost over every attempt,
+ * then the runners none of whose attempts reported one — codex reports no
+ * price, and a price table is not Ordewell's to keep (ADR-0017 U1). A runner is
+ * named only once an attempt of it has ended having reported usage: Claude
+ * Code states a cost only on a turn's last line, so a first attempt still in
+ * its turn has not said yet, and one that never ran said nothing. A total has
+ * no meter: each task's own model holds its own window.
+ */
+declare function tasksTotalText(tasks: readonly UsageTask[]): string | null;
 
 /**
  * How far a plan's supervisor may act in its wake-up turns (ADR-0029): a plan
@@ -1394,6 +1468,8 @@ interface LegacyPlanState {
     isolation?: PlanIsolation;
     /** Kept so a reopened session shows the same token line (#49). */
     plannerUsage?: PlannerUsage;
+    /** The windows reported over the session, so a reopened one knows each model's from its first call. */
+    contextWindows?: ReportedWindow[];
     /** The planner hit its usage limit and the inputs its turn took wait to be sent again; absent otherwise. */
     plannerResend?: PlannerResendState;
     /**
@@ -1486,4 +1562,4 @@ type ApprovalRecord = Pick<LegacyPlanState, 'approved' | 'approvedTasks'>;
  */
 declare function waitsForApproval(task: Pick<Task, 'id' | 'type' | 'status'>, record: ApprovalRecord): boolean;
 
-export { type ResearchProgress as $, type ApprovalRecord as A, BUILTIN_SKILL_NAMES as B, type ConversationMessage as C, DEFAULT_RUNNERS as D, type ExecutionActor as E, type IsolationTaskStatus as F, type GuardTarget as G, type IsolationView as H, type IWorktreeIsolation as I, type PlanIsolation as J, type PlanState as K, type LegacyPlanState as L, type ModelUsage as M, type PlanStatus as N, type PlanUsage as O, type PendingPlanTurn as P, type PlannerResendState as Q, type PlannerUsage as R, type PrepareIntent as S, type PreparedTask as T, type PreservedWork as U, type PreviousWork as V, type RefusedRemoval as W, type RepairEvidence as X, type ReplyRun as Y, type RepoGroupLayout as Z, type ResearchLogEntry as _, type AttemptUsage as a, type ResearchStep as a0, type ResearchStepOutcome as a1, type ResearchToolType as a2, type RunSettings as a3, type RunnerId as a4, type RunnerSessionCost as a5, type SetupFailure as a6, type ShadowedSkill as a7, type SkillAppliesTo as a8, type SkillCatalog as a9, addModelUsage as aA, addPlannerUsage as aB, addUsage as aC, addUsageTotals as aD, countedSessionCost as aE, createEmptyPlan as aF, createSkillsService as aG, createTask as aH, endAttemptUsage as aI, flattenTasks as aJ, flattenTasksWithParents as aK, isAwaitingReason as aL, isMeasured as aM, isSupervisorLevel as aN, isUserMessage as aO, migratePlanState as aP, partedPromptUsage as aQ, pausedOnLimit as aR, planUsage as aS, plannerContextFill as aT, rejoinPlanTree as aU, resumedSessionWindow as aV, startAttemptUsage as aW, taskUsageSummary as aX, usageLine as aY, waitsForApproval as aZ, type SkillInfo as aa, type SkillLoad as ab, type SkillLoadNotice as ac, type SkillMetadata as ad, type SkillSource as ae, SkillsService as af, type SubagentOutcome as ag, type SupervisorLevel as ah, type Task as ai, type TaskDiffRead as aj, type TaskDiffResult as ak, type TaskIsolation as al, type TaskIsolationState as am, type TaskModelAssignment as an, type TaskSkillNotice as ao, type TaskSkillSnapshot as ap, type TaskSnapshot as aq, type TaskStatus as ar, type TaskUsageSummary as as, type TreeSnapshot as at, type UsageLine as au, type UsageRecord as av, type UsageTotals as aw, type Verdict as ax, type VerificationCheck as ay, addAttemptUsage as az, type AwaitingReason as b, DEFAULT_SUPERVISOR_RETRY_LIMIT as c, type DiscoveredModel as d, type ExecutionCommandName as e, type ExecutionRecord as f, type GuardTrip as g, type IntegrationDisposal as h, type InvalidSkill as i, type IsolationAvailability as j, type IsolationHandoff as k, type IsolationHandoffRepo as l, type IsolationInactiveReason as m, type IsolationLandedTask as n, type IsolationLanding as o, type IsolationMergeBlock as p, type IsolationMergeBlockReason as q, type IsolationMergeResult as r, type IsolationOutcome as s, type IsolationPruneResult as t, type IsolationRemoval as u, type IsolationRepo as v, type IsolationRun as w, type IsolationTaskRecord as x, type IsolationTaskRef as y, type IsolationTaskRepo as z };
+export { type RepoGroupLayout as $, type ApprovalRecord as A, BUILTIN_SKILL_NAMES as B, type ContextFill as C, DEFAULT_RUNNERS as D, type ExecutionActor as E, type IsolationTaskRef as F, type GuardTarget as G, type IsolationTaskRepo as H, type IWorktreeIsolation as I, type IsolationTaskStatus as J, type IsolationView as K, type LegacyPlanState as L, type ModelUsage as M, type PlanIsolation as N, type PlanState as O, type PendingPlanTurn as P, type PlanStatus as Q, type PlanUsage as R, type PlannerResendState as S, type PlannerUsage as T, type PrepareIntent as U, type PreparedTask as V, type PreservedWork as W, type PreviousWork as X, type RefusedRemoval as Y, type RepairEvidence as Z, type ReplyRun as _, type AttemptUsage as a, pausedOnLimit as a$, type ReportedWindow as a0, type ResearchLogEntry as a1, type ResearchProgress as a2, type ResearchStep as a3, type ResearchStepOutcome as a4, type ResearchToolType as a5, type RunSettings as a6, type RunnerId as a7, type RunnerSessionCost as a8, type SessionBilling as a9, type UsageTotals as aA, type Verdict as aB, type VerificationCheck as aC, addAttemptUsage as aD, addModelUsage as aE, addPlannerUsage as aF, addUsage as aG, addUsageTotals as aH, contextMeterText as aI, contextMeterTitle as aJ, costText as aK, countedSessionCost as aL, createEmptyPlan as aM, createSkillsService as aN, createTask as aO, endAttemptUsage as aP, flattenTasks as aQ, flattenTasksWithParents as aR, formatCost as aS, formatTokenCount as aT, isAwaitingReason as aU, isMeasured as aV, isSupervisorLevel as aW, isUserMessage as aX, migratePlanState as aY, modelCostTitle as aZ, partedPromptUsage as a_, type SetupFailure as aa, type ShadowedSkill as ab, type SkillAppliesTo as ac, type SkillCatalog as ad, type SkillInfo as ae, type SkillLoad as af, type SkillLoadNotice as ag, type SkillMetadata as ah, type SkillSource as ai, SkillsService as aj, type SubagentOutcome as ak, type SupervisorLevel as al, type Task as am, type TaskDiffRead as an, type TaskDiffResult as ao, type TaskIsolation as ap, type TaskIsolationState as aq, type TaskModelAssignment as ar, type TaskSkillNotice as as, type TaskSkillSnapshot as at, type TaskSnapshot as au, type TaskStatus as av, type TaskUsageSummary as aw, type TreeSnapshot as ax, type UsageLine as ay, type UsageRecord as az, type AwaitingReason as b, planUsage as b0, plannerContextFill as b1, rejoinPlanTree as b2, resumedSessionWindow as b3, startAttemptUsage as b4, subagentCostTitle as b5, taskUsageSummary as b6, tasksTotalText as b7, usageLine as b8, usageText as b9, waitsForApproval as ba, type ConversationMessage as c, type CostProvenance as d, DEFAULT_SUPERVISOR_RETRY_LIMIT as e, type DiscoveredModel as f, type ExecutionCommandName as g, type ExecutionRecord as h, type GuardTrip as i, type IntegrationDisposal as j, type InvalidSkill as k, type IsolationAvailability as l, type IsolationHandoff as m, type IsolationHandoffRepo as n, type IsolationInactiveReason as o, type IsolationLandedTask as p, type IsolationLanding as q, type IsolationMergeBlock as r, type IsolationMergeBlockReason as s, type IsolationMergeResult as t, type IsolationOutcome as u, type IsolationPruneResult as v, type IsolationRemoval as w, type IsolationRepo as x, type IsolationRun as y, type IsolationTaskRecord as z };

package/dist/{Task-C0o4i3Nn.d.ts → Task-CfBM0wkV.d.ts}

@@ -125,8 +125,9 @@ interface IsolationTaskRecord {
     repairedFiles?: string[];
     /**
      * Set once the task's landed work is in the checked-out HEAD of every repo
-     * it changed — merged into the user's branch, by Merge all or by hand. What
-     * a merge gate waits for (ADR-0020).
+     * it changed — merged into the user's branch, by Merge all or by hand — or
+     * can no longer be merged there, its integration branch gone. What a merge
+     * gate waits for (ADR-0020).
      */
     inHead?: true;
 }
@@ -502,7 +503,9 @@ interface IWorktreeIsolation {
     /**
      * Mark the landed tasks whose work the checked-out HEAD now contains in
      * every repo they changed (`git merge-base --is-ancestor`), and return their
-     * ids. Only adds marks: a task found merged stays merged.
+     * ids. A repo whose integration branch is gone counts as containing it: no
+     * Merge all could bring that work in. Only adds marks: a task found merged
+     * stays merged.
      */
     findInHead(run: IsolationRun): Promise<string[]>;
     /**
@@ -548,6 +551,16 @@ interface IWorktreeIsolation {
     sweep(run: IsolationRun): Promise<void>;
 }
 
+/** How the runner says this session is paid for; absent means it has not said. */
+interface SessionBilling {
+    type: 'subscription' | 'api-key';
+    plan?: string;
+}
+interface CostProvenance {
+    kind: 'estimate' | 'billed' | 'unknown';
+    billing: SessionBilling['type'] | 'unknown' | 'mixed';
+    basis?: 'list' | 'managed';
+}
 /**
  * What one model call consumed, as its provider or runner reported it. Shared
  * by the planner's usage line (#49) and per-attempt task usage (#26): a record
@@ -569,22 +582,47 @@ interface UsageRecord {
     cachedInputTokens?: number;
     /**
      * Filled only from a provider's or runner's own report, never from a price
-     * table or an estimate: prices go stale, and a subscription runner has no
+     * table kept in Ordewell: prices go stale, and a subscription runner has no
      * per-token price at all. No report means no cost, not a guessed one.
      */
     reportedCost?: {
         amount: number;
         currency: string;
+        kind?: 'estimate' | 'billed';
+        basis?: 'list' | 'managed';
     };
+    sessionBilling?: SessionBilling;
     /**
      * The model's context window: as the runner or provider reported it, or,
      * when it reported none, from that runner's or provider's own model listing
      * (`ContextWindowFill`). Never from a table kept in Ordewell.
      */
     contextWindow?: number;
+    /**
+     * What the main model's context holds once this call is done, counted the
+     * way its runner's own UI counts it, so the meter reads what the user would
+     * see there. Runners differ, and no sum of the measures above can tell.
+     * A measure of the meter only: no total adds it. Absent, the meter reads the
+     * prompt.
+     */
+    contextTokens?: number;
+    /**
+     * The runner reset the main model's context outside a call — a compaction,
+     * or a `/clear`: no call, so the record measures nothing but `contextTokens`,
+     * the size it reported the context left at, if it did. It may name the model
+     * the new context belongs to; a record that names none is about whichever
+     * runs now.
+     */
+    compacted?: true;
     /** Set when a subagent made the call; its usage still counts toward the total. */
     subagentId?: string;
 }
+/** A model's window as its reporter stated it: what a plan saves of its session's windows (`SessionWindows`). */
+interface ReportedWindow {
+    source: string;
+    model: string;
+    contextWindow: number;
+}
 /**
  * A running sum of {@link UsageRecord}s. A measure stays absent until some
  * record reports it. Cost is kept per currency: two runners may bill in
@@ -595,6 +633,7 @@ interface UsageTotals {
     outputTokens?: number;
     cachedInputTokens?: number;
     reportedCost?: Record<string, number>;
+    costProvenance?: Record<string, CostProvenance>;
 }
 /**
  * The input side of a call whose provider reports its prompt in parts — the
@@ -614,9 +653,12 @@ declare function addUsage(totals: UsageTotals, record: UsageRecord): UsageTotals
  * What the planner has consumed over a session (#49). `totals` includes every
  * `bySubagent` entry. `lastPromptTokens` and `contextWindow` track the
  * planner's own calls only — a subagent runs its own model, whose window says
- * nothing about the planner's.
+ * nothing about the planner's. `lastPromptTokens` is the context the last call
+ * left (its `contextTokens`, else its prompt), under the name saved sessions
+ * already hold it by.
  */
 interface PlannerUsage {
+    sessionBilling?: SessionBilling;
     totals: UsageTotals;
     bySubagent?: Record<string, UsageTotals>;
     byModel?: ModelUsage[];
@@ -626,31 +668,35 @@ interface PlannerUsage {
     contextWindow?: number;
 }
 declare function addPlannerUsage(usage: PlannerUsage, record: UsageRecord): PlannerUsage;
-/** Whether any measure was reported: a token line of nothing but blanks says nothing. */
+/** Whether any measure was reported: a usage line of nothing but blanks says nothing. */
 declare function isMeasured(totals: UsageTotals): boolean;
-/** What the token line shows of a ledger — live from its broadcast, or reloaded from the saved one. */
+/**
+ * The main model's context: what its last call left in it, against its window
+ * when that is known. A window of 0 is not known.
+ */
+interface ContextFill {
+    usedTokens: number;
+    windowTokens?: number;
+}
+/** What the usage line draws of a ledger — live from its broadcast, or reloaded from the saved one. */
 interface UsageLine {
+    sessionBilling?: SessionBilling;
     byModel?: ModelUsage[];
     model?: string;
     totals: UsageTotals;
     bySubagent?: Record<string, UsageTotals>;
-    contextFill?: {
-        usedTokens: number;
-        windowTokens: number;
-    };
+    contextFill?: ContextFill;
 }
 declare function usageLine(usage: PlannerUsage): UsageLine;
 /**
- * The last planner prompt against its window, or undefined while either is
- * unknown. `usedTokens` is the prompt total as reported, cached tokens
+ * The main model's context as its last call left it, or undefined before one
+ * was measured and after a compaction that reported no size. `usedTokens` is
+ * what that call stated as its context, else its prompt total, cached tokens
  * included: a cached token still occupies the window, so subtracting the
- * cached share would understate how full the context is. A window of 0 is
- * treated as unknown — never guessed.
+ * cached share would understate how full the context is. The window rides
+ * along only when known; a window of 0 is treated as unknown — never guessed.
  */
-declare function plannerContextFill(usage: PlannerUsage): {
-    usedTokens: number;
-    windowTokens: number;
-} | undefined;
+declare function plannerContextFill(usage: PlannerUsage): ContextFill | undefined;
 interface ModelUsage {
     source: string;
     model?: string;
@@ -680,7 +726,9 @@ interface AttemptUsage extends PlannerUsage {
     runnerSessionCost?: RunnerSessionCost;
 }
 declare function startAttemptUsage(attempt: number, runner: string, startedAt: string): AttemptUsage;
+/** What its runner reports as it winds down after the attempt ended is added without moving its end. */
 declare function addAttemptUsage(usage: AttemptUsage, record: UsageRecord, now: string): AttemptUsage;
+/** An attempt ends once; ended again once its runner wound down, it only takes the count that runner ended on. */
 declare function endAttemptUsage(usage: AttemptUsage, now: string, runnerSessionCost?: RunnerSessionCost, sessionId?: string): AttemptUsage;
 /** The count a continue of `sessionId` starts from: the one its latest attempt in that session ended with. */
 declare function countedSessionCost(attempts: readonly AttemptUsage[] | undefined, sessionId: string): RunnerSessionCost | undefined;
@@ -713,12 +761,38 @@ declare function planUsage(tasks: readonly UsageTask[]): PlanUsage;
 interface TaskUsageSummary {
     totals: UsageTotals;
     attempts: number;
-    contextFill?: {
-        usedTokens: number;
-        windowTokens: number;
-    };
+    contextFill?: ContextFill;
 }
 declare function taskUsageSummary(task: Pick<UsageTask, 'attemptUsage'>): TaskUsageSummary;
+/** `950`, `1.5k`, `61k`, `261k`, `1.2M`. */
+declare function formatTokenCount(n: number): string;
+/** Two decimals from 1 up and up to four below it: a call can cost a fraction of a cent, a session several dollars. */
+declare function formatCost(currency: string, amount: number): string;
+/** `ctx 61k (6%)`, `ctx 61k` while the window is unknown, nothing before a call was measured. */
+declare function contextMeterText(fill: ContextFill | undefined): string | null;
+/** Exact counts for the meter's hover. */
+declare function contextMeterTitle(fill: ContextFill): string;
+/** The cost per currency as reported, joined by ` · `; null when none was reported. */
+declare function costText(totals: UsageTotals): string | null;
+/** The meter, then the cost, joined by ` · `; null when neither is known. */
+declare function usageText(usage: {
+    totals: UsageTotals;
+    contextFill?: ContextFill;
+}): string | null;
+/** Each runner/model's reported cost for the cost's hover, leaving out models with none. */
+declare function modelCostTitle(byModel: readonly ModelUsage[]): string | undefined;
+/** Each subagent's reported cost for the subagent count's hover, or that it reported none. */
+declare function subagentCostTitle(bySubagent: Readonly<Record<string, UsageTotals>>): string;
+/**
+ * `Tasks total: $3.20 · codex reports no cost`: the cost over every attempt,
+ * then the runners none of whose attempts reported one — codex reports no
+ * price, and a price table is not Ordewell's to keep (ADR-0017 U1). A runner is
+ * named only once an attempt of it has ended having reported usage: Claude
+ * Code states a cost only on a turn's last line, so a first attempt still in
+ * its turn has not said yet, and one that never ran said nothing. A total has
+ * no meter: each task's own model holds its own window.
+ */
+declare function tasksTotalText(tasks: readonly UsageTask[]): string | null;
 
 /**
  * How far a plan's supervisor may act in its wake-up turns (ADR-0029): a plan
@@ -1394,6 +1468,8 @@ interface LegacyPlanState {
     isolation?: PlanIsolation;
     /** Kept so a reopened session shows the same token line (#49). */
     plannerUsage?: PlannerUsage;
+    /** The windows reported over the session, so a reopened one knows each model's from its first call. */
+    contextWindows?: ReportedWindow[];
     /** The planner hit its usage limit and the inputs its turn took wait to be sent again; absent otherwise. */
     plannerResend?: PlannerResendState;
     /**
@@ -1486,4 +1562,4 @@ type ApprovalRecord = Pick<LegacyPlanState, 'approved' | 'approvedTasks'>;
  */
 declare function waitsForApproval(task: Pick<Task, 'id' | 'type' | 'status'>, record: ApprovalRecord): boolean;
 
-export { type ResearchProgress as $, type ApprovalRecord as A, BUILTIN_SKILL_NAMES as B, type ConversationMessage as C, DEFAULT_RUNNERS as D, type ExecutionActor as E, type IsolationTaskStatus as F, type GuardTarget as G, type IsolationView as H, type IWorktreeIsolation as I, type PlanIsolation as J, type PlanState as K, type LegacyPlanState as L, type ModelUsage as M, type PlanStatus as N, type PlanUsage as O, type PendingPlanTurn as P, type PlannerResendState as Q, type PlannerUsage as R, type PrepareIntent as S, type PreparedTask as T, type PreservedWork as U, type PreviousWork as V, type RefusedRemoval as W, type RepairEvidence as X, type ReplyRun as Y, type RepoGroupLayout as Z, type ResearchLogEntry as _, type AttemptUsage as a, type ResearchStep as a0, type ResearchStepOutcome as a1, type ResearchToolType as a2, type RunSettings as a3, type RunnerId as a4, type RunnerSessionCost as a5, type SetupFailure as a6, type ShadowedSkill as a7, type SkillAppliesTo as a8, type SkillCatalog as a9, addModelUsage as aA, addPlannerUsage as aB, addUsage as aC, addUsageTotals as aD, countedSessionCost as aE, createEmptyPlan as aF, createSkillsService as aG, createTask as aH, endAttemptUsage as aI, flattenTasks as aJ, flattenTasksWithParents as aK, isAwaitingReason as aL, isMeasured as aM, isSupervisorLevel as aN, isUserMessage as aO, migratePlanState as aP, partedPromptUsage as aQ, pausedOnLimit as aR, planUsage as aS, plannerContextFill as aT, rejoinPlanTree as aU, resumedSessionWindow as aV, startAttemptUsage as aW, taskUsageSummary as aX, usageLine as aY, waitsForApproval as aZ, type SkillInfo as aa, type SkillLoad as ab, type SkillLoadNotice as ac, type SkillMetadata as ad, type SkillSource as ae, SkillsService as af, type SubagentOutcome as ag, type SupervisorLevel as ah, type Task as ai, type TaskDiffRead as aj, type TaskDiffResult as ak, type TaskIsolation as al, type TaskIsolationState as am, type TaskModelAssignment as an, type TaskSkillNotice as ao, type TaskSkillSnapshot as ap, type TaskSnapshot as aq, type TaskStatus as ar, type TaskUsageSummary as as, type TreeSnapshot as at, type UsageLine as au, type UsageRecord as av, type UsageTotals as aw, type Verdict as ax, type VerificationCheck as ay, addAttemptUsage as az, type AwaitingReason as b, DEFAULT_SUPERVISOR_RETRY_LIMIT as c, type DiscoveredModel as d, type ExecutionCommandName as e, type ExecutionRecord as f, type GuardTrip as g, type IntegrationDisposal as h, type InvalidSkill as i, type IsolationAvailability as j, type IsolationHandoff as k, type IsolationHandoffRepo as l, type IsolationInactiveReason as m, type IsolationLandedTask as n, type IsolationLanding as o, type IsolationMergeBlock as p, type IsolationMergeBlockReason as q, type IsolationMergeResult as r, type IsolationOutcome as s, type IsolationPruneResult as t, type IsolationRemoval as u, type IsolationRepo as v, type IsolationRun as w, type IsolationTaskRecord as x, type IsolationTaskRef as y, type IsolationTaskRepo as z };
+export { type RepoGroupLayout as $, type ApprovalRecord as A, BUILTIN_SKILL_NAMES as B, type ContextFill as C, DEFAULT_RUNNERS as D, type ExecutionActor as E, type IsolationTaskRef as F, type GuardTarget as G, type IsolationTaskRepo as H, type IWorktreeIsolation as I, type IsolationTaskStatus as J, type IsolationView as K, type LegacyPlanState as L, type ModelUsage as M, type PlanIsolation as N, type PlanState as O, type PendingPlanTurn as P, type PlanStatus as Q, type PlanUsage as R, type PlannerResendState as S, type PlannerUsage as T, type PrepareIntent as U, type PreparedTask as V, type PreservedWork as W, type PreviousWork as X, type RefusedRemoval as Y, type RepairEvidence as Z, type ReplyRun as _, type AttemptUsage as a, pausedOnLimit as a$, type ReportedWindow as a0, type ResearchLogEntry as a1, type ResearchProgress as a2, type ResearchStep as a3, type ResearchStepOutcome as a4, type ResearchToolType as a5, type RunSettings as a6, type RunnerId as a7, type RunnerSessionCost as a8, type SessionBilling as a9, type UsageTotals as aA, type Verdict as aB, type VerificationCheck as aC, addAttemptUsage as aD, addModelUsage as aE, addPlannerUsage as aF, addUsage as aG, addUsageTotals as aH, contextMeterText as aI, contextMeterTitle as aJ, costText as aK, countedSessionCost as aL, createEmptyPlan as aM, createSkillsService as aN, createTask as aO, endAttemptUsage as aP, flattenTasks as aQ, flattenTasksWithParents as aR, formatCost as aS, formatTokenCount as aT, isAwaitingReason as aU, isMeasured as aV, isSupervisorLevel as aW, isUserMessage as aX, migratePlanState as aY, modelCostTitle as aZ, partedPromptUsage as a_, type SetupFailure as aa, type ShadowedSkill as ab, type SkillAppliesTo as ac, type SkillCatalog as ad, type SkillInfo as ae, type SkillLoad as af, type SkillLoadNotice as ag, type SkillMetadata as ah, type SkillSource as ai, SkillsService as aj, type SubagentOutcome as ak, type SupervisorLevel as al, type Task as am, type TaskDiffRead as an, type TaskDiffResult as ao, type TaskIsolation as ap, type TaskIsolationState as aq, type TaskModelAssignment as ar, type TaskSkillNotice as as, type TaskSkillSnapshot as at, type TaskSnapshot as au, type TaskStatus as av, type TaskUsageSummary as aw, type TreeSnapshot as ax, type UsageLine as ay, type UsageRecord as az, type AwaitingReason as b, planUsage as b0, plannerContextFill as b1, rejoinPlanTree as b2, resumedSessionWindow as b3, startAttemptUsage as b4, subagentCostTitle as b5, taskUsageSummary as b6, tasksTotalText as b7, usageLine as b8, usageText as b9, waitsForApproval as ba, type ConversationMessage as c, type CostProvenance as d, DEFAULT_SUPERVISOR_RETRY_LIMIT as e, type DiscoveredModel as f, type ExecutionCommandName as g, type ExecutionRecord as h, type GuardTrip as i, type IntegrationDisposal as j, type InvalidSkill as k, type IsolationAvailability as l, type IsolationHandoff as m, type IsolationHandoffRepo as n, type IsolationInactiveReason as o, type IsolationLandedTask as p, type IsolationLanding as q, type IsolationMergeBlock as r, type IsolationMergeBlockReason as s, type IsolationMergeResult as t, type IsolationOutcome as u, type IsolationPruneResult as v, type IsolationRemoval as w, type IsolationRepo as x, type IsolationRun as y, type IsolationTaskRecord as z };

package/dist/{chunk-H7QX32BH.mjs → chunk-24EL4Z2W.mjs}

@@ -7,7 +7,7 @@ import {
   flattenTasksWithParents,
   inheritedSkills,
   skillNames
-} from "./chunk-EEE2GBLG.mjs";
+} from "./chunk-PFH7WFIB.mjs";
 
 // src/services/JsonExtractor.ts
 var PLAN_ENVELOPE_KEY = "tasks";
@@ -644,4 +644,4 @@ export {
   checkPlanInvariants,
   detectCycle
 };
-//# sourceMappingURL=chunk-H7QX32BH.mjs.map
+//# sourceMappingURL=chunk-24EL4Z2W.mjs.map