mixdog 0.9.31 → 0.9.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mixdog",
-  "version": "0.9.31",
+  "version": "0.9.33",
   "private": false,
   "type": "module",
   "description": "Standalone mixdog coding-agent CLI/TUI workspace.",

package/scripts/arg-guard-test.mjs

@@ -28,6 +28,15 @@ test('grep head_limit/offset/-C as numeric strings coerce', () => {
     assert.equal(a['-C'], 2);
 });
 
+test('grep empty context strings are treated as omitted', () => {
+    const a = { pattern: 'x', output_mode: 'content_with_context', '-A': '', '-B': '', '-C': '', context: '' };
+    assert.equal(validateBuiltinArgs('grep', a), null);
+    assert.equal(Object.prototype.hasOwnProperty.call(a, '-A'), false);
+    assert.equal(Object.prototype.hasOwnProperty.call(a, '-B'), false);
+    assert.equal(Object.prototype.hasOwnProperty.call(a, '-C'), false);
+    assert.equal(Object.prototype.hasOwnProperty.call(a, 'context'), false);
+});
+
 test('list/find/glob head_limit as numeric string coerces', () => {
     const l = { path: '.', head_limit: '5' };
     assert.equal(validateBuiltinArgs('list', l), null);

package/src/runtime/agent/orchestrator/tools/builtin/arg-guard.mjs

@@ -399,6 +399,10 @@ function guardGrep(a) {
         if (err) return err;
     }
     for (const k of ['-A', '-B', '-C', 'context']) {
+        if (hasOwn(a, k) && a[k] === '') {
+            delete a[k];
+            continue;
+        }
         const err = checkIntInRange(a, k, 0, GREP_CONTEXT_MAX, { clamp: true });
         if (err) return err;
     }

package/src/runtime/memory/lib/pg/process.mjs

@@ -290,12 +290,15 @@ export async function startPg({ runtimeDir, pgdataDir, port: preferredPort = 554
   // so we return the instant pg_isready succeeds rather than waiting on pg_ctl.
   // Only the long-lived child handle is unref'd; poll timers stay ref'd.
   async function startAndWaitReady() {
-    // detached on win32: give pg_ctl (and the postmaster it spawns) its own
-    // process group / console so an ancestor `taskkill /F /T` cannot enumerate
-    // it via the Node process tree. The orphaned postmaster survives and is
-    // re-adopted next boot via supervisor tryReusePgInstance (postmaster.pid).
-    const detached = process.platform === 'win32'
-    const child = spawn(pgctl, startArgs, { env, stdio: ['ignore', 'pipe', 'pipe'], windowsHide: true, detached })
+    // NEVER set `detached` on win32: DETACHED_PROCESS makes the OS ignore
+    // `windowsHide`, so pg_ctl + the postmaster it launches allocate a VISIBLE
+    // console (see shared/spawn-flags.mjs). Detachment gave no real isolation
+    // here anyway: `pg_ctl start` daemonizes the postmaster and exits at once,
+    // so the postmaster is already reparented OUT of the Node process tree —
+    // detached only isolated the short-lived pg_ctl. Shutdown/reuse target
+    // pgdata/postmaster.pid (pg_ctl stop -D, tryReusePgInstance), not a
+    // Node-tree taskkill, so `windowsHide` alone is correct on all platforms.
+    const child = spawn(pgctl, startArgs, { env, stdio: ['ignore', 'pipe', 'pipe'], windowsHide: true })
     child.unref?.()
     let stdout = '', stderr = '', closed = false, exitCode = null
     child.stdout?.on('data', d => { stdout += d.toString() })

package/src/session-runtime/mcp-glue.mjs

@@ -100,11 +100,11 @@ export function createMcpGlue({
   async function applyMcpServerConnection(name, enabled) {
     const target = clean(name);
     if (!target) return;
-    const { servers, sources } = resolveEffectiveMcpServers();
-    // A project-local `.mcp.json` entry WINS over config for this name, so the
-    // config enable/disable flag doesn't change what's actually connected.
-    // Only act when the effective entry is config-sourced (or absent).
-    if (sources[target] && sources[target] !== 'config') return;
+    const { servers } = resolveEffectiveMcpServers();
+    // The toggle is applied to whichever source drives this name: project
+    // `.mcp.json` entries persist their `enabled` flag in that file (project >
+    // config precedence) and config entries in mixdog-config, so acting on the
+    // effective entry here keeps live state in sync with the durable flag.
     // Changing this server's state clears any stale failure record for it.
     if (Array.isArray(state.mcpFailures)) {
       state.mcpFailures = state.mcpFailures.filter((row) => row.name !== target);

package/src/session-runtime/plugin-mcp.mjs

@@ -1,5 +1,5 @@
 // Plugin/project MCP server discovery + normalization, and skill-file counting.
-import { existsSync, readFileSync, readdirSync, statSync } from 'node:fs';
+import { existsSync, readFileSync, readdirSync, statSync, writeFileSync } from 'node:fs';
 import { isAbsolute, join, relative, resolve } from 'node:path';
 import { clean } from './session-text.mjs';
 import { readJsonSafe } from './fs-utils.mjs';
@@ -45,6 +45,41 @@ export function readProjectMcpServers(cwd) {
   return out;
 }
 
+// Persist an enable/disable flag for a project-local `.mcp.json` server, in
+// place, preserving the file's shape. Accepts both the standard
+// `{ mcpServers: {...} }` wrapper and a bare name->cfg map. Writes pretty JSON
+// (2-space indent + trailing newline) so the file stays valid + diff-friendly.
+// Throws if the file is missing/unparseable or the server isn't defined there.
+export function setProjectMcpServerEnabled(cwd, name, enabled) {
+  const path = join(cwd || '.', '.mcp.json');
+  const key = clean(name);
+  if (!key) throw new Error('MCP server name is required');
+  let raw;
+  try {
+    raw = JSON.parse(readFileSync(path, 'utf8'));
+  } catch (error) {
+    throw new Error(`cannot update ${path}: ${error?.message || String(error)}`);
+  }
+  if (!raw || typeof raw !== 'object' || Array.isArray(raw)) {
+    throw new Error(`unexpected .mcp.json shape at ${path}`);
+  }
+  const usesWrapper = raw.mcpServers && typeof raw.mcpServers === 'object' && !Array.isArray(raw.mcpServers);
+  const map = usesWrapper ? raw.mcpServers : raw;
+  const entryKey = Object.prototype.hasOwnProperty.call(map, key)
+    ? key
+    : Object.keys(map).reverse().find((candidate) => clean(candidate) === key);
+  if (!map || typeof map !== 'object' || Array.isArray(map) || !entryKey) {
+    throw new Error(`MCP server not defined in ${path}: ${key}`);
+  }
+  const entry = map[entryKey];
+  if (!entry || typeof entry !== 'object' || Array.isArray(entry)) {
+    throw new Error(`MCP server is not an object in ${path}: ${key}`);
+  }
+  map[entryKey] = { ...entry, enabled: enabled !== false };
+  writeFileSync(path, `${JSON.stringify(raw, null, 2)}\n`, 'utf8');
+  return raw;
+}
+
 function isPlainObject(value) {
   return value !== null && typeof value === 'object' && !Array.isArray(value);
 }

package/src/session-runtime/resource-api.mjs

@@ -17,6 +17,7 @@ import {
   pluginRawMcpServers,
   pluginMcpEnableScript,
   resolveContainedPluginPath,
+  setProjectMcpServerEnabled,
 } from './plugin-mcp.mjs';
 
 // MCP servers, skills, plugins, hooks, and memory/recall surfaces. Extracted
@@ -129,6 +130,17 @@ export function createResourceApi(deps) {
     setMcpServerEnabled(name, enabled) {
       const serverName = clean(name);
       if (!serverName) throw new Error('MCP server name is required');
+      const want = enabled !== false;
+      // A project-local `.mcp.json` entry WINS over config for this name, so the
+      // durable toggle must land in whichever file actually drives the server.
+      // For project-sourced servers, persist the `enabled` flag into `.mcp.json`
+      // (the mtime bump invalidates the project cache), then run the same
+      // background connect/recreate chain used for config servers.
+      const shadowRow = mcpStatus().servers.find((s) => s.name === serverName);
+      if (shadowRow && shadowRow.source === 'project') {
+        setProjectMcpServerEnabled(getCurrentCwd(), serverName, want);
+        return scheduleMcpToggle(serverName, want);
+      }
       const nextConfig = { ...getConfig() };
       const current = nextConfig.mcpServers && typeof nextConfig.mcpServers === 'object'
         ? { ...nextConfig.mcpServers }
@@ -136,20 +148,13 @@ export function createResourceApi(deps) {
       if (!Object.prototype.hasOwnProperty.call(current, serverName)) {
         throw new Error(`MCP server not configured: ${serverName}`);
       }
-      // A project-local `.mcp.json` entry WINS over config for this name, so a
-      // config enable/disable flag would persist but never change live state.
-      // Surface that to the caller instead of reporting a silent success.
-      const shadowRow = mcpStatus().servers.find((s) => s.name === serverName);
-      if (shadowRow && shadowRow.source === 'project') {
-        throw new Error(`'${serverName}' is defined by project .mcp.json — config toggle has no effect`);
-      }
       // Adopt + persist config synchronously (fast) so intent is durable, then
       // hand the heavy connect/close/recreate to the per-server background
       // chain. Return that chain's promise so callers can settle the picker on
       // completion, but the store no longer blocks on it.
-      current[serverName] = { ...(current[serverName] || {}), enabled: enabled !== false };
+      current[serverName] = { ...(current[serverName] || {}), enabled: want };
       saveConfigAndAdopt({ ...nextConfig, mcpServers: current });
-      return scheduleMcpToggle(serverName, enabled !== false);
+      return scheduleMcpToggle(serverName, want);
     },
     skillsStatus() {
       return skillsStatus();

package/src/tui/app/extension-pickers.mjs

@@ -64,7 +64,7 @@ export function createExtensionPickers({
         markerColor: enabled ? theme.success : theme.inactive,
         description: pending
           ? `${optimistic.enabled ? 'enabling' : 'disabling'}… · ${server.transport || 'unknown'}`
-          : `${server.status || 'unknown'} · ${server.transport || 'unknown'} · ${server.toolCount || 0} tools${server.error ? ` · ${server.error}` : ''}`,
+          : `${server.source || 'config'} · ${server.status || 'unknown'} · ${server.transport || 'unknown'} · ${server.toolCount || 0} tools${server.error ? ` · ${server.error}` : ''}`,
         _action: 'server',
         _server: server,
         _enabled: enabled,

package/src/tui/app/model-picker.mjs

@@ -20,6 +20,12 @@ import {
   buildProviderModelItems,
 } from './model-options.mjs';
 
+// Cached picker opens stay instant, but a catalog older than this is treated as
+// stale: cached rows render immediately and a background force refresh updates
+// the picker in place. Avoids the "stale /model & /agents catalog" without
+// paying a remote provider-list round-trip on every open.
+const MODEL_CACHE_TTL_MS = 5 * 60 * 1000;
+
 export function createModelPicker({
   store,
   getState,
@@ -35,6 +41,7 @@ export function createModelPicker({
   modelSwitchNotice,
   openProviderSetupPicker,
 }) {
+  let providerModelsTtlRefreshPromise = null;
   const openModelPicker = async (options = {}) => {
     const state = getState();
     setProviderPrompt(null);
@@ -61,6 +68,7 @@ export function createModelPicker({
       : [];
     let refreshModelsPromise = null;
     let renderedQuickModels = false;
+    let renderActiveProviderModels = null;
     if (!providerModels.length || options.refreshModels === true) {
       setPicker({
         title: options.title || 'Model',
@@ -88,6 +96,17 @@ export function createModelPicker({
       }
     }
 
+    // Served straight from a non-empty UI cache: if that cache is older than the
+    // TTL, render the cached rows now and quietly force a background refresh so
+    // the catalog can't drift stale. Never applies to the search cache (its own
+    // quick paths refresh differently) or explicit refreshModels opens.
+    const cacheAt = Number(cacheRef.current.at) || 0;
+    const cacheIsStale = providerModels.length > 0
+      && options.refreshModels !== true
+      && options.cacheRef !== 'search'
+      && !refreshModelsPromise
+      && (Date.now() - cacheAt) > MODEL_CACHE_TTL_MS;
+
     if (!providerModels || providerModels.length === 0) {
       store.pushNotice(options.emptyNotice || 'no provider models available; open /providers to sign in', 'warn');
       void openProviderSetupPicker({
@@ -112,9 +131,11 @@ export function createModelPicker({
       }
       const highlightProvider = renderOptions.highlightProvider || providerListHighlightProvider || null;
       activeModelProvider = null;
+      renderActiveProviderModels = null;
       const openProviderModelsPicker = (provider) => {
         if (!provider) return;
         activeModelProvider = provider;
+        renderActiveProviderModels = () => openProviderModelsPicker(provider);
         const providerModels = models.filter((model) => model.provider === provider);
         const preferredEffort = (values = []) => {
           const allowed = values.filter(Boolean);
@@ -345,19 +366,34 @@ export function createModelPicker({
     };
 
     renderModelPicker();
+    const applyFreshModels = (freshModels) => {
+      if (!isActiveModelPicker()) return;
+      if (!Array.isArray(freshModels) || freshModels.length === 0) return;
+      providerModels = freshModels;
+      models = normalizeModelOptions(providerModels);
+      cacheRef.current = { models: providerModels, at: Date.now() };
+      if (activeModelProvider === null) {
+        renderModelPicker();
+      } else if (typeof renderActiveProviderModels === 'function') {
+        renderActiveProviderModels();
+      }
+    };
     if (renderedQuickModels && refreshModelsPromise) {
-      void refreshModelsPromise
-        .then((freshModels) => {
-          if (!isActiveModelPicker()) return;
-          if (!Array.isArray(freshModels) || freshModels.length === 0) return;
-          providerModels = freshModels;
-          models = normalizeModelOptions(providerModels);
-          cacheRef.current = { models: providerModels, at: Date.now() };
-          if (activeModelProvider === null) {
-            renderModelPicker();
-          }
-        })
-        .catch(() => {});
+      void refreshModelsPromise.then(applyFreshModels).catch(() => {});
+    } else if (cacheIsStale) {
+      if (!providerModelsTtlRefreshPromise) {
+        providerModelsTtlRefreshPromise = Promise.resolve(loadModels({ force: true }))
+          .then((freshModels) => {
+            if (Array.isArray(freshModels) && freshModels.length > 0) {
+              cacheRef.current = { models: freshModels, at: Date.now() };
+            }
+            return freshModels;
+          })
+          .finally(() => {
+            providerModelsTtlRefreshPromise = null;
+          });
+      }
+      void providerModelsTtlRefreshPromise.then(applyFreshModels).catch(() => {});
     }
   };
 

package/src/tui/app/route-pickers.mjs

@@ -74,6 +74,9 @@ export function createRoutePickers({
       store.pushNotice(`could not list agents: ${e?.message || e}`, 'error');
       return;
     }
+    // /agents refresh: force the nested model picker to reload the provider
+    // catalog on the next agent open (the agents list itself is always fresh).
+    const refreshModels = options.refreshModels === true;
     const routeOverrides = options.routeOverrides && typeof options.routeOverrides === 'object' ? options.routeOverrides : {};
     const initialAgentId = clean(options.initialAgentId || '');
     const items = agents.map((agent) => ({
@@ -104,6 +107,7 @@ export function createRoutePickers({
         void openModelPicker({
           title: `${agent.label} Model`,
           providerDescription: 'Choose a provider for this agent.',
+          refreshModels,
           currentRoute: agent.route || null,
           returnTo: () => openAgentsPicker(),
           onImmediateSelect: (routeInput) => {

package/src/tui/app/slash-dispatch.mjs

@@ -71,6 +71,11 @@ export function createSlashDispatch({
           openModelPicker();
           return true;
         }
+        if (arg.trim().toLowerCase() === 'refresh') {
+          // Explicit catalog reload: force a fresh remote provider list.
+          openModelPicker({ refreshModels: true });
+          return true;
+        }
         void store.setModel(arg)
           .then(ok => store.pushNotice(ok ? modelSwitchNotice() : 'Model switch is already running.', ok ? 'info' : 'warn'))
           .catch((e) => store.pushNotice(`Couldn’t switch model: ${e?.message || e}`, 'error'));
@@ -92,7 +97,7 @@ export function createSlashDispatch({
         openSearchPicker();
         return true;
       case 'agents':
-        openAgentsPicker();
+        openAgentsPicker(arg.trim().toLowerCase() === 'refresh' ? { refreshModels: true } : {});
         return true;
       case 'workflow':
         if (!arg) {

package/src/tui/dist/index.mjs

@@ -13122,7 +13122,7 @@ function createExtensionPickers({
         label: server.name,
         marker: enabled ? "\u25CF" : "\u25CB",
         markerColor: enabled ? theme2.success : theme2.inactive,
-        description: pending ? `${optimistic.enabled ? "enabling" : "disabling"}\u2026 \xB7 ${server.transport || "unknown"}` : `${server.status || "unknown"} \xB7 ${server.transport || "unknown"} \xB7 ${server.toolCount || 0} tools${server.error ? ` \xB7 ${server.error}` : ""}`,
+        description: pending ? `${optimistic.enabled ? "enabling" : "disabling"}\u2026 \xB7 ${server.transport || "unknown"}` : `${server.source || "config"} \xB7 ${server.status || "unknown"} \xB7 ${server.transport || "unknown"} \xB7 ${server.toolCount || 0} tools${server.error ? ` \xB7 ${server.error}` : ""}`,
         _action: "server",
         _server: server,
         _enabled: enabled
@@ -15690,6 +15690,7 @@ function createChannelPickers({
 }
 
 // src/tui/app/model-picker.mjs
+var MODEL_CACHE_TTL_MS = 5 * 60 * 1e3;
 function createModelPicker({
   store,
   getState,
@@ -15705,6 +15706,7 @@ function createModelPicker({
   modelSwitchNotice: modelSwitchNotice2,
   openProviderSetupPicker
 }) {
+  let providerModelsTtlRefreshPromise = null;
   const openModelPicker = async (options = {}) => {
     const state = getState();
     setProviderPrompt(null);
@@ -15729,6 +15731,7 @@ function createModelPicker({
     let providerModels = Array.isArray(cacheRef.current.models) ? cacheRef.current.models : [];
     let refreshModelsPromise = null;
     let renderedQuickModels = false;
+    let renderActiveProviderModels = null;
     if (!providerModels.length || options.refreshModels === true) {
       setPicker({
         title: options.title || "Model",
@@ -15755,6 +15758,8 @@ function createModelPicker({
         return;
       }
     }
+    const cacheAt = Number(cacheRef.current.at) || 0;
+    const cacheIsStale = providerModels.length > 0 && options.refreshModels !== true && options.cacheRef !== "search" && !refreshModelsPromise && Date.now() - cacheAt > MODEL_CACHE_TTL_MS;
     if (!providerModels || providerModels.length === 0) {
       store.pushNotice(options.emptyNotice || "no provider models available; open /providers to sign in", "warn");
       void openProviderSetupPicker({
@@ -15778,9 +15783,11 @@ function createModelPicker({
       }
       const highlightProvider = renderOptions.highlightProvider || providerListHighlightProvider || null;
       activeModelProvider = null;
+      renderActiveProviderModels = null;
       const openProviderModelsPicker = (provider) => {
         if (!provider) return;
         activeModelProvider = provider;
+        renderActiveProviderModels = () => openProviderModelsPicker(provider);
         const providerModels2 = models.filter((model) => model.provider === provider);
         const preferredEffort = (values = []) => {
           const allowed = values.filter(Boolean);
@@ -15999,17 +16006,33 @@ ${model?.id || ""}`;
       });
     };
     renderModelPicker();
+    const applyFreshModels = (freshModels) => {
+      if (!isActiveModelPicker()) return;
+      if (!Array.isArray(freshModels) || freshModels.length === 0) return;
+      providerModels = freshModels;
+      models = normalizeModelOptions(providerModels);
+      cacheRef.current = { models: providerModels, at: Date.now() };
+      if (activeModelProvider === null) {
+        renderModelPicker();
+      } else if (typeof renderActiveProviderModels === "function") {
+        renderActiveProviderModels();
+      }
+    };
     if (renderedQuickModels && refreshModelsPromise) {
-      void refreshModelsPromise.then((freshModels) => {
-        if (!isActiveModelPicker()) return;
-        if (!Array.isArray(freshModels) || freshModels.length === 0) return;
-        providerModels = freshModels;
-        models = normalizeModelOptions(providerModels);
-        cacheRef.current = { models: providerModels, at: Date.now() };
-        if (activeModelProvider === null) {
-          renderModelPicker();
-        }
-      }).catch(() => {
+      void refreshModelsPromise.then(applyFreshModels).catch(() => {
+      });
+    } else if (cacheIsStale) {
+      if (!providerModelsTtlRefreshPromise) {
+        providerModelsTtlRefreshPromise = Promise.resolve(loadModels({ force: true })).then((freshModels) => {
+          if (Array.isArray(freshModels) && freshModels.length > 0) {
+            cacheRef.current = { models: freshModels, at: Date.now() };
+          }
+          return freshModels;
+        }).finally(() => {
+          providerModelsTtlRefreshPromise = null;
+        });
+      }
+      void providerModelsTtlRefreshPromise.then(applyFreshModels).catch(() => {
       });
     }
   };
@@ -16616,6 +16639,7 @@ function createRoutePickers({
       store.pushNotice(`could not list agents: ${e?.message || e}`, "error");
       return;
     }
+    const refreshModels = options.refreshModels === true;
     const routeOverrides = options.routeOverrides && typeof options.routeOverrides === "object" ? options.routeOverrides : {};
     const initialAgentId = clean3(options.initialAgentId || "");
     const items = agents.map((agent) => ({
@@ -16646,6 +16670,7 @@ function createRoutePickers({
         void openModelPicker({
           title: `${agent.label} Model`,
           providerDescription: "Choose a provider for this agent.",
+          refreshModels,
           currentRoute: agent.route || null,
           returnTo: () => openAgentsPicker(),
           onImmediateSelect: (routeInput) => {
@@ -17441,6 +17466,10 @@ function createSlashDispatch({
           openModelPicker();
           return true;
         }
+        if (arg.trim().toLowerCase() === "refresh") {
+          openModelPicker({ refreshModels: true });
+          return true;
+        }
         void store.setModel(arg).then((ok) => store.pushNotice(ok ? modelSwitchNotice2() : "Model switch is already running.", ok ? "info" : "warn")).catch((e) => store.pushNotice(`Couldn\u2019t switch model: ${e?.message || e}`, "error"));
         return true;
       case "remote": {
@@ -17453,7 +17482,7 @@ function createSlashDispatch({
         openSearchPicker();
         return true;
       case "agents":
-        openAgentsPicker();
+        openAgentsPicker(arg.trim().toLowerCase() === "refresh" ? { refreshModels: true } : {});
         return true;
       case "workflow":
         if (!arg) {