@yemi33/minions 0.1.2286 → 0.1.2287

package/engine.js

@@ -849,6 +849,7 @@ async function findExistingWorktree(repoDir, branchName) {
 }
 
 function isWorktreeRetryableError(err) {
+  if (err?._incompleteCheckout) return true;
   const msg = String(err?.message || '');
   return msg.includes('ETIMEDOUT')
     || msg.includes('index.lock')
@@ -957,6 +958,29 @@ async function runWorktreeAdd(rootDir, worktreePath, addArgs, gitOpts, worktreeC
         log('warn', `Retrying git worktree add (attempt ${attempt + 1}/${retries + 1}) for ${path.basename(worktreePath)}`);
       }
       await shared.shellSafeGit(['worktree', 'add', worktreePath, ...addArgs], { ...gitOpts, cwd: rootDir });
+      // W-mqvaxv65000m76f2 (issue #430, Layer 1) — GVFS partial-checkout guard.
+      // On large GVFS repos (e.g. 1JS with 296K files), `git worktree add`
+      // exits cleanly but only writes a .git file — no source files are checked
+      // out. The engine would otherwise treat the empty worktree as valid for
+      // reuse; the subsequent `git status` preflight fails (nothing to stat) and
+      // the dispatch loop recurs. Detect the empty checkout and throw a retriable
+      // error so the retry loop re-creates the worktree on the next attempt.
+      let worktreeEntries;
+      try { worktreeEntries = fs.readdirSync(worktreePath).filter(e => e !== '.git'); }
+      catch { worktreeEntries = null; } // If the read fails, skip the check — don't block normal cases.
+      if (worktreeEntries !== null && worktreeEntries.length === 0) {
+        log('warn', `runWorktreeAdd: GVFS partial checkout detected at ${worktreePath} (only .git written) — removing and retrying`);
+        try {
+          await shared.shellSafeGit(['worktree', 'remove', '--force', worktreePath], { ...gitOpts, cwd: rootDir, timeout: 30000 });
+        } catch (rmErr) {
+          log('warn', `runWorktreeAdd: worktree remove after partial checkout failed (${rmErr.message}) — falling back to fs-level cleanup`);
+          try { fs.rmSync(worktreePath, { recursive: true, force: true }); } catch {}
+          try { await shared.shellSafeGit(['worktree', 'prune'], { ...gitOpts, cwd: rootDir, timeout: 15000 }); } catch {}
+        }
+        const incompleteErr = new Error(`GVFS incomplete checkout at ${worktreePath}: worktree add exited cleanly but no source files were checked out (only .git was written). Retriable.`);
+        incompleteErr._incompleteCheckout = true;
+        throw incompleteErr;
+      }
       // W-mqecdoot — stamp the engine ownership marker so the out-of-root
       // worktree GC can distinguish a worktree we created from one a human
       // developer made by hand. Best-effort; never blocks the spawn.
@@ -5992,8 +6016,10 @@ function materializePlansAsWorkItems(config) {
   let planFiles;
   try { planFiles = fs.readdirSync(PRD_DIR).filter(f => f.endsWith('.json')); } catch { return; }
 
-  // Regex for detecting sequential PRD item IDs (P-001, P-002) — hoisted outside loop
-  const SEQUENTIAL_ID_RE = /^P-?\d+$/;
+  // Regex for detecting sequential PRD item IDs (P-001, M001, M-001, WI-001, …) — hoisted outside loop.
+  // Covers all patterns where an alphabetic prefix is followed by an optional dash and pure digits,
+  // e.g. P001, P-001, M001, M-001, WI-001. Does NOT match hex UUIDs like P-a3f9b2c1.
+  const SEQUENTIAL_ID_RE = /^[A-Za-z]+-?\d+$/;
 
   for (let file of planFiles) {
     // safeJsonNoRestore — if a PRD was archived between readdir and this
@@ -6211,7 +6237,9 @@ function materializePlansAsWorkItems(config) {
       mutateWorkItems(wiPath, existingItems => {
         for (const item of projItems) {
           // Re-open: 'updated' or 'missing' re-opens a done work item (#906)
-          const existingWi = existingItems.find(w => w.id === item.id);
+          // Use composite (sourcePlan, id) key so a WI from another PRD with the
+          // same id is not treated as already-materialized for this PRD.
+          const existingWi = existingItems.find(w => w.id === item.id && w.sourcePlan === file);
           const shouldReopen = item.status === PRD_ITEM_STATUS.UPDATED || item.status === PRD_ITEM_STATUS.MISSING;
           if (existingWi && DONE_STATUSES.has(existingWi.status) && shouldReopen) {
             shared.reopenWorkItem(existingWi);
@@ -6222,13 +6250,14 @@ function materializePlansAsWorkItems(config) {
             continue;
           }
 
-          // Skip if already materialized — work item ID = PRD item ID, check all projects
+          // Skip if already materialized — use composite (sourcePlan, id) key to prevent
+          // cross-PRD collision when two plans share the same item id (W-mqv6ql5w001w792f).
           let alreadyExists = !!existingWi;
           if (!alreadyExists) {
             for (const p of allProjects) {
               if (String(p.name || '').toLowerCase() === String(projName || '').toLowerCase()) continue;
               const otherItems = safeJsonArr(projectWorkItemsPath(p));
-              const otherWi = otherItems.find(w => w.id === item.id);
+              const otherWi = otherItems.find(w => w.id === item.id && w.sourcePlan === file);
               if (otherWi) {
                 if (DONE_STATUSES.has(otherWi.status) && shouldReopen) {
                   deferredReopens.push({ itemId: item.id, projectName: p.name, item });
@@ -8510,7 +8539,7 @@ function discoverCentralWorkItems(config) {
     const itemProjectResolution = shared.resolveConfiguredProject(item.project, projects);
     if (itemProjectResolution.error) {
       const error = itemProjectResolution.error;
-      mutations.set(item.id, { status: WI_STATUS.FAILED, failReason: error, failedAt: ts() });
+      mutations.set(item.id, { status: WI_STATUS.FAILED, failReason: error, failedAt: ts(), _failureClass: FAILURE_CLASS.PROJECT_NOT_FOUND });
       log('warn', `central work item ${item.id}: ${error}`);
       continue;
     }
@@ -8648,6 +8677,7 @@ function discoverCentralWorkItems(config) {
           status: WI_STATUS.FAILED,
           failReason: error,
           failedAt: ts(),
+          _failureClass: FAILURE_CLASS.PROJECT_NOT_FOUND,
           ...(declaredPlanProject ? { _declaredPlanProject: declaredPlanProject, _declaredPlanProjectMissing: true } : {}),
         });
         log('warn', `central work item ${item.id}: ${error}`);
@@ -8661,6 +8691,7 @@ function discoverCentralWorkItems(config) {
           status: WI_STATUS.FAILED,
           failReason: crossRepoFallbackError,
           failedAt: ts(),
+          _failureClass: FAILURE_CLASS.PROJECT_NOT_FOUND,
           _crossRepoTargetProjects: planTargetProjects.slice(),
         });
         log('warn', `central work item ${item.id} (cross-repo plan-to-prd): ${crossRepoFallbackError}`);
@@ -10288,12 +10319,15 @@ async function tickInner() {
       } else {
         // P-a3f9b205: surface the per-project live-mode gate. Order matters:
         // max_concurrency / agent_busy / branch_locked are all more specific
-        // and win when both apply.
+        // and win when both apply. Also check the pending item's own resolved
+        // checkout mode so worktree-mode items on hybrid projects are not
+        // falsely annotated live_checkout_busy (mirrors seeding guard above).
         const itemProjName = item.project || item.meta?.project?.name || null;
         if (
           itemProjName
           && !READ_ONLY_ROOT_TASK_TYPES.has(item.type)
           && postLiveProjectsInUse.has(itemProjName)
+          && shared.resolveCheckoutMode(shared.findProjectByName(shared.getProjects(config), itemProjName), item.type) === 'live'
         ) {
           reason = 'live_checkout_busy';
         }
@@ -10490,6 +10524,7 @@ module.exports = {
   resolveDependencyBranches, buildCrossRepoDepsSection, // exported for testing (P-faea3206)
   gitOutputToString, gitErrorOutput, classifyDepMergeFailureOutput, listUnmergedFiles, // exported for testing
   buildDepConflictFixItem, deriveConflictFixKey, // exported for testing (W-mpcwojgr000a0244)
+  runWorktreeAdd, // exported for testing (W-mqvaxv65000m76f2 — GVFS partial-checkout behavioral test)
   isWorktreeRetryableError, removeStaleIndexLock, syncReusedWorktree, assertCleanSharedWorktree, _quarantineDirtyWorktree, // exported for testing
   _statusPorcelainCmd, _killGitDescendantsForWorktree, _bumpQuarantineOutcome, // exported for testing (W-mq5n1zx5)
   _reapWorktreeHolders, _findTerminalWorktreeOwners, // exported for testing (W-mqila0t5 — CWD-pinned holder reap)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yemi33/minions",
-  "version": "0.1.2286",
+  "version": "0.1.2287",
   "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"