@mrciphersmith/keryx 0.3.53 → 0.3.54

package/dist/cli.js

@@ -20100,7 +20100,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@mrciphersmith/keryx",
-    version: "0.3.53",
+    version: "0.3.54",
     description: "Version-controlled project context for AI coding agents: code graph, architecture wiki, project memory, relevant tests, quality signals, and task flows.",
     private: false,
     publishConfig: {
@@ -57349,14 +57349,15 @@ async function showPrefix(cwd) {
   }
   return result.stdout.trim();
 }
+function rankOfRef(ref, headTargets) {
+  if (/^refs\/remotes\/[^/]+\/(main|master)$/.test(ref)) {
+    return 0;
+  }
+  return headTargets.has(ref) ? 1 : 2;
+}
 function orderRemoteRefs(entries, max = MAX_REFS) {
   const headTargets = new Set(entries.map((entry) => entry.symref).filter((symref) => symref.length > 0));
-  const rank = (ref) => {
-    if (/^refs\/remotes\/[^/]+\/(main|master)$/.test(ref)) {
-      return 0;
-    }
-    return headTargets.has(ref) ? 1 : 2;
-  };
+  const rank = (ref) => rankOfRef(ref, headTargets);
   const candidates = entries.filter((entry) => entry.ref.startsWith("refs/remotes/") && !entry.ref.endsWith("/HEAD") && entry.symref === "").sort((a, b) => rank(a.ref) - rank(b.ref) || (a.ref < b.ref ? -1 : a.ref > b.ref ? 1 : 0));
   const seenTips = new Set;
   const refs = [];
@@ -57385,7 +57386,8 @@ async function remoteRefs(cwd) {
     }
     entries.push({ tip, ref, symref: symref ?? "" });
   }
-  return orderRemoteRefs(entries);
+  const headTargets = new Set(entries.map((entry) => entry.symref).filter((symref) => symref.length > 0));
+  return orderRemoteRefs(entries).map((ref) => ({ ref, primary: rankOfRef(ref, headTargets) < 2 }));
 }
 async function flowDirsOnRef(cwd, ref, flowsPath) {
   const result = await runGit2(cwd, ["ls-tree", "-z", "-d", "--name-only", "--full-tree", ref, "--", `${flowsPath}/`]);
@@ -57411,12 +57413,16 @@ async function knownRemoteFlowDirs(cwd) {
       while (next < refs.length) {
         const index = next;
         next += 1;
-        const ref = refs[index];
-        if (ref === undefined) {
+        const entry = refs[index];
+        if (entry === undefined) {
           continue;
         }
-        const short = ref.slice("refs/remotes/".length);
-        found[index] = (await flowDirsOnRef(cwd, ref, flowsPath)).map((dir) => ({ ref: short, dir }));
+        const short = entry.ref.slice("refs/remotes/".length);
+        found[index] = (await flowDirsOnRef(cwd, entry.ref, flowsPath)).map((dir) => ({
+          ref: short,
+          dir,
+          primary: entry.primary
+        }));
       }
     };
     await Promise.all(Array.from({ length: Math.min(CONCURRENCY, refs.length) }, () => worker()));
@@ -57608,7 +57614,7 @@ tracker reporting.
 - \`keryx flow recover <id> --reason "<why>"\` (moves a flow stuck in
   \`completing\` back to \`in-progress\`)
 - \`keryx flow block|unblock <id>\` / \`flow check\` (duplicate ids, including a
-  number a known remote branch holds; warns about a flow folder that is not
+  number the default branch holds, warns about a number another remote branch holds and about a flow folder that is not
   committed) / \`flow renumber <dir> --to <id> --reason "<why>"\` (refuses an id a
   known remote branch uses)
 
@@ -58771,20 +58777,28 @@ function createFlowService(deps) {
           });
         }
       }
+      const warnings = [];
       const remoteDirs = await knownRemoteFlowDirs(cwd);
       if (remoteDirs.length > 0) {
         for (const dir of allDirs) {
-          const clash = remoteDirs.find((entry) => entry.dir !== dir && flowNumberOfDir(entry.dir) === Number(flowIdOf(dir)));
-          if (clash) {
+          const clashes = remoteDirs.filter((entry) => entry.dir !== dir && flowNumberOfDir(entry.dir) === Number(flowIdOf(dir)));
+          const primary = clashes.find((entry) => entry.primary);
+          const other = clashes[0];
+          if (primary) {
             issues.push({
               flow: dir,
               kind: "duplicate-id",
-              message: `flow id ${flowIdOf(dir)} is also used on ${clash.ref} by a different flow (${safeDirName(clash.dir)})` + ` \u2014 repair with: keryx flow renumber ${dir} --to <free id> --reason "<why>"`
+              message: `flow id ${flowIdOf(dir)} is also used on ${primary.ref} by a different flow (${safeDirName(primary.dir)})` + ` \u2014 repair with: keryx flow renumber ${dir} --to <free id> --reason "<why>"`
+            });
+          } else if (other) {
+            warnings.push({
+              flow: dir,
+              kind: "branch-duplicate-id",
+              message: `flow id ${flowIdOf(dir)} is also used on ${other.ref} by a different flow (${safeDirName(other.dir)});` + ` ignore it if that branch is stale, otherwise renumber one of them before it merges`
             });
           }
         }
       }
-      const warnings = [];
       const inHead = await flowFoldersInHead(cwd, allDirs).catch(() => {
         return null;
       });

package/dist/core.js

@@ -26318,14 +26318,15 @@ async function showPrefix(cwd) {
   }
   return result.stdout.trim();
 }
+function rankOfRef(ref, headTargets) {
+  if (/^refs\/remotes\/[^/]+\/(main|master)$/.test(ref)) {
+    return 0;
+  }
+  return headTargets.has(ref) ? 1 : 2;
+}
 function orderRemoteRefs(entries, max = MAX_REFS) {
   const headTargets = new Set(entries.map((entry) => entry.symref).filter((symref) => symref.length > 0));
-  const rank = (ref) => {
-    if (/^refs\/remotes\/[^/]+\/(main|master)$/.test(ref)) {
-      return 0;
-    }
-    return headTargets.has(ref) ? 1 : 2;
-  };
+  const rank = (ref) => rankOfRef(ref, headTargets);
   const candidates = entries.filter((entry) => entry.ref.startsWith("refs/remotes/") && !entry.ref.endsWith("/HEAD") && entry.symref === "").sort((a, b) => rank(a.ref) - rank(b.ref) || (a.ref < b.ref ? -1 : a.ref > b.ref ? 1 : 0));
   const seenTips = new Set;
   const refs = [];
@@ -26354,7 +26355,8 @@ async function remoteRefs(cwd) {
     }
     entries.push({ tip, ref, symref: symref ?? "" });
   }
-  return orderRemoteRefs(entries);
+  const headTargets = new Set(entries.map((entry) => entry.symref).filter((symref) => symref.length > 0));
+  return orderRemoteRefs(entries).map((ref) => ({ ref, primary: rankOfRef(ref, headTargets) < 2 }));
 }
 async function flowDirsOnRef(cwd, ref, flowsPath) {
   const result = await runGit2(cwd, ["ls-tree", "-z", "-d", "--name-only", "--full-tree", ref, "--", `${flowsPath}/`]);
@@ -26380,12 +26382,16 @@ async function knownRemoteFlowDirs(cwd) {
       while (next < refs.length) {
         const index = next;
         next += 1;
-        const ref = refs[index];
-        if (ref === undefined) {
+        const entry = refs[index];
+        if (entry === undefined) {
           continue;
         }
-        const short = ref.slice("refs/remotes/".length);
-        found[index] = (await flowDirsOnRef(cwd, ref, flowsPath)).map((dir) => ({ ref: short, dir }));
+        const short = entry.ref.slice("refs/remotes/".length);
+        found[index] = (await flowDirsOnRef(cwd, entry.ref, flowsPath)).map((dir) => ({
+          ref: short,
+          dir,
+          primary: entry.primary
+        }));
       }
     };
     await Promise.all(Array.from({ length: Math.min(CONCURRENCY, refs.length) }, () => worker()));
@@ -27373,20 +27379,28 @@ function createFlowService(deps) {
           });
         }
       }
+      const warnings = [];
       const remoteDirs = await knownRemoteFlowDirs(cwd);
       if (remoteDirs.length > 0) {
         for (const dir of allDirs) {
-          const clash = remoteDirs.find((entry) => entry.dir !== dir && flowNumberOfDir(entry.dir) === Number(flowIdOf(dir)));
-          if (clash) {
+          const clashes = remoteDirs.filter((entry) => entry.dir !== dir && flowNumberOfDir(entry.dir) === Number(flowIdOf(dir)));
+          const primary = clashes.find((entry) => entry.primary);
+          const other = clashes[0];
+          if (primary) {
             issues.push({
               flow: dir,
               kind: "duplicate-id",
-              message: `flow id ${flowIdOf(dir)} is also used on ${clash.ref} by a different flow (${safeDirName(clash.dir)})` + ` \u2014 repair with: keryx flow renumber ${dir} --to <free id> --reason "<why>"`
+              message: `flow id ${flowIdOf(dir)} is also used on ${primary.ref} by a different flow (${safeDirName(primary.dir)})` + ` \u2014 repair with: keryx flow renumber ${dir} --to <free id> --reason "<why>"`
+            });
+          } else if (other) {
+            warnings.push({
+              flow: dir,
+              kind: "branch-duplicate-id",
+              message: `flow id ${flowIdOf(dir)} is also used on ${other.ref} by a different flow (${safeDirName(other.dir)});` + ` ignore it if that branch is stale, otherwise renumber one of them before it merges`
             });
           }
         }
       }
-      const warnings = [];
       const inHead = await flowFoldersInHead(cwd, allDirs).catch(() => {
         return null;
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrciphersmith/keryx",
-  "version": "0.3.53",
+  "version": "0.3.54",
   "description": "Version-controlled project context for AI coding agents: code graph, architecture wiki, project memory, relevant tests, quality signals, and task flows.",
   "private": false,
   "publishConfig": {