@yemi33/minions 0.1.2383 → 0.1.2384

package/engine/managed-spawn.js

@@ -302,7 +302,22 @@ function _validateSpec(spec, index, limits, opts) {
   if (typeof spec.cwd === 'string' && spec.cwd.length > 500) {
     return { ok: false, reason: 'cwd-too-long' };
   }
-  if (_resolveRequireGitWorkdir(opts) && typeof spec.cwd === 'string' && spec.cwd.length > 0) {
+  if (opts.allowedCwdRoot) {
+    if (typeof spec.cwd !== 'string' || spec.cwd.length === 0) {
+      return { ok: false, reason: INVALID_WORKDIR_REASON_PREFIX + 'cwd-required-for-dispatch-confinement' };
+    }
+    try {
+      const cwdReal = shared.realPathForComparison(spec.cwd);
+      const rootReal = shared.realPathForComparison(opts.allowedCwdRoot);
+      if (!shared.isPathInsideOrEqual(cwdReal, rootReal)) {
+        return { ok: false, reason: INVALID_WORKDIR_REASON_PREFIX + 'cwd-outside-dispatch-worktree' };
+      }
+    } catch (err) {
+      return { ok: false, reason: INVALID_WORKDIR_REASON_PREFIX + 'cwd-containment-check-failed (' + err.message + ')' };
+    }
+  }
+  let normalizedCwd = typeof spec.cwd === 'string' ? spec.cwd : '';
+  if (_resolveRequireGitWorkdir(opts) && normalizedCwd.length > 0) {
     const wt = shared.isValidGitWorktree(spec.cwd, { memo: opts._gitWorktreeMemo });
     if (!wt.ok) {
       // W-mpbpa01y000qcdc2 — enrich the reject reason so the dispatcher prompt
@@ -319,6 +334,12 @@ function _validateSpec(spec, index, limits, opts) {
       return { ok: false, reason: INVALID_WORKDIR_REASON_PREFIX + detail };
     }
   }
+  if (normalizedCwd) {
+    try { normalizedCwd = shared.realPathForComparison(normalizedCwd); }
+    catch (err) {
+      return { ok: false, reason: INVALID_WORKDIR_REASON_PREFIX + 'cwd-canonicalization-failed (' + err.message + ')' };
+    }
+  }
 
   // env (optional). Validation has three independent layers:
   //   1. Shape guard: key matches /^[A-Za-z_][A-Za-z0-9_]*$/ (argv-smuggling
@@ -339,7 +360,7 @@ function _validateSpec(spec, index, limits, opts) {
   if (envKeys.length > maxEnv) {
     return { ok: false, reason: 'env-too-many (>' + maxEnv + ')' };
   }
-  const projectForSpec = _resolveProjectForCwd(
+  const projectForSpec = opts.project || _resolveProjectForCwd(
     typeof spec.cwd === 'string' ? spec.cwd : '',
     opts && Array.isArray(opts.projects) ? opts.projects : null,
   );
@@ -411,7 +432,7 @@ function _validateSpec(spec, index, limits, opts) {
       name: spec.name,
       cmd: spec.cmd,
       args: args,
-      cwd: typeof spec.cwd === 'string' ? spec.cwd : '',
+      cwd: normalizedCwd,
       env: env,
       ports: ports,
       ttl_minutes: ttlMinutes,
@@ -585,7 +606,7 @@ function buildManagedSpawnHint(opts) {
     '      "name": "constellation-host",',
     '      "cmd": "bun",',
     '      "args": ["run", "dev"],',
-    '      "cwd": "D:/repos/constellation",',
+    '      "cwd": "<absolute path at or below MINIONS_AGENT_CWD>",',
     '      "env": { "VITE_HOST": "127.0.0.1" },',
     '      "ports": [3001],',
     '      "ttl_minutes": ' + ttl + ',',
@@ -624,6 +645,7 @@ function buildManagedSpawnHint(opts) {
     '- Ports: 1024–65535, ≤ 20 per spec',
     '- TTL: ≤ ' + maxTtl + ' minutes (hard cap), defaults to ' + defaultTtl + ' if omitted',
     '- `attrs` serialized: ≤ 2048 bytes (opaque blob the engine surfaces to downstream agents)',
+    '- `cwd`: must resolve at or below this dispatch\'s `MINIONS_AGENT_CWD`. A worktree-mode project\'s operator checkout is rejected even though it is a valid Git checkout.',
     '',
     'If your file is invalid the engine marks this dispatch ERROR with `failure_class: invalid-managed-spawn` (non-retryable) — fix the file shape, don\'t retry blindly.',
     '',
@@ -875,6 +897,9 @@ function _toStateRecord(spec, runtime, ctx) {
     owner_agent: (ctx && ctx.owner_agent) || '',
     owner_wi: (ctx && ctx.owner_wi) || '',
     owner_project: (ctx && ctx.owner_project) || '',
+    owner_work_type: (ctx && ctx.owner_work_type) || '',
+    dispatch_root: (ctx && ctx.dispatch_root) || '',
+    checkout_mode: (ctx && ctx.checkout_mode) || '',
     cmd: spec.cmd,
     args: Array.isArray(spec.args) ? spec.args.slice() : [],
     cwd: typeof spec.cwd === 'string' ? spec.cwd : '',
@@ -1265,7 +1290,69 @@ function computeManagedSpecsEtag(opts) {
   return crypto.createHash('sha1').update(json).digest('hex').slice(0, 16);
 }
 
-function restartManagedSpec(name) {
+function validateManagedSpecExecutionContext(record, opts) {
+  opts = opts || {};
+  if (!record || typeof record.cwd !== 'string' || !record.cwd) {
+    return { ok: false, reason: 'cwd-missing' };
+  }
+  let projects;
+  try {
+    projects = Array.isArray(opts.projects) ? opts.projects : shared.getProjects(opts.config);
+  } catch {
+    return { ok: false, reason: 'project-config-unavailable' };
+  }
+  const project = record.owner_project
+    ? shared.findProjectByName(projects, record.owner_project)
+    : null;
+  for (const candidate of projects) {
+    if (!candidate?.localPath) continue;
+    const candidateMode = shared.resolveCheckoutMode(
+      candidate,
+      record.owner_work_type || shared.WORK_TYPE.IMPLEMENT,
+    );
+    if (candidateMode !== shared.CHECKOUT_MODES.WORKTREE) continue;
+    try {
+      if (shared.pathsOverlap(record.cwd, candidate.localPath)) {
+        return { ok: false, reason: 'cwd-overlaps-worktree-mode-operator-checkout' };
+      }
+    } catch {
+      return { ok: false, reason: 'cwd-overlap-check-failed' };
+    }
+  }
+  const mode = project
+    ? shared.resolveCheckoutMode(project, record.owner_work_type || shared.WORK_TYPE.IMPLEMENT)
+    : shared.CHECKOUT_MODES.WORKTREE;
+  if (project && mode === shared.CHECKOUT_MODES.LIVE) {
+    if (record.dispatch_root && !shared.sameResolvedPath(record.dispatch_root, project.localPath)) {
+      return { ok: false, reason: 'live-dispatch-root-mismatch' };
+    }
+    try {
+      if (!shared.isPathInsideOrEqual(record.cwd, project.localPath)) {
+        return { ok: false, reason: 'live-cwd-outside-project' };
+      }
+    } catch {
+      return { ok: false, reason: 'live-cwd-unavailable' };
+    }
+    return { ok: true, project, mode };
+  }
+
+  if (!record.dispatch_root) {
+    return record.checkout_mode
+      ? { ok: false, reason: 'dispatch-root-missing' }
+      : { ok: true, legacy: true, project, mode };
+  }
+  try {
+    shared.assertWorktreeOutsideProjects(record.dispatch_root, projects);
+    if (!shared.isPathInsideOrEqual(record.cwd, record.dispatch_root)) {
+      return { ok: false, reason: 'cwd-outside-dispatch-root' };
+    }
+  } catch {
+    return { ok: false, reason: 'dispatch-root-inside-operator-checkout' };
+  }
+  return { ok: true, project, mode };
+}
+
+function restartManagedSpec(name, opts) {
   if (typeof name !== 'string' || name.length === 0) {
     throw new Error('restartManagedSpec: name required');
   }
@@ -1273,6 +1360,11 @@ function restartManagedSpec(name) {
   if (!existing) {
     throw new Error('restartManagedSpec: spec not found: ' + name);
   }
+  const executionContext = validateManagedSpecExecutionContext(existing, opts);
+  if (!executionContext.ok) {
+    try { removeManagedSpec(name); } catch {}
+    throw new Error('restartManagedSpec: unsafe persisted execution context (' + executionContext.reason + ')');
+  }
   // Reconstruct a sidecar-shaped spec from the persisted state row. The
   // state shape keeps cmd/args/cwd/env/ports/attrs/healthcheck verbatim
   // (see _toStateRecord), so this is a direct projection.
@@ -1299,6 +1391,9 @@ function restartManagedSpec(name) {
     owner_agent: existing.owner_agent || '',
     owner_wi: existing.owner_wi || '',
     owner_project: existing.owner_project || '',
+    owner_work_type: existing.owner_work_type || '',
+    dispatch_root: existing.dispatch_root || '',
+    checkout_mode: existing.checkout_mode || '',
   };
   const runtime = spawnManagedSpec(spec, ctx);
   // recordManagedSpec replaces by name (item 2 idempotency contract) and
@@ -1380,6 +1475,12 @@ function _runManagedReconcile(opts) {
   const killBatch = typeof opts.killBatch === 'function'
     ? opts.killBatch
     : shared.killByPidsImmediate;
+  let projects;
+  try {
+    projects = Array.isArray(opts.projects) ? opts.projects : shared.getProjects(opts.config);
+  } catch {
+    projects = [];
+  }
   const stats = {
     scanned: 0,
     ttlExpired: 0,
@@ -1413,6 +1514,11 @@ function _runManagedReconcile(opts) {
         stats.deadDropped++;
         continue; // dead + not expired → drop
       }
+      const executionContext = validateManagedSpecExecutionContext(rec, { projects });
+      if (!executionContext.ok) {
+        ttlPidsToKill.push(rec.pid);
+        continue;
+      }
       kept.push(rec);
       survivors.push({ name: rec.name, log_path: rec.log_path || '', healthy: rec.healthy === true, last_health_at: rec.last_health_at || 0 });
     }
@@ -1550,6 +1656,7 @@ module.exports = {
   // Item 4 (P-4b8d2e57): discovery API (etag + state-driven respawn).
   computeManagedSpecsEtag: computeManagedSpecsEtag,
   restartManagedSpec: restartManagedSpec,
+  validateManagedSpecExecutionContext: validateManagedSpecExecutionContext,
   // Item 7 (P-8a4d6f29): TTL sweep + boot reconcile + project cleanup.
   sweepManagedSpawn: sweepManagedSpawn,
   bootReconcileManagedSpawn: bootReconcileManagedSpawn,