@yemi33/minions 0.1.1901 → 0.1.1903

package/dashboard/js/render-watches.js

@@ -51,6 +51,20 @@ const _WATCH_CONDITION_LABELS = {
   enabled: 'Enabled',
   disabled: 'Disabled',
   'activity-change': 'Activity Change',
+  // P-w4e2f6a1 — Phase 2.1: PR predicate conditions
+  'head-commit-change': 'Head Commit Changed',
+  'mergeable-flipped': 'Mergeable Flipped',
+  'ready-for-merge': 'Ready For Merge',
+  'behind-master': 'Behind Master',
+  'draft-flipped': 'Draft Flipped',
+  // P-w5b8d2c9 — Phase 2.2: work-item / plan / pipeline predicate conditions
+  stalled: 'Stalled',
+  'retry-limit-reached': 'Retry Limit Reached',
+  'dependency-met': 'Dependency Met',
+  'all-items-done': 'All Items Done',
+  'item-failed-n-times': 'Item Failed N Times',
+  'stage-advanced': 'Stage Advanced',
+  'stuck-in-stage': 'Stuck In Stage',
 };
 
 function _conditionLabel(cond) {
@@ -176,6 +190,79 @@ function _watchNext() { var tp = Math.ceil((window._lastWatches || []).length /
 
 // ─── Detail Modal ───────────────────────────────────────────────────────────
 
+// P-w14e7a8c — Phase 7.1: render the action/chain block for the detail modal.
+// Single-object action prints one step (parity with legacy view); array-form
+// chain prints each step indexed. Each step surfaces guard.expr when present
+// so users can verify the editor round-tripped through engine/watches.js.
+function _renderWatchActionDetail(action) {
+  if (!action) return '';
+  if (Array.isArray(action)) {
+    if (action.length === 0) return '';
+    var stepHtml = action.map(function(step, i) {
+      return '<div style="margin-top:4px;padding:8px;background:var(--surface2);border-radius:4px">' +
+        '<div style="font-size:11px;color:var(--muted)">Step ' + (i + 1) + '</div>' +
+        '<div style="font-size:12px"><strong>Type:</strong> <span class="dispatch-type explore">' + escHtml(step && step.type ? step.type : '?') + '</span></div>' +
+        (step && step.guard && step.guard.expr ? '<div style="font-size:11px;margin-top:2px"><strong>Guard:</strong> <code>' + escHtml(step.guard.expr) + '</code></div>' : '') +
+        (step && step.params && Object.keys(step.params).length ? '<div style="margin-top:4px;font-size:11px;font-family:monospace;white-space:pre-wrap">' + escHtml(JSON.stringify(step.params, null, 2)) + '</div>' : '') +
+        '</div>';
+    }).join('');
+    return '<div><strong style="color:var(--muted)">Follow-up Action Chain (' + action.length + ' step' + (action.length === 1 ? '' : 's') + '):</strong>' + stepHtml + '</div>';
+  }
+  if (action.type) {
+    return '<div><strong style="color:var(--muted)">Follow-up Action:</strong> <span class="dispatch-type explore">' + escHtml(action.type) + '</span>' +
+      (action.guard && action.guard.expr ? '<div style="font-size:11px;margin-top:2px"><strong>Guard:</strong> <code>' + escHtml(action.guard.expr) + '</code></div>' : '') +
+      (action.params && Object.keys(action.params).length ? '<div style="margin-top:4px;padding:8px;background:var(--surface2);border-radius:4px;font-size:11px;font-family:monospace;white-space:pre-wrap">' + escHtml(JSON.stringify(action.params, null, 2)) + '</div>' : '') +
+      '</div>';
+  }
+  return '';
+}
+
+// P-w14e7a8c — Phase 7.1: render the cross-target requires[] block for the
+// detail modal. Empty / missing requires renders nothing.
+function _renderWatchRequiresDetail(requires) {
+  if (!Array.isArray(requires) || requires.length === 0) return '';
+  var rows = requires.map(function(r, i) {
+    return '<div style="margin-top:4px;padding:6px 8px;background:var(--surface2);border-radius:4px;font-size:11px">' +
+      '<span style="color:var(--muted)">[' + (i + 1) + ']</span> ' +
+      escHtml(r && r.target ? r.target : '?') +
+      ' <span class="dispatch-type explore">' + escHtml(r && r.targetType ? r.targetType : '?') + '</span>' +
+      ' <span style="color:var(--blue)">' + escHtml(_conditionLabel(r && r.condition ? r.condition : '?')) + '</span>' +
+      '</div>';
+  }).join('');
+  return '<div><strong style="color:var(--muted)">Requires (AND-join, ' + requires.length + '):</strong>' + rows + '</div>';
+}
+
+// P-w15f1d4b — Phase 7.2: render the evaluation history block for the detail
+// modal. `history` is the Phase 6.2 `_history` array shape
+// `[{checked_at, fired, reason, condition}]` (oldest-first, capped at 25 by
+// the engine). The lazy fetcher in openWatchDetail injects the rendered HTML
+// into a `watch-history-<id>` placeholder div once /api/watches/:id/history
+// resolves. Empty / missing arrays render a "no checks yet" hint so legacy
+// watches that were created before Phase 6.2 don't show a half-empty table.
+function _renderWatchHistoryDetail(history) {
+  if (!Array.isArray(history) || history.length === 0) {
+    return '<div style="color:var(--muted);font-style:italic;font-size:11px">no history yet — watch has not been checked, or pre-dates the history feature</div>';
+  }
+  // Render newest-first for readability — the engine stores oldest-first.
+  var entries = history.slice().reverse();
+  var rows = entries.map(function(entry) {
+    var fired = !!(entry && entry.fired);
+    var ts = entry && entry.checked_at ? formatLocalDateTime(entry.checked_at) : '?';
+    var reason = entry && entry.reason ? entry.reason : '';
+    var indicator = fired
+      ? '<span style="color:var(--green)" title="fired">✓ fired</span>'
+      : '<span style="color:var(--muted)" title="not fired">·</span>';
+    return '<tr>' +
+      '<td style="padding:2px 8px 2px 0;color:var(--muted);white-space:nowrap">' + escHtml(ts) + '</td>' +
+      '<td style="padding:2px 8px 2px 0;white-space:nowrap">' + indicator + '</td>' +
+      '<td style="padding:2px 0;color:var(--text)">' + escHtml(reason) + '</td>' +
+    '</tr>';
+  }).join('');
+  return '<div><strong style="color:var(--muted)">Evaluation History (' + history.length + ' check' + (history.length === 1 ? '' : 's') + ', newest first):</strong>' +
+    '<table style="margin-top:4px;font-size:11px;border-collapse:collapse;width:100%"><tbody>' + rows + '</tbody></table>' +
+    '</div>';
+}
+
 function openWatchDetail(id) {
   var w = (window._lastWatches || []).find(function(x) { return x.id === id; });
   if (!w) return;
@@ -204,9 +291,14 @@ function openWatchDetail(id) {
     '<div><strong style="color:var(--muted)">Notify:</strong> ' + escHtml(w.notify || 'inbox') + '</div>' +
     '<div><strong style="color:var(--muted)">Triggers:</strong> ' + (w.triggerCount || 0) + (w.stopAfter > 0 ? ' / ' + w.stopAfter + ' (expires after)' : ' (runs forever)') + '</div>' +
     (w.onNotMet ? '<div><strong style="color:var(--muted)">On Each Poll (not met):</strong> ' + escHtml(w.onNotMet) + '</div>' : '') +
-    (w.action && w.action.type ? '<div><strong style="color:var(--muted)">Follow-up Action:</strong> <span class="dispatch-type explore">' + escHtml(w.action.type) + '</span>' +
-      (w.action.params && Object.keys(w.action.params).length ? '<div style="margin-top:4px;padding:8px;background:var(--surface2);border-radius:4px;font-size:11px;font-family:monospace;white-space:pre-wrap">' + escHtml(JSON.stringify(w.action.params, null, 2)) + '</div>' : '') +
-      '</div>' : '') +
+    // P-w14e7a8c — Phase 7.1: render single action OR array-form chain.
+    // Each step shows its type, params, and (if present) guard expression
+    // so users can verify that the chain editor round-tripped through the
+    // back-end (engine/watches.js createWatch persists the shape unchanged).
+    _renderWatchActionDetail(w.action) +
+    // P-w14e7a8c — Phase 7.1: render cross-target requirements list when
+    // the watch carries a non-empty requires[] from the editor.
+    _renderWatchRequiresDetail(w.requires) +
     (w._lastActionResult ? '<div><strong style="color:var(--muted)">Last Action Result:</strong> <span style="color:' + (w._lastActionResult.ok ? 'var(--green)' : 'var(--red)') + '">' + (w._lastActionResult.ok ? 'OK' : 'FAILED') + '</span> — ' + escHtml(w._lastActionResult.summary || '') + (w._lastActionResult.dispatchedItemId ? ' (dispatched: ' + escHtml(w._lastActionResult.dispatchedItemId) + ')' : '') + '</div>' : '') +
     '<div><strong style="color:var(--muted)">Created:</strong> ' + escHtml(createdAt) + '</div>' +
     '<div><strong style="color:var(--muted)">Last Checked:</strong> ' + escHtml(lastChecked) + '</div>' +
@@ -214,12 +306,38 @@ function openWatchDetail(id) {
     (w._lastTriggerMessage ? '<div><strong style="color:var(--muted)">Last Trigger Message:</strong><div style="margin-top:4px;padding:8px;background:var(--surface2);border-radius:4px;font-size:11px">' + escHtml(w._lastTriggerMessage) + '</div></div>' : '') +
     (w.project ? '<div><strong style="color:var(--muted)">Project:</strong> ' + escHtml(w.project) + '</div>' : '') +
     (w.description ? '<div><strong style="color:var(--muted)">Description:</strong> ' + escHtml(w.description) + '</div>' : '') +
+    // P-w15f1d4b — Phase 7.2: reserve a placeholder for the lazily-fetched
+    // evaluation history table. The fetch below populates it once
+    // /api/watches/:id/history resolves; failures fall back to the inline
+    // _history copy from /api/watches (best-effort) or a "no history" hint.
+    '<div id="watch-history-' + escHtml(w.id) + '"><div style="color:var(--muted);font-style:italic;font-size:11px">Loading history…</div></div>' +
   '</div>';
 
   document.getElementById('modal-body').innerHTML = body;
   document.getElementById('modal-body').style.whiteSpace = 'normal';
   document.getElementById('modal-body').style.fontFamily = "'Segoe UI', system-ui, sans-serif";
   document.getElementById('modal').classList.add('open');
+
+  // P-w15f1d4b — Phase 7.2: lazy history fetch. We don't block modal render
+  // on this — the placeholder above is replaced once /api/watches/:id/history
+  // resolves. On failure, fall back to whatever _history is already inline
+  // on the watch object (often present from the most recent /api/watches
+  // poll) so legacy watches still surface what they have locally.
+  (function loadHistory() {
+    var container = document.getElementById('watch-history-' + w.id);
+    if (!container) return;
+    fetch('/api/watches/' + encodeURIComponent(w.id) + '/history').then(function(res) {
+      if (!res.ok) throw new Error('HTTP ' + res.status);
+      return res.json();
+    }).then(function(data) {
+      if (!container.isConnected) return; // user closed the modal
+      container.innerHTML = _renderWatchHistoryDetail(data && data.history);
+    }).catch(function() {
+      if (!container.isConnected) return;
+      // Fall back to the inline _history from /api/watches (best-effort).
+      container.innerHTML = _renderWatchHistoryDetail(w._history || []);
+    });
+  })();
 }
 
 // ─── CRUD Actions ───────────────────────────────────────────────────────────
@@ -290,14 +408,6 @@ function _watchFormHtml() {
   var agentOpts = '<option value="">human</option>' + (cmdAgents || []).map(function(a) { return '<option value="' + escHtml(a.id) + '">' + escHtml(a.name) + '</option>'; }).join('');
   var projOpts = '<option value="">Any</option>' + (cmdProjects || []).map(function(p) { return '<option value="' + escHtml(p.name) + '">' + escHtml(p.name) + '</option>'; }).join('');
 
-  // Action picker: empty value = no follow-up action (legacy notify-only behavior).
-  var actionOpts = '<option value="">None — notify only</option>';
-  if (_watchActionTypesCache && _watchActionTypesCache.length) {
-    actionOpts += _watchActionTypesCache.map(function(a) {
-      return '<option value="' + escHtml(a.value) + '" title="' + escHtml(a.description || '') + '">' + escHtml(a.label) + '</option>';
-    }).join('');
-  }
-
   return '<div style="display:flex;flex-direction:column;gap:12px;font-family:inherit">' +
     '<div id="watch-form-error" style="display:none;color:var(--red);font-size:12px;padding:6px 10px;background:rgba(255,50,50,0.1);border-radius:var(--radius-sm)"></div>' +
     '<label style="color:var(--text);font-size:var(--text-md)">Target (e.g. PR number, work item ID, meeting/plan/schedule/pipeline/dispatch/agent ID)<input id="watch-edit-target" placeholder="e.g. 1057, W-abc123, M-xyz, schedule-42" style="' + inputStyle + '"></label>' +
@@ -309,19 +419,82 @@ function _watchFormHtml() {
     '<label style="color:var(--text);font-size:var(--text-md)">Description<input id="watch-edit-desc" placeholder="Optional description" style="' + inputStyle + '"></label>' +
     '<label style="color:var(--text);font-size:var(--text-md)">Stop After N Triggers <span style="font-size:10px;color:var(--muted)">(0 = run forever, 1 = expire on first match)</span><input id="watch-edit-stop-after" type="number" value="0" min="0" style="' + inputStyle + '"></label>' +
     '<label style="color:var(--text);font-size:var(--text-md)">On Each Poll (if condition not met)<select id="watch-edit-on-not-met" style="' + inputStyle + '"><option value="">None — do nothing</option><option value="notify">Notify — write to inbox each poll</option></select></label>' +
-    '<label style="color:var(--text);font-size:var(--text-md)">Follow-up Action <span style="font-size:10px;color:var(--muted)">(runs after the inbox notification when the watch fires)</span><select id="watch-edit-action-type" style="' + inputStyle + '" onchange="_updateWatchActionParamsHint()">' + actionOpts + '</select></label>' +
-    '<label style="color:var(--text);font-size:var(--text-md)" id="watch-edit-action-params-label" style="display:none">Action Params (JSON) <span style="font-size:10px;color:var(--muted)" id="watch-edit-action-params-hint"></span><textarea id="watch-edit-action-params" rows="4" placeholder=\'{"title": "Re-check {{target}} after merge", "type": "verify"}\' style="' + inputStyle + ';font-family:monospace"></textarea></label>' +
+    // P-w14e7a8c — Phase 7.1: action chain editor (step list + add/remove)
+    '<div style="border:1px solid var(--border);border-radius:var(--radius-sm);padding:10px;display:flex;flex-direction:column;gap:8px">' +
+      '<div style="color:var(--text);font-size:var(--text-md);display:flex;align-items:center;justify-content:space-between">' +
+        '<span>Follow-up Action(s) <span style="font-size:10px;color:var(--muted)">(runs after the inbox notification when the watch fires; 1 step = single, 2+ = chain)</span></span>' +
+        '<button type="button" class="pr-pager-btn" style="font-size:10px;padding:2px 8px;color:var(--green);border-color:var(--green)" onclick="_addWatchStepRow()">+ Add step</button>' +
+      '</div>' +
+      '<div id="watch-edit-steps"></div>' +
+    '</div>' +
+    // P-w14e7a8c — Phase 7.1: requires editor (cross-target AND-join rows)
+    '<div style="border:1px solid var(--border);border-radius:var(--radius-sm);padding:10px;display:flex;flex-direction:column;gap:8px">' +
+      '<div style="color:var(--text);font-size:var(--text-md);display:flex;align-items:center;justify-content:space-between">' +
+        '<span>Requires <span style="font-size:10px;color:var(--muted)">(cross-target AND-join — every requirement must also be true to fire)</span></span>' +
+        '<button type="button" class="pr-pager-btn" style="font-size:10px;padding:2px 8px;color:var(--green);border-color:var(--green)" onclick="_addRequireRow()">+ Add requirement</button>' +
+      '</div>' +
+      '<div id="watch-edit-requires"></div>' +
+    '</div>' +
   '</div>';
 }
 
-// Refresh the action params textarea hint based on the selected action type.
-function _updateWatchActionParamsHint() {
-  var sel = document.getElementById('watch-edit-action-type');
-  var label = document.getElementById('watch-edit-action-params-label');
-  var hint = document.getElementById('watch-edit-action-params-hint');
-  if (!sel || !label || !hint) return;
-  if (!sel.value) { label.style.display = 'none'; return; }
-  label.style.display = '';
+// P-w14e7a8c — Phase 7.1: action chain step editor.
+// Renders a single step block with type / params / guard inputs into the
+// container at #watch-edit-steps. Step indexes are stable per-block so the
+// remove button can target the right node; the submit handler walks live
+// rows (not these indexes) and packs them into a single object (1 step) or
+// array (2+ steps) before sending to /api/watches.
+var _watchStepSeq = 0;
+function _addWatchStepRow(initial) {
+  var container = document.getElementById('watch-edit-steps');
+  if (!container) return;
+  _watchStepSeq += 1;
+  var idx = _watchStepSeq;
+  var inputStyle = 'display:block;width:100%;margin-top:4px;padding:6px 8px;background:var(--bg);border:1px solid var(--border);border-radius:var(--radius-sm);color:var(--text);font-size:var(--text-md);font-family:inherit';
+  var actionOpts = '<option value="">— select action —</option>';
+  if (_watchActionTypesCache && _watchActionTypesCache.length) {
+    actionOpts += _watchActionTypesCache.map(function(a) {
+      return '<option value="' + escHtml(a.value) + '" title="' + escHtml(a.description || '') + '">' + escHtml(a.label) + '</option>';
+    }).join('');
+  }
+  var initType = (initial && initial.type) || '';
+  var initParams = initial && initial.params ? JSON.stringify(initial.params, null, 2) : '';
+  var initGuard = initial && initial.guard && initial.guard.expr ? initial.guard.expr : '';
+  var row = document.createElement('div');
+  row.className = 'watch-step-row';
+  row.setAttribute('data-step-idx', String(idx));
+  row.style.cssText = 'border:1px solid var(--border);border-radius:var(--radius-sm);padding:8px;display:flex;flex-direction:column;gap:6px;background:var(--surface)';
+  row.innerHTML =
+    '<div style="display:flex;align-items:center;justify-content:space-between;gap:8px">' +
+      '<select id="watch-step-' + idx + '-type" style="' + inputStyle + ';margin-top:0;flex:1" onchange="_updateWatchStepParamsHint(' + idx + ')">' + actionOpts + '</select>' +
+      '<button type="button" class="pr-pager-btn" style="font-size:10px;padding:2px 8px;color:var(--red);border-color:var(--red)" onclick="_removeWatchStepRow(' + idx + ')">Remove</button>' +
+    '</div>' +
+    '<label style="color:var(--text);font-size:11px">Params (JSON) <span style="font-size:10px;color:var(--muted)" id="watch-step-' + idx + '-params-hint"></span>' +
+      '<textarea id="watch-step-' + idx + '-params" rows="3" placeholder=\'{"title": "Re-check {{target}} after merge"}\' style="' + inputStyle + ';font-family:monospace"></textarea>' +
+    '</label>' +
+    '<label style="color:var(--text);font-size:11px">Guard expression <span style="font-size:10px;color:var(--muted)">(optional — skip step if expr is false; e.g. <code>newState.mergeable === true</code>)</span>' +
+      '<input id="watch-step-' + idx + '-guard" placeholder="" style="' + inputStyle + ';font-family:monospace">' +
+    '</label>';
+  container.appendChild(row);
+  if (initType) document.getElementById('watch-step-' + idx + '-type').value = initType;
+  if (initParams) document.getElementById('watch-step-' + idx + '-params').value = initParams;
+  if (initGuard) document.getElementById('watch-step-' + idx + '-guard').value = initGuard;
+  _updateWatchStepParamsHint(idx);
+}
+
+function _removeWatchStepRow(idx) {
+  var row = document.querySelector('.watch-step-row[data-step-idx="' + idx + '"]');
+  if (row && row.parentNode) row.parentNode.removeChild(row);
+}
+
+// Refresh the hint next to a single step's params textarea based on its
+// currently selected action type. Same registry-driven hint as the legacy
+// single-action form (kept for parity).
+function _updateWatchStepParamsHint(idx) {
+  var sel = document.getElementById('watch-step-' + idx + '-type');
+  var hint = document.getElementById('watch-step-' + idx + '-params-hint');
+  if (!sel || !hint) return;
+  if (!sel.value) { hint.textContent = ''; return; }
   var entry = (_watchActionTypesCache || []).find(function(a) { return a.value === sel.value; });
   if (!entry) { hint.textContent = ''; return; }
   var paramHints = (entry.params || []).map(function(p) {
@@ -330,6 +503,60 @@ function _updateWatchActionParamsHint() {
   hint.textContent = paramHints ? '— ' + paramHints : '';
 }
 
+// P-w14e7a8c — Phase 7.1: requires-row editor.
+// Each row is one cross-target requirement: {target, targetType, condition}.
+// Per the engine contract (engine/watches.js _validateRequires) requirements
+// MUST NOT themselves declare nested requires — the form intentionally
+// surfaces only the three fields the back-end accepts.
+var _watchRequireSeq = 0;
+function _addRequireRow(initial) {
+  var container = document.getElementById('watch-edit-requires');
+  if (!container) return;
+  _watchRequireSeq += 1;
+  var idx = _watchRequireSeq;
+  var inputStyle = 'display:block;width:100%;margin-top:4px;padding:6px 8px;background:var(--bg);border:1px solid var(--border);border-radius:var(--radius-sm);color:var(--text);font-size:var(--text-md);font-family:inherit';
+  var targetTypes = _watchTargetTypesCache && _watchTargetTypesCache.length ? _watchTargetTypesCache : [];
+  var ttOpts = '<option value="">— targetType —</option>' + targetTypes.map(function(t) {
+    return '<option value="' + escHtml(t.value) + '">' + escHtml(t.label) + '</option>';
+  }).join('');
+  var initTarget = (initial && initial.target) || '';
+  var initTT = (initial && initial.targetType) || '';
+  var initCond = (initial && initial.condition) || '';
+  var row = document.createElement('div');
+  row.className = 'watch-require-row';
+  row.setAttribute('data-require-idx', String(idx));
+  row.style.cssText = 'display:grid;grid-template-columns:1fr 1fr 1fr auto;gap:6px;align-items:end';
+  row.innerHTML =
+    '<label style="color:var(--text);font-size:11px;margin:0">Target<input id="watch-require-' + idx + '-target" placeholder="e.g. PR-123, pipeline-X" style="' + inputStyle + '"></label>' +
+    '<label style="color:var(--text);font-size:11px;margin:0">Target Type<select id="watch-require-' + idx + '-target-type" style="' + inputStyle + '" onchange="_updateRequireConditionOptions(' + idx + ')">' + ttOpts + '</select></label>' +
+    '<label style="color:var(--text);font-size:11px;margin:0">Condition<select id="watch-require-' + idx + '-condition" style="' + inputStyle + '"></select></label>' +
+    '<button type="button" class="pr-pager-btn" style="font-size:10px;padding:6px 8px;color:var(--red);border-color:var(--red)" onclick="_removeRequireRow(' + idx + ')">Remove</button>';
+  container.appendChild(row);
+  if (initTarget) document.getElementById('watch-require-' + idx + '-target').value = initTarget;
+  if (initTT) document.getElementById('watch-require-' + idx + '-target-type').value = initTT;
+  _updateRequireConditionOptions(idx);
+  if (initCond) document.getElementById('watch-require-' + idx + '-condition').value = initCond;
+}
+
+function _removeRequireRow(idx) {
+  var row = document.querySelector('.watch-require-row[data-require-idx="' + idx + '"]');
+  if (row && row.parentNode) row.parentNode.removeChild(row);
+}
+
+// Per-row condition refresh — mirrors _updateWatchConditionOptions for the
+// primary watch's condition select but scoped to the requirement row.
+function _updateRequireConditionOptions(idx) {
+  var ttSel = document.getElementById('watch-require-' + idx + '-target-type');
+  var condSel = document.getElementById('watch-require-' + idx + '-condition');
+  if (!ttSel || !condSel || !_watchTargetTypesCache) return;
+  var entry = _watchTargetTypesCache.find(function(t) { return t.value === ttSel.value; });
+  var conditions = (entry && entry.conditions) || [];
+  condSel.innerHTML = (conditions.length ? '' : '<option value="">— select target type first —</option>') +
+    conditions.map(function(c) {
+      return '<option value="' + escHtml(c) + '">' + escHtml(_conditionLabel(c)) + '</option>';
+    }).join('');
+}
+
 // Refresh the condition <select> based on the currently selected target type.
 function _updateWatchConditionOptions() {
   var ttSel = document.getElementById('watch-edit-target-type');
@@ -349,6 +576,11 @@ function _renderCreateWatchModal() {
   document.getElementById('modal-body').style.whiteSpace = 'normal';
   document.getElementById('modal-body').style.fontFamily = "'Segoe UI', system-ui, sans-serif";
   document.getElementById('modal').classList.add('open');
+  // P-w14e7a8c — Phase 7.1: seed one empty action step row so the picker is
+  // visible by default (matches today's UX where the action <select> is
+  // always visible). Users who want notify-only just leave the type empty
+  // (or click Remove); users who want a chain click "+ Add step" again.
+  _addWatchStepRow();
 }
 
 function openCreateWatchModal() {
@@ -389,44 +621,84 @@ function submitWatch() {
   var description = (document.getElementById('watch-edit-desc') || {}).value || '';
   var stopAfter = parseInt((document.getElementById('watch-edit-stop-after') || {}).value, 10) || 0;
   var onNotMet = (document.getElementById('watch-edit-on-not-met') || {}).value || '';
-  var actionType = (document.getElementById('watch-edit-action-type') || {}).value || '';
-  var actionParamsRaw = (document.getElementById('watch-edit-action-params') || {}).value || '';
 
   var errEl = document.getElementById('watch-form-error');
   function showErr(msg) { if (errEl) { errEl.textContent = msg; errEl.style.display = 'block'; } }
 
   if (!target.trim()) { showErr('Target is required'); return; }
 
-  var action = null;
-  if (actionType) {
-    var params = {};
-    if (actionParamsRaw.trim()) {
-      try { params = JSON.parse(actionParamsRaw); }
-      catch (e) { showErr('Action Params must be valid JSON: ' + e.message); return; }
-      if (params === null || typeof params !== 'object' || Array.isArray(params)) {
-        showErr('Action Params must be a JSON object'); return;
+  // P-w14e7a8c — Phase 7.1: harvest action steps from the chain editor.
+  // 0 steps -> action: null (notify-only legacy behavior).
+  // 1 step  -> action: { type, params, guard? } (single-object form).
+  // 2+ steps -> action: [ {...}, ... ] (array-form chain — engine/watch-actions.js
+  //             runWatchActionChain handles it).
+  var stepRows = document.querySelectorAll('.watch-step-row');
+  var steps = [];
+  for (var i = 0; i < stepRows.length; i++) {
+    var row = stepRows[i];
+    var stepIdx = row.getAttribute('data-step-idx');
+    var typeEl = document.getElementById('watch-step-' + stepIdx + '-type');
+    var paramsEl = document.getElementById('watch-step-' + stepIdx + '-params');
+    var guardEl = document.getElementById('watch-step-' + stepIdx + '-guard');
+    var sType = typeEl && typeEl.value ? typeEl.value : '';
+    if (!sType) continue; // empty type → blank row, skip silently
+    var sParamsRaw = paramsEl ? paramsEl.value : '';
+    var sParams = {};
+    if (sParamsRaw && sParamsRaw.trim()) {
+      try { sParams = JSON.parse(sParamsRaw); }
+      catch (e) { showErr('Step ' + (steps.length + 1) + ' params must be valid JSON: ' + e.message); return; }
+      if (sParams === null || typeof sParams !== 'object' || Array.isArray(sParams)) {
+        showErr('Step ' + (steps.length + 1) + ' params must be a JSON object'); return;
       }
     }
-    action = { type: actionType, params: params };
+    var step = { type: sType, params: sParams };
+    var sGuard = guardEl && guardEl.value ? guardEl.value.trim() : '';
+    if (sGuard) step.guard = { expr: sGuard };
+    steps.push(step);
   }
+  var action = null;
+  if (steps.length === 1) action = steps[0];
+  else if (steps.length > 1) action = steps;
+
+  // P-w14e7a8c — Phase 7.1: harvest cross-target requirements. Skip rows
+  // with no target (treat as empty/blank). Send `requires: []` (omit) when
+  // there are no usable rows so the back-end stays in legacy single-watch
+  // shape — engine/watches.js _validateRequires accepts both null and [].
+  var reqRows = document.querySelectorAll('.watch-require-row');
+  var requires = [];
+  for (var j = 0; j < reqRows.length; j++) {
+    var rrow = reqRows[j];
+    var rIdx = rrow.getAttribute('data-require-idx');
+    var rTarget = (document.getElementById('watch-require-' + rIdx + '-target') || {}).value || '';
+    var rType = (document.getElementById('watch-require-' + rIdx + '-target-type') || {}).value || '';
+    var rCond = (document.getElementById('watch-require-' + rIdx + '-condition') || {}).value || '';
+    if (!rTarget.trim() && !rType && !rCond) continue; // wholly blank row, skip
+    if (!rTarget.trim()) { showErr('Requirement ' + (requires.length + 1) + ': target is required'); return; }
+    if (!rType) { showErr('Requirement ' + (requires.length + 1) + ': target type is required'); return; }
+    if (!rCond) { showErr('Requirement ' + (requires.length + 1) + ': condition is required'); return; }
+    requires.push({ target: rTarget.trim(), targetType: rType, condition: rCond });
+  }
+
+  var payload = {
+    target: target.trim(),
+    targetType: targetType,
+    condition: condition,
+    interval: interval,
+    owner: owner || 'human',
+    project: project || null,
+    description: description || null,
+    notify: 'inbox',
+    stopAfter: stopAfter,
+    onNotMet: onNotMet || null,
+    action: action,
+  };
+  if (requires.length > 0) payload.requires = requires;
 
   showToast('cmd-toast', 'Creating watch...', true);
   fetch('/api/watches', {
     method: 'POST',
     headers: { 'Content-Type': 'application/json' },
-    body: JSON.stringify({
-      target: target.trim(),
-      targetType: targetType,
-      condition: condition,
-      interval: interval,
-      owner: owner || 'human',
-      project: project || null,
-      description: description || null,
-      notify: 'inbox',
-      stopAfter: stopAfter,
-      onNotMet: onNotMet || null,
-      action: action,
-    })
+    body: JSON.stringify(payload)
   }).then(async function(res) {
     var data = await res.json().catch(function() { return {}; });
     if (!res.ok || data.error) {
@@ -453,4 +725,15 @@ window.MinionsWatches = {
   _watchPrev: _watchPrev,
   _watchNext: _watchNext,
   _updateWatchConditionOptions: _updateWatchConditionOptions,
+  // P-w14e7a8c — Phase 7.1: chain + requires editor handlers (called from
+  // inline onclick attributes generated by _watchFormHtml / _addWatchStepRow
+  // / _addRequireRow). Exposed on the namespace for testability.
+  _addWatchStepRow: _addWatchStepRow,
+  _removeWatchStepRow: _removeWatchStepRow,
+  _updateWatchStepParamsHint: _updateWatchStepParamsHint,
+  _addRequireRow: _addRequireRow,
+  _removeRequireRow: _removeRequireRow,
+  _updateRequireConditionOptions: _updateRequireConditionOptions,
+  // P-w15f1d4b — Phase 7.2: history table helper exposed for testability.
+  _renderWatchHistoryDetail: _renderWatchHistoryDetail,
 };

package/dashboard.js

@@ -6501,12 +6501,26 @@ What would you like to discuss or change? When you're happy, say "approve" and I
     return jsonReply(res, 200, { actionTypes: watchesMod.listActionTypes() });
   }
 
+  // P-w13c2b6f — Phase 6.3: surface the per-watch evaluation history
+  // (Phase 6.2's `_history` array) over an HTTP GET. Returns
+  // {id, history:[…]} for known ids and 404 otherwise. The handler is
+  // exported as `_handleWatchHistory` so unit tests can call it with a
+  // mock res without booting the full server.
+  async function handleWatchHistory(req, res, match) {
+    const id = match && match[1];
+    if (!id) return jsonReply(res, 400, { error: 'watch id required' });
+    const watch = watchesMod.getWatches().find(w => w.id === id);
+    if (!watch) return jsonReply(res, 404, { error: 'Watch not found' });
+    const history = Array.isArray(watch._history) ? watch._history : [];
+    return jsonReply(res, 200, { id, history });
+  }
+
   async function handleWatchesCreate(req, res) {
     const body = await readBody(req);
-    const { target, targetType, condition, interval, owner, description, project, notify, stopAfter, onNotMet, action } = body;
+    const { target, targetType, condition, interval, owner, description, project, notify, stopAfter, onNotMet, action, requires } = body;
     if (!target) return jsonReply(res, 400, { error: 'target is required' });
     try {
-      const watch = watchesMod.createWatch({ target, targetType, condition, interval, owner, description, project, notify, stopAfter, onNotMet, action });
+      const watch = watchesMod.createWatch({ target, targetType, condition, interval, owner, description, project, notify, stopAfter, onNotMet, action, requires });
       invalidateStatusCache();
       recordCcTurnIfPresent(req, {
         kind: 'watch', id: watch?.id || null, title: `Watch ${target}` + (condition ? ` (${condition})` : ''), project: project || null,
@@ -7536,6 +7550,7 @@ What would you like to discuss or change? When you're happy, say "approve" and I
     { method: 'GET', path: '/api/watches', desc: 'List all watches', handler: handleWatchesList },
     { method: 'GET', path: '/api/watches/target-types', desc: 'List registered watch target types and their valid conditions', handler: handleWatchesTargetTypes },
     { method: 'GET', path: '/api/watches/action-types', desc: 'List registered follow-up action types (notify, dispatch-work-item, webhook, ...)', handler: handleWatchesActionTypes },
+    { method: 'GET', path: /^\/api\/watches\/([\w-]+)\/history$/, template: '/api/watches/:id/history', desc: 'Read the persisted evaluation history (last 25 checks) for a watch', handler: handleWatchHistory },
     { method: 'POST', path: '/api/watches', desc: 'Create a new watch', params: 'target, targetType, condition, interval?, owner?, description?, project?, notify?, stopAfter?, onNotMet?, action?', handler: handleWatchesCreate },
     { method: 'POST', path: '/api/watches/update', desc: 'Update a watch (pause/resume/modify)', params: 'id, status?, interval?, description?, notify?, stopAfter?, onNotMet?, condition?, action?', handler: handleWatchesUpdate },
     { method: 'POST', path: '/api/watches/delete', desc: 'Delete a watch', params: 'id', handler: handleWatchesDelete },
@@ -7942,6 +7957,7 @@ module.exports = {
   _collectArchivedWorkItems: collectArchivedWorkItems,
   buildCCStatePreamble,
   _routesAsMeta,
+  _server: server,
   _buildTranscriptCarryover,
   _transcriptHasCarryoverContext,
   _ccRuntimeNeedsResumeCarryover,

package/engine/ado.js

@@ -746,6 +746,70 @@ async function pollPrStatus(config) {
       updated = true;
     }
 
+    // P-w1a3f9b2 — Phase 1.1: plumb mergeable / isDraft / mergeStatus /
+    // headRefOid onto the PR object so watches captureState (engine/watches.js)
+    // and future predicates (Phase 2.1: head-commit-change, mergeable-flipped,
+    // ready-for-merge, draft-flipped) can read them.
+    //
+    // ADO ↔ GitHub mapping notes:
+    //   - `headRefOid` ← lastMergeSourceCommit.commitId (source-branch tip,
+    //     equivalent to GitHub's pulls API head.sha — the source-side push tip,
+    //     not the merge commit).
+    //   - `mergeable` is derived from prData.mergeStatus, which is ADO's
+    //     "succeeded | conflicts | failure | queued | notSet | rejectedByPolicy"
+    //     enum. We collapse it to GitHub's tri-state contract:
+    //       succeeded                          → true   (mergeable)
+    //       conflicts | failure | rejectedByPolicy → false (not mergeable)
+    //       queued | notSet | (anything else)  → null   (computing / unknown,
+    //                                                    treated as "no signal"
+    //                                                    by predicates).
+    //   - `mergeStatus` is preserved verbatim as the ADO-native equivalent of
+    //     GitHub's `mergeStateStatus`. **Gap:** ADO does not expose a
+    //     direct equivalent of GitHub's `mergeable_state` (clean/dirty/unstable/
+    //     blocked/behind/draft/has_hooks/unknown), so `pr.mergeStateStatus`
+    //     stays unset for ADO PRs and watches that depend on it (Phase 2.1
+    //     `behind-master` / fine-grained block detection) need to fall back to
+    //     `mergeable === false` plus `pr.behindBy` (Phase 1.3) when
+    //     `pr.mergeStateStatus` is null/undefined.
+    //   - `isDraft` ← prData.isDraft (ADO field, same boolean semantics as
+    //     GitHub's `draft`).
+    //   - `behindBy` (P-w3a7b9c4 — Phase 1.3): **Gap:** ADO has no direct
+    //     `behind_by` count equivalent to GitHub's /compare API, so ADO PRs
+    //     always get `behindBy: null`. A future implementation could walk
+    //     `lastMergeTargetCommit → master` via the commit-graph; deferred
+    //     for now (see prd open_questions on ADO behindBy parity). The
+    //     `behind-master` predicate treats null as "not behind" so this
+    //     null contract keeps ADO PRs dormant against that watch (no
+    //     false positives) instead of over-firing.
+    if (sourceCommit && pr.headRefOid !== sourceCommit) {
+      pr.headRefOid = sourceCommit;
+      updated = true;
+    }
+    const adoMergeStatus = typeof prData.mergeStatus === 'string' ? prData.mergeStatus : null;
+    if ((pr.mergeStatus || null) !== adoMergeStatus) {
+      pr.mergeStatus = adoMergeStatus;
+      updated = true;
+    }
+    const newMergeable = adoMergeStatus === 'succeeded' ? true
+      : (adoMergeStatus === 'conflicts' || adoMergeStatus === 'failure' || adoMergeStatus === 'rejectedByPolicy') ? false
+      : null; // queued | notSet | unknown → no signal
+    if (pr.mergeable !== newMergeable) {
+      pr.mergeable = newMergeable;
+      updated = true;
+    }
+    const newIsDraft = prData.isDraft === true;
+    if (pr.isDraft !== newIsDraft) {
+      pr.isDraft = newIsDraft;
+      updated = true;
+    }
+
+    // P-w3a7b9c4 — Phase 1.3: ADO PRs always get pr.behindBy = null
+    // (GitHub-only feature for v1; see comment block above for the gap).
+    if (pr.behindBy !== null) {
+      pr.behindBy = null;
+      updated = true;
+    }
+
     const reviewers = prData.reviewers || [];
     const votes = reviewers.map(r => r.vote).filter(v => v !== undefined);
     let newReviewStatus = pr.reviewStatus || 'pending';
@@ -1568,4 +1632,14 @@ module.exports = {
   _resetAdoThrottle, // exported for testing
   _setAdoThrottleForTest, // exported for testing
   _setAdoTokenForTest, // exported for testing
+  // Exported for unit tests — engine code MUST go through pollPrStatus / reconcilePrs.
+  decodeUrlSegment,
+  stripGitSuffix,
+  encodeAdoPathSegment,
+  buildAdoPrUrlBase,
+  adoRepoCandidateFromParts,
+  parseAdoRepoMetadata,
+  parseCanonicalAdoPrId,
+  isAdoRepairCandidateCompatible,
+  getMissingAdoProjectConfigFields,
 };