@ordewell/core 0.5.0 → 0.5.1

package/dist/index.d.mts

@@ -1,17 +1,17 @@
-import { B as RunnerId, t as PlanStatus, L as LegacyPlanState, j as IsolationMergeResult, I as IWorktreeIsolation, p as IsolationTaskStatus, P as PlanIsolation, R as RepoGroupLayout, a as DiscoveredModel, T as Task, w as ResearchProgress, v as ResearchLogEntry, C as ConversationMessage, O as TaskSnapshot, c as IsolationHandoff, G as TaskIsolation, q as IsolationView, Q as QueuedMessage, A as ActiveTaskSession, z as ResearchToolType, s as PlanState, a1 as Verdict } from './Task-CfTjRQeS.mjs';
-export { D as DiscoveredMode, b as IsolationAvailability, d as IsolationHandoffRepo, e as IsolationInactiveReason, f as IsolationLandedTask, g as IsolationLanding, h as IsolationMergeBlock, i as IsolationMergeBlockReason, k as IsolationOutcome, l as IsolationRepo, m as IsolationRun, n as IsolationTaskRecord, o as IsolationTaskRepo, M as Message, r as PlanModificationWarnings, u as PreparedTask, x as ResearchStep, y as ResearchStepOutcome, S as StreamEvent, E as StreamStepEvent, F as StreamThinkingEvent, H as TaskIsolationState, J as TaskMode, K as TaskModelAssignment, N as TaskOutputSummary, U as TaskStatus, V as TaskType, W as TaskWithParent, X as ThinkingBlock, Y as UserPromptEntry, Z as UserStep, _ as ValidationCheck, $ as ValidationContext, a0 as ValidationResult, a2 as VerificationCheck, a3 as addTaskToPlan, a4 as createEmptyPlan, a5 as createTask, a6 as emptyWarnings, a7 as flattenTasks, a8 as flattenTasksWithParents, a9 as migrateLegacyPlan, aa as migratePlanState, ab as migrateTask, ac as removeTaskFromPlan, ad as renumberTasks, ae as updateTaskInPlan, af as validateModifiedPlan, ag as warningsText } from './Task-CfTjRQeS.mjs';
-import { f as IFileSystem, R as ReadFileOpts, T as ToolOutcome, d as GrepOptions, c as GlobOptions, b as FindSymbolOptions, I as IConfig, A as AiProvider, r as ProviderModelLists, i as ITerminalSession, h as ITerminalRunner, w as RunnerRegistry, k as OrchestratorOption, u as RunnerInvocation, g as IPluginStore, v as RunnerPluginManifest, t as ResolveContext } from './ITerminalRunner-DXlJop_f.mjs';
-export { a as AllProviderModels, C as CatalogModel, D as DiscoveryCommand, F as FetchAllProviderModelsOptions, G as GREP_DEFAULT_HEAD_LIMIT, e as GrepOutputMode, M as ModelCatalog, j as ModelShortcut, O as ORCHESTRATOR_SHORTCUTS, P as PluginCloneFn, l as PluginEntry, m as PluginFeatures, n as PluginMode, o as PluginModelDiscovery, p as PluginRunnerDef, q as ProviderCredentialSource, s as ProviderModelsResult, S as SEARCH_EXCLUSIONS, x as collectProviderCredentials, y as enabledRunners, z as fetchAllProviderModels, B as isReservedRunnerName, E as knownModelId, H as resolveModelShortcut, J as resolveProvider, K as toOrchestratorOptions } from './ITerminalRunner-DXlJop_f.mjs';
+import { F as RunnerId, u as PlanStatus, L as LegacyPlanState, k as IsolationMergeResult, g as IsolationLandedTask, I as IWorktreeIsolation, w as RepoGroupLayout, a as DiscoveredModel, T as Task, y as ResearchProgress, x as ResearchLogEntry, C as ConversationMessage, V as TaskSnapshot, d as IsolationHandoff, J as TaskIsolation, r as IsolationView, P as PlanIsolation, Q as QueuedMessage, A as ActiveTaskSession, E as ResearchToolType, t as PlanState, a3 as Verdict } from './Task-BxQkPlXO.mjs';
+export { D as DiscoveredMode, b as IntegrationDisposal, c as IsolationAvailability, e as IsolationHandoffRepo, f as IsolationInactiveReason, h as IsolationLanding, i as IsolationMergeBlock, j as IsolationMergeBlockReason, l as IsolationOutcome, m as IsolationRepo, n as IsolationRun, o as IsolationTaskRecord, p as IsolationTaskRepo, q as IsolationTaskStatus, M as Message, s as PlanModificationWarnings, v as PreparedTask, R as RepairEvidence, z as ResearchStep, B as ResearchStepOutcome, S as StreamEvent, G as StreamStepEvent, H as StreamThinkingEvent, K as TaskIsolationState, N as TaskMode, O as TaskModelAssignment, U as TaskOutputSummary, W as TaskStatus, X as TaskType, Y as TaskWithParent, Z as ThinkingBlock, _ as UserPromptEntry, $ as UserStep, a0 as ValidationCheck, a1 as ValidationContext, a2 as ValidationResult, a4 as VerificationCheck, a5 as addTaskToPlan, a6 as createEmptyPlan, a7 as createTask, a8 as emptyWarnings, a9 as flattenTasks, aa as flattenTasksWithParents, ab as migrateLegacyPlan, ac as migratePlanState, ad as migrateTask, ae as removeTaskFromPlan, af as renumberTasks, ag as updateTaskInPlan, ah as validateModifiedPlan, ai as warningsText } from './Task-BxQkPlXO.mjs';
+import { f as IFileSystem, R as ReadFileOpts, T as ToolOutcome, d as GrepOptions, c as GlobOptions, b as FindSymbolOptions, I as IConfig, A as AiProvider, r as ProviderModelLists, i as ITerminalSession, h as ITerminalRunner, w as RunnerRegistry, k as OrchestratorOption, u as RunnerInvocation, g as IPluginStore, v as RunnerPluginManifest, t as ResolveContext } from './ITerminalRunner-DCjsa2-I.mjs';
+export { a as AllProviderModels, C as CatalogModel, D as DiscoveryCommand, F as FetchAllProviderModelsOptions, G as GREP_DEFAULT_HEAD_LIMIT, e as GrepOutputMode, M as ModelCatalog, j as ModelShortcut, O as ORCHESTRATOR_SHORTCUTS, P as PluginCloneFn, l as PluginEntry, m as PluginFeatures, n as PluginMode, o as PluginModelDiscovery, p as PluginRunnerDef, q as ProviderCredentialSource, s as ProviderModelsResult, S as SEARCH_EXCLUSIONS, x as collectProviderCredentials, y as enabledRunners, z as fetchAllProviderModels, B as isReservedRunnerName, E as knownModelId, H as resolveModelShortcut, J as resolveProvider, K as toOrchestratorOptions } from './ITerminalRunner-DCjsa2-I.mjs';
 import { I as IApproval, d as ApprovalRequest, a as ApprovalMode } from './ApprovalPolicy-BVhGdECT.mjs';
 export { A as ApprovalKind, b as ApprovalPolicy, c as ApprovalPolicyOptions, e as ApprovalSource, D as DENY_ALL } from './ApprovalPolicy-BVhGdECT.mjs';
-import { R as RunnerModeInfo } from './ModeResolver-D1-2xJsE.mjs';
-export { M as ManifestLookup, b as buildModeGuide, f as filteredBuildModes, r as resolveDefaultMode, a as resolveTaskMode, c as runnerModesFrom } from './ModeResolver-D1-2xJsE.mjs';
-import { T as TaskOp, c as SessionBroadcaster, e as SessionNotice } from './plan-utils-B5oIZkuI.mjs';
-export { A as ApplyTaskOpsResult, C as CHECKPOINT_TRUNCATE_LENGTH, S as SerializedPlan, a as SerializedTask, b as SerializedTaskStatus, d as SessionMessage, f as TaskRef, g as applyTaskOps, h as canMergeTasks, i as canSetDependencies, j as canSplitTask, k as classifyOutcome, l as dependencyCandidates, m as dependentsOf, n as executionSummary, p as parseTaskOpsJson, s as serializePlan, o as serializeTask, q as serializeTaskStatus, r as summarizeToolCall, t as textHasTaskOps, u as truncateCheckpointSummary } from './plan-utils-B5oIZkuI.mjs';
+import { T as TaskOp, f as SessionBroadcaster, h as SessionNotice } from './plan-utils-CtB3_Ovf.mjs';
+export { A as Adr0013IsolationRun, a as Adr0013PlanIsolation, b as Adr0013TaskRecord, c as ApplyTaskOpsResult, C as CHECKPOINT_TRUNCATE_LENGTH, S as SerializedPlan, d as SerializedTask, e as SerializedTaskStatus, g as SessionMessage, i as TaskRef, j as applyTaskOps, k as canMergeTasks, l as canSetDependencies, m as canSplitTask, n as capConflictFiles, o as classifyOutcome, p as dependencyCandidates, q as dependentsOf, r as executionSummary, s as migratePlanIsolation, t as parseTaskOpsJson, u as serializePlan, v as serializeTask, w as serializeTaskStatus, x as summarizeToolCall, y as textHasTaskOps, z as truncateCheckpointSummary } from './plan-utils-CtB3_Ovf.mjs';
+import { R as RunnerModeInfo } from './ModeResolver-DVJ7HV3k.mjs';
+export { M as ManifestLookup, b as buildModeGuide, f as filteredBuildModes, r as resolveDefaultMode, a as resolveTaskMode, c as runnerModesFrom } from './ModeResolver-DVJ7HV3k.mjs';
 import { ChildProcess } from 'child_process';
 import { EventEmitter } from 'events';
-import { b as PlanParseError } from './parsing-BJECTMOD.mjs';
-export { P as PLAN_ENVELOPE_KEY, a as PartialPlanTask, T as TASK_OPS_ENVELOPE_KEY, c as TASK_QUERY_ENVELOPE_KEY, d as checkDepsResolve, e as checkImmutableLog, f as checkInProgress, g as checkNoCycles, h as checkUniqueIds, i as escapeControlCharsInStrings, j as extractJsonObject, k as extractObjectWithBalance, l as extractObjectsWithKey, m as looksLikePlanAttempt, p as parsePartialPlan, n as parsePlanJson, s as stripModelNoise, o as stripTrailingCommas, v as validatePlanModification } from './parsing-BJECTMOD.mjs';
+import { b as PlanParseError } from './parsing-DRp4dPC0.mjs';
+export { P as PLAN_ENVELOPE_KEY, a as PartialPlanTask, T as TASK_OPS_ENVELOPE_KEY, c as TASK_QUERY_ENVELOPE_KEY, d as checkDepsResolve, e as checkImmutableLog, f as checkInProgress, g as checkNoCycles, h as checkUniqueIds, i as escapeControlCharsInStrings, j as extractJsonObject, k as extractObjectWithBalance, l as extractObjectsWithKey, m as looksLikePlanAttempt, p as parsePartialPlan, n as parsePlanJson, s as stripModelNoise, o as stripTrailingCommas, v as validatePlanModification } from './parsing-DRp4dPC0.mjs';
 export { resolveOrderLabel, taskOrderLabel } from './order-labels.mjs';
 
 interface SessionMeta {
@@ -527,6 +527,7 @@ declare abstract class BaseConfig implements IConfig {
     get worktreeSetupCommand(): string | undefined;
     get workspaceRepos(): string[];
     get worktreeLinks(): string[];
+    get conflictRepairAttempts(): number;
     get approvalMode(): ApprovalMode;
     get approvalPreApproved(): string[];
     protected static detectProvider(fallback: AiProvider): AiProvider;
@@ -560,9 +561,11 @@ interface INotification {
 /**
  * How "Merge all" went, in words every surface shares. `group` is whether the
  * run spans more than a lone repo at `.`; only a merge into every repository
- * has something to say about that.
+ * has something to say about that. `repaired` names the landed tasks that only
+ * landed after a conflict repair (ADR-0015), so a clean-looking merge still
+ * points review at what changed to get there.
  */
-declare function describeMergeResult(result: IsolationMergeResult, branch: string, group: boolean): {
+declare function describeMergeResult(result: IsolationMergeResult, branch: string, group: boolean, repaired?: IsolationLandedTask[]): {
     level: 'info' | 'warn' | 'error';
     message: string;
 };
@@ -584,37 +587,6 @@ interface WorktreeIsolationDeps {
 }
 declare function createWorktreeIsolation(deps: WorktreeIsolationDeps): IWorktreeIsolation;
 
-/** A task record as ADR-0013 persisted it, for one repository. */
-interface Adr0013TaskRecord {
-    taskId: string;
-    order: number;
-    title: string;
-    branch: string;
-    worktree: string;
-    status: IsolationTaskStatus;
-    linked: string[];
-}
-/** A run as ADR-0013 persisted it (0.4.23): one repository, its refs on the run itself. */
-interface Adr0013IsolationRun {
-    id: string;
-    workspaceRoot: string;
-    baseRef: string;
-    baseBranch?: string;
-    integrationBranch: string;
-    tasks: Record<string, Adr0013TaskRecord>;
-}
-interface Adr0013PlanIsolation {
-    run: Adr0013IsolationRun;
-    resolvers: Record<string, string>;
-}
-/**
- * A persisted plan isolation in today's shape. A run saved in the ADR-0013
- * format — recognised by its own `integrationBranch` — becomes a group of one
- * at `.`, keeping its branches, so a session saved by 0.4.23 resumes and hands
- * off exactly as it would have.
- */
-declare function migratePlanIsolation(state: PlanIsolation | Adr0013PlanIsolation): PlanIsolation;
-
 interface ILogger {
     warn(scope: string, message: string, err?: unknown): void;
 }
@@ -1933,12 +1905,19 @@ declare class TaskOrchestrator {
      */
     adoptIsolation(state: PlanIsolation | null): Promise<void>;
     reviewRunDiff(): Promise<string>;
-    /** "Merge all": the run's integration branches into whatever the user has checked out, in every repo or none. */
+    /**
+     * "Merge all": the run's integration branches into whatever the user has
+     * checked out, in every repo or none. Once everything merged, the run has
+     * nothing left to hand over, so it is cleared up and forgotten; a branch
+     * the user's HEAD somehow does not contain stays for the next run's sweep.
+     */
     mergeRun(): Promise<IsolationMergeResult>;
+    private clearMergedRun;
     /** Worktrees and task branches go; the integration branch and the record stay for review and merge. */
     cleanupRun(): Promise<void>;
     /** The run and everything it made go, and the plan forgets it; the next run starts afresh. */
     discardRun(): Promise<void>;
+    private forgetRun;
     private requireRun;
     /** What the plan persists of isolated execution; null when no run ever isolated. */
     get isolationRecord(): PlanIsolation | null;
@@ -1964,6 +1943,24 @@ declare class TaskOrchestrator {
     stop(): void;
     onUserTaskComplete(taskId: string): Promise<void>;
     private onVerdict;
+    private afterVerdict;
+    /**
+     * A repair's verdict decides only whether its work may try to land. It never
+     * replaces the verdict the task's own work earned, and a repair that does not
+     * land leaves the task waiting on the user — never a failed task, so never a
+     * halted run.
+     */
+    private settleRepair;
+    /**
+     * Evidence before the queue: the repair's work is committed and checked, and
+     * only then merged, through the same serialized landing as any other task —
+     * so a repair the tip has moved past again is a fresh conflict, not a pass.
+     */
+    private landRepair;
+    private landedRepair;
+    /** A repair that did not land leaves the task as its conflict did: waiting on the user, worktree and refs kept. */
+    private unrepaired;
+    private describeEvidence;
     /**
      * Merge a passed attempt's worktree. The attempt stays live while it waits on
      * the module's merge queue, so a cancel, retry or stop in that window still
@@ -1977,6 +1974,9 @@ declare class TaskOrchestrator {
     /** Settle a task whose work passed, by what its integration reported. */
     private landPassed;
     private landUnmerged;
+    /** The repair a conflicted task is owed next; null when repair is off, used up, or there is no isolated run to repair it in. */
+    private nextRepair;
+    private noRepairReason;
     /**
      * Mark which added task resolves which conflict. The resolver merges the
      * conflicted task's branch by hand in its own worktree; once that lands, the
@@ -2064,6 +2064,7 @@ declare class TaskOrchestrator {
      * attempt may have decided the task since (mark complete, cancel, retry).
      */
     private abandonSpawn;
+    private repairPrompt;
     /**
      * The one place an attempt's working directory is decided. Async so a
      * per-attempt workspace (worktree isolation, #12) can be prepared here.
@@ -2088,6 +2089,8 @@ declare class TaskOrchestrator {
     plannerIsolation(): Promise<IsolatedExecution>;
     private decideRun;
     private activate;
+    /** What earlier runs left merged in the group goes; a failure here is worth a word, never a stopped run. */
+    private sweep;
     /**
      * The plan's run carries on while anything has landed on its integration
      * branch: a resumed plan's dependents must start from a tip that holds their
@@ -2097,8 +2100,8 @@ declare class TaskOrchestrator {
     /**
      * A run with nothing landed holds only superseded attempts, so it goes whole.
      * One that cannot be continued for another reason — it ran from a different
-     * workspace path — keeps its integration branch: only the user gives landed
-     * work up.
+     * workspace path — keeps its integration branch in each repo that has not
+     * merged it: only the user gives landed work up.
      */
     private mintRun;
     /** Close the open run. An isolated one hands its integration branch over for review. */
@@ -2697,11 +2700,13 @@ declare class ConversationEditError extends Error {
 declare class ConversationBusyError extends ConversationEditError {
     constructor(operation: string);
 }
-/** A user message the conversation can be rewound to just before. */
+/** A user message a rewind can fork the conversation from just before. */
 interface RewindTarget {
-    /** Position in the transcript — what {@link PlannerConversation.rewind} takes. */
+    /** Position in the transcript — what {@link PlannerConversation.cloneBefore} takes. */
     index: number;
     preview: string;
+    /** The whole message — the preview cuts it to one line, and a surface confirming the rewind quotes it. */
+    content: string;
     timestamp: string;
 }
 /** What a compaction left behind. */
@@ -2807,6 +2812,10 @@ interface ConversationFork {
     goal: string;
     workspace: string;
 }
+/** A fork made by a rewind, and the full text of the message it was made just before. */
+interface ConversationRewind extends ConversationFork {
+    rewoundMessage: string;
+}
 interface SessionDeps {
     config: IConfig;
     notifications: INotification;
@@ -3029,16 +3038,18 @@ declare class Session {
      */
     forkConversation(): ConversationFork;
     /**
-     * Cut the conversation back to just before a user message (a transcript
-     * position from {@link rewindTargets}). Conversation only: the task list,
-     * and any run executing it, carry on as they are. The planner's live context
-     * is dropped, so the next message replays from the shortened transcript.
+     * Fork the conversation from just before a user message (a transcript
+     * position from {@link rewindTargets}): the fork holds everything said
+     * before it and the current task list, like {@link forkConversation}, and
+     * this session keeps its whole history. The message's full text comes back
+     * so a surface can offer it for resending.
      */
-    rewindConversation(userMessageIndex: number): LegacyPlanState;
+    rewindConversation(userMessageIndex: number): ConversationRewind;
+    private saveFork;
     /**
      * Condense the conversation on the user's say-so: a hidden planner turn
      * summarises it, and the summary replaces everything but the last two
-     * exchanges. Conversation only, like a rewind — the tasks, and any run
+     * exchanges. Conversation only — the tasks, and any run
      * executing them, are untouched. Atomic: a failed or stopped turn changes
      * nothing.
      */
@@ -3128,8 +3139,9 @@ declare class Session {
      * The opt-in way through a merge conflict: add an AI task, on the conflicted
      * task's own runner and model, that merges its branch by hand in a worktree
      * of its own. When that task lands, the conflicted one lands through it (see
-     * {@link TaskOrchestrator.linkConflictResolver}). Never automatic — nothing
-     * but this call adds it.
+     * {@link TaskOrchestrator.linkConflictResolver}). The automatic answer to a
+     * conflict is a repair, a new attempt of the same task (ADR-0015); a task is
+     * only ever added to the plan by this call.
      */
     resolveConflictAsTask(taskId: string): Promise<LegacyPlanState | null>;
     stopExecution(): void;
@@ -3508,6 +3520,19 @@ declare function buildConflictResolutionPrompt(task: Task, conflict: {
     repos: string[];
     conflictRepo?: string;
 }, integrationBranch: string): string;
+/**
+ * Runner prompt for a conflict repair (ADR-0015): a new attempt of the
+ * conflicted task itself, in its kept worktree, so the merge runs the other
+ * way round from {@link buildConflictResolutionPrompt} — the integration tip
+ * into the task's branch. Whether it worked is decided by the evidence checks
+ * and the landing that follow, never by the agent's word.
+ */
+declare function buildConflictRepairPrompt(task: Task, conflict: {
+    branch: string;
+    repos: string[];
+    conflictRepo?: string;
+    conflictFiles?: string[];
+}, integrationBranch: string): string;
 
 /**
  * The one owner of "the model emitted something unusable — correct it and
@@ -4162,4 +4187,4 @@ declare class PlannerModelMemory {
     recall(provider: string, catalog: PlannerModelCandidate[]): PlannerModelRecall;
 }
 
-export { ALLOWED_PLUGIN_HOSTS, ALL_PROVIDERS, AUTO_COMMANDS, AbstractRunner, AbstractTerminalSession, ActiveTaskSession, type Adr0013IsolationRun, type Adr0013PlanIsolation, type Adr0013TaskRecord, type AgentAdapter, type AgentAdapterFactory, type AgentEvent, type AgentProcessDeps, type AgentStartOptions, AiProvider, ApprovalMode, ApprovalRequest, BUILTIN_SKILL_NAMES, BaseAiService, BaseConfig, BaseFileSystem, BufferedTaskOutputSource, CLAUDE_CODE_MANIFEST, CLI_PROVIDERS, CMD_EXE_MAX_COMMAND_LINE, CORE_PLANNER_PROMPT, type CappedRows, type CheckpointListener, ClaudeCodeAdapter, CliAgentAiService, type CliAgentAiServiceDeps, CodexAdapter, type CommandClassification, CommandLineTooLongError, type CommandTier, type ComposeOptions, ConsoleLogger, ContextCollector, ConversationBusyError, type ConversationCompaction, ConversationEditError, type ConversationFork, ConversationMessage, type ConversationRequest, type ConversationTurn, type ConversationVariant, DAEMON_SUBPROTOCOL, DAEMON_TOKEN_SUBPROTOCOL_PREFIX, DiscoveredModel, EmbeddedNewlineError, type EnvAdmission, EnvConfig, type ExecFileFn, type ExecImpl, ExecutableNotFoundError, FindSymbolOptions, FsPluginStore, GIT_READONLY_SUBCOMMANDS, GeminiService, type GitExecFn, GlobOptions, type GrepInvocation, GrepOptions, type HasBinFn, HeadlessRunner, type HeadlessRunnerDeps, HeadlessSession, HomeTranscriptReader, type IAiService, IApproval, IConfig, IFileSystem, type ILogger, type INotification, IPluginStore, ITerminalRunner, ITerminalSession, IWorktreeIsolation, IsolationHandoff, IsolationMergeResult, IsolationTaskStatus, IsolationView, JSON_REPAIR_INSTRUCTION, type KillTreeDeps, type LaunchDeps, type LaunchPlan, LegacyPlanState, LineBuffer, type LiveOutputLookup, type LiveTail, type LiveTailOptions, type MappedTool, ModelResolver, type ModelResolverDeps, type ModifyPlanRequest, type NotificationAction, OPENCODE_MANIFEST, ORDEWELL_SETTABLE_ENV, OUTPUT_LINES_DEFAULT, OUTPUT_LINES_MAX, OpenAiService, OpenCodeAdapter, type OrchestratorObserver, OrchestratorOption, PLUGIN_NAME_PATTERN, PROVIDER_CREDENTIAL_ENV, PROVIDER_DETECT_PRIORITY, PROVIDER_LABEL, PROVIDER_PRIORITY, PROVIDER_SHORT_LABEL, type PendingApproval, PendingApprovals, type PendingApprovalsOptions, PlanEditError, PlanIsolation, PlanParseError, type PlanRequest, PlanState, PlanStatus, PlanStore, Planner, type PlannerModelCandidate, type PlannerModelChoice, PlannerModelMemory, type PlannerModelRecall, type PlannerModelStore, type PlannerReplyClassification, type PlannerRuntimeToggles, type PluginSource, type PrdBlock, type PreparedLaunch, type PriorOutput, type ProbeFn, ProviderModelLists, type ProviderRegistration, type PtySize, type PtyWrapOptions, QueuedMessage, REFUSED_COMMANDS, ReadFileOpts, type RepairLoopOpts, type RepairVerdict, RepoGroupLayout, type ResearchChat, ResearchLogEntry, ResearchProgress, type ResearchShell, type ResearchShellDeps, ResearchToolType, type ResearchTurn, ResolveContext, type RewindTarget, type RunnerCatalog, RunnerId, RunnerInstallation, RunnerInvocation, type RunnerMode, RunnerModeInfo, RunnerPluginManifest, RunnerRegistry, type RunnerSpawnOptions, SETTINGS_ENV_ALLOWLIST, SETTINGS_ENV_REFUSED, STATE_DIR, STOPPED_TOOL_RESULT, SYMBOL_LANGUAGES, Session, SessionBroadcaster, type SessionData, type SessionDeps, type SessionMeta, SessionNotice, type SessionPlanner, type SessionRuntimeSettings, SettingsService, type ShellDialect, type SkillInfo, type SkillMetadata, SkillsService, type SpawnSpec, StdioAgentAdapter, TASK_QUERY_ANSWER_MAX_CHARS, TASK_QUERY_ANSWER_OR_OPS, TASK_QUERY_FIELDS, TASK_QUERY_PROTOCOL, TASK_QUERY_REMINDER, TRUNCATED_PLAN_REPAIR_INSTRUCTION, Task, type TaskAttemptSnapshot, TaskIsolation, TaskOp, TaskOrchestrator, type TaskOutputAttempt, type TaskOutputSource, type TaskQuery, type TaskQueryCatalog, type TaskQueryField, TaskSnapshot, TmuxRunner, type TmuxRunnerDeps, type TokenCarriers, type ToolCall, ToolOutcome, type ToolResult, type TranscriptQuery, type TranscriptReader, type UserSettings, Verdict, VerdictEngine, type VerdictListener, WINDOWS_MAX_COMMAND_LINE, type WorkspaceCheckDeps, WorkspaceNotAProjectError, WorkspaceNotFoundError, type WorkspaceProjectCheckDeps, type WorktreeIsolationDeps, admitSettingsEnv, applyHeadLimit, assertInstallablePluginUrl, assertPlainPluginName, assertWorkspaceExists, assertWorkspaceIsProject, augmentPromptWithPriorOutputs, augmentedPath, bearerHeaderValue, buildConflictResolutionPrompt, buildConversationSystemPrompt, buildFallbackGrepArgs, buildGlobArgs, buildGrepArgs, buildMergePrompt, buildModifyDuringExecutionPrompt, buildModifyPlanPrompt, buildPlanWithResults, buildResearchPrompt, buildResearchToolsPrompt, buildRunnerInvocation, buildShellInvocation, buildSplitPrompt, buildSubagentSystemPrompt, clampThinkingEffort, classifyCommand, classifyPlannerReply, classifyPluginSource, clearAugmentedPathCache, clearDaemonToken, clearResearchShellCache, clearState, clipboardCopyCommand, coerceAssignments, collectDirectDependencyOutputs, composeAugmentedPrompt, configuredProviders, createAiService, createSkillsService, createWorktreeIsolation, daemonTokenPath, defaultLogger, definitionPattern, deleteSession, describeMergeResult, discoverGeminiModels, effectiveAllowlist, ensureDir, ensureStateDirIgnored, executionLogBlock, extractPrdBlock, extractPresentedToken, filterFallbackByAnchoredInclude, filterModelsForPrompt, formatSearchOutput, generatePlanWithRepair, getLatestSession, getProviderMeta, getSettingsPath, getStateDir, globalDataDir, grantScopeFor, hasTmux, includeGlobFor, isCliProvider, isExecutableResolved, isOpenAiProvider, isPlainPluginName, isValidManifest, killTree, languageForId, listSessions, loadSession, loadSessionPlanState, loadState, mapAgentTool, migrateOldConfigDir, migratePlanIsolation, mintDaemonToken, mintSessionId, modelContextBlock, modifyValidationFeedback, normalizeAgentArgs, normalizeGeminiModel, parseTaskQueryJson, pendingEditRulesBlock, planDirectLaunch, planShellLaunch, posixShellQuote, prefixModelId, providerForRunner, reEmitPlanPrompt, reEmitTaskOpsPrompt, reEmitTaskQueryPrompt, readDaemonToken, referencePattern, renderPlanMap, renderPriorOutputs, renderTaskQueryAnswer, repairLoop, researchShellWarning, researchToolsPath, resolveArgs, resolvePluginInstallDir, resolveProviderFromPrefix, resolveResearchShell, resolveSkillInvocation, resolveWithin, retargetTaskRunner, runnerAssignment, runnerForProvider, sanitizeSlug, savePrdMarkdown, saveSession, saveState, sessionRuntimeSettings, stateExists, stripAnsi, stripModelPrefix, summarizeOutput, taskOpsRejectedPrompt, taskQuerySignature, textHasTaskQuery, tmuxSessionName, tmuxSocketName, tmuxWindowName, tokenSubprotocols, tokensMatch, truncatedPlanReEmitPrompt, wellKnownBinDirs, windowsCommandLine, withPath, wrapWithPty };
+export { ALLOWED_PLUGIN_HOSTS, ALL_PROVIDERS, AUTO_COMMANDS, AbstractRunner, AbstractTerminalSession, ActiveTaskSession, type AgentAdapter, type AgentAdapterFactory, type AgentEvent, type AgentProcessDeps, type AgentStartOptions, AiProvider, ApprovalMode, ApprovalRequest, BUILTIN_SKILL_NAMES, BaseAiService, BaseConfig, BaseFileSystem, BufferedTaskOutputSource, CLAUDE_CODE_MANIFEST, CLI_PROVIDERS, CMD_EXE_MAX_COMMAND_LINE, CORE_PLANNER_PROMPT, type CappedRows, type CheckpointListener, ClaudeCodeAdapter, CliAgentAiService, type CliAgentAiServiceDeps, CodexAdapter, type CommandClassification, CommandLineTooLongError, type CommandTier, type ComposeOptions, ConsoleLogger, ContextCollector, ConversationBusyError, type ConversationCompaction, ConversationEditError, type ConversationFork, ConversationMessage, type ConversationRequest, type ConversationRewind, type ConversationTurn, type ConversationVariant, DAEMON_SUBPROTOCOL, DAEMON_TOKEN_SUBPROTOCOL_PREFIX, DiscoveredModel, EmbeddedNewlineError, type EnvAdmission, EnvConfig, type ExecFileFn, type ExecImpl, ExecutableNotFoundError, FindSymbolOptions, FsPluginStore, GIT_READONLY_SUBCOMMANDS, GeminiService, type GitExecFn, GlobOptions, type GrepInvocation, GrepOptions, type HasBinFn, HeadlessRunner, type HeadlessRunnerDeps, HeadlessSession, HomeTranscriptReader, type IAiService, IApproval, IConfig, IFileSystem, type ILogger, type INotification, IPluginStore, ITerminalRunner, ITerminalSession, IWorktreeIsolation, IsolationHandoff, IsolationLandedTask, IsolationMergeResult, IsolationView, JSON_REPAIR_INSTRUCTION, type KillTreeDeps, type LaunchDeps, type LaunchPlan, LegacyPlanState, LineBuffer, type LiveOutputLookup, type LiveTail, type LiveTailOptions, type MappedTool, ModelResolver, type ModelResolverDeps, type ModifyPlanRequest, type NotificationAction, OPENCODE_MANIFEST, ORDEWELL_SETTABLE_ENV, OUTPUT_LINES_DEFAULT, OUTPUT_LINES_MAX, OpenAiService, OpenCodeAdapter, type OrchestratorObserver, OrchestratorOption, PLUGIN_NAME_PATTERN, PROVIDER_CREDENTIAL_ENV, PROVIDER_DETECT_PRIORITY, PROVIDER_LABEL, PROVIDER_PRIORITY, PROVIDER_SHORT_LABEL, type PendingApproval, PendingApprovals, type PendingApprovalsOptions, PlanEditError, PlanIsolation, PlanParseError, type PlanRequest, PlanState, PlanStatus, PlanStore, Planner, type PlannerModelCandidate, type PlannerModelChoice, PlannerModelMemory, type PlannerModelRecall, type PlannerModelStore, type PlannerReplyClassification, type PlannerRuntimeToggles, type PluginSource, type PrdBlock, type PreparedLaunch, type PriorOutput, type ProbeFn, ProviderModelLists, type ProviderRegistration, type PtySize, type PtyWrapOptions, QueuedMessage, REFUSED_COMMANDS, ReadFileOpts, type RepairLoopOpts, type RepairVerdict, RepoGroupLayout, type ResearchChat, ResearchLogEntry, ResearchProgress, type ResearchShell, type ResearchShellDeps, ResearchToolType, type ResearchTurn, ResolveContext, type RewindTarget, type RunnerCatalog, RunnerId, RunnerInstallation, RunnerInvocation, type RunnerMode, RunnerModeInfo, RunnerPluginManifest, RunnerRegistry, type RunnerSpawnOptions, SETTINGS_ENV_ALLOWLIST, SETTINGS_ENV_REFUSED, STATE_DIR, STOPPED_TOOL_RESULT, SYMBOL_LANGUAGES, Session, SessionBroadcaster, type SessionData, type SessionDeps, type SessionMeta, SessionNotice, type SessionPlanner, type SessionRuntimeSettings, SettingsService, type ShellDialect, type SkillInfo, type SkillMetadata, SkillsService, type SpawnSpec, StdioAgentAdapter, TASK_QUERY_ANSWER_MAX_CHARS, TASK_QUERY_ANSWER_OR_OPS, TASK_QUERY_FIELDS, TASK_QUERY_PROTOCOL, TASK_QUERY_REMINDER, TRUNCATED_PLAN_REPAIR_INSTRUCTION, Task, type TaskAttemptSnapshot, TaskIsolation, TaskOp, TaskOrchestrator, type TaskOutputAttempt, type TaskOutputSource, type TaskQuery, type TaskQueryCatalog, type TaskQueryField, TaskSnapshot, TmuxRunner, type TmuxRunnerDeps, type TokenCarriers, type ToolCall, ToolOutcome, type ToolResult, type TranscriptQuery, type TranscriptReader, type UserSettings, Verdict, VerdictEngine, type VerdictListener, WINDOWS_MAX_COMMAND_LINE, type WorkspaceCheckDeps, WorkspaceNotAProjectError, WorkspaceNotFoundError, type WorkspaceProjectCheckDeps, type WorktreeIsolationDeps, admitSettingsEnv, applyHeadLimit, assertInstallablePluginUrl, assertPlainPluginName, assertWorkspaceExists, assertWorkspaceIsProject, augmentPromptWithPriorOutputs, augmentedPath, bearerHeaderValue, buildConflictRepairPrompt, buildConflictResolutionPrompt, buildConversationSystemPrompt, buildFallbackGrepArgs, buildGlobArgs, buildGrepArgs, buildMergePrompt, buildModifyDuringExecutionPrompt, buildModifyPlanPrompt, buildPlanWithResults, buildResearchPrompt, buildResearchToolsPrompt, buildRunnerInvocation, buildShellInvocation, buildSplitPrompt, buildSubagentSystemPrompt, clampThinkingEffort, classifyCommand, classifyPlannerReply, classifyPluginSource, clearAugmentedPathCache, clearDaemonToken, clearResearchShellCache, clearState, clipboardCopyCommand, coerceAssignments, collectDirectDependencyOutputs, composeAugmentedPrompt, configuredProviders, createAiService, createSkillsService, createWorktreeIsolation, daemonTokenPath, defaultLogger, definitionPattern, deleteSession, describeMergeResult, discoverGeminiModels, effectiveAllowlist, ensureDir, ensureStateDirIgnored, executionLogBlock, extractPrdBlock, extractPresentedToken, filterFallbackByAnchoredInclude, filterModelsForPrompt, formatSearchOutput, generatePlanWithRepair, getLatestSession, getProviderMeta, getSettingsPath, getStateDir, globalDataDir, grantScopeFor, hasTmux, includeGlobFor, isCliProvider, isExecutableResolved, isOpenAiProvider, isPlainPluginName, isValidManifest, killTree, languageForId, listSessions, loadSession, loadSessionPlanState, loadState, mapAgentTool, migrateOldConfigDir, mintDaemonToken, mintSessionId, modelContextBlock, modifyValidationFeedback, normalizeAgentArgs, normalizeGeminiModel, parseTaskQueryJson, pendingEditRulesBlock, planDirectLaunch, planShellLaunch, posixShellQuote, prefixModelId, providerForRunner, reEmitPlanPrompt, reEmitTaskOpsPrompt, reEmitTaskQueryPrompt, readDaemonToken, referencePattern, renderPlanMap, renderPriorOutputs, renderTaskQueryAnswer, repairLoop, researchShellWarning, researchToolsPath, resolveArgs, resolvePluginInstallDir, resolveProviderFromPrefix, resolveResearchShell, resolveSkillInvocation, resolveWithin, retargetTaskRunner, runnerAssignment, runnerForProvider, sanitizeSlug, savePrdMarkdown, saveSession, saveState, sessionRuntimeSettings, stateExists, stripAnsi, stripModelPrefix, summarizeOutput, taskOpsRejectedPrompt, taskQuerySignature, textHasTaskQuery, tmuxSessionName, tmuxSocketName, tmuxWindowName, tokenSubprotocols, tokensMatch, truncatedPlanReEmitPrompt, wellKnownBinDirs, windowsCommandLine, withPath, wrapWithPty };

package/dist/index.d.ts

@@ -1,17 +1,17 @@
-import { B as RunnerId, t as PlanStatus, L as LegacyPlanState, j as IsolationMergeResult, I as IWorktreeIsolation, p as IsolationTaskStatus, P as PlanIsolation, R as RepoGroupLayout, a as DiscoveredModel, T as Task, w as ResearchProgress, v as ResearchLogEntry, C as ConversationMessage, O as TaskSnapshot, c as IsolationHandoff, G as TaskIsolation, q as IsolationView, Q as QueuedMessage, A as ActiveTaskSession, z as ResearchToolType, s as PlanState, a1 as Verdict } from './Task-CfTjRQeS.js';
-export { D as DiscoveredMode, b as IsolationAvailability, d as IsolationHandoffRepo, e as IsolationInactiveReason, f as IsolationLandedTask, g as IsolationLanding, h as IsolationMergeBlock, i as IsolationMergeBlockReason, k as IsolationOutcome, l as IsolationRepo, m as IsolationRun, n as IsolationTaskRecord, o as IsolationTaskRepo, M as Message, r as PlanModificationWarnings, u as PreparedTask, x as ResearchStep, y as ResearchStepOutcome, S as StreamEvent, E as StreamStepEvent, F as StreamThinkingEvent, H as TaskIsolationState, J as TaskMode, K as TaskModelAssignment, N as TaskOutputSummary, U as TaskStatus, V as TaskType, W as TaskWithParent, X as ThinkingBlock, Y as UserPromptEntry, Z as UserStep, _ as ValidationCheck, $ as ValidationContext, a0 as ValidationResult, a2 as VerificationCheck, a3 as addTaskToPlan, a4 as createEmptyPlan, a5 as createTask, a6 as emptyWarnings, a7 as flattenTasks, a8 as flattenTasksWithParents, a9 as migrateLegacyPlan, aa as migratePlanState, ab as migrateTask, ac as removeTaskFromPlan, ad as renumberTasks, ae as updateTaskInPlan, af as validateModifiedPlan, ag as warningsText } from './Task-CfTjRQeS.js';
-import { f as IFileSystem, R as ReadFileOpts, T as ToolOutcome, d as GrepOptions, c as GlobOptions, b as FindSymbolOptions, I as IConfig, A as AiProvider, r as ProviderModelLists, i as ITerminalSession, h as ITerminalRunner, w as RunnerRegistry, k as OrchestratorOption, u as RunnerInvocation, g as IPluginStore, v as RunnerPluginManifest, t as ResolveContext } from './ITerminalRunner-nupxhtPb.js';
-export { a as AllProviderModels, C as CatalogModel, D as DiscoveryCommand, F as FetchAllProviderModelsOptions, G as GREP_DEFAULT_HEAD_LIMIT, e as GrepOutputMode, M as ModelCatalog, j as ModelShortcut, O as ORCHESTRATOR_SHORTCUTS, P as PluginCloneFn, l as PluginEntry, m as PluginFeatures, n as PluginMode, o as PluginModelDiscovery, p as PluginRunnerDef, q as ProviderCredentialSource, s as ProviderModelsResult, S as SEARCH_EXCLUSIONS, x as collectProviderCredentials, y as enabledRunners, z as fetchAllProviderModels, B as isReservedRunnerName, E as knownModelId, H as resolveModelShortcut, J as resolveProvider, K as toOrchestratorOptions } from './ITerminalRunner-nupxhtPb.js';
+import { F as RunnerId, u as PlanStatus, L as LegacyPlanState, k as IsolationMergeResult, g as IsolationLandedTask, I as IWorktreeIsolation, w as RepoGroupLayout, a as DiscoveredModel, T as Task, y as ResearchProgress, x as ResearchLogEntry, C as ConversationMessage, V as TaskSnapshot, d as IsolationHandoff, J as TaskIsolation, r as IsolationView, P as PlanIsolation, Q as QueuedMessage, A as ActiveTaskSession, E as ResearchToolType, t as PlanState, a3 as Verdict } from './Task-BxQkPlXO.js';
+export { D as DiscoveredMode, b as IntegrationDisposal, c as IsolationAvailability, e as IsolationHandoffRepo, f as IsolationInactiveReason, h as IsolationLanding, i as IsolationMergeBlock, j as IsolationMergeBlockReason, l as IsolationOutcome, m as IsolationRepo, n as IsolationRun, o as IsolationTaskRecord, p as IsolationTaskRepo, q as IsolationTaskStatus, M as Message, s as PlanModificationWarnings, v as PreparedTask, R as RepairEvidence, z as ResearchStep, B as ResearchStepOutcome, S as StreamEvent, G as StreamStepEvent, H as StreamThinkingEvent, K as TaskIsolationState, N as TaskMode, O as TaskModelAssignment, U as TaskOutputSummary, W as TaskStatus, X as TaskType, Y as TaskWithParent, Z as ThinkingBlock, _ as UserPromptEntry, $ as UserStep, a0 as ValidationCheck, a1 as ValidationContext, a2 as ValidationResult, a4 as VerificationCheck, a5 as addTaskToPlan, a6 as createEmptyPlan, a7 as createTask, a8 as emptyWarnings, a9 as flattenTasks, aa as flattenTasksWithParents, ab as migrateLegacyPlan, ac as migratePlanState, ad as migrateTask, ae as removeTaskFromPlan, af as renumberTasks, ag as updateTaskInPlan, ah as validateModifiedPlan, ai as warningsText } from './Task-BxQkPlXO.js';
+import { f as IFileSystem, R as ReadFileOpts, T as ToolOutcome, d as GrepOptions, c as GlobOptions, b as FindSymbolOptions, I as IConfig, A as AiProvider, r as ProviderModelLists, i as ITerminalSession, h as ITerminalRunner, w as RunnerRegistry, k as OrchestratorOption, u as RunnerInvocation, g as IPluginStore, v as RunnerPluginManifest, t as ResolveContext } from './ITerminalRunner-H1yT8LTy.js';
+export { a as AllProviderModels, C as CatalogModel, D as DiscoveryCommand, F as FetchAllProviderModelsOptions, G as GREP_DEFAULT_HEAD_LIMIT, e as GrepOutputMode, M as ModelCatalog, j as ModelShortcut, O as ORCHESTRATOR_SHORTCUTS, P as PluginCloneFn, l as PluginEntry, m as PluginFeatures, n as PluginMode, o as PluginModelDiscovery, p as PluginRunnerDef, q as ProviderCredentialSource, s as ProviderModelsResult, S as SEARCH_EXCLUSIONS, x as collectProviderCredentials, y as enabledRunners, z as fetchAllProviderModels, B as isReservedRunnerName, E as knownModelId, H as resolveModelShortcut, J as resolveProvider, K as toOrchestratorOptions } from './ITerminalRunner-H1yT8LTy.js';
 import { I as IApproval, d as ApprovalRequest, a as ApprovalMode } from './ApprovalPolicy-BVhGdECT.js';
 export { A as ApprovalKind, b as ApprovalPolicy, c as ApprovalPolicyOptions, e as ApprovalSource, D as DENY_ALL } from './ApprovalPolicy-BVhGdECT.js';
-import { R as RunnerModeInfo } from './ModeResolver-BBVktyiP.js';
-export { M as ManifestLookup, b as buildModeGuide, f as filteredBuildModes, r as resolveDefaultMode, a as resolveTaskMode, c as runnerModesFrom } from './ModeResolver-BBVktyiP.js';
-import { T as TaskOp, c as SessionBroadcaster, e as SessionNotice } from './plan-utils-Cy-RsBSV.js';
-export { A as ApplyTaskOpsResult, C as CHECKPOINT_TRUNCATE_LENGTH, S as SerializedPlan, a as SerializedTask, b as SerializedTaskStatus, d as SessionMessage, f as TaskRef, g as applyTaskOps, h as canMergeTasks, i as canSetDependencies, j as canSplitTask, k as classifyOutcome, l as dependencyCandidates, m as dependentsOf, n as executionSummary, p as parseTaskOpsJson, s as serializePlan, o as serializeTask, q as serializeTaskStatus, r as summarizeToolCall, t as textHasTaskOps, u as truncateCheckpointSummary } from './plan-utils-Cy-RsBSV.js';
+import { T as TaskOp, f as SessionBroadcaster, h as SessionNotice } from './plan-utils-CkNbqAmS.js';
+export { A as Adr0013IsolationRun, a as Adr0013PlanIsolation, b as Adr0013TaskRecord, c as ApplyTaskOpsResult, C as CHECKPOINT_TRUNCATE_LENGTH, S as SerializedPlan, d as SerializedTask, e as SerializedTaskStatus, g as SessionMessage, i as TaskRef, j as applyTaskOps, k as canMergeTasks, l as canSetDependencies, m as canSplitTask, n as capConflictFiles, o as classifyOutcome, p as dependencyCandidates, q as dependentsOf, r as executionSummary, s as migratePlanIsolation, t as parseTaskOpsJson, u as serializePlan, v as serializeTask, w as serializeTaskStatus, x as summarizeToolCall, y as textHasTaskOps, z as truncateCheckpointSummary } from './plan-utils-CkNbqAmS.js';
+import { R as RunnerModeInfo } from './ModeResolver-Dkig8ghQ.js';
+export { M as ManifestLookup, b as buildModeGuide, f as filteredBuildModes, r as resolveDefaultMode, a as resolveTaskMode, c as runnerModesFrom } from './ModeResolver-Dkig8ghQ.js';
 import { ChildProcess } from 'child_process';
 import { EventEmitter } from 'events';
-import { b as PlanParseError } from './parsing-Bv3g2Tu_.js';
-export { P as PLAN_ENVELOPE_KEY, a as PartialPlanTask, T as TASK_OPS_ENVELOPE_KEY, c as TASK_QUERY_ENVELOPE_KEY, d as checkDepsResolve, e as checkImmutableLog, f as checkInProgress, g as checkNoCycles, h as checkUniqueIds, i as escapeControlCharsInStrings, j as extractJsonObject, k as extractObjectWithBalance, l as extractObjectsWithKey, m as looksLikePlanAttempt, p as parsePartialPlan, n as parsePlanJson, s as stripModelNoise, o as stripTrailingCommas, v as validatePlanModification } from './parsing-Bv3g2Tu_.js';
+import { b as PlanParseError } from './parsing-CF_grC29.js';
+export { P as PLAN_ENVELOPE_KEY, a as PartialPlanTask, T as TASK_OPS_ENVELOPE_KEY, c as TASK_QUERY_ENVELOPE_KEY, d as checkDepsResolve, e as checkImmutableLog, f as checkInProgress, g as checkNoCycles, h as checkUniqueIds, i as escapeControlCharsInStrings, j as extractJsonObject, k as extractObjectWithBalance, l as extractObjectsWithKey, m as looksLikePlanAttempt, p as parsePartialPlan, n as parsePlanJson, s as stripModelNoise, o as stripTrailingCommas, v as validatePlanModification } from './parsing-CF_grC29.js';
 export { resolveOrderLabel, taskOrderLabel } from './order-labels.js';
 
 interface SessionMeta {
@@ -527,6 +527,7 @@ declare abstract class BaseConfig implements IConfig {
     get worktreeSetupCommand(): string | undefined;
     get workspaceRepos(): string[];
     get worktreeLinks(): string[];
+    get conflictRepairAttempts(): number;
     get approvalMode(): ApprovalMode;
     get approvalPreApproved(): string[];
     protected static detectProvider(fallback: AiProvider): AiProvider;
@@ -560,9 +561,11 @@ interface INotification {
 /**
  * How "Merge all" went, in words every surface shares. `group` is whether the
  * run spans more than a lone repo at `.`; only a merge into every repository
- * has something to say about that.
+ * has something to say about that. `repaired` names the landed tasks that only
+ * landed after a conflict repair (ADR-0015), so a clean-looking merge still
+ * points review at what changed to get there.
  */
-declare function describeMergeResult(result: IsolationMergeResult, branch: string, group: boolean): {
+declare function describeMergeResult(result: IsolationMergeResult, branch: string, group: boolean, repaired?: IsolationLandedTask[]): {
     level: 'info' | 'warn' | 'error';
     message: string;
 };
@@ -584,37 +587,6 @@ interface WorktreeIsolationDeps {
 }
 declare function createWorktreeIsolation(deps: WorktreeIsolationDeps): IWorktreeIsolation;
 
-/** A task record as ADR-0013 persisted it, for one repository. */
-interface Adr0013TaskRecord {
-    taskId: string;
-    order: number;
-    title: string;
-    branch: string;
-    worktree: string;
-    status: IsolationTaskStatus;
-    linked: string[];
-}
-/** A run as ADR-0013 persisted it (0.4.23): one repository, its refs on the run itself. */
-interface Adr0013IsolationRun {
-    id: string;
-    workspaceRoot: string;
-    baseRef: string;
-    baseBranch?: string;
-    integrationBranch: string;
-    tasks: Record<string, Adr0013TaskRecord>;
-}
-interface Adr0013PlanIsolation {
-    run: Adr0013IsolationRun;
-    resolvers: Record<string, string>;
-}
-/**
- * A persisted plan isolation in today's shape. A run saved in the ADR-0013
- * format — recognised by its own `integrationBranch` — becomes a group of one
- * at `.`, keeping its branches, so a session saved by 0.4.23 resumes and hands
- * off exactly as it would have.
- */
-declare function migratePlanIsolation(state: PlanIsolation | Adr0013PlanIsolation): PlanIsolation;
-
 interface ILogger {
     warn(scope: string, message: string, err?: unknown): void;
 }
@@ -1933,12 +1905,19 @@ declare class TaskOrchestrator {
      */
     adoptIsolation(state: PlanIsolation | null): Promise<void>;
     reviewRunDiff(): Promise<string>;
-    /** "Merge all": the run's integration branches into whatever the user has checked out, in every repo or none. */
+    /**
+     * "Merge all": the run's integration branches into whatever the user has
+     * checked out, in every repo or none. Once everything merged, the run has
+     * nothing left to hand over, so it is cleared up and forgotten; a branch
+     * the user's HEAD somehow does not contain stays for the next run's sweep.
+     */
     mergeRun(): Promise<IsolationMergeResult>;
+    private clearMergedRun;
     /** Worktrees and task branches go; the integration branch and the record stay for review and merge. */
     cleanupRun(): Promise<void>;
     /** The run and everything it made go, and the plan forgets it; the next run starts afresh. */
     discardRun(): Promise<void>;
+    private forgetRun;
     private requireRun;
     /** What the plan persists of isolated execution; null when no run ever isolated. */
     get isolationRecord(): PlanIsolation | null;
@@ -1964,6 +1943,24 @@ declare class TaskOrchestrator {
     stop(): void;
     onUserTaskComplete(taskId: string): Promise<void>;
     private onVerdict;
+    private afterVerdict;
+    /**
+     * A repair's verdict decides only whether its work may try to land. It never
+     * replaces the verdict the task's own work earned, and a repair that does not
+     * land leaves the task waiting on the user — never a failed task, so never a
+     * halted run.
+     */
+    private settleRepair;
+    /**
+     * Evidence before the queue: the repair's work is committed and checked, and
+     * only then merged, through the same serialized landing as any other task —
+     * so a repair the tip has moved past again is a fresh conflict, not a pass.
+     */
+    private landRepair;
+    private landedRepair;
+    /** A repair that did not land leaves the task as its conflict did: waiting on the user, worktree and refs kept. */
+    private unrepaired;
+    private describeEvidence;
     /**
      * Merge a passed attempt's worktree. The attempt stays live while it waits on
      * the module's merge queue, so a cancel, retry or stop in that window still
@@ -1977,6 +1974,9 @@ declare class TaskOrchestrator {
     /** Settle a task whose work passed, by what its integration reported. */
     private landPassed;
     private landUnmerged;
+    /** The repair a conflicted task is owed next; null when repair is off, used up, or there is no isolated run to repair it in. */
+    private nextRepair;
+    private noRepairReason;
     /**
      * Mark which added task resolves which conflict. The resolver merges the
      * conflicted task's branch by hand in its own worktree; once that lands, the
@@ -2064,6 +2064,7 @@ declare class TaskOrchestrator {
      * attempt may have decided the task since (mark complete, cancel, retry).
      */
     private abandonSpawn;
+    private repairPrompt;
     /**
      * The one place an attempt's working directory is decided. Async so a
      * per-attempt workspace (worktree isolation, #12) can be prepared here.
@@ -2088,6 +2089,8 @@ declare class TaskOrchestrator {
     plannerIsolation(): Promise<IsolatedExecution>;
     private decideRun;
     private activate;
+    /** What earlier runs left merged in the group goes; a failure here is worth a word, never a stopped run. */
+    private sweep;
     /**
      * The plan's run carries on while anything has landed on its integration
      * branch: a resumed plan's dependents must start from a tip that holds their
@@ -2097,8 +2100,8 @@ declare class TaskOrchestrator {
     /**
      * A run with nothing landed holds only superseded attempts, so it goes whole.
      * One that cannot be continued for another reason — it ran from a different
-     * workspace path — keeps its integration branch: only the user gives landed
-     * work up.
+     * workspace path — keeps its integration branch in each repo that has not
+     * merged it: only the user gives landed work up.
      */
     private mintRun;
     /** Close the open run. An isolated one hands its integration branch over for review. */
@@ -2697,11 +2700,13 @@ declare class ConversationEditError extends Error {
 declare class ConversationBusyError extends ConversationEditError {
     constructor(operation: string);
 }
-/** A user message the conversation can be rewound to just before. */
+/** A user message a rewind can fork the conversation from just before. */
 interface RewindTarget {
-    /** Position in the transcript — what {@link PlannerConversation.rewind} takes. */
+    /** Position in the transcript — what {@link PlannerConversation.cloneBefore} takes. */
     index: number;
     preview: string;
+    /** The whole message — the preview cuts it to one line, and a surface confirming the rewind quotes it. */
+    content: string;
     timestamp: string;
 }
 /** What a compaction left behind. */
@@ -2807,6 +2812,10 @@ interface ConversationFork {
     goal: string;
     workspace: string;
 }
+/** A fork made by a rewind, and the full text of the message it was made just before. */
+interface ConversationRewind extends ConversationFork {
+    rewoundMessage: string;
+}
 interface SessionDeps {
     config: IConfig;
     notifications: INotification;
@@ -3029,16 +3038,18 @@ declare class Session {
      */
     forkConversation(): ConversationFork;
     /**
-     * Cut the conversation back to just before a user message (a transcript
-     * position from {@link rewindTargets}). Conversation only: the task list,
-     * and any run executing it, carry on as they are. The planner's live context
-     * is dropped, so the next message replays from the shortened transcript.
+     * Fork the conversation from just before a user message (a transcript
+     * position from {@link rewindTargets}): the fork holds everything said
+     * before it and the current task list, like {@link forkConversation}, and
+     * this session keeps its whole history. The message's full text comes back
+     * so a surface can offer it for resending.
      */
-    rewindConversation(userMessageIndex: number): LegacyPlanState;
+    rewindConversation(userMessageIndex: number): ConversationRewind;
+    private saveFork;
     /**
      * Condense the conversation on the user's say-so: a hidden planner turn
      * summarises it, and the summary replaces everything but the last two
-     * exchanges. Conversation only, like a rewind — the tasks, and any run
+     * exchanges. Conversation only — the tasks, and any run
      * executing them, are untouched. Atomic: a failed or stopped turn changes
      * nothing.
      */
@@ -3128,8 +3139,9 @@ declare class Session {
      * The opt-in way through a merge conflict: add an AI task, on the conflicted
      * task's own runner and model, that merges its branch by hand in a worktree
      * of its own. When that task lands, the conflicted one lands through it (see
-     * {@link TaskOrchestrator.linkConflictResolver}). Never automatic — nothing
-     * but this call adds it.
+     * {@link TaskOrchestrator.linkConflictResolver}). The automatic answer to a
+     * conflict is a repair, a new attempt of the same task (ADR-0015); a task is
+     * only ever added to the plan by this call.
      */
     resolveConflictAsTask(taskId: string): Promise<LegacyPlanState | null>;
     stopExecution(): void;
@@ -3508,6 +3520,19 @@ declare function buildConflictResolutionPrompt(task: Task, conflict: {
     repos: string[];
     conflictRepo?: string;
 }, integrationBranch: string): string;
+/**
+ * Runner prompt for a conflict repair (ADR-0015): a new attempt of the
+ * conflicted task itself, in its kept worktree, so the merge runs the other
+ * way round from {@link buildConflictResolutionPrompt} — the integration tip
+ * into the task's branch. Whether it worked is decided by the evidence checks
+ * and the landing that follow, never by the agent's word.
+ */
+declare function buildConflictRepairPrompt(task: Task, conflict: {
+    branch: string;
+    repos: string[];
+    conflictRepo?: string;
+    conflictFiles?: string[];
+}, integrationBranch: string): string;
 
 /**
  * The one owner of "the model emitted something unusable — correct it and
@@ -4162,4 +4187,4 @@ declare class PlannerModelMemory {
     recall(provider: string, catalog: PlannerModelCandidate[]): PlannerModelRecall;
 }
 
-export { ALLOWED_PLUGIN_HOSTS, ALL_PROVIDERS, AUTO_COMMANDS, AbstractRunner, AbstractTerminalSession, ActiveTaskSession, type Adr0013IsolationRun, type Adr0013PlanIsolation, type Adr0013TaskRecord, type AgentAdapter, type AgentAdapterFactory, type AgentEvent, type AgentProcessDeps, type AgentStartOptions, AiProvider, ApprovalMode, ApprovalRequest, BUILTIN_SKILL_NAMES, BaseAiService, BaseConfig, BaseFileSystem, BufferedTaskOutputSource, CLAUDE_CODE_MANIFEST, CLI_PROVIDERS, CMD_EXE_MAX_COMMAND_LINE, CORE_PLANNER_PROMPT, type CappedRows, type CheckpointListener, ClaudeCodeAdapter, CliAgentAiService, type CliAgentAiServiceDeps, CodexAdapter, type CommandClassification, CommandLineTooLongError, type CommandTier, type ComposeOptions, ConsoleLogger, ContextCollector, ConversationBusyError, type ConversationCompaction, ConversationEditError, type ConversationFork, ConversationMessage, type ConversationRequest, type ConversationTurn, type ConversationVariant, DAEMON_SUBPROTOCOL, DAEMON_TOKEN_SUBPROTOCOL_PREFIX, DiscoveredModel, EmbeddedNewlineError, type EnvAdmission, EnvConfig, type ExecFileFn, type ExecImpl, ExecutableNotFoundError, FindSymbolOptions, FsPluginStore, GIT_READONLY_SUBCOMMANDS, GeminiService, type GitExecFn, GlobOptions, type GrepInvocation, GrepOptions, type HasBinFn, HeadlessRunner, type HeadlessRunnerDeps, HeadlessSession, HomeTranscriptReader, type IAiService, IApproval, IConfig, IFileSystem, type ILogger, type INotification, IPluginStore, ITerminalRunner, ITerminalSession, IWorktreeIsolation, IsolationHandoff, IsolationMergeResult, IsolationTaskStatus, IsolationView, JSON_REPAIR_INSTRUCTION, type KillTreeDeps, type LaunchDeps, type LaunchPlan, LegacyPlanState, LineBuffer, type LiveOutputLookup, type LiveTail, type LiveTailOptions, type MappedTool, ModelResolver, type ModelResolverDeps, type ModifyPlanRequest, type NotificationAction, OPENCODE_MANIFEST, ORDEWELL_SETTABLE_ENV, OUTPUT_LINES_DEFAULT, OUTPUT_LINES_MAX, OpenAiService, OpenCodeAdapter, type OrchestratorObserver, OrchestratorOption, PLUGIN_NAME_PATTERN, PROVIDER_CREDENTIAL_ENV, PROVIDER_DETECT_PRIORITY, PROVIDER_LABEL, PROVIDER_PRIORITY, PROVIDER_SHORT_LABEL, type PendingApproval, PendingApprovals, type PendingApprovalsOptions, PlanEditError, PlanIsolation, PlanParseError, type PlanRequest, PlanState, PlanStatus, PlanStore, Planner, type PlannerModelCandidate, type PlannerModelChoice, PlannerModelMemory, type PlannerModelRecall, type PlannerModelStore, type PlannerReplyClassification, type PlannerRuntimeToggles, type PluginSource, type PrdBlock, type PreparedLaunch, type PriorOutput, type ProbeFn, ProviderModelLists, type ProviderRegistration, type PtySize, type PtyWrapOptions, QueuedMessage, REFUSED_COMMANDS, ReadFileOpts, type RepairLoopOpts, type RepairVerdict, RepoGroupLayout, type ResearchChat, ResearchLogEntry, ResearchProgress, type ResearchShell, type ResearchShellDeps, ResearchToolType, type ResearchTurn, ResolveContext, type RewindTarget, type RunnerCatalog, RunnerId, RunnerInstallation, RunnerInvocation, type RunnerMode, RunnerModeInfo, RunnerPluginManifest, RunnerRegistry, type RunnerSpawnOptions, SETTINGS_ENV_ALLOWLIST, SETTINGS_ENV_REFUSED, STATE_DIR, STOPPED_TOOL_RESULT, SYMBOL_LANGUAGES, Session, SessionBroadcaster, type SessionData, type SessionDeps, type SessionMeta, SessionNotice, type SessionPlanner, type SessionRuntimeSettings, SettingsService, type ShellDialect, type SkillInfo, type SkillMetadata, SkillsService, type SpawnSpec, StdioAgentAdapter, TASK_QUERY_ANSWER_MAX_CHARS, TASK_QUERY_ANSWER_OR_OPS, TASK_QUERY_FIELDS, TASK_QUERY_PROTOCOL, TASK_QUERY_REMINDER, TRUNCATED_PLAN_REPAIR_INSTRUCTION, Task, type TaskAttemptSnapshot, TaskIsolation, TaskOp, TaskOrchestrator, type TaskOutputAttempt, type TaskOutputSource, type TaskQuery, type TaskQueryCatalog, type TaskQueryField, TaskSnapshot, TmuxRunner, type TmuxRunnerDeps, type TokenCarriers, type ToolCall, ToolOutcome, type ToolResult, type TranscriptQuery, type TranscriptReader, type UserSettings, Verdict, VerdictEngine, type VerdictListener, WINDOWS_MAX_COMMAND_LINE, type WorkspaceCheckDeps, WorkspaceNotAProjectError, WorkspaceNotFoundError, type WorkspaceProjectCheckDeps, type WorktreeIsolationDeps, admitSettingsEnv, applyHeadLimit, assertInstallablePluginUrl, assertPlainPluginName, assertWorkspaceExists, assertWorkspaceIsProject, augmentPromptWithPriorOutputs, augmentedPath, bearerHeaderValue, buildConflictResolutionPrompt, buildConversationSystemPrompt, buildFallbackGrepArgs, buildGlobArgs, buildGrepArgs, buildMergePrompt, buildModifyDuringExecutionPrompt, buildModifyPlanPrompt, buildPlanWithResults, buildResearchPrompt, buildResearchToolsPrompt, buildRunnerInvocation, buildShellInvocation, buildSplitPrompt, buildSubagentSystemPrompt, clampThinkingEffort, classifyCommand, classifyPlannerReply, classifyPluginSource, clearAugmentedPathCache, clearDaemonToken, clearResearchShellCache, clearState, clipboardCopyCommand, coerceAssignments, collectDirectDependencyOutputs, composeAugmentedPrompt, configuredProviders, createAiService, createSkillsService, createWorktreeIsolation, daemonTokenPath, defaultLogger, definitionPattern, deleteSession, describeMergeResult, discoverGeminiModels, effectiveAllowlist, ensureDir, ensureStateDirIgnored, executionLogBlock, extractPrdBlock, extractPresentedToken, filterFallbackByAnchoredInclude, filterModelsForPrompt, formatSearchOutput, generatePlanWithRepair, getLatestSession, getProviderMeta, getSettingsPath, getStateDir, globalDataDir, grantScopeFor, hasTmux, includeGlobFor, isCliProvider, isExecutableResolved, isOpenAiProvider, isPlainPluginName, isValidManifest, killTree, languageForId, listSessions, loadSession, loadSessionPlanState, loadState, mapAgentTool, migrateOldConfigDir, migratePlanIsolation, mintDaemonToken, mintSessionId, modelContextBlock, modifyValidationFeedback, normalizeAgentArgs, normalizeGeminiModel, parseTaskQueryJson, pendingEditRulesBlock, planDirectLaunch, planShellLaunch, posixShellQuote, prefixModelId, providerForRunner, reEmitPlanPrompt, reEmitTaskOpsPrompt, reEmitTaskQueryPrompt, readDaemonToken, referencePattern, renderPlanMap, renderPriorOutputs, renderTaskQueryAnswer, repairLoop, researchShellWarning, researchToolsPath, resolveArgs, resolvePluginInstallDir, resolveProviderFromPrefix, resolveResearchShell, resolveSkillInvocation, resolveWithin, retargetTaskRunner, runnerAssignment, runnerForProvider, sanitizeSlug, savePrdMarkdown, saveSession, saveState, sessionRuntimeSettings, stateExists, stripAnsi, stripModelPrefix, summarizeOutput, taskOpsRejectedPrompt, taskQuerySignature, textHasTaskQuery, tmuxSessionName, tmuxSocketName, tmuxWindowName, tokenSubprotocols, tokensMatch, truncatedPlanReEmitPrompt, wellKnownBinDirs, windowsCommandLine, withPath, wrapWithPty };
+export { ALLOWED_PLUGIN_HOSTS, ALL_PROVIDERS, AUTO_COMMANDS, AbstractRunner, AbstractTerminalSession, ActiveTaskSession, type AgentAdapter, type AgentAdapterFactory, type AgentEvent, type AgentProcessDeps, type AgentStartOptions, AiProvider, ApprovalMode, ApprovalRequest, BUILTIN_SKILL_NAMES, BaseAiService, BaseConfig, BaseFileSystem, BufferedTaskOutputSource, CLAUDE_CODE_MANIFEST, CLI_PROVIDERS, CMD_EXE_MAX_COMMAND_LINE, CORE_PLANNER_PROMPT, type CappedRows, type CheckpointListener, ClaudeCodeAdapter, CliAgentAiService, type CliAgentAiServiceDeps, CodexAdapter, type CommandClassification, CommandLineTooLongError, type CommandTier, type ComposeOptions, ConsoleLogger, ContextCollector, ConversationBusyError, type ConversationCompaction, ConversationEditError, type ConversationFork, ConversationMessage, type ConversationRequest, type ConversationRewind, type ConversationTurn, type ConversationVariant, DAEMON_SUBPROTOCOL, DAEMON_TOKEN_SUBPROTOCOL_PREFIX, DiscoveredModel, EmbeddedNewlineError, type EnvAdmission, EnvConfig, type ExecFileFn, type ExecImpl, ExecutableNotFoundError, FindSymbolOptions, FsPluginStore, GIT_READONLY_SUBCOMMANDS, GeminiService, type GitExecFn, GlobOptions, type GrepInvocation, GrepOptions, type HasBinFn, HeadlessRunner, type HeadlessRunnerDeps, HeadlessSession, HomeTranscriptReader, type IAiService, IApproval, IConfig, IFileSystem, type ILogger, type INotification, IPluginStore, ITerminalRunner, ITerminalSession, IWorktreeIsolation, IsolationHandoff, IsolationLandedTask, IsolationMergeResult, IsolationView, JSON_REPAIR_INSTRUCTION, type KillTreeDeps, type LaunchDeps, type LaunchPlan, LegacyPlanState, LineBuffer, type LiveOutputLookup, type LiveTail, type LiveTailOptions, type MappedTool, ModelResolver, type ModelResolverDeps, type ModifyPlanRequest, type NotificationAction, OPENCODE_MANIFEST, ORDEWELL_SETTABLE_ENV, OUTPUT_LINES_DEFAULT, OUTPUT_LINES_MAX, OpenAiService, OpenCodeAdapter, type OrchestratorObserver, OrchestratorOption, PLUGIN_NAME_PATTERN, PROVIDER_CREDENTIAL_ENV, PROVIDER_DETECT_PRIORITY, PROVIDER_LABEL, PROVIDER_PRIORITY, PROVIDER_SHORT_LABEL, type PendingApproval, PendingApprovals, type PendingApprovalsOptions, PlanEditError, PlanIsolation, PlanParseError, type PlanRequest, PlanState, PlanStatus, PlanStore, Planner, type PlannerModelCandidate, type PlannerModelChoice, PlannerModelMemory, type PlannerModelRecall, type PlannerModelStore, type PlannerReplyClassification, type PlannerRuntimeToggles, type PluginSource, type PrdBlock, type PreparedLaunch, type PriorOutput, type ProbeFn, ProviderModelLists, type ProviderRegistration, type PtySize, type PtyWrapOptions, QueuedMessage, REFUSED_COMMANDS, ReadFileOpts, type RepairLoopOpts, type RepairVerdict, RepoGroupLayout, type ResearchChat, ResearchLogEntry, ResearchProgress, type ResearchShell, type ResearchShellDeps, ResearchToolType, type ResearchTurn, ResolveContext, type RewindTarget, type RunnerCatalog, RunnerId, RunnerInstallation, RunnerInvocation, type RunnerMode, RunnerModeInfo, RunnerPluginManifest, RunnerRegistry, type RunnerSpawnOptions, SETTINGS_ENV_ALLOWLIST, SETTINGS_ENV_REFUSED, STATE_DIR, STOPPED_TOOL_RESULT, SYMBOL_LANGUAGES, Session, SessionBroadcaster, type SessionData, type SessionDeps, type SessionMeta, SessionNotice, type SessionPlanner, type SessionRuntimeSettings, SettingsService, type ShellDialect, type SkillInfo, type SkillMetadata, SkillsService, type SpawnSpec, StdioAgentAdapter, TASK_QUERY_ANSWER_MAX_CHARS, TASK_QUERY_ANSWER_OR_OPS, TASK_QUERY_FIELDS, TASK_QUERY_PROTOCOL, TASK_QUERY_REMINDER, TRUNCATED_PLAN_REPAIR_INSTRUCTION, Task, type TaskAttemptSnapshot, TaskIsolation, TaskOp, TaskOrchestrator, type TaskOutputAttempt, type TaskOutputSource, type TaskQuery, type TaskQueryCatalog, type TaskQueryField, TaskSnapshot, TmuxRunner, type TmuxRunnerDeps, type TokenCarriers, type ToolCall, ToolOutcome, type ToolResult, type TranscriptQuery, type TranscriptReader, type UserSettings, Verdict, VerdictEngine, type VerdictListener, WINDOWS_MAX_COMMAND_LINE, type WorkspaceCheckDeps, WorkspaceNotAProjectError, WorkspaceNotFoundError, type WorkspaceProjectCheckDeps, type WorktreeIsolationDeps, admitSettingsEnv, applyHeadLimit, assertInstallablePluginUrl, assertPlainPluginName, assertWorkspaceExists, assertWorkspaceIsProject, augmentPromptWithPriorOutputs, augmentedPath, bearerHeaderValue, buildConflictRepairPrompt, buildConflictResolutionPrompt, buildConversationSystemPrompt, buildFallbackGrepArgs, buildGlobArgs, buildGrepArgs, buildMergePrompt, buildModifyDuringExecutionPrompt, buildModifyPlanPrompt, buildPlanWithResults, buildResearchPrompt, buildResearchToolsPrompt, buildRunnerInvocation, buildShellInvocation, buildSplitPrompt, buildSubagentSystemPrompt, clampThinkingEffort, classifyCommand, classifyPlannerReply, classifyPluginSource, clearAugmentedPathCache, clearDaemonToken, clearResearchShellCache, clearState, clipboardCopyCommand, coerceAssignments, collectDirectDependencyOutputs, composeAugmentedPrompt, configuredProviders, createAiService, createSkillsService, createWorktreeIsolation, daemonTokenPath, defaultLogger, definitionPattern, deleteSession, describeMergeResult, discoverGeminiModels, effectiveAllowlist, ensureDir, ensureStateDirIgnored, executionLogBlock, extractPrdBlock, extractPresentedToken, filterFallbackByAnchoredInclude, filterModelsForPrompt, formatSearchOutput, generatePlanWithRepair, getLatestSession, getProviderMeta, getSettingsPath, getStateDir, globalDataDir, grantScopeFor, hasTmux, includeGlobFor, isCliProvider, isExecutableResolved, isOpenAiProvider, isPlainPluginName, isValidManifest, killTree, languageForId, listSessions, loadSession, loadSessionPlanState, loadState, mapAgentTool, migrateOldConfigDir, mintDaemonToken, mintSessionId, modelContextBlock, modifyValidationFeedback, normalizeAgentArgs, normalizeGeminiModel, parseTaskQueryJson, pendingEditRulesBlock, planDirectLaunch, planShellLaunch, posixShellQuote, prefixModelId, providerForRunner, reEmitPlanPrompt, reEmitTaskOpsPrompt, reEmitTaskQueryPrompt, readDaemonToken, referencePattern, renderPlanMap, renderPriorOutputs, renderTaskQueryAnswer, repairLoop, researchShellWarning, researchToolsPath, resolveArgs, resolvePluginInstallDir, resolveProviderFromPrefix, resolveResearchShell, resolveSkillInvocation, resolveWithin, retargetTaskRunner, runnerAssignment, runnerForProvider, sanitizeSlug, savePrdMarkdown, saveSession, saveState, sessionRuntimeSettings, stateExists, stripAnsi, stripModelPrefix, summarizeOutput, taskOpsRejectedPrompt, taskQuerySignature, textHasTaskQuery, tmuxSessionName, tmuxSocketName, tmuxWindowName, tokenSubprotocols, tokensMatch, truncatedPlanReEmitPrompt, wellKnownBinDirs, windowsCommandLine, withPath, wrapWithPty };