@yemi33/minions 0.1.2340 → 0.1.2341

package/dashboard/js/render-other.js

@@ -166,6 +166,18 @@ function _liveValidationTypesArray(p) {
   return arr.filter(function(t) { return typeof t === 'string' && t.length > 0; });
 }
 
+// Expose the hybrid constants + normalizer on window so the Settings page
+// (dashboard/js/settings.js) can reuse the SAME single source of truth for the
+// hybrid work-item-type list, default type, and liveValidationType normalizer
+// rather than duplicating them (CLAUDE.md "no duplicate solutions"). Both files
+// concatenate into one dashboard <script> scope, but attaching to window makes
+// the cross-file dependency explicit and order-independent.
+try {
+  window.CHECKOUT_MODE_HYBRID_TYPES = CHECKOUT_MODE_HYBRID_TYPES;
+  window.CHECKOUT_MODE_HYBRID_DEFAULT_TYPE = CHECKOUT_MODE_HYBRID_DEFAULT_TYPE;
+  window._liveValidationTypesArray = _liveValidationTypesArray;
+} catch (e) { /* non-browser (unit test require) */ }
+
 function _closeCheckoutModeMenu() {
   const existing = document.getElementById('checkout-mode-menu');
   if (existing) existing.remove();

package/dashboard/js/settings.js

@@ -276,18 +276,55 @@ async function openSettings() {
     // where worktrees are unworkable. p.checkoutMode is resolved server-side
     // (honors the legacy worktreeMode field). Chip is hidden by default and
     // toggled reactively below.
+    // W-mr9mx93d000x1dda — third option "Hybrid dispatch": checkoutMode:'live'
+    // PLUS a liveValidation block (coding WIs author in isolated worktrees; only
+    // the chosen validation type(s) run in-place on the live checkout, with an
+    // optional auto-dispatch-after-coding toggle). This mirrors the Projects-bar
+    // picker (render-other.js _openCheckoutModeMenu / _renderCheckoutModeHybridStep)
+    // so both surfaces configure the SAME liveValidation shape identically.
     var currentWtMode = (p.checkoutMode === 'live') ? 'live' : 'worktree';
-    var wtModeSearch = 'checkout mode worktree isolated live dispatch';
+    var lvTypes = (window._liveValidationTypesArray ? window._liveValidationTypesArray(p) : []);
+    // 3-way UI mode: worktree / live / hybrid. Hybrid = live + >=1 validation type.
+    var currentCheckoutMode = (currentWtMode === 'live')
+      ? (lvTypes.length > 0 ? 'hybrid' : 'live')
+      : 'worktree';
+    var hybridTypes = window.CHECKOUT_MODE_HYBRID_TYPES || [];
+    var hybridDefaultType = window.CHECKOUT_MODE_HYBRID_DEFAULT_TYPE || 'test';
+    var hybridPreselect = lvTypes.length > 0 ? lvTypes : [hybridDefaultType];
+    var hybridAutoPre = p.liveValidationAutoDispatch === true;
+    var wtModeSearch = 'checkout mode worktree isolated live hybrid dispatch validation';
+    var hybridTypeChecks = hybridTypes.map(function(t) {
+      var checkedAttr = hybridPreselect.indexOf(t) !== -1 ? ' checked' : '';
+      return '<label style="display:inline-flex;align-items:center;gap:4px;margin:2px 10px 2px 0;font-size:var(--text-sm);color:var(--text)">' +
+        '<input type="checkbox" data-live-validation-type="' + escHtml(p.name) + '" value="' + escHtml(t) + '"' + checkedAttr + '>' +
+        '<span>' + escHtml(t) + '</span>' +
+      '</label>';
+    }).join('');
+    var hybridPanel =
+      '<div data-checkout-hybrid-panel="' + escHtml(p.name) + '" style="' + (currentCheckoutMode === 'hybrid' ? '' : 'display:none;') + 'margin-top:6px">' +
+        '<div style="padding:6px 8px;background:rgba(234,179,8,0.12);border:1px solid var(--yellow);border-radius:4px;color:var(--yellow);font-size:var(--text-xs);line-height:1.4;margin-bottom:6px">' +
+          '⚠ Hybrid mode: coding work items author in isolated worktrees; only the chosen validation type(s) run in-place on the live checkout (one mutating dispatch at a time; refused on a dirty tree).' +
+        '</div>' +
+        '<div style="font-size:var(--text-sm);color:var(--muted);margin-bottom:2px">Work-item type(s) to validate live:</div>' +
+        '<div style="margin-bottom:4px">' + hybridTypeChecks + '</div>' +
+        '<label style="display:inline-flex;align-items:center;gap:6px;font-size:var(--text-sm);color:var(--text);margin-top:2px">' +
+          '<input type="checkbox" id="set-liveValidationAutoDispatch-' + escHtml(p.name) + '"' + (hybridAutoPre ? ' checked' : '') + '>' +
+          '<span>Automatically validate after each coding work item completes</span>' +
+        '</label>' +
+        '<div data-checkout-hybrid-error="' + escHtml(p.name) + '" style="display:none;margin-top:6px;color:var(--red);font-size:var(--text-xs)">Select at least one work-item type to validate live.</div>' +
+      '</div>';
     var worktreeModeBlock =
       '<div data-search="' + escHtml(wtModeSearch) + '" style="margin-bottom:6px">' +
         '<label style="font-size:var(--text-sm);color:var(--muted);display:block;margin-bottom:2px">Checkout mode</label>' +
         '<select id="set-checkoutMode-' + escHtml(p.name) + '" data-checkout-mode-select="' + escHtml(p.name) + '" style="width:100%;padding:4px 6px;background:var(--surface);border:1px solid var(--border);border-radius:4px;color:var(--text);font-size:var(--text-md)">' +
-          '<option value="worktree" title="Each dispatch runs in its own isolated git worktree. Fully parallel, never touches your working directory."' + (currentWtMode === 'worktree' ? ' selected' : '') + '>Worktree (default)</option>' +
-          '<option value="live" title="Agents run in-place in the project folder. One mutating dispatch at a time; refuses to run on a dirty tree."' + (currentWtMode === 'live' ? ' selected' : '') + '>Live checkout</option>' +
+          '<option value="worktree" title="Each dispatch runs in its own isolated git worktree. Fully parallel, never touches your working directory."' + (currentCheckoutMode === 'worktree' ? ' selected' : '') + '>Worktree (default)</option>' +
+          '<option value="live" title="Agents run in-place in the project folder. One mutating dispatch at a time; refuses to run on a dirty tree."' + (currentCheckoutMode === 'live' ? ' selected' : '') + '>Live checkout</option>' +
+          '<option value="hybrid" title="Coding work authors in isolated worktrees; only a chosen validation step runs on the real checkout."' + (currentCheckoutMode === 'hybrid' ? ' selected' : '') + '>Hybrid dispatch</option>' +
         '</select>' +
-        '<div data-checkout-mode-chip="' + escHtml(p.name) + '" style="' + (currentWtMode === 'live' ? '' : 'display:none;') + 'margin-top:6px;padding:6px 8px;background:rgba(234,179,8,0.12);border:1px solid var(--yellow);border-radius:4px;color:var(--yellow);font-size:var(--text-xs);line-height:1.4">' +
+        '<div data-checkout-mode-chip="' + escHtml(p.name) + '" style="' + (currentCheckoutMode === 'live' ? '' : 'display:none;') + 'margin-top:6px;padding:6px 8px;background:rgba(234,179,8,0.12);border:1px solid var(--yellow);border-radius:4px;color:var(--yellow);font-size:var(--text-xs);line-height:1.4">' +
           '⚠ Live mode: dispatches run directly in this repo\'s checkout. Only one mutating dispatch runs at a time. Dirty working trees block dispatch — commit or stash before running.' +
         '</div>' +
+        hybridPanel +
       '</div>';
     // W-mqtvnnj1000357fa — per-project live-checkout auto-stash override.
     // Tri-state: "" (use fleet default → engine.liveCheckoutAutoStash), "on"
@@ -715,12 +752,17 @@ async function openSettings() {
   // chip is rendered once with display:none for worktree-mode projects and
   // visible for already-live projects; this handler only flips the
   // display style — no markup is regenerated.
+  // W-mr9mx93d000x1dda — also reveal/hide the Hybrid sub-panel: the live chip
+  // shows for 'live', the hybrid panel (type checkboxes + auto-validate) shows
+  // for 'hybrid', neither for 'worktree'.
   document.querySelectorAll('[data-checkout-mode-select]').forEach(function(sel) {
     sel.addEventListener('change', function() {
       const projName = sel.getAttribute('data-checkout-mode-select');
-      const chip = document.querySelector('[data-checkout-mode-chip="' + (window.CSS && CSS.escape ? CSS.escape(projName) : projName) + '"]');
-      if (!chip) return;
-      chip.style.display = (sel.value === 'live') ? '' : 'none';
+      const esc = (window.CSS && CSS.escape ? CSS.escape(projName) : projName);
+      const chip = document.querySelector('[data-checkout-mode-chip="' + esc + '"]');
+      if (chip) chip.style.display = (sel.value === 'live') ? '' : 'none';
+      const hybridPanel = document.querySelector('[data-checkout-hybrid-panel="' + esc + '"]');
+      if (hybridPanel) hybridPanel.style.display = (sel.value === 'hybrid') ? '' : 'none';
     });
   });
 }
@@ -1165,18 +1207,48 @@ async function saveSettings() {
     });
 
     const currentProjects = (_settingsData && Array.isArray(_settingsData.projects)) ? _settingsData.projects : [];
+    // W-mr9mx93d000x1dda — collect per-project hybrid validation errors so a
+    // Hybrid selection with zero checked types blocks the whole save with an
+    // inline error (mirrors the Projects-bar picker's "require >=1 type" guard)
+    // rather than silently POSTing an empty/absent liveValidation.
+    const hybridValidationErrors = [];
     const projectsPayload = currentProjects.map(function(p) {
       // W-mpg3whgp000d09ec / #2732 — mainBranch is now editable from Settings →
       // Projects. Empty string = clear the override; the field stays optional.
       const mainBranchInput = document.getElementById('set-mainBranch-' + p.name);
       const mainBranchValue = mainBranchInput ? mainBranchInput.value.trim() : (p.mainBranch || '');
       // P-a3f9b207 (consolidated W-mqiaw974) — per-project checkoutMode.
-      // Normalize to 'worktree' for any value other than 'live' so a stale DOM
-      // never POSTs garbage; the server-side validator
-      // (shared.validateCheckoutMode) is the authoritative gate for unknown
-      // values.
+      // W-mr9mx93d000x1dda — the select now carries THREE UI values:
+      // 'worktree' | 'live' | 'hybrid'. Both 'live' and 'hybrid' persist as the
+      // server enum checkoutMode:'live'; hybrid additionally carries a
+      // liveValidation block. Any unknown value normalizes to 'worktree' so a
+      // stale DOM never POSTs garbage (shared.validateCheckoutMode /
+      // shared.validateLiveValidation are the authoritative server gates).
       const wtModeInput = document.getElementById('set-checkoutMode-' + p.name);
-      const wtModeValue = (wtModeInput && wtModeInput.value === 'live') ? 'live' : 'worktree';
+      const uiMode = wtModeInput ? wtModeInput.value : 'worktree';
+      const isHybrid = uiMode === 'hybrid';
+      const checkoutMode = (uiMode === 'live' || uiMode === 'hybrid') ? 'live' : 'worktree';
+      // liveValidation: an explicit block for hybrid, else explicit null. Always
+      // sending the key (never omitting it) matches the Projects-bar picker
+      // (_applyCheckoutModeChange) contract EXACTLY and guarantees a Settings
+      // save can never silently leave a stale hybrid block on a project the
+      // operator just moved to Worktrees/Live checkout.
+      let liveValidation = null;
+      if (isHybrid) {
+        const esc = (window.CSS && CSS.escape ? CSS.escape(p.name) : p.name);
+        const typeEls = document.querySelectorAll('[data-live-validation-type="' + esc + '"]');
+        const types = [];
+        typeEls.forEach(function(el) { if (el && el.checked) types.push(el.value); });
+        const errEl = document.querySelector('[data-checkout-hybrid-error="' + esc + '"]');
+        if (types.length === 0) {
+          hybridValidationErrors.push(p.name);
+          if (errEl) errEl.style.display = '';
+        } else {
+          if (errEl) errEl.style.display = 'none';
+          const autoEl = document.getElementById('set-liveValidationAutoDispatch-' + p.name);
+          liveValidation = { type: types, autoDispatch: !!(autoEl && autoEl.checked) };
+        }
+      }
       // W-mqtvnnj1000357fa — per-project live-checkout auto-stash override.
       // '' → null (clear override, fall back to engine fleet setting); 'on' →
       // true; 'off' → false. The server deletes the field on null and validates
@@ -1187,7 +1259,8 @@ async function saveSettings() {
       return {
         name: p.name,
         mainBranch: mainBranchValue || null,
-        checkoutMode: wtModeValue,
+        checkoutMode: checkoutMode,
+        liveValidation: liveValidation,
         liveCheckoutAutoStash: autoStashValue,
         workSources: {
           pullRequests: { enabled: document.getElementById('set-ws-prs-' + p.name)?.checked ?? true },
@@ -1196,6 +1269,10 @@ async function saveSettings() {
       };
     });
 
+    if (hybridValidationErrors.length > 0) {
+      throw new Error('Hybrid dispatch needs at least one validation work-item type for: ' + hybridValidationErrors.join(', '));
+    }
+
     // Save config
     const res = await fetch('/api/settings', {
       method: 'POST', headers: { 'Content-Type': 'application/json' },

package/dashboard.js

@@ -11037,6 +11037,15 @@ What would you like to discuss or change? When you're happy, say "approve" and I
           // the per-project dropdown. resolveCheckoutMode honors the legacy
           // worktreeMode field; 'worktree' (default) or 'live'.
           checkoutMode: shared.resolveCheckoutMode(p),
+          // W-mr9mx93d000x1dda — surface the hybrid liveValidation config
+          // (type(s) + autoDispatch) so the Settings → Projects checkout-mode
+          // control can pre-fill its Hybrid sub-panel authoritatively (mirrors
+          // the /api/status project mapping the Projects-bar picker reads).
+          // Only meaningful under checkoutMode:'live'; null/false otherwise.
+          liveValidationType: (shared.resolveCheckoutMode(p) === 'live' && p.liveValidation && p.liveValidation.type)
+            ? p.liveValidation.type
+            : null,
+          liveValidationAutoDispatch: !!(shared.resolveCheckoutMode(p) === 'live' && p.liveValidation && p.liveValidation.autoDispatch === true),
           // W-mqtvnnj1000357fa — surface the RAW per-project auto-stash override
           // (true / false / undefined) so the Settings UI can pre-select the
           // tri-state dropdown. Undefined means "use fleet default"

package/package.json

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