mixdog 0.9.174 → 1.0.0

package/src/runtime/agent/orchestrator/tools/builtin/lib/search-input-helpers.mjs

@@ -1,3 +1,4 @@
+import { markScopedCacheIncomplete } from '../../../session/cache/scoped-cache-outcome.mjs';
 import { canonicalizeGlobSlashes } from '../path-utils.mjs';
 import { relativePathPrefix } from '../search-path-diagnostics.mjs';
 import { normalizeGrepLine, splitGrepCountPrefix, splitGrepLinePrefix } from '../grep-formatting.mjs';
@@ -46,6 +47,42 @@ export function resolveHeadLimit(coerced, defaultLimit) {
   return coerced === 0 ? Infinity : coerced;
 }
 
+// Validates the shared head_limit/offset window arguments. `error` is the
+// tool-error text; otherwise the resolved limit (Infinity = unlimited), the
+// coerced limit as given (null when absent, 0 when explicitly unlimited) and
+// the offset.
+export function resolveSearchWindow(args, defaultHeadLimit) {
+  const headLimitCoerced = coerceNonNegInt(args.head_limit);
+  if (Number.isNaN(headLimitCoerced)) {
+    return {
+      error: `Error: invalid limit ${JSON.stringify(args.head_limit)}; expected a non-negative integer (0 = unlimited)`,
+    };
+  }
+  const offsetCoerced = coerceNonNegInt(args.offset);
+  if (Number.isNaN(offsetCoerced)) {
+    return { error: `Error: invalid offset ${JSON.stringify(args.offset)}; expected a non-negative integer` };
+  }
+  return {
+    headLimit: resolveHeadLimit(headLimitCoerced, defaultHeadLimit),
+    headLimitCoerced,
+    offset: offsetCoerced || 0,
+  };
+}
+
+// A pattern list capped at `cap`. Dropping input patterns means the result
+// cannot cover the requested set — never cache it as complete, and key the
+// cache on the original count (`total`) so a capped request never collides
+// with an exact N-pattern one.
+export function capPatternList(requested, cap, options) {
+  if (requested.length <= cap) return { patterns: requested, note: '', total: 0 };
+  if (options?.scopedCacheOutcome) markScopedCacheIncomplete(options.scopedCacheOutcome);
+  return {
+    patterns: requested.slice(0, cap),
+    note: `[capped at ${cap} of ${requested.length} patterns]\n`,
+    total: requested.length,
+  };
+}
+
 export function globMtimeTiePath(entry) {
   const p = String(entry?.path ?? entry?.full ?? '');
   return process.platform === 'win32' ? p.toLocaleLowerCase() : p;

package/src/runtime/agent/orchestrator/tools/builtin/lib/shell-job-insights.mjs

@@ -1,4 +1,4 @@
-import { stripAnsi } from '../../shell-command.mjs';
+import { stripAnsi } from '../../shell-exec-output.mjs';
 
 export const SHELL_JOB_OUTPUT_DISK_CAP = 100 * 1024 * 1024;
 

package/src/runtime/agent/orchestrator/tools/builtin/list-tool.mjs

@@ -8,12 +8,8 @@ import { NOISE_DIR_NAMES, walkDir } from './glob-walk.mjs';
 import { TOOL_OUTPUT_MAX_BYTES } from './tool-output-limit.mjs';
 import { runRgWindowedLines } from './native-search-runner.mjs';
 import { tryServeListMetadata } from './native-search-client.mjs';
-import { guardedWalkRoot, normalizeListHeadLimit, pageContinuationLine } from './lib/list-helpers.mjs';
+import { countTextFileLines, guardedWalkRoot, normalizeListHeadLimit, pageContinuationLine } from './lib/list-helpers.mjs';
 import { reportToolProgress } from './lib/tool-progress.mjs';
-import {
-  recordRuntimeDirectoryReadSuccess,
-  reportRuntimeDirectoryReadFailure,
-} from '../../../../shared/session-runtime-health.mjs';
 import { displayRelPath, statWalkRoot } from './list-tool-shared.mjs';
 import { executeFindFilesTool } from './find-files-tool.mjs';
 
@@ -68,14 +64,10 @@ function recordDirectoryWalkTelemetry(options, status, walkResult, warningCount
 // After a walk: an abort propagates, a root that could not be read is the
 // tool's answer (returned as the error line, uncached, and counted against
 // the runtime worker's health), and anything else records a healthy read.
-function walkRootFailureLine(options, fullPath, walkResult, walkWarnings, label) {
+function walkRootFailureLine(options, walkResult, walkWarnings, label) {
   throwIfDirectoryWalkAborted(options.signal, walkResult, label);
   const rootFailure = walkWarnings.find((warning) => warning.root);
-  if (!rootFailure) {
-    recordRuntimeDirectoryReadSuccess();
-    return null;
-  }
-  reportRuntimeDirectoryReadFailure(fullPath, rootFailure.error);
+  if (!rootFailure) return null;
   recordDirectoryWalkTelemetry(options, 'failed', walkResult, walkWarnings.length);
   if (options?.scopedCacheOutcome) markScopedCacheIncomplete(options.scopedCacheOutcome);
   return directoryReadFailureLine(rootFailure);
@@ -220,13 +212,30 @@ function listCacheKey({ fullPath, depth, hidden, sort, typeFilter, headLimit, of
 function listRowLine(row, fullPath, meta) {
   const path = displayRelPath(row.path, fullPath);
   if (!meta) return `${path}\t${row.type}`;
-  return `${path}\t${row.type}\t${row.size}\t${_metaMtimeIso(row.mtimeMs)}\t${_metaModeOctal(row.mode)}`;
+  return `${path}\t${row.type}\t${row.size}\t${_metaMtimeIso(row.mtimeMs)}\t${_metaModeOctal(row.mode)}${lineCountSuffix(row.lineCount)}`;
+}
+
+function lineCountSuffix(lineCount) {
+  return lineCount == null ? '' : `\t${lineCount}`;
 }
 
-function listFileLine(fullPath, st, meta) {
+function listFileLine(fullPath, st, meta, lineCount) {
   const path = normalizeOutputPath(fullPath);
   if (!meta) return `${path}\tfile`;
-  return `${path}\tfile\t${st.size}\t${_metaMtimeIso(st.mtimeMs)}\t${_metaModeOctal(st.mode)}`;
+  return `${path}\tfile\t${st.size}\t${_metaMtimeIso(st.mtimeMs)}\t${_metaModeOctal(st.mode)}${lineCountSuffix(lineCount)}`;
+}
+
+// Text-file line counts for the rendered meta rows (binaries and files over
+// the size cap get none), read in bounded batches.
+async function fillRowLineCounts(rows) {
+  const files = rows.filter((row) => row.type === 'file');
+  for (let i = 0; i < files.length; i += 32) {
+    await Promise.all(
+      files.slice(i, i + 32).map(async (row) => {
+        row.lineCount = await countTextFileLines(row.fullPath, row.size);
+      })
+    );
+  }
 }
 
 function entryType(ent) {
@@ -342,7 +351,7 @@ export async function executeListTool(args, workDir, options = {}) {
   if (args.mode === 'find') return executeFindFilesTool(args, workDir, options);
   args.path = normalizeInputPath(args.path);
   if (!args.name && hasGlobMagic(args.path)) {
-    return executeFindFilesTool({ ...args, mode: 'find' }, workDir);
+    return executeFindFilesTool({ ...args, mode: 'find' }, workDir, options);
   }
   const request = listRequest(args, workDir);
   if (request.error) return request.error;
@@ -364,7 +373,7 @@ export async function executeListTool(args, workDir, options = {}) {
   if (root.error) return root.error;
   if (!root.stat.isDirectory()) {
     if (!root.stat.isFile()) return `Error: not a directory — ${normalizeOutputPath(fullPath)}`;
-    const out = listFileLine(fullPath, root.stat, meta);
+    const out = listFileLine(fullPath, root.stat, meta, meta ? await countTextFileLines(fullPath, root.stat.size) : null);
     cacheSet(cacheKey, out, { scopes: [fullPath] });
     return out;
   }
@@ -373,7 +382,7 @@ export async function executeListTool(args, workDir, options = {}) {
     workDir,
     options
   );
-  const rootFailure = walkRootFailureLine(options, fullPath, walkResult, walkWarnings, 'list walk');
+  const rootFailure = walkRootFailureLine(options, walkResult, walkWarnings, 'list walk');
   if (rootFailure) return rootFailure;
   if (!nativeDeep && needsGlobalStat) await fillRowMetadata(rows, workDir, options);
   sortListRows(rows, sort);
@@ -403,6 +412,7 @@ async function renderListPage({ request, rows, walkWarnings, truncatedByCap, nat
   const windowed = offset > 0 ? rows.slice(offset) : rows;
   const sliced = headLimit > 0 ? windowed.slice(0, headLimit) : windowed;
   if (!nativeDeep && meta && !needsGlobalStat) await fillRowMetadata(sliced, workDir, options);
+  if (meta) await fillRowLineCounts(sliced);
   const lines = sliced.map((row) => listRowLine(row, fullPath, meta));
   const paged = windowed.length > sliced.length;
   if (paged) lines.push(pageContinuationLine(offset, sliced.length, rows.length));
@@ -519,7 +529,7 @@ export async function executeTreeTool(args, workDir, options = {}) {
   if (root.error) return root.error;
   if (!root.stat.isDirectory()) return `Error: not a directory — ${normalizeOutputPath(fullPath)}`;
   const { lines, walkResult, walkWarnings } = await walkTreeLines(fullPath, request, options);
-  const rootFailure = walkRootFailureLine(options, fullPath, walkResult, walkWarnings, 'tree walk');
+  const rootFailure = walkRootFailureLine(options, walkResult, walkWarnings, 'tree walk');
   if (rootFailure) return rootFailure;
   const { out, incomplete } = renderTreeOutput(lines, walkWarnings, request);
   recordDirectoryWalkTelemetry(options, walkOutcome(walkResult, walkWarnings.length), walkResult, walkWarnings.length);

package/src/runtime/agent/orchestrator/tools/builtin/native-search-client.mjs

@@ -10,7 +10,6 @@
 // executable.
 import { existsSync } from 'node:fs';
 import { bindChildLifecycle, createNativeSearchTransport } from './native-search-transport.mjs';
-import { reportRuntimeWorkerUnhealthy } from '../../../../shared/session-runtime-health.mjs';
 import { invalidateBuiltinResultCache } from './cache-layers.mjs';
 import { getPluginData } from '../../config.mjs';
 import { ensureGraphBinary } from '../graph-binary-fetcher.mjs';
@@ -45,6 +44,8 @@ let _warmPromise = null;
 let _lastTimeoutRecycleAt = 0;
 const _abortSignalSubscribers = new WeakMap();
 
+const searchServerDisabled = () => process.env.MIXDOG_SEARCH_SERVER === '0';
+
 function codedError(code, message, cause = null) {
   const error = new Error(message);
   error.code = code;
@@ -429,7 +430,7 @@ export { completeNativeCancellation as _ackNativeSearchCancellationForTest };
 // call this fire-and-forget to have the resident
 // server up before the first tool call. Honors the same kill switch.
 export async function warmNativeSearchServer(timeoutMs = 5_000) {
-  if (process.env.MIXDOG_SEARCH_SERVER === '0') return false;
+  if (searchServerDisabled()) return false;
   if (!_warmPromise) {
     const warm = (async () => {
       try {
@@ -501,11 +502,6 @@ async function requestNative(server, request, execOptions, deadlineMs) {
       // if it does not comply. Killing it here also destroyed every warm
       // inventory, so the next call re-walked from cold and timed out again.
       if (action !== 'runtime') return;
-      reportRuntimeWorkerUnhealthy({
-        reason: 'native search timed out again after server recycle',
-        code: 'NATIVE_SEARCH_TIMEOUT_STREAK',
-        subsystem: 'native-search',
-      });
       queueMicrotask(() => {
         if (_server === server) {
           _teardown(error, { countFailure: false, detail: 'repeated request timeouts' });
@@ -640,7 +636,7 @@ function consumedDeadline(response, deadlineMs) {
 /** Returns a runRgWindowedLines-shaped result, or null when the native server
  *  is disabled or the response carries no line list. */
 export async function tryServeSearch(argsList, execOptions = {}, opts = {}) {
-  if (process.env.MIXDOG_SEARCH_SERVER === '0') return null;
+  if (searchServerDisabled()) return null;
   const deadlineMs = callerDeadlineMs(execOptions, REQUEST_TIMEOUT_MS);
   const buildRequest = (server, remaining) => ({
     id: ++server.sequence,
@@ -730,7 +726,7 @@ export async function tryServeSearch(argsList, execOptions = {}, opts = {}) {
 }
 
 export async function tryServeFuzzySearch(args, execOptions = {}) {
-  if (process.env.MIXDOG_SEARCH_SERVER === '0') return null;
+  if (searchServerDisabled()) return null;
   const deadlineMs = callerDeadlineMs(execOptions, REQUEST_TIMEOUT_MS);
   const response = await requestNativeWithRestart(
     (server, remaining) => ({
@@ -783,7 +779,7 @@ export async function tryServeFuzzySearch(args, execOptions = {}) {
 }
 
 export async function tryServeListMetadata(paths, execOptions = {}) {
-  if (process.env.MIXDOG_SEARCH_SERVER === '0') return null;
+  if (searchServerDisabled()) return null;
   const list = Array.isArray(paths) ? paths.map(String) : [];
   if (list.length === 0) return [];
   if (list.length > 50_000) {

package/src/runtime/agent/orchestrator/tools/builtin/path-utils.mjs

@@ -126,12 +126,22 @@ export const GREP_AUTO_CONTEXT_BEFORE = 8;
 export const GREP_AUTO_CONTEXT_AFTER = 12;
 export const GREP_AUTO_CONTEXT_LINES = GREP_AUTO_CONTEXT_AFTER;
 
-export function normalizeGrepArgs(args) {
-  if (!args || typeof args !== 'object') return args;
+// The aliases grep and glob share: `limit` → `head_limit`, and the root/dir
+// spellings of `path`.
+function promoteSharedSearchAliases(args) {
   if ((args.head_limit === undefined || args.head_limit === null) && args.limit !== undefined) {
     args.head_limit = args.limit;
     delete args.limit;
   }
+  if (args.path === undefined || args.path === null || args.path === '') {
+    const alias = firstPresentArg(args, ['root', 'directory', 'dir']);
+    if (alias !== undefined) args.path = alias;
+  }
+}
+
+export function normalizeGrepArgs(args) {
+  if (!args || typeof args !== 'object') return args;
+  promoteSharedSearchAliases(args);
   if (args.pattern === undefined || args.pattern === null || args.pattern === '') {
     const alias = firstPresentArg(args, ['query', 'regex', 'regexp', 'needle', 'search', 'literal']);
     if (alias !== undefined) args.pattern = alias;
@@ -140,10 +150,6 @@ export function normalizeGrepArgs(args) {
     const alias = firstPresentArg(args, ['file_pattern', 'filePattern', 'include', 'includes', 'files']);
     if (alias !== undefined) args.glob = alias;
   }
-  if (args.path === undefined || args.path === null || args.path === '') {
-    const alias = firstPresentArg(args, ['root', 'directory', 'dir']);
-    if (alias !== undefined) args.path = alias;
-  }
   if (
     (args.output_mode === undefined || args.output_mode === null || args.output_mode === '') &&
     typeof args.mode === 'string'
@@ -163,10 +169,7 @@ export function normalizeGrepArgs(args) {
 
 export function normalizeGlobArgs(args) {
   if (!args || typeof args !== 'object') return args;
-  if ((args.head_limit === undefined || args.head_limit === null) && args.limit !== undefined) {
-    args.head_limit = args.limit;
-    delete args.limit;
-  }
+  promoteSharedSearchAliases(args);
   if (args.pattern === undefined || args.pattern === null || args.pattern === '') {
     const alias = firstPresentArg(args, [
       'glob',
@@ -179,10 +182,6 @@ export function normalizeGlobArgs(args) {
     ]);
     if (alias !== undefined) args.pattern = alias;
   }
-  if (args.path === undefined || args.path === null || args.path === '') {
-    const alias = firstPresentArg(args, ['root', 'directory', 'dir']);
-    if (alias !== undefined) args.path = alias;
-  }
   // Internal-only passthrough: `_extraIgnoreDirs` is an array of basenames
   // appended as `!**/<name>/**` ignore globs by executeGlobTool for the
   // duration of one invocation. Not exposed in tools.json. Sanitize to a
@@ -308,9 +307,8 @@ export function coerceShapeFlex(value) {
   return value;
 }
 
-// JSON-stringified path arrays (path:"[]") and empty arrays mean "search cwd".
-// Bracket-shaped strings that exist on disk (e.g. a literal `[x]` directory) are
-// left untouched — JSON reinterpretation only runs after a stat miss.
+// A compact `[path, offset, limit?]` range tuple as a region object, or null
+// when the value is not one.
 function compactReadRangeTuple(value) {
   if (!Array.isArray(value) || value.length < 2 || value.length > 3 || typeof value[0] !== 'string') return null;
   const numeric = value

package/src/runtime/agent/orchestrator/tools/builtin/read-formatting.mjs

@@ -18,7 +18,7 @@ const READ_MAX_RENDERED_LINE_CHARS = 2_000;
 // (runtime/shared/read-row-numbers.mjs).
 export const LINE_NO_SEP = READ_LINE_NO_SEP;
 
-export function buildSmartReadTruncationMarker(totalLines, fileBytes, _filePath = '') {
+export function buildSmartReadTruncationMarker(totalLines, fileBytes) {
   const kb = Math.max(1, Math.round((Number(fileBytes) || 0) / 1024));
   return `... [TRUNCATED - ${totalLines} lines / ${kb} KB; read located windows with {file_path, offset, limit}] ...`;
 }
@@ -39,7 +39,7 @@ function rangeFromRenderedReadRows(rows, fallbackStartLine = 1) {
   };
 }
 
-export function smartReadTruncate(renderedWithLineNos, totalLines, fileBytes, filePath = '') {
+export function smartReadTruncate(renderedWithLineNos, totalLines, fileBytes) {
   const overByBytes = fileBytes > SMART_READ_MAX_BYTES;
   const overByLines = totalLines > SMART_READ_MAX_LINES;
   if (!overByBytes && !overByLines) {
@@ -56,7 +56,7 @@ export function smartReadTruncate(renderedWithLineNos, totalLines, fileBytes, fi
   const tailRows = rows.slice(tailStart);
   const head = headRows.join('\n');
   const tail = tailRows.join('\n');
-  const marker = buildSmartReadTruncationMarker(totalLines, fileBytes, filePath);
+  const marker = buildSmartReadTruncationMarker(totalLines, fileBytes);
   return {
     text: `${head}\n${marker}\n${tail}`,
     truncated: true,