@afokapu/atdd-flow 0.3.84 → 0.3.85

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@afokapu/atdd-flow",
-  "version": "0.3.84",
+  "version": "0.3.85",
   "description": "Filesystem-first Desk registry for projects, seats, tasks, threads, and handoffs.",
   "type": "module",
   "bin": {

package/src/seats.ts

@@ -255,7 +255,7 @@ async function taskCoordinatorBase(root: string, config: Project, task: Task, re
     const head = await runOutput(["git", "-C", coordinator.worktree, "rev-parse", "HEAD"]);
     if (head !== branchHead) throw new Error(`Coordinator ${coordinator.address} head is stale relative to ${branch}.`);
   } else {
-    try { await assertBranchReady(mode, coordinator.worktree, branch); }
+    try { await assertBranchReady(mode, coordinator.worktree, branch, coordinator.role === "main"); }
     catch (error) { throw new Error(`Coordinator ${coordinator.address} is not ready: ${(error as Error).message}`); }
   }
   return { coordinator, branch, commit: branchHead };
@@ -331,7 +331,7 @@ async function spawnTaskDriver(root: string, config: Project, role: Role, name:
     const currentBranch = await branchCommit(mode, base.coordinator.worktree, coordinatorBase.branch);
     if (currentBranch !== coordinatorBase.commit) throw new Error(`Coordinator ${base.coordinator.address} advanced during driver provisioning.`);
     if (!baseArgument) {
-      const current = await assertBranchReady(mode, base.coordinator.worktree, coordinatorBase.branch);
+      const current = await assertBranchReady(mode, base.coordinator.worktree, coordinatorBase.branch, base.coordinator.role === "main");
       if (current !== coordinatorBase.commit) throw new Error(`Coordinator ${base.coordinator.address} advanced during driver provisioning.`);
     }
     await atomicYaml(paths(root).seatFile(address), record);

package/src/vcs.ts

@@ -103,7 +103,11 @@ export async function isAncestor(cwd: string, ancestor: string, descendant: stri
   catch { return false; }
 }
 
-export async function assertBranchReady(mode: VcsMode, cwd: string, branch: string) {
+/**
+ * A branch is ready when its checkout is clean and at the branch tip. `allowDirtyParent` additionally accepts a Jujutsu working copy
+ * whose parent is exactly the branch tip with uncommitted changes (a migrated dirty primary); conflicts and any other lineage stay refused.
+ */
+export async function assertBranchReady(mode: VcsMode, cwd: string, branch: string, allowDirtyParent = false) {
   if (mode === "git") {
     if (await runOutput(["git", "-C", cwd, "status", "--porcelain"])) throw new Error(`Worktree ${cwd} is dirty.`);
     const checkedOut = await runOutput(["git", "-C", cwd, "branch", "--show-current"]);
@@ -120,7 +124,7 @@ export async function assertBranchReady(mode: VcsMode, cwd: string, branch: stri
       runOutput(["jj", "log", "-r", "@-", "--no-graph", "-T", "commit_id"], cwd),
       runOutput(["jj", "diff", "-r", "@", "--name-only"], cwd),
     ]);
-    if (parent === expected && !changed) return expected;
+    if (parent === expected && (!changed || allowDirtyParent)) return expected;
   }
   throw new Error(`Worktree ${cwd} is stale relative to ${branch}.`);
 }