@ordewell/core 0.5.3 → 0.5.5

package/dist/{ITerminalRunner-Bd-vAJnw.d.ts → ITerminalRunner-BV9Rd2o9.d.ts}

@@ -1,5 +1,5 @@
 import { I as IApproval, a as ApprovalMode } from './ApprovalPolicy-BVhGdECT.js';
-import { F as RunnerId } from './Task-BxQkPlXO.js';
+import { H as RunnerId } from './Task-Vl5Zq_D-.js';
 
 interface ToolOutcome {
     success: boolean;
@@ -121,6 +121,8 @@ interface OrchestratorOption {
     apiProvider: AiProvider;
     description?: string;
     pricing?: string;
+    /** The model's context window when the catalog reports one (#49). */
+    contextWindow?: number;
 }
 
 interface FetchAllProviderModelsOptions {

package/dist/{ITerminalRunner-ByeoLF57.d.mts → ITerminalRunner-C77ZNZS9.d.mts}

@@ -1,5 +1,5 @@
 import { I as IApproval, a as ApprovalMode } from './ApprovalPolicy-BVhGdECT.mjs';
-import { F as RunnerId } from './Task-BxQkPlXO.mjs';
+import { H as RunnerId } from './Task-Vl5Zq_D-.mjs';
 
 interface ToolOutcome {
     success: boolean;
@@ -121,6 +121,8 @@ interface OrchestratorOption {
     apiProvider: AiProvider;
     description?: string;
     pricing?: string;
+    /** The model's context window when the catalog reports one (#49). */
+    contextWindow?: number;
 }
 
 interface FetchAllProviderModelsOptions {

package/dist/{ModeResolver-DVJ7HV3k.d.mts → ModeResolver-D-SUFRNF.d.mts}

@@ -1,4 +1,4 @@
-import { F as RunnerId } from './Task-BxQkPlXO.mjs';
+import { H as RunnerId } from './Task-Vl5Zq_D-.mjs';
 
 interface RunnerModeInfo {
     id: string;

package/dist/{ModeResolver-Dkig8ghQ.d.ts → ModeResolver-D3XO0fT9.d.ts}

@@ -1,4 +1,4 @@
-import { F as RunnerId } from './Task-BxQkPlXO.js';
+import { H as RunnerId } from './Task-Vl5Zq_D-.js';
 
 interface RunnerModeInfo {
     id: string;

package/dist/{Task-BxQkPlXO.d.mts → Task-Vl5Zq_D-.d.mts}

@@ -72,6 +72,12 @@ interface IsolationTaskRecord {
     repos: Record<string, IsolationTaskRepo>;
     /** The repo whose merge stopped the task from landing, while `status` is `conflict` or `failed`. */
     conflictRepo?: string;
+    /**
+     * What a `failed` landing stopped on, in words a surface can repeat — a
+     * missing worktree is the common one. Cleared by the next landing attempt,
+     * so a stale reason cannot outlive the failure it explains.
+     */
+    landingError?: string;
     /** Repo-relative paths, in `conflictRepo`, that conflicted; set only while `status` is `conflict` or `repairing`. */
     conflictFiles?: string[];
     /**
@@ -275,6 +281,18 @@ interface PreparedTask {
      */
     copied: string[];
 }
+/**
+ * What a crash-recovery prune found and left alone: task records that were
+ * `active` yet still held unlanded work, so the prune kept them as `kept`
+ * rather than deleting work no one else has.
+ */
+interface IsolationPruneResult {
+    kept: Array<{
+        taskId: string;
+        order: number;
+        title: string;
+    }>;
+}
 interface IWorktreeIsolation {
     /**
      * A repo group with at least one repo to isolate, a clean tracked tree in
@@ -333,9 +351,9 @@ interface IWorktreeIsolation {
      */
     integrate(task: Task, run: IsolationRun, persist?: () => void): Promise<IsolationOutcome>;
     /**
-     * `keep: false` removes the task's worktree, branch and record (cancel, task
+     * `keep: false` removes the task's worktree, branch and record (retry, task
      * removal). `keep: true` leaves the worktree and branch exactly as they are
-     * for inspection — a failed verdict — and only moves the task off `active`,
+     * for inspection — a failed verdict, a stop, a cancel — and only moves the task off `active`,
      * so a crash-recovery prune does not sweep it away; a repair it ends leaves
      * the task `conflict`, as it was before the repair. Takes the run rather than
      * a bare task id: ids are only unique within one plan, and one daemon serves
@@ -349,9 +367,13 @@ interface IWorktreeIsolation {
     /**
      * Drop what a crash left behind: a landing it interrupted is rolled back in
      * every repo, a repair it interrupted leaves its task `conflict`, then stale
-     * active worktrees and directories no record owns go.
+     * active worktrees and directories no record owns go. An `active` record
+     * that still holds unlanded work — commits its branch alone carries, or
+     * edits in its worktree — is not a crash orphan: it may belong to a runner
+     * another host is still driving, so it is kept as `kept` and named in the
+     * result.
      */
-    pruneOrphans(run: IsolationRun): Promise<void>;
+    pruneOrphans(run: IsolationRun): Promise<IsolationPruneResult>;
     /** Unified diff of each repo's integration branch against its base ref. */
     reviewDiff(run: IsolationRun): Promise<string>;
     /**
@@ -382,6 +404,99 @@ interface IWorktreeIsolation {
     sweep(run: IsolationRun): Promise<void>;
 }
 
+/**
+ * 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
+ * says nothing about who asked for the call, so either can hold a list of them.
+ *
+ * Every measure is optional because backends report different subsets. An
+ * absent field means "not reported" — never zero — so a total can tell the two
+ * apart.
+ */
+interface UsageRecord {
+    /** The provider or runner id that reported the call — `openai`, `claude-code`, … */
+    source: string;
+    model?: string;
+    inputTokens?: number;
+    outputTokens?: number;
+    /** The share of `inputTokens` served from the provider's prompt cache. */
+    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
+     * per-token price at all. No report means no cost, not a guessed one.
+     */
+    reportedCost?: {
+        amount: number;
+        currency: string;
+    };
+    /** The model's context window, when the runner itself reports it. */
+    contextWindow?: number;
+    /** Set when a subagent made the call; its usage still counts toward the total. */
+    subagentId?: string;
+}
+/**
+ * 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
+ * different ones, and there is no honest exchange rate to fold them together.
+ */
+interface UsageTotals {
+    inputTokens?: number;
+    outputTokens?: number;
+    cachedInputTokens?: number;
+    reportedCost?: Record<string, number>;
+}
+/**
+ * The input side of a call whose provider reports its prompt in parts — the
+ * uncached tail, with cache reads and cache writes beside it rather than inside
+ * it (Anthropic, and OpenCode after it). The prompt the model saw is all three;
+ * only the reads were served from cache, since a write is billed as fresh
+ * input. A part left unreported adds nothing, and with no part reported there
+ * is no measure at all.
+ */
+declare function partedPromptUsage(parts: {
+    uncached?: number;
+    cacheRead?: number;
+    cacheWrite?: number;
+}): Pick<UsageRecord, 'inputTokens' | 'cachedInputTokens'>;
+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.
+ */
+interface PlannerUsage {
+    totals: UsageTotals;
+    bySubagent?: Record<string, UsageTotals>;
+    lastPromptTokens?: number;
+    contextWindow?: number;
+}
+declare function addPlannerUsage(usage: PlannerUsage, record: UsageRecord): PlannerUsage;
+/** Whether any measure was reported: a token 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. */
+interface UsageLine {
+    totals: UsageTotals;
+    bySubagent?: Record<string, UsageTotals>;
+    contextFill?: {
+        usedTokens: number;
+        windowTokens: number;
+    };
+}
+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
+ * 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.
+ */
+declare function plannerContextFill(usage: PlannerUsage): {
+    usedTokens: number;
+    windowTokens: number;
+} | undefined;
+
 interface UserStep {
     order: number;
     instruction: string;
@@ -478,6 +593,8 @@ interface ResearchStep {
     /** The model's tool_call id, so a surface can match `tool_result` to the
      * pending `tool_call` it announced — robust under parallel same-tool rounds. */
     toolCallId?: string;
+    /** The research subagent that ran the call, so a reload regroups it under that subagent. */
+    subagentId?: string;
     timestamp: string;
     thinkingText?: string;
 }
@@ -487,9 +604,30 @@ interface UserPromptEntry {
     content: string;
     timestamp: string;
 }
-type ResearchLogEntry = ResearchStep | UserPromptEntry;
+type SubagentOutcome = 'done' | 'failed' | 'stopped';
+/**
+ * One subagent's whole run, logged when it finishes: what it was asked, how it
+ * ended and what it reported. Its steps stay separate entries carrying the same
+ * `subagentId`, so an older reader that knows only steps still shows them.
+ */
+interface SubagentLogEntry {
+    id: string;
+    type: 'subagent';
+    subagentId: string;
+    brief: string;
+    model?: string;
+    outcome: SubagentOutcome;
+    digest: string;
+    usage?: UsageTotals;
+    timestamp: string;
+}
+type ResearchLogEntry = ResearchStep | UserPromptEntry | SubagentLogEntry;
 interface ResearchProgress {
-    type: 'thinking' | 'tool_call' | 'tool_result' | 'plan_token' | 'interrupted' | 'liveness';
+    type: 'thinking' | 'tool_call' | 'tool_result' | 'plan_token' | 'interrupted' | 'liveness' | 'text_delta' | 'text_retracted' | 'usage' | 'subagent_started' | 'subagent_finished';
+    /** Minted by whoever runs the turn and passed through untouched; absent outside a turn. */
+    turnId?: string;
+    /** One continuous run of model text — text before a tool call is its own segment. */
+    segmentId?: string;
     text?: string;
     tool?: string;
     /** Harness planners (ADR-0009): the agent's own name for a tool Ordewell has no member for. */
@@ -504,6 +642,12 @@ interface ResearchProgress {
     toolCallId?: string;
     /** Present when this event originates from (or reports on) one spawned research subagent (issue #34). */
     subagentId?: string;
+    record?: UsageRecord;
+    brief?: string;
+    model?: string;
+    outcome?: SubagentOutcome;
+    digest?: string;
+    usage?: UsageTotals;
 }
 interface ThinkingBlock {
     id: string;
@@ -543,6 +687,12 @@ interface DiscoveredModel {
         id: string;
         label: string;
     }[];
+    /**
+     * The model's context window when the runner or catalog reports it (#49).
+     * Read by the planner-model lookup so context fill can be shown; absent when
+     * unknown rather than defaulted to zero.
+     */
+    contextWindow?: number;
 }
 type PlanStatus = 'draft' | 'approved' | 'rejected' | 'running' | 'completed';
 /**
@@ -598,6 +748,8 @@ interface LegacyPlanState {
      * must leave it behind rather than share it.
      */
     isolation?: PlanIsolation;
+    /** Kept so a reopened session shows the same token line (#49). */
+    plannerUsage?: PlannerUsage;
 }
 interface Message {
     id: string;
@@ -643,6 +795,15 @@ declare function addTaskToPlan(tasks: Task[], partial: Partial<Task>): Task[];
 declare function removeTaskFromPlan(tasks: Task[], taskId: string): Task[];
 declare function updateTaskInPlan(tasks: Task[], taskId: string, changes: Partial<Task>): Task[];
 declare function renumberTasks(tasks: Task[]): Task[];
+/**
+ * Lay a planner-written task list over the plan it rewrites without letting it
+ * change execution state. A planner restates tasks; it never witnessed one run,
+ * so the status it writes is not evidence. A settled task is kept exactly as
+ * it stands wherever the rewrite names it, and put back beside its old
+ * neighbour where the rewrite leaves it out. Every other task keeps the status
+ * it had; a task the rewrite adds starts pending.
+ */
+declare function keepExecutionState(current: Task[], rewrite: Task[]): Task[];
 declare function validateModifiedPlan(original: Task[], modified: Task[]): PlanModificationWarnings;
 interface ActiveTaskSession {
     id: string;
@@ -661,4 +822,4 @@ interface ValidationContext {
 type ValidationCheck = (ctx: ValidationContext) => ValidationResult;
 declare function warningsText(w: PlanModificationWarnings): string | null;
 
-export { type UserStep as $, type ActiveTaskSession as A, type ResearchStepOutcome as B, type ConversationMessage as C, type DiscoveredMode as D, type ResearchToolType as E, type RunnerId as F, type StreamStepEvent as G, type StreamThinkingEvent as H, type IWorktreeIsolation as I, type TaskIsolation as J, type TaskIsolationState as K, type LegacyPlanState as L, type Message as M, type TaskMode as N, type TaskModelAssignment as O, type PlanIsolation as P, type QueuedMessage as Q, type RepairEvidence as R, type StreamEvent as S, type Task as T, type TaskOutputSummary as U, type TaskSnapshot as V, type TaskStatus as W, type TaskType as X, type TaskWithParent as Y, type ThinkingBlock as Z, type UserPromptEntry as _, type DiscoveredModel as a, type ValidationCheck as a0, type ValidationContext as a1, type ValidationResult as a2, type Verdict as a3, type VerificationCheck as a4, addTaskToPlan as a5, createEmptyPlan as a6, createTask as a7, emptyWarnings as a8, flattenTasks as a9, flattenTasksWithParents as aa, migrateLegacyPlan as ab, migratePlanState as ac, migrateTask as ad, removeTaskFromPlan as ae, renumberTasks as af, updateTaskInPlan as ag, validateModifiedPlan as ah, warningsText as ai, type IntegrationDisposal as b, type IsolationAvailability as c, type IsolationHandoff as d, type IsolationHandoffRepo as e, type IsolationInactiveReason as f, type IsolationLandedTask as g, type IsolationLanding as h, type IsolationMergeBlock as i, type IsolationMergeBlockReason as j, type IsolationMergeResult as k, type IsolationOutcome as l, type IsolationRepo as m, type IsolationRun as n, type IsolationTaskRecord as o, type IsolationTaskRepo as p, type IsolationTaskStatus as q, type IsolationView as r, type PlanModificationWarnings as s, type PlanState as t, type PlanStatus as u, type PreparedTask as v, type RepoGroupLayout as w, type ResearchLogEntry as x, type ResearchProgress as y, type ResearchStep as z };
+export { type TaskType as $, type ActiveTaskSession as A, type ResearchProgress as B, type ConversationMessage as C, type DiscoveredMode as D, type ResearchStep as E, type ResearchStepOutcome as F, type ResearchToolType as G, type RunnerId as H, type IWorktreeIsolation as I, type StreamStepEvent as J, type StreamThinkingEvent as K, type LegacyPlanState as L, type Message as M, type SubagentLogEntry as N, type SubagentOutcome as O, type PlanIsolation as P, type QueuedMessage as Q, type RepairEvidence as R, type StreamEvent as S, type Task as T, type TaskIsolation as U, type TaskIsolationState as V, type TaskMode as W, type TaskModelAssignment as X, type TaskOutputSummary as Y, type TaskSnapshot as Z, type TaskStatus as _, type DiscoveredModel as a, type TaskWithParent as a0, type ThinkingBlock as a1, type UsageLine as a2, type UsageRecord as a3, type UsageTotals as a4, type UserPromptEntry as a5, type UserStep as a6, type ValidationCheck as a7, type ValidationContext as a8, type ValidationResult as a9, type Verdict as aa, type VerificationCheck as ab, addPlannerUsage as ac, addTaskToPlan as ad, addUsage as ae, createEmptyPlan as af, createTask as ag, emptyWarnings as ah, flattenTasks as ai, flattenTasksWithParents as aj, isMeasured as ak, keepExecutionState as al, migrateLegacyPlan as am, migratePlanState as an, migrateTask as ao, partedPromptUsage as ap, plannerContextFill as aq, removeTaskFromPlan as ar, renumberTasks as as, updateTaskInPlan as at, usageLine as au, validateModifiedPlan as av, warningsText as aw, type IntegrationDisposal as b, type IsolationAvailability as c, type IsolationHandoff as d, type IsolationHandoffRepo as e, type IsolationInactiveReason as f, type IsolationLandedTask as g, type IsolationLanding as h, type IsolationMergeBlock as i, type IsolationMergeBlockReason as j, type IsolationMergeResult as k, type IsolationOutcome as l, type IsolationPruneResult as m, type IsolationRepo as n, type IsolationRun as o, type IsolationTaskRecord as p, type IsolationTaskRepo as q, type IsolationTaskStatus as r, type IsolationView as s, type PlanModificationWarnings as t, type PlanState as u, type PlanStatus as v, type PlannerUsage as w, type PreparedTask as x, type RepoGroupLayout as y, type ResearchLogEntry as z };

package/dist/{Task-BxQkPlXO.d.ts → Task-Vl5Zq_D-.d.ts}

@@ -72,6 +72,12 @@ interface IsolationTaskRecord {
     repos: Record<string, IsolationTaskRepo>;
     /** The repo whose merge stopped the task from landing, while `status` is `conflict` or `failed`. */
     conflictRepo?: string;
+    /**
+     * What a `failed` landing stopped on, in words a surface can repeat — a
+     * missing worktree is the common one. Cleared by the next landing attempt,
+     * so a stale reason cannot outlive the failure it explains.
+     */
+    landingError?: string;
     /** Repo-relative paths, in `conflictRepo`, that conflicted; set only while `status` is `conflict` or `repairing`. */
     conflictFiles?: string[];
     /**
@@ -275,6 +281,18 @@ interface PreparedTask {
      */
     copied: string[];
 }
+/**
+ * What a crash-recovery prune found and left alone: task records that were
+ * `active` yet still held unlanded work, so the prune kept them as `kept`
+ * rather than deleting work no one else has.
+ */
+interface IsolationPruneResult {
+    kept: Array<{
+        taskId: string;
+        order: number;
+        title: string;
+    }>;
+}
 interface IWorktreeIsolation {
     /**
      * A repo group with at least one repo to isolate, a clean tracked tree in
@@ -333,9 +351,9 @@ interface IWorktreeIsolation {
      */
     integrate(task: Task, run: IsolationRun, persist?: () => void): Promise<IsolationOutcome>;
     /**
-     * `keep: false` removes the task's worktree, branch and record (cancel, task
+     * `keep: false` removes the task's worktree, branch and record (retry, task
      * removal). `keep: true` leaves the worktree and branch exactly as they are
-     * for inspection — a failed verdict — and only moves the task off `active`,
+     * for inspection — a failed verdict, a stop, a cancel — and only moves the task off `active`,
      * so a crash-recovery prune does not sweep it away; a repair it ends leaves
      * the task `conflict`, as it was before the repair. Takes the run rather than
      * a bare task id: ids are only unique within one plan, and one daemon serves
@@ -349,9 +367,13 @@ interface IWorktreeIsolation {
     /**
      * Drop what a crash left behind: a landing it interrupted is rolled back in
      * every repo, a repair it interrupted leaves its task `conflict`, then stale
-     * active worktrees and directories no record owns go.
+     * active worktrees and directories no record owns go. An `active` record
+     * that still holds unlanded work — commits its branch alone carries, or
+     * edits in its worktree — is not a crash orphan: it may belong to a runner
+     * another host is still driving, so it is kept as `kept` and named in the
+     * result.
      */
-    pruneOrphans(run: IsolationRun): Promise<void>;
+    pruneOrphans(run: IsolationRun): Promise<IsolationPruneResult>;
     /** Unified diff of each repo's integration branch against its base ref. */
     reviewDiff(run: IsolationRun): Promise<string>;
     /**
@@ -382,6 +404,99 @@ interface IWorktreeIsolation {
     sweep(run: IsolationRun): Promise<void>;
 }
 
+/**
+ * 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
+ * says nothing about who asked for the call, so either can hold a list of them.
+ *
+ * Every measure is optional because backends report different subsets. An
+ * absent field means "not reported" — never zero — so a total can tell the two
+ * apart.
+ */
+interface UsageRecord {
+    /** The provider or runner id that reported the call — `openai`, `claude-code`, … */
+    source: string;
+    model?: string;
+    inputTokens?: number;
+    outputTokens?: number;
+    /** The share of `inputTokens` served from the provider's prompt cache. */
+    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
+     * per-token price at all. No report means no cost, not a guessed one.
+     */
+    reportedCost?: {
+        amount: number;
+        currency: string;
+    };
+    /** The model's context window, when the runner itself reports it. */
+    contextWindow?: number;
+    /** Set when a subagent made the call; its usage still counts toward the total. */
+    subagentId?: string;
+}
+/**
+ * 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
+ * different ones, and there is no honest exchange rate to fold them together.
+ */
+interface UsageTotals {
+    inputTokens?: number;
+    outputTokens?: number;
+    cachedInputTokens?: number;
+    reportedCost?: Record<string, number>;
+}
+/**
+ * The input side of a call whose provider reports its prompt in parts — the
+ * uncached tail, with cache reads and cache writes beside it rather than inside
+ * it (Anthropic, and OpenCode after it). The prompt the model saw is all three;
+ * only the reads were served from cache, since a write is billed as fresh
+ * input. A part left unreported adds nothing, and with no part reported there
+ * is no measure at all.
+ */
+declare function partedPromptUsage(parts: {
+    uncached?: number;
+    cacheRead?: number;
+    cacheWrite?: number;
+}): Pick<UsageRecord, 'inputTokens' | 'cachedInputTokens'>;
+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.
+ */
+interface PlannerUsage {
+    totals: UsageTotals;
+    bySubagent?: Record<string, UsageTotals>;
+    lastPromptTokens?: number;
+    contextWindow?: number;
+}
+declare function addPlannerUsage(usage: PlannerUsage, record: UsageRecord): PlannerUsage;
+/** Whether any measure was reported: a token 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. */
+interface UsageLine {
+    totals: UsageTotals;
+    bySubagent?: Record<string, UsageTotals>;
+    contextFill?: {
+        usedTokens: number;
+        windowTokens: number;
+    };
+}
+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
+ * 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.
+ */
+declare function plannerContextFill(usage: PlannerUsage): {
+    usedTokens: number;
+    windowTokens: number;
+} | undefined;
+
 interface UserStep {
     order: number;
     instruction: string;
@@ -478,6 +593,8 @@ interface ResearchStep {
     /** The model's tool_call id, so a surface can match `tool_result` to the
      * pending `tool_call` it announced — robust under parallel same-tool rounds. */
     toolCallId?: string;
+    /** The research subagent that ran the call, so a reload regroups it under that subagent. */
+    subagentId?: string;
     timestamp: string;
     thinkingText?: string;
 }
@@ -487,9 +604,30 @@ interface UserPromptEntry {
     content: string;
     timestamp: string;
 }
-type ResearchLogEntry = ResearchStep | UserPromptEntry;
+type SubagentOutcome = 'done' | 'failed' | 'stopped';
+/**
+ * One subagent's whole run, logged when it finishes: what it was asked, how it
+ * ended and what it reported. Its steps stay separate entries carrying the same
+ * `subagentId`, so an older reader that knows only steps still shows them.
+ */
+interface SubagentLogEntry {
+    id: string;
+    type: 'subagent';
+    subagentId: string;
+    brief: string;
+    model?: string;
+    outcome: SubagentOutcome;
+    digest: string;
+    usage?: UsageTotals;
+    timestamp: string;
+}
+type ResearchLogEntry = ResearchStep | UserPromptEntry | SubagentLogEntry;
 interface ResearchProgress {
-    type: 'thinking' | 'tool_call' | 'tool_result' | 'plan_token' | 'interrupted' | 'liveness';
+    type: 'thinking' | 'tool_call' | 'tool_result' | 'plan_token' | 'interrupted' | 'liveness' | 'text_delta' | 'text_retracted' | 'usage' | 'subagent_started' | 'subagent_finished';
+    /** Minted by whoever runs the turn and passed through untouched; absent outside a turn. */
+    turnId?: string;
+    /** One continuous run of model text — text before a tool call is its own segment. */
+    segmentId?: string;
     text?: string;
     tool?: string;
     /** Harness planners (ADR-0009): the agent's own name for a tool Ordewell has no member for. */
@@ -504,6 +642,12 @@ interface ResearchProgress {
     toolCallId?: string;
     /** Present when this event originates from (or reports on) one spawned research subagent (issue #34). */
     subagentId?: string;
+    record?: UsageRecord;
+    brief?: string;
+    model?: string;
+    outcome?: SubagentOutcome;
+    digest?: string;
+    usage?: UsageTotals;
 }
 interface ThinkingBlock {
     id: string;
@@ -543,6 +687,12 @@ interface DiscoveredModel {
         id: string;
         label: string;
     }[];
+    /**
+     * The model's context window when the runner or catalog reports it (#49).
+     * Read by the planner-model lookup so context fill can be shown; absent when
+     * unknown rather than defaulted to zero.
+     */
+    contextWindow?: number;
 }
 type PlanStatus = 'draft' | 'approved' | 'rejected' | 'running' | 'completed';
 /**
@@ -598,6 +748,8 @@ interface LegacyPlanState {
      * must leave it behind rather than share it.
      */
     isolation?: PlanIsolation;
+    /** Kept so a reopened session shows the same token line (#49). */
+    plannerUsage?: PlannerUsage;
 }
 interface Message {
     id: string;
@@ -643,6 +795,15 @@ declare function addTaskToPlan(tasks: Task[], partial: Partial<Task>): Task[];
 declare function removeTaskFromPlan(tasks: Task[], taskId: string): Task[];
 declare function updateTaskInPlan(tasks: Task[], taskId: string, changes: Partial<Task>): Task[];
 declare function renumberTasks(tasks: Task[]): Task[];
+/**
+ * Lay a planner-written task list over the plan it rewrites without letting it
+ * change execution state. A planner restates tasks; it never witnessed one run,
+ * so the status it writes is not evidence. A settled task is kept exactly as
+ * it stands wherever the rewrite names it, and put back beside its old
+ * neighbour where the rewrite leaves it out. Every other task keeps the status
+ * it had; a task the rewrite adds starts pending.
+ */
+declare function keepExecutionState(current: Task[], rewrite: Task[]): Task[];
 declare function validateModifiedPlan(original: Task[], modified: Task[]): PlanModificationWarnings;
 interface ActiveTaskSession {
     id: string;
@@ -661,4 +822,4 @@ interface ValidationContext {
 type ValidationCheck = (ctx: ValidationContext) => ValidationResult;
 declare function warningsText(w: PlanModificationWarnings): string | null;
 
-export { type UserStep as $, type ActiveTaskSession as A, type ResearchStepOutcome as B, type ConversationMessage as C, type DiscoveredMode as D, type ResearchToolType as E, type RunnerId as F, type StreamStepEvent as G, type StreamThinkingEvent as H, type IWorktreeIsolation as I, type TaskIsolation as J, type TaskIsolationState as K, type LegacyPlanState as L, type Message as M, type TaskMode as N, type TaskModelAssignment as O, type PlanIsolation as P, type QueuedMessage as Q, type RepairEvidence as R, type StreamEvent as S, type Task as T, type TaskOutputSummary as U, type TaskSnapshot as V, type TaskStatus as W, type TaskType as X, type TaskWithParent as Y, type ThinkingBlock as Z, type UserPromptEntry as _, type DiscoveredModel as a, type ValidationCheck as a0, type ValidationContext as a1, type ValidationResult as a2, type Verdict as a3, type VerificationCheck as a4, addTaskToPlan as a5, createEmptyPlan as a6, createTask as a7, emptyWarnings as a8, flattenTasks as a9, flattenTasksWithParents as aa, migrateLegacyPlan as ab, migratePlanState as ac, migrateTask as ad, removeTaskFromPlan as ae, renumberTasks as af, updateTaskInPlan as ag, validateModifiedPlan as ah, warningsText as ai, type IntegrationDisposal as b, type IsolationAvailability as c, type IsolationHandoff as d, type IsolationHandoffRepo as e, type IsolationInactiveReason as f, type IsolationLandedTask as g, type IsolationLanding as h, type IsolationMergeBlock as i, type IsolationMergeBlockReason as j, type IsolationMergeResult as k, type IsolationOutcome as l, type IsolationRepo as m, type IsolationRun as n, type IsolationTaskRecord as o, type IsolationTaskRepo as p, type IsolationTaskStatus as q, type IsolationView as r, type PlanModificationWarnings as s, type PlanState as t, type PlanStatus as u, type PreparedTask as v, type RepoGroupLayout as w, type ResearchLogEntry as x, type ResearchProgress as y, type ResearchStep as z };
+export { type TaskType as $, type ActiveTaskSession as A, type ResearchProgress as B, type ConversationMessage as C, type DiscoveredMode as D, type ResearchStep as E, type ResearchStepOutcome as F, type ResearchToolType as G, type RunnerId as H, type IWorktreeIsolation as I, type StreamStepEvent as J, type StreamThinkingEvent as K, type LegacyPlanState as L, type Message as M, type SubagentLogEntry as N, type SubagentOutcome as O, type PlanIsolation as P, type QueuedMessage as Q, type RepairEvidence as R, type StreamEvent as S, type Task as T, type TaskIsolation as U, type TaskIsolationState as V, type TaskMode as W, type TaskModelAssignment as X, type TaskOutputSummary as Y, type TaskSnapshot as Z, type TaskStatus as _, type DiscoveredModel as a, type TaskWithParent as a0, type ThinkingBlock as a1, type UsageLine as a2, type UsageRecord as a3, type UsageTotals as a4, type UserPromptEntry as a5, type UserStep as a6, type ValidationCheck as a7, type ValidationContext as a8, type ValidationResult as a9, type Verdict as aa, type VerificationCheck as ab, addPlannerUsage as ac, addTaskToPlan as ad, addUsage as ae, createEmptyPlan as af, createTask as ag, emptyWarnings as ah, flattenTasks as ai, flattenTasksWithParents as aj, isMeasured as ak, keepExecutionState as al, migrateLegacyPlan as am, migratePlanState as an, migrateTask as ao, partedPromptUsage as ap, plannerContextFill as aq, removeTaskFromPlan as ar, renumberTasks as as, updateTaskInPlan as at, usageLine as au, validateModifiedPlan as av, warningsText as aw, type IntegrationDisposal as b, type IsolationAvailability as c, type IsolationHandoff as d, type IsolationHandoffRepo as e, type IsolationInactiveReason as f, type IsolationLandedTask as g, type IsolationLanding as h, type IsolationMergeBlock as i, type IsolationMergeBlockReason as j, type IsolationMergeResult as k, type IsolationOutcome as l, type IsolationPruneResult as m, type IsolationRepo as n, type IsolationRun as o, type IsolationTaskRecord as p, type IsolationTaskRepo as q, type IsolationTaskStatus as r, type IsolationView as s, type PlanModificationWarnings as t, type PlanState as u, type PlanStatus as v, type PlannerUsage as w, type PreparedTask as x, type RepoGroupLayout as y, type ResearchLogEntry as z };