@ordewell/core 0.10.4 → 0.10.6

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

@@ -155,8 +155,10 @@ interface IsolationRepo {
     root: string;
     /** The commit checked out at run start. Switching branches mid-run does not retarget it. */
     baseRef: string;
-    /** Branch name checked out at run start; absent on a detached HEAD. */
+    /** Branch name checked out at run start; absent on a detached HEAD, and on a record saved before this was noted. */
     baseBranch?: string;
+    /** Set when the run started on a detached HEAD, so that is told from a record that never noted its branch. */
+    startedDetached?: true;
     integrationBranch: string;
 }
 /**
@@ -237,6 +239,10 @@ interface IsolationHandoffRepo {
     path: string;
     integrationBranch: string;
     baseRef: string;
+    /** The branch the run started on in this repo; absent when it started on a detached HEAD or the record never noted one. */
+    baseBranch?: string;
+    /** Set when the run started on a detached HEAD. */
+    startedDetached?: true;
     /** Tasks whose work landed in this repo, in plan order. */
     landed: IsolationLandedTask[];
 }
@@ -259,27 +265,36 @@ interface IsolationView {
 /**
  * Why "Merge all" would not touch a repo. `partial-landing`: a task's landing
  * was interrupted and could not be rolled back there, so its integration
- * branch holds part of a task.
+ * branch holds part of a task. `wrong-branch`: the repo is not on the branch
+ * the run started on, and the merge would land on some other one.
  */
-type IsolationMergeBlockReason = 'merge-in-progress' | 'conflict' | 'uncommitted-changes' | 'partial-landing' | 'git-error';
+type IsolationMergeBlockReason = 'merge-in-progress' | 'conflict' | 'uncommitted-changes' | 'partial-landing' | 'wrong-branch' | 'git-error';
 interface IsolationMergeBlock {
     repo: string;
     reason: IsolationMergeBlockReason;
     /** The files that would conflict, or the user's uncommitted ones the merge also changes; empty for the other reasons. */
     files: string[];
+    /** `wrong-branch` only: the branch the run started on. */
+    expected?: string;
+    /** `wrong-branch` only: the branch checked out now; absent on a detached HEAD. */
+    actual?: string;
+    /** `wrong-branch` only: the repo is in the middle of a rebase, which is what detached its HEAD. */
+    rebasing?: true;
 }
 /**
  * How "Merge all" went.
  * - `merged`: every repo with work on its integration branch took it.
- * - `blocked`: the preflight found repos that could not, so nothing was
+ * - `blocked`: a repo was on another branch than the run started on, or the
+ *   preflight found repos that could not take their merge, so nothing was
  *   touched anywhere; `blocked` says which and why.
  * - `conflict` / `failed`: a merge stopped in `repo` — on git older than 2.38,
  *   which cannot preflight, or for a reason no preflight could foresee. That
  *   merge was aborted, leaving `repo` as it was; `landed` names the repos
  *   merged before it, which stay merged, and is absent when there are none.
  *
- * A group of one is blocked only by a partial landing; otherwise its one merge
- * lands or is aborted whole, so it reports as it always has.
+ * A group of one is blocked only by a partial landing or by being on the wrong
+ * branch; otherwise its one merge lands or is aborted whole, so it reports as
+ * it always has.
  */
 type IsolationMergeResult = {
     outcome: 'merged';
@@ -561,7 +576,11 @@ interface UsageRecord {
         amount: number;
         currency: string;
     };
-    /** The model's context window, when the runner itself reports it. */
+    /**
+     * 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;
     /** Set when a subagent made the call; its usage still counts toward the total. */
     subagentId?: string;
@@ -638,16 +657,41 @@ interface ModelUsage {
     totals: UsageTotals;
 }
 declare function addModelUsage(models: readonly ModelUsage[], record: UsageRecord): ModelUsage[];
+/**
+ * What Ordewell has counted of a runner's own session that reports its cost
+ * as a running total: that total and each model's share, in USD, as of its
+ * last report. A resume of that session counts its first report's growth
+ * over this; with no count kept for it, that report only sets the baseline.
+ */
+interface RunnerSessionCost {
+    sessionId: string;
+    usd: number;
+    modelUsd: Record<string, number>;
+}
 interface AttemptUsage extends PlannerUsage {
     attempt: number;
     runner: string;
+    /** The runner session this attempt ran in, as its runner reported it: what a later Continue of it resumes. */
+    sessionId?: string;
     startedAt: string;
     endedAt?: string;
     wallTimeMs: number;
+    /** What was counted of its runner session's running cost as it ended: a continue of that session counts on from it. */
+    runnerSessionCost?: RunnerSessionCost;
 }
 declare function startAttemptUsage(attempt: number, runner: string, startedAt: string): AttemptUsage;
 declare function addAttemptUsage(usage: AttemptUsage, record: UsageRecord, now: string): AttemptUsage;
-declare function endAttemptUsage(usage: AttemptUsage, now: string): AttemptUsage;
+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;
+/**
+ * The model a continue's session last ran on and the window it was measured
+ * against: the latest earlier attempt of that same runner session that
+ * reported one. An attempt that measured nothing is skipped — a continuation
+ * does not undo what its session was last measured against — and a window is
+ * never borrowed from another session: a fresh attempt starts one.
+ */
+declare function resumedSessionWindow(attempts: readonly AttemptUsage[] | undefined, runner: string, attempt: number, sessionId: string): Pick<PlannerUsage, 'source' | 'model' | 'contextWindow'> | undefined;
 interface PlanUsage {
     totals: UsageTotals;
     byModel: ModelUsage[];
@@ -660,6 +704,21 @@ interface UsageTask {
     subtasks?: readonly UsageTask[];
 }
 declare function planUsage(tasks: readonly UsageTask[]): PlanUsage;
+/**
+ * What one task spent across every attempt and every model it ran on, so a
+ * stop, a model change and a continue never makes the earlier spend vanish. The
+ * context meter is the exception: it reads the latest attempt, because only the
+ * current model's window says how full the next prompt is.
+ */
+interface TaskUsageSummary {
+    totals: UsageTotals;
+    attempts: number;
+    contextFill?: {
+        usedTokens: number;
+        windowTokens: number;
+    };
+}
+declare function taskUsageSummary(task: Pick<UsageTask, 'attemptUsage'>): TaskUsageSummary;
 
 /**
  * How far a plan's supervisor may act in its wake-up turns (ADR-0029): a plan
@@ -685,7 +744,7 @@ type ExecutionActor = {
  | {
     kind: 'autorun';
 };
-type ExecutionCommandName = 'run_plan' | 'run_task' | 'stop_task' | 'stop_run' | 'retry_task' | 'message_task' | 'answer_approval' | 'merge_all' | 'skip_task';
+type ExecutionCommandName = 'run_plan' | 'run_task' | 'stop_task' | 'stop_run' | 'retry_task' | 'message_task' | 'answer_approval' | 'merge_all' | 'skip_task' | 'force_start' | 'mark_complete' | 'mark_not_done' | 'interrupt_task' | 'force_send_queued' | 'remove_queued' | 'cancel_resume' | 'answer_checkpoint' | 'approve_review';
 /**
  * One call at the command seam as the timeline keeps it: what was asked, by
  * whom, about which task, and how it ended — done, refused by the seam, or
@@ -933,9 +992,11 @@ type TaskType = 'ai' | 'user';
 /**
  * `skipped` is terminal and verdict-less: the task will not be waited for, and
  * nothing it did lands. Its dependents go ahead without it once the work it
- * waited on is done.
+ * waited on is done. There is no stored `blocked`: a task is blocked when a
+ * failed dependency says so (ADR-0034), and a file that kept the old status
+ * loads as pending.
  */
-type TaskStatus = 'pending' | 'approved' | 'in_progress' | 'completed' | 'failed' | 'blocked' | 'awaiting_user' | 'skipped';
+type TaskStatus = 'pending' | 'approved' | 'in_progress' | 'completed' | 'failed' | 'awaiting_user' | 'skipped';
 type TaskMode = string;
 /**
  * Why an `awaiting_user` task waits (ADR-0018, W1): a structured turn that
@@ -993,6 +1054,13 @@ interface Task {
     userStoriesCovered?: string[];
     /** The runner's saved session for a later continue; cleared when a fresh attempt starts. */
     runnerSessionId?: string;
+    /**
+     * The runner that session belongs to: a session cannot cross runners, so
+     * Continue is offered only while the task is still assigned to it. Absent
+     * on a plan saved before it was recorded; the last attempt's runner stands
+     * in (see `sessionOwner`).
+     */
+    runnerSessionOwner?: RunnerId;
     /** Set only while `status` is `awaiting_user`, and not always then — a pause saved by an older build has none. */
     awaitingReason?: AwaitingReason;
     /**
@@ -1177,10 +1245,13 @@ interface ConversationMessage {
      * (ADR-0029), its record in `execution`. 'wake_up' is the digest a wake-up
      * gave the supervisor (role 'user': the model was told it), and
      * 'supervisor' what the supervisor said in a wake-up turn (ADR-0029).
+     * 'error' is a planner turn that ended on the planner's usage limit, drawn
+     * as a failure and never replayed to the planner: it is not the planner's
+     * answer, and its inputs are sent again (see {@link PlannerResendState}).
      * Absent for ordinary chat turns, so sessions saved before markers existed
      * degrade gracefully.
      */
-    kind?: 'plan_generated' | 'system' | 'compaction' | 'skill_load' | 'execution' | 'wake_up' | 'supervisor';
+    kind?: 'plan_generated' | 'system' | 'compaction' | 'skill_load' | 'execution' | 'wake_up' | 'supervisor' | 'error';
     actor?: 'Ordewell setting';
     /** Present exactly when `kind` is 'skill_load'. */
     skill?: SkillLoad;
@@ -1188,6 +1259,23 @@ interface ConversationMessage {
     execution?: ExecutionRecord;
     /** A user's message that was force sent, stopping the turn before it (ADR-0023). */
     forced?: true;
+    /**
+     * What a reply showed, run by run, where each began (ADR-0017 A1). Beside
+     * `content`, which stays the reply as the planner is told it. Absent on
+     * entries saved before runs were kept, which reload as one message.
+     */
+    runs?: ReplyRun[];
+}
+/**
+ * One run of a planner reply's text: the segment it streamed under, its
+ * settled text, and when it began. A run that never streamed (a message the
+ * conversation wrote in the planner's place) has a segment no stream used.
+ */
+interface ReplyRun {
+    segmentId: string;
+    text: string;
+    /** ISO timestamp. */
+    startedAt: string;
 }
 /**
  * A skill's SKILL.md as it was when loaded into a planner conversation. A
@@ -1268,6 +1356,17 @@ interface SupervisionSnapshot {
     /** The events inside their debounce window and the wake-up rate's timestamps. */
     wake?: SupervisorSnapshot;
 }
+/**
+ * What waits on the planner's usage limit. With `at`, the inputs no turn
+ * answered are sent again then, on their own; without it — the reset could
+ * not be read, the resend hit the limit again, or it was cancelled — they go
+ * with the next input: the user's message, or a wake-up.
+ */
+interface PlannerResendState {
+    /** The runner whose account hit the limit; a planner on another one is not held by it. */
+    runner?: RunnerId;
+    at?: string;
+}
 interface LegacyPlanState {
     runSettings?: RunSettings;
     /** What supervision remembers across a daemon restart (ADR-0029); absent on plans saved before it existed. */
@@ -1295,6 +1394,8 @@ interface LegacyPlanState {
     isolation?: PlanIsolation;
     /** Kept so a reopened session shows the same token line (#49). */
     plannerUsage?: PlannerUsage;
+    /** The planner hit its usage limit and the inputs its turn took wait to be sent again; absent otherwise. */
+    plannerResend?: PlannerResendState;
     /**
      * The tasks the user approved to run: every task when they executed the
      * plan, and each one they started or retried themselves since. A command
@@ -1385,4 +1486,4 @@ type ApprovalRecord = Pick<LegacyPlanState, 'approved' | 'approvedTasks'>;
  */
 declare function waitsForApproval(task: Pick<Task, 'id' | 'type' | 'status'>, record: ApprovalRecord): boolean;
 
-export { type ResearchStepOutcome 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 PlannerUsage as Q, type PrepareIntent as R, type PreparedTask as S, type PreservedWork as T, type PreviousWork as U, type RefusedRemoval as V, type RepairEvidence as W, type RepoGroupLayout as X, type ResearchLogEntry as Y, type ResearchProgress as Z, type ResearchStep as _, type AttemptUsage as a, type ResearchToolType as a0, type RunSettings as a1, type RunnerId as a2, type SetupFailure as a3, type ShadowedSkill as a4, type SkillAppliesTo as a5, type SkillCatalog as a6, type SkillInfo as a7, type SkillLoad as a8, type SkillLoadNotice as a9, createEmptyPlan as aA, createSkillsService as aB, createTask as aC, endAttemptUsage as aD, flattenTasks as aE, flattenTasksWithParents as aF, isAwaitingReason as aG, isMeasured as aH, isSupervisorLevel as aI, isUserMessage as aJ, migratePlanState as aK, partedPromptUsage as aL, pausedOnLimit as aM, planUsage as aN, plannerContextFill as aO, rejoinPlanTree as aP, startAttemptUsage as aQ, usageLine as aR, waitsForApproval as aS, type SkillMetadata as aa, type SkillSource as ab, SkillsService as ac, type SubagentOutcome as ad, type SupervisorLevel as ae, type Task as af, type TaskDiffRead as ag, type TaskDiffResult as ah, type TaskIsolation as ai, type TaskIsolationState as aj, type TaskModelAssignment as ak, type TaskSkillNotice as al, type TaskSkillSnapshot as am, type TaskSnapshot as an, type TaskStatus as ao, type TreeSnapshot as ap, type UsageLine as aq, type UsageRecord as ar, type UsageTotals as as, type Verdict as at, type VerificationCheck as au, addAttemptUsage as av, addModelUsage as aw, addPlannerUsage as ax, addUsage as ay, addUsageTotals 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 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 };

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

@@ -155,8 +155,10 @@ interface IsolationRepo {
     root: string;
     /** The commit checked out at run start. Switching branches mid-run does not retarget it. */
     baseRef: string;
-    /** Branch name checked out at run start; absent on a detached HEAD. */
+    /** Branch name checked out at run start; absent on a detached HEAD, and on a record saved before this was noted. */
     baseBranch?: string;
+    /** Set when the run started on a detached HEAD, so that is told from a record that never noted its branch. */
+    startedDetached?: true;
     integrationBranch: string;
 }
 /**
@@ -237,6 +239,10 @@ interface IsolationHandoffRepo {
     path: string;
     integrationBranch: string;
     baseRef: string;
+    /** The branch the run started on in this repo; absent when it started on a detached HEAD or the record never noted one. */
+    baseBranch?: string;
+    /** Set when the run started on a detached HEAD. */
+    startedDetached?: true;
     /** Tasks whose work landed in this repo, in plan order. */
     landed: IsolationLandedTask[];
 }
@@ -259,27 +265,36 @@ interface IsolationView {
 /**
  * Why "Merge all" would not touch a repo. `partial-landing`: a task's landing
  * was interrupted and could not be rolled back there, so its integration
- * branch holds part of a task.
+ * branch holds part of a task. `wrong-branch`: the repo is not on the branch
+ * the run started on, and the merge would land on some other one.
  */
-type IsolationMergeBlockReason = 'merge-in-progress' | 'conflict' | 'uncommitted-changes' | 'partial-landing' | 'git-error';
+type IsolationMergeBlockReason = 'merge-in-progress' | 'conflict' | 'uncommitted-changes' | 'partial-landing' | 'wrong-branch' | 'git-error';
 interface IsolationMergeBlock {
     repo: string;
     reason: IsolationMergeBlockReason;
     /** The files that would conflict, or the user's uncommitted ones the merge also changes; empty for the other reasons. */
     files: string[];
+    /** `wrong-branch` only: the branch the run started on. */
+    expected?: string;
+    /** `wrong-branch` only: the branch checked out now; absent on a detached HEAD. */
+    actual?: string;
+    /** `wrong-branch` only: the repo is in the middle of a rebase, which is what detached its HEAD. */
+    rebasing?: true;
 }
 /**
  * How "Merge all" went.
  * - `merged`: every repo with work on its integration branch took it.
- * - `blocked`: the preflight found repos that could not, so nothing was
+ * - `blocked`: a repo was on another branch than the run started on, or the
+ *   preflight found repos that could not take their merge, so nothing was
  *   touched anywhere; `blocked` says which and why.
  * - `conflict` / `failed`: a merge stopped in `repo` — on git older than 2.38,
  *   which cannot preflight, or for a reason no preflight could foresee. That
  *   merge was aborted, leaving `repo` as it was; `landed` names the repos
  *   merged before it, which stay merged, and is absent when there are none.
  *
- * A group of one is blocked only by a partial landing; otherwise its one merge
- * lands or is aborted whole, so it reports as it always has.
+ * A group of one is blocked only by a partial landing or by being on the wrong
+ * branch; otherwise its one merge lands or is aborted whole, so it reports as
+ * it always has.
  */
 type IsolationMergeResult = {
     outcome: 'merged';
@@ -561,7 +576,11 @@ interface UsageRecord {
         amount: number;
         currency: string;
     };
-    /** The model's context window, when the runner itself reports it. */
+    /**
+     * 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;
     /** Set when a subagent made the call; its usage still counts toward the total. */
     subagentId?: string;
@@ -638,16 +657,41 @@ interface ModelUsage {
     totals: UsageTotals;
 }
 declare function addModelUsage(models: readonly ModelUsage[], record: UsageRecord): ModelUsage[];
+/**
+ * What Ordewell has counted of a runner's own session that reports its cost
+ * as a running total: that total and each model's share, in USD, as of its
+ * last report. A resume of that session counts its first report's growth
+ * over this; with no count kept for it, that report only sets the baseline.
+ */
+interface RunnerSessionCost {
+    sessionId: string;
+    usd: number;
+    modelUsd: Record<string, number>;
+}
 interface AttemptUsage extends PlannerUsage {
     attempt: number;
     runner: string;
+    /** The runner session this attempt ran in, as its runner reported it: what a later Continue of it resumes. */
+    sessionId?: string;
     startedAt: string;
     endedAt?: string;
     wallTimeMs: number;
+    /** What was counted of its runner session's running cost as it ended: a continue of that session counts on from it. */
+    runnerSessionCost?: RunnerSessionCost;
 }
 declare function startAttemptUsage(attempt: number, runner: string, startedAt: string): AttemptUsage;
 declare function addAttemptUsage(usage: AttemptUsage, record: UsageRecord, now: string): AttemptUsage;
-declare function endAttemptUsage(usage: AttemptUsage, now: string): AttemptUsage;
+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;
+/**
+ * The model a continue's session last ran on and the window it was measured
+ * against: the latest earlier attempt of that same runner session that
+ * reported one. An attempt that measured nothing is skipped — a continuation
+ * does not undo what its session was last measured against — and a window is
+ * never borrowed from another session: a fresh attempt starts one.
+ */
+declare function resumedSessionWindow(attempts: readonly AttemptUsage[] | undefined, runner: string, attempt: number, sessionId: string): Pick<PlannerUsage, 'source' | 'model' | 'contextWindow'> | undefined;
 interface PlanUsage {
     totals: UsageTotals;
     byModel: ModelUsage[];
@@ -660,6 +704,21 @@ interface UsageTask {
     subtasks?: readonly UsageTask[];
 }
 declare function planUsage(tasks: readonly UsageTask[]): PlanUsage;
+/**
+ * What one task spent across every attempt and every model it ran on, so a
+ * stop, a model change and a continue never makes the earlier spend vanish. The
+ * context meter is the exception: it reads the latest attempt, because only the
+ * current model's window says how full the next prompt is.
+ */
+interface TaskUsageSummary {
+    totals: UsageTotals;
+    attempts: number;
+    contextFill?: {
+        usedTokens: number;
+        windowTokens: number;
+    };
+}
+declare function taskUsageSummary(task: Pick<UsageTask, 'attemptUsage'>): TaskUsageSummary;
 
 /**
  * How far a plan's supervisor may act in its wake-up turns (ADR-0029): a plan
@@ -685,7 +744,7 @@ type ExecutionActor = {
  | {
     kind: 'autorun';
 };
-type ExecutionCommandName = 'run_plan' | 'run_task' | 'stop_task' | 'stop_run' | 'retry_task' | 'message_task' | 'answer_approval' | 'merge_all' | 'skip_task';
+type ExecutionCommandName = 'run_plan' | 'run_task' | 'stop_task' | 'stop_run' | 'retry_task' | 'message_task' | 'answer_approval' | 'merge_all' | 'skip_task' | 'force_start' | 'mark_complete' | 'mark_not_done' | 'interrupt_task' | 'force_send_queued' | 'remove_queued' | 'cancel_resume' | 'answer_checkpoint' | 'approve_review';
 /**
  * One call at the command seam as the timeline keeps it: what was asked, by
  * whom, about which task, and how it ended — done, refused by the seam, or
@@ -933,9 +992,11 @@ type TaskType = 'ai' | 'user';
 /**
  * `skipped` is terminal and verdict-less: the task will not be waited for, and
  * nothing it did lands. Its dependents go ahead without it once the work it
- * waited on is done.
+ * waited on is done. There is no stored `blocked`: a task is blocked when a
+ * failed dependency says so (ADR-0034), and a file that kept the old status
+ * loads as pending.
  */
-type TaskStatus = 'pending' | 'approved' | 'in_progress' | 'completed' | 'failed' | 'blocked' | 'awaiting_user' | 'skipped';
+type TaskStatus = 'pending' | 'approved' | 'in_progress' | 'completed' | 'failed' | 'awaiting_user' | 'skipped';
 type TaskMode = string;
 /**
  * Why an `awaiting_user` task waits (ADR-0018, W1): a structured turn that
@@ -993,6 +1054,13 @@ interface Task {
     userStoriesCovered?: string[];
     /** The runner's saved session for a later continue; cleared when a fresh attempt starts. */
     runnerSessionId?: string;
+    /**
+     * The runner that session belongs to: a session cannot cross runners, so
+     * Continue is offered only while the task is still assigned to it. Absent
+     * on a plan saved before it was recorded; the last attempt's runner stands
+     * in (see `sessionOwner`).
+     */
+    runnerSessionOwner?: RunnerId;
     /** Set only while `status` is `awaiting_user`, and not always then — a pause saved by an older build has none. */
     awaitingReason?: AwaitingReason;
     /**
@@ -1177,10 +1245,13 @@ interface ConversationMessage {
      * (ADR-0029), its record in `execution`. 'wake_up' is the digest a wake-up
      * gave the supervisor (role 'user': the model was told it), and
      * 'supervisor' what the supervisor said in a wake-up turn (ADR-0029).
+     * 'error' is a planner turn that ended on the planner's usage limit, drawn
+     * as a failure and never replayed to the planner: it is not the planner's
+     * answer, and its inputs are sent again (see {@link PlannerResendState}).
      * Absent for ordinary chat turns, so sessions saved before markers existed
      * degrade gracefully.
      */
-    kind?: 'plan_generated' | 'system' | 'compaction' | 'skill_load' | 'execution' | 'wake_up' | 'supervisor';
+    kind?: 'plan_generated' | 'system' | 'compaction' | 'skill_load' | 'execution' | 'wake_up' | 'supervisor' | 'error';
     actor?: 'Ordewell setting';
     /** Present exactly when `kind` is 'skill_load'. */
     skill?: SkillLoad;
@@ -1188,6 +1259,23 @@ interface ConversationMessage {
     execution?: ExecutionRecord;
     /** A user's message that was force sent, stopping the turn before it (ADR-0023). */
     forced?: true;
+    /**
+     * What a reply showed, run by run, where each began (ADR-0017 A1). Beside
+     * `content`, which stays the reply as the planner is told it. Absent on
+     * entries saved before runs were kept, which reload as one message.
+     */
+    runs?: ReplyRun[];
+}
+/**
+ * One run of a planner reply's text: the segment it streamed under, its
+ * settled text, and when it began. A run that never streamed (a message the
+ * conversation wrote in the planner's place) has a segment no stream used.
+ */
+interface ReplyRun {
+    segmentId: string;
+    text: string;
+    /** ISO timestamp. */
+    startedAt: string;
 }
 /**
  * A skill's SKILL.md as it was when loaded into a planner conversation. A
@@ -1268,6 +1356,17 @@ interface SupervisionSnapshot {
     /** The events inside their debounce window and the wake-up rate's timestamps. */
     wake?: SupervisorSnapshot;
 }
+/**
+ * What waits on the planner's usage limit. With `at`, the inputs no turn
+ * answered are sent again then, on their own; without it — the reset could
+ * not be read, the resend hit the limit again, or it was cancelled — they go
+ * with the next input: the user's message, or a wake-up.
+ */
+interface PlannerResendState {
+    /** The runner whose account hit the limit; a planner on another one is not held by it. */
+    runner?: RunnerId;
+    at?: string;
+}
 interface LegacyPlanState {
     runSettings?: RunSettings;
     /** What supervision remembers across a daemon restart (ADR-0029); absent on plans saved before it existed. */
@@ -1295,6 +1394,8 @@ interface LegacyPlanState {
     isolation?: PlanIsolation;
     /** Kept so a reopened session shows the same token line (#49). */
     plannerUsage?: PlannerUsage;
+    /** The planner hit its usage limit and the inputs its turn took wait to be sent again; absent otherwise. */
+    plannerResend?: PlannerResendState;
     /**
      * The tasks the user approved to run: every task when they executed the
      * plan, and each one they started or retried themselves since. A command
@@ -1385,4 +1486,4 @@ type ApprovalRecord = Pick<LegacyPlanState, 'approved' | 'approvedTasks'>;
  */
 declare function waitsForApproval(task: Pick<Task, 'id' | 'type' | 'status'>, record: ApprovalRecord): boolean;
 
-export { type ResearchStepOutcome 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 PlannerUsage as Q, type PrepareIntent as R, type PreparedTask as S, type PreservedWork as T, type PreviousWork as U, type RefusedRemoval as V, type RepairEvidence as W, type RepoGroupLayout as X, type ResearchLogEntry as Y, type ResearchProgress as Z, type ResearchStep as _, type AttemptUsage as a, type ResearchToolType as a0, type RunSettings as a1, type RunnerId as a2, type SetupFailure as a3, type ShadowedSkill as a4, type SkillAppliesTo as a5, type SkillCatalog as a6, type SkillInfo as a7, type SkillLoad as a8, type SkillLoadNotice as a9, createEmptyPlan as aA, createSkillsService as aB, createTask as aC, endAttemptUsage as aD, flattenTasks as aE, flattenTasksWithParents as aF, isAwaitingReason as aG, isMeasured as aH, isSupervisorLevel as aI, isUserMessage as aJ, migratePlanState as aK, partedPromptUsage as aL, pausedOnLimit as aM, planUsage as aN, plannerContextFill as aO, rejoinPlanTree as aP, startAttemptUsage as aQ, usageLine as aR, waitsForApproval as aS, type SkillMetadata as aa, type SkillSource as ab, SkillsService as ac, type SubagentOutcome as ad, type SupervisorLevel as ae, type Task as af, type TaskDiffRead as ag, type TaskDiffResult as ah, type TaskIsolation as ai, type TaskIsolationState as aj, type TaskModelAssignment as ak, type TaskSkillNotice as al, type TaskSkillSnapshot as am, type TaskSnapshot as an, type TaskStatus as ao, type TreeSnapshot as ap, type UsageLine as aq, type UsageRecord as ar, type UsageTotals as as, type Verdict as at, type VerificationCheck as au, addAttemptUsage as av, addModelUsage as aw, addPlannerUsage as ax, addUsage as ay, addUsageTotals 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 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 };