@gethmy/harness 1.2.0 → 1.2.1

package/dist/cli.js

@@ -81,6 +81,11 @@ var init_constants = __esm(() => {
     QUERY_GC_TIME: 1000 * 60 * 60 * 24
   };
 });
+// ../harmony-shared/dist/fanoutSource.js
+var FANOUT_KEY_MARKER = "harmony:fanout-item", FANOUT_KEY_RE;
+var init_fanoutSource = __esm(() => {
+  FANOUT_KEY_RE = new RegExp(`^\\[${FANOUT_KEY_MARKER}\\]:\\s*#(\\S+)\\s*$`, "m");
+});
 // ../harmony-shared/dist/gateConfigError.js
 function gateConfigErrorReason(evaluation) {
   if (!evaluation || evaluation.passed)
@@ -496,6 +501,7 @@ var init_dist = __esm(() => {
   init_columnSort();
   init_commentSerializer();
   init_constants();
+  init_fanoutSource();
   init_gateConfigError();
   init_gateEvaluate();
   init_logger();

package/dist/index.js

@@ -164,6 +164,11 @@ var init_constants = __esm(() => {
     QUERY_GC_TIME: 1000 * 60 * 60 * 24
   };
 });
+// ../harmony-shared/dist/fanoutSource.js
+var FANOUT_KEY_MARKER = "harmony:fanout-item", FANOUT_KEY_RE;
+var init_fanoutSource = __esm(() => {
+  FANOUT_KEY_RE = new RegExp(`^\\[${FANOUT_KEY_MARKER}\\]:\\s*#(\\S+)\\s*$`, "m");
+});
 // ../harmony-shared/dist/gateConfigError.js
 function gateConfigErrorReason(evaluation) {
   if (!evaluation || evaluation.passed)
@@ -579,6 +584,7 @@ var init_dist = __esm(() => {
   init_columnSort();
   init_commentSerializer();
   init_constants();
+  init_fanoutSource();
   init_gateConfigError();
   init_gateEvaluate();
   init_logger();
@@ -3647,7 +3653,7 @@ async function runStage(request, deps) {
 // src/worktree.ts
 init_log();
 import { execFileSync as execFileSync7, execSync } from "node:child_process";
-import { existsSync as existsSync3, rmSync } from "node:fs";
+import { existsSync as existsSync3, readdirSync as readdirSync2, rmSync } from "node:fs";
 import { resolve as resolve3 } from "node:path";
 var TAG13 = "worktree";
 
@@ -3781,11 +3787,25 @@ function createWorktree(basePath, baseBranch, branchName, opts = {}) {
   }
   return worktreeDir;
 }
+function containsForeignWorktrees(dir) {
+  if (existsSync3(resolve3(dir, ".git")))
+    return false;
+  let children;
+  try {
+    children = readdirSync2(dir);
+  } catch {
+    return false;
+  }
+  return children.some((child) => existsSync3(resolve3(dir, child, ".git")));
+}
 function cleanupWorktree(worktreePath, branchName) {
   const repoRoot = execFileSync7("git", ["rev-parse", "--show-toplevel"], {
     encoding: "utf-8"
   }).trim();
   if (existsSync3(worktreePath)) {
+    if (containsForeignWorktrees(worktreePath)) {
+      throw new Error(`Refusing to remove ${worktreePath}: it is not a git worktree itself, ` + `but git worktrees live directly beneath it. Removing it would ` + `destroy them — pass the individual worktree paths instead (#928).`);
+    }
     try {
       execFileSync7("git", ["worktree", "remove", worktreePath, "--force"], {
         cwd: repoRoot,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gethmy/harness",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Execution motor for Harmony playbook stages. Runs exactly one stage per invocation: worktree, role-separated subagents, held oracle, gate evidence. It never routes, never judges, never pushes.",
   "type": "module",
   "main": "dist/index.js",

package/src/worktree.ts

@@ -1,5 +1,5 @@
 import { execFileSync, execSync } from "node:child_process";
-import { existsSync, rmSync } from "node:fs";
+import { existsSync, readdirSync, rmSync } from "node:fs";
 import { resolve } from "node:path";
 import { log } from "./log.js";
 import { installCommand } from "./pm.js";
@@ -356,6 +356,25 @@ export function createWorktree(
   return worktreeDir;
 }
 
+/**
+ * True when `dir` is not itself a git worktree or repository (no `.git`
+ * entry) while a direct child directory carries one — i.e. `dir` is a
+ * CONTAINER of worktrees, like `.harmony-worktrees/agent-attempts/`.
+ * Force-removing such a directory destroys every worktree beneath it, live
+ * runs included (#928), so `cleanupWorktree` refuses it outright instead of
+ * escalating to `rmSync`.
+ */
+function containsForeignWorktrees(dir: string): boolean {
+  if (existsSync(resolve(dir, ".git"))) return false;
+  let children: string[];
+  try {
+    children = readdirSync(dir);
+  } catch {
+    return false;
+  }
+  return children.some((child) => existsSync(resolve(dir, child, ".git")));
+}
+
 /**
  * Remove a git worktree and its branch.
  */
@@ -368,6 +387,16 @@ export function cleanupWorktree(
   }).trim();
 
   if (existsSync(worktreePath)) {
+    // Never escalate on a container: `git worktree remove` would fail on it
+    // (it is not a worktree), and the old rmSync fallback then deleted every
+    // worktree underneath — including live ones with uncommitted work (#928).
+    if (containsForeignWorktrees(worktreePath)) {
+      throw new Error(
+        `Refusing to remove ${worktreePath}: it is not a git worktree itself, ` +
+          `but git worktrees live directly beneath it. Removing it would ` +
+          `destroy them — pass the individual worktree paths instead (#928).`,
+      );
+    }
     try {
       execFileSync("git", ["worktree", "remove", worktreePath, "--force"], {
         cwd: repoRoot,