nolo-cli 0.11.0 → 0.12.0-alpha.10

package/{chunk-BX6U3ETE.js → chunk-MG6BVV3T.js}

@@ -1,27 +1,36 @@
 import {
   applyChatCompletionDelta,
-  finalizeAccumulatedToolCalls,
   flushChatCompletionStream,
+  providerHttpFailure,
   readSseFrames,
-  throwIfChatCompletionStreamFailed,
-  toOpenAiCompatibleMessages
-} from "./chunk-ZPRK73XY.js";
+  throwIfChatCompletionStreamFailed
+} from "./chunk-5S4SWV5G.js";
 import {
   parseToolArgumentsJson
-} from "./chunk-S3GS2PRL.js";
+} from "./chunk-TA7VKOHU.js";
 import {
   createThinkParserState,
-  extractThinkContent
-} from "./chunk-OPZYGHUC.js";
+  createToolCallAccumulator,
+  extractThinkContent,
+  finalizeAccumulatedToolCalls
+} from "./chunk-3WGLLTK4.js";
+import {
+  requiresBareImageUrl,
+  toBareImageUrlMessages
+} from "./chunk-LUKQQJFL.js";
 import {
   buildProviderAuthHeaders,
-  buildProviderExecutionPlan
-} from "./chunk-YTBMA7NO.js";
+  buildProviderExecutionPlan,
+  toOpenAiCompatibleMessages
+} from "./chunk-TYPHUVK5.js";
 import {
   canonicalizeToolName,
   createGlob,
   resolveExecutableOnPath
-} from "./chunk-4SOKXIW4.js";
+} from "./chunk-B4KT7RN2.js";
+import {
+  toErrorMessage
+} from "./chunk-HNMXYYJR.js";
 import {
   asRecordOrEmpty
 } from "./chunk-KX6YBIHG.js";
@@ -38,17 +47,14 @@ import {
   asTrimmedLowercaseString
 } from "./chunk-QSJ3HFEF.js";
 import {
-  toErrorMessage
-} from "./chunk-HNMXYYJR.js";
+  isRecord
+} from "./chunk-KUG52IAP.js";
 import {
   asTrimmedString
 } from "./chunk-3EUW3WEO.js";
 import {
   asOptionalPositiveFiniteNumber
 } from "./chunk-U6VC4MU4.js";
-import {
-  isRecord
-} from "./chunk-KUG52IAP.js";
 import {
   normalizeServerOrigin
 } from "./chunk-CF7PE763.js";
@@ -81,9 +87,14 @@ function parseSseDataLineJson(line) {
 
 // packages/agent-runtime/openAiCompatibleProvider.ts
 function buildOpenAiCompatibleChatCompletionRequest(args) {
+  const messages = toOpenAiCompatibleMessages(args.messages);
   const body = {
     model: args.providerConfig.model,
-    messages: toOpenAiCompatibleMessages(args.messages),
+    messages: requiresBareImageUrl({
+      endpoint: args.providerConfig.endpoint,
+      provider: args.providerConfig.provider,
+      model: args.providerConfig.model
+    }) ? toBareImageUrlMessages(messages) : messages,
     stream: args.stream ?? false,
     ...args.providerConfig.requestOptions,
     ...args.tools && args.tools.length > 0 ? { tools: args.tools } : {},
@@ -121,6 +132,9 @@ function parseOpenAiCompatibleChatCompletionResponse(args) {
     ...reasoning ? { reasoning_content: reasoning } : {},
     ...typeof choiceMessage?.reasoning_content === "string" && choiceMessage.reasoning_content ? { reasoning_content: choiceMessage.reasoning_content } : {},
     ...typeof rawFinishReason === "string" && rawFinishReason.length > 0 ? { finish_reason: rawFinishReason } : {},
+    // 非流式：拿到完整的 200 JSON body 本身就证明这次调用走完了，
+    // 不必等 finish_reason（有从不发它的上游，见 AgentRuntimeResult）。
+    stream_complete: true,
     usage: args.data?.usage,
     trace: args.trace
   };
@@ -137,7 +151,7 @@ async function readOpenAiCompatibleSseCompletion(args) {
     content: "",
     reasoning: "",
     usage: void 0,
-    accumulatedToolCalls: {},
+    accumulatedToolCalls: createToolCallAccumulator(),
     thinkState: createThinkParserState(),
     onTextDelta: args.onTextDelta,
     onReasoningDelta: args.onReasoningDelta
@@ -152,7 +166,7 @@ async function readOpenAiCompatibleSseCompletion(args) {
     content: state.content,
     ...state.reasoning ? { reasoning_content: state.reasoning } : {},
     ...tool_calls.length > 0 ? { tool_calls } : {},
-    ...state.usage ? { usage: state.usage } : {},
+    ...state.usage ? { usage: state.usage, stream_complete: true } : {},
     ...state.finishReason ? { finish_reason: state.finishReason } : {}
   };
 }
@@ -183,13 +197,12 @@ async function executeOpenAiCompatibleChatCompletion(args) {
     }
   }
   if (!res.ok) {
-    const raw2 = await res.text().catch(() => "");
-    let data2 = raw2;
-    try {
-      data2 = JSON.parse(raw2);
-    } catch {
-    }
-    throw new Error(`local provider failed: HTTP ${res.status} ${JSON.stringify(data2)}`);
+    throw providerHttpFailure({
+      label: "local provider",
+      status: res.status,
+      raw: await res.text().catch(() => ""),
+      messages: args.messages
+    });
   }
   const contentType = res.headers.get("content-type") ?? "";
   const isEventStream = contentType.includes("text/event-stream");
@@ -206,6 +219,7 @@ async function executeOpenAiCompatibleChatCompletion(args) {
       ...streamed.tool_calls ? { tool_calls: streamed.tool_calls } : {},
       ...streamed.reasoning_content ? { reasoning_content: streamed.reasoning_content } : {},
       ...streamed.usage ? { usage: streamed.usage } : {},
+      ...streamed.stream_complete ? { stream_complete: true } : {},
       ...streamed.finish_reason ? { finish_reason: streamed.finish_reason } : {},
       trace: args.messages
     };
@@ -389,10 +403,16 @@ function dialogMessageRecordToAgentRuntimeMessage(record) {
   return {
     role: record.role,
     content: record.content ?? "",
+    ...record.contextReference !== void 0 ? { context_reference: record.contextReference } : {},
     ...typeof record.reasoning_content === "string" ? { reasoning_content: record.reasoning_content } : {},
     ...typeof record.toolCallId === "string" ? { tool_call_id: record.toolCallId } : {},
     ...Array.isArray(record.tool_calls) ? { tool_calls: record.tool_calls } : {},
-    ...typeof record.toolName === "string" ? { toolName: record.toolName } : {}
+    ...typeof record.toolName === "string" ? { toolName: record.toolName } : {},
+    ...(() => {
+      const raw = record.createdAt;
+      const ms = typeof raw === "number" ? raw : typeof raw === "string" ? Date.parse(raw) : NaN;
+      return Number.isFinite(ms) ? { createdAt: ms } : {};
+    })()
   };
 }
 
@@ -469,6 +489,7 @@ function buildDialogMessageWriteOps(args) {
         dialogId: args.dialogId,
         role: message.role,
         content: message.content ?? "",
+        ...message.context_reference !== void 0 ? { contextReference: message.context_reference } : {},
         // 持久化思维链(reasoning):空轮/异常排查的关键证据,
         // 回读由 dialogMessageRecordToAgentRuntimeMessage 还原。
         ...typeof message.reasoning_content === "string" ? { reasoning_content: message.reasoning_content } : {},
@@ -1338,7 +1359,7 @@ function buildSearchWorkspaceParameters(variant) {
   const path = buildWorkspacePathProperty();
   const includeIgnored = {
     type: "boolean",
-    description: "When true, search files ignored by .gitignore such as .tmp. Defaults to false; .git and node_modules remain excluded."
+    description: "When true, search files ignored by .gitignore such as .tmp. Defaults to false. Build artifacts (dist/, *.tsbuildinfo, *.min.js, etc.) are always excluded regardless of this flag. .git and node_modules remain excluded."
   };
   const exclude = {
     type: "array",
@@ -1701,6 +1722,24 @@ var EXEC_SHELL_TIMEOUT_ENV = "NOLO_EXEC_SHELL_TIMEOUT_MS";
 var EXEC_SHELL_DETACH_ENV = "NOLO_EXEC_SHELL_DETACH_MS";
 var DEFAULT_EXEC_SHELL_DETACH_MS = 12e4;
 var DEFAULT_LOCAL_API_ORIGIN = "http://127.0.0.1:38123";
+var ALWAYS_EXCLUDED_GLOBS = [
+  "*.tsbuildinfo",
+  "dist/**",
+  "build/**",
+  "out/**",
+  "coverage/**",
+  ".next/**",
+  ".turbo/**",
+  "public/assets/**",
+  "*.min.js",
+  "*.min.css",
+  "*.map",
+  "*.lock",
+  "bun.lockb",
+  "*.ldb"
+];
+var DEFAULT_SEARCH_MAX_RESULTS = 200;
+var SEARCH_OUTPUT_CHAR_LIMIT = 2e4;
 function readTrimmedString(value) {
   return asOptionalTrimmedString(value);
 }
@@ -2046,8 +2085,29 @@ function sliceReadFileContent(args) {
     truncated: startLine > 1 || effectiveEndLine < totalLines
   };
 }
-function countExactTextOccurrences(args) {
-  return args.content.split(args.oldText).length - 1;
+function buildEolTolerantPattern(oldTextLf) {
+  const escaped = oldTextLf.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  const pattern = escaped.replace(/\n/g, "\\r?\\n");
+  return new RegExp(pattern, "g");
+}
+function countAndReplaceEolTolerant(args) {
+  const oldTextLf = normalizeEolToLf(args.oldText);
+  const newTextLf = normalizeEolToLf(args.newText);
+  const pattern = buildEolTolerantPattern(oldTextLf);
+  let count = 0;
+  const result = args.content.replace(pattern, (match) => {
+    count++;
+    const eol = match.includes("\r\n") ? "\r\n" : "\n";
+    return convertEol(newTextLf, eol);
+  });
+  return { count, result };
+}
+function normalizeEolToLf(text) {
+  return text.replace(/\r\n/g, "\n");
+}
+function convertEol(text, eol) {
+  const lf = normalizeEolToLf(text);
+  return eol === "\r\n" ? lf.replace(/\n/g, "\r\n") : lf;
 }
 function pluralizeReplacement(count) {
   return count === 1 ? "replacement" : "replacements";
@@ -2068,8 +2128,8 @@ function requireWorkspaceGlobPattern(args) {
   if (!pattern) throw new Error("globFiles requires a non-empty pattern.");
   return pattern;
 }
-function readWorkspaceMaxResults(args) {
-  if (args.maxResults === void 0) return void 0;
+function readWorkspaceMaxResults(args, defaultValue) {
+  if (args.maxResults === void 0) return defaultValue;
   const value = Number(args.maxResults);
   if (!Number.isInteger(value) || value < 1) {
     throw new Error("maxResults must be a positive integer.");
@@ -2245,6 +2305,29 @@ function waitForNodeProcessExit(proc) {
     });
   });
 }
+function isSpawnFailureError(error) {
+  if (!error || typeof error !== "object") return false;
+  const err = error;
+  if (err.code === "ENOENT") return true;
+  const message = toErrorMessage(error).toLowerCase();
+  return message.includes("enoent") || message.includes("executable not found") || message.includes("spawn") && message.includes("not found");
+}
+function spawnFailedCommandResult(error, outputLimit) {
+  const stderr = `spawn failed: ${toErrorMessage(error)}
+`;
+  return {
+    stdout: "",
+    stderr,
+    exitCode: 127,
+    timedOut: false,
+    spawnFailed: true,
+    content: truncateToolOutput(
+      [`stderr:
+${stderr.trim()}`, "exitCode: 127"].filter(Boolean).join("\n\n"),
+      outputLimit
+    )
+  };
+}
 function resolveRipgrepBinary(env = process.env) {
   const fromEnv = asOptionalTrimmedString(env.NOLO_BUNDLED_RG);
   if (fromEnv) {
@@ -2255,6 +2338,9 @@ function resolveRipgrepBinary(env = process.env) {
   }
   return resolveExecutableOnPath("rg");
 }
+function resolveGrepBinary() {
+  return resolveExecutableOnPath("grep");
+}
 async function runWorkspaceCommand(args) {
   const timeoutMs = asOptionalPositiveFiniteNumber(args.timeoutMs);
   const detached = process.platform !== "win32";
@@ -2339,7 +2425,21 @@ async function runWorkspaceCommand(args) {
   }
   if (abortPromise) racers.push(abortPromise);
   if (detachPromise) racers.push(detachPromise);
-  const raceWinner = await Promise.race(racers);
+  let raceWinner;
+  try {
+    raceWinner = await Promise.race(racers);
+  } catch (error) {
+    if (timeout) clearTimeout(timeout);
+    if (detachTimer) clearTimeout(detachTimer);
+    if (abortListener && args.abortSignal) {
+      args.abortSignal.removeEventListener("abort", abortListener);
+    }
+    detachSignalCleanup();
+    if (isSpawnFailureError(error)) {
+      return spawnFailedCommandResult(error, args.outputLimit);
+    }
+    throw error;
+  }
   if (timeout) clearTimeout(timeout);
   if (detachTimer) clearTimeout(detachTimer);
   if (abortListener && args.abortSignal) {
@@ -2456,12 +2556,40 @@ async function runWorkspaceCommandLimitedLines(args) {
     ]);
   } catch (error) {
     const settled2 = await exitSettled;
-    if (!settled2.ok) throw settled2.error;
+    if (!settled2.ok) {
+      return {
+        stdout: "",
+        stderr: `spawn failed: ${toErrorMessage(settled2.error)}
+`,
+        exitCode: 127,
+        limitedByMaxResults: false,
+        spawnFailed: true
+      };
+    }
+    if (isSpawnFailureError(error)) {
+      return {
+        stdout: "",
+        stderr: `spawn failed: ${toErrorMessage(error)}
+`,
+        exitCode: 127,
+        limitedByMaxResults: false,
+        spawnFailed: true
+      };
+    }
     throw error;
   }
   if (!limitedByMaxResults && pending.trim()) lines.push(pending);
   const settled = await exitSettled;
-  if (!settled.ok) throw settled.error;
+  if (!settled.ok) {
+    return {
+      stdout: "",
+      stderr: `spawn failed: ${toErrorMessage(settled.error)}
+`,
+      exitCode: 127,
+      limitedByMaxResults: false,
+      spawnFailed: true
+    };
+  }
   const exitCode = limitedByMaxResults ? 0 : settled.code;
   const stderr = await stderrPromise;
   return {
@@ -2590,13 +2718,16 @@ async function editFileTool(args) {
     ...args.confirmExternalFileAccess ? { confirmExternalFileAccess: args.confirmExternalFileAccess } : {}
   });
   const content = await readFile(absolutePath, "utf8");
-  const replacementCount = countExactTextOccurrences({ content, oldText });
+  const { count: replacementCount, result: nextContent } = countAndReplaceEolTolerant({
+    content,
+    oldText,
+    newText
+  });
   if (replacementCount !== expectedReplacements) {
     throw new Error(
-      `editFile expected ${expectedReplacements} ${pluralizeReplacement(expectedReplacements)} but found ${replacementCount} in ${requestedPath}.`
+      `editFile expected ${expectedReplacements} ${pluralizeReplacement(expectedReplacements)} but found ${replacementCount} in ${requestedPath} (matched after EOL normalization; verify the exact text).`
     );
   }
-  const nextContent = content.split(oldText).join(newText);
   await writeFile(absolutePath, nextContent, "utf8");
   const relativePath = normalizeWorkspaceRelativePath({
     workspaceRoot: resolve(args.workspaceRoot),
@@ -2693,7 +2824,7 @@ async function searchFilesTool(args) {
   const parsed = parseWorkspaceToolArguments(args.call.arguments);
   const query = requireWorkspaceSearchQuery(parsed);
   const exclude = readWorkspaceExcludeGlobs(parsed);
-  const maxResults = readWorkspaceMaxResults(parsed);
+  const maxResults = readWorkspaceMaxResults(parsed, DEFAULT_SEARCH_MAX_RESULTS);
   const contextLines = readWorkspaceContextLines(parsed);
   const literal = parsed.literal === true;
   const caseSensitive = parsed.caseSensitive === false ? false : true;
@@ -2708,8 +2839,8 @@ async function searchFilesTool(args) {
     workspaceRoot: resolve(args.workspaceRoot),
     targetPath: searchPath
   });
-  const rgBinary = resolveRipgrepBinary();
-  const grepBinary = resolveExecutableOnPath("grep") || "grep";
+  const rgBinary = (args.resolveRipgrepBinary ?? resolveRipgrepBinary)();
+  const grepBinary = (args.resolveGrepBinary ?? resolveGrepBinary)();
   const rgCommand = rgBinary ? [
     rgBinary,
     "--line-number",
@@ -2723,29 +2854,26 @@ async function searchFilesTool(args) {
     "!node_modules",
     "--glob",
     "!.git",
+    ...ALWAYS_EXCLUDED_GLOBS.flatMap((g) => ["--glob", `!${g}`]),
     ...exclude.flatMap((excludePattern) => ["--glob", `!${excludePattern}`]),
     "--",
     query,
     relativeSearchPath
   ] : null;
-  const grepCommand = [
-    grepBinary,
-    "-R",
-    "-n",
-    "-I",
-    ...literal ? ["-F"] : [],
-    ...caseSensitive ? [] : ["-i"],
-    ...contextLines !== void 0 ? ["-C", String(contextLines)] : [],
-    "--exclude-dir=node_modules",
-    "--exclude-dir=.git",
-    ...exclude.flatMap((excludePattern) => ["--exclude", excludePattern]),
-    query,
-    relativeSearchPath
+  const grepExcludeArgs = [
+    ...ALWAYS_EXCLUDED_GLOBS.flatMap((g) => {
+      if (!g.endsWith("/**")) return ["--exclude", g];
+      const dir = g.replace(/\/\*\*$/, "");
+      return dir.includes("/") ? [] : [`--exclude-dir=${dir}`];
+    }),
+    ...exclude.flatMap((excludePattern) => ["--exclude", excludePattern])
   ];
+  let searchEngine = "js";
+  let binariesUnavailable = !rgBinary && !grepBinary;
   const result = await (async () => {
     if (rgCommand) {
       try {
-        return maxResults && !contextLines ? await runWorkspaceCommandLimitedLines({
+        const rgResult = maxResults && !contextLines ? await runWorkspaceCommandLimitedLines({
           workspaceRoot: args.workspaceRoot,
           command: rgCommand,
           maxLines: maxResults
@@ -2753,35 +2881,66 @@ async function searchFilesTool(args) {
           workspaceRoot: args.workspaceRoot,
           command: rgCommand
         });
+        if (!rgResult.spawnFailed) {
+          searchEngine = "ripgrep";
+          return rgResult;
+        }
       } catch {
       }
     }
-    try {
-      return maxResults && !contextLines ? await runWorkspaceCommandLimitedLines({
-        workspaceRoot: args.workspaceRoot,
-        command: grepCommand,
-        maxLines: maxResults
-      }) : await runWorkspaceCommand({
-        workspaceRoot: args.workspaceRoot,
-        command: grepCommand
-      });
-    } catch {
-      return {
-        stdout: "",
-        stderr: "",
-        exitCode: 0,
-        limitedByMaxResults: false
-      };
+    if (grepBinary) {
+      const grepCommand = [
+        grepBinary,
+        "-R",
+        "-n",
+        "-I",
+        ...literal ? ["-F"] : [],
+        ...caseSensitive ? [] : ["-i"],
+        ...contextLines !== void 0 ? ["-C", String(contextLines)] : [],
+        "--exclude-dir=node_modules",
+        "--exclude-dir=.git",
+        ...grepExcludeArgs,
+        query,
+        relativeSearchPath
+      ];
+      try {
+        const grepResult = maxResults && !contextLines ? await runWorkspaceCommandLimitedLines({
+          workspaceRoot: args.workspaceRoot,
+          command: grepCommand,
+          maxLines: maxResults
+        }) : await runWorkspaceCommand({
+          workspaceRoot: args.workspaceRoot,
+          command: grepCommand
+        });
+        if (!grepResult.spawnFailed) {
+          searchEngine = "grep";
+          return grepResult;
+        }
+        binariesUnavailable = true;
+      } catch {
+        binariesUnavailable = true;
+      }
+    } else {
+      binariesUnavailable = true;
     }
+    return {
+      stdout: "",
+      stderr: "",
+      exitCode: 0,
+      limitedByMaxResults: false,
+      spawnFailed: true
+    };
   })();
   let outputLines = result.stdout.split(/\r?\n/).map((line) => line.trimEnd().replace(/^\.\//, "")).filter(Boolean);
+  outputLines = dropAlwaysExcludedLines(outputLines);
   let limitedByMaxResults = "limitedByMaxResults" in result && result.limitedByMaxResults === true;
-  if (outputLines.length === 0 && result.exitCode === 0 && (includeIgnored || !await hasRootGitignore(args.workspaceRoot))) {
+  const forceJsFallback = binariesUnavailable || result.spawnFailed === true;
+  if (outputLines.length === 0 && (forceJsFallback || result.exitCode === 0 && (includeIgnored || !await hasRootGitignore(args.workspaceRoot)))) {
     const fallback = await scanWorkspaceTextMatches({
       workspaceRoot: args.workspaceRoot,
       relativeSearchPath,
       query,
-      exclude,
+      exclude: [...ALWAYS_EXCLUDED_GLOBS, ...exclude],
       maxResults,
       literal,
       caseSensitive,
@@ -2789,6 +2948,7 @@ async function searchFilesTool(args) {
     });
     outputLines = fallback.lines;
     limitedByMaxResults = fallback.limitedByMaxResults;
+    searchEngine = "js";
   }
   if (contextLines && outputLines.length > 0) {
     const limited = limitSearchOutputByMatches(outputLines, maxResults);
@@ -2800,8 +2960,11 @@ async function searchFilesTool(args) {
     const match = line.match(/^(.*?):\d+:/);
     return match?.[1] ? [match[1]] : [];
   })));
+  const rawContent = outputLines.join("\n");
+  const content = truncateToolOutput(rawContent, SEARCH_OUTPUT_CHAR_LIMIT);
+  const truncatedByByteLimit = content.length !== rawContent.length;
   return {
-    content: outputLines.join("\n"),
+    content,
     metadata: {
       query,
       path: requestedPath,
@@ -2814,10 +2977,12 @@ async function searchFilesTool(args) {
       count: outputLines.length,
       matchCount: matchLines.length,
       matchedFiles,
-      truncated: limitedByMaxResults,
+      truncated: limitedByMaxResults || truncatedByByteLimit,
       limitedByMaxResults,
+      ...truncatedByByteLimit ? { truncatedByByteLimit: true } : {},
       ...maxResults ? { maxResults } : {},
       exitCode: result.exitCode,
+      searchEngine,
       ...extractActivity(parsed) ? { activity: extractActivity(parsed) } : {}
     }
   };
@@ -2848,6 +3013,14 @@ async function filterRootGitignoredFiles(args) {
   const globs = patterns.map((pattern) => createGlob(pattern));
   return args.files.filter((file) => !globs.some((glob) => glob.match(file)));
 }
+function dropAlwaysExcludedLines(lines) {
+  const globs = ALWAYS_EXCLUDED_GLOBS.map((pattern) => createGlob(pattern));
+  return lines.filter((line) => {
+    const filePath = line.match(/^(.*?):\d+[:-]/)?.[1];
+    if (!filePath) return true;
+    return !globs.some((glob) => glob.match(filePath));
+  });
+}
 function scanWorkspaceGlobFiles(args) {
   const pathPrefix = args.relativeSearchPath === "." ? "" : `${args.relativeSearchPath.replace(/\/+$/, "")}/`;
   return Array.from(createGlob(args.pattern).scanSync({
@@ -2940,38 +3113,76 @@ async function globFilesTool(args) {
     workspaceRoot: resolve(args.workspaceRoot),
     targetPath: searchPath
   });
-  const command = [
-    "rg",
-    "--files",
-    "--hidden",
-    ...includeIgnored ? ["--no-ignore"] : [],
-    "--glob",
-    pattern,
-    "--glob",
-    "!node_modules",
-    "--glob",
-    "!.git",
-    ...exclude.flatMap((excludePattern) => ["--glob", `!${excludePattern}`]),
-    ...relativeSearchPath === "." ? [] : [relativeSearchPath]
-  ];
-  const result = await runWorkspaceCommand({
-    workspaceRoot: args.workspaceRoot,
-    command
-  });
   const pathPrefix = relativeSearchPath === "." ? "" : `${relativeSearchPath.replace(/\/+$/, "")}/`;
-  let files = result.stdout.split(/\r?\n/).map((line) => line.trim().replace(/^\.\//, "")).filter(Boolean).filter((line) => !pathPrefix || line === relativeSearchPath || line.startsWith(pathPrefix)).sort((left, right) => left.localeCompare(right));
-  files = await filterRootGitignoredFiles({
-    workspaceRoot: args.workspaceRoot,
-    files,
-    includeIgnored
-  });
-  if (files.length === 0 && (includeIgnored || !await hasRootGitignore(args.workspaceRoot))) {
+  const rgBinary = (args.resolveRipgrepBinary ?? resolveRipgrepBinary)();
+  let searchEngine = "js";
+  let exitCode = 0;
+  let files = [];
+  if (rgBinary) {
+    const command = [
+      rgBinary,
+      "--files",
+      "--hidden",
+      ...includeIgnored ? ["--no-ignore"] : [],
+      "--glob",
+      pattern,
+      "--glob",
+      "!node_modules",
+      "--glob",
+      "!.git",
+      ...exclude.flatMap((excludePattern) => ["--glob", `!${excludePattern}`]),
+      ...relativeSearchPath === "." ? [] : [relativeSearchPath]
+    ];
+    const result = await runWorkspaceCommand({
+      workspaceRoot: args.workspaceRoot,
+      command
+    });
+    exitCode = result.exitCode;
+    if (result.spawnFailed) {
+      files = scanWorkspaceGlobFiles({
+        workspaceRoot: args.workspaceRoot,
+        pattern,
+        relativeSearchPath,
+        exclude
+      });
+      files = await filterRootGitignoredFiles({
+        workspaceRoot: args.workspaceRoot,
+        files,
+        includeIgnored
+      });
+      searchEngine = "js";
+    } else {
+      files = result.stdout.split(/\r?\n/).map((line) => line.trim().replace(/^\.\//, "")).filter(Boolean).filter((line) => !pathPrefix || line === relativeSearchPath || line.startsWith(pathPrefix)).sort((left, right) => left.localeCompare(right));
+      files = await filterRootGitignoredFiles({
+        workspaceRoot: args.workspaceRoot,
+        files,
+        includeIgnored
+      });
+      if (files.length === 0 && (includeIgnored || !await hasRootGitignore(args.workspaceRoot))) {
+        files = scanWorkspaceGlobFiles({
+          workspaceRoot: args.workspaceRoot,
+          pattern,
+          relativeSearchPath,
+          exclude
+        });
+        searchEngine = "js";
+      } else {
+        searchEngine = "ripgrep";
+      }
+    }
+  } else {
     files = scanWorkspaceGlobFiles({
       workspaceRoot: args.workspaceRoot,
       pattern,
       relativeSearchPath,
       exclude
     });
+    files = await filterRootGitignoredFiles({
+      workspaceRoot: args.workspaceRoot,
+      files,
+      includeIgnored
+    });
+    searchEngine = "js";
   }
   const commandLimitedByMaxResults = false;
   const totalCount = commandLimitedByMaxResults ? void 0 : files.length;
@@ -2992,7 +3203,8 @@ async function globFilesTool(args) {
       truncated: limitedByMaxResults,
       limitedByMaxResults,
       ...maxResults ? { maxResults } : {},
-      exitCode: result.exitCode,
+      exitCode,
+      searchEngine,
       ...activity ? { activity } : {}
     }
   };
@@ -3196,6 +3408,10 @@ async function listProcessesTool(args) {
 }
 function createLocalWorkspaceToolExecutors(args) {
   const fileAccess = args.confirmExternalFileAccess ? { confirmExternalFileAccess: args.confirmExternalFileAccess } : {};
+  const searchBinaryResolvers = {
+    ...args.resolveRipgrepBinary ? { resolveRipgrepBinary: args.resolveRipgrepBinary } : {},
+    ...args.resolveGrepBinary ? { resolveGrepBinary: args.resolveGrepBinary } : {}
+  };
   return {
     editFile: (call) => editFileTool({
       call,
@@ -3205,7 +3421,8 @@ function createLocalWorkspaceToolExecutors(args) {
     globFiles: (call) => globFilesTool({
       call,
       workspaceRoot: args.workspaceRoot,
-      ...fileAccess
+      ...fileAccess,
+      ...args.resolveRipgrepBinary ? { resolveRipgrepBinary: args.resolveRipgrepBinary } : {}
     }),
     listFiles: (call) => listFilesTool({
       call,
@@ -3225,7 +3442,8 @@ function createLocalWorkspaceToolExecutors(args) {
     searchFiles: (call) => searchFilesTool({
       call,
       workspaceRoot: args.workspaceRoot,
-      ...fileAccess
+      ...fileAccess,
+      ...searchBinaryResolvers
     }),
     captureVisualState: (call) => captureVisualStateTool({
       call,