mixdog 1.4.0 → 1.4.2

package/src/runtime/shared/session-scratch.mjs

@@ -0,0 +1,37 @@
+// Per-session scratch directory under Mixdog's data directory. Processes the
+// `shell` tool starts see it as TEMP/TMP/TMPDIR, so scratch files never land in
+// the project, and it is removed with its session (session-delete.mjs).
+import { mkdirSync, rmSync } from 'node:fs';
+import { join } from 'node:path';
+import { resolvePluginData } from './plugin-paths.mjs';
+
+const SESSION_ID = /^[A-Za-z0-9_-]+$/;
+
+/** The session's scratch path (not created), or '' for an unusable id. */
+export function sessionScratchDir(sessionId) {
+  const id = typeof sessionId === 'string' ? sessionId : '';
+  return SESSION_ID.test(id) ? join(resolvePluginData(), 'scratch', id) : '';
+}
+
+/** Create the session's scratch directory if absent; returns its path ('' without a session id). */
+export function ensureSessionScratchDir(sessionId) {
+  const dir = sessionScratchDir(sessionId);
+  if (dir) mkdirSync(dir, { recursive: true });
+  return dir;
+}
+
+export function removeSessionScratchDir(sessionId) {
+  const dir = sessionScratchDir(sessionId);
+  if (dir) rmSync(dir, { recursive: true, force: true });
+}
+
+/** Point an env's temp variables at the session's scratch directory. */
+export function applySessionScratchEnv(env, sessionId) {
+  const dir = ensureSessionScratchDir(sessionId);
+  if (dir) {
+    env.TEMP = dir;
+    env.TMP = dir;
+    env.TMPDIR = dir;
+  }
+  return env;
+}

package/src/runtime/shared/staged-install-worker.mjs

@@ -6,8 +6,13 @@
  * quitting mid-install. Does its work and exits; the swap happens on a later
  * clean launch via performPendingSwap().
  */
+import { adoptSystemProxy } from './llm/system-proxy.mjs';
 import { runStagedInstall } from './staged-update.mjs';
 
+// Consume the system proxy handed over by the launcher (removing it from this
+// env); only the npm install below receives it, as npm settings.
+adoptSystemProxy();
+
 const version = process.argv[2] || process.env.MIXDOG_STAGE_VERSION || '';
 runStagedInstall(version)
   .then((r) => process.exit(r?.ok || r?.alreadyStaged || r?.inProgress ? 0 : 1))

package/src/runtime/shared/staged-update.mjs

@@ -46,6 +46,7 @@ import { dirname, basename, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { spawn } from 'node:child_process';
 import { resolvePluginData } from './plugin-paths.mjs';
+import { systemProxyHandoffEnv, systemProxyNpmEnv } from './llm/system-proxy.mjs';
 // Same probe every discovery/lock reader uses; `process.pid` is trivially alive.
 import { isPidAlive as pidAlive } from './pid-liveness.mjs';
 import { sleepSync } from './sleep.mjs';
@@ -222,6 +223,38 @@ function releaseStagingLock(verDir) {
   }
 }
 
+const DEFAULT_NPM_REGISTRY = 'https://registry.npmjs.org/';
+
+/** The registry npm installs from (its .npmrc files included); npm's default when npm cannot say. */
+function npmRegistry(cliJs) {
+  return new Promise((resolve) => {
+    let out = '';
+    let child;
+    try {
+      child = spawn(process.execPath, [cliJs, 'config', 'get', 'registry'], {
+        stdio: ['ignore', 'pipe', 'ignore'],
+        shell: false,
+        timeout: 10_000,
+        ...hiddenSpawnOpts,
+      });
+    } catch {
+      resolve(DEFAULT_NPM_REGISTRY);
+      return;
+    }
+    child.stdout?.on('data', (chunk) => {
+      out += chunk;
+    });
+    child.once('error', () => resolve(DEFAULT_NPM_REGISTRY));
+    child.once('close', (code) => {
+      try {
+        resolve(code === 0 ? new URL(out.trim()).href : DEFAULT_NPM_REGISTRY);
+      } catch {
+        resolve(DEFAULT_NPM_REGISTRY);
+      }
+    });
+  });
+}
+
 /**
  * runStagedInstall(version) — perform the full staging install for one version
  * into ~/.mixdog/data/staging/<version>. Runs to completion (awaits the npm
@@ -259,10 +292,17 @@ export async function runStagedInstall(version) {
     // shell spawn (AV constraint — no shell spawns).
     const cliJs = npmCliJsPath();
     if (!cliJs) return { ok: false, error: 'npm-cli.js unresolved — staging skipped' };
+    // The system proxy of npm's registry, as npm's own settings for this one install.
+    const npmProxyEnv = await systemProxyNpmEnv(() => npmRegistry(cliJs));
     const code = await new Promise((res) => {
       let child;
       try {
-        child = spawn(process.execPath, [cliJs, ...installArgs], { stdio: 'ignore', shell: false, ...hiddenSpawnOpts });
+        child = spawn(process.execPath, [cliJs, ...installArgs], {
+          stdio: 'ignore',
+          shell: false,
+          env: { ...process.env, ...npmProxyEnv },
+          ...hiddenSpawnOpts,
+        });
       } catch {
         res(-1);
         return;
@@ -319,7 +359,12 @@ export function spawnStagedInstall(version) {
   if (isStagedComplete(v)) return false;
   try {
     const worker = join(_MODULE_DIR, 'staged-install-worker.mjs');
-    const child = spawn(process.execPath, [worker, v], { stdio: 'ignore', ...detachedSpawnOpts });
+    // The worker gets the system proxy decision privately (it consumes it).
+    const child = spawn(process.execPath, [worker, v], {
+      stdio: 'ignore',
+      env: { ...process.env, ...systemProxyHandoffEnv() },
+      ...detachedSpawnOpts,
+    });
     child.once?.('error', () => {});
     child.unref?.();
     return true;

package/src/runtime/shared/tool-card-model/agent-surface.mjs

@@ -38,9 +38,7 @@ function agentNameFromResult(resultText) {
 // The agent identity a card shows: the call's own fields, else the result
 // envelope when the call only carried a tag/task id.
 function agentDisplayName(args, resultText = '') {
-  return (
-    titleizeAgentName(args?.agent || args?.subagent_type || args?.name || '') || agentNameFromResult(resultText)
-  );
+  return titleizeAgentName(args?.agent || args?.subagent_type || args?.name || '') || agentNameFromResult(resultText);
 }
 
 function agentModelLabel(args) {

package/src/runtime/shared/tool-card-model/card-status.mjs

@@ -7,13 +7,26 @@ import { backgroundTaskFailureStatusLabel } from '../err-text.mjs';
 import { agentTerminalDetail, isAgentTool } from './agent-surface.mjs';
 import { backgroundTaskElapsed, backgroundTaskFailureDetail, isBackgroundTaskTool } from './background-task.mjs';
 import { shellDisplayStatus } from './shell-surface.mjs';
-import { normalizeTerminalStatus, resultControlStatus, resultEnvelopeStatus, shellResultElapsed } from './terminal-status.mjs';
+import {
+  normalizeTerminalStatus,
+  resultControlStatus,
+  resultEnvelopeStatus,
+  shellResultElapsed,
+} from './terminal-status.mjs';
 import { mediaTerminalStatus } from './media-result.mjs';
 import { gitTerminalStatus } from './git-result.mjs';
 import { isUserControlCancellation } from '../tool-status.mjs';
 
 // Tools whose result opens with a task/bridge envelope that reports the call's status.
-const ENVELOPE_STATUS_TOOLS = new Set(['agent', 'bridge', 'task', 'web_search', 'search_query', 'image_query', 'web_search_call']);
+const ENVELOPE_STATUS_TOOLS = new Set([
+  'agent',
+  'bridge',
+  'task',
+  'web_search',
+  'search_query',
+  'image_query',
+  'web_search_call',
+]);
 
 function shellFragments(base, display, isShellSurface) {
   if (!isShellSurface) return { shellStatus: '', shellElapsed: '' };

package/src/runtime/shared/tool-result-summary.mjs

@@ -648,7 +648,7 @@ const summarizeAskUserResult = ({ text, translate }) => {
 
 const TOOL_RESULT_SUMMARIZERS = new Map(
   [
-    [['ask_user'], summarizeAskUserResult],
+    [['ask_user', 'handoff_user'], summarizeAskUserResult],
     [['read', 'view_image', 'read_mcp_resource'], summarizeReadResult],
     [['apply_patch'], summarizePatchResult],
     [['grep'], summarizeGrepResult],

package/src/runtime/shared/tool-surface.mjs

@@ -83,7 +83,7 @@ export function isTaskWaitToolCall(name, args = {}) {
   );
 }
 
-export function displayToolName(name, args = {}) {
+function displayToolName(name, args = {}) {
   if (isExternalMcpToolName(name)) {
     const mcp = parseMcpToolName(name);
     return `MCP ${titleCaseMcpServer(mcp.server)}`;
@@ -127,6 +127,8 @@ export function displayToolName(name, args = {}) {
     case 'web_fetch':
     case 'fetch':
       return 'Fetch';
+    case 'explore':
+      return 'Explore';
     case 'browser':
     case 'browser_devtools':
       return 'Browser';
@@ -151,6 +153,7 @@ export function displayToolName(name, args = {}) {
     case 'request_user_input':
       return 'Ask User';
     case 'ask_user':
+    case 'handoff_user':
       return 'Question';
     case 'update_plan':
       return 'Plan';
@@ -212,18 +215,14 @@ export function summarizeToolArgs(name, args, { max = DEFAULT_SUMMARY_MAX } = {}
   }
   switch (normalized) {
     case 'read':
-      if (!a.path && !a.file_path) return '';
-      if (Array.isArray(a.path) || Array.isArray(a.file_path)) {
-        return formatCountedUnit(collectionCount(a.path, a.file_path), 'file');
-      }
-      return compactParts([
-        displayToolPath(a.path ?? a.file_path),
-        a.pages ? `pages ${a.pages}` : summarizeLineWindow(a),
-      ]);
     case 'view_image':
-      return displayToolPath(a.path || a.file_path || '');
     case 'apply_patch':
-      return summarizePatch(a.patch, a.base_path);
+    case 'list':
+    case 'ls':
+    case 'grep':
+    case 'glob':
+    case 'find':
+      return summarizeFileToolArgs(normalized, a, max);
     case 'shell':
     case 'bash':
     case 'bash_session':
@@ -239,6 +238,8 @@ export function summarizeToolArgs(name, args, { max = DEFAULT_SUMMARY_MAX } = {}
       return summarizeGithub(a, max);
     case 'goal':
       return compactParts([String(a.action || ''), truncateToolText(a.objective, max)]);
+    case 'handoff_user':
+      return '';
     case 'ask_user':
       return truncateToolText(
         (Array.isArray(a.questions) ? a.questions : [])
@@ -247,6 +248,82 @@ export function summarizeToolArgs(name, args, { max = DEFAULT_SUMMARY_MAX } = {}
           .join(', '),
         max
       );
+    case 'search_query':
+    case 'image_query':
+    case 'web_search':
+    case 'web_search_call':
+    case 'load_tool':
+    case 'web_fetch':
+    case 'fetch':
+      return summarizeWebToolArgs(normalized, a, max);
+    case 'browser':
+    case 'browser_devtools':
+    case 'computer':
+    case 'terminal':
+    case 'visualize':
+    case 'office':
+    case 'media':
+    case 'tidy':
+      return summarizeInterfaceToolArgs(normalized, a, args, max);
+    case 'explore':
+      if (Array.isArray(a.query)) return formatCountedUnit(collectionCount(a.query), 'query', 'queries');
+      return truncateToolText(a.query || '', Math.min(max, 80));
+    case 'read_mcp_resource':
+      return truncateToolText(a.uri || '', max);
+    case 'list_mcp_resources':
+    case 'list_mcp_resource_templates':
+      return a.server ? `server "${truncateToolText(a.server, max)}"` : 'all servers';
+    case 'cwd':
+    case 'session':
+    case 'setup':
+    case 'memory':
+    case 'remember':
+    case 'save_memory':
+    case 'update_memory':
+    case 'recall_memory':
+    case 'recall':
+    case 'search_memories':
+      return summarizeStateToolArgs(normalized, a, max);
+    case 'bridge':
+    case 'agent': {
+      const agentModel = bridgeAgentModelSummary(a);
+      if (agentModel) return agentModel;
+      const bridgeAction = a.type || a.action || a.mode || '';
+      const showTarget = !/^(status|read)$/i.test(String(bridgeAction || ''));
+      return compactParts([bridgeAction, showTarget ? a.tag || a.sessionId || a.task_id || '' : '']);
+    }
+    case 'code_graph':
+      return codeGraphSummary(a, max);
+    case 'skill':
+    case 'skill_execute':
+    case 'skill_view':
+    case 'skills_list':
+    case 'use_skill':
+      return truncateToolText(
+        firstText(a.name, a.skill, a.skill_name, a.query, a.q, normalized === 'skills_list' ? 'all skills' : ''),
+        max
+      );
+    default:
+      return genericArgsSummary(a, max);
+  }
+}
+
+// Files, directories and patches.
+function summarizeFileToolArgs(normalized, a, max) {
+  switch (normalized) {
+    case 'read':
+      if (!a.path && !a.file_path) return '';
+      if (Array.isArray(a.path) || Array.isArray(a.file_path)) {
+        return formatCountedUnit(collectionCount(a.path, a.file_path), 'file');
+      }
+      return compactParts([
+        displayToolPath(a.path ?? a.file_path),
+        a.pages ? `pages ${a.pages}` : summarizeLineWindow(a),
+      ]);
+    case 'view_image':
+      return displayToolPath(a.path || a.file_path || '');
+    case 'apply_patch':
+      return summarizePatch(a.patch, a.base_path);
     case 'list':
     case 'ls':
       if (Array.isArray(a.path) || Array.isArray(a.dir) || Array.isArray(a.cwd)) {
@@ -281,6 +358,14 @@ export function summarizeToolArgs(name, args, { max = DEFAULT_SUMMARY_MAX } = {}
         return formatCountedUnit(collectionCount(a.query, a.fuzzy), 'query', 'queries');
       }
       return compactParts([quoted(a.query ?? a.fuzzy, max), a.path ? `path: ${displayToolPath(a.path)}` : '']);
+    default:
+      return '';
+  }
+}
+
+// Search, fetch and tool-search loading.
+function summarizeWebToolArgs(normalized, a, max) {
+  switch (normalized) {
     case 'search_query':
     case 'image_query':
     case 'web_search':
@@ -300,6 +385,14 @@ export function summarizeToolArgs(name, args, { max = DEFAULT_SUMMARY_MAX } = {}
         return formatCountedUnit(collectionCount(a.url, a.uri), 'URL', 'URLs');
       }
       return truncateToolText(a.url || a.uri || '', max);
+    default:
+      return '';
+  }
+}
+
+// Bridge and interface tools: browser, computer, terminal, visualize, office, media, tidy.
+function summarizeInterfaceToolArgs(normalized, a, args, max) {
+  switch (normalized) {
     case 'browser':
     case 'browser_devtools': {
       const call = bridgeToolCall(args);
@@ -339,11 +432,14 @@ export function summarizeToolArgs(name, args, { max = DEFAULT_SUMMARY_MAX } = {}
         Array.isArray(a.paths) && a.paths.length ? truncateToolText(a.paths.join(' '), max) : '',
         a.apply === true ? 'apply' : '',
       ]);
-    case 'read_mcp_resource':
-      return truncateToolText(a.uri || '', max);
-    case 'list_mcp_resources':
-    case 'list_mcp_resource_templates':
-      return a.server ? `server "${truncateToolText(a.server, max)}"` : 'all servers';
+    default:
+      return '';
+  }
+}
+
+// Sessions, setup and memory.
+function summarizeStateToolArgs(normalized, a, max) {
+  switch (normalized) {
     case 'cwd': // legacy: old transcripts
     case 'session':
       return compactParts([
@@ -393,27 +489,8 @@ export function summarizeToolArgs(name, args, { max = DEFAULT_SUMMARY_MAX } = {}
         a.limit || a.topK ? `top ${a.limit ?? a.topK}` : '',
       ]);
     }
-    case 'bridge':
-    case 'agent': {
-      const agentModel = bridgeAgentModelSummary(a);
-      if (agentModel) return agentModel;
-      const bridgeAction = a.type || a.action || a.mode || '';
-      const showTarget = !/^(status|read)$/i.test(String(bridgeAction || ''));
-      return compactParts([bridgeAction, showTarget ? a.tag || a.sessionId || a.task_id || '' : '']);
-    }
-    case 'code_graph':
-      return codeGraphSummary(a, max);
-    case 'skill':
-    case 'skill_execute':
-    case 'skill_view':
-    case 'skills_list':
-    case 'use_skill':
-      return truncateToolText(
-        firstText(a.name, a.skill, a.skill_name, a.query, a.q, normalized === 'skills_list' ? 'all skills' : ''),
-        max
-      );
     default:
-      return genericArgsSummary(a, max);
+      return '';
   }
 }
 

package/src/runtime/shared/tool-work-units.mjs

@@ -20,6 +20,7 @@ export const CATEGORY_ORDER = [
   'Skill',
   'Web Research',
   'Memory',
+  'Explore',
   'Patch',
   'Git',
   'Shell',
@@ -58,6 +59,7 @@ const TOOL_CATEGORY = new Map([
   ['save_memory', 'Memory'],
   ['update_memory', 'Memory'],
   ['memory', 'Memory'],
+  ['explore', 'Explore'],
   ['apply_patch', 'Patch'],
   ['edit', 'Patch'],
   ['strreplace', 'Patch'],
@@ -91,6 +93,7 @@ const TOOL_CATEGORY = new Map([
   ['goal', 'Setup'],
   ['request_user_input', 'Setup'],
   ['ask_user', 'Setup'],
+  ['handoff_user', 'Setup'],
   ['update_plan', 'Setup'],
   ['skill', 'Skill'],
   ['skill_execute', 'Skill'],
@@ -115,6 +118,7 @@ const CATEGORY_COPY = new Map([
   ['Skill', { active: 'Loading', done: 'Loaded', noun: 'skill' }],
   ['Web Research', { active: 'Researching', done: 'Researched', noun: 'query', pluralNoun: 'queries' }],
   ['Memory', { active: 'Checking', done: 'Checked', noun: 'memory item' }],
+  ['Explore', { active: 'Exploring', done: 'Explored', noun: 'query', pluralNoun: 'queries' }],
   ['Patch', { active: 'Editing', done: 'Edited', noun: 'file' }],
   ['Git', { active: 'Running', done: 'Ran', noun: 'Git command' }],
   ['Shell', { active: 'Running', done: 'Ran', noun: 'command' }],
@@ -688,6 +692,7 @@ const TOOL_UNITS = new Map([
         pluralNoun: 'URLs',
       }),
   ],
+  ['explore', (a) => unitDescriptor('Explore', { count: queryCount(a, 'query') || 1 })],
   ['browser', browserUnit],
   ['browser_devtools', browserUnit],
   ['computer', () => unitDescriptor('Computer', { count: 1, active: 'Operating', done: 'Operated', noun: 'action' })],
@@ -734,6 +739,7 @@ const TOOL_UNITS = new Map([
   ['code_graph', codeGraphUnit],
   ['request_user_input', () => unitDescriptor('Setup', { active: 'Asking', done: 'Asked', noun: 'user' })],
   ['ask_user', () => unitDescriptor('Setup', { active: 'Asking', done: 'Asked', noun: 'user' })],
+  ['handoff_user', () => unitDescriptor('Setup', { active: 'Asking', done: 'Asked', noun: 'user' })],
   ['update_plan', () => unitDescriptor('Setup', { active: 'Updating', done: 'Updated', noun: 'plan' })],
   ['list_mcp_resources', () => unitDescriptor('Setup', { active: 'Listing', done: 'Listed', noun: 'MCP resource' })],
   [

package/src/runtime/shared/turn-snapshot-store.mjs

@@ -117,16 +117,23 @@ function recordPath(sessionId) {
 function chain(sessionId, task) {
   const previous = writeChains.get(sessionId) || Promise.resolve();
   const next = previous.then(task, task);
-  writeChains.set(
-    sessionId,
-    next.then(
-      () => undefined,
-      () => undefined
-    )
+  const settled = next.then(
+    () => undefined,
+    () => undefined
   );
+  writeChains.set(sessionId, settled);
+  // A settled chain with nothing queued behind it holds no order to keep.
+  void settled.then(() => {
+    if (writeChains.get(sessionId) === settled) writeChains.delete(sessionId);
+  });
   return next;
 }
 
+/** Sessions with a write chain still held (tests). */
+export function _turnSnapshotWriteChainCountForTest() {
+  return writeChains.size;
+}
+
 async function readRecordFile(path) {
   try {
     const parsed = JSON.parse(await readFile(path, 'utf8'));