@yemi33/minions 0.1.2287 → 0.1.2289

package/dashboard/js/render-plans.js

@@ -189,8 +189,9 @@ function derivePlanStatus(prdFile, mdFile, prdJsonStatus, workItems, opts) {
   if (prdJsonStatus === 'rejected') return 'rejected';
   if (prdJsonStatus === 'paused' && !allDone) return 'paused';
   if (prdJsonStatus === 'revision-requested') return 'revision-requested';
-  // PRD awaiting approval overrides WI-derived completion — new items may need materialization (#970)
-  if (prdJsonStatus === 'awaiting-approval') return 'awaiting-approval';
+  // PRD awaiting approval overrides only when no work has started yet — if work is active or
+  // done, the approval gate was already implicitly cleared and the status is stale (#970).
+  if (prdJsonStatus === 'awaiting-approval' && !hasActiveWork && !allDone) return 'awaiting-approval';
 
   // Derive from work item progress
   if (allDone && !hasActiveWork) return 'completed';
@@ -268,6 +269,10 @@ function renderPlans(plans) {
   for (const p of plans) {
     if (p.format === 'prd' && !p.archived && p.sourcePlan) {
       const sourceKeys = [p.sourcePlan, normalizeSourcePlanKey(p.sourcePlan)];
+      // Also register the bare basename without directory prefix ('plans/foo.md' → 'foo.md')
+      // so that plans whose p.file has no prefix can still find their PRD.
+      const bare = (p.sourcePlan || '').replace(/^[^/]+\//, '');
+      if (bare && bare !== p.sourcePlan) sourceKeys.push(bare);
       for (const sourceKey of sourceKeys) {
         if (!sourceKey) continue;
         planToPrdFile[sourceKey] = p.file;

package/dashboard/js/settings.js

@@ -410,6 +410,8 @@ async function openSettings() {
       // OFF because killing a foreign process is destructive.
       settingsToggle('Auto-reap orphan worktree holders', 'set-autoReapOrphanWorktreeHolders', !!e.autoReapOrphanWorktreeHolders,
         'When ON, the periodic orphan-worktree sweep automatically kills unambiguous orphan `spawn-agent.js` processes holding a stuck worktree\'s cwd (Windows file-lock pattern, e.g. W-mq1k8z6o003acd89 / PID 16828). Safe-reap criteria: cmdline must match spawn-agent.js, reference the worktree basename, AND process age must exceed `engine.agentTimeout * 2`. Default OFF because killing a foreign process is destructive. The holder SCAN runs either way and is appended to the escalation inbox note.') +
+      settingsToggle('Live-checkout auto-reset (fleet-wide)', 'set-liveCheckoutAutoReset', !!e.liveCheckoutAutoReset,
+        'When ON, a dirty or broken live-checkout (in-place) tree is force-recovered before dispatch via `git fetch origin` + `git reset --hard origin/<branch>` instead of failing the dispatch with non-retryable LIVE_CHECKOUT_DIRTY. This is the FLEET-WIDE fallback; a per-project `liveCheckoutAutoReset` in config.json overrides it. Default OFF because the reset is DESTRUCTIVE — it discards the operator\'s uncommitted changes in the live checkout (a `live-checkout-autoreset-<workItem>` inbox note records exactly what was discarded for reflog recovery). Only affects projects running in live/in-place checkout mode.') +
     '</div>' +
     '<div class="settings-grid-2">' +
       settingsField('Worktree Create Timeout', 'set-worktreeCreateTimeout', e.worktreeCreateTimeout || 300000, 'ms', 'Timeout for git worktree add (increase for large repos/Windows)') +
@@ -1082,6 +1084,7 @@ async function saveSettings() {
       autoCompletePrs: document.getElementById('set-autoCompletePrs').checked,
       ccUseWorkerPool: !!document.getElementById('set-ccUseWorkerPool')?.checked,
       autoReapOrphanWorktreeHolders: !!document.getElementById('set-autoReapOrphanWorktreeHolders')?.checked,
+      liveCheckoutAutoReset: !!document.getElementById('set-liveCheckoutAutoReset')?.checked,
       orphanHolderScanTimeoutMs: document.getElementById('set-orphanHolderScanTimeoutMs')?.value,
       statusProbeKillTimeoutMs: document.getElementById('set-statusProbeKillTimeoutMs')?.value,
       adoPollEnabled: document.getElementById('set-adoPollEnabled').checked,

package/dashboard/slim/body.html

@@ -89,6 +89,10 @@
             <div class="cockpit-label"><span class="cockpit-dot"></span> Engine</div>
             <div class="cockpit-value dim">—</div>
             <div class="cockpit-detail">checking&hellip;</div>
+            <!-- Shown by status.js only when the engine is down/stale. Mirrors the
+                 classic dashboard's stale-banner restart action; both surfaces POST
+                 /api/engine/restart. -->
+            <button id="slim-engine-restart" class="engine-restart-btn" type="button" hidden>Restart engine</button>
           </div>
           <div class="cockpit-tile" data-tile="queued">
             <div class="cockpit-label"><span class="cockpit-dot"></span> Queued work</div>
@@ -124,17 +128,6 @@
           </div>
         </div>
       </div>
-      <!-- Pending work items sub-section: lists work items with
-           status === 'pending'. Populated by renderPendingWorkItems() in
-           status.js from the /api/work-items poll slice; hidden via the
-           `hidden` attribute when there are zero pending items. -->
-      <div class="pending-section" id="pending-section" hidden>
-        <div class="pending-head">
-          Pending Work Items
-          <span class="pending-count" id="pending-count"></span>
-        </div>
-        <div class="pending-list" id="pending-list"></div>
-      </div>
     </div>
   </div>
 

package/dashboard/slim/js/modals-tiles.js

@@ -189,6 +189,71 @@
     body.appendChild(section);
   }
 
+  // Collapsible "Pending work items" section appended to the queued popout
+  // (W-mqv1xbcm). Sources data.workItems filtered to status === 'pending' — the
+  // same /api/work-items slice the slim poll merges onto the snapshot — so it
+  // adds no new API calls and refreshes whenever the popout is re-opened.
+  // Expanded by DEFAULT (more prominent than the collapsed Completed section)
+  // since these are the queued WIs the operator most wants to scan. Mirrors
+  // renderCompletedSection's structure + tileCard usage; all text via
+  // textContent (no innerHTML) to keep the SEC-03 baseline clean. Each card
+  // shows title, id, project (project || _source), type, and the engine's
+  // _pendingReason as a chip when set.
+  function renderPendingSection(body, data) {
+    var pending = (Array.isArray(data.workItems) ? data.workItems : []).filter(function(w) {
+      return w && w.status === 'pending';
+    });
+
+    var section = document.createElement('div');
+    section.className = 'tile-completed-section';
+
+    var head = document.createElement('div');
+    head.className = 'tile-completed-section-head';
+    head.setAttribute('role', 'button');
+    head.setAttribute('tabindex', '0');
+    head.setAttribute('aria-expanded', 'true');
+    var caret = document.createElement('span');
+    caret.className = 'tile-caret';
+    caret.textContent = '▾';
+    var label = document.createElement('span');
+    label.className = 'tile-completed-section-title';
+    label.textContent = 'Pending work items (' + pending.length + ')';
+    head.appendChild(caret);
+    head.appendChild(label);
+
+    var listWrap = document.createElement('div');
+    listWrap.className = 'tile-completed-section-body';
+
+    if (!pending.length) {
+      tileEmpty(listWrap, 'No pending work items.');
+    } else {
+      pending.forEach(function(w) {
+        var project = w.project || w._source;
+        var meta = [w.id || null, project || null, w.type || null].filter(Boolean).join(' · ');
+        var card = { title: w.title || w.id || '(untitled)', meta: meta };
+        if (w._pendingReason) {
+          card.chip = { text: String(w._pendingReason).replace(/_/g, ' '), cls: 'amber' };
+        }
+        listWrap.appendChild(tileCard(card));
+      });
+    }
+
+    function toggle() {
+      var open = !section.classList.toggle('collapsed');
+      head.setAttribute('aria-expanded', open ? 'true' : 'false');
+      caret.textContent = open ? '▾' : '▸';
+      listWrap.hidden = !open;
+    }
+    head.addEventListener('click', toggle);
+    head.addEventListener('keydown', function(ev) {
+      if (ev.key === 'Enter' || ev.key === ' ') { ev.preventDefault(); toggle(); }
+    });
+
+    section.appendChild(head);
+    section.appendChild(listWrap);
+    body.appendChild(section);
+  }
+
   function renderPrTileBody(body, data) {
     // Emoji glyphs make build/review status scannable at a glance; the
     // accompanying label keeps the row readable when the glyph alone is
@@ -310,7 +375,7 @@
   var TILE_VIEWS = {
     engine:     { title: 'Engine',            render: renderEngineTileBody },
     dispatches: { title: 'Active dispatches', render: function(body, data) { renderDispatchTileBody(body, data, true); } },
-    queued:     { title: 'Queued work',       render: function(body, data) { renderDispatchTileBody(body, data, false); renderCompletedSection(body, data); } },
+    queued:     { title: 'Queued work',       render: function(body, data) { renderDispatchTileBody(body, data, false); renderPendingSection(body, data); renderCompletedSection(body, data); } },
     prs:        { title: 'Pull requests',     render: renderPrTileBody },
     watches:    { title: 'Watches',           render: renderWatchTileBody },
   };

package/dashboard/slim/js/status.js

@@ -54,6 +54,68 @@
   // Latest /api/status snapshot — read by the cockpit-tile detail modals.
   var lastStatusData = null;
 
+  // ── Engine restart affordance ──────────────────────────────────
+  // Shows a "Restart engine" button on the engine tile when the engine reports
+  // down/stale and calls the same POST /api/engine/restart endpoint the classic
+  // dashboard uses (dashboard/js/render-dispatch.js#_wireEngineRestartClick).
+  // Optimistic UX parity: disable while pending, re-enable + alert on error,
+  // re-poll on success (the button hides itself once the engine reports
+  // 'running' again). engineRestartPending guards the in-flight label so the
+  // 5s status poll doesn't stomp "Restarting…" back to the idle text.
+  var engineRestartPending = false;
+
+  function updateEngineRestartButton(engineDown) {
+    var btn = document.getElementById('slim-engine-restart');
+    if (!btn) return;
+    if (!engineDown) {
+      // Engine recovered — clear pending state and hide the button.
+      engineRestartPending = false;
+      btn.hidden = true;
+      btn.disabled = false;
+      btn.textContent = 'Restart engine';
+      return;
+    }
+    btn.hidden = false;
+    if (!engineRestartPending) {
+      btn.disabled = false;
+      btn.textContent = 'Restart engine';
+    }
+  }
+
+  async function onEngineRestartClick(ev) {
+    if (ev) ev.stopPropagation();   // don't trigger the engine tile's detail modal
+    var btn = document.getElementById('slim-engine-restart');
+    if (!btn || engineRestartPending) return;
+    engineRestartPending = true;
+    btn.disabled = true;
+    btn.textContent = 'Restarting…';
+    try {
+      var res = await fetch('/api/engine/restart', { method: 'POST' });
+      var data = await res.json().catch(function() { return {}; });
+      if (res.ok && data.ok) {
+        // Re-poll sooner than the 5s cadence so the engine tile flips to
+        // 'running' (and the button auto-hides) shortly after the new PID's
+        // first heartbeat. Ongoing 5s polling catches it regardless.
+        scheduleStatusRefresh(1500);
+      } else {
+        engineRestartPending = false;
+        btn.disabled = false;
+        btn.textContent = 'Restart engine';
+        alert('Engine restart failed: ' + (data.error || ('HTTP ' + res.status)));
+      }
+    } catch (e) {
+      engineRestartPending = false;
+      btn.disabled = false;
+      btn.textContent = 'Restart engine';
+      alert('Engine restart failed: ' + (e && e.message ? e.message : 'unknown error'));
+    }
+  }
+
+  (function bindEngineRestart() {
+    var btn = document.getElementById('slim-engine-restart');
+    if (btn) btn.addEventListener('click', onEngineRestartClick);
+  })();
+
   // Reflect the Command Center's resolved runtime + model in the Actions panel
   // header (slim-ux only — classic chrome is untouched). Source is the same
   // /api/status payload the cockpit polls: autoMode.ccModel (config.engine
@@ -116,12 +178,20 @@
 
     updateTile('engine', engineValue, engineDetail, engineLit);
 
+    // Surface a "Restart engine" button on the engine tile whenever the engine
+    // is down/unreachable (stopped or stale heartbeat) — mirrors the classic
+    // dashboard's stale/stopped restart affordance
+    // (dashboard/js/render-dispatch.js#_wireEngineRestartClick). Both front-ends
+    // are separate IIFE bundles never loaded together, so the reused unit is the
+    // POST /api/engine/restart contract, consistent with the rest of slim (e.g.
+    // command-send.js reuses /api/command-center/* rather than the classic fn).
+    updateEngineRestartButton(engineState === 'stopped' || engineState === 'stale');
+
     // ── Dispatches ─────────────────────────────────────────────
     // The per-minion "working" view moved to the Team cards (renderMembers);
     // this section only drives the system tiles now.
     var dispatch = data.dispatch || {};
     var active = Array.isArray(dispatch.active) ? dispatch.active : [];
-    var pending = Array.isArray(dispatch.pending) ? dispatch.pending : [];
     var completed = Array.isArray(dispatch.completed) ? dispatch.completed : [];
     updateTile(
       'dispatches',
@@ -129,11 +199,19 @@
       active.length ? 'agents working' : 'no agents working',
       active.length ? 'amber' : null
     );
+    // "Queued work" reflects ALL work items waiting to be dispatched — both
+    // status 'pending' (not yet picked up) and status 'queued' (W-mqveaj1h).
+    // Sourced from the /api/work-items poll slice merged in by history.js, not
+    // the dispatch queue, so a pending WI that has not produced a dispatch yet
+    // is still counted. Supersedes the standalone "Pending Work Items" section.
+    var waitingItems = (Array.isArray(data.workItems) ? data.workItems : []).filter(function(w) {
+      return w && (w.status === 'pending' || w.status === 'queued');
+    });
     updateTile(
       'queued',
-      pending.length,
-      pending.length ? 'waiting to spawn' : 'queue empty',
-      pending.length ? 'orange' : null
+      waitingItems.length,
+      waitingItems.length ? 'waiting to spawn' : 'queue empty',
+      waitingItems.length ? 'orange' : null
     );
 
     // ── PR tile (status snapshot from cached pull-requests) ─────
@@ -179,11 +257,6 @@
     // ── Team member cards ──────────────────────────────────────
     renderMembers(Array.isArray(data.agents) ? data.agents : []);
 
-    // ── Pending work items section ─────────────────────────────
-    // Surfaces WIs with status === 'pending' (W-mqtx516q). Sourced from the
-    // /api/work-items slice merged in by the slim poll (history.js).
-    renderPendingWorkItems(Array.isArray(data.workItems) ? data.workItems : []);
-
     // ── Stamps + history ───────────────────────────────────────
     var stamp = document.getElementById('cockpit-stamp');
     if (stamp) stamp.textContent = 'updated ' + relTime(data.timestamp || Date.now());
@@ -193,94 +266,5 @@
     if (hStamp) hStamp.textContent = relTime(data.timestamp || Date.now());
   }
 
-  // ── Pending work items renderer ────────────────────────────────
-  // Lists every work item with status === 'pending' in a dedicated section
-  // under the cockpit (W-mqtx516q). The section is hidden via the `hidden`
-  // attribute when there are zero pending items. Each row shows id, title,
-  // project, type, and the engine's _pendingReason as a small badge when set.
-  // Everything goes through textContent (no innerHTML) to keep the SEC-03
-  // baseline clean. A JSON fingerprint of the visible fields skips the DOM
-  // rebuild when nothing changed between 5s polls.
-  var _lastPendingJson = null;
-
-  function renderPendingWorkItems(items) {
-    var section = document.getElementById('pending-section');
-    var list = document.getElementById('pending-list');
-    if (!section || !list) return;
-
-    var pending = (Array.isArray(items) ? items : []).filter(function(w) {
-      return w && w.status === 'pending';
-    });
-
-    var fingerprint = JSON.stringify(pending.map(function(w) {
-      return [w.id, w.title, w.project || w._source, w.type, w._pendingReason];
-    }));
-    if (fingerprint === _lastPendingJson) return;
-    _lastPendingJson = fingerprint;
-
-    if (!pending.length) {
-      section.setAttribute('hidden', '');
-      list.textContent = '';
-      return;
-    }
-    section.removeAttribute('hidden');
-
-    var countEl = document.getElementById('pending-count');
-    if (countEl) countEl.textContent = String(pending.length);
-
-    list.textContent = '';
-    var frag = document.createDocumentFragment();
-    pending.forEach(function(w) {
-      var row = document.createElement('div');
-      row.className = 'pending-row';
-
-      // Top line: title + optional pending-reason badge.
-      var main = document.createElement('div');
-      main.className = 'pending-row-main';
-
-      var title = document.createElement('span');
-      title.className = 'pending-title';
-      title.textContent = w.title || w.id || '(untitled)';
-      title.title = (w.title || w.id || '') + (w.id ? ' (' + w.id + ')' : '');
-      main.appendChild(title);
-
-      if (w._pendingReason) {
-        var badge = document.createElement('span');
-        badge.className = 'pending-reason-badge';
-        badge.textContent = String(w._pendingReason).replace(/_/g, ' ');
-        badge.title = 'Pending reason: ' + w._pendingReason;
-        main.appendChild(badge);
-      }
-      row.appendChild(main);
-
-      // Meta line: id + project + type chips.
-      var meta = document.createElement('div');
-      meta.className = 'pending-row-meta';
-
-      var idEl = document.createElement('span');
-      idEl.className = 'pending-meta-id';
-      idEl.textContent = w.id || '';
-      meta.appendChild(idEl);
-
-      var project = w.project || w._source;
-      if (project) {
-        var projEl = document.createElement('span');
-        projEl.className = 'pending-meta-chip';
-        projEl.textContent = project;
-        meta.appendChild(projEl);
-      }
-
-      if (w.type) {
-        var typeEl = document.createElement('span');
-        typeEl.className = 'pending-meta-chip pending-meta-type';
-        typeEl.textContent = w.type;
-        meta.appendChild(typeEl);
-      }
-      row.appendChild(meta);
-
-      frag.appendChild(row);
-    });
-    list.appendChild(frag);
-  }
 
 

package/dashboard/slim/styles.css

@@ -1100,6 +1100,19 @@
       margin-left: auto;
       text-align: right;
     }
+    /* Restart-engine affordance on the engine tile — toggled visible via the
+       `hidden` attribute in status.js only when the engine reports down/stale.
+       Mirrors the classic dashboard's stale-banner "Restart engine" action
+       (dashboard/js/render-dispatch.js); both POST /api/engine/restart. */
+    .engine-restart-btn {
+      font-size: var(--text-base); font-weight: 600;
+      padding: 2px 10px; border-radius: 10px;
+      background: rgba(248, 81, 73, 0.12); color: var(--red); border: 1px solid var(--red);
+      cursor: pointer; font-family: inherit; white-space: nowrap;
+    }
+    .engine-restart-btn:hover { filter: brightness(1.2); }
+    .engine-restart-btn:disabled { opacity: 0.6; cursor: default; }
+    .engine-restart-btn[hidden] { display: none; }
     /* Cockpit tiles are clickable -> detail modal. */
     .cockpit-tile { cursor: pointer; position: relative; }
     .cockpit-tile:hover { border-color: var(--blue); }
@@ -1139,93 +1152,6 @@
     .team-section { margin-bottom: 14px; }
     .cockpit-section { padding-top: 14px; border-top: 1px solid var(--border); }
 
-    /* Pending work items section (W-mqtx516q). Sits under the cockpit tiles;
-       hidden via the `hidden` attribute when there are no pending WIs. */
-    .pending-section {
-      padding-top: 14px;
-      margin-top: 14px;
-      border-top: 1px solid var(--border);
-    }
-    .pending-section[hidden] { display: none; }
-    .pending-head {
-      font-size: var(--text-sm);
-      font-weight: 600;
-      color: var(--text);
-      letter-spacing: 0.02em;
-      text-transform: uppercase;
-      margin-bottom: 8px;
-      display: flex;
-      align-items: center;
-      gap: 6px;
-    }
-    .pending-count {
-      font-size: var(--text-xs);
-      font-weight: 600;
-      color: var(--orange);
-      background: rgba(214, 153, 34, 0.14);
-      border-radius: 9px;
-      padding: 0 7px;
-      line-height: 16px;
-    }
-    .pending-list {
-      display: flex;
-      flex-direction: column;
-      gap: 6px;
-    }
-    .pending-row {
-      background: var(--surface2);
-      border: 1px solid var(--border);
-      border-left: 3px solid var(--orange);
-      border-radius: var(--radius);
-      padding: 7px 9px;
-    }
-    .pending-row-main {
-      display: flex;
-      align-items: center;
-      gap: 6px;
-    }
-    .pending-title {
-      font-size: var(--text-md);
-      color: var(--text);
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      min-width: 0;
-      flex: 1;
-    }
-    .pending-reason-badge {
-      flex: none;
-      font-size: var(--text-xs);
-      color: var(--orange);
-      border: 1px solid rgba(214, 153, 34, 0.5);
-      border-radius: 6px;
-      padding: 0 5px;
-      line-height: 15px;
-      white-space: nowrap;
-    }
-    .pending-row-meta {
-      display: flex;
-      align-items: center;
-      flex-wrap: wrap;
-      gap: 6px;
-      margin-top: 4px;
-    }
-    .pending-meta-id {
-      font-size: var(--text-xs);
-      color: var(--muted);
-      font-family: var(--mono, monospace);
-    }
-    .pending-meta-chip {
-      font-size: var(--text-xs);
-      color: var(--muted);
-      background: var(--surface);
-      border: 1px solid var(--border);
-      border-radius: 6px;
-      padding: 0 6px;
-      line-height: 15px;
-    }
-    .pending-meta-type { color: var(--blue); }
-
     /* Square member cards. Auto-fill so the column count adapts to the
        panel width; aspect-ratio keeps each card square regardless. */
     .member-grid {