halfcycle 0.13.0-rc.1 → 0.13.0-rc.2

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "halfcycle",
-  "version": "0.13.0-rc.1",
+  "version": "0.13.0-rc.2",
   "description": "Halfcycle Method bundle — resolution-stub slash commands, remote method-delivery registration, and governance-hook wiring for a Halfcycle engagement repo. It ships NO worker role files: a project's roles are authored from that project's own recorded decisions at orchestration kickoff (FX-2, W3-F-27).",
   "commands": [
     {

package/dist/cli.js

@@ -11849,12 +11849,14 @@ function tidy(projectDir) {
     if (!existsSync7(at))
       continue;
     const shown2 = relative2(root, at).split(sep).join("/");
-    if (tree.locked || holdsWork(at)) {
+    const held = tree.locked ? "work" : holdsWork(at, mainPath);
+    if (held === "work") {
       kept.push(shown2);
       continue;
     }
     clearCaches(at, at);
-    if (!git2(root, ["worktree", "remove", at]).ok) {
+    const remove = held === "duplicates" ? ["worktree", "remove", "--force", at] : ["worktree", "remove", at];
+    if (!git2(root, remove).ok) {
       kept.push(shown2);
       continue;
     }
@@ -11902,23 +11904,53 @@ function parseWorktrees(porcelain) {
   }
   return trees;
 }
-function holdsWork(copyDir) {
+function holdsWork(copyDir, mainDir) {
   const status = git2(copyDir, ["status", "--porcelain", "-z", "--untracked-files=all"]);
   if (!status.ok)
-    return true;
+    return "work";
+  let duplicates = false;
   const fields = status.out.split("\0");
   for (let i = 0; i < fields.length; i += 1) {
     const field = fields[i];
     if (field === "")
       continue;
     const code = field.slice(0, 2);
-    if (code !== "??")
-      return true;
     const path = field.slice(3);
-    if (!path.split("/").some((segment) => CACHE_NAMES.has(segment)))
-      return true;
+    if (code === "??" && path.split("/").some((segment) => CACHE_NAMES.has(segment)))
+      continue;
+    if (code !== "??" && code !== " M" && code !== "M " && code !== "A ")
+      return "work";
+    if (!duplicatesMain(copyDir, mainDir, path))
+      return "work";
+    duplicates = true;
   }
-  return false;
+  return duplicates ? "duplicates" : "clean";
+}
+function duplicatesMain(copyDir, mainDir, path) {
+  if (path === "" || path.endsWith("/"))
+    return false;
+  let executable;
+  try {
+    const entry = lstatSync2(join9(copyDir, ...path.split("/")));
+    if (!entry.isFile())
+      return false;
+    executable = (entry.mode & 64) !== 0;
+  } catch {
+    return false;
+  }
+  const listed = git2(mainDir, ["--literal-pathspecs", "ls-tree", "-z", "--full-tree", "HEAD", "--", path]);
+  if (!listed.ok)
+    return false;
+  const entries = listed.out.split("\0").filter((entry) => entry !== "");
+  if (entries.length !== 1)
+    return false;
+  const match = /^(100644|100755) blob ([0-9a-f]+)\t([\s\S]*)$/.exec(entries[0]);
+  if (match === null || match[3] !== path)
+    return false;
+  if (process.platform !== "win32" && executable !== (match[1] === "100755"))
+    return false;
+  const hashed = git2(copyDir, ["hash-object", "--no-filters", "--", path]);
+  return hashed.ok && hashed.out.trim() === match[2];
 }
 function clearCaches(copyDir, dir) {
   let names;