@ordewell/core 0.10.3 → 0.10.5

package/dist/{IFileSystem-DCd-rkeH.d.ts → IFileSystem-ClBdp59f.d.ts}

@@ -1,4 +1,4 @@
-import { I as IApproval } from './IRunner-QBdYcatb.js';
+import { I as IApproval } from './IRunner-Crkt3tHD.js';
 
 interface ToolOutcome {
     success: boolean;

package/dist/{IFileSystem-B8Nkgg4e.d.mts → IFileSystem-Db34maxC.d.mts}

@@ -1,4 +1,4 @@
-import { I as IApproval } from './IRunner-CXdYyIZo.mjs';
+import { I as IApproval } from './IRunner-lMQIa5Wc.mjs';
 
 interface ToolOutcome {
     success: boolean;

package/dist/{IRunner-CXdYyIZo.d.mts → IRunner-Crkt3tHD.d.ts}

@@ -1,5 +1,5 @@
 import { ChildProcess } from 'child_process';
-import { a2 as RunnerId, ar as UsageRecord, ad as SubagentOutcome, d as DiscoveredModel, am as TaskSkillSnapshot } from './Task-CRVIqSfy.mjs';
+import { a3 as RunnerId, au as UsageRecord, af as SubagentOutcome, a4 as RunnerSessionCost, d as DiscoveredModel, ao as TaskSkillSnapshot } from './Task-D4QHjdGv.js';
 import { z } from 'zod/v4';
 
 /**
@@ -791,6 +791,7 @@ declare const taskOutputInput: z.ZodObject<{
         runner_loaded: "runner_loaded";
         compaction: "compaction";
         command_output: "command_output";
+        model_switched: "model_switched";
         text_delta: "text_delta";
         turn_start: "turn_start";
         message_queued: "message_queued";
@@ -1060,6 +1061,11 @@ interface RunnerCommand {
     /** Other names the runner answers to for the same command. */
     aliases?: string[];
 }
+/** A model as a runner lists it: the id it accepts, which is the one a plan holds, and the name it shows. */
+interface RunnerModelRef {
+    model: string;
+    label?: string;
+}
 /** An MCP server a runner loaded for a task, and the state the runner reported it in. */
 interface RunnerMcpServer {
     name: string;
@@ -1077,6 +1083,15 @@ declare function findRunnerCommand(commands: readonly RunnerCommand[], name: str
  * surfaces — is already provider-agnostic, so an adapter is the entire cost of
  * teaching Ordewell to plan with another agent.
  */
+/**
+ * A runner's structured word that its account's usage limit ended the turn
+ * (ADR-0018, U1). `resetsAt` (ISO) is when, where the runner's own limit state
+ * says so; without it the reset is read from the error's words, as for a
+ * runner that reports the limit in words alone.
+ */
+interface UsageLimitSignal {
+    resetsAt?: string;
+}
 /**
  * One normalized event from a running agent turn. Deliberately smaller than
  * any single agent's native protocol: this is the intersection Ordewell can act
@@ -1216,10 +1231,16 @@ type AgentEvent =
     type: 'message_dropped';
     id: string;
 }
-/** The turn failed. Carries the agent's own words — never a Ordewell paraphrase. */
+/**
+ * The turn failed. Carries the agent's own words — never a Ordewell paraphrase.
+ * `usageLimit` is set where the runner's protocol says in a field, not only
+ * in words, whether its account's usage limit failed the turn: `false` when
+ * the field names another cause, which its words then cannot overrule.
+ */
  | {
     type: 'error';
     message: string;
+    usageLimit?: UsageLimitSignal | false;
 }
 /**
  * What the runner loaded for this process from the user's and the
@@ -1242,6 +1263,28 @@ type AgentEvent =
  | {
     type: 'command_output';
     text: string;
+}
+/**
+ * The runner's main thread now answers on another model, after a model
+ * command sent through the task's chat (#106): the user's own choice, which
+ * the plan follows. Each side is named by the id the runner lists it under,
+ * the one a plan holds. `effort` only where the runner reports one.
+ */
+ | {
+    type: 'model_switched';
+    from: RunnerModelRef;
+    to: RunnerModelRef;
+    effort?: string;
+}
+/**
+ * The runner's main thread now answers on another model with no model
+ * command before it (#106). Nobody in the chat chose it, so the plan does
+ * not follow; the drift is reported so it is stated, not hidden.
+ */
+ | {
+    type: 'model_drifted';
+    from: RunnerModelRef;
+    to: RunnerModelRef;
 };
 /**
  * What a planner's permission request is for, read from the runner's own
@@ -1289,6 +1332,8 @@ interface AgentStartCommon {
      * degrades to a fresh session seeded from the stored history, not an error.
      */
     resumeSessionId?: string;
+    /** What was counted of the cost of `resumeSessionId` before, for a runner that reports a running total. */
+    resumeCost?: RunnerSessionCost;
 }
 /** The read-only planner (ADR-0008/0009). The only start `CliAgentAiService` can express. */
 interface PlannerStartOptions extends AgentStartCommon {
@@ -1372,6 +1417,8 @@ interface AgentAdapter {
     send(message: string, onEvent: (event: AgentEvent) => void, signal?: AbortSignal, onActivity?: () => void): Promise<void>;
     /** The agent's native session id once it has announced one. Resumption hint only. */
     nativeSessionId(): string | null;
+    /** What has been counted of the session's running cost, for a runner that reports one; null while unknown. */
+    sessionCost?(): RunnerSessionCost | null;
     /** Kill the process and release its resources. Idempotent. */
     dispose(): void;
     /**
@@ -1768,6 +1815,8 @@ interface IRunnerSession {
     interrupt(): Promise<void>;
     /** The runner's own session id once announced — what a continue resumes (ADR-0018, K1). */
     nativeSessionId(): string | null;
+    /** What has been counted of that session's running cost, for a runner that reports one; null while unknown. */
+    sessionCost?(): RunnerSessionCost | null;
     /**
      * The slash commands the runner offers this task (#66): its built-ins and
      * the user's and the project's skills and custom commands. Empty for a
@@ -1826,6 +1875,18 @@ interface IRunner {
         env?: Record<string, string>;
         /** The runner's own session to continue in (ADR-0018, K1). */
         resumeSessionId?: string;
+        /** What was counted of that session's running cost before, so its first turn is counted from there. */
+        resumeCost?: RunnerSessionCost;
+        /**
+         * The model that session last ran on and its window, so a resumed turn that
+         * states none is measured as before. Runners ignore it; the window fill
+         * that wraps one reads it.
+         */
+        resumeWindow?: {
+            source?: string;
+            model?: string;
+            contextWindow?: number;
+        };
         /**
          * Which run of the task this is, from 1. A structured runner binds the
          * attempt's MCP token to it (ADR-0022, A2).
@@ -1844,4 +1905,4 @@ interface IRunner {
     activeCount: number;
 }
 
-export { type OwnerOnlyFile as $, AUTO_COMMANDS as A, type IRunnerSession as B, type CatalogModel as C, DEFAULT_PLANNER_ALLOWLIST as D, type EditPlanArgs as E, type FetchAllProviderModelsOptions as F, GIT_READONLY_SUBCOMMANDS as G, type InvokedCommand as H, type IApproval as I, type ListModelsArgs as J, type ListRunnersArgs as K, LineBuffer as L, type LoadSkillArgs as M, type McpClientConfig as N, type McpCredential as O, type McpTool as P, type McpToolContext as Q, type McpToolReply as R, type MessageTaskArgs as S, ModelCatalog as T, type ModelShortcut as U, ORCHESTRATOR_SHORTCUTS as V, ORDEWELL_MCP_PATH as W, ORDEWELL_MCP_SERVER_NAME as X, type OneTaskArgs as Y, type OrchestratorOption as Z, OrdewellMcpServer as _, type AgentAdapter as a, researchShellWarning as a$, PLANNER_EXECUTION_TOOLS as a0, PLANNER_TOOLS as a1, type PlannerAllowlist as a2, type PlannerBackendId as a3, type PlannerStartOptions as a4, type PlannerTokenScope as a5, type PlannerToolHandler as a6, type ProjectMcpServer as a7, type ProviderCredentialSource as a8, type ProviderModelLists as a9, type TaskCompleteArgs as aA, type TaskDiffArgs as aB, type TaskMessageFrom as aC, type TaskModeAgentAdapter as aD, TaskModeUnsupportedError as aE, type TaskOutputArgs as aF, type TaskQueryArgs as aG, type TaskRunnerFlags as aH, type TaskStartOptions as aI, type TaskTokenScope as aJ, type TaskToolHandler as aK, approvalScopes as aL, classifyCommand as aM, clearResearchShellCache as aN, collectProviderCredentials as aO, commandAllowedBy as aP, effectiveApprovalMode as aQ, enabledRunners as aR, fetchAllProviderModels as aS, findRunnerCommand as aT, isGranted as aU, isRunnerApproval as aV, knownModelId as aW, mcpClientConfig as aX, ownerOnlyConfigFile as aY, parseAllowlist as aZ, parseApprovalModeSetting as a_, type ProviderModelsResult as aa, type QueuedTaskMessage as ab, REFUSED_COMMANDS as ac, type ResearchShell as ad, type ResearchShellDeps as ae, type RetryTaskArgs as af, type RunCommandArgs as ag, type RunPlanArgs as ah, type RunnerCommand as ai, type RunnerCommandKind as aj, type RunnerEntry as ak, type RunnerFeatures as al, type RunnerManifest as am, type RunnerMcpServer as an, type RunnerMode as ao, type RunnerModelDiscovery as ap, RunnerRegistry as aq, type ShellDialect as ar, type SpawnFn as as, type StandingDecision as at, type StructuredEvent as au, type StructuredTurnEnd as av, type SubmitPlanArgs as aw, TASK_COMPLETE_TOOL as ax, TASK_COMPLETION_CONTRACT as ay, TASK_TOOLS as az, type AgentAdapterFactory as b, researchToolsPath as b0, resolveModelShortcut as b1, resolveProvider as b2, resolveResearchShell as b3, scopeAllowed as b4, sharedMcpServer as b5, toApprovalDecision as b6, toOrchestratorOptions as b7, toolAllowed as b8, type AgentEvent as c, type AgentProcessDeps as d, type AgentStartOptions as e, type AiProvider as f, type AllProviderModels as g, type AnswerApprovalArgs as h, type ApprovalAnswer as i, type ApprovalDecision as j, type ApprovalKind as k, type ApprovalMode as l, type ApprovalModeSetting as m, ApprovalPolicy as n, type ApprovalPolicyOptions as o, type ApprovalRequest as p, type ApprovalSource as q, type CheckpointAnswer as r, type CheckpointArgs as s, type CommandClassification as t, type CommandTier as u, type CommandWords as v, DENY_ALL as w, type DiscoveryCommand as x, type IConfig as y, type IRunner as z };
+export { type OwnerOnlyFile as $, AUTO_COMMANDS as A, type IRunnerSession as B, type CatalogModel as C, DEFAULT_PLANNER_ALLOWLIST as D, type EditPlanArgs as E, type FetchAllProviderModelsOptions as F, GIT_READONLY_SUBCOMMANDS as G, type InvokedCommand as H, type IApproval as I, type ListModelsArgs as J, type ListRunnersArgs as K, LineBuffer as L, type LoadSkillArgs as M, type McpClientConfig as N, type McpCredential as O, type McpTool as P, type McpToolContext as Q, type McpToolReply as R, type MessageTaskArgs as S, ModelCatalog as T, type ModelShortcut as U, ORCHESTRATOR_SHORTCUTS as V, ORDEWELL_MCP_PATH as W, ORDEWELL_MCP_SERVER_NAME as X, type OneTaskArgs as Y, type OrchestratorOption as Z, OrdewellMcpServer as _, type AgentAdapter as a, parseAllowlist as a$, PLANNER_EXECUTION_TOOLS as a0, PLANNER_TOOLS as a1, type PlannerAllowlist as a2, type PlannerBackendId as a3, type PlannerStartOptions as a4, type PlannerTokenScope as a5, type PlannerToolHandler as a6, type ProjectMcpServer as a7, type ProviderCredentialSource as a8, type ProviderModelLists as a9, TASK_TOOLS as aA, type TaskCompleteArgs as aB, type TaskDiffArgs as aC, type TaskMessageFrom as aD, type TaskModeAgentAdapter as aE, TaskModeUnsupportedError as aF, type TaskOutputArgs as aG, type TaskQueryArgs as aH, type TaskRunnerFlags as aI, type TaskStartOptions as aJ, type TaskTokenScope as aK, type TaskToolHandler as aL, type UsageLimitSignal as aM, approvalScopes as aN, classifyCommand as aO, clearResearchShellCache as aP, collectProviderCredentials as aQ, commandAllowedBy as aR, effectiveApprovalMode as aS, enabledRunners as aT, fetchAllProviderModels as aU, findRunnerCommand as aV, isGranted as aW, isRunnerApproval as aX, knownModelId as aY, mcpClientConfig as aZ, ownerOnlyConfigFile as a_, type ProviderModelsResult as aa, type QueuedTaskMessage as ab, REFUSED_COMMANDS as ac, type ResearchShell as ad, type ResearchShellDeps as ae, type RetryTaskArgs as af, type RunCommandArgs as ag, type RunPlanArgs as ah, type RunnerCommand as ai, type RunnerCommandKind as aj, type RunnerEntry as ak, type RunnerFeatures as al, type RunnerManifest as am, type RunnerMcpServer as an, type RunnerMode as ao, type RunnerModelDiscovery as ap, type RunnerModelRef as aq, RunnerRegistry as ar, type ShellDialect as as, type SpawnFn as at, type StandingDecision as au, type StructuredEvent as av, type StructuredTurnEnd as aw, type SubmitPlanArgs as ax, TASK_COMPLETE_TOOL as ay, TASK_COMPLETION_CONTRACT as az, type AgentAdapterFactory as b, parseApprovalModeSetting as b0, researchShellWarning as b1, researchToolsPath as b2, resolveModelShortcut as b3, resolveProvider as b4, resolveResearchShell as b5, scopeAllowed as b6, sharedMcpServer as b7, toApprovalDecision as b8, toOrchestratorOptions as b9, toolAllowed as ba, type AgentEvent as c, type AgentProcessDeps as d, type AgentStartOptions as e, type AiProvider as f, type AllProviderModels as g, type AnswerApprovalArgs as h, type ApprovalAnswer as i, type ApprovalDecision as j, type ApprovalKind as k, type ApprovalMode as l, type ApprovalModeSetting as m, ApprovalPolicy as n, type ApprovalPolicyOptions as o, type ApprovalRequest as p, type ApprovalSource as q, type CheckpointAnswer as r, type CheckpointArgs as s, type CommandClassification as t, type CommandTier as u, type CommandWords as v, DENY_ALL as w, type DiscoveryCommand as x, type IConfig as y, type IRunner as z };

package/dist/{IRunner-QBdYcatb.d.ts → IRunner-lMQIa5Wc.d.mts}

@@ -1,5 +1,5 @@
 import { ChildProcess } from 'child_process';
-import { a2 as RunnerId, ar as UsageRecord, ad as SubagentOutcome, d as DiscoveredModel, am as TaskSkillSnapshot } from './Task-CRVIqSfy.js';
+import { a3 as RunnerId, au as UsageRecord, af as SubagentOutcome, a4 as RunnerSessionCost, d as DiscoveredModel, ao as TaskSkillSnapshot } from './Task-D4QHjdGv.mjs';
 import { z } from 'zod/v4';
 
 /**
@@ -791,6 +791,7 @@ declare const taskOutputInput: z.ZodObject<{
         runner_loaded: "runner_loaded";
         compaction: "compaction";
         command_output: "command_output";
+        model_switched: "model_switched";
         text_delta: "text_delta";
         turn_start: "turn_start";
         message_queued: "message_queued";
@@ -1060,6 +1061,11 @@ interface RunnerCommand {
     /** Other names the runner answers to for the same command. */
     aliases?: string[];
 }
+/** A model as a runner lists it: the id it accepts, which is the one a plan holds, and the name it shows. */
+interface RunnerModelRef {
+    model: string;
+    label?: string;
+}
 /** An MCP server a runner loaded for a task, and the state the runner reported it in. */
 interface RunnerMcpServer {
     name: string;
@@ -1077,6 +1083,15 @@ declare function findRunnerCommand(commands: readonly RunnerCommand[], name: str
  * surfaces — is already provider-agnostic, so an adapter is the entire cost of
  * teaching Ordewell to plan with another agent.
  */
+/**
+ * A runner's structured word that its account's usage limit ended the turn
+ * (ADR-0018, U1). `resetsAt` (ISO) is when, where the runner's own limit state
+ * says so; without it the reset is read from the error's words, as for a
+ * runner that reports the limit in words alone.
+ */
+interface UsageLimitSignal {
+    resetsAt?: string;
+}
 /**
  * One normalized event from a running agent turn. Deliberately smaller than
  * any single agent's native protocol: this is the intersection Ordewell can act
@@ -1216,10 +1231,16 @@ type AgentEvent =
     type: 'message_dropped';
     id: string;
 }
-/** The turn failed. Carries the agent's own words — never a Ordewell paraphrase. */
+/**
+ * The turn failed. Carries the agent's own words — never a Ordewell paraphrase.
+ * `usageLimit` is set where the runner's protocol says in a field, not only
+ * in words, whether its account's usage limit failed the turn: `false` when
+ * the field names another cause, which its words then cannot overrule.
+ */
  | {
     type: 'error';
     message: string;
+    usageLimit?: UsageLimitSignal | false;
 }
 /**
  * What the runner loaded for this process from the user's and the
@@ -1242,6 +1263,28 @@ type AgentEvent =
  | {
     type: 'command_output';
     text: string;
+}
+/**
+ * The runner's main thread now answers on another model, after a model
+ * command sent through the task's chat (#106): the user's own choice, which
+ * the plan follows. Each side is named by the id the runner lists it under,
+ * the one a plan holds. `effort` only where the runner reports one.
+ */
+ | {
+    type: 'model_switched';
+    from: RunnerModelRef;
+    to: RunnerModelRef;
+    effort?: string;
+}
+/**
+ * The runner's main thread now answers on another model with no model
+ * command before it (#106). Nobody in the chat chose it, so the plan does
+ * not follow; the drift is reported so it is stated, not hidden.
+ */
+ | {
+    type: 'model_drifted';
+    from: RunnerModelRef;
+    to: RunnerModelRef;
 };
 /**
  * What a planner's permission request is for, read from the runner's own
@@ -1289,6 +1332,8 @@ interface AgentStartCommon {
      * degrades to a fresh session seeded from the stored history, not an error.
      */
     resumeSessionId?: string;
+    /** What was counted of the cost of `resumeSessionId` before, for a runner that reports a running total. */
+    resumeCost?: RunnerSessionCost;
 }
 /** The read-only planner (ADR-0008/0009). The only start `CliAgentAiService` can express. */
 interface PlannerStartOptions extends AgentStartCommon {
@@ -1372,6 +1417,8 @@ interface AgentAdapter {
     send(message: string, onEvent: (event: AgentEvent) => void, signal?: AbortSignal, onActivity?: () => void): Promise<void>;
     /** The agent's native session id once it has announced one. Resumption hint only. */
     nativeSessionId(): string | null;
+    /** What has been counted of the session's running cost, for a runner that reports one; null while unknown. */
+    sessionCost?(): RunnerSessionCost | null;
     /** Kill the process and release its resources. Idempotent. */
     dispose(): void;
     /**
@@ -1768,6 +1815,8 @@ interface IRunnerSession {
     interrupt(): Promise<void>;
     /** The runner's own session id once announced — what a continue resumes (ADR-0018, K1). */
     nativeSessionId(): string | null;
+    /** What has been counted of that session's running cost, for a runner that reports one; null while unknown. */
+    sessionCost?(): RunnerSessionCost | null;
     /**
      * The slash commands the runner offers this task (#66): its built-ins and
      * the user's and the project's skills and custom commands. Empty for a
@@ -1826,6 +1875,18 @@ interface IRunner {
         env?: Record<string, string>;
         /** The runner's own session to continue in (ADR-0018, K1). */
         resumeSessionId?: string;
+        /** What was counted of that session's running cost before, so its first turn is counted from there. */
+        resumeCost?: RunnerSessionCost;
+        /**
+         * The model that session last ran on and its window, so a resumed turn that
+         * states none is measured as before. Runners ignore it; the window fill
+         * that wraps one reads it.
+         */
+        resumeWindow?: {
+            source?: string;
+            model?: string;
+            contextWindow?: number;
+        };
         /**
          * Which run of the task this is, from 1. A structured runner binds the
          * attempt's MCP token to it (ADR-0022, A2).
@@ -1844,4 +1905,4 @@ interface IRunner {
     activeCount: number;
 }
 
-export { type OwnerOnlyFile as $, AUTO_COMMANDS as A, type IRunnerSession as B, type CatalogModel as C, DEFAULT_PLANNER_ALLOWLIST as D, type EditPlanArgs as E, type FetchAllProviderModelsOptions as F, GIT_READONLY_SUBCOMMANDS as G, type InvokedCommand as H, type IApproval as I, type ListModelsArgs as J, type ListRunnersArgs as K, LineBuffer as L, type LoadSkillArgs as M, type McpClientConfig as N, type McpCredential as O, type McpTool as P, type McpToolContext as Q, type McpToolReply as R, type MessageTaskArgs as S, ModelCatalog as T, type ModelShortcut as U, ORCHESTRATOR_SHORTCUTS as V, ORDEWELL_MCP_PATH as W, ORDEWELL_MCP_SERVER_NAME as X, type OneTaskArgs as Y, type OrchestratorOption as Z, OrdewellMcpServer as _, type AgentAdapter as a, researchShellWarning as a$, PLANNER_EXECUTION_TOOLS as a0, PLANNER_TOOLS as a1, type PlannerAllowlist as a2, type PlannerBackendId as a3, type PlannerStartOptions as a4, type PlannerTokenScope as a5, type PlannerToolHandler as a6, type ProjectMcpServer as a7, type ProviderCredentialSource as a8, type ProviderModelLists as a9, type TaskCompleteArgs as aA, type TaskDiffArgs as aB, type TaskMessageFrom as aC, type TaskModeAgentAdapter as aD, TaskModeUnsupportedError as aE, type TaskOutputArgs as aF, type TaskQueryArgs as aG, type TaskRunnerFlags as aH, type TaskStartOptions as aI, type TaskTokenScope as aJ, type TaskToolHandler as aK, approvalScopes as aL, classifyCommand as aM, clearResearchShellCache as aN, collectProviderCredentials as aO, commandAllowedBy as aP, effectiveApprovalMode as aQ, enabledRunners as aR, fetchAllProviderModels as aS, findRunnerCommand as aT, isGranted as aU, isRunnerApproval as aV, knownModelId as aW, mcpClientConfig as aX, ownerOnlyConfigFile as aY, parseAllowlist as aZ, parseApprovalModeSetting as a_, type ProviderModelsResult as aa, type QueuedTaskMessage as ab, REFUSED_COMMANDS as ac, type ResearchShell as ad, type ResearchShellDeps as ae, type RetryTaskArgs as af, type RunCommandArgs as ag, type RunPlanArgs as ah, type RunnerCommand as ai, type RunnerCommandKind as aj, type RunnerEntry as ak, type RunnerFeatures as al, type RunnerManifest as am, type RunnerMcpServer as an, type RunnerMode as ao, type RunnerModelDiscovery as ap, RunnerRegistry as aq, type ShellDialect as ar, type SpawnFn as as, type StandingDecision as at, type StructuredEvent as au, type StructuredTurnEnd as av, type SubmitPlanArgs as aw, TASK_COMPLETE_TOOL as ax, TASK_COMPLETION_CONTRACT as ay, TASK_TOOLS as az, type AgentAdapterFactory as b, researchToolsPath as b0, resolveModelShortcut as b1, resolveProvider as b2, resolveResearchShell as b3, scopeAllowed as b4, sharedMcpServer as b5, toApprovalDecision as b6, toOrchestratorOptions as b7, toolAllowed as b8, type AgentEvent as c, type AgentProcessDeps as d, type AgentStartOptions as e, type AiProvider as f, type AllProviderModels as g, type AnswerApprovalArgs as h, type ApprovalAnswer as i, type ApprovalDecision as j, type ApprovalKind as k, type ApprovalMode as l, type ApprovalModeSetting as m, ApprovalPolicy as n, type ApprovalPolicyOptions as o, type ApprovalRequest as p, type ApprovalSource as q, type CheckpointAnswer as r, type CheckpointArgs as s, type CommandClassification as t, type CommandTier as u, type CommandWords as v, DENY_ALL as w, type DiscoveryCommand as x, type IConfig as y, type IRunner as z };
+export { type OwnerOnlyFile as $, AUTO_COMMANDS as A, type IRunnerSession as B, type CatalogModel as C, DEFAULT_PLANNER_ALLOWLIST as D, type EditPlanArgs as E, type FetchAllProviderModelsOptions as F, GIT_READONLY_SUBCOMMANDS as G, type InvokedCommand as H, type IApproval as I, type ListModelsArgs as J, type ListRunnersArgs as K, LineBuffer as L, type LoadSkillArgs as M, type McpClientConfig as N, type McpCredential as O, type McpTool as P, type McpToolContext as Q, type McpToolReply as R, type MessageTaskArgs as S, ModelCatalog as T, type ModelShortcut as U, ORCHESTRATOR_SHORTCUTS as V, ORDEWELL_MCP_PATH as W, ORDEWELL_MCP_SERVER_NAME as X, type OneTaskArgs as Y, type OrchestratorOption as Z, OrdewellMcpServer as _, type AgentAdapter as a, parseAllowlist as a$, PLANNER_EXECUTION_TOOLS as a0, PLANNER_TOOLS as a1, type PlannerAllowlist as a2, type PlannerBackendId as a3, type PlannerStartOptions as a4, type PlannerTokenScope as a5, type PlannerToolHandler as a6, type ProjectMcpServer as a7, type ProviderCredentialSource as a8, type ProviderModelLists as a9, TASK_TOOLS as aA, type TaskCompleteArgs as aB, type TaskDiffArgs as aC, type TaskMessageFrom as aD, type TaskModeAgentAdapter as aE, TaskModeUnsupportedError as aF, type TaskOutputArgs as aG, type TaskQueryArgs as aH, type TaskRunnerFlags as aI, type TaskStartOptions as aJ, type TaskTokenScope as aK, type TaskToolHandler as aL, type UsageLimitSignal as aM, approvalScopes as aN, classifyCommand as aO, clearResearchShellCache as aP, collectProviderCredentials as aQ, commandAllowedBy as aR, effectiveApprovalMode as aS, enabledRunners as aT, fetchAllProviderModels as aU, findRunnerCommand as aV, isGranted as aW, isRunnerApproval as aX, knownModelId as aY, mcpClientConfig as aZ, ownerOnlyConfigFile as a_, type ProviderModelsResult as aa, type QueuedTaskMessage as ab, REFUSED_COMMANDS as ac, type ResearchShell as ad, type ResearchShellDeps as ae, type RetryTaskArgs as af, type RunCommandArgs as ag, type RunPlanArgs as ah, type RunnerCommand as ai, type RunnerCommandKind as aj, type RunnerEntry as ak, type RunnerFeatures as al, type RunnerManifest as am, type RunnerMcpServer as an, type RunnerMode as ao, type RunnerModelDiscovery as ap, type RunnerModelRef as aq, RunnerRegistry as ar, type ShellDialect as as, type SpawnFn as at, type StandingDecision as au, type StructuredEvent as av, type StructuredTurnEnd as aw, type SubmitPlanArgs as ax, TASK_COMPLETE_TOOL as ay, TASK_COMPLETION_CONTRACT as az, type AgentAdapterFactory as b, parseApprovalModeSetting as b0, researchShellWarning as b1, researchToolsPath as b2, resolveModelShortcut as b3, resolveProvider as b4, resolveResearchShell as b5, scopeAllowed as b6, sharedMcpServer as b7, toApprovalDecision as b8, toOrchestratorOptions as b9, toolAllowed as ba, type AgentEvent as c, type AgentProcessDeps as d, type AgentStartOptions as e, type AiProvider as f, type AllProviderModels as g, type AnswerApprovalArgs as h, type ApprovalAnswer as i, type ApprovalDecision as j, type ApprovalKind as k, type ApprovalMode as l, type ApprovalModeSetting as m, ApprovalPolicy as n, type ApprovalPolicyOptions as o, type ApprovalRequest as p, type ApprovalSource as q, type CheckpointAnswer as r, type CheckpointArgs as s, type CommandClassification as t, type CommandTier as u, type CommandWords as v, DENY_ALL as w, type DiscoveryCommand as x, type IConfig as y, type IRunner as z };

package/dist/{ModeResolver-geqjKkLY.d.mts → ModeResolver-B4hhABNf.d.mts}

@@ -1,4 +1,4 @@
-import { a2 as RunnerId } from './Task-CRVIqSfy.mjs';
+import { a3 as RunnerId } from './Task-D4QHjdGv.mjs';
 
 interface RunnerModeInfo {
     id: string;

package/dist/{ModeResolver-BOU90Nn-.d.ts → ModeResolver-CUR5jCSU.d.ts}

@@ -1,4 +1,4 @@
-import { a2 as RunnerId } from './Task-CRVIqSfy.js';
+import { a3 as RunnerId } from './Task-D4QHjdGv.js';
 
 interface RunnerModeInfo {
     id: string;

package/dist/{Task-CRVIqSfy.d.mts → Task-D4QHjdGv.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';
@@ -463,7 +478,7 @@ interface IWorktreeIsolation {
      * 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
-     * many (ADR-0007).
+     * many (ADR-0025 D2).
      */
     release(run: IsolationRun, taskId: string, opts: {
         keep: boolean;
@@ -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
@@ -993,6 +1052,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 +1243,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;
@@ -1268,6 +1337,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 +1375,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 +1467,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 ResearchStep 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 RepoGroupLayout as Y, type ResearchLogEntry as Z, type ResearchProgress as _, type AttemptUsage as a, type ResearchStepOutcome as a0, type ResearchToolType as a1, type RunSettings as a2, type RunnerId as a3, type RunnerSessionCost as a4, type SetupFailure as a5, type ShadowedSkill as a6, type SkillAppliesTo as a7, type SkillCatalog as a8, type SkillInfo as a9, addPlannerUsage as aA, addUsage as aB, addUsageTotals as aC, countedSessionCost as aD, createEmptyPlan as aE, createSkillsService as aF, createTask as aG, endAttemptUsage as aH, flattenTasks as aI, flattenTasksWithParents as aJ, isAwaitingReason as aK, isMeasured as aL, isSupervisorLevel as aM, isUserMessage as aN, migratePlanState as aO, partedPromptUsage as aP, pausedOnLimit as aQ, planUsage as aR, plannerContextFill as aS, rejoinPlanTree as aT, resumedSessionWindow as aU, startAttemptUsage as aV, taskUsageSummary as aW, usageLine as aX, waitsForApproval as aY, type SkillLoad as aa, type SkillLoadNotice as ab, type SkillMetadata as ac, type SkillSource as ad, SkillsService as ae, type SubagentOutcome as af, type SupervisorLevel as ag, type Task as ah, type TaskDiffRead as ai, type TaskDiffResult as aj, type TaskIsolation as ak, type TaskIsolationState as al, type TaskModelAssignment as am, type TaskSkillNotice as an, type TaskSkillSnapshot as ao, type TaskSnapshot as ap, type TaskStatus as aq, type TaskUsageSummary as ar, type TreeSnapshot as as, type UsageLine as at, type UsageRecord as au, type UsageTotals as av, type Verdict as aw, type VerificationCheck as ax, addAttemptUsage as ay, addModelUsage 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 };