mixdog 0.9.41 → 0.9.44

package/src/standalone/explore-tool.mjs

@@ -1,7 +1,7 @@
 import { isAbsolute, resolve } from 'node:path';
 import { existsSync } from 'node:fs';
 import { homedir } from 'node:os';
-import { makeAgentDispatch } from '../runtime/agent/orchestrator/agent-runtime/agent-dispatch.mjs';
+import { makeAgentDispatch, resolveMaintenanceRoute } from '../runtime/agent/orchestrator/agent-runtime/agent-dispatch.mjs';
 import { loadConfig } from '../runtime/agent/orchestrator/config.mjs';
 import { initProviders } from '../runtime/agent/orchestrator/providers/registry.mjs';
 import { presentErrorText } from '../runtime/shared/err-text.mjs';
@@ -195,10 +195,13 @@ function exploreResultCacheEnabled() {
     && !/^(?:0|false|off|no)$/i.test(String(process.env.MIXDOG_EXPLORE_RESULT_CACHE || '1'));
 }
 
-function exploreResultCacheKey({ cwd, presetName, query }) {
+export function exploreResultCacheKey({ cwd, route, query }) {
   return JSON.stringify({
     cwd: String(cwd || ''),
-    presetName: String(presetName || ''),
+    provider: clean(route?.provider),
+    model: clean(route?.model),
+    effort: clean(route?.effort),
+    fast: route?.fast === true,
     query: String(query || ''),
   });
 }
@@ -211,13 +214,14 @@ function findConfigPreset(config, presetName) {
     || null;
 }
 
-async function ensureExploreProviderReady(config) {
-  const route = config?.maintenance?.explore;
-  // Route object ({provider,model}) is the current shape; a string is a
-  // legacy preset NAME resolved against config.presets.
-  const provider = (route && typeof route === 'object')
-    ? clean(route.provider)
-    : clean(findConfigPreset(config, route)?.provider);
+export function resolveExploreRoute(config) {
+  const routeOrName = resolveMaintenanceRoute({ agent: 'explorer', config });
+  if (routeOrName && typeof routeOrName === 'object') return routeOrName;
+  return findConfigPreset(config, routeOrName);
+}
+
+async function ensureExploreProviderReady(config, route) {
+  const provider = clean(route?.provider);
   if (!provider) return;
   const providers = { ...(config?.providers || {}) };
   providers[provider] = { ...(providers[provider] || {}), enabled: true };
@@ -411,11 +415,8 @@ async function runExploreSync(args = {}, ctx = {}) {
   scheduleExploreCodeGraphPrewarm(resolvedCwd);
   scheduleExploreFindPrewarm(resolvedCwd);
   const config = loadConfig();
-  await ensureExploreProviderReady(config);
-  const route = config?.maintenance?.explore;
-  const presetName = (route && typeof route === 'object')
-    ? `${clean(route.provider)}/${clean(route.model)}`
-    : (route || '');
+  const route = resolveExploreRoute(config);
+  await ensureExploreProviderReady(config, route);
   // Turn budget is enforced BOTH ways: the prompt contract (rules/agent/
   // 30-explorer.md, "hard max 3 tool turns, expected 1") steers the model,
   // and maxLoopIterations mechanically backstops it — live traces showed
@@ -439,7 +440,7 @@ async function runExploreSync(args = {}, ctx = {}) {
   // query resolves without delay regardless of index.
   const stagger = working.length > 1 ? EXPLORE_FANOUT_STAGGER_MS : 0;
   const settled = await Promise.allSettled(working.map((q, i) => {
-    const key = exploreResultCacheKey({ cwd: resolvedCwd, presetName, query: q });
+    const key = exploreResultCacheKey({ cwd: resolvedCwd, route, query: q });
     return runExploreCached(key, () => {
       const delay = (stagger > 0 && i > 0) ? new Promise((r) => setTimeout(r, stagger)) : null;
       return delay

package/src/tui/app/provider-setup-picker.mjs

@@ -49,6 +49,7 @@ export function createProviderSetupPicker({
     let setup = options.preloadedSetup && typeof options.preloadedSetup === 'object'
       ? options.preloadedSetup
       : null;
+    options.preloadedSetup = null;
     if (!setup) {
       setPicker({
         title: options.title || 'Providers',

package/src/tui/app/use-transcript-window.mjs

@@ -352,7 +352,11 @@ export function useTranscriptWindow({
   // measuredRowsVersion bumps, the row index absorbs the growth (idEntry.rows ==
   // the new measured height) and the live estimate matches it, so delta → 0.
   if (scrolledUp && !followingRef.current) {
-    const growth = streamingTailMountedGrowth(transcriptItems, frameColumns, toolOutputExpanded);
+    const growth = streamingTailMountedGrowth(
+      streamingTailItem ? [streamingTailItem] : transcriptItems,
+      frameColumns,
+      toolOutputExpanded,
+    );
     // Only compensate when the tail is actually mounted in the rendered slice
     // (viewport + overscan). Off-slice it is represented by a row-index-sized
     // bottom spacer that does NOT physically grow this frame, so shifting the

package/src/tui/components/StatusLine.jsx

@@ -8,6 +8,7 @@
  */
 import React, { useEffect, useRef, useState } from 'react';
 import { Box, Text } from 'ink';
+import { rgbSgr } from '../../ui/ansi.mjs';
 import { displayModelName, shortenModelName } from '../../ui/model-display.mjs';
 import { theme, surfaceBackground } from '../theme.mjs';
 import {
@@ -116,7 +117,7 @@ function scheduleBootFullRetry(backoffMsRef, nextAttemptAtRef) {
 function ansiRgb(value, fallback) {
   const match = /^rgb\((\d+),(\d+),(\d+)\)$/.exec(String(value || '').replace(/\s+/g, ''));
   if (!match) return fallback;
-  return `\x1b[38;2;${match[1]};${match[2]};${match[3]}m`;
+  return rgbSgr(match[1], match[2], match[3]);
 }
 
 // SGR escapes derived from the active theme. Resolved per call (not captured at
@@ -124,11 +125,11 @@ function ansiRgb(value, fallback) {
 // render. `theme` is mutated in-place on switch.
 function statusColors() {
   return {
-    STATUS: ansiRgb(theme.statusText, '\x1b[38;2;198;198;198m'),
-    SUBTLE: ansiRgb(theme.statusSubtle, '\x1b[38;2;136;136;136m'),
-    SUCCESS: ansiRgb(theme.success, '\x1b[38;2;0;170;75m'),
-    WARNING: ansiRgb(theme.warning, '\x1b[38;2;255;193;7m'),
-    ERROR: ansiRgb(theme.error, '\x1b[38;2;220;70;88m'),
+    STATUS: ansiRgb(theme.statusText, rgbSgr(198, 198, 198)),
+    SUBTLE: ansiRgb(theme.statusSubtle, rgbSgr(136, 136, 136)),
+    SUCCESS: ansiRgb(theme.success, rgbSgr(0, 170, 75)),
+    WARNING: ansiRgb(theme.warning, rgbSgr(255, 193, 7)),
+    ERROR: ansiRgb(theme.error, rgbSgr(220, 70, 88)),
   };
 }
 
@@ -250,26 +251,6 @@ function localRunningWorkerCount(agentWorkers = [], agentJobs = []) {
   return seen.size;
 }
 
-function localRunningWorkerTags(agentWorkers = [], agentJobs = [], limit = 3) {
-  const tags = [];
-  const seen = new Set();
-  for (const worker of Array.isArray(agentWorkers) ? agentWorkers : []) {
-    const tag = String(worker?.tag || worker?.agent || worker?.name || '').trim();
-    if (!tag || isTerminalStatus(worker?.stage || worker?.status) || seen.has(tag)) continue;
-    seen.add(tag);
-    tags.push(tag);
-  }
-  for (const job of Array.isArray(agentJobs) ? agentJobs : []) {
-    if (!/running/i.test(String(job?.status || job?.stage || ''))) continue;
-    const tag = String(job?.tag || job?.agent || job?.type || job?.task_id || job?.taskId || '').trim();
-    if (!tag || seen.has(tag)) continue;
-    seen.add(tag);
-    tags.push(tag);
-  }
-  if (tags.length <= limit) return tags.join(', ');
-  return `${tags.slice(0, limit).join(', ')}, +${tags.length - limit}`;
-}
-
 function localTimeMs(value) {
   if (typeof value === 'number' && Number.isFinite(value) && value > 0) return value;
   const n = Date.parse(String(value || ''));
@@ -311,11 +292,9 @@ function localStatusLineL2({
   const runningCount = localRunningWorkerCount(agentWorkers, agentJobs);
   if (runningCount > 0) {
     const label = `Running ${runningCount} Agent${runningCount === 1 ? '' : 's'}`;
-    const tagSummary = localRunningWorkerTags(agentWorkers, agentJobs);
-    const tags = tagSummary ? ` ${SUBTLE}(${RESET}${STATUS}${tagSummary}${RESET}${SUBTLE})${RESET}` : '';
     const oldestStart = localOldestWorkerStartMs(agentWorkers, agentJobs);
     const elapsed = oldestStart > 0 ? localFormatElapsed(now - oldestStart) : '';
-    l2Parts.push(`${spin} ${STATUS}${label}${RESET}${tags}${elapsedSuffix(elapsed)}`);
+    l2Parts.push(`${spin} ${STATUS}${label}${RESET}${elapsedSuffix(elapsed)}`);
   }
   const tools = activeTools && typeof activeTools === 'object' ? activeTools : {};
   const exploreInfo = tools.explore || null;
@@ -369,9 +348,9 @@ function extractCachedShellSegments(cachedL2 = '', now = Date.now(), capturedAt
     // Start-anchored so only a REAL standalone shell segment matches. A visible
     // segment is `<spinner-glyph> Running N … [· elapsed]`, so allow the single
     // leading spinner token via `^(?:\S+\s+)?` then pin `Running N Shell(s)` to
-    // that position. An Agents segment is `<glyph> Running N Agents (tags) …` →
-    // `Shells?` cannot match `Agents`; a tag-injected `Running 3 Shells · 9s`
-    // sits AFTER `Running N Agents (` (not at the pinned start) → no false match.
+    // that position. An Agents segment is `<glyph> Running N Agents · …` →
+    // `Shells?` cannot match `Agents`; any shell-like text after the Agents label
+    // is not at the pinned start, so it cannot produce a false match.
     const m = /^(?:\S+\s+)?Running (\d+) Shells?\b(?:\s·\s(.+?))?\s*$/.exec(seg.trim());
     if (!m) continue;
     const n = Number(m[1]) || 0;