@yemi33/minions 0.1.2410 → 0.1.2411

package/dashboard/js/settings.js

@@ -144,7 +144,7 @@ async function openSettings() {
         '</div>' +
         '<div data-search="default model fleet">' +
           '<label style="font-size:var(--text-sm);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:var(--text-md)"></div>' +
+          '<div id="set-defaultModel-wrap"><input id="set-defaultModel" value="' + escHtml(e.defaultModel || '') + '" placeholder="Default (CLI chooses)" style="' + MODEL_FIELD_INPUT_STYLE + '"></div>' +
           '<div style="font-size:var(--text-xs);color:var(--muted);margin-top:1px">Empty = let the runtime pick its own default</div>' +
         '</div>' +
       '</div>' +
@@ -168,7 +168,7 @@ async function openSettings() {
             // swaps THIS element. Without the wrap it would wipe the label
             // and the hint below, breaking vertical alignment with the
             // sibling CC CLI / Effort columns.
-            '<div id="set-ccModel-wrap"><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:var(--text-md)"></div>' +
+            '<div id="set-ccModel-wrap"><input id="set-ccModel" value="' + escHtml(e.ccModel || '') + '" placeholder="(inherits Default Model)" style="' + MODEL_FIELD_INPUT_STYLE + '"></div>' +
             '<div style="font-size:var(--text-xs);color:var(--muted);margin-top:1px">Empty = inherit Default Model</div>' +
           '</div>' +
           '<div data-search="cc effort reasoning">' +
@@ -995,6 +995,133 @@ async function initRuntimeFleetUI(engineCfg, agentsCfg) {
   });
 }
 
+// ── Model field styling (W-mrvdup4h000fc0a2) ─────────────────────────────
+// Default Model / CC Model in the Runtime pane are datalist-backed <input>
+// comboboxes (staged/custom model IDs must stay typeable, so they can't be
+// closed native <select>s). These shared styles make the input match the box
+// metrics of the sibling native <select> dropdowns (Default CLI / CC CLI /
+// Effort / Font Size) and add a chevron so it reads as a dropdown.
+// box-sizing:border-box keeps the bordered box the same rendered size as a
+// width:100% <select>; the chevron is drawn just inside the input's right edge.
+const MODEL_FIELD_INPUT_BOX = 'box-sizing:border-box;padding:4px 6px;background:var(--surface);border:1px solid var(--border);border-radius:4px;color:var(--text);font-size:var(--text-md)';
+const MODEL_FIELD_CHEVRON = "background-image:url('data:image/svg+xml,%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20width=%2210%22%20height=%226%22%3E%3Cpath%20d=%22M1%201l4%204%204-4%22%20fill=%22none%22%20stroke=%22%238b949e%22%20stroke-width=%221.5%22/%3E%3C/svg%3E');background-repeat:no-repeat;background-position:right 8px center;padding-right:22px";
+// Full-width variant for the initial (pre-discovery) placeholder inputs.
+const MODEL_FIELD_INPUT_STYLE = 'width:100%;' + MODEL_FIELD_INPUT_BOX + ';' + MODEL_FIELD_CHEVRON;
+
+// ── Model-picker dropdown (W-mrvdup4h000fc0a2 / PR #916) ──────────────────
+// The Default Model / CC Model fields must stay editable <input>s so staged
+// and custom model IDs remain typeable — they can't be closed native
+// <select>s. Discovery used to be surfaced through a browser <datalist>, but
+// the datalist autocomplete popup is browser chrome and reads visibly
+// different from the native <select> dropdowns of the sibling controls
+// (Default CLI / CC CLI / Effort) — the mismatch the reviewer flagged: the
+// "dialog that it launches doesn't match". This wires a dashboard-themed
+// popover (.model-combo-popup) onto the input so the launched suggestion list
+// matches those dropdowns while keeping the field free-typeable.
+//
+//   inputEl : the editable <input> (kept typeable; free text is preserved)
+//   popupEl : the (initially empty) .model-combo-popup container to render into
+//   models  : array of { id, name } discovery results (may be empty)
+//
+// The popup is positioned with position:fixed at open time (see the CSS) so it
+// escapes the .settings-content / .settings-body overflow clipping and floats
+// like a native dropdown. All listeners are element-scoped so they are GC'd
+// with the input when loadModelsForRuntime re-renders (no global leak).
+function _wireModelCombobox(inputEl, popupEl, models) {
+  if (!inputEl || !popupEl) return;
+  const options = (models || [])
+    .map(function(m) {
+      const id = m.id || m.name || '';
+      const label = (m.name && m.name !== id) ? m.name : '';
+      return { id: id, label: label };
+    })
+    .filter(function(o) { return o.id; });
+  if (options.length === 0) return;
+  let visible = [];
+  let activeIdx = -1;
+
+  function position() {
+    const r = inputEl.getBoundingClientRect();
+    popupEl.style.left = r.left + 'px';
+    popupEl.style.top = r.bottom + 'px';
+    popupEl.style.width = r.width + 'px';
+  }
+  function render() {
+    const q = (inputEl.value || '').toLowerCase();
+    // A value that exactly equals an option shows the full list, so re-focusing
+    // a filled field still offers every model (matching native <select>).
+    const exact = options.some(function(o) { return o.id.toLowerCase() === q; });
+    visible = (!q || exact) ? options.slice()
+      : options.filter(function(o) {
+        return o.id.toLowerCase().indexOf(q) !== -1 || (o.label && o.label.toLowerCase().indexOf(q) !== -1);
+      });
+    if (visible.length === 0) { hide(); return; }
+    if (activeIdx >= visible.length) activeIdx = -1;
+    // eslint-disable-next-line no-unsanitized/property -- reason: structural HTML is a string literal; all user data wrapped in escHtml() (fields: model id, model label)
+    popupEl.innerHTML = visible.map(function(o, i) {
+      return '<div class="model-combo-option' + (i === activeIdx ? ' active' : '') + '" data-idx="' + i + '">' +
+        '<span class="model-combo-id">' + escHtml(o.id) + '</span>' +
+        (o.label ? '<span class="model-combo-label">' + escHtml(o.label) + '</span>' : '') +
+      '</div>';
+    }).join('');
+    position();
+    popupEl.classList.add('visible');
+    inputEl.setAttribute('aria-expanded', 'true');
+  }
+  function hide() {
+    popupEl.classList.remove('visible');
+    inputEl.setAttribute('aria-expanded', 'false');
+    activeIdx = -1;
+  }
+  function pick(o) {
+    if (!o) return;
+    inputEl.value = o.id;
+    hide();
+  }
+  function scrollActive() {
+    const el = popupEl.querySelector('.model-combo-option.active');
+    if (el && el.scrollIntoView) el.scrollIntoView({ block: 'nearest' });
+  }
+
+  inputEl.addEventListener('focus', render);
+  // A click on an already-focused input does not re-fire `focus`, so after a
+  // selection (pick → hide) or Escape (hide) the still-focused input could not
+  // be reopened by clicking — it only stays a dead field until blur+refocus.
+  // Reopen the popup on click whenever it is currently hidden (matches how a
+  // native <select> reopens on click). No-op on the focus-triggering click,
+  // which already opened it, so there is no open/close flicker.
+  inputEl.addEventListener('click', function() {
+    if (!popupEl.classList.contains('visible')) render();
+  });
+  inputEl.addEventListener('input', function() { activeIdx = -1; render(); });
+  inputEl.addEventListener('keydown', function(ev) {
+    const open = popupEl.classList.contains('visible');
+    if (ev.key === 'ArrowDown') {
+      ev.preventDefault();
+      if (!open) { render(); return; }
+      activeIdx = Math.min(activeIdx + 1, visible.length - 1);
+      render(); scrollActive();
+    } else if (ev.key === 'ArrowUp') {
+      if (!open) return;
+      ev.preventDefault();
+      activeIdx = Math.max(activeIdx - 1, 0);
+      render(); scrollActive();
+    } else if (ev.key === 'Enter') {
+      if (open && activeIdx >= 0) { ev.preventDefault(); pick(visible[activeIdx]); }
+    } else if (ev.key === 'Escape') {
+      if (open) { ev.stopPropagation(); hide(); }
+    }
+  });
+  // mousedown (not click) so the pick fires before the input's blur hides it.
+  popupEl.addEventListener('mousedown', function(ev) {
+    const row = ev.target.closest('.model-combo-option');
+    if (!row) return;
+    ev.preventDefault();
+    pick(visible[Number(row.getAttribute('data-idx'))]);
+  });
+  inputEl.addEventListener('blur', function() { setTimeout(hide, 120); });
+}
+
 /**
  * Render an editable model field backed by discovered-model suggestions.
  * Discovery is advisory: staged/future/custom model IDs must remain typeable.
@@ -1005,7 +1132,7 @@ async function loadModelsForRuntime(runtimeName, inputId, currentValue, forceRef
   const token = _nextModelLoadToken('runtime', inputId);
   if (!runtimeName) {
     // eslint-disable-next-line no-unsanitized/property -- reason: structural HTML is a string literal; all user data wrapped in escHtml() (fields: currentValue; inputId is an internal fixed DOM id)
-    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:var(--text-md)">';
+    wrap.innerHTML = '<input id="' + inputId + '" value="' + escHtml(currentValue || '') + '" placeholder="(no runtime selected)" disabled style="' + MODEL_FIELD_INPUT_STYLE + ';color:var(--muted)">';
     return;
   }
   let payload = { models: null };
@@ -1013,17 +1140,14 @@ async function loadModelsForRuntime(runtimeName, inputId, currentValue, forceRef
 
   if (!_isCurrentModelLoad('runtime', inputId, token)) return;
   const models = Array.isArray(payload.models) ? payload.models : null;
-  const listId = inputId + '-options';
-  let opts = '';
-  for (const m of (models || [])) {
-    const id = m.id || m.name || '';
-    if (!id) continue;
-    const label = m.name && m.name !== id ? m.name : '';
-    opts += '<option value="' + escHtml(id) + '"' + (label ? ' label="' + escHtml(label) + '"' : '') + '></option>';
-  }
   const title = forceRefresh ? 'Model list refreshed' : 'Refresh models from the selected CLI';
-  // eslint-disable-next-line no-unsanitized/property -- reason: structural HTML is a string literal; all user data wrapped in escHtml()
-  wrap.innerHTML = '<div style="display:flex;gap:4px"><input id="' + inputId + '" list="' + listId + '" value="' + escHtml(currentValue || '') + '" placeholder="Default (CLI chooses)" autocomplete="off" style="min-width:0;flex:1;padding:4px 6px;background:var(--surface);border:1px solid var(--border);border-radius:4px;color:var(--text);font-size:var(--text-md)"><button type="button" data-model-refresh title="' + escHtml(title) + '" aria-label="Refresh model list" style="padding:3px 8px;background:var(--surface2);border:1px solid var(--border);border-radius:4px;color:var(--muted);cursor:pointer">↻</button></div><datalist id="' + listId + '">' + opts + '</datalist>';
+  // Editable model input + themed suggestion popover (see _wireModelCombobox).
+  // The field stays free-typeable for staged/custom IDs; discovered models are
+  // offered through .model-combo-popup so the launched list matches the sibling
+  // native <select> dropdowns instead of the browser's <datalist> chrome.
+  // eslint-disable-next-line no-unsanitized/property -- reason: structural HTML is a string literal; all user data wrapped in escHtml() (fields: currentValue, title; inputId is an internal fixed DOM id)
+  wrap.innerHTML = '<div class="model-combo" style="width:100%"><div style="display:flex;gap:4px;width:100%"><input id="' + inputId + '" value="' + escHtml(currentValue || '') + '" placeholder="Default (CLI chooses)" autocomplete="off" role="combobox" aria-autocomplete="list" aria-expanded="false" style="min-width:0;flex:1;' + MODEL_FIELD_INPUT_BOX + ';' + MODEL_FIELD_CHEVRON + '"><button type="button" data-model-refresh title="' + escHtml(title) + '" aria-label="Refresh model list" style="padding:3px 8px;background:var(--surface2);border:1px solid var(--border);border-radius:4px;color:var(--muted);cursor:pointer">↻</button></div><div class="model-combo-popup" data-model-popup></div></div>';
+  _wireModelCombobox(document.getElementById(inputId), wrap.querySelector('[data-model-popup]'), models || []);
   const refresh = wrap.querySelector('[data-model-refresh]');
   if (refresh) {
     refresh.addEventListener('click', async function() {

package/dashboard/styles.css

@@ -889,6 +889,33 @@
   .cmd-mention-item .mention-name { font-weight: 600; color: var(--purple); }
   .cmd-mention-item .mention-role { color: var(--muted); font-size: var(--text-base); }
 
+  /* Model-picker combobox (Settings → Agents Runtime & Models, PR #916).
+     The Default Model / CC Model fields stay editable <input>s (staged/custom
+     model IDs must remain typeable) but the launched suggestion list is a
+     dashboard-themed popover instead of the browser's native <datalist>
+     chrome, so it matches the sibling native <select> dropdowns. Positioned
+     with position:fixed (coords set in JS at open time) so it escapes the
+     .settings-content / .settings-body overflow clipping and floats like a
+     native dropdown. z-index sits above modal content (.modal-bg is 400). */
+  .model-combo { position: relative; }
+  .model-combo-popup {
+    display: none; position: fixed; margin-top: 2px;
+    background: var(--surface); border: 1px solid var(--border); border-radius: 4px;
+    padding: 2px 0; box-shadow: var(--shadow-lg); z-index: 500;
+    max-height: 260px; overflow-y: auto;
+    scrollbar-width: thin; scrollbar-color: var(--border) transparent;
+  }
+  .model-combo-popup.visible { display: block; }
+  .model-combo-popup::-webkit-scrollbar { width: 4px; }
+  .model-combo-popup::-webkit-scrollbar-thumb { background: var(--border); border-radius: 4px; }
+  .model-combo-option {
+    padding: 4px 8px; font-size: var(--text-md); color: var(--text); cursor: pointer;
+    display: flex; align-items: baseline; gap: 6px; white-space: nowrap;
+  }
+  .model-combo-option:hover { background: var(--surface2); }
+  .model-combo-option.active { background: rgba(88,166,255,0.15); }
+  .model-combo-label { color: var(--muted); font-size: var(--text-xs); }
+
   /* Hints bar */
   .cmd-hints {
     display: flex; gap: var(--space-6); margin-top: var(--space-2); font-size: var(--text-sm); color: var(--muted);

package/engine/runtimes/copilot.js

@@ -767,10 +767,17 @@ const KNOWN_EVENT_TYPES = new Set([
  * Returns { text, usage, sessionId, model } — same shape as the Claude adapter
  * so engine/lifecycle.js can consume both transparently.
  *
- *   - text:      concatenation of answer `assistant.message.data.content`
- *                values, plus trailing deltas if the CLI exits before a final
- *                `assistant.message`. Narration attached to tool requests is
- *                progress text and is excluded from the final answer.
+ *   - text:      the TRAILING text segment of the turn — answer
+ *                `assistant.message.data.content` values plus trailing deltas,
+ *                but only those that arrived AFTER the last real (non-
+ *                `task_complete`) tool boundary. Narration attached to tool
+ *                requests is progress text and is excluded from the final
+ *                answer, and a real tool call resets the accumulators so pre-
+ *                tool text never welds onto the post-tool answer. This mirrors
+ *                the stream consumer's `_resetTrailingSegment` and Claude's
+ *                result-carries-last-message shape, so the terminal
+ *                reconciliation in engine/llm.js#finalize agrees with the live
+ *                stream instead of re-welding split blocks (W-mrw87290000b2965).
  *   - usage:     mapped from the terminal `result` event. Copilot doesn't
  *                report cost/tokens — those fields are NULL, not 0, so the
  *                dashboard can distinguish "Copilot didn't tell us" from
@@ -809,10 +816,15 @@ function parseOutput(raw, { maxTextLength = 0 } = {}) {
       const content = obj.data?.content;
       const toolRequests = obj.data?.toolRequests;
       const hasToolRequests = Array.isArray(toolRequests) && toolRequests.length > 0;
+      let sawRealTool = false;
       if (hasToolRequests) {
         for (const tr of toolRequests) {
-          const summary = tr?.name === 'task_complete' ? tr.arguments?.summary || tr.intentionSummary : '';
-          if (typeof summary === 'string' && summary) taskCompleteSummary = summary;
+          if (tr?.name === 'task_complete') {
+            const summary = tr.arguments?.summary || tr.intentionSummary;
+            if (typeof summary === 'string' && summary) taskCompleteSummary = summary;
+          } else if (tr?.name) {
+            sawRealTool = true;
+          }
         }
       }
       if (typeof content === 'string') {
@@ -821,9 +833,32 @@ function parseOutput(raw, { maxTextLength = 0 } = {}) {
       }
       const ot = obj.data?.outputTokens;
       if (typeof ot === 'number') outputTokensTotal += ot;
+      // A real (non-task_complete) tool call closes the trailing text segment:
+      // the final answer is whatever text arrives AFTER it. Reset the trailing
+      // accumulators so pre-tool narration — whether it arrived as a finalized
+      // assistant.message or as raw deltas — does not weld onto the post-tool
+      // answer. Without this, `text = messageContents.join('') + pendingDeltaContent`
+      // re-welds `<pre-tool><post-tool>` in the terminal reconciliation
+      // (engine/llm.js#finalize -> runtime.parseOutput), and the CC SSE `done`
+      // payload re-introduces the weld the stream consumer already split apart
+      // (W-mrw87290000b2965). Mirrors the stream consumer's _resetTrailingSegment
+      // and Claude, whose result event carries only the last assistant message.
+      if (sawRealTool) {
+        messageContents.length = 0;
+        pendingDeltaContent = '';
+      }
     } else if (type === 'tool.execution_start') {
-      const summary = obj.data?.toolName === 'task_complete' ? obj.data?.arguments?.summary : '';
-      if (typeof summary === 'string' && summary) taskCompleteSummary = summary;
+      const toolName = obj.data?.toolName;
+      if (toolName === 'task_complete') {
+        const summary = obj.data?.arguments?.summary;
+        if (typeof summary === 'string' && summary) taskCompleteSummary = summary;
+      } else if (typeof toolName === 'string' && toolName) {
+        // Same real-tool-boundary reset as the toolRequests branch above —
+        // `tool.execution_start` is the standalone event shape (delta -> tool
+        // -> delta) that produced the original weld repro.
+        messageContents.length = 0;
+        pendingDeltaContent = '';
+      }
     } else if (type === 'session.task_complete') {
       const summary = obj.data?.summary;
       if (typeof summary === 'string' && summary) taskCompleteSummary = summary;
@@ -1196,6 +1231,17 @@ function createStreamConsumer(ctx) {
   function _resetTrailingSegment() {
     trailingText = '';
     _hadPriorTrailingMessage = false;
+    // A real tool call closes the trailing text segment, so the live
+    // `assistant.message_delta` accumulator must reset too — otherwise, when
+    // the pre-tool text arrived ONLY as deltas (no finalizing non-tool
+    // `assistant.message` to zero the buffer, e.g. delta(s) → tool.execution_start
+    // → delta(s)), the post-tool deltas append onto the pre-tool text and
+    // `ctx.pushText` emits the welded whole-turn buffer under the new (post-tool)
+    // segmentId. The dashboard then renders the post-tool block as
+    // `<pre-tool>.<post-tool>` with no separator (W-mrw87290 — CC weld across a
+    // tool call). Claude's adapter resets its accumulator on tool_use for the
+    // same reason (engine/runtimes/claude.js).
+    copilotMessageBuffer = '';
   }
 
   function _captureTaskComplete(summary, success = true, { clearBuffer = false } = {}) {

package/package.json

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