@gaia-ai/addon-herdr 0.11.5 → 0.13.0

package/dist/src/index.js

@@ -515,6 +515,27 @@ export class HerdrExecutor {
      * flagging it cleaned (GAIA-141 RC-2).
      */
     async removeWorktree(branch, worktreePath) {
+        // GAIA-468 / GAIA-228 (superseded MR !258, trigger folded in here): a
+        // ticket whose recorded `worktreePath` IS the configured parent-repo root
+        // must be refused rather than acted on. GAIA-293 already excludes the main
+        // checkout on the git side (`findGitWorktree` drops porcelain record 0 and
+        // the configured root), but neither `resolveWorktreeEntry` (herdr-tracked
+        // path) nor the probe fallback below carried the same filter, leaving two
+        // live branches: herdr tracks the workspace → `herdr worktree remove
+        // --force` throws `not_linked_worktree`, caught by the reaper and retried
+        // forever; herdr does NOT track it → the probe resolves `worktreePath`
+        // itself (unfiltered), `registered: false`, `onDisk: true`, and
+        // `gitAwareRemove` calls `forceRemoveDir` on the MAIN CHECKOUT. Refusing
+        // here, before either branch is reached, closes both without touching the
+        // git-side exclusion or the executor's `unverified`/`already_absent`
+        // contract for every other path.
+        if (this.options.root && worktreePath) {
+            const root = normPath(this.options.root);
+            if (normPath(worktreePath) === root) {
+                this.logger.warn({ branch, worktreePath, root: this.options.root }, 'refusing to tear down the main checkout');
+                return 'unverified';
+            }
+        }
         const entries = await this.listWorktrees();
         const entry = resolveWorktreeEntry(entries, branch, worktreePath);
         if (!entry) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gaia-ai/addon-herdr",
-  "version": "0.11.5",
+  "version": "0.13.0",
   "description": "GAIA herdr integration: spawn executor + per-ticket worktree workspace.",
   "type": "module",
   "license": "MIT",
@@ -20,10 +20,10 @@
     "directory": "gaia-cli/addons/herdr"
   },
   "dependencies": {
-    "@gaia-ai/addon-workspace-git": "^0.11.5"
+    "@gaia-ai/addon-workspace-git": "^0.13.0"
   },
   "peerDependencies": {
-    "@gaia-ai/conductor": "^0.11.5",
-    "@gaia-ai/core": "^0.11.5"
+    "@gaia-ai/conductor": "^0.13.0",
+    "@gaia-ai/core": "^0.13.0"
   }
 }