@yemi33/minions 0.1.1985 → 0.1.1986

package/engine.js

@@ -586,7 +586,16 @@ async function syncReusedWorktree(rootDir, worktreePath, branchName, gitOpts = {
 async function findExistingWorktree(repoDir, branchName) {
   try {
     const out = await shared.shellSafeGit(['worktree', 'list', '--porcelain'], { cwd: repoDir, timeout: 10000 });
-    const found = shared.parseWorktreePorcelain(out).find(w => w.branch === branchName);
+    // Skip worktrees at or inside `repoDir` itself: the main checkout (always
+    // first in the porcelain output) sits AT repoDir, and nested worktrees
+    // under it would trip assertWorktreeOutsideProject downstream anyway.
+    // Returning either as "reusable" creates an unresolvable preflight
+    // rejection loop when the branch happens to be checked out at the
+    // project root (common when an operator works on the minions repo
+    // locally while the engine tries to review that same branch).
+    const found = shared.parseWorktreePorcelain(out).find(w =>
+      w.branch === branchName && !shared.isPathInsideOrEqual(w.path, repoDir)
+    );
     if (found && fs.existsSync(found.path)) return found.path;
   } catch (e) { log('warn', 'git: ' + e.message); }
   return null;
@@ -926,14 +935,34 @@ async function spawnAgent(dispatchItem, config) {
       : taskPromptWithReport;
   };
   let fullTaskPrompt = buildFullTaskPrompt(taskPrompt);
-  const tmpDir = path.join(ENGINE_DIR, 'tmp');
-  if (!fs.existsSync(tmpDir)) fs.mkdirSync(tmpDir, { recursive: true });
   const safeId = id.replace(/[:\\/*?"<>|]/g, '-');
-  const promptPath = path.join(tmpDir, `prompt-${safeId}.md`);
+  // P-f6-tmp-toctou: per-dispatch unique tmp dir closes the symlink-plant
+  // window on engine/tmp/prompt-<id>.md (mkdtempSync + chmod 0o700). Filename
+  // pattern inside the dir is unchanged so spawn-agent.js's prompt→pid regex
+  // derivation still works.
+  const dispatchTmpDir = shared.createDispatchTmpDir(id);
+  const promptPath = path.join(dispatchTmpDir, `prompt-${safeId}.md`);
   safeWrite(promptPath, fullTaskPrompt);
-  const sysPromptPath = path.join(tmpDir, `sysprompt-${safeId}.md`);
+  const sysPromptPath = path.join(dispatchTmpDir, `sysprompt-${safeId}.md`);
   safeWrite(sysPromptPath, systemPrompt);
-  const _cleanupPromptFiles = () => { safeUnlink(promptPath); safeUnlink(sysPromptPath); };
+  // Stamp the tmpDir on the dispatch entry so cleanup/orphan-reap/kill paths
+  // (dispatch.js, meeting.js, cli.js, cleanup.js, timeout.js) can find the
+  // dir via shared.dispatchPidCandidates / findDispatchPidFile. Best-effort —
+  // backward-compat fallbacks still scan dispatch-<safeId>-* dirs by id.
+  try {
+    dispatchItem.tmpDir = dispatchTmpDir;
+    const dispatchPath = path.join(MINIONS_DIR, 'engine', 'dispatch.json');
+    mutateJsonFileLocked(dispatchPath, (dispatch) => {
+      for (const queue of ['pending', 'active', 'completed']) {
+        const arr = Array.isArray(dispatch?.[queue]) ? dispatch[queue] : null;
+        if (!arr) continue;
+        const found = arr.find(d => d && d.id === id);
+        if (found) found.tmpDir = dispatchTmpDir;
+      }
+      return dispatch;
+    }, { defaultValue: { pending: [], active: [], completed: [] } });
+  } catch (e) { log('warn', `spawnAgent: failed to persist tmpDir for ${id}: ${e.message}`); }
+  const _cleanupPromptFiles = () => { shared.removeDispatchTmpDir(dispatchTmpDir); };
   // Convert a WORKTREE_NESTED_IN_PROJECT throw into a fail-fast non-retryable
   // dispatch failure (W-mp62taw2000ubcc3). The error's `.code` is set by
   // shared.assertWorktreeOutsideProject so we don't have to parse the message.
@@ -1834,6 +1863,9 @@ async function spawnAgent(dispatchItem, config) {
     if (pidFilePath) {
       try { safeUnlink(pidFilePath); } catch { /* may not exist yet */ }
     }
+    // P-f6-tmp-toctou: rm the per-dispatch tmp dir too so prompt/sysprompt
+    // sidecars don't leak when runFile throws before onAgentClose can run.
+    try { _cleanupPromptFiles(); } catch { /* cleanup is best-effort */ }
     cleanupTempAgent(agentId);
     throw spawnErr;
   }
@@ -1974,7 +2006,7 @@ async function spawnAgent(dispatchItem, config) {
       const pendingForResume = steering.buildPendingSteeringPrompt(agentId);
       const steerPromptBody = pendingForResume.prompt || steerMsg;
       const steerPrompt = `Message from your human teammate:\n\n${steerPromptBody}\n\nRespond to this, then continue working on your current task.`;
-      const steerPromptPath = path.join(ENGINE_DIR, 'tmp', `prompt-steer-${safeId}.md`);
+      const steerPromptPath = path.join(dispatchTmpDir, `prompt-steer-${safeId}.md`);
       try { safeWrite(steerPromptPath, steerPrompt); } catch (e) {
         log('warn', `Steering: failed to write prompt for ${agentId}: ${e.message}`);
         try { fs.appendFileSync(liveOutputPath, `\n[steering-failed] Could not write prompt. Message was: ${steerMsg}\n`); } catch {}
@@ -2832,10 +2864,11 @@ async function spawnAgent(dispatchItem, config) {
       } catch (e) { log('warn', `keep-processes acceptance: failed to set _pendingReason: ${e.message}`); }
     }
 
-    // Cleanup temp files (including PID file now that dispatch is complete)
-    try { fs.unlinkSync(sysPromptPath); } catch { /* cleanup */ }
-    try { fs.unlinkSync(promptPath); } catch { /* cleanup */ }
-    try { fs.unlinkSync(promptPath.replace(/prompt-/, 'pid-').replace(/\.md$/, '.pid')); } catch { /* cleanup */ }
+    // Cleanup temp files (whole per-dispatch dir, including PID/sysprompt
+    // tmp/prompt — P-f6-tmp-toctou). removeDispatchTmpDir validates the path
+    // resolves under engine/tmp/dispatch-* before rmSync, so a corrupted
+    // dispatch.json field can't redirect this to an arbitrary path.
+    try { shared.removeDispatchTmpDir(dispatchTmpDir); } catch { /* cleanup */ }
 
     log('info', `Agent ${agentId} completed. Output saved to ${archivePath}`);
 
@@ -5028,10 +5061,19 @@ function materializeSpecsAsWorkItems(config, project) {
   let recentSpecs = [];
   for (const pattern of filePatterns) {
     try {
-      const result = exec(
-        `git log --diff-filter=AM --name-only --pretty=format:"COMMIT:%H|%s" --since="${sinceDate}" -- "${pattern}"`,
-        { cwd: root, encoding: 'utf8', timeout: 10000 }
-      ).trim();
+      // P-f7-git-log: argv form via execFileSync (shell:false) so file patterns
+      // from operator config.json reach git as literal pathspec args, never as
+      // shell tokens. Spread the pattern after the '--' pathspec separator.
+      const args = [
+        'log',
+        '--diff-filter=AM',
+        '--name-only',
+        '--pretty=format:COMMIT:%H|%s',
+        `--since=${sinceDate}`,
+        '--',
+        pattern,
+      ];
+      const result = shared.shellSafeGitSync(args, { cwd: root, timeout: 10000 }).trim();
       if (!result) continue;
 
       let currentCommit = null;
@@ -6539,6 +6581,7 @@ module.exports = {
   // Discovery
   discoverWork, discoverFromPrs, discoverFromWorkItems, discoverCentralWorkItems,
   materializePlansAsWorkItems,
+  materializeSpecsAsWorkItems, // exported for testing (P-f7-git-log)
   reservePrdFilename, // exported for testing (P-9b7e5d3c)
   sweepStaleArchivedPrdBackups, // exported for testing
 
@@ -6548,6 +6591,7 @@ module.exports = {
   buildDepConflictFixItem, // exported for testing (W-mpcwojgr000a0244)
   isWorktreeRetryableError, removeStaleIndexLock, syncReusedWorktree, assertCleanSharedWorktree, // exported for testing
   pruneStaleWorktreeForBranch, // exported for testing
+  findExistingWorktree, // exported for testing
   _maxTurnsForType, buildProjectContext, normalizeAc, _buildAgentSpawnFlags, _classifyAgentFailure, // exported for testing
   promoteCheckpointSteeringForClose, // exported for testing
   normalizePrBranch, resolvePrBranch, prCausePart, getPrCauseHead, getPrCauseBase, getPrAutomationCauseKey, getPrAutomationDispatchKey, // exported for testing

package/package.json

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