@ordewell/core 0.5.0 → 0.5.1

package/dist/testing.d.ts

@@ -1,5 +1,5 @@
-import { i as ITerminalSession, I as IConfig, f as IFileSystem } from './ITerminalRunner-nupxhtPb.js';
-import { I as IWorktreeIsolation, b as IsolationAvailability, j as IsolationMergeResult, k as IsolationOutcome, m as IsolationRun, T as Task, u as PreparedTask, c as IsolationHandoff } from './Task-CfTjRQeS.js';
+import { i as ITerminalSession, I as IConfig, f as IFileSystem } from './ITerminalRunner-H1yT8LTy.js';
+import { b as IntegrationDisposal, I as IWorktreeIsolation, c as IsolationAvailability, k as IsolationMergeResult, l as IsolationOutcome, R as RepairEvidence, n as IsolationRun, T as Task, v as PreparedTask, d as IsolationHandoff } from './Task-BxQkPlXO.js';
 import './ApprovalPolicy-BVhGdECT.js';
 
 declare function fakeConfig(overrides?: Partial<IConfig>): IConfig;
@@ -35,7 +35,7 @@ type FakeIsolationCall = {
     op: 'startRun';
     workspaceRoot: string;
 } | {
-    op: 'prepare';
+    op: 'prepare' | 'reopen' | 'verifyRepair';
     taskId: string;
 } | {
     op: 'integrate';
@@ -45,10 +45,10 @@ type FakeIsolationCall = {
     taskId: string;
     keep: boolean;
 } | {
-    op: 'handoff' | 'pruneOrphans' | 'reviewDiff' | 'mergeIntoCheckedOut';
+    op: 'handoff' | 'pruneOrphans' | 'reviewDiff' | 'mergeIntoCheckedOut' | 'sweep';
 } | {
     op: 'discard';
-    keepIntegration: boolean;
+    integration: IntegrationDisposal;
 };
 /**
  * An in-memory {@link IWorktreeIsolation} for scheduling tests: no git, no
@@ -57,7 +57,8 @@ type FakeIsolationCall = {
  * to script a conflict, and `holdIntegration` to keep a task un-integrated so a
  * test can observe that its dependents wait. `repos` makes the run a group of
  * several; `changes` and `stopsIn` say which of them a task changes and where
- * its landing stops.
+ * its landing stops. `repairEvidence` scripts what a conflict repair's
+ * evidence check finds.
  */
 declare class FakeWorktreeIsolation implements IWorktreeIsolation {
     availability: IsolationAvailability;
@@ -67,6 +68,8 @@ declare class FakeWorktreeIsolation implements IWorktreeIsolation {
     changes: Map<string, string[]>;
     /** Per task id, the repo its landing stops in when its outcome is not `merged`; its first changed repo when not listed. */
     stopsIn: Map<string, string>;
+    /** Per task id, the files a `conflict` outcome names; empty when not listed. */
+    conflictFiles: Map<string, string[]>;
     /** What `mergeIntoCheckedOut` answers. */
     mergeResult: IsolationMergeResult;
     /** What `startRun` shares and `prepare` copies, to exercise their notices. */
@@ -75,14 +78,19 @@ declare class FakeWorktreeIsolation implements IWorktreeIsolation {
     copied: string[];
     /** Set to make `startRun` throw, as git does when no repo of the group can be isolated. */
     startRunError: Error | null;
+    /** Set to make `discard` / `sweep` throw after logging the call. */
+    discardError: Error | null;
+    sweepError: Error | null;
     /** Per task id; a task not listed integrates as `merged`. */
     outcomes: Map<string, IsolationOutcome>;
+    /** Per task id, what `verifyRepair` finds; a task not listed passes. */
+    repairEvidence: Map<string, RepairEvidence>;
     calls: FakeIsolationCall[];
     private holds;
     private runCount;
     private log;
     /** Task ids in the order `op` was called for them. */
-    taskIdsFor(op: 'prepare' | 'integrate' | 'release'): string[];
+    taskIdsFor(op: 'prepare' | 'reopen' | 'verifyRepair' | 'integrate' | 'release'): string[];
     /** Make `integrate` for this task wait until the returned function is called. */
     holdIntegration(taskId: string): () => void;
     isActive(workspaceRoot: string): Promise<IsolationAvailability>;
@@ -90,6 +98,9 @@ declare class FakeWorktreeIsolation implements IWorktreeIsolation {
     stash(workspaceRoot: string): Promise<void>;
     startRun(workspaceRoot: string): Promise<IsolationRun>;
     prepare(task: Task, run: IsolationRun): Promise<PreparedTask>;
+    /** Like git: the same cwd, each changed repo's tip recorded, the repair counted. */
+    reopen(task: Task, run: IsolationRun): Promise<PreparedTask>;
+    verifyRepair(task: Task, _run: IsolationRun): Promise<RepairEvidence>;
     /** Like git: the landing is recorded and persisted before the (held) merge, and cleared once it settles. */
     integrate(task: Task, run: IsolationRun, persist?: () => void): Promise<IsolationOutcome>;
     release(run: IsolationRun, taskId: string, opts: {
@@ -100,8 +111,9 @@ declare class FakeWorktreeIsolation implements IWorktreeIsolation {
     reviewDiff(): Promise<string>;
     mergeIntoCheckedOut(): Promise<IsolationMergeResult>;
     discard(_run: IsolationRun, opts: {
-        keepIntegration: boolean;
+        integration: IntegrationDisposal;
     }): Promise<void>;
+    sweep(): Promise<void>;
 }
 
 export { type FakeIsolationCall, FakeTerminalSession, FakeWorktreeIsolation, fakeConfig, fakeFileSystem };

package/dist/testing.js

@@ -34,7 +34,12 @@ function integrationBranchFor(runId) {
 }
 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,
@@ -73,6 +78,8 @@ function fakeConfig(overrides = {}) {
     worktreeIsolation: false,
     workspaceRepos: [],
     worktreeLinks: [],
+    // Off so a scripted conflict stays a conflict unless a test opts into repairing it.
+    conflictRepairAttempts: 0,
     approvalMode: "ask",
     approvalPreApproved: [],
     setProviderModelLists: () => {
@@ -139,6 +146,8 @@ var FakeWorktreeIsolation = class {
   changes = /* @__PURE__ */ new Map();
   /** Per task id, the repo its landing stops in when its outcome is not `merged`; its first changed repo when not listed. */
   stopsIn = /* @__PURE__ */ new Map();
+  /** Per task id, the files a `conflict` outcome names; empty when not listed. */
+  conflictFiles = /* @__PURE__ */ new Map();
   /** What `mergeIntoCheckedOut` answers. */
   mergeResult = { outcome: "merged" };
   /** What `startRun` shares and `prepare` copies, to exercise their notices. */
@@ -147,8 +156,13 @@ var FakeWorktreeIsolation = class {
   copied = [];
   /** Set to make `startRun` throw, as git does when no repo of the group can be isolated. */
   startRunError = null;
+  /** Set to make `discard` / `sweep` throw after logging the call. */
+  discardError = null;
+  sweepError = null;
   /** Per task id; a task not listed integrates as `merged`. */
   outcomes = /* @__PURE__ */ new Map();
+  /** Per task id, what `verifyRepair` finds; a task not listed passes. */
+  repairEvidence = /* @__PURE__ */ new Map();
   calls = [];
   holds = /* @__PURE__ */ new Map();
   runCount = 0;
@@ -211,6 +225,23 @@ var FakeWorktreeIsolation = class {
     };
     return { cwd, branch, copied: [...this.copied] };
   }
+  /** Like git: the same cwd, each changed repo's tip recorded, the repair counted. */
+  async reopen(task, run) {
+    this.log({ op: "reopen", taskId: task.id });
+    const record = run.tasks[task.id];
+    if (record?.status !== "conflict") throw new Error(`Task ${task.order} has no conflict to repair`);
+    const changed = Object.entries(record.repos).filter(([repo, entry]) => entry.changed || repo === record.conflictRepo).map(([repo]) => repo);
+    const files = (record.conflictFiles ?? []).map((file) => record.conflictRepo && record.conflictRepo !== SELF_REPO ? `${record.conflictRepo}/${file}` : file);
+    record.repairs = (record.repairs ?? 0) + 1;
+    record.repairBase = Object.fromEntries(changed.map((repo) => [repo, `tip-${repo}`]));
+    record.repairedFiles = [.../* @__PURE__ */ new Set([...record.repairedFiles ?? [], ...files])];
+    record.status = "repairing";
+    return { cwd: record.workspace, branch: record.branch, copied: [] };
+  }
+  async verifyRepair(task, _run) {
+    this.log({ op: "verifyRepair", taskId: task.id });
+    return this.repairEvidence.get(task.id) ?? { ok: true };
+  }
   /** Like git: the landing is recorded and persisted before the (held) merge, and cleared once it settles. */
   async integrate(task, run, persist = () => void 0) {
     this.log({ op: "integrate", taskId: task.id });
@@ -226,8 +257,16 @@ var FakeWorktreeIsolation = class {
     delete run.landing;
     const outcome = this.outcomes.get(task.id) ?? "merged";
     record.status = outcome;
-    if (outcome === "merged") delete record.conflictRepo;
-    else record.conflictRepo = this.stopsIn.get(task.id) ?? changed[0] ?? SELF_REPO;
+    delete record.repairBase;
+    if (outcome === "merged") {
+      delete record.conflictRepo;
+      delete record.conflictFiles;
+    } else {
+      record.conflictRepo = this.stopsIn.get(task.id) ?? changed[0] ?? SELF_REPO;
+      const files = this.conflictFiles.get(task.id);
+      if (files) record.conflictFiles = files;
+      else delete record.conflictFiles;
+    }
     return outcome;
   }
   async release(run, taskId, opts) {
@@ -235,6 +274,10 @@ var FakeWorktreeIsolation = class {
     const record = run.tasks[taskId];
     if (!opts.keep) delete run.tasks[taskId];
     else if (record?.status === "active") record.status = "kept";
+    else if (record?.status === "repairing") {
+      record.status = "conflict";
+      delete record.repairBase;
+    }
   }
   async handoff(run) {
     this.log({ op: "handoff" });
@@ -252,7 +295,12 @@ var FakeWorktreeIsolation = class {
     return this.mergeResult;
   }
   async discard(_run, opts) {
-    this.log({ op: "discard", keepIntegration: opts.keepIntegration });
+    this.log({ op: "discard", integration: opts.integration });
+    if (this.discardError) throw this.discardError;
+  }
+  async sweep() {
+    this.log({ op: "sweep" });
+    if (this.sweepError) throw this.sweepError;
   }
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/testing.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/testing.ts","../src/services/isolationRecord.ts"],"sourcesContent":["import type { IConfig } from './interfaces/IConfig';\nimport type { IFileSystem, ToolOutcome } from './interfaces/IFileSystem';\nimport type { ITerminalSession } from './interfaces/ITerminalRunner';\nimport type {\n  IsolationAvailability,\n  IsolationHandoff,\n  IsolationMergeResult,\n  IsolationOutcome,\n  IsolationRun,\n  PreparedTask,\n  IWorktreeIsolation,\n} from './interfaces/IWorktreeIsolation';\nimport type { Task } from './models/Task';\nimport { handoffOf, integrationBranchFor, SELF_REPO } from './services/isolationRecord';\n\nexport function fakeConfig(overrides: Partial<IConfig> = {}): IConfig {\n  return {\n    aiProvider: 'openrouter',\n    apiKey: 'sk-test',\n    planningModel: 'test-model',\n    enabledRunners: ['claude-code'],\n    maxParallelSessions: 3,\n    researchEnabled: false,\n    researchMaxSteps: 10,\n    researchMaxFileSize: 100_000,\n    openAiBaseUrl: 'https://api.openai.com/v1',\n    openAiApiKey: '',\n    openrouterKey: '',\n    geminiKey: '',\n    openaiCompatibleBaseUrl: '',\n    openaiCompatibleApiKey: '',\n    orchestratorModel: '',\n    researchSubagentModel: '',\n    geminiModel: '',\n    planMapEnabled: true,\n    autonomousMode: true,\n    // Off so an orchestrator built without an injected isolation never runs\n    // real git against whatever repository the tests happen to run in.\n    worktreeIsolation: false,\n    workspaceRepos: [],\n    worktreeLinks: [],\n    approvalMode: 'ask',\n    approvalPreApproved: [],\n    setProviderModelLists: () => {},\n    getProviderBaseUrl: () => '',\n    getProviderApiKey: () => '',\n    ...overrides,\n  };\n}\n\nconst EMPTY_OUTCOME: ToolOutcome = { success: false, output: '', truncated: false };\n\n/**\n * A complete {@link IFileSystem} stub. Lives here rather than in each package's\n * test folder so adding a tool to the interface is one edit, not one per suite.\n */\nexport function fakeFileSystem(overrides: Partial<IFileSystem> = {}): IFileSystem {\n  return {\n    readFile: async () => EMPTY_OUTCOME,\n    readFiles: async () => EMPTY_OUTCOME,\n    glob: async () => EMPTY_OUTCOME,\n    grep: async () => EMPTY_OUTCOME,\n    findSymbol: async () => EMPTY_OUTCOME,\n    listDir: async () => EMPTY_OUTCOME,\n    bash: async () => EMPTY_OUTCOME,\n    getWorkspaceRoot: () => '/workspace',\n    ...overrides,\n  };\n}\n\nexport class FakeTerminalSession implements ITerminalSession {\n  private outputCbs: Array<(text: string) => void> = [];\n  private exitCbs: Array<(code: number) => void> = [];\n  output = '';\n  written: string[] = [];\n  killed = false;\n\n  constructor(public id = 's1', public taskId = 't1') {}\n\n  onOutput(cb: (text: string) => void): void { this.outputCbs.push(cb); }\n  onExit(cb: (code: number) => void): void { this.exitCbs.push(cb); }\n  kill(): void { this.killed = true; }\n  getOutput(): string { return this.output; }\n  write(text: string): void { this.written.push(text); }\n\n  emitOutput(text: string): void {\n    this.output += text;\n    for (const cb of this.outputCbs) cb(text);\n  }\n  emitExit(code: number): void {\n    for (const cb of this.exitCbs) cb(code);\n  }\n}\n\nexport type FakeIsolationCall =\n  | { op: 'isActive'; workspaceRoot: string }\n  | { op: 'stash'; workspaceRoot: string }\n  | { op: 'startRun'; workspaceRoot: string }\n  | { op: 'prepare'; taskId: string }\n  | { op: 'integrate'; taskId: string }\n  | { op: 'release'; taskId: string; keep: boolean }\n  | { op: 'handoff' | 'pruneOrphans' | 'reviewDiff' | 'mergeIntoCheckedOut' }\n  | { op: 'discard'; keepIntegration: boolean };\n\n/**\n * An in-memory {@link IWorktreeIsolation} for scheduling tests: no git, no\n * filesystem. Every call is logged in `calls`; `prepare` hands back a\n * deterministic fake cwd. Set `availability` to exercise the fallbacks, `outcomes`\n * to script a conflict, and `holdIntegration` to keep a task un-integrated so a\n * test can observe that its dependents wait. `repos` makes the run a group of\n * several; `changes` and `stopsIn` say which of them a task changes and where\n * its landing stops.\n */\nexport class FakeWorktreeIsolation implements IWorktreeIsolation {\n  availability: IsolationAvailability = { active: true };\n  /** The repo paths `startRun` groups: a group of one at `.` unless set. */\n  repos: string[] = [SELF_REPO];\n  /** Per task id, the repos it changes; every repo of the group when not listed. */\n  changes = new Map<string, string[]>();\n  /** Per task id, the repo its landing stops in when its outcome is not `merged`; its first changed repo when not listed. */\n  stopsIn = new Map<string, string>();\n  /** What `mergeIntoCheckedOut` answers. */\n  mergeResult: IsolationMergeResult = { outcome: 'merged' };\n  /** What `startRun` shares and `prepare` copies, to exercise their notices. */\n  shared: string[] = [];\n  sharedRepos: string[] = [];\n  copied: string[] = [];\n  /** Set to make `startRun` throw, as git does when no repo of the group can be isolated. */\n  startRunError: Error | null = null;\n  /** Per task id; a task not listed integrates as `merged`. */\n  outcomes = new Map<string, IsolationOutcome>();\n  calls: FakeIsolationCall[] = [];\n  private holds = new Map<string, Promise<void>>();\n  private runCount = 0;\n\n  private log(call: FakeIsolationCall): void { this.calls.push(call); }\n\n  /** Task ids in the order `op` was called for them. */\n  taskIdsFor(op: 'prepare' | 'integrate' | 'release'): string[] {\n    return this.calls.flatMap((c) => (c.op === op && 'taskId' in c ? [c.taskId] : []));\n  }\n\n  /** Make `integrate` for this task wait until the returned function is called. */\n  holdIntegration(taskId: string): () => void {\n    let open!: () => void;\n    this.holds.set(taskId, new Promise<void>((resolve) => { open = resolve; }));\n    return open;\n  }\n\n  async isActive(workspaceRoot: string): Promise<IsolationAvailability> {\n    this.log({ op: 'isActive', workspaceRoot });\n    return this.availability;\n  }\n\n  /** Like git: once the tracked changes are stashed, the tree is no longer dirty. */\n  async stash(workspaceRoot: string): Promise<void> {\n    this.log({ op: 'stash', workspaceRoot });\n    if (!this.availability.active && this.availability.reason === 'dirty') this.availability = { active: true };\n  }\n\n  async startRun(workspaceRoot: string): Promise<IsolationRun> {\n    this.log({ op: 'startRun', workspaceRoot });\n    if (this.startRunError) throw this.startRunError;\n    const id = `run${++this.runCount}`;\n    return {\n      id,\n      workspaceRoot,\n      repos: this.repos.map((repo) => ({\n        path: repo, root: `${workspaceRoot}/${repo}`.replace(/\\/\\.$/, ''), baseRef: 'base0000', baseBranch: 'main', integrationBranch: integrationBranchFor(id),\n      })),\n      shared: [...this.shared],\n      sharedRepos: [...this.sharedRepos],\n      tasks: {},\n    };\n  }\n\n  async prepare(task: Task, run: IsolationRun): Promise<PreparedTask> {\n    this.log({ op: 'prepare', taskId: task.id });\n    const name = `${task.order}-${task.id}`;\n    const cwd = `/fake-worktrees/${run.id}/${name}`;\n    const branch = `ordewell/${run.id}/${name}`;\n    run.tasks[task.id] = {\n      taskId: task.id, order: task.order, title: task.title, branch, workspace: cwd, status: 'active',\n      repos: Object.fromEntries(run.repos.map((r) => [r.path, { worktree: r.path === SELF_REPO ? cwd : `${cwd}/${r.path}`, linked: [] }])),\n    };\n    return { cwd, branch, copied: [...this.copied] };\n  }\n\n  /** Like git: the landing is recorded and persisted before the (held) merge, and cleared once it settles. */\n  async integrate(task: Task, run: IsolationRun, persist: () => void = () => undefined): Promise<IsolationOutcome> {\n    this.log({ op: 'integrate', taskId: task.id });\n    const record = run.tasks[task.id];\n    if (!record) return 'failed';\n    const changed = this.changes.get(task.id) ?? run.repos.map((r) => r.path);\n    for (const [repo, entry] of Object.entries(record.repos)) entry.changed = changed.includes(repo) || (entry.changed ?? false);\n    if (changed.length > 0) {\n      run.landing = { taskId: task.id, tips: Object.fromEntries(changed.map((repo) => [repo, `tip-${repo}`])) };\n      persist();\n    }\n    await this.holds.get(task.id);\n    delete run.landing;\n    const outcome = this.outcomes.get(task.id) ?? 'merged';\n    record.status = outcome;\n    if (outcome === 'merged') delete record.conflictRepo;\n    else record.conflictRepo = this.stopsIn.get(task.id) ?? changed[0] ?? SELF_REPO;\n    return outcome;\n  }\n\n  async release(run: IsolationRun, taskId: string, opts: { keep: boolean }): Promise<void> {\n    this.log({ op: 'release', taskId, keep: opts.keep });\n    const record = run.tasks[taskId];\n    if (!opts.keep) delete run.tasks[taskId];\n    else if (record?.status === 'active') record.status = 'kept';\n  }\n\n  async handoff(run: IsolationRun): Promise<IsolationHandoff> {\n    this.log({ op: 'handoff' });\n    return handoffOf(run);\n  }\n\n  async pruneOrphans(): Promise<void> { this.log({ op: 'pruneOrphans' }); }\n  async reviewDiff(): Promise<string> { this.log({ op: 'reviewDiff' }); return ''; }\n  async mergeIntoCheckedOut(): Promise<IsolationMergeResult> { this.log({ op: 'mergeIntoCheckedOut' }); return this.mergeResult; }\n  async discard(_run: IsolationRun, opts: { keepIntegration: boolean }): Promise<void> {\n    this.log({ op: 'discard', keepIntegration: opts.keepIntegration });\n  }\n}\n","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  kept: 'kept',\n  failed: 'kept',\n};\n\nexport function taskIsolationOf(record: IsolationTaskRecord): 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  };\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 => ({ taskId: r.taskId, order: r.order, title: r.title });\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":[]}
+{"version":3,"sources":["../src/testing.ts","../src/services/isolationRecord.ts"],"sourcesContent":["import type { IConfig } from './interfaces/IConfig';\nimport type { IFileSystem, ToolOutcome } from './interfaces/IFileSystem';\nimport type { ITerminalSession } from './interfaces/ITerminalRunner';\nimport type {\n  IsolationAvailability,\n  IsolationHandoff,\n  IsolationMergeResult,\n  IsolationOutcome,\n  IsolationRun,\n  IntegrationDisposal,\n  PreparedTask,\n  IWorktreeIsolation,\n  RepairEvidence,\n} from './interfaces/IWorktreeIsolation';\nimport type { Task } from './models/Task';\nimport { handoffOf, integrationBranchFor, SELF_REPO } from './services/isolationRecord';\n\nexport function fakeConfig(overrides: Partial<IConfig> = {}): IConfig {\n  return {\n    aiProvider: 'openrouter',\n    apiKey: 'sk-test',\n    planningModel: 'test-model',\n    enabledRunners: ['claude-code'],\n    maxParallelSessions: 3,\n    researchEnabled: false,\n    researchMaxSteps: 10,\n    researchMaxFileSize: 100_000,\n    openAiBaseUrl: 'https://api.openai.com/v1',\n    openAiApiKey: '',\n    openrouterKey: '',\n    geminiKey: '',\n    openaiCompatibleBaseUrl: '',\n    openaiCompatibleApiKey: '',\n    orchestratorModel: '',\n    researchSubagentModel: '',\n    geminiModel: '',\n    planMapEnabled: true,\n    autonomousMode: true,\n    // Off so an orchestrator built without an injected isolation never runs\n    // real git against whatever repository the tests happen to run in.\n    worktreeIsolation: false,\n    workspaceRepos: [],\n    worktreeLinks: [],\n    // Off so a scripted conflict stays a conflict unless a test opts into repairing it.\n    conflictRepairAttempts: 0,\n    approvalMode: 'ask',\n    approvalPreApproved: [],\n    setProviderModelLists: () => {},\n    getProviderBaseUrl: () => '',\n    getProviderApiKey: () => '',\n    ...overrides,\n  };\n}\n\nconst EMPTY_OUTCOME: ToolOutcome = { success: false, output: '', truncated: false };\n\n/**\n * A complete {@link IFileSystem} stub. Lives here rather than in each package's\n * test folder so adding a tool to the interface is one edit, not one per suite.\n */\nexport function fakeFileSystem(overrides: Partial<IFileSystem> = {}): IFileSystem {\n  return {\n    readFile: async () => EMPTY_OUTCOME,\n    readFiles: async () => EMPTY_OUTCOME,\n    glob: async () => EMPTY_OUTCOME,\n    grep: async () => EMPTY_OUTCOME,\n    findSymbol: async () => EMPTY_OUTCOME,\n    listDir: async () => EMPTY_OUTCOME,\n    bash: async () => EMPTY_OUTCOME,\n    getWorkspaceRoot: () => '/workspace',\n    ...overrides,\n  };\n}\n\nexport class FakeTerminalSession implements ITerminalSession {\n  private outputCbs: Array<(text: string) => void> = [];\n  private exitCbs: Array<(code: number) => void> = [];\n  output = '';\n  written: string[] = [];\n  killed = false;\n\n  constructor(public id = 's1', public taskId = 't1') {}\n\n  onOutput(cb: (text: string) => void): void { this.outputCbs.push(cb); }\n  onExit(cb: (code: number) => void): void { this.exitCbs.push(cb); }\n  kill(): void { this.killed = true; }\n  getOutput(): string { return this.output; }\n  write(text: string): void { this.written.push(text); }\n\n  emitOutput(text: string): void {\n    this.output += text;\n    for (const cb of this.outputCbs) cb(text);\n  }\n  emitExit(code: number): void {\n    for (const cb of this.exitCbs) cb(code);\n  }\n}\n\nexport type FakeIsolationCall =\n  | { op: 'isActive'; workspaceRoot: string }\n  | { op: 'stash'; workspaceRoot: string }\n  | { op: 'startRun'; workspaceRoot: string }\n  | { op: 'prepare' | 'reopen' | 'verifyRepair'; taskId: string }\n  | { op: 'integrate'; taskId: string }\n  | { op: 'release'; taskId: string; keep: boolean }\n  | { op: 'handoff' | 'pruneOrphans' | 'reviewDiff' | 'mergeIntoCheckedOut' | 'sweep' }\n  | { op: 'discard'; integration: IntegrationDisposal };\n\n/**\n * An in-memory {@link IWorktreeIsolation} for scheduling tests: no git, no\n * filesystem. Every call is logged in `calls`; `prepare` hands back a\n * deterministic fake cwd. Set `availability` to exercise the fallbacks, `outcomes`\n * to script a conflict, and `holdIntegration` to keep a task un-integrated so a\n * test can observe that its dependents wait. `repos` makes the run a group of\n * several; `changes` and `stopsIn` say which of them a task changes and where\n * its landing stops. `repairEvidence` scripts what a conflict repair's\n * evidence check finds.\n */\nexport class FakeWorktreeIsolation implements IWorktreeIsolation {\n  availability: IsolationAvailability = { active: true };\n  /** The repo paths `startRun` groups: a group of one at `.` unless set. */\n  repos: string[] = [SELF_REPO];\n  /** Per task id, the repos it changes; every repo of the group when not listed. */\n  changes = new Map<string, string[]>();\n  /** Per task id, the repo its landing stops in when its outcome is not `merged`; its first changed repo when not listed. */\n  stopsIn = new Map<string, string>();\n  /** Per task id, the files a `conflict` outcome names; empty when not listed. */\n  conflictFiles = new Map<string, string[]>();\n  /** What `mergeIntoCheckedOut` answers. */\n  mergeResult: IsolationMergeResult = { outcome: 'merged' };\n  /** What `startRun` shares and `prepare` copies, to exercise their notices. */\n  shared: string[] = [];\n  sharedRepos: string[] = [];\n  copied: string[] = [];\n  /** Set to make `startRun` throw, as git does when no repo of the group can be isolated. */\n  startRunError: Error | null = null;\n  /** Set to make `discard` / `sweep` throw after logging the call. */\n  discardError: Error | null = null;\n  sweepError: Error | null = null;\n  /** Per task id; a task not listed integrates as `merged`. */\n  outcomes = new Map<string, IsolationOutcome>();\n  /** Per task id, what `verifyRepair` finds; a task not listed passes. */\n  repairEvidence = new Map<string, RepairEvidence>();\n  calls: FakeIsolationCall[] = [];\n  private holds = new Map<string, Promise<void>>();\n  private runCount = 0;\n\n  private log(call: FakeIsolationCall): void { this.calls.push(call); }\n\n  /** Task ids in the order `op` was called for them. */\n  taskIdsFor(op: 'prepare' | 'reopen' | 'verifyRepair' | 'integrate' | 'release'): string[] {\n    return this.calls.flatMap((c) => (c.op === op && 'taskId' in c ? [c.taskId] : []));\n  }\n\n  /** Make `integrate` for this task wait until the returned function is called. */\n  holdIntegration(taskId: string): () => void {\n    let open!: () => void;\n    this.holds.set(taskId, new Promise<void>((resolve) => { open = resolve; }));\n    return open;\n  }\n\n  async isActive(workspaceRoot: string): Promise<IsolationAvailability> {\n    this.log({ op: 'isActive', workspaceRoot });\n    return this.availability;\n  }\n\n  /** Like git: once the tracked changes are stashed, the tree is no longer dirty. */\n  async stash(workspaceRoot: string): Promise<void> {\n    this.log({ op: 'stash', workspaceRoot });\n    if (!this.availability.active && this.availability.reason === 'dirty') this.availability = { active: true };\n  }\n\n  async startRun(workspaceRoot: string): Promise<IsolationRun> {\n    this.log({ op: 'startRun', workspaceRoot });\n    if (this.startRunError) throw this.startRunError;\n    const id = `run${++this.runCount}`;\n    return {\n      id,\n      workspaceRoot,\n      repos: this.repos.map((repo) => ({\n        path: repo, root: `${workspaceRoot}/${repo}`.replace(/\\/\\.$/, ''), baseRef: 'base0000', baseBranch: 'main', integrationBranch: integrationBranchFor(id),\n      })),\n      shared: [...this.shared],\n      sharedRepos: [...this.sharedRepos],\n      tasks: {},\n    };\n  }\n\n  async prepare(task: Task, run: IsolationRun): Promise<PreparedTask> {\n    this.log({ op: 'prepare', taskId: task.id });\n    const name = `${task.order}-${task.id}`;\n    const cwd = `/fake-worktrees/${run.id}/${name}`;\n    const branch = `ordewell/${run.id}/${name}`;\n    run.tasks[task.id] = {\n      taskId: task.id, order: task.order, title: task.title, branch, workspace: cwd, status: 'active',\n      repos: Object.fromEntries(run.repos.map((r) => [r.path, { worktree: r.path === SELF_REPO ? cwd : `${cwd}/${r.path}`, linked: [] }])),\n    };\n    return { cwd, branch, copied: [...this.copied] };\n  }\n\n  /** Like git: the same cwd, each changed repo's tip recorded, the repair counted. */\n  async reopen(task: Task, run: IsolationRun): Promise<PreparedTask> {\n    this.log({ op: 'reopen', taskId: task.id });\n    const record = run.tasks[task.id];\n    if (record?.status !== 'conflict') throw new Error(`Task ${task.order} has no conflict to repair`);\n    const changed = Object.entries(record.repos).filter(([repo, entry]) => entry.changed || repo === record.conflictRepo).map(([repo]) => repo);\n    const files = (record.conflictFiles ?? []).map((file) => (record.conflictRepo && record.conflictRepo !== SELF_REPO ? `${record.conflictRepo}/${file}` : file));\n    record.repairs = (record.repairs ?? 0) + 1;\n    record.repairBase = Object.fromEntries(changed.map((repo) => [repo, `tip-${repo}`]));\n    record.repairedFiles = [...new Set([...(record.repairedFiles ?? []), ...files])];\n    record.status = 'repairing';\n    return { cwd: record.workspace, branch: record.branch, copied: [] };\n  }\n\n  async verifyRepair(task: Task, _run: IsolationRun): Promise<RepairEvidence> {\n    this.log({ op: 'verifyRepair', taskId: task.id });\n    return this.repairEvidence.get(task.id) ?? { ok: true };\n  }\n\n  /** Like git: the landing is recorded and persisted before the (held) merge, and cleared once it settles. */\n  async integrate(task: Task, run: IsolationRun, persist: () => void = () => undefined): Promise<IsolationOutcome> {\n    this.log({ op: 'integrate', taskId: task.id });\n    const record = run.tasks[task.id];\n    if (!record) return 'failed';\n    const changed = this.changes.get(task.id) ?? run.repos.map((r) => r.path);\n    for (const [repo, entry] of Object.entries(record.repos)) entry.changed = changed.includes(repo) || (entry.changed ?? false);\n    if (changed.length > 0) {\n      run.landing = { taskId: task.id, tips: Object.fromEntries(changed.map((repo) => [repo, `tip-${repo}`])) };\n      persist();\n    }\n    await this.holds.get(task.id);\n    delete run.landing;\n    const outcome = this.outcomes.get(task.id) ?? 'merged';\n    record.status = outcome;\n    delete record.repairBase;\n    if (outcome === 'merged') {\n      delete record.conflictRepo;\n      delete record.conflictFiles;\n    } else {\n      record.conflictRepo = this.stopsIn.get(task.id) ?? changed[0] ?? SELF_REPO;\n      const files = this.conflictFiles.get(task.id);\n      if (files) record.conflictFiles = files;\n      else delete record.conflictFiles;\n    }\n    return outcome;\n  }\n\n  async release(run: IsolationRun, taskId: string, opts: { keep: boolean }): Promise<void> {\n    this.log({ op: 'release', taskId, keep: opts.keep });\n    const record = run.tasks[taskId];\n    if (!opts.keep) delete run.tasks[taskId];\n    else if (record?.status === 'active') record.status = 'kept';\n    else if (record?.status === 'repairing') {\n      record.status = 'conflict';\n      delete record.repairBase;\n    }\n  }\n\n  async handoff(run: IsolationRun): Promise<IsolationHandoff> {\n    this.log({ op: 'handoff' });\n    return handoffOf(run);\n  }\n\n  async pruneOrphans(): Promise<void> { this.log({ op: 'pruneOrphans' }); }\n  async reviewDiff(): Promise<string> { this.log({ op: 'reviewDiff' }); return ''; }\n  async mergeIntoCheckedOut(): Promise<IsolationMergeResult> { this.log({ op: 'mergeIntoCheckedOut' }); return this.mergeResult; }\n  async discard(_run: IsolationRun, opts: { integration: IntegrationDisposal }): Promise<void> {\n    this.log({ op: 'discard', integration: opts.integration });\n    if (this.discardError) throw this.discardError;\n  }\n  async sweep(): Promise<void> {\n    this.log({ op: 'sweep' });\n    if (this.sweepError) throw this.sweepError;\n  }\n}\n","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":[]}

package/dist/testing.mjs

@@ -2,7 +2,7 @@ import {
   SELF_REPO,
   handoffOf,
   integrationBranchFor
-} from "./chunk-HQICT7HQ.mjs";
+} from "./chunk-T2S5O36I.mjs";
 
 // src/testing.ts
 function fakeConfig(overrides = {}) {
@@ -31,6 +31,8 @@ function fakeConfig(overrides = {}) {
     worktreeIsolation: false,
     workspaceRepos: [],
     worktreeLinks: [],
+    // Off so a scripted conflict stays a conflict unless a test opts into repairing it.
+    conflictRepairAttempts: 0,
     approvalMode: "ask",
     approvalPreApproved: [],
     setProviderModelLists: () => {
@@ -97,6 +99,8 @@ var FakeWorktreeIsolation = class {
   changes = /* @__PURE__ */ new Map();
   /** Per task id, the repo its landing stops in when its outcome is not `merged`; its first changed repo when not listed. */
   stopsIn = /* @__PURE__ */ new Map();
+  /** Per task id, the files a `conflict` outcome names; empty when not listed. */
+  conflictFiles = /* @__PURE__ */ new Map();
   /** What `mergeIntoCheckedOut` answers. */
   mergeResult = { outcome: "merged" };
   /** What `startRun` shares and `prepare` copies, to exercise their notices. */
@@ -105,8 +109,13 @@ var FakeWorktreeIsolation = class {
   copied = [];
   /** Set to make `startRun` throw, as git does when no repo of the group can be isolated. */
   startRunError = null;
+  /** Set to make `discard` / `sweep` throw after logging the call. */
+  discardError = null;
+  sweepError = null;
   /** Per task id; a task not listed integrates as `merged`. */
   outcomes = /* @__PURE__ */ new Map();
+  /** Per task id, what `verifyRepair` finds; a task not listed passes. */
+  repairEvidence = /* @__PURE__ */ new Map();
   calls = [];
   holds = /* @__PURE__ */ new Map();
   runCount = 0;
@@ -169,6 +178,23 @@ var FakeWorktreeIsolation = class {
     };
     return { cwd, branch, copied: [...this.copied] };
   }
+  /** Like git: the same cwd, each changed repo's tip recorded, the repair counted. */
+  async reopen(task, run) {
+    this.log({ op: "reopen", taskId: task.id });
+    const record = run.tasks[task.id];
+    if (record?.status !== "conflict") throw new Error(`Task ${task.order} has no conflict to repair`);
+    const changed = Object.entries(record.repos).filter(([repo, entry]) => entry.changed || repo === record.conflictRepo).map(([repo]) => repo);
+    const files = (record.conflictFiles ?? []).map((file) => record.conflictRepo && record.conflictRepo !== SELF_REPO ? `${record.conflictRepo}/${file}` : file);
+    record.repairs = (record.repairs ?? 0) + 1;
+    record.repairBase = Object.fromEntries(changed.map((repo) => [repo, `tip-${repo}`]));
+    record.repairedFiles = [.../* @__PURE__ */ new Set([...record.repairedFiles ?? [], ...files])];
+    record.status = "repairing";
+    return { cwd: record.workspace, branch: record.branch, copied: [] };
+  }
+  async verifyRepair(task, _run) {
+    this.log({ op: "verifyRepair", taskId: task.id });
+    return this.repairEvidence.get(task.id) ?? { ok: true };
+  }
   /** Like git: the landing is recorded and persisted before the (held) merge, and cleared once it settles. */
   async integrate(task, run, persist = () => void 0) {
     this.log({ op: "integrate", taskId: task.id });
@@ -184,8 +210,16 @@ var FakeWorktreeIsolation = class {
     delete run.landing;
     const outcome = this.outcomes.get(task.id) ?? "merged";
     record.status = outcome;
-    if (outcome === "merged") delete record.conflictRepo;
-    else record.conflictRepo = this.stopsIn.get(task.id) ?? changed[0] ?? SELF_REPO;
+    delete record.repairBase;
+    if (outcome === "merged") {
+      delete record.conflictRepo;
+      delete record.conflictFiles;
+    } else {
+      record.conflictRepo = this.stopsIn.get(task.id) ?? changed[0] ?? SELF_REPO;
+      const files = this.conflictFiles.get(task.id);
+      if (files) record.conflictFiles = files;
+      else delete record.conflictFiles;
+    }
     return outcome;
   }
   async release(run, taskId, opts) {
@@ -193,6 +227,10 @@ var FakeWorktreeIsolation = class {
     const record = run.tasks[taskId];
     if (!opts.keep) delete run.tasks[taskId];
     else if (record?.status === "active") record.status = "kept";
+    else if (record?.status === "repairing") {
+      record.status = "conflict";
+      delete record.repairBase;
+    }
   }
   async handoff(run) {
     this.log({ op: "handoff" });
@@ -210,7 +248,12 @@ var FakeWorktreeIsolation = class {
     return this.mergeResult;
   }
   async discard(_run, opts) {
-    this.log({ op: "discard", keepIntegration: opts.keepIntegration });
+    this.log({ op: "discard", integration: opts.integration });
+    if (this.discardError) throw this.discardError;
+  }
+  async sweep() {
+    this.log({ op: "sweep" });
+    if (this.sweepError) throw this.sweepError;
   }
 };
 export {

package/dist/testing.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/testing.ts"],"sourcesContent":["import type { IConfig } from './interfaces/IConfig';\nimport type { IFileSystem, ToolOutcome } from './interfaces/IFileSystem';\nimport type { ITerminalSession } from './interfaces/ITerminalRunner';\nimport type {\n  IsolationAvailability,\n  IsolationHandoff,\n  IsolationMergeResult,\n  IsolationOutcome,\n  IsolationRun,\n  PreparedTask,\n  IWorktreeIsolation,\n} from './interfaces/IWorktreeIsolation';\nimport type { Task } from './models/Task';\nimport { handoffOf, integrationBranchFor, SELF_REPO } from './services/isolationRecord';\n\nexport function fakeConfig(overrides: Partial<IConfig> = {}): IConfig {\n  return {\n    aiProvider: 'openrouter',\n    apiKey: 'sk-test',\n    planningModel: 'test-model',\n    enabledRunners: ['claude-code'],\n    maxParallelSessions: 3,\n    researchEnabled: false,\n    researchMaxSteps: 10,\n    researchMaxFileSize: 100_000,\n    openAiBaseUrl: 'https://api.openai.com/v1',\n    openAiApiKey: '',\n    openrouterKey: '',\n    geminiKey: '',\n    openaiCompatibleBaseUrl: '',\n    openaiCompatibleApiKey: '',\n    orchestratorModel: '',\n    researchSubagentModel: '',\n    geminiModel: '',\n    planMapEnabled: true,\n    autonomousMode: true,\n    // Off so an orchestrator built without an injected isolation never runs\n    // real git against whatever repository the tests happen to run in.\n    worktreeIsolation: false,\n    workspaceRepos: [],\n    worktreeLinks: [],\n    approvalMode: 'ask',\n    approvalPreApproved: [],\n    setProviderModelLists: () => {},\n    getProviderBaseUrl: () => '',\n    getProviderApiKey: () => '',\n    ...overrides,\n  };\n}\n\nconst EMPTY_OUTCOME: ToolOutcome = { success: false, output: '', truncated: false };\n\n/**\n * A complete {@link IFileSystem} stub. Lives here rather than in each package's\n * test folder so adding a tool to the interface is one edit, not one per suite.\n */\nexport function fakeFileSystem(overrides: Partial<IFileSystem> = {}): IFileSystem {\n  return {\n    readFile: async () => EMPTY_OUTCOME,\n    readFiles: async () => EMPTY_OUTCOME,\n    glob: async () => EMPTY_OUTCOME,\n    grep: async () => EMPTY_OUTCOME,\n    findSymbol: async () => EMPTY_OUTCOME,\n    listDir: async () => EMPTY_OUTCOME,\n    bash: async () => EMPTY_OUTCOME,\n    getWorkspaceRoot: () => '/workspace',\n    ...overrides,\n  };\n}\n\nexport class FakeTerminalSession implements ITerminalSession {\n  private outputCbs: Array<(text: string) => void> = [];\n  private exitCbs: Array<(code: number) => void> = [];\n  output = '';\n  written: string[] = [];\n  killed = false;\n\n  constructor(public id = 's1', public taskId = 't1') {}\n\n  onOutput(cb: (text: string) => void): void { this.outputCbs.push(cb); }\n  onExit(cb: (code: number) => void): void { this.exitCbs.push(cb); }\n  kill(): void { this.killed = true; }\n  getOutput(): string { return this.output; }\n  write(text: string): void { this.written.push(text); }\n\n  emitOutput(text: string): void {\n    this.output += text;\n    for (const cb of this.outputCbs) cb(text);\n  }\n  emitExit(code: number): void {\n    for (const cb of this.exitCbs) cb(code);\n  }\n}\n\nexport type FakeIsolationCall =\n  | { op: 'isActive'; workspaceRoot: string }\n  | { op: 'stash'; workspaceRoot: string }\n  | { op: 'startRun'; workspaceRoot: string }\n  | { op: 'prepare'; taskId: string }\n  | { op: 'integrate'; taskId: string }\n  | { op: 'release'; taskId: string; keep: boolean }\n  | { op: 'handoff' | 'pruneOrphans' | 'reviewDiff' | 'mergeIntoCheckedOut' }\n  | { op: 'discard'; keepIntegration: boolean };\n\n/**\n * An in-memory {@link IWorktreeIsolation} for scheduling tests: no git, no\n * filesystem. Every call is logged in `calls`; `prepare` hands back a\n * deterministic fake cwd. Set `availability` to exercise the fallbacks, `outcomes`\n * to script a conflict, and `holdIntegration` to keep a task un-integrated so a\n * test can observe that its dependents wait. `repos` makes the run a group of\n * several; `changes` and `stopsIn` say which of them a task changes and where\n * its landing stops.\n */\nexport class FakeWorktreeIsolation implements IWorktreeIsolation {\n  availability: IsolationAvailability = { active: true };\n  /** The repo paths `startRun` groups: a group of one at `.` unless set. */\n  repos: string[] = [SELF_REPO];\n  /** Per task id, the repos it changes; every repo of the group when not listed. */\n  changes = new Map<string, string[]>();\n  /** Per task id, the repo its landing stops in when its outcome is not `merged`; its first changed repo when not listed. */\n  stopsIn = new Map<string, string>();\n  /** What `mergeIntoCheckedOut` answers. */\n  mergeResult: IsolationMergeResult = { outcome: 'merged' };\n  /** What `startRun` shares and `prepare` copies, to exercise their notices. */\n  shared: string[] = [];\n  sharedRepos: string[] = [];\n  copied: string[] = [];\n  /** Set to make `startRun` throw, as git does when no repo of the group can be isolated. */\n  startRunError: Error | null = null;\n  /** Per task id; a task not listed integrates as `merged`. */\n  outcomes = new Map<string, IsolationOutcome>();\n  calls: FakeIsolationCall[] = [];\n  private holds = new Map<string, Promise<void>>();\n  private runCount = 0;\n\n  private log(call: FakeIsolationCall): void { this.calls.push(call); }\n\n  /** Task ids in the order `op` was called for them. */\n  taskIdsFor(op: 'prepare' | 'integrate' | 'release'): string[] {\n    return this.calls.flatMap((c) => (c.op === op && 'taskId' in c ? [c.taskId] : []));\n  }\n\n  /** Make `integrate` for this task wait until the returned function is called. */\n  holdIntegration(taskId: string): () => void {\n    let open!: () => void;\n    this.holds.set(taskId, new Promise<void>((resolve) => { open = resolve; }));\n    return open;\n  }\n\n  async isActive(workspaceRoot: string): Promise<IsolationAvailability> {\n    this.log({ op: 'isActive', workspaceRoot });\n    return this.availability;\n  }\n\n  /** Like git: once the tracked changes are stashed, the tree is no longer dirty. */\n  async stash(workspaceRoot: string): Promise<void> {\n    this.log({ op: 'stash', workspaceRoot });\n    if (!this.availability.active && this.availability.reason === 'dirty') this.availability = { active: true };\n  }\n\n  async startRun(workspaceRoot: string): Promise<IsolationRun> {\n    this.log({ op: 'startRun', workspaceRoot });\n    if (this.startRunError) throw this.startRunError;\n    const id = `run${++this.runCount}`;\n    return {\n      id,\n      workspaceRoot,\n      repos: this.repos.map((repo) => ({\n        path: repo, root: `${workspaceRoot}/${repo}`.replace(/\\/\\.$/, ''), baseRef: 'base0000', baseBranch: 'main', integrationBranch: integrationBranchFor(id),\n      })),\n      shared: [...this.shared],\n      sharedRepos: [...this.sharedRepos],\n      tasks: {},\n    };\n  }\n\n  async prepare(task: Task, run: IsolationRun): Promise<PreparedTask> {\n    this.log({ op: 'prepare', taskId: task.id });\n    const name = `${task.order}-${task.id}`;\n    const cwd = `/fake-worktrees/${run.id}/${name}`;\n    const branch = `ordewell/${run.id}/${name}`;\n    run.tasks[task.id] = {\n      taskId: task.id, order: task.order, title: task.title, branch, workspace: cwd, status: 'active',\n      repos: Object.fromEntries(run.repos.map((r) => [r.path, { worktree: r.path === SELF_REPO ? cwd : `${cwd}/${r.path}`, linked: [] }])),\n    };\n    return { cwd, branch, copied: [...this.copied] };\n  }\n\n  /** Like git: the landing is recorded and persisted before the (held) merge, and cleared once it settles. */\n  async integrate(task: Task, run: IsolationRun, persist: () => void = () => undefined): Promise<IsolationOutcome> {\n    this.log({ op: 'integrate', taskId: task.id });\n    const record = run.tasks[task.id];\n    if (!record) return 'failed';\n    const changed = this.changes.get(task.id) ?? run.repos.map((r) => r.path);\n    for (const [repo, entry] of Object.entries(record.repos)) entry.changed = changed.includes(repo) || (entry.changed ?? false);\n    if (changed.length > 0) {\n      run.landing = { taskId: task.id, tips: Object.fromEntries(changed.map((repo) => [repo, `tip-${repo}`])) };\n      persist();\n    }\n    await this.holds.get(task.id);\n    delete run.landing;\n    const outcome = this.outcomes.get(task.id) ?? 'merged';\n    record.status = outcome;\n    if (outcome === 'merged') delete record.conflictRepo;\n    else record.conflictRepo = this.stopsIn.get(task.id) ?? changed[0] ?? SELF_REPO;\n    return outcome;\n  }\n\n  async release(run: IsolationRun, taskId: string, opts: { keep: boolean }): Promise<void> {\n    this.log({ op: 'release', taskId, keep: opts.keep });\n    const record = run.tasks[taskId];\n    if (!opts.keep) delete run.tasks[taskId];\n    else if (record?.status === 'active') record.status = 'kept';\n  }\n\n  async handoff(run: IsolationRun): Promise<IsolationHandoff> {\n    this.log({ op: 'handoff' });\n    return handoffOf(run);\n  }\n\n  async pruneOrphans(): Promise<void> { this.log({ op: 'pruneOrphans' }); }\n  async reviewDiff(): Promise<string> { this.log({ op: 'reviewDiff' }); return ''; }\n  async mergeIntoCheckedOut(): Promise<IsolationMergeResult> { this.log({ op: 'mergeIntoCheckedOut' }); return this.mergeResult; }\n  async discard(_run: IsolationRun, opts: { keepIntegration: boolean }): Promise<void> {\n    this.log({ op: 'discard', keepIntegration: opts.keepIntegration });\n  }\n}\n"],"mappings":";;;;;;;AAeO,SAAS,WAAW,YAA8B,CAAC,GAAY;AACpE,SAAO;AAAA,IACL,YAAY;AAAA,IACZ,QAAQ;AAAA,IACR,eAAe;AAAA,IACf,gBAAgB,CAAC,aAAa;AAAA,IAC9B,qBAAqB;AAAA,IACrB,iBAAiB;AAAA,IACjB,kBAAkB;AAAA,IAClB,qBAAqB;AAAA,IACrB,eAAe;AAAA,IACf,cAAc;AAAA,IACd,eAAe;AAAA,IACf,WAAW;AAAA,IACX,yBAAyB;AAAA,IACzB,wBAAwB;AAAA,IACxB,mBAAmB;AAAA,IACnB,uBAAuB;AAAA,IACvB,aAAa;AAAA,IACb,gBAAgB;AAAA,IAChB,gBAAgB;AAAA;AAAA;AAAA,IAGhB,mBAAmB;AAAA,IACnB,gBAAgB,CAAC;AAAA,IACjB,eAAe,CAAC;AAAA,IAChB,cAAc;AAAA,IACd,qBAAqB,CAAC;AAAA,IACtB,uBAAuB,MAAM;AAAA,IAAC;AAAA,IAC9B,oBAAoB,MAAM;AAAA,IAC1B,mBAAmB,MAAM;AAAA,IACzB,GAAG;AAAA,EACL;AACF;AAEA,IAAM,gBAA6B,EAAE,SAAS,OAAO,QAAQ,IAAI,WAAW,MAAM;AAM3E,SAAS,eAAe,YAAkC,CAAC,GAAgB;AAChF,SAAO;AAAA,IACL,UAAU,YAAY;AAAA,IACtB,WAAW,YAAY;AAAA,IACvB,MAAM,YAAY;AAAA,IAClB,MAAM,YAAY;AAAA,IAClB,YAAY,YAAY;AAAA,IACxB,SAAS,YAAY;AAAA,IACrB,MAAM,YAAY;AAAA,IAClB,kBAAkB,MAAM;AAAA,IACxB,GAAG;AAAA,EACL;AACF;AAEO,IAAM,sBAAN,MAAsD;AAAA,EAO3D,YAAmB,KAAK,MAAa,SAAS,MAAM;AAAjC;AAAkB;AAAA,EAAgB;AAAA,EAAlC;AAAA,EAAkB;AAAA,EAN7B,YAA2C,CAAC;AAAA,EAC5C,UAAyC,CAAC;AAAA,EAClD,SAAS;AAAA,EACT,UAAoB,CAAC;AAAA,EACrB,SAAS;AAAA,EAIT,SAAS,IAAkC;AAAE,SAAK,UAAU,KAAK,EAAE;AAAA,EAAG;AAAA,EACtE,OAAO,IAAkC;AAAE,SAAK,QAAQ,KAAK,EAAE;AAAA,EAAG;AAAA,EAClE,OAAa;AAAE,SAAK,SAAS;AAAA,EAAM;AAAA,EACnC,YAAoB;AAAE,WAAO,KAAK;AAAA,EAAQ;AAAA,EAC1C,MAAM,MAAoB;AAAE,SAAK,QAAQ,KAAK,IAAI;AAAA,EAAG;AAAA,EAErD,WAAW,MAAoB;AAC7B,SAAK,UAAU;AACf,eAAW,MAAM,KAAK,UAAW,IAAG,IAAI;AAAA,EAC1C;AAAA,EACA,SAAS,MAAoB;AAC3B,eAAW,MAAM,KAAK,QAAS,IAAG,IAAI;AAAA,EACxC;AACF;AAqBO,IAAM,wBAAN,MAA0D;AAAA,EAC/D,eAAsC,EAAE,QAAQ,KAAK;AAAA;AAAA,EAErD,QAAkB,CAAC,SAAS;AAAA;AAAA,EAE5B,UAAU,oBAAI,IAAsB;AAAA;AAAA,EAEpC,UAAU,oBAAI,IAAoB;AAAA;AAAA,EAElC,cAAoC,EAAE,SAAS,SAAS;AAAA;AAAA,EAExD,SAAmB,CAAC;AAAA,EACpB,cAAwB,CAAC;AAAA,EACzB,SAAmB,CAAC;AAAA;AAAA,EAEpB,gBAA8B;AAAA;AAAA,EAE9B,WAAW,oBAAI,IAA8B;AAAA,EAC7C,QAA6B,CAAC;AAAA,EACtB,QAAQ,oBAAI,IAA2B;AAAA,EACvC,WAAW;AAAA,EAEX,IAAI,MAA+B;AAAE,SAAK,MAAM,KAAK,IAAI;AAAA,EAAG;AAAA;AAAA,EAGpE,WAAW,IAAmD;AAC5D,WAAO,KAAK,MAAM,QAAQ,CAAC,MAAO,EAAE,OAAO,MAAM,YAAY,IAAI,CAAC,EAAE,MAAM,IAAI,CAAC,CAAE;AAAA,EACnF;AAAA;AAAA,EAGA,gBAAgB,QAA4B;AAC1C,QAAI;AACJ,SAAK,MAAM,IAAI,QAAQ,IAAI,QAAc,CAAC,YAAY;AAAE,aAAO;AAAA,IAAS,CAAC,CAAC;AAC1E,WAAO;AAAA,EACT;AAAA,EAEA,MAAM,SAAS,eAAuD;AACpE,SAAK,IAAI,EAAE,IAAI,YAAY,cAAc,CAAC;AAC1C,WAAO,KAAK;AAAA,EACd;AAAA;AAAA,EAGA,MAAM,MAAM,eAAsC;AAChD,SAAK,IAAI,EAAE,IAAI,SAAS,cAAc,CAAC;AACvC,QAAI,CAAC,KAAK,aAAa,UAAU,KAAK,aAAa,WAAW,QAAS,MAAK,eAAe,EAAE,QAAQ,KAAK;AAAA,EAC5G;AAAA,EAEA,MAAM,SAAS,eAA8C;AAC3D,SAAK,IAAI,EAAE,IAAI,YAAY,cAAc,CAAC;AAC1C,QAAI,KAAK,cAAe,OAAM,KAAK;AACnC,UAAM,KAAK,MAAM,EAAE,KAAK,QAAQ;AAChC,WAAO;AAAA,MACL;AAAA,MACA;AAAA,MACA,OAAO,KAAK,MAAM,IAAI,CAAC,UAAU;AAAA,QAC/B,MAAM;AAAA,QAAM,MAAM,GAAG,aAAa,IAAI,IAAI,GAAG,QAAQ,SAAS,EAAE;AAAA,QAAG,SAAS;AAAA,QAAY,YAAY;AAAA,QAAQ,mBAAmB,qBAAqB,EAAE;AAAA,MACxJ,EAAE;AAAA,MACF,QAAQ,CAAC,GAAG,KAAK,MAAM;AAAA,MACvB,aAAa,CAAC,GAAG,KAAK,WAAW;AAAA,MACjC,OAAO,CAAC;AAAA,IACV;AAAA,EACF;AAAA,EAEA,MAAM,QAAQ,MAAY,KAA0C;AAClE,SAAK,IAAI,EAAE,IAAI,WAAW,QAAQ,KAAK,GAAG,CAAC;AAC3C,UAAM,OAAO,GAAG,KAAK,KAAK,IAAI,KAAK,EAAE;AACrC,UAAM,MAAM,mBAAmB,IAAI,EAAE,IAAI,IAAI;AAC7C,UAAM,SAAS,YAAY,IAAI,EAAE,IAAI,IAAI;AACzC,QAAI,MAAM,KAAK,EAAE,IAAI;AAAA,MACnB,QAAQ,KAAK;AAAA,MAAI,OAAO,KAAK;AAAA,MAAO,OAAO,KAAK;AAAA,MAAO;AAAA,MAAQ,WAAW;AAAA,MAAK,QAAQ;AAAA,MACvF,OAAO,OAAO,YAAY,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,YAAY,MAAM,GAAG,GAAG,IAAI,EAAE,IAAI,IAAI,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;AAAA,IACrI;AACA,WAAO,EAAE,KAAK,QAAQ,QAAQ,CAAC,GAAG,KAAK,MAAM,EAAE;AAAA,EACjD;AAAA;AAAA,EAGA,MAAM,UAAU,MAAY,KAAmB,UAAsB,MAAM,QAAsC;AAC/G,SAAK,IAAI,EAAE,IAAI,aAAa,QAAQ,KAAK,GAAG,CAAC;AAC7C,UAAM,SAAS,IAAI,MAAM,KAAK,EAAE;AAChC,QAAI,CAAC,OAAQ,QAAO;AACpB,UAAM,UAAU,KAAK,QAAQ,IAAI,KAAK,EAAE,KAAK,IAAI,MAAM,IAAI,CAAC,MAAM,EAAE,IAAI;AACxE,eAAW,CAAC,MAAM,KAAK,KAAK,OAAO,QAAQ,OAAO,KAAK,EAAG,OAAM,UAAU,QAAQ,SAAS,IAAI,MAAM,MAAM,WAAW;AACtH,QAAI,QAAQ,SAAS,GAAG;AACtB,UAAI,UAAU,EAAE,QAAQ,KAAK,IAAI,MAAM,OAAO,YAAY,QAAQ,IAAI,CAAC,SAAS,CAAC,MAAM,OAAO,IAAI,EAAE,CAAC,CAAC,EAAE;AACxG,cAAQ;AAAA,IACV;AACA,UAAM,KAAK,MAAM,IAAI,KAAK,EAAE;AAC5B,WAAO,IAAI;AACX,UAAM,UAAU,KAAK,SAAS,IAAI,KAAK,EAAE,KAAK;AAC9C,WAAO,SAAS;AAChB,QAAI,YAAY,SAAU,QAAO,OAAO;AAAA,QACnC,QAAO,eAAe,KAAK,QAAQ,IAAI,KAAK,EAAE,KAAK,QAAQ,CAAC,KAAK;AACtE,WAAO;AAAA,EACT;AAAA,EAEA,MAAM,QAAQ,KAAmB,QAAgB,MAAwC;AACvF,SAAK,IAAI,EAAE,IAAI,WAAW,QAAQ,MAAM,KAAK,KAAK,CAAC;AACnD,UAAM,SAAS,IAAI,MAAM,MAAM;AAC/B,QAAI,CAAC,KAAK,KAAM,QAAO,IAAI,MAAM,MAAM;AAAA,aAC9B,QAAQ,WAAW,SAAU,QAAO,SAAS;AAAA,EACxD;AAAA,EAEA,MAAM,QAAQ,KAA8C;AAC1D,SAAK,IAAI,EAAE,IAAI,UAAU,CAAC;AAC1B,WAAO,UAAU,GAAG;AAAA,EACtB;AAAA,EAEA,MAAM,eAA8B;AAAE,SAAK,IAAI,EAAE,IAAI,eAAe,CAAC;AAAA,EAAG;AAAA,EACxE,MAAM,aAA8B;AAAE,SAAK,IAAI,EAAE,IAAI,aAAa,CAAC;AAAG,WAAO;AAAA,EAAI;AAAA,EACjF,MAAM,sBAAqD;AAAE,SAAK,IAAI,EAAE,IAAI,sBAAsB,CAAC;AAAG,WAAO,KAAK;AAAA,EAAa;AAAA,EAC/H,MAAM,QAAQ,MAAoB,MAAmD;AACnF,SAAK,IAAI,EAAE,IAAI,WAAW,iBAAiB,KAAK,gBAAgB,CAAC;AAAA,EACnE;AACF;","names":[]}
+{"version":3,"sources":["../src/testing.ts"],"sourcesContent":["import type { IConfig } from './interfaces/IConfig';\nimport type { IFileSystem, ToolOutcome } from './interfaces/IFileSystem';\nimport type { ITerminalSession } from './interfaces/ITerminalRunner';\nimport type {\n  IsolationAvailability,\n  IsolationHandoff,\n  IsolationMergeResult,\n  IsolationOutcome,\n  IsolationRun,\n  IntegrationDisposal,\n  PreparedTask,\n  IWorktreeIsolation,\n  RepairEvidence,\n} from './interfaces/IWorktreeIsolation';\nimport type { Task } from './models/Task';\nimport { handoffOf, integrationBranchFor, SELF_REPO } from './services/isolationRecord';\n\nexport function fakeConfig(overrides: Partial<IConfig> = {}): IConfig {\n  return {\n    aiProvider: 'openrouter',\n    apiKey: 'sk-test',\n    planningModel: 'test-model',\n    enabledRunners: ['claude-code'],\n    maxParallelSessions: 3,\n    researchEnabled: false,\n    researchMaxSteps: 10,\n    researchMaxFileSize: 100_000,\n    openAiBaseUrl: 'https://api.openai.com/v1',\n    openAiApiKey: '',\n    openrouterKey: '',\n    geminiKey: '',\n    openaiCompatibleBaseUrl: '',\n    openaiCompatibleApiKey: '',\n    orchestratorModel: '',\n    researchSubagentModel: '',\n    geminiModel: '',\n    planMapEnabled: true,\n    autonomousMode: true,\n    // Off so an orchestrator built without an injected isolation never runs\n    // real git against whatever repository the tests happen to run in.\n    worktreeIsolation: false,\n    workspaceRepos: [],\n    worktreeLinks: [],\n    // Off so a scripted conflict stays a conflict unless a test opts into repairing it.\n    conflictRepairAttempts: 0,\n    approvalMode: 'ask',\n    approvalPreApproved: [],\n    setProviderModelLists: () => {},\n    getProviderBaseUrl: () => '',\n    getProviderApiKey: () => '',\n    ...overrides,\n  };\n}\n\nconst EMPTY_OUTCOME: ToolOutcome = { success: false, output: '', truncated: false };\n\n/**\n * A complete {@link IFileSystem} stub. Lives here rather than in each package's\n * test folder so adding a tool to the interface is one edit, not one per suite.\n */\nexport function fakeFileSystem(overrides: Partial<IFileSystem> = {}): IFileSystem {\n  return {\n    readFile: async () => EMPTY_OUTCOME,\n    readFiles: async () => EMPTY_OUTCOME,\n    glob: async () => EMPTY_OUTCOME,\n    grep: async () => EMPTY_OUTCOME,\n    findSymbol: async () => EMPTY_OUTCOME,\n    listDir: async () => EMPTY_OUTCOME,\n    bash: async () => EMPTY_OUTCOME,\n    getWorkspaceRoot: () => '/workspace',\n    ...overrides,\n  };\n}\n\nexport class FakeTerminalSession implements ITerminalSession {\n  private outputCbs: Array<(text: string) => void> = [];\n  private exitCbs: Array<(code: number) => void> = [];\n  output = '';\n  written: string[] = [];\n  killed = false;\n\n  constructor(public id = 's1', public taskId = 't1') {}\n\n  onOutput(cb: (text: string) => void): void { this.outputCbs.push(cb); }\n  onExit(cb: (code: number) => void): void { this.exitCbs.push(cb); }\n  kill(): void { this.killed = true; }\n  getOutput(): string { return this.output; }\n  write(text: string): void { this.written.push(text); }\n\n  emitOutput(text: string): void {\n    this.output += text;\n    for (const cb of this.outputCbs) cb(text);\n  }\n  emitExit(code: number): void {\n    for (const cb of this.exitCbs) cb(code);\n  }\n}\n\nexport type FakeIsolationCall =\n  | { op: 'isActive'; workspaceRoot: string }\n  | { op: 'stash'; workspaceRoot: string }\n  | { op: 'startRun'; workspaceRoot: string }\n  | { op: 'prepare' | 'reopen' | 'verifyRepair'; taskId: string }\n  | { op: 'integrate'; taskId: string }\n  | { op: 'release'; taskId: string; keep: boolean }\n  | { op: 'handoff' | 'pruneOrphans' | 'reviewDiff' | 'mergeIntoCheckedOut' | 'sweep' }\n  | { op: 'discard'; integration: IntegrationDisposal };\n\n/**\n * An in-memory {@link IWorktreeIsolation} for scheduling tests: no git, no\n * filesystem. Every call is logged in `calls`; `prepare` hands back a\n * deterministic fake cwd. Set `availability` to exercise the fallbacks, `outcomes`\n * to script a conflict, and `holdIntegration` to keep a task un-integrated so a\n * test can observe that its dependents wait. `repos` makes the run a group of\n * several; `changes` and `stopsIn` say which of them a task changes and where\n * its landing stops. `repairEvidence` scripts what a conflict repair's\n * evidence check finds.\n */\nexport class FakeWorktreeIsolation implements IWorktreeIsolation {\n  availability: IsolationAvailability = { active: true };\n  /** The repo paths `startRun` groups: a group of one at `.` unless set. */\n  repos: string[] = [SELF_REPO];\n  /** Per task id, the repos it changes; every repo of the group when not listed. */\n  changes = new Map<string, string[]>();\n  /** Per task id, the repo its landing stops in when its outcome is not `merged`; its first changed repo when not listed. */\n  stopsIn = new Map<string, string>();\n  /** Per task id, the files a `conflict` outcome names; empty when not listed. */\n  conflictFiles = new Map<string, string[]>();\n  /** What `mergeIntoCheckedOut` answers. */\n  mergeResult: IsolationMergeResult = { outcome: 'merged' };\n  /** What `startRun` shares and `prepare` copies, to exercise their notices. */\n  shared: string[] = [];\n  sharedRepos: string[] = [];\n  copied: string[] = [];\n  /** Set to make `startRun` throw, as git does when no repo of the group can be isolated. */\n  startRunError: Error | null = null;\n  /** Set to make `discard` / `sweep` throw after logging the call. */\n  discardError: Error | null = null;\n  sweepError: Error | null = null;\n  /** Per task id; a task not listed integrates as `merged`. */\n  outcomes = new Map<string, IsolationOutcome>();\n  /** Per task id, what `verifyRepair` finds; a task not listed passes. */\n  repairEvidence = new Map<string, RepairEvidence>();\n  calls: FakeIsolationCall[] = [];\n  private holds = new Map<string, Promise<void>>();\n  private runCount = 0;\n\n  private log(call: FakeIsolationCall): void { this.calls.push(call); }\n\n  /** Task ids in the order `op` was called for them. */\n  taskIdsFor(op: 'prepare' | 'reopen' | 'verifyRepair' | 'integrate' | 'release'): string[] {\n    return this.calls.flatMap((c) => (c.op === op && 'taskId' in c ? [c.taskId] : []));\n  }\n\n  /** Make `integrate` for this task wait until the returned function is called. */\n  holdIntegration(taskId: string): () => void {\n    let open!: () => void;\n    this.holds.set(taskId, new Promise<void>((resolve) => { open = resolve; }));\n    return open;\n  }\n\n  async isActive(workspaceRoot: string): Promise<IsolationAvailability> {\n    this.log({ op: 'isActive', workspaceRoot });\n    return this.availability;\n  }\n\n  /** Like git: once the tracked changes are stashed, the tree is no longer dirty. */\n  async stash(workspaceRoot: string): Promise<void> {\n    this.log({ op: 'stash', workspaceRoot });\n    if (!this.availability.active && this.availability.reason === 'dirty') this.availability = { active: true };\n  }\n\n  async startRun(workspaceRoot: string): Promise<IsolationRun> {\n    this.log({ op: 'startRun', workspaceRoot });\n    if (this.startRunError) throw this.startRunError;\n    const id = `run${++this.runCount}`;\n    return {\n      id,\n      workspaceRoot,\n      repos: this.repos.map((repo) => ({\n        path: repo, root: `${workspaceRoot}/${repo}`.replace(/\\/\\.$/, ''), baseRef: 'base0000', baseBranch: 'main', integrationBranch: integrationBranchFor(id),\n      })),\n      shared: [...this.shared],\n      sharedRepos: [...this.sharedRepos],\n      tasks: {},\n    };\n  }\n\n  async prepare(task: Task, run: IsolationRun): Promise<PreparedTask> {\n    this.log({ op: 'prepare', taskId: task.id });\n    const name = `${task.order}-${task.id}`;\n    const cwd = `/fake-worktrees/${run.id}/${name}`;\n    const branch = `ordewell/${run.id}/${name}`;\n    run.tasks[task.id] = {\n      taskId: task.id, order: task.order, title: task.title, branch, workspace: cwd, status: 'active',\n      repos: Object.fromEntries(run.repos.map((r) => [r.path, { worktree: r.path === SELF_REPO ? cwd : `${cwd}/${r.path}`, linked: [] }])),\n    };\n    return { cwd, branch, copied: [...this.copied] };\n  }\n\n  /** Like git: the same cwd, each changed repo's tip recorded, the repair counted. */\n  async reopen(task: Task, run: IsolationRun): Promise<PreparedTask> {\n    this.log({ op: 'reopen', taskId: task.id });\n    const record = run.tasks[task.id];\n    if (record?.status !== 'conflict') throw new Error(`Task ${task.order} has no conflict to repair`);\n    const changed = Object.entries(record.repos).filter(([repo, entry]) => entry.changed || repo === record.conflictRepo).map(([repo]) => repo);\n    const files = (record.conflictFiles ?? []).map((file) => (record.conflictRepo && record.conflictRepo !== SELF_REPO ? `${record.conflictRepo}/${file}` : file));\n    record.repairs = (record.repairs ?? 0) + 1;\n    record.repairBase = Object.fromEntries(changed.map((repo) => [repo, `tip-${repo}`]));\n    record.repairedFiles = [...new Set([...(record.repairedFiles ?? []), ...files])];\n    record.status = 'repairing';\n    return { cwd: record.workspace, branch: record.branch, copied: [] };\n  }\n\n  async verifyRepair(task: Task, _run: IsolationRun): Promise<RepairEvidence> {\n    this.log({ op: 'verifyRepair', taskId: task.id });\n    return this.repairEvidence.get(task.id) ?? { ok: true };\n  }\n\n  /** Like git: the landing is recorded and persisted before the (held) merge, and cleared once it settles. */\n  async integrate(task: Task, run: IsolationRun, persist: () => void = () => undefined): Promise<IsolationOutcome> {\n    this.log({ op: 'integrate', taskId: task.id });\n    const record = run.tasks[task.id];\n    if (!record) return 'failed';\n    const changed = this.changes.get(task.id) ?? run.repos.map((r) => r.path);\n    for (const [repo, entry] of Object.entries(record.repos)) entry.changed = changed.includes(repo) || (entry.changed ?? false);\n    if (changed.length > 0) {\n      run.landing = { taskId: task.id, tips: Object.fromEntries(changed.map((repo) => [repo, `tip-${repo}`])) };\n      persist();\n    }\n    await this.holds.get(task.id);\n    delete run.landing;\n    const outcome = this.outcomes.get(task.id) ?? 'merged';\n    record.status = outcome;\n    delete record.repairBase;\n    if (outcome === 'merged') {\n      delete record.conflictRepo;\n      delete record.conflictFiles;\n    } else {\n      record.conflictRepo = this.stopsIn.get(task.id) ?? changed[0] ?? SELF_REPO;\n      const files = this.conflictFiles.get(task.id);\n      if (files) record.conflictFiles = files;\n      else delete record.conflictFiles;\n    }\n    return outcome;\n  }\n\n  async release(run: IsolationRun, taskId: string, opts: { keep: boolean }): Promise<void> {\n    this.log({ op: 'release', taskId, keep: opts.keep });\n    const record = run.tasks[taskId];\n    if (!opts.keep) delete run.tasks[taskId];\n    else if (record?.status === 'active') record.status = 'kept';\n    else if (record?.status === 'repairing') {\n      record.status = 'conflict';\n      delete record.repairBase;\n    }\n  }\n\n  async handoff(run: IsolationRun): Promise<IsolationHandoff> {\n    this.log({ op: 'handoff' });\n    return handoffOf(run);\n  }\n\n  async pruneOrphans(): Promise<void> { this.log({ op: 'pruneOrphans' }); }\n  async reviewDiff(): Promise<string> { this.log({ op: 'reviewDiff' }); return ''; }\n  async mergeIntoCheckedOut(): Promise<IsolationMergeResult> { this.log({ op: 'mergeIntoCheckedOut' }); return this.mergeResult; }\n  async discard(_run: IsolationRun, opts: { integration: IntegrationDisposal }): Promise<void> {\n    this.log({ op: 'discard', integration: opts.integration });\n    if (this.discardError) throw this.discardError;\n  }\n  async sweep(): Promise<void> {\n    this.log({ op: 'sweep' });\n    if (this.sweepError) throw this.sweepError;\n  }\n}\n"],"mappings":";;;;;;;AAiBO,SAAS,WAAW,YAA8B,CAAC,GAAY;AACpE,SAAO;AAAA,IACL,YAAY;AAAA,IACZ,QAAQ;AAAA,IACR,eAAe;AAAA,IACf,gBAAgB,CAAC,aAAa;AAAA,IAC9B,qBAAqB;AAAA,IACrB,iBAAiB;AAAA,IACjB,kBAAkB;AAAA,IAClB,qBAAqB;AAAA,IACrB,eAAe;AAAA,IACf,cAAc;AAAA,IACd,eAAe;AAAA,IACf,WAAW;AAAA,IACX,yBAAyB;AAAA,IACzB,wBAAwB;AAAA,IACxB,mBAAmB;AAAA,IACnB,uBAAuB;AAAA,IACvB,aAAa;AAAA,IACb,gBAAgB;AAAA,IAChB,gBAAgB;AAAA;AAAA;AAAA,IAGhB,mBAAmB;AAAA,IACnB,gBAAgB,CAAC;AAAA,IACjB,eAAe,CAAC;AAAA;AAAA,IAEhB,wBAAwB;AAAA,IACxB,cAAc;AAAA,IACd,qBAAqB,CAAC;AAAA,IACtB,uBAAuB,MAAM;AAAA,IAAC;AAAA,IAC9B,oBAAoB,MAAM;AAAA,IAC1B,mBAAmB,MAAM;AAAA,IACzB,GAAG;AAAA,EACL;AACF;AAEA,IAAM,gBAA6B,EAAE,SAAS,OAAO,QAAQ,IAAI,WAAW,MAAM;AAM3E,SAAS,eAAe,YAAkC,CAAC,GAAgB;AAChF,SAAO;AAAA,IACL,UAAU,YAAY;AAAA,IACtB,WAAW,YAAY;AAAA,IACvB,MAAM,YAAY;AAAA,IAClB,MAAM,YAAY;AAAA,IAClB,YAAY,YAAY;AAAA,IACxB,SAAS,YAAY;AAAA,IACrB,MAAM,YAAY;AAAA,IAClB,kBAAkB,MAAM;AAAA,IACxB,GAAG;AAAA,EACL;AACF;AAEO,IAAM,sBAAN,MAAsD;AAAA,EAO3D,YAAmB,KAAK,MAAa,SAAS,MAAM;AAAjC;AAAkB;AAAA,EAAgB;AAAA,EAAlC;AAAA,EAAkB;AAAA,EAN7B,YAA2C,CAAC;AAAA,EAC5C,UAAyC,CAAC;AAAA,EAClD,SAAS;AAAA,EACT,UAAoB,CAAC;AAAA,EACrB,SAAS;AAAA,EAIT,SAAS,IAAkC;AAAE,SAAK,UAAU,KAAK,EAAE;AAAA,EAAG;AAAA,EACtE,OAAO,IAAkC;AAAE,SAAK,QAAQ,KAAK,EAAE;AAAA,EAAG;AAAA,EAClE,OAAa;AAAE,SAAK,SAAS;AAAA,EAAM;AAAA,EACnC,YAAoB;AAAE,WAAO,KAAK;AAAA,EAAQ;AAAA,EAC1C,MAAM,MAAoB;AAAE,SAAK,QAAQ,KAAK,IAAI;AAAA,EAAG;AAAA,EAErD,WAAW,MAAoB;AAC7B,SAAK,UAAU;AACf,eAAW,MAAM,KAAK,UAAW,IAAG,IAAI;AAAA,EAC1C;AAAA,EACA,SAAS,MAAoB;AAC3B,eAAW,MAAM,KAAK,QAAS,IAAG,IAAI;AAAA,EACxC;AACF;AAsBO,IAAM,wBAAN,MAA0D;AAAA,EAC/D,eAAsC,EAAE,QAAQ,KAAK;AAAA;AAAA,EAErD,QAAkB,CAAC,SAAS;AAAA;AAAA,EAE5B,UAAU,oBAAI,IAAsB;AAAA;AAAA,EAEpC,UAAU,oBAAI,IAAoB;AAAA;AAAA,EAElC,gBAAgB,oBAAI,IAAsB;AAAA;AAAA,EAE1C,cAAoC,EAAE,SAAS,SAAS;AAAA;AAAA,EAExD,SAAmB,CAAC;AAAA,EACpB,cAAwB,CAAC;AAAA,EACzB,SAAmB,CAAC;AAAA;AAAA,EAEpB,gBAA8B;AAAA;AAAA,EAE9B,eAA6B;AAAA,EAC7B,aAA2B;AAAA;AAAA,EAE3B,WAAW,oBAAI,IAA8B;AAAA;AAAA,EAE7C,iBAAiB,oBAAI,IAA4B;AAAA,EACjD,QAA6B,CAAC;AAAA,EACtB,QAAQ,oBAAI,IAA2B;AAAA,EACvC,WAAW;AAAA,EAEX,IAAI,MAA+B;AAAE,SAAK,MAAM,KAAK,IAAI;AAAA,EAAG;AAAA;AAAA,EAGpE,WAAW,IAA+E;AACxF,WAAO,KAAK,MAAM,QAAQ,CAAC,MAAO,EAAE,OAAO,MAAM,YAAY,IAAI,CAAC,EAAE,MAAM,IAAI,CAAC,CAAE;AAAA,EACnF;AAAA;AAAA,EAGA,gBAAgB,QAA4B;AAC1C,QAAI;AACJ,SAAK,MAAM,IAAI,QAAQ,IAAI,QAAc,CAAC,YAAY;AAAE,aAAO;AAAA,IAAS,CAAC,CAAC;AAC1E,WAAO;AAAA,EACT;AAAA,EAEA,MAAM,SAAS,eAAuD;AACpE,SAAK,IAAI,EAAE,IAAI,YAAY,cAAc,CAAC;AAC1C,WAAO,KAAK;AAAA,EACd;AAAA;AAAA,EAGA,MAAM,MAAM,eAAsC;AAChD,SAAK,IAAI,EAAE,IAAI,SAAS,cAAc,CAAC;AACvC,QAAI,CAAC,KAAK,aAAa,UAAU,KAAK,aAAa,WAAW,QAAS,MAAK,eAAe,EAAE,QAAQ,KAAK;AAAA,EAC5G;AAAA,EAEA,MAAM,SAAS,eAA8C;AAC3D,SAAK,IAAI,EAAE,IAAI,YAAY,cAAc,CAAC;AAC1C,QAAI,KAAK,cAAe,OAAM,KAAK;AACnC,UAAM,KAAK,MAAM,EAAE,KAAK,QAAQ;AAChC,WAAO;AAAA,MACL;AAAA,MACA;AAAA,MACA,OAAO,KAAK,MAAM,IAAI,CAAC,UAAU;AAAA,QAC/B,MAAM;AAAA,QAAM,MAAM,GAAG,aAAa,IAAI,IAAI,GAAG,QAAQ,SAAS,EAAE;AAAA,QAAG,SAAS;AAAA,QAAY,YAAY;AAAA,QAAQ,mBAAmB,qBAAqB,EAAE;AAAA,MACxJ,EAAE;AAAA,MACF,QAAQ,CAAC,GAAG,KAAK,MAAM;AAAA,MACvB,aAAa,CAAC,GAAG,KAAK,WAAW;AAAA,MACjC,OAAO,CAAC;AAAA,IACV;AAAA,EACF;AAAA,EAEA,MAAM,QAAQ,MAAY,KAA0C;AAClE,SAAK,IAAI,EAAE,IAAI,WAAW,QAAQ,KAAK,GAAG,CAAC;AAC3C,UAAM,OAAO,GAAG,KAAK,KAAK,IAAI,KAAK,EAAE;AACrC,UAAM,MAAM,mBAAmB,IAAI,EAAE,IAAI,IAAI;AAC7C,UAAM,SAAS,YAAY,IAAI,EAAE,IAAI,IAAI;AACzC,QAAI,MAAM,KAAK,EAAE,IAAI;AAAA,MACnB,QAAQ,KAAK;AAAA,MAAI,OAAO,KAAK;AAAA,MAAO,OAAO,KAAK;AAAA,MAAO;AAAA,MAAQ,WAAW;AAAA,MAAK,QAAQ;AAAA,MACvF,OAAO,OAAO,YAAY,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,YAAY,MAAM,GAAG,GAAG,IAAI,EAAE,IAAI,IAAI,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;AAAA,IACrI;AACA,WAAO,EAAE,KAAK,QAAQ,QAAQ,CAAC,GAAG,KAAK,MAAM,EAAE;AAAA,EACjD;AAAA;AAAA,EAGA,MAAM,OAAO,MAAY,KAA0C;AACjE,SAAK,IAAI,EAAE,IAAI,UAAU,QAAQ,KAAK,GAAG,CAAC;AAC1C,UAAM,SAAS,IAAI,MAAM,KAAK,EAAE;AAChC,QAAI,QAAQ,WAAW,WAAY,OAAM,IAAI,MAAM,QAAQ,KAAK,KAAK,4BAA4B;AACjG,UAAM,UAAU,OAAO,QAAQ,OAAO,KAAK,EAAE,OAAO,CAAC,CAAC,MAAM,KAAK,MAAM,MAAM,WAAW,SAAS,OAAO,YAAY,EAAE,IAAI,CAAC,CAAC,IAAI,MAAM,IAAI;AAC1I,UAAM,SAAS,OAAO,iBAAiB,CAAC,GAAG,IAAI,CAAC,SAAU,OAAO,gBAAgB,OAAO,iBAAiB,YAAY,GAAG,OAAO,YAAY,IAAI,IAAI,KAAK,IAAK;AAC7J,WAAO,WAAW,OAAO,WAAW,KAAK;AACzC,WAAO,aAAa,OAAO,YAAY,QAAQ,IAAI,CAAC,SAAS,CAAC,MAAM,OAAO,IAAI,EAAE,CAAC,CAAC;AACnF,WAAO,gBAAgB,CAAC,GAAG,oBAAI,IAAI,CAAC,GAAI,OAAO,iBAAiB,CAAC,GAAI,GAAG,KAAK,CAAC,CAAC;AAC/E,WAAO,SAAS;AAChB,WAAO,EAAE,KAAK,OAAO,WAAW,QAAQ,OAAO,QAAQ,QAAQ,CAAC,EAAE;AAAA,EACpE;AAAA,EAEA,MAAM,aAAa,MAAY,MAA6C;AAC1E,SAAK,IAAI,EAAE,IAAI,gBAAgB,QAAQ,KAAK,GAAG,CAAC;AAChD,WAAO,KAAK,eAAe,IAAI,KAAK,EAAE,KAAK,EAAE,IAAI,KAAK;AAAA,EACxD;AAAA;AAAA,EAGA,MAAM,UAAU,MAAY,KAAmB,UAAsB,MAAM,QAAsC;AAC/G,SAAK,IAAI,EAAE,IAAI,aAAa,QAAQ,KAAK,GAAG,CAAC;AAC7C,UAAM,SAAS,IAAI,MAAM,KAAK,EAAE;AAChC,QAAI,CAAC,OAAQ,QAAO;AACpB,UAAM,UAAU,KAAK,QAAQ,IAAI,KAAK,EAAE,KAAK,IAAI,MAAM,IAAI,CAAC,MAAM,EAAE,IAAI;AACxE,eAAW,CAAC,MAAM,KAAK,KAAK,OAAO,QAAQ,OAAO,KAAK,EAAG,OAAM,UAAU,QAAQ,SAAS,IAAI,MAAM,MAAM,WAAW;AACtH,QAAI,QAAQ,SAAS,GAAG;AACtB,UAAI,UAAU,EAAE,QAAQ,KAAK,IAAI,MAAM,OAAO,YAAY,QAAQ,IAAI,CAAC,SAAS,CAAC,MAAM,OAAO,IAAI,EAAE,CAAC,CAAC,EAAE;AACxG,cAAQ;AAAA,IACV;AACA,UAAM,KAAK,MAAM,IAAI,KAAK,EAAE;AAC5B,WAAO,IAAI;AACX,UAAM,UAAU,KAAK,SAAS,IAAI,KAAK,EAAE,KAAK;AAC9C,WAAO,SAAS;AAChB,WAAO,OAAO;AACd,QAAI,YAAY,UAAU;AACxB,aAAO,OAAO;AACd,aAAO,OAAO;AAAA,IAChB,OAAO;AACL,aAAO,eAAe,KAAK,QAAQ,IAAI,KAAK,EAAE,KAAK,QAAQ,CAAC,KAAK;AACjE,YAAM,QAAQ,KAAK,cAAc,IAAI,KAAK,EAAE;AAC5C,UAAI,MAAO,QAAO,gBAAgB;AAAA,UAC7B,QAAO,OAAO;AAAA,IACrB;AACA,WAAO;AAAA,EACT;AAAA,EAEA,MAAM,QAAQ,KAAmB,QAAgB,MAAwC;AACvF,SAAK,IAAI,EAAE,IAAI,WAAW,QAAQ,MAAM,KAAK,KAAK,CAAC;AACnD,UAAM,SAAS,IAAI,MAAM,MAAM;AAC/B,QAAI,CAAC,KAAK,KAAM,QAAO,IAAI,MAAM,MAAM;AAAA,aAC9B,QAAQ,WAAW,SAAU,QAAO,SAAS;AAAA,aAC7C,QAAQ,WAAW,aAAa;AACvC,aAAO,SAAS;AAChB,aAAO,OAAO;AAAA,IAChB;AAAA,EACF;AAAA,EAEA,MAAM,QAAQ,KAA8C;AAC1D,SAAK,IAAI,EAAE,IAAI,UAAU,CAAC;AAC1B,WAAO,UAAU,GAAG;AAAA,EACtB;AAAA,EAEA,MAAM,eAA8B;AAAE,SAAK,IAAI,EAAE,IAAI,eAAe,CAAC;AAAA,EAAG;AAAA,EACxE,MAAM,aAA8B;AAAE,SAAK,IAAI,EAAE,IAAI,aAAa,CAAC;AAAG,WAAO;AAAA,EAAI;AAAA,EACjF,MAAM,sBAAqD;AAAE,SAAK,IAAI,EAAE,IAAI,sBAAsB,CAAC;AAAG,WAAO,KAAK;AAAA,EAAa;AAAA,EAC/H,MAAM,QAAQ,MAAoB,MAA2D;AAC3F,SAAK,IAAI,EAAE,IAAI,WAAW,aAAa,KAAK,YAAY,CAAC;AACzD,QAAI,KAAK,aAAc,OAAM,KAAK;AAAA,EACpC;AAAA,EACA,MAAM,QAAuB;AAC3B,SAAK,IAAI,EAAE,IAAI,QAAQ,CAAC;AACxB,QAAI,KAAK,WAAY,OAAM,KAAK;AAAA,EAClC;AACF;","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ordewell/core",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Ordewell core — planner, orchestrator, runners and verification engine.",
   "license": "Apache-2.0",
   "author": "Alessandro Costanzo Ciano",

package/dist/chunk-HQICT7HQ.mjs.map

@@ -1 +0,0 @@
-{"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  kept: 'kept',\n  failed: 'kept',\n};\n\nexport function taskIsolationOf(record: IsolationTaskRecord): 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  };\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 => ({ taskId: r.taskId, order: r.order, title: r.title });\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":[]}