@yemi33/minions 0.1.2424 → 0.1.2426

package/engine/spawn-agent.js

@@ -33,7 +33,7 @@
 
 const fs = require('fs');
 const path = require('path');
-const { runFile, cleanChildEnv, killGracefully, killImmediate, killByPidsImmediate, listProcessDescendants, ts, readFileNoFollow } = require('./shared');
+const { runFile, cleanChildEnv, killImmediate, killByPidsImmediate, listProcessDescendants, ts, readFileNoFollow } = require('./shared');
 const {
   resolveRuntime,
   RUNTIME_OPTIONS_FLAG,
@@ -80,9 +80,15 @@ function parseSpawnArgs(argv) {
       case '--no-verbose':                 opts.verbose = false; break;
       case '--stream':                     opts.stream = peek(); break;
       case '--disable-builtin-mcps':       opts.disableBuiltinMcps = true; break;
-      case '--no-custom-instructions':     opts.suppressAgentsMd = true; break;
       case '--enable-reasoning-summaries': opts.reasoningSummaries = true; break;
       case RUNTIME_OPTIONS_FLAG:           Object.assign(opts, decodeRuntimeOptions(peek())); break;
+      // P-mcp-storm — repeatable; accumulate user MCP server names to disable.
+      // copilot.buildArgs re-emits these as --disable-mcp-server <name> on the CLI.
+      case '--disable-mcp-server': {
+        const v = peek();
+        if (typeof v === 'string' && v) (opts.disabledMcpServers ||= []).push(v);
+        break;
+      }
       // LEGACY: dropped — the runtime adapter emits its own permission flag.
       // Pre-P-2a6d9c4f engine.js still passes `--permission-mode bypassPermissions`;
       // letting it through would duplicate the permission flag for Claude.
@@ -129,6 +135,24 @@ function buildSpawnInvocation({ runtime, resolved, promptText, sysPromptText, op
   };
 }
 
+function deliverPromptToStdin(stdin, prompt, onError) {
+  let settled = false;
+  const fail = (err) => {
+    if (settled) return;
+    settled = true;
+    onError(err);
+  };
+  stdin.on('error', fail); // Keep consuming late EPIPE/EOF events after end() settles.
+  try {
+    stdin.end(prompt, (err) => {
+      if (err) fail(err);
+      else settled = true;
+    });
+  } catch (err) {
+    fail(err);
+  }
+}
+
 function normalizeRuntimeExit(code, signal) {
   if (Number.isInteger(code)) return code;
   if (signal) return 128;
@@ -605,15 +629,12 @@ function main() {
 
   // Deliver the prompt — stdin (Claude default) vs argv (handled by adapter).
   if (invocation.deliveryMode === 'stdin') {
-    try {
-      proc.stdin.write(invocation.finalPrompt);
-      proc.stdin.end();
-    } catch (err) {
-      console.error(`FATAL: stdin write failed (broken pipe): ${err.message}`);
-      fs.appendFileSync(debugPath, `STDIN ERROR: ${err.message}\n`);
+    deliverPromptToStdin(proc.stdin, invocation.finalPrompt, (err) => {
+      console.error(`FATAL: child startup stdin delivery failed (${err.code || 'error'}): ${err.message}`);
+      fs.appendFileSync(debugPath, `STDIN ERROR (${err.code || 'error'}): ${err.message}\n`);
       killImmediate(proc);
       process.exit(1);
-    }
+    });
   } else {
     // Adapter has already spliced the prompt into argv (--prompt <text>).
     // Close stdin so the runtime doesn't wait on it.
@@ -651,18 +672,24 @@ function main() {
   // Forward output without depending on the parent engine pipe staying alive.
   proc.stdout.on('data', forwardStdout);
 
-  // MCP startup timeout: kill if no stdout within 3 minutes
-  const MCP_STARTUP_TIMEOUT = 180000; // 3 minutes
+  // NO stdout-only startup timer. A productive runtime (Copilot in particular)
+  // can legitimately emit zero stdout until it writes its terminal result, so a
+  // "no output after Ns → kill" timer produces false TIMEOUT failures on agents
+  // that are actively working (incident: ralph-fix-mrz8ka5g0015124a pushed merge
+  // commit 8b0e6ff1 and wrote a nonce-valid success report, yet the 180s timer's
+  // killGracefully forced result:error). Startup-stall detection is owned by the
+  // engine-side spawn-phase watchdog (engine/spawn-phase-watchdog.js), which
+  // distinguishes a genuinely wedged pre-task process (idle, no live-output task
+  // activity, CPU below threshold past the grace window) from a productive-but-
+  // silent one (burning CPU) — preserving the invariant that a live tracked agent
+  // is never killed merely for output silence.
+  //
+  // We still note the first stdout chunk: the close handler uses `gotFirstOutput`
+  // as a heuristic to force a final descendant snapshot for agents that produced
+  // output (and thus likely spawned MCP children) even when the 3s initial
+  // snapshot missed them. This is a bookkeeping flag, not a timer.
   let gotFirstOutput = false;
-  const startupTimer = setTimeout(() => {
-    if (!gotFirstOutput) {
-      const msg = `TIMEOUT: ${runtimeName} CLI produced no output after ${MCP_STARTUP_TIMEOUT / 1000}s (likely MCP server startup stall)`;
-      console.error(msg);
-      fs.appendFileSync(debugPath, msg + '\n');
-      killGracefully(proc);
-    }
-  }, MCP_STARTUP_TIMEOUT);
-  proc.stdout.once('data', () => { gotFirstOutput = true; clearTimeout(startupTimer); });
+  proc.stdout.once('data', () => { gotFirstOutput = true; });
 
   // Descendant snapshot loop (orphan-MCP fix). The runtime CLI (claude/copilot)
   // spawns one node child per configured MCP server (Azure, Playwright, Loop,
@@ -705,7 +732,6 @@ function main() {
     if (signal) realSignalFromEvent = signal;
   });
   proc.on('close', (code, signal) => {
-    clearTimeout(startupTimer);
     clearTimeout(initialSnapshotTimer);
     clearInterval(descTimer);
 
@@ -823,6 +849,7 @@ module.exports = {
   writeProcessExitSentinel,
   preApproveWorkspaceMcps,
   createParentPipeForwarder,
+  deliverPromptToStdin, // exported for testing
   assertStaleHeadOk,
   hydrateRuntimeOptionFiles, // exported for testing
 };

package/engine/steering-constraints.js

@@ -0,0 +1,31 @@
+'use strict';
+
+const SCOPE = Object.freeze({
+  AGENT: 'agent',
+  CURRENT_DISPATCH: 'current-dispatch',
+});
+
+const SUPERSEDE_MODE = Object.freeze({
+  ALL: 'all',
+  UNACKED: 'unacked',
+});
+
+const STEER_ID_PATTERN = /^steer-[a-f0-9]{10}$/;
+
+function isSteerId(value) {
+  return typeof value === 'string' && STEER_ID_PATTERN.test(value);
+}
+
+function isSupersedeValue(value) {
+  return value === SUPERSEDE_MODE.ALL
+    || value === SUPERSEDE_MODE.UNACKED
+    || isSteerId(value);
+}
+
+module.exports = {
+  SCOPE,
+  SUPERSEDE_MODE,
+  STEER_ID_PATTERN,
+  isSteerId,
+  isSupersedeValue,
+};

package/engine/steering-store.js

@@ -154,15 +154,23 @@ function updateStatus(id, status, opts = {}) {
 function listForAgent(agentId, opts = {}) {
   if (!agentId) return [];
   const limit = Math.max(1, Math.min(500, Number(opts.limit) || 50));
+  const status = opts.status == null ? null : String(opts.status);
+  if (status !== null && !VALID_STATUSES.has(status)) {
+    throw new Error(`steering-store.listForAgent: invalid status '${status}'`);
+  }
   let db;
   try { const { getDb } = require('./db'); db = getDb(); }
   catch { return []; }
+  const statusClause = status === null ? '' : ' AND status = ?';
+  const params = status === null
+    ? [String(agentId), limit]
+    : [String(agentId), status, limit];
   const rows = db.prepare(`
     SELECT * FROM steering_deliveries
-    WHERE agent_id = ?
+    WHERE agent_id = ?${statusClause}
     ORDER BY created_at DESC, rowid DESC
     LIMIT ?
-  `).all(String(agentId), limit);
+  `).all(...params);
   return rows.map(_rowToRecord);
 }
 

package/engine/steering.js

@@ -7,6 +7,13 @@ const fs = require('fs');
 const path = require('path');
 const shared = require('./shared');
 const { wrapUntrusted, buildSource } = require('./untrusted-fence');
+const {
+  SCOPE,
+  SUPERSEDE_MODE,
+  STEER_ID_PATTERN,
+  isSteerId,
+  isSupersedeValue,
+} = require('./steering-constraints');
 
 const AGENTS_DIR = path.join(shared.MINIONS_DIR, 'agents');
 
@@ -349,9 +356,9 @@ function supersedeMessages(agentId, mode, opts = {}) {
   for (const entry of entries) {
     const status = entry.status || STATUS.QUEUED;
     let target = false;
-    if (mode === 'all') {
+    if (mode === SUPERSEDE_MODE.ALL) {
       if (status !== STATUS.ACKNOWLEDGED && status !== STATUS.DROPPED) target = true;
-    } else if (mode === 'unacked') {
+    } else if (mode === SUPERSEDE_MODE.UNACKED) {
       if (UNACKED_STATUSES.has(status)) target = true;
     } else {
       // Specific steerId
@@ -514,6 +521,11 @@ module.exports = {
   ackProcessedSteeringMessages,
   ackSteeringFromAckDir,
   STATUS,
+  SCOPE,
+  SUPERSEDE_MODE,
+  STEER_ID_PATTERN,
+  isSteerId,
+  isSupersedeValue,
   DEDUPE_WINDOW_MS,
   // Exposed for unit tests only.
   _updateEntryStatus,