@yemi33/minions 0.1.2379 → 0.1.2380

package/bin/minions.js

@@ -1404,9 +1404,21 @@ ${fs.existsSync(path.join(PKG_ROOT, '.git')) ? `
   // PowerShell is unavailable, the engine is hung, or its cmdline doesn't match.
   const oldEnginePid = readEnginePid(MINIONS_HOME);
   try { execSync(`node "${path.join(MINIONS_HOME, 'engine.js')}" stop`, { stdio: 'ignore', cwd: MINIONS_HOME, timeout: 10000, windowsHide: true }); } catch {}
-  // Force-kill the recorded engine PID (NOT the tree — agent children must
-  // survive so the new engine can re-attach them via PID files).
-  killPidOnly(oldEnginePid);
+  // Give the engine's graceful handler time to drain non-reattachable pooled
+  // leases. Detached cold agents are not part of that drain and remain alive
+  // for normal PID-file reattachment by the replacement engine.
+  const shutdownTimeout = (() => {
+    try {
+      const cfg = JSON.parse(fs.readFileSync(path.join(MINIONS_HOME, 'config.json'), 'utf8'));
+      return Number(cfg?.engine?.shutdownTimeout) || shared.ENGINE_DEFAULTS.shutdownTimeout;
+    } catch { return shared.ENGINE_DEFAULTS.shutdownTimeout; }
+  })();
+  const gracefulEngineStop = waitForPidDeath(oldEnginePid, shutdownTimeout + 5000);
+  if (!gracefulEngineStop.ok) {
+    // Fallback for a hung engine. Kill only the engine PID, never its detached
+    // cold-agent children; pooled leases have already exceeded their drain budget.
+    killPidOnly(oldEnginePid);
+  }
   killByPort(restartResolved.port);
   killMinionsProcesses(['engine.js', 'dashboard.js', 'supervisor.js']);
   // Confirm the OS finished the asynchronous termination before we spawn new
@@ -1491,15 +1503,13 @@ ${fs.existsSync(path.join(PKG_ROOT, '.git')) ? `
   const engineDir = path.join(MINIONS_HOME, 'engine');
 
   // Engine state
-  for (const f of ['dispatch.json', 'control.json', 'log.json', 'metrics.json', 'cooldowns.json', 'schedule-runs.json', 'kb-checkpoint.json', 'cc-session.json', 'doc-sessions.json', 'pipeline-runs.json']) rm(path.join(engineDir, f));
+  require(path.join(PKG_ROOT, 'engine', 'db')).cleanupRetiredJsonFiles(MINIONS_HOME);
+  for (const f of ['state.db', 'state.db-wal', 'state.db-shm', 'control.json', 'kb-checkpoint.json']) {
+    rm(path.join(engineDir, f));
+  }
   glob(engineDir, /^pid-.*\.pid$/).forEach(rm);
   rmDir(path.join(engineDir, 'tmp'));
 
-  // Work items + PRs
-  rm(path.join(MINIONS_HOME, 'work-items.json'));
-  rm(path.join(MINIONS_HOME, 'work-items-archive.json'));
-  rm(path.join(MINIONS_HOME, 'pull-requests.json'));
-
   // Plans + PRDs + Pipelines + Meetings
   rmDir(path.join(MINIONS_HOME, 'plans'));
   rmDir(path.join(MINIONS_HOME, 'prd'));

package/dashboard/js/refresh.js

@@ -151,9 +151,8 @@ const RENDER_VERSIONS = {
   dispatch: 2,
   engineLog: 2,
   metrics: 1,
-  // Bumped 7→8: WI detail modal's branch pill moved out of the Artifacts
-  // chip row into its own non-interactive "Branch" field (W-mr2qjr3b0002522f).
-  workItems: 8,
+  // Bumped 8->9: row actions now preserve work-item source scope when IDs collide.
+  workItems: 9,
   skills: 1,
   commands: 1,
   mcpServers: 1,

package/dashboard/js/render-prd.js

@@ -855,7 +855,7 @@ async function prdItemEdit(source, itemId) {
 
     completionHtml = '<div style="background:var(--surface);border:1px solid var(--border);border-left:3px solid ' + statusColor + ';border-radius:4px;padding:10px 12px;margin-bottom:12px">' +
       '<div style="display:flex;align-items:center;gap:8px;margin-bottom:6px">' +
-        (wi ? '<a href="#" onclick="event.preventDefault();event.stopPropagation();openWorkItemDetail(\'' + escHtml(wi.id) + '\')" title="Open ' + escHtml(wi.id) + ' detail" style="font-size:var(--text-base);font-weight:700;color:' + statusColor + ';text-decoration:none;cursor:pointer" onmouseover="this.style.textDecoration=\'underline\'" onmouseout="this.style.textDecoration=\'none\'">' + statusLabel + ' &rarr;</a>' : '<span style="font-size:var(--text-base);font-weight:700;color:' + statusColor + '">' + statusLabel + '</span>') +
+        (wi ? '<a href="#" onclick="event.preventDefault();event.stopPropagation();openWorkItemDetail(\'' + escHtml(wi.id) + '\',\'' + escHtml(wi._source || '') + '\')" title="Open ' + escHtml(wi.id) + ' detail" style="font-size:var(--text-base);font-weight:700;color:' + statusColor + ';text-decoration:none;cursor:pointer" onmouseover="this.style.textDecoration=\'underline\'" onmouseout="this.style.textDecoration=\'none\'">' + statusLabel + ' &rarr;</a>' : '<span style="font-size:var(--text-base);font-weight:700;color:' + statusColor + '">' + statusLabel + '</span>') +
         typePillHtml +
         (agent ? '<span style="font-size:var(--text-base);color:var(--muted)">by ' + escHtml(agent) + '</span>' : '') +
         (completedAt ? '<span style="font-size:var(--text-sm);color:var(--muted)">' + escHtml(completedAt.slice(0, 16).replace('T', ' ')) + '</span>' : '') +

package/dashboard/js/render-work-items.js

@@ -192,7 +192,7 @@ function wiRow(item) {
     var prLabel = prNumMatch ? ('PR #' + prNumMatch[1]) : 'parent PR';
     followupChip = ' <a class="pr-badge draft" style="font-size:var(--text-xs);text-decoration:none" target="_blank" rel="noopener" href="' + escapeHtml(prFollowup.parent_pr_url) + '" title="Follow-up dispatched from ' + escapeHtml(prRef) + (prFollowup.parent_comment_author ? ' by ' + escapeHtml(prFollowup.parent_comment_author) : '') + '" onclick="event.stopPropagation()">&#8617; from ' + escapeHtml(prLabel) + '</a>';
   }
-  return '<tr data-wi-id="' + escapeHtml(item.id) + '" style="cursor:pointer" onclick="if(shouldIgnoreSelectionClick(event))return;openWorkItemDetail(\'' + escapeHtml(item.id) + '\')">' +
+  return '<tr data-wi-id="' + escapeHtml(item.id) + '" style="cursor:pointer" onclick="if(shouldIgnoreSelectionClick(event))return;openWorkItemDetail(\'' + escapeHtml(item.id) + '\',\'' + escapeHtml(item._source || '') + '\')">' +
     '<td style="min-width:280px;max-width:320px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap" title="' + escapeHtml((item.title || '').slice(0, 200)) + '">' + escapeHtml(item.title || '') + followupChip + '</td>' +
     '<td><span style="font-size:var(--text-sm);color:var(--muted)">' + escapeHtml(item._source || '') + '</span>' +
       (item.scope === 'fan-out' ? ' <span class="pr-badge ' + (item.status === 'done' || item.status === 'failed' ? 'draft' : 'building') + '" style="font-size:var(--text-xs)">fan-out</span>' : '') + '</td>' +
@@ -312,7 +312,8 @@ function renderWorkItems(items, opts) {
 }
 
 async function editWorkItem(id, source) {
-  const cached = allWorkItems.find(i => i.id === id);
+  source = source || '';
+  const cached = allWorkItems.find(i => i.id === id && (!source || i._source === source));
   if (!cached) return;
   // Hydrate the full record before rendering the form. The bulk
   // /api/work-items list endpoint truncates `description` and replaces
@@ -331,7 +332,7 @@ async function editWorkItem(id, source) {
     (cached.referencesCount > 0 && !Array.isArray(cached.references));
   if (needsHydration) {
     try {
-      const r = await fetch('/api/work-items/' + encodeURIComponent(id));
+      const r = await fetch('/api/work-items/' + encodeURIComponent(id) + '?source=' + encodeURIComponent(source));
       if (!r.ok) throw new Error('HTTP ' + r.status);
       const data = await r.json();
       const full = data && data.item;
@@ -972,9 +973,15 @@ function _wiRenderDetail(item) {
   return html;
 }
 
-function openWorkItemDetail(id) {
+function openWorkItemDetail(id, source) {
   if (window.getSelection && window.getSelection().toString().length > 0) return;
-  const cached = allWorkItems.find(i => i.id === id);
+  source = source || '';
+  const matches = allWorkItems.filter(i => i.id === id && (!source || i._source === source));
+  if (!source && matches.length > 1) {
+    alert('Multiple work items share this ID. Open it from the Work Items page to select the project.');
+    return;
+  }
+  const cached = matches[0];
   if (!cached) return;
 
   // Render the modal immediately from the cached (slim) record so the click
@@ -999,7 +1006,7 @@ function openWorkItemDetail(id) {
 
   if (!needsHydration) return;
 
-  fetch('/api/work-items/' + encodeURIComponent(id))
+  fetch('/api/work-items/' + encodeURIComponent(id) + '?source=' + encodeURIComponent(source))
     .then(function(r) { if (!r.ok) throw new Error('HTTP ' + r.status); return r.json(); })
     .then(function(data) {
       // Guard against modal navigation away from this WI during the fetch.