@ordewell/core 0.10.1 → 0.10.3

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

@@ -1,5 +1,5 @@
 import { ChildProcess } from 'child_process';
-import { ao as UsageRecord, aa as SubagentOutcome, $ as RunnerId, aj as TaskSkillSnapshot } from './Task-CxwnCJLi.js';
+import { a2 as RunnerId, ar as UsageRecord, ad as SubagentOutcome, d as DiscoveredModel, am as TaskSkillSnapshot } from './Task-CRVIqSfy.js';
 import { z } from 'zod/v4';
 
 /**
@@ -463,6 +463,198 @@ interface IApproval {
 /** Denies everything. The safe default when a surface wires no approval channel. */
 declare const DENY_ALL: IApproval;
 
+interface CatalogModel {
+    id: string;
+    name: string;
+    description: string;
+    pricing: {
+        prompt: string;
+        completion: string;
+    };
+    contextLength: number;
+}
+declare class ModelCatalog {
+    static fetchModels(apiKey: string, baseUrl?: string, fetchImpl?: typeof fetch): Promise<CatalogModel[]>;
+    /**
+     * Delete the on-disk catalog cache for a base URL so the next fetch re-runs.
+     * Used by the resolver's `invalidate()` in production (no injected fetch);
+     * best-effort — a missing file or unreadable dir is a no-op.
+     */
+    static clearCache(baseUrl?: string): void;
+    private static readCache;
+    private static writeCache;
+}
+
+interface ModelShortcut {
+    label: string;
+    id: string;
+    provider: string;
+    description: string;
+    pricing?: string;
+}
+declare const ORCHESTRATOR_SHORTCUTS: ModelShortcut[];
+declare function resolveModelShortcut(input: string, shortcuts: ModelShortcut[]): string | null;
+/**
+ * Resolves a value to a model id ONLY when it is in the supplied catalog
+ * option list — either directly or via a shortcut label. Free-typed, unknown,
+ * or not-currently-available values return null, so callers never store an id
+ * the user couldn't have selected from the list. Keeps model-setting list-only.
+ */
+declare function knownModelId(value: string, optionIds: string[], shortcuts: ModelShortcut[]): string | null;
+
+type ProviderModelLists = Record<string, string[]>;
+interface OrchestratorOption {
+    id: string;
+    label: string;
+    provider: string;
+    apiProvider: AiProvider;
+    description?: string;
+    pricing?: string;
+    /** The model's context window when the catalog reports one (#49). */
+    contextWindow?: number;
+}
+
+interface FetchAllProviderModelsOptions {
+    apiKeys: Record<string, string>;
+    baseUrls: Record<string, string>;
+    fetchImpl?: typeof fetch;
+}
+type AllProviderModels = Record<string, CatalogModel[]>;
+/**
+ * Result of a picker-catalog fetch fan-out: the per-provider model lists plus
+ * the per-provider failures. `errors` is keyed by provider id and holds the
+ * failure message for any provider whose catalog fetch rejected — the seam the
+ * surfaces (CLI, VS Code) use to flag "this configured provider didn't work"
+ * rather than silently showing a short list.
+ */
+interface ProviderModelsResult {
+    models: AllProviderModels;
+    errors: Record<string, string>;
+}
+/** The provider config fields the discovery fan-out needs. */
+interface ProviderCredentialSource {
+    getProviderApiKey(provider: AiProvider): string;
+    getProviderBaseUrl(provider: AiProvider): string;
+    openaiCompatibleBaseUrl: string;
+}
+/**
+ * Collect the API keys and base URLs the picker fan-out should probe, applying
+ * the single "configured" policy shared by every surface (CLI + VS Code):
+ *  - a preset is discovered only when it has an API key (OpenRouter included —
+ *    its public catalog is not probed keyless, matching the product rule that
+ *    only key-configured providers appear);
+ *  - `openai_compatible` is discovered only when an explicit endpoint is set
+ *    (keyless local servers like ollama / LM Studio).
+ * Base URLs are handed through only for providers that pass the gate, so the
+ * fan-out never touches an unconfigured third-party endpoint.
+ */
+declare function collectProviderCredentials(config: ProviderCredentialSource): {
+    apiKeys: Record<string, string>;
+    baseUrls: Record<string, string>;
+};
+declare function fetchAllProviderModels(opts: FetchAllProviderModelsOptions): Promise<ProviderModelsResult>;
+declare function resolveProvider(modelId: string, providerModelLists: Record<string, string[]>): AiProvider | null;
+declare function toOrchestratorOptions(providerModels: AllProviderModels, shortcuts: ModelShortcut[]): OrchestratorOption[];
+
+/** An LLM vendor reached over HTTP. A closed set: each one has its own registration in `ProviderRegistry`. */
+type AiProvider = 'google' | 'openrouter' | 'openai_compatible' | 'openai' | 'xai' | 'groq' | 'deepseek' | 'together' | 'mistral' | 'anthropic' | 'fireworks' | 'perplexity' | 'zhipu' | 'kimi' | 'cerebras' | 'deepinfra' | 'doubao' | 'qwen' | 'hunyuan' | 'baichuan' | 'minimax' | 'yi' | 'stepfun' | 'siliconflow' | 'cohere' | 'novita';
+/**
+ * Who plans: an API vendor, or the id of a runner serving as a *harness
+ * planner* (ADR-0009) — a coding agent CLI already installed on the machine,
+ * driven as the planner over its own programmatic transport and authenticated
+ * by the subscription the user already holds. Runners sit in the provider axis
+ * deliberately: "what plans for me?" is one question, and it belongs in one
+ * setting. The runner half is open — any built-in runner with a connector can
+ * plan — so it is checked against the registry, not by the type:
+ * `isApiProvider` narrows to a vendor, `isCliProvider` tells a harness planner.
+ */
+type PlannerBackendId = AiProvider | RunnerId;
+interface IConfig {
+    aiProvider: PlannerBackendId;
+    apiKey: string;
+    planningModel: string;
+    enabledRunners: string[];
+    maxParallelSessions: number;
+    researchEnabled: boolean;
+    researchMaxSteps: number;
+    researchMaxFileSize: number;
+    openAiBaseUrl: string;
+    openAiApiKey: string;
+    /** Provider keys + base URL the ModelResolver uses to fetch the picker catalogs. */
+    openrouterKey: string;
+    geminiKey: string;
+    geminiBaseUrl?: string;
+    /** Base URL + API key for a user-provided OpenAI-compatible endpoint (ollama, vLLM, LM Studio, etc.). */
+    openaiCompatibleBaseUrl: string;
+    openaiCompatibleApiKey: string;
+    orchestratorModel: string;
+    geminiModel: string;
+    /** Model for research subagents (issue #34); defaults to the (cheap) planner model. */
+    researchSubagentModel: string;
+    /**
+     * Thinking effort / model variant for a harness planner (ADR-0009), chosen
+     * from the agent's own discovered variants. Separate from the per-task
+     * efforts the plan carries — this one is the planner's own dial.
+     */
+    plannerThinkingEffort?: string;
+    planMapEnabled: boolean;
+    autonomousMode: boolean;
+    /**
+     * Run each AI task in its own git worktree and integrate the results on a
+     * per-run branch (ADR-0013). Non-git workspaces fall back to the shared
+     * workspace root regardless of this flag.
+     */
+    worktreeIsolation: boolean;
+    /**
+     * Shell command run in a fresh task worktree instead of symlinking ignored
+     * artifacts from the main worktree — for repos where sharing `node_modules`
+     * or a virtualenv is wrong.
+     */
+    worktreeSetupCommand?: string;
+    /**
+     * Repositories of the repo group listed by hand, relative to the workspace
+     * (ADR-0014). When non-empty the group is exactly these, replacing the
+     * repositories auto-detected directly inside the folder; needed for ones
+     * deeper than that, which are never auto-detected.
+     */
+    workspaceRepos: string[];
+    /**
+     * Extra paths or globs, relative to each repo root, linked from the real repo
+     * into its task worktree where they exist — gitignored local state such as
+     * `*.tfstate` that a task must use, not a copy of.
+     */
+    worktreeLinks: string[];
+    /**
+     * How many conflict repairs one task may go through before its conflict is
+     * left for a person (ADR-0015); 0 turns repair off.
+     */
+    conflictRepairAttempts: number;
+    /**
+     * What to do when planner research reaches outside its default envelope — an
+     * out-of-workspace path, a shell command beyond the auto-allowed read-only
+     * set, an MCP tool. `ask` prompts the user (and denies where no surface can
+     * prompt, such as headless runs); `allow` and `deny` skip the prompt
+     * entirely; `auto` follows {@link autonomousMode} (ADR-0026).
+     */
+    approvalMode: ApprovalModeSetting;
+    /** Allowlist entries granted up front, beside the defaults (ADR-0026, `plannerAllowlist.ts`). */
+    approvalPreApproved: string[];
+    /** Whether the built-in allowlist of read-only command families and MCP tools applies. */
+    approvalDefaults: boolean;
+    /** How many fetches and searches one planner turn may make (ADR-0027). User-only, like the approval settings. */
+    webReadBudget: number;
+    /** Get the base URL for an OpenAI-compatible provider. */
+    getProviderBaseUrl(provider: AiProvider): string;
+    /** Get the API key for a provider. */
+    getProviderApiKey(provider: AiProvider): string;
+    /**
+     * Push the canonical provider routing lists in (sole producer: ModelResolver).
+     * Config consumes them when resolving a chosen model id to its serving API.
+     */
+    setProviderModelLists(lists: ProviderModelLists): void;
+}
+declare function enabledRunners(cfg: IConfig): RunnerId[];
+
 /**
  * The tools of the Ordewell MCP server, per token role (ADR-0022), and the
  * handler interfaces the session side implements to answer them.
@@ -588,24 +780,24 @@ declare const taskOutputInput: z.ZodObject<{
         error: "error";
         command: "command";
         thinking: "thinking";
-        task_skills: "task_skills";
-        turn_start: "turn_start";
-        command_output: "command_output";
-        compaction: "compaction";
-        runner_loaded: "runner_loaded";
-        turn_end: "turn_end";
-        text_delta: "text_delta";
         thinking_delta: "thinking_delta";
         tool_call: "tool_call";
         tool_result: "tool_result";
+        usage: "usage";
         subagent_started: "subagent_started";
         subagent_finished: "subagent_finished";
-        usage: "usage";
+        turn_end: "turn_end";
+        message_delivered: "message_delivered";
+        runner_loaded: "runner_loaded";
+        compaction: "compaction";
+        command_output: "command_output";
+        text_delta: "text_delta";
+        turn_start: "turn_start";
         message_queued: "message_queued";
         message_removed: "message_removed";
         message_undelivered: "message_undelivered";
         message_handed_over: "message_handed_over";
-        message_delivered: "message_delivered";
+        task_skills: "task_skills";
         approval_requested: "approval_requested";
         approval_decided: "approval_decided";
         approval_withdrawn: "approval_withdrawn";
@@ -1314,7 +1506,10 @@ interface RunnerFeatures {
     permissionModeValues?: Record<string, string>;
     modeSettings?: Record<string, Record<string, string>>;
 }
-type ModelDiscoveryParser = 'claude-help' | 'opencode-models' | 'opencode-models-verbose' | 'anthropic-models' | 'line-by-line' | 'json' | 'json-table';
+/** A runner's own reader for its catalog's output, kept beside its manifest. */
+type ModelOutputParser = (output: string, manifest: RunnerManifest) => DiscoveredModel[];
+/** How discovery output becomes models: one `id label` per line, or the runner's own reader. Absent means per line. */
+type ModelDiscoveryParser = 'line-by-line' | ModelOutputParser;
 interface DiscoveryCommand {
     command: string;
     args: string[];
@@ -1343,7 +1538,6 @@ interface RunnerModelDiscovery {
     command?: string;
     args?: string[];
     parser?: ModelDiscoveryParser;
-    jsonPath?: string;
     /**
      * Stdio JSON-RPC discovery (Codex `app-server`): spawn the command, send
      * `initialize` then `model/list`, and read the catalog from the response.
@@ -1378,6 +1572,12 @@ interface RunnerModelDiscovery {
         modelId: string;
         modelLabel: string;
     }[];
+    /**
+     * The runner names its models `provider/model` (OpenCode), so an id of that
+     * shape can be its own rather than an OpenRouter slug left from a vendor
+     * planner.
+     */
+    providerQualifiedIds?: boolean;
     /**
      * HTTP API discovery — tried BEFORE command discovery. When the runner's CLI
      * has no model-listing subcommand (Claude Code), an API endpoint can serve as
@@ -1421,195 +1621,6 @@ interface RunnerEntry {
     manifest: RunnerManifest;
 }
 
-interface CatalogModel {
-    id: string;
-    name: string;
-    description: string;
-    pricing: {
-        prompt: string;
-        completion: string;
-    };
-    contextLength: number;
-}
-declare class ModelCatalog {
-    static fetchModels(apiKey: string, baseUrl?: string, fetchImpl?: typeof fetch): Promise<CatalogModel[]>;
-    /**
-     * Delete the on-disk catalog cache for a base URL so the next fetch re-runs.
-     * Used by the resolver's `invalidate()` in production (no injected fetch);
-     * best-effort — a missing file or unreadable dir is a no-op.
-     */
-    static clearCache(baseUrl?: string): void;
-    private static readCache;
-    private static writeCache;
-}
-
-interface ModelShortcut {
-    label: string;
-    id: string;
-    provider: string;
-    description: string;
-    pricing?: string;
-}
-declare const ORCHESTRATOR_SHORTCUTS: ModelShortcut[];
-declare function resolveModelShortcut(input: string, shortcuts: ModelShortcut[]): string | null;
-/**
- * Resolves a value to a model id ONLY when it is in the supplied catalog
- * option list — either directly or via a shortcut label. Free-typed, unknown,
- * or not-currently-available values return null, so callers never store an id
- * the user couldn't have selected from the list. Keeps model-setting list-only.
- */
-declare function knownModelId(value: string, optionIds: string[], shortcuts: ModelShortcut[]): string | null;
-
-type ProviderModelLists = Record<string, string[]>;
-interface OrchestratorOption {
-    id: string;
-    label: string;
-    provider: string;
-    apiProvider: AiProvider;
-    description?: string;
-    pricing?: string;
-    /** The model's context window when the catalog reports one (#49). */
-    contextWindow?: number;
-}
-
-interface FetchAllProviderModelsOptions {
-    apiKeys: Record<string, string>;
-    baseUrls: Record<string, string>;
-    fetchImpl?: typeof fetch;
-}
-type AllProviderModels = Record<string, CatalogModel[]>;
-/**
- * Result of a picker-catalog fetch fan-out: the per-provider model lists plus
- * the per-provider failures. `errors` is keyed by provider id and holds the
- * failure message for any provider whose catalog fetch rejected — the seam the
- * surfaces (CLI, VS Code) use to flag "this configured provider didn't work"
- * rather than silently showing a short list.
- */
-interface ProviderModelsResult {
-    models: AllProviderModels;
-    errors: Record<string, string>;
-}
-/** The provider config fields the discovery fan-out needs. */
-interface ProviderCredentialSource {
-    getProviderApiKey(provider: AiProvider): string;
-    getProviderBaseUrl(provider: AiProvider): string;
-    openaiCompatibleBaseUrl: string;
-}
-/**
- * Collect the API keys and base URLs the picker fan-out should probe, applying
- * the single "configured" policy shared by every surface (CLI + VS Code):
- *  - a preset is discovered only when it has an API key (OpenRouter included —
- *    its public catalog is not probed keyless, matching the product rule that
- *    only key-configured providers appear);
- *  - `openai_compatible` is discovered only when an explicit endpoint is set
- *    (keyless local servers like ollama / LM Studio).
- * Base URLs are handed through only for providers that pass the gate, so the
- * fan-out never touches an unconfigured third-party endpoint.
- */
-declare function collectProviderCredentials(config: ProviderCredentialSource): {
-    apiKeys: Record<string, string>;
-    baseUrls: Record<string, string>;
-};
-declare function fetchAllProviderModels(opts: FetchAllProviderModelsOptions): Promise<ProviderModelsResult>;
-declare function resolveProvider(modelId: string, providerModelLists: Record<string, string[]>): AiProvider | null;
-declare function toOrchestratorOptions(providerModels: AllProviderModels, shortcuts: ModelShortcut[]): OrchestratorOption[];
-
-/**
- * Who plans. Mostly LLM vendors reached over HTTP; the last three are *harness
- * planners* (ADR-0009) — a coding agent CLI already installed on the machine,
- * driven as the planner over its own programmatic transport and authenticated
- * by the subscription the user already holds. They are runners in the provider
- * axis, deliberately: "what plans for me?" is one question, and it belongs in
- * one setting. `isCliProvider` is the single guard that tells the two kinds
- * apart.
- */
-type AiProvider = 'google' | 'openrouter' | 'openai_compatible' | 'openai' | 'xai' | 'groq' | 'deepseek' | 'together' | 'mistral' | 'anthropic' | 'fireworks' | 'perplexity' | 'zhipu' | 'kimi' | 'cerebras' | 'deepinfra' | 'doubao' | 'qwen' | 'hunyuan' | 'baichuan' | 'minimax' | 'yi' | 'stepfun' | 'siliconflow' | 'cohere' | 'novita' | 'claude-code' | 'codex' | 'opencode';
-interface IConfig {
-    aiProvider: AiProvider;
-    apiKey: string;
-    planningModel: string;
-    enabledRunners: string[];
-    maxParallelSessions: number;
-    researchEnabled: boolean;
-    researchMaxSteps: number;
-    researchMaxFileSize: number;
-    openAiBaseUrl: string;
-    openAiApiKey: string;
-    /** Provider keys + base URL the ModelResolver uses to fetch the picker catalogs. */
-    openrouterKey: string;
-    geminiKey: string;
-    geminiBaseUrl?: string;
-    /** Base URL + API key for a user-provided OpenAI-compatible endpoint (ollama, vLLM, LM Studio, etc.). */
-    openaiCompatibleBaseUrl: string;
-    openaiCompatibleApiKey: string;
-    orchestratorModel: string;
-    geminiModel: string;
-    /** Model for research subagents (issue #34); defaults to the (cheap) planner model. */
-    researchSubagentModel: string;
-    /**
-     * Thinking effort / model variant for a harness planner (ADR-0009), chosen
-     * from the agent's own discovered variants. Separate from the per-task
-     * efforts the plan carries — this one is the planner's own dial.
-     */
-    plannerThinkingEffort?: string;
-    planMapEnabled: boolean;
-    autonomousMode: boolean;
-    /**
-     * Run each AI task in its own git worktree and integrate the results on a
-     * per-run branch (ADR-0013). Non-git workspaces fall back to the shared
-     * workspace root regardless of this flag.
-     */
-    worktreeIsolation: boolean;
-    /**
-     * Shell command run in a fresh task worktree instead of symlinking ignored
-     * artifacts from the main worktree — for repos where sharing `node_modules`
-     * or a virtualenv is wrong.
-     */
-    worktreeSetupCommand?: string;
-    /**
-     * Repositories of the repo group listed by hand, relative to the workspace
-     * (ADR-0014). When non-empty the group is exactly these, replacing the
-     * repositories auto-detected directly inside the folder; needed for ones
-     * deeper than that, which are never auto-detected.
-     */
-    workspaceRepos: string[];
-    /**
-     * Extra paths or globs, relative to each repo root, linked from the real repo
-     * into its task worktree where they exist — gitignored local state such as
-     * `*.tfstate` that a task must use, not a copy of.
-     */
-    worktreeLinks: string[];
-    /**
-     * How many conflict repairs one task may go through before its conflict is
-     * left for a person (ADR-0015); 0 turns repair off.
-     */
-    conflictRepairAttempts: number;
-    /**
-     * What to do when planner research reaches outside its default envelope — an
-     * out-of-workspace path, a shell command beyond the auto-allowed read-only
-     * set, an MCP tool. `ask` prompts the user (and denies where no surface can
-     * prompt, such as headless runs); `allow` and `deny` skip the prompt
-     * entirely; `auto` follows {@link autonomousMode} (ADR-0026).
-     */
-    approvalMode: ApprovalModeSetting;
-    /** Allowlist entries granted up front, beside the defaults (ADR-0026, `plannerAllowlist.ts`). */
-    approvalPreApproved: string[];
-    /** Whether the built-in allowlist of read-only command families and MCP tools applies. */
-    approvalDefaults: boolean;
-    /** How many fetches and searches one planner turn may make (ADR-0027). User-only, like the approval settings. */
-    webReadBudget: number;
-    /** Get the base URL for an OpenAI-compatible provider. */
-    getProviderBaseUrl(provider: AiProvider): string;
-    /** Get the API key for a provider. */
-    getProviderApiKey(provider: AiProvider): string;
-    /**
-     * Push the canonical provider routing lists in (sole producer: ModelResolver).
-     * Config consumes them when resolving a chosen model id to its serving API.
-     */
-    setProviderModelLists(lists: ProviderModelLists): void;
-}
-declare function enabledRunners(cfg: IConfig): RunnerId[];
-
 declare class RunnerRegistry {
     private readonly runners;
     private readonly unavailableModes;
@@ -1833,4 +1844,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, researchToolsPath as a$, PLANNER_EXECUTION_TOOLS as a0, PLANNER_TOOLS as a1, type PlannerAllowlist as a2, type PlannerStartOptions as a3, type PlannerTokenScope as a4, type PlannerToolHandler as a5, type ProjectMcpServer as a6, type ProviderCredentialSource as a7, type ProviderModelLists as a8, type ProviderModelsResult as a9, type TaskDiffArgs as aA, type TaskMessageFrom as aB, type TaskModeAgentAdapter as aC, TaskModeUnsupportedError as aD, type TaskOutputArgs as aE, type TaskQueryArgs as aF, type TaskRunnerFlags as aG, type TaskStartOptions as aH, type TaskTokenScope as aI, type TaskToolHandler as aJ, approvalScopes as aK, classifyCommand as aL, clearResearchShellCache as aM, collectProviderCredentials as aN, commandAllowedBy as aO, effectiveApprovalMode as aP, enabledRunners as aQ, fetchAllProviderModels as aR, findRunnerCommand as aS, isGranted as aT, isRunnerApproval as aU, knownModelId as aV, mcpClientConfig as aW, ownerOnlyConfigFile as aX, parseAllowlist as aY, parseApprovalModeSetting as aZ, researchShellWarning as a_, type QueuedTaskMessage as aa, REFUSED_COMMANDS as ab, type ResearchShell as ac, type ResearchShellDeps as ad, type RetryTaskArgs as ae, type RunCommandArgs as af, type RunPlanArgs as ag, type RunnerCommand as ah, type RunnerCommandKind as ai, type RunnerEntry as aj, type RunnerFeatures as ak, type RunnerManifest as al, type RunnerMcpServer as am, type RunnerMode as an, type RunnerModelDiscovery as ao, RunnerRegistry as ap, type ShellDialect as aq, type SpawnFn as ar, type StandingDecision as as, type StructuredEvent as at, type StructuredTurnEnd as au, type SubmitPlanArgs as av, TASK_COMPLETE_TOOL as aw, TASK_COMPLETION_CONTRACT as ax, TASK_TOOLS as ay, type TaskCompleteArgs as az, type AgentAdapterFactory as b, resolveModelShortcut as b0, resolveProvider as b1, resolveResearchShell as b2, scopeAllowed as b3, sharedMcpServer as b4, toApprovalDecision as b5, toOrchestratorOptions as b6, toolAllowed as b7, 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, 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 };

package/dist/{ModeResolver-m1d8Cb-j.d.mts → ModeResolver-BOU90Nn-.d.ts}

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

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

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

package/dist/{Task-CxwnCJLi.d.mts → Task-CRVIqSfy.d.mts}

@@ -330,8 +330,26 @@ interface PreparedTask {
     setupFailed?: SetupFailure[];
     /** What the attempt this one replaces left unlanded, kept on a branch before its worktree went; absent when nothing was. */
     preserved?: PreservedWork[];
-    continuation?: 'restored' | 'fallback';
+    /** Set for a `restore` prepare: whether the previous attempt's work was put back, or every repo fell back to its tip. */
+    restoration?: 'restored' | 'fallback';
 }
+/**
+ * How a task workspace starts: `fresh` from the integration tips, `restore`
+ * with the previous attempt's preserved work merged on top of them — for a
+ * continue (ADR-0018, K1) and for a carry-over to another runner.
+ */
+type PrepareIntent = 'fresh' | 'restore';
+/**
+ * What a restoring attempt is told became of the previous attempt's work: in
+ * its working tree, or kept on `preserved` branches because restoring it
+ * conflicted with the integration tips.
+ */
+type PreviousWork = {
+    outcome: 'restored';
+} | {
+    outcome: 'fallback';
+    preserved: readonly PreservedWork[];
+};
 /** A task as a removal names it. */
 type IsolationTaskRef = Pick<IsolationTaskRecord, 'taskId' | 'order' | 'title'>;
 /**
@@ -400,11 +418,11 @@ interface IWorktreeIsolation {
     /**
      * Create the task workspace — one worktree per isolated repo from its
      * integration tip, the shared paths linked in — and return the cwd to spawn
-     * the Runner into. Fresh attempts start clean from the tips. A continuation
-     * restores the previous attempt's preserved work on top of them, falling
-     * back to the tips in every repo when any restoration conflicts (ADR-0018).
+     * the Runner into. Fresh attempts start clean from the tips. A `restore`
+     * puts the previous attempt's preserved work on top of them, falling back
+     * to the tips in every repo when any restoration conflicts (ADR-0018).
      */
-    prepare(task: Task, run: IsolationRun, intent?: 'fresh' | 'continuation'): Promise<PreparedTask>;
+    prepare(task: Task, run: IsolationRun, intent?: PrepareIntent): Promise<PreparedTask>;
     /**
      * Hand a conflicted task's kept workspace to a conflict repair (ADR-0015)
      * as it is — nothing is re-cut — and return the same cwd. Records each
@@ -914,7 +932,8 @@ interface TaskOutputSummary {
 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.
+ * nothing it did lands. Its dependents go ahead without it once the work it
+ * waited on is done.
  */
 type TaskStatus = 'pending' | 'approved' | 'in_progress' | 'completed' | 'failed' | 'blocked' | 'awaiting_user' | 'skipped';
 type TaskMode = string;
@@ -983,6 +1002,12 @@ interface Task {
      * waits for a manual retry. Set only with `awaitingReason` `usage-limit`.
      */
     resumeAt?: string;
+    /**
+     * The runner a task paused on its usage limit was moved off (ADR-0018, U1):
+     * its next attempt is a carry-over, a fresh session that starts from that
+     * attempt's files. Cleared once that attempt runs, and by a retry.
+     */
+    carriedFrom?: RunnerId;
     /** Why the task was skipped, as whoever skipped it put it; set only while `status` is `skipped`, and not always then. */
     skipReason?: string;
     /**
@@ -1274,9 +1299,17 @@ interface LegacyPlanState {
      * 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
      * from anyone else starts only these (ADR-0029); a task the planner added
-     * after the approval waits for the user's.
+     * after the approval waits for the user's. Only tasks still in the plan: a
+     * task that leaves takes its approval with it.
      */
     approvedTasks?: string[];
+    /**
+     * The user approved the plan to run: Execute plan, signing off a review, or
+     * autorun's start (ADR-0029, ADR-0030). Kept apart from {@link status},
+     * which surfaces rewrite for display; a user's start of one task approves
+     * that task, not the plan.
+     */
+    approved?: boolean;
 }
 interface Message {
     id: string;
@@ -1290,7 +1323,8 @@ interface TaskSnapshot extends Task {
     retryCount: number;
     finalized: boolean;
 }
-type PlanState = {
+/** The plan a surface reads whole carries the approval record, so it can tell which tasks wait for the user (ADR-0035). */
+type PlanState = ({
     phase: 'planning';
     history: Message[];
     message: string;
@@ -1304,11 +1338,15 @@ type PlanState = {
     goal: string;
     runners: string[];
     status: PlanStatus;
-};
+}) & ApprovalRecord;
 declare function migratePlanState(raw: unknown): PlanState;
 
 declare function createTask(overrides?: Partial<Task>): Task;
-/** The runner set a plan has until one is chosen: the one runner every host ships. */
+/**
+ * The runner set a plan has until one is chosen. The one runner named outside
+ * its declaration on purpose: a default is a product choice that no manifest
+ * or connector implies.
+ */
 declare const DEFAULT_RUNNERS: readonly RunnerId[];
 declare function createEmptyPlan(): LegacyPlanState;
 declare function flattenTasks(tasks: readonly Task[]): Task[];
@@ -1337,5 +1375,14 @@ interface TaskWithParent {
 declare function flattenTasksWithParents(tasks: readonly Task[]): TaskWithParent[];
 /** A task paused on its runner's usage limit, whether it resumes on its own or waits for the user (#84). */
 declare function pausedOnLimit(task: Readonly<Task>): boolean;
+/** The user's approval record, as a plan carries it (ADR-0029). */
+type ApprovalRecord = Pick<LegacyPlanState, 'approved' | 'approvedTasks'>;
+/**
+ * A task the scheduler leaves for the user (ADR-0035): an AI task not started
+ * yet, in a plan they approved, outside their approval record — the planner
+ * added it since. It starts once they start it or execute the plan. In a plan
+ * they never approved nothing is theirs yet, so nothing is singled out.
+ */
+declare function waitsForApproval(task: Pick<Task, 'id' | 'type' | 'status'>, record: ApprovalRecord): boolean;
 
-export { type RunnerId as $, type AttemptUsage as A, BUILTIN_SKILL_NAMES as B, type ConversationMessage as C, DEFAULT_RUNNERS as D, type ExecutionActor as E, type IsolationView as F, type GuardTarget as G, type PlanIsolation as H, type IWorktreeIsolation as I, type PlanState as J, type PlanStatus as K, type LegacyPlanState as L, type ModelUsage as M, type PlanUsage as N, type PlannerUsage as O, type PendingPlanTurn as P, type PreparedTask as Q, type PreservedWork as R, type RefusedRemoval as S, type RepairEvidence as T, type RepoGroupLayout as U, type ResearchLogEntry as V, type ResearchProgress as W, type ResearchStep as X, type ResearchStepOutcome as Y, type ResearchToolType as Z, type RunSettings as _, type AwaitingReason as a, type SetupFailure as a0, type ShadowedSkill as a1, type SkillAppliesTo as a2, type SkillCatalog as a3, type SkillInfo as a4, type SkillLoad as a5, type SkillLoadNotice as a6, type SkillMetadata as a7, type SkillSource as a8, SkillsService as a9, endAttemptUsage as aA, flattenTasks as aB, flattenTasksWithParents as aC, isAwaitingReason as aD, isMeasured as aE, isSupervisorLevel as aF, isUserMessage as aG, migratePlanState as aH, partedPromptUsage as aI, pausedOnLimit as aJ, planUsage as aK, plannerContextFill as aL, rejoinPlanTree as aM, startAttemptUsage as aN, usageLine as aO, type SubagentOutcome as aa, type SupervisorLevel as ab, type Task as ac, type TaskDiffRead as ad, type TaskDiffResult as ae, type TaskIsolation as af, type TaskIsolationState as ag, type TaskModelAssignment as ah, type TaskSkillNotice as ai, type TaskSkillSnapshot as aj, type TaskSnapshot as ak, type TaskStatus as al, type TreeSnapshot as am, type UsageLine as an, type UsageRecord as ao, type UsageTotals as ap, type Verdict as aq, type VerificationCheck as ar, addAttemptUsage as as, addModelUsage as at, addPlannerUsage as au, addUsage as av, addUsageTotals as aw, createEmptyPlan as ax, createSkillsService as ay, createTask as az, DEFAULT_SUPERVISOR_RETRY_LIMIT as b, type DiscoveredModel as c, type ExecutionCommandName as d, type ExecutionRecord as e, type GuardTrip as f, type IntegrationDisposal as g, type InvalidSkill as h, type IsolationAvailability as i, type IsolationHandoff as j, type IsolationHandoffRepo as k, type IsolationInactiveReason as l, type IsolationLandedTask as m, type IsolationLanding as n, type IsolationMergeBlock as o, type IsolationMergeBlockReason as p, type IsolationMergeResult as q, type IsolationOutcome as r, type IsolationPruneResult as s, type IsolationRemoval as t, type IsolationRepo as u, type IsolationRun as v, type IsolationTaskRecord as w, type IsolationTaskRef as x, type IsolationTaskRepo as y, type IsolationTaskStatus as z };
+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 };