@yemi33/minions 0.1.1588 → 0.1.1589

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.1.1589 (2026-04-28)
+
+### Features
+-  Pluggable CLI runtime adapters (Claude + GitHub Copilot) (#1804)
+
 ## 0.1.1588 (2026-04-28)
 
 ### Other

package/bin/minions.js

@@ -480,7 +480,7 @@ const engineCmds = new Set([
   'start', 'stop', 'status', 'pause', 'resume',
   'queue', 'sources', 'discover', 'dispatch',
   'spawn', 'work', 'cleanup', 'mcp-sync', 'plan',
-  'kill', 'complete',
+  'kill', 'complete', 'config',
 ]);
 
 if (!cmd || cmd === 'help' || cmd === '--help' || cmd === '-h') {
@@ -548,14 +548,16 @@ if (!cmd || cmd === 'help' || cmd === '--help' || cmd === '-h') {
 } else if (cmd === 'add' || cmd === 'remove' || cmd === 'list' || cmd === 'scan') {
   delegate('minions.js', [cmd, ...rest]);
 } else if (cmd === 'restart') {
-  // Start both engine and dashboard — the go-to command after a reboot
+  // Start both engine and dashboard — the go-to command after a reboot.
+  // `--cli` / `--model` flags forward to `engine.js start` so the runtime
+  // fleet flips before the daemon spawns (P-6b3f9c2e AC: works on restart).
   ensureInstalled();
   // Stop engine if running (graceful attempt)
   try { execSync(`node "${path.join(MINIONS_HOME, 'engine.js')}" stop`, { stdio: 'ignore', cwd: MINIONS_HOME }); } catch {}
   // Kill all existing engine/dashboard processes — handles crashed engines and orphan dashboards
   killByPort(7331);
   killMinionsProcesses(['engine.js', 'dashboard.js']);
-  const engineProc = spawn(process.execPath, [path.join(MINIONS_HOME, 'engine.js'), 'start'], {
+  const engineProc = spawn(process.execPath, [path.join(MINIONS_HOME, 'engine.js'), 'start', ...rest], {
     cwd: MINIONS_HOME, stdio: 'ignore', detached: true, windowsHide: true
   });
   engineProc.unref();

package/dashboard/js/settings.js

@@ -20,11 +20,22 @@ async function openSettings() {
   const agents = data.agents || {};
   const t = data.teams || {};
 
+  // Per-agent override placeholders surface the inherited fleet defaults as
+  // muted text — operators see exactly what each agent will resolve to without
+  // chasing config files. Empty input clears the override → re-inherit fleet.
+  const fleetCliLabel = e.defaultCli || 'claude';
+  const fleetModelLabel = e.defaultModel ? String(e.defaultModel) : 'CLI default';
   const agentRows = Object.entries(agents).map(function([id, a]) {
     return '<tr>' +
       '<td style="font-weight:600">' + escHtml(a.emoji || '') + ' ' + escHtml(a.name || id) + '</td>' +
       '<td><input data-agent="' + escHtml(id) + '" data-field="role" value="' + escHtml(a.role || '') + '" style="width:100%;padding:4px 6px;background:var(--surface);border:1px solid var(--border);border-radius:4px;color:var(--text);font-size:11px"></td>' +
       '<td><input data-agent="' + escHtml(id) + '" data-field="skills" value="' + escHtml((a.skills || []).join(', ')) + '" style="width:100%;padding:4px 6px;background:var(--surface);border:1px solid var(--border);border-radius:4px;color:var(--text);font-size:11px"></td>' +
+      '<td data-runtime-cli="' + escHtml(id) + '" style="min-width:110px">' +
+        // Initial loading placeholder — initRuntimeFleetUI() replaces this with a
+        // <select> populated from /api/runtimes once the registry resolves.
+        '<input value="' + escHtml(a.cli || '') + '" placeholder="' + escHtml(fleetCliLabel) + ' (fleet)" disabled style="width:100%;padding:4px 6px;background:var(--surface);border:1px solid var(--border);border-radius:4px;color:var(--muted);font-size:11px">' +
+      '</td>' +
+      '<td><input data-agent="' + escHtml(id) + '" data-field="model" value="' + escHtml(a.model || '') + '" placeholder="' + escHtml(fleetModelLabel) + ' (fleet)" style="width:120px;padding:4px 6px;background:var(--surface);border:1px solid var(--border);border-radius:4px;color:var(--text);font-size:11px"></td>' +
       '<td><input data-agent="' + escHtml(id) + '" data-field="monthlyBudgetUsd" value="' + escHtml(a.monthlyBudgetUsd != null ? String(a.monthlyBudgetUsd) : '') + '" placeholder="unlimited" style="width:70px;padding:4px 6px;background:var(--surface);border:1px solid var(--border);border-radius:4px;color:var(--text);font-size:11px;text-align:right"></td>' +
     '</tr>';
   }).join('');
@@ -112,27 +123,84 @@ async function openSettings() {
       settingsField('Decompose', 'set-mt-decompose', (e.maxTurnsByType || {}).decompose || '', '', 'Default: 15') +
     '</div>' +
 
-    '<h3 style="font-size:13px;color:var(--blue);margin-bottom:8px">Command Center / Doc Chat</h3>' +
-    '<div style="display:grid;grid-template-columns:1fr 1fr;gap:8px;margin-bottom:16px">' +
-      '<div>' +
-        '<label style="font-size:10px;color:var(--muted);display:block;margin-bottom:2px">Model</label>' +
-        '<select id="set-ccModel" style="width:100%;padding:4px 6px;background:var(--surface);border:1px solid var(--border);border-radius:4px;color:var(--text);font-size:12px">' +
-          '<option value="sonnet"' + ((e.ccModel || 'sonnet') === 'sonnet' ? ' selected' : '') + '>Sonnet (default)</option>' +
-          '<option value="haiku"' + (e.ccModel === 'haiku' ? ' selected' : '') + '>Haiku (faster, cheaper)</option>' +
-          '<option value="opus"' + (e.ccModel === 'opus' ? ' selected' : '') + '>Opus (most capable)</option>' +
-        '</select>' +
-        '<div style="font-size:9px;color:var(--muted);margin-top:1px">Model used for CC and doc-chat conversations</div>' +
-      '</div>' +
-      '<div>' +
-        '<label style="font-size:10px;color:var(--muted);display:block;margin-bottom:2px">Effort Level</label>' +
-        '<select id="set-ccEffort" style="width:100%;padding:4px 6px;background:var(--surface);border:1px solid var(--border);border-radius:4px;color:var(--text);font-size:12px">' +
-          '<option value=""' + (!e.ccEffort ? ' selected' : '') + '>Default</option>' +
-          '<option value="low"' + (e.ccEffort === 'low' ? ' selected' : '') + '>Low (quick responses)</option>' +
-          '<option value="medium"' + (e.ccEffort === 'medium' ? ' selected' : '') + '>Medium</option>' +
-          '<option value="high"' + (e.ccEffort === 'high' ? ' selected' : '') + '>High (thorough)</option>' +
-        '</select>' +
-        '<div style="font-size:9px;color:var(--muted);margin-top:1px">Controls response depth and reasoning effort</div>' +
+    // ── Runtime (P-7a5c1f8e) — unified fleet runtime + CC overrides + advanced ──
+    '<h3 style="font-size:13px;color:var(--blue);margin-bottom:8px">Runtime</h3>' +
+    '<div id="set-runtime-section" style="border:1px solid var(--border);border-radius:6px;padding:10px 12px;margin-bottom:16px">' +
+      '<div style="font-size:10px;color:var(--muted);margin-bottom:8px">Single source of truth for which CLI runtime + model the fleet spawns. Per-agent overrides live in the Agents table below.</div>' +
+      '<div style="display:grid;grid-template-columns:1fr 2fr;gap:8px;margin-bottom:8px">' +
+        '<div>' +
+          '<label style="font-size:10px;color:var(--muted);display:block;margin-bottom:2px">Default CLI</label>' +
+          '<select id="set-defaultCli" style="width:100%;padding:4px 6px;background:var(--surface);border:1px solid var(--border);border-radius:4px;color:var(--text);font-size:12px">' +
+            '<option value="">Loading…</option>' +
+          '</select>' +
+          '<div style="font-size:9px;color:var(--muted);margin-top:1px">Fleet-wide runtime — registered adapters from <code>/api/runtimes</code></div>' +
+        '</div>' +
+        '<div>' +
+          '<label style="font-size:10px;color:var(--muted);display:block;margin-bottom:2px">Default Model</label>' +
+          '<div id="set-defaultModel-wrap"><input id="set-defaultModel" value="' + escHtml(e.defaultModel || '') + '" placeholder="Default (CLI chooses)" style="width:100%;padding:4px 6px;background:var(--surface);border:1px solid var(--border);border-radius:4px;color:var(--text);font-size:12px"></div>' +
+          '<div style="font-size:9px;color:var(--muted);margin-top:1px">Empty = let the runtime pick its own default</div>' +
+        '</div>' +
       '</div>' +
+      // CC overrides — collapsed by default
+      '<details id="set-cc-overrides-details"' + ((e.ccCli || e.ccModel) ? ' open' : '') + ' style="margin-top:8px;border-top:1px solid var(--border);padding-top:8px">' +
+        '<summary style="cursor:pointer;font-size:11px;color:var(--text);user-select:none">Customize CC separately ' +
+          '<span style="font-size:9px;color:var(--muted)">(Command Center + doc-chat use the fleet defaults unless overridden)</span>' +
+        '</summary>' +
+        '<div style="display:grid;grid-template-columns:1fr 2fr 1fr;gap:8px;margin-top:8px">' +
+          '<div>' +
+            '<label style="font-size:10px;color:var(--muted);display:block;margin-bottom:2px">CC CLI</label>' +
+            '<select id="set-ccCli" style="width:100%;padding:4px 6px;background:var(--surface);border:1px solid var(--border);border-radius:4px;color:var(--text);font-size:12px">' +
+              '<option value="">Loading…</option>' +
+            '</select>' +
+            '<div style="font-size:9px;color:var(--muted);margin-top:1px">Empty = inherit Default CLI</div>' +
+          '</div>' +
+          '<div>' +
+            '<label style="font-size:10px;color:var(--muted);display:block;margin-bottom:2px">CC Model</label>' +
+            '<input id="set-ccModel" value="' + escHtml(e.ccModel || '') + '" placeholder="(inherits Default Model)" style="width:100%;padding:4px 6px;background:var(--surface);border:1px solid var(--border);border-radius:4px;color:var(--text);font-size:12px">' +
+            '<div style="font-size:9px;color:var(--muted);margin-top:1px">Empty = inherit Default Model</div>' +
+          '</div>' +
+          '<div>' +
+            '<label style="font-size:10px;color:var(--muted);display:block;margin-bottom:2px">Effort</label>' +
+            '<select id="set-ccEffort" style="width:100%;padding:4px 6px;background:var(--surface);border:1px solid var(--border);border-radius:4px;color:var(--text);font-size:12px">' +
+              '<option value=""' + (!e.ccEffort ? ' selected' : '') + '>Default</option>' +
+              '<option value="low"' + (e.ccEffort === 'low' ? ' selected' : '') + '>Low</option>' +
+              '<option value="medium"' + (e.ccEffort === 'medium' ? ' selected' : '') + '>Medium</option>' +
+              '<option value="high"' + (e.ccEffort === 'high' ? ' selected' : '') + '>High</option>' +
+            '</select>' +
+            '<div style="font-size:9px;color:var(--muted);margin-top:1px">CC reasoning depth</div>' +
+          '</div>' +
+        '</div>' +
+      '</details>' +
+      // Advanced runtime settings — collapsed by default
+      '<details id="set-runtime-advanced-details" style="margin-top:8px;border-top:1px solid var(--border);padding-top:8px">' +
+        '<summary style="cursor:pointer;font-size:11px;color:var(--text);user-select:none">Advanced runtime settings ' +
+          '<span style="font-size:9px;color:var(--muted)">(per-runtime feature flags)</span>' +
+        '</summary>' +
+        '<div style="display:flex;flex-direction:column;gap:6px;margin-top:8px">' +
+          settingsToggle('Claude bare mode', 'set-claudeBareMode', !!e.claudeBareMode, '--bare suppresses CLAUDE.md auto-discovery; pair with explicit ccSystemPrompt or context will be lost') +
+        '</div>' +
+        '<div style="display:grid;grid-template-columns:1fr 1fr;gap:8px;margin-top:8px">' +
+          settingsField('Claude fallback model', 'set-claudeFallbackModel', e.claudeFallbackModel || '', '', 'Used by --fallback-model on rate-limit / overload (Claude only)') +
+          settingsField('Max budget (USD)', 'set-maxBudgetUsd', e.maxBudgetUsd != null ? String(e.maxBudgetUsd) : '', '', 'Fleet ceiling for --max-budget-usd. 0 is a valid cap (read-only / dry-run). Empty = no cap. Claude only.') +
+        '</div>' +
+        '<div style="display:flex;flex-direction:column;gap:6px;margin-top:8px">' +
+          // Tooltip on copilotDisableBuiltinMcps MUST warn about the split-brain risk
+          settingsToggle('Copilot: disable built-in MCPs', 'set-copilotDisableBuiltinMcps', e.copilotDisableBuiltinMcps !== false,
+            '⚠ When OFF, Copilot agents can autonomously create PRs/labels/comments via the github-mcp-server, bypassing pull-requests.json tracking — Minions and Copilot end up with split views of the same PR. Keep ON unless you understand the risk.') +
+          settingsToggle('Copilot: suppress AGENTS.md', 'set-copilotSuppressAgentsMd', e.copilotSuppressAgentsMd !== false, '--no-custom-instructions: stops AGENTS.md auto-load from fighting Minions playbook prompts') +
+          settingsToggle('Copilot: reasoning summaries', 'set-copilotReasoningSummaries', !!e.copilotReasoningSummaries, '--enable-reasoning-summaries (Anthropic-family models only)') +
+          settingsToggle('Disable model discovery', 'set-disableModelDiscovery', !!e.disableModelDiscovery, 'Skip /api/runtimes/<name>/models REST calls fleet-wide. Settings UI falls back to free-text.') +
+        '</div>' +
+        '<div style="display:grid;grid-template-columns:1fr 3fr;gap:8px;margin-top:8px">' +
+          '<div>' +
+            '<label style="font-size:10px;color:var(--muted);display:block;margin-bottom:2px">Copilot stream</label>' +
+            '<select id="set-copilotStreamMode" style="width:100%;padding:4px 6px;background:var(--surface);border:1px solid var(--border);border-radius:4px;color:var(--text);font-size:12px">' +
+              '<option value="on"' + ((e.copilotStreamMode || 'on') === 'on' ? ' selected' : '') + '>on (incremental)</option>' +
+              '<option value="off"' + (e.copilotStreamMode === 'off' ? ' selected' : '') + '>off (batched)</option>' +
+            '</select>' +
+          '</div>' +
+        '</div>' +
+      '</details>' +
     '</div>' +
 
     '<h3 style="font-size:13px;color:var(--blue);margin-bottom:8px">Teams Integration</h3>' +
@@ -175,8 +243,9 @@ async function openSettings() {
     '</div>' +
 
     '<h3 style="font-size:13px;color:var(--blue);margin-bottom:8px">Agents</h3>' +
+    '<div style="font-size:10px;color:var(--muted);margin-bottom:6px">CLI / Model placeholders show the fleet default each agent will inherit. Pick a value to pin per-agent; clear to re-inherit.</div>' +
     '<table style="width:100%;border-collapse:collapse;margin-bottom:16px;font-size:11px">' +
-      '<tr style="text-align:left;color:var(--muted)"><th style="padding:4px">Agent</th><th style="padding:4px">Role</th><th style="padding:4px">Skills</th><th style="padding:4px">Budget $/mo</th></tr>' +
+      '<tr style="text-align:left;color:var(--muted)"><th style="padding:4px">Agent</th><th style="padding:4px">Role</th><th style="padding:4px">Skills</th><th style="padding:4px">CLI</th><th style="padding:4px">Model</th><th style="padding:4px">Budget $/mo</th></tr>' +
       agentRows +
     '</table>' +
 
@@ -226,6 +295,118 @@ async function openSettings() {
       warn.style.display = 'none';
     }
   });
+
+  // ── Runtime fleet wiring (P-7a5c1f8e) ──────────────────────────────────────
+  // 1. Load registered runtimes into the defaultCli + ccCli dropdowns.
+  // 2. Load models for the selected defaultCli into the defaultModel input.
+  // 3. On defaultCli change → re-fetch models so the input never shows stale list.
+  // The same pattern wires ccCli → ccModel; ccCli inherits defaultCli when unset.
+  initRuntimeFleetUI(e, agents);
+}
+
+async function initRuntimeFleetUI(engineCfg, agentsCfg) {
+  const cliSelect = document.getElementById('set-defaultCli');
+  const ccCliSelect = document.getElementById('set-ccCli');
+  if (!cliSelect || !ccCliSelect) return;
+
+  // Fetch the registry; render an empty fallback on failure so the rest of the
+  // settings panel still works.
+  let runtimes = [];
+  try {
+    const r = await fetch('/api/runtimes');
+    const d = await r.json();
+    runtimes = Array.isArray(d.runtimes) ? d.runtimes : [];
+  } catch { /* ignore — we'll surface a free-text-only path below */ }
+
+  // Always include 'claude' as a fallback option even if /api/runtimes is empty;
+  // legacy installs without the registry endpoint should still see something pickable.
+  const names = runtimes.length ? runtimes.map(rt => rt.name) : ['claude'];
+  const currentDefault = engineCfg.defaultCli || 'claude';
+  const currentCc = engineCfg.ccCli || '';
+  cliSelect.innerHTML = names.map(n =>
+    '<option value="' + escHtml(n) + '"' + (n === currentDefault ? ' selected' : '') + '>' + escHtml(n) + '</option>'
+  ).join('');
+  ccCliSelect.innerHTML =
+    '<option value=""' + (!currentCc ? ' selected' : '') + '>Inherit Default CLI</option>' +
+    names.map(n =>
+      '<option value="' + escHtml(n) + '"' + (n === currentCc ? ' selected' : '') + '>' + escHtml(n) + '</option>'
+    ).join('');
+
+  // Hydrate per-agent CLI dropdowns now that we know the registered names. The
+  // Agents table renders cells with `data-runtime-cli="<id>"` as a hook.
+  const cliCells = document.querySelectorAll('[data-runtime-cli]');
+  for (const cell of cliCells) {
+    const agentId = cell.getAttribute('data-runtime-cli');
+    const agent = (agentsCfg || {})[agentId] || {};
+    const current = agent.cli || '';
+    cell.innerHTML =
+      '<select data-agent="' + escHtml(agentId) + '" data-field="cli" style="width:100%;padding:4px 6px;background:var(--surface);border:1px solid var(--border);border-radius:4px;color:var(--text);font-size:11px">' +
+        '<option value=""' + (!current ? ' selected' : '') + '>(fleet default)</option>' +
+        names.map(n =>
+          '<option value="' + escHtml(n) + '"' + (n === current ? ' selected' : '') + '>' + escHtml(n) + '</option>'
+        ).join('') +
+      '</select>';
+  }
+
+  // Models load for the resolved default + CC CLIs. ccCli falls back to
+  // defaultCli when unset — same rule as resolveCcCli().
+  loadModelsForRuntime(cliSelect.value, 'set-defaultModel', engineCfg.defaultModel || '');
+  loadModelsForRuntime(currentCc || cliSelect.value, 'set-ccModel', engineCfg.ccModel || '');
+
+  // CLI change → re-fetch models. NEVER carry the previous runtime's list over.
+  cliSelect.addEventListener('change', () => {
+    loadModelsForRuntime(cliSelect.value, 'set-defaultModel', '');
+    if (!ccCliSelect.value) {
+      // CC inherits defaultCli — its model list must follow.
+      loadModelsForRuntime(cliSelect.value, 'set-ccModel', '');
+    }
+  });
+  ccCliSelect.addEventListener('change', () => {
+    const target = ccCliSelect.value || cliSelect.value;
+    loadModelsForRuntime(target, 'set-ccModel', '');
+  });
+}
+
+/**
+ * Replace the input/select at `inputId` with a dropdown when the runtime
+ * exposes a model list, or a free-text input when `{ models: null }` (e.g.
+ * Claude or model-discovery disabled). The "Default (CLI chooses)" option is
+ * always present and submits empty string.
+ */
+async function loadModelsForRuntime(runtimeName, inputId, currentValue) {
+  const wrap = document.getElementById(inputId)?.parentElement;
+  if (!wrap) return;
+  if (!runtimeName) {
+    wrap.innerHTML = '<input id="' + inputId + '" value="' + escHtml(currentValue || '') + '" placeholder="(no runtime selected)" disabled style="width:100%;padding:4px 6px;background:var(--surface);border:1px solid var(--border);border-radius:4px;color:var(--muted);font-size:12px">';
+    return;
+  }
+  let payload = { models: null };
+  try {
+    const res = await fetch('/api/runtimes/' + encodeURIComponent(runtimeName) + '/models');
+    if (res.ok) payload = await res.json();
+  } catch { /* fall through to free-text */ }
+
+  const models = Array.isArray(payload.models) ? payload.models : null;
+  if (!models || models.length === 0) {
+    // Free-text fallback — let the user type anything (custom Anthropic /
+    // OpenAI model IDs, future models, etc.).
+    wrap.innerHTML = '<input id="' + inputId + '" value="' + escHtml(currentValue || '') + '" placeholder="Default (CLI chooses)" style="width:100%;padding:4px 6px;background:var(--surface);border:1px solid var(--border);border-radius:4px;color:var(--text);font-size:12px">';
+    return;
+  }
+  // Dropdown. The first option submits empty string → "Default (CLI chooses)".
+  let opts = '<option value=""' + (!currentValue ? ' selected' : '') + '>Default (CLI chooses)</option>';
+  for (const m of models) {
+    const id = m.id || m.name || '';
+    if (!id) continue;
+    const label = m.name && m.name !== id ? (id + ' — ' + m.name) : id;
+    opts += '<option value="' + escHtml(id) + '"' + (id === currentValue ? ' selected' : '') + '>' + escHtml(label) + '</option>';
+  }
+  // If the current value isn't in the model list (custom / older choice),
+  // surface it as a selectable option so the user doesn't lose it on next save.
+  if (currentValue && !models.some(m => (m.id || m.name) === currentValue)) {
+    opts += '<option value="' + escHtml(currentValue) + '" selected>' + escHtml(currentValue) + ' (custom)</option>';
+  }
+  wrap.innerHTML = '<select id="' + inputId + '" style="width:100%;padding:4px 6px;background:var(--surface);border:1px solid var(--border);border-radius:4px;color:var(--text);font-size:12px">' + opts + '</select>';
 }
 
 function settingsToggle(label, id, checked, hint) {
@@ -284,8 +465,21 @@ async function saveSettings() {
       agentBusyReassignMs: document.getElementById('set-agentBusyReassignMs').value,
       ignoredCommentAuthors: document.getElementById('set-ignoredCommentAuthors').value,
       versionCheckInterval: document.getElementById('set-versionCheckInterval').value,
-      ccModel: document.getElementById('set-ccModel').value,
+      // Runtime fleet (P-7a5c1f8e). Empty strings are intentional — they signal
+      // "clear this override". The server deletes the key from config.engine.
+      defaultCli: (document.getElementById('set-defaultCli')?.value ?? '').trim(),
+      defaultModel: (document.getElementById('set-defaultModel')?.value ?? '').trim(),
+      ccCli: (document.getElementById('set-ccCli')?.value ?? '').trim(),
+      ccModel: (document.getElementById('set-ccModel')?.value ?? '').trim(),
       ccEffort: document.getElementById('set-ccEffort').value || null,
+      claudeBareMode: !!document.getElementById('set-claudeBareMode')?.checked,
+      claudeFallbackModel: (document.getElementById('set-claudeFallbackModel')?.value ?? '').trim(),
+      copilotDisableBuiltinMcps: !!document.getElementById('set-copilotDisableBuiltinMcps')?.checked,
+      copilotSuppressAgentsMd: !!document.getElementById('set-copilotSuppressAgentsMd')?.checked,
+      copilotStreamMode: document.getElementById('set-copilotStreamMode')?.value || 'on',
+      copilotReasoningSummaries: !!document.getElementById('set-copilotReasoningSummaries')?.checked,
+      maxBudgetUsd: (document.getElementById('set-maxBudgetUsd')?.value ?? '').trim(),
+      disableModelDiscovery: !!document.getElementById('set-disableModelDiscovery')?.checked,
       maxTurnsByType: (function() {
         var mbt = {};
         var types = ['explore', 'ask', 'review', 'implement', 'fix', 'test', 'verify', 'plan', 'decompose'];

package/dashboard.js

@@ -551,6 +551,10 @@ const CC_STREAM_HEARTBEAT_MS = 15000; // keep streaming responses alive across p
 const DOC_CHAT_TIMEOUT_MS = 360000; // allow longer doc-chat turns before timing out server-side
 const CC_STREAM_REATTACH_GRACE_MS = 60000; // keep CC job alive briefly after disconnect so the UI can reattach
 const CC_STREAM_DONE_RETENTION_MS = 30000; // retain final payload briefly so reconnect can still receive it
+// Doc-chat is interactive — long-doc edits with multi-step Read+Write tool use can run
+// 4–5 min on `canEdit:true` paths. CC's default 2-min timeout was killing legitimate
+// edits mid-stream. Pinned to 6 min as the bounded but generous ceiling.
+const DOC_CHAT_TIMEOUT_MS = 360000;
 function _releaseCCTab(tabId) { ccInFlightTabs.delete(tabId); ccInFlightAborts.delete(tabId); }
 function _getCcLiveStream(tabId) {
   return ccLiveStreams.get(tabId) || null;
@@ -1230,6 +1234,7 @@ async function ccCall(message, { store = 'cc', sessionKey, extraContext, label =
   if (sessionId && maxTurns > 1) {
     const p1 = llm.callLLM(buildPrompt({ includePreamble: false }), '', {
       timeout, label, model, maxTurns, allowedTools, sessionId, effort: ccEffort, direct: true,
+      engineConfig: CONFIG.engine,
     });
     if (onAbortReady) onAbortReady(p1.abort);
     result = await p1;
@@ -1241,9 +1246,10 @@ async function ccCall(message, { store = 'cc', sessionKey, extraContext, label =
     }
 
     // No text — distinguish "session exists but call failed" (e.g. tool timeout)
-    // from "session is truly dead" (no sessionId returned, or stderr indicates invalid session).
-    const sessionStillValid = llm.isResumeSessionStillValid(result);
-    if (sessionStillValid) {
+    // from "session is truly dead" (no sessionId in the parsed output).
+    // Per P-5e1b7a3c: trust the runtime adapter's parseOutput — if it found a
+    // sessionId the session is alive; if not, treat it as dead and retry fresh.
+    if (result.sessionId !== null) {
       console.log(`[${label}] Resume call failed (code=${result.code}, empty=${!result.text}) but session is still valid — preserving session for retry`);
       updateSession(store, sessionKey, result.sessionId || sessionId, true);
       return result;
@@ -1265,6 +1271,7 @@ async function ccCall(message, { store = 'cc', sessionKey, extraContext, label =
   const freshPrompt = buildPrompt();
   const p2 = llm.callLLM(freshPrompt, CC_STATIC_SYSTEM_PROMPT, {
     timeout, label, model, maxTurns, allowedTools, effort: ccEffort, direct: true,
+    engineConfig: CONFIG.engine,
   });
   if (onAbortReady) onAbortReady(p2.abort);
   result = await p2;
@@ -1281,6 +1288,7 @@ async function ccCall(message, { store = 'cc', sessionKey, extraContext, label =
   await new Promise(r => setTimeout(r, 2000));
   const p3 = llm.callLLM(freshPrompt, CC_STATIC_SYSTEM_PROMPT, {
     timeout, label, model, maxTurns, allowedTools, effort: ccEffort, direct: true,
+    engineConfig: CONFIG.engine,
   });
   if (onAbortReady) onAbortReady(p3.abort);
   result = await p3;
@@ -1311,6 +1319,7 @@ async function ccCallStreaming(message, { store = 'cc', sessionKey, extraContext
   if (sessionId && maxTurns > 1) {
     const p1 = llm.callLLMStreaming(buildPrompt({ includePreamble: false }), '', {
       timeout, label, model, maxTurns, allowedTools, sessionId, effort: ccEffort, direct: true,
+      engineConfig: CONFIG.engine,
       onChunk,
       onToolUse,
     });
@@ -1323,8 +1332,10 @@ async function ccCallStreaming(message, { store = 'cc', sessionKey, extraContext
       return result;
     }
 
-    const sessionStillValid = llm.isResumeSessionStillValid(result);
-    if (sessionStillValid) {
+    // Per P-5e1b7a3c: parsedOutput.sessionId !== null means the runtime adapter
+    // successfully captured a session — preserve it for retry. null means the
+    // session is truly dead (or never started); rotate it.
+    if (result.sessionId !== null) {
       console.log(`[${label}] Resume call failed (code=${result.code}, empty=${!result.text}) but session is still valid — preserving session for retry`);
       updateSession(store, sessionKey, result.sessionId || sessionId, true);
       return result;
@@ -1344,6 +1355,7 @@ async function ccCallStreaming(message, { store = 'cc', sessionKey, extraContext
   const freshPrompt = buildPrompt();
   const p2 = llm.callLLMStreaming(freshPrompt, CC_STATIC_SYSTEM_PROMPT, {
     timeout, label, model, maxTurns, allowedTools, effort: ccEffort, direct: true,
+    engineConfig: CONFIG.engine,
     onChunk,
     onToolUse,
   });
@@ -1361,6 +1373,7 @@ async function ccCallStreaming(message, { store = 'cc', sessionKey, extraContext
   await new Promise(r => setTimeout(r, 2000));
   const p3 = llm.callLLMStreaming(freshPrompt, CC_STATIC_SYSTEM_PROMPT, {
     timeout, label, model, maxTurns, allowedTools, effort: ccEffort, direct: true,
+    engineConfig: CONFIG.engine,
     onChunk,
     onToolUse,
   });
@@ -1429,6 +1442,7 @@ async function ccDocCall({ message, document, title, filePath, selection, canEdi
     timeout: DOC_CHAT_TIMEOUT_MS,
     allowedTools: canEdit ? 'Read,Write,Edit,Glob,Grep' : 'Read,Glob,Grep',
     maxTurns: canEdit ? 25 : 10,
+    timeout: DOC_CHAT_TIMEOUT_MS,
     skipStatePreamble: true,
     ...(model ? { model } : {}),
     onAbortReady,
@@ -1478,6 +1492,7 @@ async function ccDocCallStreaming({ message, document, title, filePath, selectio
     timeout: DOC_CHAT_TIMEOUT_MS,
     allowedTools: canEdit ? 'Read,Write,Edit,Glob,Grep' : 'Read,Glob,Grep',
     maxTurns: canEdit ? 25 : 10,
+    timeout: DOC_CHAT_TIMEOUT_MS,
     skipStatePreamble: true,
     ...(model ? { model } : {}),
     onAbortReady,
@@ -4525,6 +4540,7 @@ What would you like to discuss or change? When you're happy, say "approve" and I
           timeout: 900000, label: 'command-center', model: streamModel, maxTurns: ccMaxTurns,
           allowedTools: 'Bash,Read,Write,Edit,Glob,Grep,WebFetch,WebSearch',
           sessionId, effort: streamEffort, direct: true,
+          engineConfig: CONFIG.engine,
           onChunk: (text) => {
             const actIdx = findCCActionsDelimiter(text);
             const display = actIdx >= 0 ? text.slice(0, actIdx).trim() : text;
@@ -4554,6 +4570,7 @@ What would you like to discuss or change? When you're happy, say "approve" and I
             timeout: 900000, label: 'command-center', model: streamModel, maxTurns: ccMaxTurns,
               allowedTools: 'Bash,Read,Write,Edit,Glob,Grep,WebFetch,WebSearch',
               effort: streamEffort, direct: true,
+              engineConfig: CONFIG.engine,
               onChunk: (text) => {
                 const actIdx = findCCActionsDelimiter(text);
                 const display = actIdx >= 0 ? text.slice(0, actIdx).trim() : text;
@@ -4876,10 +4893,57 @@ What would you like to discuss or change? When you're happy, say "approve" and I
         delete config.engine.adoPollCommentsEvery;
         // String fields
         if (e.worktreeRoot !== undefined) config.engine.worktreeRoot = String(e.worktreeRoot || D.worktreeRoot);
-        // CC model/effort
+
+        // ── Runtime fleet (P-7a5c1f8e) ─────────────────────────────────────
+        // Empty string clears the override — the dashboard's "Default (CLI
+        // chooses)" option submits '' and we must persist that as "unset".
+        // Validate `defaultCli` and `ccCli` against the runtime registry so a
+        // typo in the dashboard can't pin the fleet to a non-existent runtime.
+        const _isClear = (v) => v === '' || v === null;
+        let _registeredCliNames = null;
+        const _validCli = (name) => {
+          if (_registeredCliNames == null) {
+            try { _registeredCliNames = require('./engine/runtimes').listRuntimes(); }
+            catch { _registeredCliNames = []; }
+          }
+          return _registeredCliNames.length === 0 || _registeredCliNames.includes(String(name));
+        };
+        if (e.defaultCli !== undefined) {
+          if (_isClear(e.defaultCli)) delete config.engine.defaultCli;
+          else if (_validCli(e.defaultCli)) config.engine.defaultCli = String(e.defaultCli);
+          else _clamped.push(`defaultCli: "${e.defaultCli}" not registered (kept previous value)`);
+        }
+        if (e.ccCli !== undefined) {
+          if (_isClear(e.ccCli)) delete config.engine.ccCli;
+          else if (_validCli(e.ccCli)) config.engine.ccCli = String(e.ccCli);
+          else _clamped.push(`ccCli: "${e.ccCli}" not registered (kept previous value)`);
+        }
+        if (e.defaultModel !== undefined) {
+          if (_isClear(e.defaultModel)) delete config.engine.defaultModel;
+          else config.engine.defaultModel = String(e.defaultModel);
+        }
         if (e.ccModel !== undefined) {
-          const valid = ['sonnet', 'haiku', 'opus'];
-          config.engine.ccModel = valid.includes(e.ccModel) ? e.ccModel : D.ccModel;
+          if (_isClear(e.ccModel)) delete config.engine.ccModel;
+          else config.engine.ccModel = String(e.ccModel);
+        }
+        if (e.claudeFallbackModel !== undefined) {
+          if (_isClear(e.claudeFallbackModel)) delete config.engine.claudeFallbackModel;
+          else config.engine.claudeFallbackModel = String(e.claudeFallbackModel);
+        }
+        if (e.copilotStreamMode !== undefined) {
+          const valid = ['on', 'off'];
+          if (_isClear(e.copilotStreamMode)) delete config.engine.copilotStreamMode;
+          else if (valid.includes(e.copilotStreamMode)) config.engine.copilotStreamMode = e.copilotStreamMode;
+          else _clamped.push(`copilotStreamMode: "${e.copilotStreamMode}" not in [on, off] (kept previous value)`);
+        }
+        // maxBudgetUsd uses ?? semantics — 0 is a valid cap (read-only / dry-run agents).
+        if (e.maxBudgetUsd !== undefined) {
+          if (_isClear(e.maxBudgetUsd)) delete config.engine.maxBudgetUsd;
+          else {
+            const n = Number(e.maxBudgetUsd);
+            if (Number.isFinite(n) && n >= 0) config.engine.maxBudgetUsd = n;
+            else _clamped.push(`maxBudgetUsd: "${e.maxBudgetUsd}" must be ≥ 0 (kept previous value)`);
+          }
         }
         if (e.ccEffort !== undefined) {
           const valid = [null, 'low', 'medium', 'high'];
@@ -4927,6 +4991,31 @@ What would you like to discuss or change? When you're happy, say "approve" and I
             if (val === undefined || isNaN(val)) delete config.agents[id].monthlyBudgetUsd;
             else config.agents[id].monthlyBudgetUsd = Math.max(0, val);
           }
+          // Per-agent runtime overrides (P-7a5c1f8e). Empty string clears
+          // the override so the agent inherits the fleet default; validated
+          // CLI values pin the agent to a specific runtime. `0` is a valid
+          // maxBudgetUsd (read-only / dry-run agents).
+          if (updates.cli !== undefined) {
+            if (updates.cli === '' || updates.cli === null) delete config.agents[id].cli;
+            else config.agents[id].cli = String(updates.cli);
+          }
+          if (updates.model !== undefined) {
+            if (updates.model === '' || updates.model === null) delete config.agents[id].model;
+            else config.agents[id].model = String(updates.model);
+          }
+          if (updates.maxBudgetUsd !== undefined) {
+            if (updates.maxBudgetUsd === '' || updates.maxBudgetUsd === null) delete config.agents[id].maxBudgetUsd;
+            else {
+              const n = Number(updates.maxBudgetUsd);
+              if (Number.isFinite(n) && n >= 0) config.agents[id].maxBudgetUsd = n;
+            }
+          }
+          if (updates.bareMode !== undefined) {
+            // Boolean override — explicit false should override engine.claudeBareMode=true,
+            // so we accept all three states (true, false, "unset" via empty/null).
+            if (updates.bareMode === '' || updates.bareMode === null) delete config.agents[id].bareMode;
+            else config.agents[id].bareMode = !!updates.bareMode;
+          }
         }
       }
 
@@ -5749,6 +5838,44 @@ What would you like to discuss or change? When you're happy, say "approve" and I
     }},
     { method: 'POST', path: '/api/engine/restart', desc: 'Force-kill engine and restart immediately', handler: handleEngineRestart },
 
+    // Runtimes (CLI fleet) — model discovery + capability surface
+    { method: 'GET', path: '/api/runtimes', desc: 'List registered CLI runtimes and their capability flags', handler: (req, res) => {
+      const md = require('./engine/model-discovery');
+      return jsonReply(res, 200, { runtimes: md.listAllRuntimes() }, req);
+    }},
+    { method: 'POST', path: /^\/api\/runtimes\/([\w-]+)\/models\/refresh$/, desc: 'Invalidate the models cache for a runtime and re-fetch', handler: async (req, res, match) => {
+      const md = require('./engine/model-discovery');
+      const name = match[1];
+      try {
+        md.invalidateRuntimeModelsCache(name);
+      } catch (e) {
+        if (/Unknown runtime/.test(e.message || '')) return jsonReply(res, 404, { error: e.message }, req);
+        return jsonReply(res, 500, { error: String(e.message || e) }, req);
+      }
+      let payload;
+      try {
+        reloadConfig();
+        payload = await md.getRuntimeModels(name, { force: true, config: CONFIG });
+      } catch (e) {
+        if (/Unknown runtime/.test(e.message || '')) return jsonReply(res, 404, { error: e.message }, req);
+        return jsonReply(res, 500, { error: String(e.message || e) }, req);
+      }
+      return jsonReply(res, 200, payload, req);
+    }},
+    { method: 'GET', path: /^\/api\/runtimes\/([\w-]+)\/models$/, desc: 'Get cached or fresh model list for a runtime', handler: async (req, res, match) => {
+      const md = require('./engine/model-discovery');
+      const name = match[1];
+      let payload;
+      try {
+        reloadConfig();
+        payload = await md.getRuntimeModels(name, { config: CONFIG });
+      } catch (e) {
+        if (/Unknown runtime/.test(e.message || '')) return jsonReply(res, 404, { error: e.message }, req);
+        return jsonReply(res, 500, { error: String(e.message || e) }, req);
+      }
+      return jsonReply(res, 200, payload, req);
+    }},
+
     // Settings
     { method: 'GET', path: '/api/settings', desc: 'Return current engine + claude + routing config', handler: handleSettingsRead },
     { method: 'POST', path: '/api/settings', desc: 'Update engine + claude + agent + teams + projects config', params: 'engine?, claude?, agents?, teams?, projects?', handler: handleSettingsUpdate },