@ordewell/core 0.5.0 → 0.5.1

package/dist/{ITerminalRunner-DXlJop_f.d.mts → ITerminalRunner-DCjsa2-I.d.mts}

@@ -1,5 +1,5 @@
 import { I as IApproval, a as ApprovalMode } from './ApprovalPolicy-BVhGdECT.mjs';
-import { B as RunnerId } from './Task-CfTjRQeS.mjs';
+import { F as RunnerId } from './Task-BxQkPlXO.mjs';
 
 interface ToolOutcome {
     success: boolean;
@@ -230,6 +230,11 @@ interface IConfig {
      * `*.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, or a shell command beyond the auto-allowed read-only

package/dist/{ITerminalRunner-nupxhtPb.d.ts → ITerminalRunner-H1yT8LTy.d.ts}

@@ -1,5 +1,5 @@
 import { I as IApproval, a as ApprovalMode } from './ApprovalPolicy-BVhGdECT.js';
-import { B as RunnerId } from './Task-CfTjRQeS.js';
+import { F as RunnerId } from './Task-BxQkPlXO.js';
 
 interface ToolOutcome {
     success: boolean;
@@ -230,6 +230,11 @@ interface IConfig {
      * `*.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, or a shell command beyond the auto-allowed read-only

package/dist/{ModeResolver-D1-2xJsE.d.mts → ModeResolver-DVJ7HV3k.d.mts}

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

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

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

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

@@ -35,10 +35,12 @@ type IsolationOutcome = 'merged' | 'conflict' | 'failed';
  * `active` — worktree exists, a runner may be writing to it.
  * `kept` — released with its worktree and branch preserved for inspection.
  * `conflict` — integration stopped on a merge conflict; worktree and refs kept.
+ * `repairing` — a conflict repair (ADR-0015) is working in the kept worktree;
+ *   one that ends without landing leaves the task `conflict` again.
  * `failed` — integration hit a git error other than a conflict; refs kept.
  * `merged` — landed on the integration branch; worktree and task branch removed.
  */
-type IsolationTaskStatus = 'active' | 'kept' | 'conflict' | 'failed' | 'merged';
+type IsolationTaskStatus = 'active' | 'kept' | 'conflict' | 'repairing' | 'failed' | 'merged';
 /** One repo's share of a task: its worktree inside the task workspace. */
 interface IsolationTaskRepo {
     /** Absolute path of this repo's worktree: the task workspace joined with the repo's path. */
@@ -70,6 +72,24 @@ interface IsolationTaskRecord {
     repos: Record<string, IsolationTaskRepo>;
     /** The repo whose merge stopped the task from landing, while `status` is `conflict` or `failed`. */
     conflictRepo?: string;
+    /** Repo-relative paths, in `conflictRepo`, that conflicted; set only while `status` is `conflict` or `repairing`. */
+    conflictFiles?: string[];
+    /**
+     * Conflict repairs started for this task (ADR-0015). Counted when one starts,
+     * so a crash cannot hand the spent attempt back; absent reads as none.
+     */
+    repairs?: number;
+    /**
+     * Keyed by repo path: each changed repo's integration tip when the repair in
+     * flight started — what the task branch must contain before it may land.
+     * Set only while `status` is `repairing`.
+     */
+    repairBase?: Record<string, string>;
+    /**
+     * Every file a repair was started for, across all of them: as `conflictFiles`
+     * names it in a group of one, prefixed with its repo's path in a group.
+     */
+    repairedFiles?: string[];
 }
 /**
  * A task's landing in flight: each changed repo's integration tip from before
@@ -144,7 +164,7 @@ interface PlanIsolation {
  * did not land and can be looked at. `none` is a task with no worktree in a plan
  * that has an isolation run.
  */
-type TaskIsolationState = 'none' | 'active' | 'integrated' | 'conflict' | 'kept';
+type TaskIsolationState = 'none' | 'active' | 'integrated' | 'conflict' | 'repairing' | 'kept';
 type TaskIsolation = {
     state: 'none';
 } | {
@@ -155,11 +175,22 @@ type TaskIsolation = {
     /** Paths of the repos the task changed. */
     repos: string[];
     conflictRepo?: string;
+    /** Repo-relative paths, in `conflictRepo`, that conflicted. */
+    conflictFiles?: string[];
+    /** The conflict repair running or last run, of the most a task may have; absent before its first. */
+    repair?: {
+        attempt: number;
+        limit: number;
+    };
+    /** What {@link IsolationTaskRecord.repairedFiles} says. */
+    repairedFiles?: string[];
 };
 interface IsolationLandedTask {
     taskId: string;
     order: number;
     title: string;
+    /** Set when the task landed only after a conflict repair (ADR-0015): the files it was started for. */
+    repairedFiles?: string[];
 }
 interface IsolationHandoffRepo {
     path: string;
@@ -214,6 +245,26 @@ type IsolationMergeResult = {
     files?: string[];
     landed?: string[];
 };
+/**
+ * What `discard` does with each repo's integration branch: `keep` it for review
+ * or merge, `delete` it, or delete it only in the repos whose checked-out HEAD
+ * already contains it (`delete-merged`) — the one way that can never give up
+ * landed work the user has not merged.
+ */
+type IntegrationDisposal = 'keep' | 'delete' | 'delete-merged';
+/**
+ * Whether a conflict repair's work may land. `not-merged`: the task branch in
+ * `repo` does not contain the tip the repair started from. `conflict-markers`:
+ * it adds leftover conflict markers to `files`. `failed`: git could not tell.
+ */
+type RepairEvidence = {
+    ok: true;
+} | {
+    ok: false;
+    reason: 'not-merged' | 'conflict-markers' | 'failed';
+    repo: string;
+    files?: string[];
+};
 interface PreparedTask {
     cwd: string;
     branch: string;
@@ -250,6 +301,21 @@ interface IWorktreeIsolation {
      * task sees everything its predecessors have integrated.
      */
     prepare(task: Task, run: IsolationRun): 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
+     * changed repo's integration tip as `repairBase`, counts the repair, and
+     * moves the task to `repairing`. Throws for a task that is not `conflict`.
+     */
+    reopen(task: Task, run: IsolationRun): Promise<PreparedTask>;
+    /**
+     * The evidence a repair must show before it lands: its work committed, and
+     * in each repo of `repairBase` the task branch containing that tip
+     * (`git merge-base --is-ancestor`) and adding no leftover conflict markers
+     * (`git diff --check`; whitespace warnings do not count). Changes nothing
+     * else: a task that fails stays `repairing` until released.
+     */
+    verifyRepair(task: Task, run: IsolationRun): Promise<RepairEvidence>;
     /**
      * Land the task atomically across the repos it changed: commit each
      * worktree, then `git merge --no-ff` the task branch into each changed
@@ -257,7 +323,9 @@ interface IWorktreeIsolation {
      * and the merges already made for the task are reset away, so `merged`
      * always means the whole task landed. Serialized inside the module; among
      * tasks waiting at once the lowest plan order goes first. On anything but
-     * `merged` the worktrees and refs stay, and nothing is ever auto-resolved.
+     * `merged` the worktrees and refs stay, and nothing is resolved here: a
+     * conflict is repaired, if at all, by a new attempt of the task in its own
+     * worktree (ADR-0015), never inside this queue.
      *
      * `persist` is called once `run.landing` is set and before the first
      * merge; the caller saves the run there, synchronously, which is what
@@ -268,7 +336,8 @@ interface IWorktreeIsolation {
      * `keep: false` removes the task's worktree, branch and record (cancel, task
      * removal). `keep: true` leaves the worktree and branch exactly as they are
      * for inspection — a failed verdict — and only moves the task off `active`,
-     * so a crash-recovery prune does not sweep it away. Takes the run rather than
+     * so a crash-recovery prune does not sweep it away; a repair it ends leaves
+     * the task `conflict`, as it was before the repair. Takes the run rather than
      * a bare task id: ids are only unique within one plan, and one daemon serves
      * many (ADR-0007).
      */
@@ -279,7 +348,8 @@ interface IWorktreeIsolation {
     handoff(run: IsolationRun): Promise<IsolationHandoff>;
     /**
      * Drop what a crash left behind: a landing it interrupted is rolled back in
-     * every repo, then stale active worktrees and directories no record owns go.
+     * every repo, a repair it interrupted leaves its task `conflict`, then stale
+     * active worktrees and directories no record owns go.
      */
     pruneOrphans(run: IsolationRun): Promise<void>;
     /** Unified diff of each repo's integration branch against its base ref. */
@@ -295,13 +365,21 @@ interface IWorktreeIsolation {
      */
     mergeIntoCheckedOut(run: IsolationRun): Promise<IsolationMergeResult>;
     /**
-     * Remove every worktree and task branch of the run, and the integration
-     * branch too unless `keepIntegration` — the branch outlives a discarded run
-     * until the user explicitly gives it up.
+     * Remove every worktree and task branch of the run, and settle each repo's
+     * integration branch as `integration` says. Anything but `keep` also clears
+     * the run's task records.
      */
     discard(run: IsolationRun, opts: {
-        keepIntegration: boolean;
+        integration: IntegrationDisposal;
     }): Promise<void>;
+    /**
+     * Clear what other runs left in each repo of `run`'s group: every
+     * `ordewell/<run-id>/…` branch the repo's checked-out HEAD already contains.
+     * Never a branch of `run` itself, one a worktree has checked out, or any
+     * branch of a run that still has a worktree — that run may be live in
+     * another plan. Tries every repo, then throws naming those where git failed.
+     */
+    sweep(run: IsolationRun): Promise<void>;
 }
 
 interface UserStep {
@@ -583,4 +661,4 @@ interface ValidationContext {
 type ValidationCheck = (ctx: ValidationContext) => ValidationResult;
 declare function warningsText(w: PlanModificationWarnings): string | null;
 
-export { type ValidationContext as $, type ActiveTaskSession as A, type RunnerId as B, type ConversationMessage as C, type DiscoveredMode as D, type StreamStepEvent as E, type StreamThinkingEvent as F, type TaskIsolation as G, type TaskIsolationState as H, type IWorktreeIsolation as I, type TaskMode as J, type TaskModelAssignment as K, type LegacyPlanState as L, type Message as M, type TaskOutputSummary as N, type TaskSnapshot as O, type PlanIsolation as P, type QueuedMessage as Q, type RepoGroupLayout as R, type StreamEvent as S, type Task as T, type TaskStatus as U, type TaskType as V, type TaskWithParent as W, type ThinkingBlock as X, type UserPromptEntry as Y, type UserStep as Z, type ValidationCheck as _, type DiscoveredModel as a, type ValidationResult as a0, type Verdict as a1, type VerificationCheck as a2, addTaskToPlan as a3, createEmptyPlan as a4, createTask as a5, emptyWarnings as a6, flattenTasks as a7, flattenTasksWithParents as a8, migrateLegacyPlan as a9, migratePlanState as aa, migrateTask as ab, removeTaskFromPlan as ac, renumberTasks as ad, updateTaskInPlan as ae, validateModifiedPlan as af, warningsText as ag, type IsolationAvailability as b, type IsolationHandoff as c, type IsolationHandoffRepo as d, type IsolationInactiveReason as e, type IsolationLandedTask as f, type IsolationLanding as g, type IsolationMergeBlock as h, type IsolationMergeBlockReason as i, type IsolationMergeResult as j, type IsolationOutcome as k, type IsolationRepo as l, type IsolationRun as m, type IsolationTaskRecord as n, type IsolationTaskRepo as o, type IsolationTaskStatus as p, type IsolationView as q, type PlanModificationWarnings as r, type PlanState as s, type PlanStatus as t, type PreparedTask as u, type ResearchLogEntry as v, type ResearchProgress as w, type ResearchStep as x, type ResearchStepOutcome as y, type ResearchToolType as z };
+export { type UserStep as $, type ActiveTaskSession as A, type ResearchStepOutcome as B, type ConversationMessage as C, type DiscoveredMode as D, type ResearchToolType as E, type RunnerId as F, type StreamStepEvent as G, type StreamThinkingEvent as H, type IWorktreeIsolation as I, type TaskIsolation as J, type TaskIsolationState as K, type LegacyPlanState as L, type Message as M, type TaskMode as N, type TaskModelAssignment as O, type PlanIsolation as P, type QueuedMessage as Q, type RepairEvidence as R, type StreamEvent as S, type Task as T, type TaskOutputSummary as U, type TaskSnapshot as V, type TaskStatus as W, type TaskType as X, type TaskWithParent as Y, type ThinkingBlock as Z, type UserPromptEntry as _, type DiscoveredModel as a, type ValidationCheck as a0, type ValidationContext as a1, type ValidationResult as a2, type Verdict as a3, type VerificationCheck as a4, addTaskToPlan as a5, createEmptyPlan as a6, createTask as a7, emptyWarnings as a8, flattenTasks as a9, flattenTasksWithParents as aa, migrateLegacyPlan as ab, migratePlanState as ac, migrateTask as ad, removeTaskFromPlan as ae, renumberTasks as af, updateTaskInPlan as ag, validateModifiedPlan as ah, warningsText as ai, type IntegrationDisposal as b, type IsolationAvailability as c, type IsolationHandoff as d, type IsolationHandoffRepo as e, type IsolationInactiveReason as f, type IsolationLandedTask as g, type IsolationLanding as h, type IsolationMergeBlock as i, type IsolationMergeBlockReason as j, type IsolationMergeResult as k, type IsolationOutcome as l, type IsolationRepo as m, type IsolationRun as n, type IsolationTaskRecord as o, type IsolationTaskRepo as p, type IsolationTaskStatus as q, type IsolationView as r, type PlanModificationWarnings as s, type PlanState as t, type PlanStatus as u, type PreparedTask as v, type RepoGroupLayout as w, type ResearchLogEntry as x, type ResearchProgress as y, type ResearchStep as z };

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

@@ -35,10 +35,12 @@ type IsolationOutcome = 'merged' | 'conflict' | 'failed';
  * `active` — worktree exists, a runner may be writing to it.
  * `kept` — released with its worktree and branch preserved for inspection.
  * `conflict` — integration stopped on a merge conflict; worktree and refs kept.
+ * `repairing` — a conflict repair (ADR-0015) is working in the kept worktree;
+ *   one that ends without landing leaves the task `conflict` again.
  * `failed` — integration hit a git error other than a conflict; refs kept.
  * `merged` — landed on the integration branch; worktree and task branch removed.
  */
-type IsolationTaskStatus = 'active' | 'kept' | 'conflict' | 'failed' | 'merged';
+type IsolationTaskStatus = 'active' | 'kept' | 'conflict' | 'repairing' | 'failed' | 'merged';
 /** One repo's share of a task: its worktree inside the task workspace. */
 interface IsolationTaskRepo {
     /** Absolute path of this repo's worktree: the task workspace joined with the repo's path. */
@@ -70,6 +72,24 @@ interface IsolationTaskRecord {
     repos: Record<string, IsolationTaskRepo>;
     /** The repo whose merge stopped the task from landing, while `status` is `conflict` or `failed`. */
     conflictRepo?: string;
+    /** Repo-relative paths, in `conflictRepo`, that conflicted; set only while `status` is `conflict` or `repairing`. */
+    conflictFiles?: string[];
+    /**
+     * Conflict repairs started for this task (ADR-0015). Counted when one starts,
+     * so a crash cannot hand the spent attempt back; absent reads as none.
+     */
+    repairs?: number;
+    /**
+     * Keyed by repo path: each changed repo's integration tip when the repair in
+     * flight started — what the task branch must contain before it may land.
+     * Set only while `status` is `repairing`.
+     */
+    repairBase?: Record<string, string>;
+    /**
+     * Every file a repair was started for, across all of them: as `conflictFiles`
+     * names it in a group of one, prefixed with its repo's path in a group.
+     */
+    repairedFiles?: string[];
 }
 /**
  * A task's landing in flight: each changed repo's integration tip from before
@@ -144,7 +164,7 @@ interface PlanIsolation {
  * did not land and can be looked at. `none` is a task with no worktree in a plan
  * that has an isolation run.
  */
-type TaskIsolationState = 'none' | 'active' | 'integrated' | 'conflict' | 'kept';
+type TaskIsolationState = 'none' | 'active' | 'integrated' | 'conflict' | 'repairing' | 'kept';
 type TaskIsolation = {
     state: 'none';
 } | {
@@ -155,11 +175,22 @@ type TaskIsolation = {
     /** Paths of the repos the task changed. */
     repos: string[];
     conflictRepo?: string;
+    /** Repo-relative paths, in `conflictRepo`, that conflicted. */
+    conflictFiles?: string[];
+    /** The conflict repair running or last run, of the most a task may have; absent before its first. */
+    repair?: {
+        attempt: number;
+        limit: number;
+    };
+    /** What {@link IsolationTaskRecord.repairedFiles} says. */
+    repairedFiles?: string[];
 };
 interface IsolationLandedTask {
     taskId: string;
     order: number;
     title: string;
+    /** Set when the task landed only after a conflict repair (ADR-0015): the files it was started for. */
+    repairedFiles?: string[];
 }
 interface IsolationHandoffRepo {
     path: string;
@@ -214,6 +245,26 @@ type IsolationMergeResult = {
     files?: string[];
     landed?: string[];
 };
+/**
+ * What `discard` does with each repo's integration branch: `keep` it for review
+ * or merge, `delete` it, or delete it only in the repos whose checked-out HEAD
+ * already contains it (`delete-merged`) — the one way that can never give up
+ * landed work the user has not merged.
+ */
+type IntegrationDisposal = 'keep' | 'delete' | 'delete-merged';
+/**
+ * Whether a conflict repair's work may land. `not-merged`: the task branch in
+ * `repo` does not contain the tip the repair started from. `conflict-markers`:
+ * it adds leftover conflict markers to `files`. `failed`: git could not tell.
+ */
+type RepairEvidence = {
+    ok: true;
+} | {
+    ok: false;
+    reason: 'not-merged' | 'conflict-markers' | 'failed';
+    repo: string;
+    files?: string[];
+};
 interface PreparedTask {
     cwd: string;
     branch: string;
@@ -250,6 +301,21 @@ interface IWorktreeIsolation {
      * task sees everything its predecessors have integrated.
      */
     prepare(task: Task, run: IsolationRun): 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
+     * changed repo's integration tip as `repairBase`, counts the repair, and
+     * moves the task to `repairing`. Throws for a task that is not `conflict`.
+     */
+    reopen(task: Task, run: IsolationRun): Promise<PreparedTask>;
+    /**
+     * The evidence a repair must show before it lands: its work committed, and
+     * in each repo of `repairBase` the task branch containing that tip
+     * (`git merge-base --is-ancestor`) and adding no leftover conflict markers
+     * (`git diff --check`; whitespace warnings do not count). Changes nothing
+     * else: a task that fails stays `repairing` until released.
+     */
+    verifyRepair(task: Task, run: IsolationRun): Promise<RepairEvidence>;
     /**
      * Land the task atomically across the repos it changed: commit each
      * worktree, then `git merge --no-ff` the task branch into each changed
@@ -257,7 +323,9 @@ interface IWorktreeIsolation {
      * and the merges already made for the task are reset away, so `merged`
      * always means the whole task landed. Serialized inside the module; among
      * tasks waiting at once the lowest plan order goes first. On anything but
-     * `merged` the worktrees and refs stay, and nothing is ever auto-resolved.
+     * `merged` the worktrees and refs stay, and nothing is resolved here: a
+     * conflict is repaired, if at all, by a new attempt of the task in its own
+     * worktree (ADR-0015), never inside this queue.
      *
      * `persist` is called once `run.landing` is set and before the first
      * merge; the caller saves the run there, synchronously, which is what
@@ -268,7 +336,8 @@ interface IWorktreeIsolation {
      * `keep: false` removes the task's worktree, branch and record (cancel, task
      * removal). `keep: true` leaves the worktree and branch exactly as they are
      * for inspection — a failed verdict — and only moves the task off `active`,
-     * so a crash-recovery prune does not sweep it away. Takes the run rather than
+     * so a crash-recovery prune does not sweep it away; a repair it ends leaves
+     * the task `conflict`, as it was before the repair. Takes the run rather than
      * a bare task id: ids are only unique within one plan, and one daemon serves
      * many (ADR-0007).
      */
@@ -279,7 +348,8 @@ interface IWorktreeIsolation {
     handoff(run: IsolationRun): Promise<IsolationHandoff>;
     /**
      * Drop what a crash left behind: a landing it interrupted is rolled back in
-     * every repo, then stale active worktrees and directories no record owns go.
+     * every repo, a repair it interrupted leaves its task `conflict`, then stale
+     * active worktrees and directories no record owns go.
      */
     pruneOrphans(run: IsolationRun): Promise<void>;
     /** Unified diff of each repo's integration branch against its base ref. */
@@ -295,13 +365,21 @@ interface IWorktreeIsolation {
      */
     mergeIntoCheckedOut(run: IsolationRun): Promise<IsolationMergeResult>;
     /**
-     * Remove every worktree and task branch of the run, and the integration
-     * branch too unless `keepIntegration` — the branch outlives a discarded run
-     * until the user explicitly gives it up.
+     * Remove every worktree and task branch of the run, and settle each repo's
+     * integration branch as `integration` says. Anything but `keep` also clears
+     * the run's task records.
      */
     discard(run: IsolationRun, opts: {
-        keepIntegration: boolean;
+        integration: IntegrationDisposal;
     }): Promise<void>;
+    /**
+     * Clear what other runs left in each repo of `run`'s group: every
+     * `ordewell/<run-id>/…` branch the repo's checked-out HEAD already contains.
+     * Never a branch of `run` itself, one a worktree has checked out, or any
+     * branch of a run that still has a worktree — that run may be live in
+     * another plan. Tries every repo, then throws naming those where git failed.
+     */
+    sweep(run: IsolationRun): Promise<void>;
 }
 
 interface UserStep {
@@ -583,4 +661,4 @@ interface ValidationContext {
 type ValidationCheck = (ctx: ValidationContext) => ValidationResult;
 declare function warningsText(w: PlanModificationWarnings): string | null;
 
-export { type ValidationContext as $, type ActiveTaskSession as A, type RunnerId as B, type ConversationMessage as C, type DiscoveredMode as D, type StreamStepEvent as E, type StreamThinkingEvent as F, type TaskIsolation as G, type TaskIsolationState as H, type IWorktreeIsolation as I, type TaskMode as J, type TaskModelAssignment as K, type LegacyPlanState as L, type Message as M, type TaskOutputSummary as N, type TaskSnapshot as O, type PlanIsolation as P, type QueuedMessage as Q, type RepoGroupLayout as R, type StreamEvent as S, type Task as T, type TaskStatus as U, type TaskType as V, type TaskWithParent as W, type ThinkingBlock as X, type UserPromptEntry as Y, type UserStep as Z, type ValidationCheck as _, type DiscoveredModel as a, type ValidationResult as a0, type Verdict as a1, type VerificationCheck as a2, addTaskToPlan as a3, createEmptyPlan as a4, createTask as a5, emptyWarnings as a6, flattenTasks as a7, flattenTasksWithParents as a8, migrateLegacyPlan as a9, migratePlanState as aa, migrateTask as ab, removeTaskFromPlan as ac, renumberTasks as ad, updateTaskInPlan as ae, validateModifiedPlan as af, warningsText as ag, type IsolationAvailability as b, type IsolationHandoff as c, type IsolationHandoffRepo as d, type IsolationInactiveReason as e, type IsolationLandedTask as f, type IsolationLanding as g, type IsolationMergeBlock as h, type IsolationMergeBlockReason as i, type IsolationMergeResult as j, type IsolationOutcome as k, type IsolationRepo as l, type IsolationRun as m, type IsolationTaskRecord as n, type IsolationTaskRepo as o, type IsolationTaskStatus as p, type IsolationView as q, type PlanModificationWarnings as r, type PlanState as s, type PlanStatus as t, type PreparedTask as u, type ResearchLogEntry as v, type ResearchProgress as w, type ResearchStep as x, type ResearchStepOutcome as y, type ResearchToolType as z };
+export { type UserStep as $, type ActiveTaskSession as A, type ResearchStepOutcome as B, type ConversationMessage as C, type DiscoveredMode as D, type ResearchToolType as E, type RunnerId as F, type StreamStepEvent as G, type StreamThinkingEvent as H, type IWorktreeIsolation as I, type TaskIsolation as J, type TaskIsolationState as K, type LegacyPlanState as L, type Message as M, type TaskMode as N, type TaskModelAssignment as O, type PlanIsolation as P, type QueuedMessage as Q, type RepairEvidence as R, type StreamEvent as S, type Task as T, type TaskOutputSummary as U, type TaskSnapshot as V, type TaskStatus as W, type TaskType as X, type TaskWithParent as Y, type ThinkingBlock as Z, type UserPromptEntry as _, type DiscoveredModel as a, type ValidationCheck as a0, type ValidationContext as a1, type ValidationResult as a2, type Verdict as a3, type VerificationCheck as a4, addTaskToPlan as a5, createEmptyPlan as a6, createTask as a7, emptyWarnings as a8, flattenTasks as a9, flattenTasksWithParents as aa, migrateLegacyPlan as ab, migratePlanState as ac, migrateTask as ad, removeTaskFromPlan as ae, renumberTasks as af, updateTaskInPlan as ag, validateModifiedPlan as ah, warningsText as ai, type IntegrationDisposal as b, type IsolationAvailability as c, type IsolationHandoff as d, type IsolationHandoffRepo as e, type IsolationInactiveReason as f, type IsolationLandedTask as g, type IsolationLanding as h, type IsolationMergeBlock as i, type IsolationMergeBlockReason as j, type IsolationMergeResult as k, type IsolationOutcome as l, type IsolationRepo as m, type IsolationRun as n, type IsolationTaskRecord as o, type IsolationTaskRepo as p, type IsolationTaskStatus as q, type IsolationView as r, type PlanModificationWarnings as s, type PlanState as t, type PlanStatus as u, type PreparedTask as v, type RepoGroupLayout as w, type ResearchLogEntry as x, type ResearchProgress as y, type ResearchStep as z };

package/dist/{chunk-HQICT7HQ.mjs → chunk-T2S5O36I.mjs}

@@ -17,21 +17,33 @@ var ISOLATION_STATE = {
   active: "active",
   merged: "integrated",
   conflict: "conflict",
+  repairing: "repairing",
   kept: "kept",
   failed: "kept"
 };
-function taskIsolationOf(record) {
+function taskIsolationOf(record, repairLimit) {
   return {
     state: ISOLATION_STATE[record.status],
     branch: record.branch,
     worktree: record.workspace,
     repos: Object.entries(record.repos).filter(([, r]) => r.changed).map(([repoPath]) => repoPath),
-    ...record.conflictRepo ? { conflictRepo: record.conflictRepo } : {}
+    ...record.conflictRepo ? { conflictRepo: record.conflictRepo } : {},
+    ...record.conflictFiles?.length ? { conflictFiles: record.conflictFiles } : {},
+    ...record.repairs ? { repair: { attempt: record.repairs, limit: repairLimit } } : {},
+    ...record.repairedFiles?.length ? { repairedFiles: record.repairedFiles } : {}
   };
 }
+function capConflictFiles(files, max = 5) {
+  return files.length <= max ? files.join(", ") : `${files.slice(0, max).join(", ")}, +${files.length - max} more`;
+}
 function handoffOf(run) {
   const merged = Object.values(run.tasks).filter((r) => r.status === "merged").sort((a, b) => a.order - b.order);
-  const entry = (r) => ({ taskId: r.taskId, order: r.order, title: r.title });
+  const entry = (r) => ({
+    taskId: r.taskId,
+    order: r.order,
+    title: r.title,
+    ...r.repairedFiles?.length ? { repairedFiles: r.repairedFiles } : {}
+  });
   return {
     repos: run.repos.map((repo) => ({
       path: repo.path,
@@ -83,8 +95,9 @@ export {
   layoutOf,
   integrationBranchNameOf,
   taskIsolationOf,
+  capConflictFiles,
   handoffOf,
   migratePlanIsolation,
   migratePlanStateIsolation
 };
-//# sourceMappingURL=chunk-HQICT7HQ.mjs.map
+//# sourceMappingURL=chunk-T2S5O36I.mjs.map

package/dist/chunk-T2S5O36I.mjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/services/isolationRecord.ts"],"sourcesContent":["import * as path from 'path';\nimport type {\n  IsolationHandoff,\n  IsolationLandedTask,\n  IsolationRepo,\n  IsolationRun,\n  IsolationTaskRecord,\n  IsolationTaskStatus,\n  PlanIsolation,\n  RepoGroupLayout,\n  TaskIsolation,\n} from '../interfaces/IWorktreeIsolation';\n\n/** The path of the repo in a workspace that is itself the repository. */\nexport const SELF_REPO = '.';\n\nexport function integrationBranchFor(runId: string): string {\n  return `ordewell/${runId}/integration`;\n}\n\nexport function repoRootOf(workspaceRoot: string, repoPath: string): string {\n  return path.join(workspaceRoot, repoPath);\n}\n\n/** The group a run isolates, as the planner is told it. */\nexport function layoutOf(run: IsolationRun): RepoGroupLayout {\n  return { repos: run.repos.map((r) => r.path), shared: [...run.shared] };\n}\n\n/** The run's integration branch for a one-line notice: every repo's has the same name. */\nexport function integrationBranchNameOf(run: IsolationRun): string {\n  return [...new Set(run.repos.map((r) => r.integrationBranch))].join(', ');\n}\n\nconst ISOLATION_STATE: Record<IsolationTaskStatus, Exclude<TaskIsolation['state'], 'none'>> = {\n  active: 'active',\n  merged: 'integrated',\n  conflict: 'conflict',\n  repairing: 'repairing',\n  kept: 'kept',\n  failed: 'kept',\n};\n\n/** `repairLimit` is `conflictRepairAttempts` as it stands now, which is what the next repair will be held to. */\nexport function taskIsolationOf(record: IsolationTaskRecord, repairLimit: number): TaskIsolation {\n  return {\n    state: ISOLATION_STATE[record.status],\n    branch: record.branch,\n    worktree: record.workspace,\n    repos: Object.entries(record.repos).filter(([, r]) => r.changed).map(([repoPath]) => repoPath),\n    ...(record.conflictRepo ? { conflictRepo: record.conflictRepo } : {}),\n    ...(record.conflictFiles?.length ? { conflictFiles: record.conflictFiles } : {}),\n    ...(record.repairs ? { repair: { attempt: record.repairs, limit: repairLimit } } : {}),\n    ...(record.repairedFiles?.length ? { repairedFiles: record.repairedFiles } : {}),\n  };\n}\n\n/** A conflict's files as one surface shows them: every one, up to `max`, then how many more. */\nexport function capConflictFiles(files: string[], max = 5): string {\n  return files.length <= max ? files.join(', ') : `${files.slice(0, max).join(', ')}, +${files.length - max} more`;\n}\n\n/** What a run hands over: each repo's integration branch and base, and what landed, in plan order. */\nexport function handoffOf(run: IsolationRun): IsolationHandoff {\n  const merged = Object.values(run.tasks)\n    .filter((r) => r.status === 'merged')\n    .sort((a, b) => a.order - b.order);\n  const entry = (r: IsolationTaskRecord): IsolationLandedTask => ({\n    taskId: r.taskId, order: r.order, title: r.title,\n    ...(r.repairedFiles?.length ? { repairedFiles: r.repairedFiles } : {}),\n  });\n  return {\n    repos: run.repos.map((repo) => ({\n      path: repo.path,\n      integrationBranch: repo.integrationBranch,\n      baseRef: repo.baseRef,\n      landed: merged.filter((r) => r.repos[repo.path]?.changed).map(entry),\n    })),\n    landed: merged.map(entry),\n  };\n}\n\n/** A task record as ADR-0013 persisted it, for one repository. */\nexport interface Adr0013TaskRecord {\n  taskId: string;\n  order: number;\n  title: string;\n  branch: string;\n  worktree: string;\n  status: IsolationTaskStatus;\n  linked: string[];\n}\n\n/** A run as ADR-0013 persisted it (0.4.23): one repository, its refs on the run itself. */\nexport interface Adr0013IsolationRun {\n  id: string;\n  workspaceRoot: string;\n  baseRef: string;\n  baseBranch?: string;\n  integrationBranch: string;\n  tasks: Record<string, Adr0013TaskRecord>;\n}\n\nexport interface Adr0013PlanIsolation {\n  run: Adr0013IsolationRun;\n  resolvers: Record<string, string>;\n}\n\nfunction isAdr0013(run: IsolationRun | Adr0013IsolationRun): run is Adr0013IsolationRun {\n  return 'integrationBranch' in run && typeof run.integrationBranch === 'string';\n}\n\nfunction fromAdr0013Task(r: Adr0013TaskRecord): IsolationTaskRecord {\n  return {\n    taskId: r.taskId,\n    order: r.order,\n    title: r.title,\n    branch: r.branch,\n    workspace: r.worktree,\n    status: r.status,\n    // A merged task's branch was merged into the one repo there was; what it\n    // changed was never recorded, and landing is what `changed` stands for.\n    repos: { [SELF_REPO]: { worktree: r.worktree, linked: r.linked ?? [], ...(r.status === 'merged' ? { changed: true } : {}) } },\n    ...(r.status === 'conflict' ? { conflictRepo: SELF_REPO } : {}),\n  };\n}\n\n/**\n * A persisted plan isolation in today's shape. A run saved in the ADR-0013\n * format — recognised by its own `integrationBranch` — becomes a group of one\n * at `.`, keeping its branches, so a session saved by 0.4.23 resumes and hands\n * off exactly as it would have.\n */\nexport function migratePlanIsolation(state: PlanIsolation | Adr0013PlanIsolation): PlanIsolation {\n  const { run, resolvers } = state;\n  if (!isAdr0013(run)) return { run, resolvers: resolvers ?? {} };\n  const repo: IsolationRepo = {\n    path: SELF_REPO,\n    root: repoRootOf(run.workspaceRoot, SELF_REPO),\n    baseRef: run.baseRef,\n    ...(run.baseBranch ? { baseBranch: run.baseBranch } : {}),\n    integrationBranch: run.integrationBranch,\n  };\n  const tasks = Object.fromEntries(Object.entries(run.tasks ?? {}).map(([id, r]) => [id, fromAdr0013Task(r)]));\n  return { run: { id: run.id, workspaceRoot: run.workspaceRoot, repos: [repo], shared: [], sharedRepos: [], tasks }, resolvers: resolvers ?? {} };\n}\n\n/** Bring a loaded plan's isolation record, if any, to today's shape in place. */\nexport function migratePlanStateIsolation(plan: { isolation?: PlanIsolation | Adr0013PlanIsolation }): void {\n  if (plan.isolation?.run) plan.isolation = migratePlanIsolation(plan.isolation);\n}\n"],"mappings":"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","names":[]}