@afokapu/atdd-bun 0.10.114 → 0.10.115

package/integrity.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.10.114",
+  "version": "0.10.115",
   "files": {
     "HOOK_AUDIT.md": "5329d840db37671b1918f688ead26865473b87db73dbc75f7c8b2a8bbe8d6d43",
     "README.md": "8aefceaa24bee498f39081b2aaf4c0d5c54bc1ed9849c20e1d98d1427df56eab",
@@ -1269,7 +1269,7 @@
     "src/cli.ts": "395638ab87565bb10c2beb35988ff1acf686924d13515795156a2e8893b3da88",
     "src/docs-capability.ts": "bdeeb414649049b1cd4fa8008cada3a576318be51c43bec91bfa46a8e250c270",
     "src/enforce.ts": "c4811abe63efe4568f3cf26e21a152d1537e120cb3ce471daca32367cf6e2cda",
-    "src/hooks.ts": "afda4062002846e56d4c3ed0e7d4e18d9dfd59666a25d55eee4b68221f3411ef",
+    "src/hooks.ts": "70094d7bb7afbddcf145d77b3003e3487c8a6d39066952251a18b5487594c310",
     "src/index.ts": "4081f8b08d1d3ee9e15a9964143e53d9cfb94a5616ab3e58a180d24cc16dc381",
     "src/integrity.ts": "f1ede7cb04924ae88e11917047277e264af6596b9759e381bd9c497cd34a797d",
     "src/journey-docs.ts": "994d229376244c84212cff951032823068a76565dd2fd427b9d44e341bd14853",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@afokapu/atdd-bun",
-  "version": "0.10.114",
+  "version": "0.10.115",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/afokapu/atdd-bun.git"

package/src/hooks.ts

@@ -628,13 +628,12 @@ async function finishCandidate(state: Layout, cfg: HookPolicy): Promise<{ error:
   const current = await currentCommit(state.current);
   if (!current) return { error: "could not resolve the current Jujutsu revision" };
   let delivery = current, found = await branchForCommit(state.current, current, cfg.protected_branches);
-  if ("error" in found && found.count === 0 && await mergedIntoPrimary(state, current, cfg)) return { branch: null, tip: current };
   if ("error" in found) {
+    // The established delivery path comes first: an empty working copy above a bookmarked parent.
     const changed = await jj(state.current, ["diff", "-r", "@", "--name-only"]);
     const parent = await jj(state.current, ["log", "-r", "@-", "--no-graph", "-T", "commit_id"]);
-    if (changed.code || changed.out || parent.code || !parent.out) return found;
-    const parentFound = await branchForCommit(state.current, parent.out, cfg.protected_branches);
-    if ("error" in parentFound) return found;
+    const parentFound = changed.code || changed.out || parent.code || !parent.out ? found : await branchForCommit(state.current, parent.out, cfg.protected_branches);
+    if ("error" in parentFound) return found.count === 0 && await chainToPrimary(state, current, cfg, true) === "merged" ? { branch: null, tip: current } : found;
     delivery = parent.out;
     found = parentFound;
   }
@@ -656,21 +655,33 @@ async function jjRevision(root: string, commit: string): Promise<{ error: string
   return { empty: emptiness === "empty", conflict: conflict === "conflict", parents };
 }
 
-// A tip is delivered when it is an ancestor of the protected branch, or when it
-// reaches such an ancestor only through empty single-parent changes (nothing to
-// deliver). Content, conflicts, or merge shapes outside that chain fail closed.
-async function deliveryError(state: Layout, branch: string, tip: string, cfg: HookPolicy): Promise<string | null> {
-  let commit = tip;
-  for (;;) {
+// Walks from a tip toward the protected branch through empty single-parent changes. "merged" means
+// the walk reached an ancestor of the protected branch, so there is nothing to deliver. Content,
+// conflicts, or merge shapes outside that chain fail closed. With refFree, an unmerged change that
+// carries any refs/heads bookmark (protected or not) also fails closed, so no unique ref is left behind.
+type ChainOutcome = "merged" | "conflict" | "unmerged" | { error: string };
+async function chainToPrimary(state: Layout, tip: string, cfg: HookPolicy, refFree = false): Promise<ChainOutcome> {
+  for (let commit = tip;;) {
     const info = await jjRevision(state.primary, commit);
-    if ("error" in info) return info.error;
-    if (info.conflict) return `bookmark ${branch} has unresolved conflicts`;
-    if (await mergedIntoPrimary(state, commit, cfg)) return null;
-    if (!info.empty || info.parents.length !== 1) return `branch ${branch} is not merged into ${cfg.worktrees.primary_branch} in the primary checkout`;
+    if ("error" in info) return info;
+    if (info.conflict) return "conflict";
+    if (await mergedIntoPrimary(state, commit, cfg)) return "merged";
+    if (!info.empty || info.parents.length !== 1) return "unmerged";
+    if (refFree) {
+      const refs = await git(state.primary, ["for-each-ref", "--format=%(refname)", "--points-at", commit, "refs/heads/"]);
+      if (refs.code || refs.out) return "unmerged";
+    }
     commit = info.parents[0]!;
   }
 }
 
+async function deliveryError(state: Layout, branch: string, tip: string, cfg: HookPolicy): Promise<string | null> {
+  const outcome = await chainToPrimary(state, tip, cfg);
+  if (outcome === "merged") return null;
+  if (outcome === "conflict") return `bookmark ${branch} has unresolved conflicts`;
+  return typeof outcome === "string" ? `branch ${branch} is not merged into ${cfg.worktrees.primary_branch} in the primary checkout` : outcome.error;
+}
+
 // The workspace name is never derived from the bookmark (bookmarks can be
 // renamed). Resolve it from the JJ registry: exactly one registered workspace
 // must resolve, by real path, to the current directory.