@yemi33/minions 0.1.612 → 0.1.614

package/CHANGELOG.md

@@ -1,11 +1,13 @@
 # Changelog
 
-## 0.1.612 (2026-04-08)
+## 0.1.614 (2026-04-08)
 
 ### Features
 -  clickable pinned notes and skills with full content + doc-chat
 
 ### Fixes
+-  kill process holding worktree lock before removal attempt
+-  dedup worktree removal attempts, add Windows rd fallback
 -  accurate LLM call timing and agent metrics on engine page
 -  worktree count now checks for .git file instead of any directory
 

package/engine/cleanup.js

@@ -39,6 +39,44 @@ function worktreeDirMatchesBranch(dirLower, branch) {
   return dirLower === branchSlug || dirLower.includes(branchSlug + '-') || dirLower.endsWith('-' + branchSlug);
 }
 
+/**
+ * Kill any tracked or PID-filed process whose dispatch ID appears in the worktree dir name.
+ * Must run BEFORE removeWorktree so file handles are released on Windows.
+ */
+function _killProcessInWorktree(dir, activeProcesses) {
+  const dirLower = dir.toLowerCase();
+  // Check tracked active processes
+  for (const [id, info] of activeProcesses.entries()) {
+    if (dirLower.includes(id.toLowerCase().slice(-8))) {
+      try { shared.killImmediate(info.proc); } catch {}
+      activeProcesses.delete(id);
+    }
+  }
+  // Check PID files in engine/tmp/ — format: pid-{label}-{id}.pid
+  try {
+    const tmpDir = path.join(ENGINE_DIR, 'tmp');
+    for (const f of fs.readdirSync(tmpDir)) {
+      if (!f.startsWith('pid-') || !f.endsWith('.pid')) continue;
+      // Extract dispatch ID suffix from filename
+      const parts = f.replace(/^pid-/, '').replace(/\.pid$/, '').split('-');
+      const suffix = parts.slice(-1)[0];
+      if (suffix && dirLower.includes(suffix)) {
+        const pid = parseInt(fs.readFileSync(path.join(tmpDir, f), 'utf8').trim(), 10);
+        if (pid > 0) {
+          try {
+            if (process.platform === 'win32') {
+              exec(`taskkill /F /PID ${pid}`, { stdio: 'pipe', timeout: 5000, windowsHide: true });
+            } else {
+              process.kill(pid, 'SIGKILL');
+            }
+          } catch {} // process may already be dead
+        }
+        try { fs.unlinkSync(path.join(tmpDir, f)); } catch {}
+      }
+    }
+  } catch {} // tmp dir may not exist
+}
+
 // ─── Cleanup Orchestrator ────────────────────────────────────────────────────
 
 function runCleanup(config, verbose = false) {
@@ -105,6 +143,7 @@ function runCleanup(config, verbose = false) {
   }
 
   // 3. Clean git worktrees for merged/abandoned PRs
+  const _attemptedWorktreePaths = new Set(); // dedup across projects sharing a worktreeRoot
   for (const project of projects) {
     const root = project.localPath ? path.resolve(project.localPath) : null;
     if (!root || !fs.existsSync(root)) continue;
@@ -261,6 +300,10 @@ function runCleanup(config, verbose = false) {
             }
           }
 
+          if (_attemptedWorktreePaths.has(entry.wtPath)) continue;
+          _attemptedWorktreePaths.add(entry.wtPath);
+          // Kill any process still running in this worktree before removal
+          _killProcessInWorktree(entry.dir, activeProcesses);
           if (shared.removeWorktree(entry.wtPath, root, worktreeRoot)) {
             cleaned.worktrees++;
             if (verbose) console.log(`  Removed worktree: ${entry.wtPath}`);

package/engine/shared.js

@@ -824,11 +824,18 @@ function removeWorktree(wtPath, gitRoot, worktreeRoot) {
   } catch (gitErr) {
     try {
       fs.rmSync(resolved, { recursive: true, force: true });
-      // Also prune the stale worktree entry from git metadata
       try { exec('git worktree prune', { cwd: gitRoot, stdio: 'pipe', timeout: 10000, windowsHide: true }); } catch {}
       return true;
     } catch (rmErr) {
-      log('warn', `removeWorktree: both git and rm failed for ${wtPath}: ${rmErr.message}`);
+      // Windows EPERM: a process may hold file handles — try rd /s /q as fallback
+      if (process.platform === 'win32' && rmErr.code === 'EPERM') {
+        try {
+          exec(`rd /s /q "${resolved}"`, { stdio: 'pipe', timeout: 15000, windowsHide: true });
+          try { exec('git worktree prune', { cwd: gitRoot, stdio: 'pipe', timeout: 10000, windowsHide: true }); } catch {}
+          return true;
+        } catch {}
+      }
+      log('warn', `removeWorktree: failed for ${wtPath}: ${rmErr.message}`);
       return false;
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yemi33/minions",
-  "version": "0.1.612",
+  "version": "0.1.614",
   "description": "Multi-agent AI dev team that runs from ~/.minions/ — five autonomous agents share a single engine, dashboard, and knowledge base",
   "bin": {
     "minions": "bin/minions.js"