@morphllm/morphsdk 0.2.56 → 0.2.57

package/dist/{chunk-SALJ2K6S.js → chunk-6X5UOY7B.js}

@@ -1,15 +1,15 @@
 import {
   toolRead
 } from "./chunk-HQO45BAJ.js";
+import {
+  toolAnalyse
+} from "./chunk-73RQWOQC.js";
 import {
   LLMResponseParser
 } from "./chunk-LVPVVLTI.js";
 import {
   getSystemPrompt
 } from "./chunk-WETRQJGU.js";
-import {
-  toolAnalyse
-} from "./chunk-73RQWOQC.js";
 import {
   readFinishFiles
 } from "./chunk-EK7OQPWD.js";
@@ -20,11 +20,6 @@ import {
 import {
   formatAgentToolOutput
 } from "./chunk-TICMYDII.js";
-import {
-  GrepState,
-  formatTurnGrepOutput,
-  parseAndFilterGrepOutput
-} from "./chunk-NDZO5IPV.js";
 import {
   fetchWithRetry,
   withTimeout
@@ -92,7 +87,6 @@ async function runWarpGrep(config) {
   const model = config.model || DEFAULT_MODEL;
   const provider = config.provider;
   const errors = [];
-  const grepState = new GrepState();
   let finishMeta;
   let terminationReason = "terminated";
   for (let round = 1; round <= maxRounds; round += 1) {
@@ -118,10 +112,25 @@ async function runWarpGrep(config) {
       const msg = c.arguments?.message || "Command skipped due to parsing error";
       formatted.push(msg);
     }
-    const otherPromises = [];
+    const allPromises = [];
+    for (const c of grepCalls) {
+      const args = c.arguments ?? {};
+      allPromises.push(
+        provider.grep({ pattern: args.pattern, path: args.path }).then(
+          (grepRes) => {
+            if (grepRes.error) {
+              return { terminate: true, error: grepRes.error };
+            }
+            const output = grepRes.lines.join("\n") || "no matches";
+            return formatAgentToolOutput("grep", args, output, { isError: false });
+          },
+          (err) => formatAgentToolOutput("grep", args, String(err), { isError: true })
+        )
+      );
+    }
     for (const c of analyseCalls) {
       const args = c.arguments ?? {};
-      otherPromises.push(
+      allPromises.push(
         toolAnalyse(provider, args).then(
           (p) => formatAgentToolOutput("analyse", args, p, { isError: false }),
           (err) => formatAgentToolOutput("analyse", args, String(err), { isError: true })
@@ -130,38 +139,24 @@ async function runWarpGrep(config) {
     }
     for (const c of readCalls) {
       const args = c.arguments ?? {};
-      otherPromises.push(
+      allPromises.push(
         toolRead(provider, args).then(
           (p) => formatAgentToolOutput("read", args, p, { isError: false }),
           (err) => formatAgentToolOutput("read", args, String(err), { isError: true })
         )
       );
     }
-    const otherResults = await Promise.all(otherPromises);
-    formatted.push(...otherResults);
-    for (const c of grepCalls) {
-      const args = c.arguments ?? {};
-      try {
-        const grepRes = await provider.grep({ pattern: args.pattern, path: args.path });
-        if (grepRes.error) {
-          errors.push({ message: grepRes.error });
-          terminationReason = "terminated";
-          return {
-            terminationReason: "terminated",
-            messages,
-            errors
-          };
-        }
-        const rawOutput = Array.isArray(grepRes.lines) ? grepRes.lines.join("\n") : "";
-        const newMatches = parseAndFilterGrepOutput(rawOutput, grepState);
-        let formattedPayload = formatTurnGrepOutput(newMatches);
-        if (formattedPayload === "No new matches found.") {
-          formattedPayload = "no new matches";
-        }
-        formatted.push(formatAgentToolOutput("grep", args, formattedPayload, { isError: false }));
-      } catch (err) {
-        formatted.push(formatAgentToolOutput("grep", args, String(err), { isError: true }));
+    const allResults = await Promise.all(allPromises);
+    for (const result of allResults) {
+      if (typeof result === "object" && "terminate" in result) {
+        errors.push({ message: result.error });
+        return {
+          terminationReason: "terminated",
+          messages,
+          errors
+        };
       }
+      formatted.push(result);
     }
     if (formatted.length > 0) {
       const turnsUsed = round;
@@ -231,4 +226,4 @@ async function runWarpGrep(config) {
 export {
   runWarpGrep
 };
-//# sourceMappingURL=chunk-SALJ2K6S.js.map
+//# sourceMappingURL=chunk-6X5UOY7B.js.map

package/dist/chunk-6X5UOY7B.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../tools/warp_grep/agent/runner.ts"],"sourcesContent":["import { AGENT_CONFIG, DEFAULT_MODEL } from './config.js';\nimport { getSystemPrompt } from './prompt.js';\nimport type { AgentRunResult, ChatMessage, SessionConfig, ToolCall, AgentFinish } from './types.js';\nimport { LLMResponseParser } from './parser.js';\nimport type { WarpGrepProvider } from '../providers/types.js';\nimport { toolRead } from '../tools/read.js';\nimport { toolAnalyse } from '../tools/analyse.js';\nimport { fetchWithRetry, withTimeout } from '../../utils/resilience.js';\nimport { formatAgentToolOutput } from './formatter.js';\nimport { readFinishFiles } from '../tools/finish.js';\nimport path from 'path';\n\ntype EventName =\n  | 'initial_state'\n  | 'round_start'\n  | 'round_end'\n  | 'finish'\n  | 'error';\n\nexport type EventCallback = (name: EventName, payload: Record<string, unknown>) => void;\n\nconst parser = new LLMResponseParser();\n\nasync function buildInitialState(repoRoot: string, query: string, provider: WarpGrepProvider): Promise<string> {\n  // Summarize top-level directories and file counts using the provider\n  // This works for both local and remote filesystems (Modal, E2B, etc.)\n  try {\n    const entries = await provider.analyse({ path: '.', maxResults: 100 });\n    const dirs = entries.filter(e => e.type === 'dir').map(d => d.name).slice(0, 50);\n    const files = entries.filter(e => e.type === 'file').map(f => f.name).slice(0, 50);\n    const parts = [\n      `<repo_root>${repoRoot}</repo_root>`,\n      `<top_dirs>${dirs.join(', ')}</top_dirs>`,\n      `<top_files>${files.join(', ')}</top_files>`,\n    ];\n    return parts.join('\\n');\n  } catch {\n    return `<repo_root>${repoRoot}</repo_root>`;\n  }\n}\n\nfunction formatAssistantToolBlock(name: string, args: Record<string, unknown>, payload: string, isError = false): string {\n  const argStr = Object.entries(args)\n    .map(([k, v]) => `${k}=${JSON.stringify(v)}`)\n    .join(' ');\n  const prefix = isError ? 'error' : 'result';\n  return `<${prefix} name=\"${name}\" ${argStr}>\\n${payload}\\n</${prefix}>`;\n}\n\nasync function callModel(messages: ChatMessage[], model: string, apiKey?: string): Promise<string> {\n  const api = 'https://api.morphllm.com/v1/chat/completions';\n  const fetchPromise = fetchWithRetry(\n    api,\n    {\n      method: 'POST',\n      headers: {\n        'Content-Type': 'application/json',\n        Authorization: `Bearer ${apiKey || process.env.MORPH_API_KEY || ''}`,\n      },\n      body: JSON.stringify({\n        model,\n        temperature: 0.0,\n        max_tokens: 1024,\n        messages,\n      }),\n    },\n    {}\n  );\n  const resp = await withTimeout(fetchPromise, AGENT_CONFIG.TIMEOUT_MS, 'morph-warp-grep request timed out');\n  if (!resp.ok) {\n    // keeping these cases are real throws, if this happens retry will likely not help, so best we just throw here, notice the error and fix\n    const t = await resp.text();\n    throw new Error(`morph-warp-grep error ${resp.status}: ${t}`);\n  }\n  const data = await resp.json();\n  const content = data?.choices?.[0]?.message?.content;\n  if (!content || typeof content !== 'string') {\n    throw new Error('Invalid response from model');\n  }\n  return content;\n}\n\nexport async function runWarpGrep(config: SessionConfig & { provider: WarpGrepProvider }): Promise<AgentRunResult> {\n  const repoRoot = path.resolve(config.repoRoot || process.cwd());\n  const messages: ChatMessage[] = [];\n\n  // system\n  const systemMessage = { role: 'system' as const, content: getSystemPrompt() };\n  messages.push(systemMessage);\n  // user query\n  const queryContent = `<query>${config.query}</query>`;\n  messages.push({ role: 'user', content: queryContent });\n  // initial state\n  const initialState = await buildInitialState(repoRoot, config.query, config.provider);\n  messages.push({ role: 'user', content: initialState });\n\n  const maxRounds = AGENT_CONFIG.MAX_ROUNDS;\n  const model = config.model || DEFAULT_MODEL;\n  const provider = config.provider;\n  const errors: Array<{ message: string }> = [];\n\n  let finishMeta: AgentFinish | undefined;\n  let terminationReason: AgentRunResult['terminationReason'] = 'terminated';\n\n  for (let round = 1; round <= maxRounds; round += 1) {\n    // call model\n    const assistantContent = await callModel(messages, model, config.apiKey).catch((e: unknown) => {\n      errors.push({ message: e instanceof Error ? e.message : String(e) });\n      return '';\n    });\n    if (!assistantContent) break;\n    messages.push({ role: 'assistant', content: assistantContent });\n\n    // parse tool calls (no longer throws - returns _skip calls for malformed commands)\n    const toolCalls = parser.parse(assistantContent);\n    if (toolCalls.length === 0) {\n      errors.push({ message: 'No tool calls produced by the model.' });\n      terminationReason = 'terminated';\n      break;\n    }\n\n    const finishCalls = toolCalls.filter(c => c.name === 'finish');\n    const grepCalls = toolCalls.filter(c => c.name === 'grep');\n    const analyseCalls = toolCalls.filter(c => c.name === 'analyse');\n    const readCalls = toolCalls.filter(c => c.name === 'read');\n    const skipCalls = toolCalls.filter(c => c.name === '_skip');\n\n    const formatted: string[] = [];\n\n    // Surface any skipped commands as feedback to the LLM\n    for (const c of skipCalls) {\n      const msg = (c.arguments as { message?: string })?.message || 'Command skipped due to parsing error';\n      formatted.push(msg);\n    }\n\n    // Execute ALL tools in parallel (grep, analyse, read)\n    const allPromises: Array<Promise<string | { terminate: true; error: string }>> = [];\n    \n    // Grep calls\n    for (const c of grepCalls) {\n      const args = (c.arguments ?? {}) as { pattern: string; path: string };\n      allPromises.push(\n        provider.grep({ pattern: args.pattern, path: args.path }).then(\n          grepRes => {\n            // Check for ripgrep availability error\n            if (grepRes.error) {\n              return { terminate: true, error: grepRes.error };\n            }\n            const output = grepRes.lines.join('\\n') || 'no matches';\n            return formatAgentToolOutput('grep', args, output, { isError: false });\n          },\n          err => formatAgentToolOutput('grep', args, String(err), { isError: true })\n        )\n      );\n    }\n    \n    // Analyse calls\n    for (const c of analyseCalls) {\n      const args = (c.arguments ?? {}) as { path: string; pattern?: string | null };\n      allPromises.push(\n        toolAnalyse(provider, args).then(\n          p => formatAgentToolOutput('analyse', args, p, { isError: false }),\n          err => formatAgentToolOutput('analyse', args, String(err), { isError: true })\n        )\n      );\n    }\n    \n    // Read calls\n    for (const c of readCalls) {\n      const args = (c.arguments ?? {}) as { path: string; start?: number; end?: number };\n      allPromises.push(\n        toolRead(provider, args).then(\n          p => formatAgentToolOutput('read', args, p, { isError: false }),\n          err => formatAgentToolOutput('read', args, String(err), { isError: true })\n        )\n      );\n    }\n    \n    const allResults = await Promise.all(allPromises);\n    \n    // Check for termination signals (e.g., ripgrep not available)\n    for (const result of allResults) {\n      if (typeof result === 'object' && 'terminate' in result) {\n        errors.push({ message: result.error });\n        return {\n          terminationReason: 'terminated',\n          messages,\n          errors,\n        };\n      }\n      formatted.push(result as string);\n    }\n\n    if (formatted.length > 0) {\n      // Add turn counter message\n      const turnsUsed = round;\n      const turnsRemaining = 4 - turnsUsed;\n      let turnMessage: string;\n      if (turnsRemaining === 0) {\n        turnMessage = `\\n\\n[Turn ${turnsUsed}/4] This is your LAST turn. You MUST call the finish tool now.`;\n      } else if (turnsRemaining === 1) {\n        turnMessage = `\\n\\n[Turn ${turnsUsed}/4] You have 1 turn remaining. Next turn you MUST call the finish tool.`;\n      } else {\n        turnMessage = `\\n\\n[Turn ${turnsUsed}/4] You have ${turnsRemaining} turns remaining.`;\n      }\n      messages.push({ role: 'user', content: formatted.join('\\n') + turnMessage });\n    }\n\n    if (finishCalls.length) {\n      const fc = finishCalls[0];\n      const files = ((fc.arguments as any)?.files ?? []) as AgentFinish['files'];\n      finishMeta = { files };\n      terminationReason = 'completed';\n      break;\n    }\n  }\n\n  if (terminationReason !== 'completed' || !finishMeta) {\n    return { terminationReason, messages, errors };\n  }\n\n  // Build finish payload\n  const parts: string[] = ['Relevant context found:'];\n  for (const f of finishMeta.files) {\n    const ranges = f.lines.map(([s, e]) => `${s}-${e}`).join(', ');\n    parts.push(`- ${f.path}: ${ranges}`);\n  }\n  const payload = parts.join('\\n');\n\n  // Resolve file contents for returned ranges\n  // Wrap reader in try-catch to handle non-existent or unreadable files gracefully\n  // Track files that couldn't be read for error reporting\n  const fileReadErrors: Array<{ path: string; error: string }> = [];\n  const resolved = await readFinishFiles(\n    repoRoot,\n    finishMeta.files,\n    async (p: string, s: number, e: number) => {\n      try {\n        const rr = await provider.read({ path: p, start: s, end: e });\n        // rr.lines are \"line|content\" → strip the \"line|\" prefix\n        return rr.lines.map(l => {\n          const idx = l.indexOf('|');\n          return idx >= 0 ? l.slice(idx + 1) : l;\n        });\n      } catch (err) {\n        // File doesn't exist or can't be read - log error but don't throw\n        // This handles cases where the agent hallucinated a path or the file was deleted\n        const errorMsg = err instanceof Error ? err.message : String(err);\n        fileReadErrors.push({ path: p, error: errorMsg });\n        console.error(`[warp_grep] Failed to read file: ${p} - ${errorMsg}`);\n        return [`[couldn't find: ${p}]`];\n      }\n    }\n  );\n\n  // Add file read errors to the result so MCP can report them\n  if (fileReadErrors.length > 0) {\n    errors.push(...fileReadErrors.map(e => ({ message: `File read error: ${e.path} - ${e.error}` })));\n  }\n\n  return {\n    terminationReason: 'completed',\n    messages,\n    finish: { payload, metadata: finishMeta, resolved },\n  };\n}\n\n\n"],"mappings":"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","names":[]}

package/dist/{chunk-UIRJE422.js → chunk-CFF636UC.js}

@@ -1,9 +1,9 @@
 import {
   WARP_GREP_DESCRIPTION
-} from "./chunk-QVRXBAMM.js";
+} from "./chunk-GJ5TYNRD.js";
 import {
   runWarpGrep
-} from "./chunk-SALJ2K6S.js";
+} from "./chunk-6X5UOY7B.js";
 import {
   LocalRipgrepProvider
 } from "./chunk-ZJIIICRA.js";
@@ -67,4 +67,4 @@ export {
   execute,
   createMorphWarpGrepTool
 };
-//# sourceMappingURL=chunk-UIRJE422.js.map
+//# sourceMappingURL=chunk-CFF636UC.js.map

package/dist/{chunk-QVRXBAMM.js → chunk-GJ5TYNRD.js}

@@ -1,6 +1,6 @@
 import {
   runWarpGrep
-} from "./chunk-SALJ2K6S.js";
+} from "./chunk-6X5UOY7B.js";
 import {
   LocalRipgrepProvider
 } from "./chunk-ZJIIICRA.js";
@@ -104,4 +104,4 @@ export {
   WARP_GREP_TOOL_NAME,
   WARP_GREP_DESCRIPTION
 };
-//# sourceMappingURL=chunk-QVRXBAMM.js.map
+//# sourceMappingURL=chunk-GJ5TYNRD.js.map

package/dist/{chunk-4ZHDBKBY.js → chunk-IMYQOKFO.js}

@@ -2,10 +2,10 @@ import {
   WARP_GREP_DESCRIPTION,
   WARP_GREP_TOOL_NAME,
   formatResult
-} from "./chunk-QVRXBAMM.js";
+} from "./chunk-GJ5TYNRD.js";
 import {
   runWarpGrep
-} from "./chunk-SALJ2K6S.js";
+} from "./chunk-6X5UOY7B.js";
 import {
   getSystemPrompt
 } from "./chunk-WETRQJGU.js";
@@ -80,4 +80,4 @@ export {
   createMorphWarpGrepTool,
   openai_default
 };
-//# sourceMappingURL=chunk-4ZHDBKBY.js.map
+//# sourceMappingURL=chunk-IMYQOKFO.js.map

package/dist/{chunk-GJURLQ3L.js → chunk-KBQWGT5L.js}

@@ -2,10 +2,10 @@ import {
   WARP_GREP_DESCRIPTION,
   WARP_GREP_TOOL_NAME,
   formatResult
-} from "./chunk-QVRXBAMM.js";
+} from "./chunk-GJ5TYNRD.js";
 import {
   runWarpGrep
-} from "./chunk-SALJ2K6S.js";
+} from "./chunk-6X5UOY7B.js";
 import {
   getSystemPrompt
 } from "./chunk-WETRQJGU.js";
@@ -74,4 +74,4 @@ export {
   createMorphWarpGrepTool,
   anthropic_default
 };
-//# sourceMappingURL=chunk-GJURLQ3L.js.map
+//# sourceMappingURL=chunk-KBQWGT5L.js.map

package/dist/{chunk-WSSSSBWU.js → chunk-QFIHUCTF.js}

@@ -1,15 +1,15 @@
 import {
   createMorphWarpGrepTool as createMorphWarpGrepTool2
-} from "./chunk-GJURLQ3L.js";
+} from "./chunk-KBQWGT5L.js";
 import {
   createMorphWarpGrepTool
-} from "./chunk-4ZHDBKBY.js";
+} from "./chunk-IMYQOKFO.js";
 import {
   createMorphWarpGrepTool as createMorphWarpGrepTool3
-} from "./chunk-UIRJE422.js";
+} from "./chunk-CFF636UC.js";
 import {
   WarpGrepClient
-} from "./chunk-QVRXBAMM.js";
+} from "./chunk-GJ5TYNRD.js";
 import {
   createCodebaseSearchTool as createCodebaseSearchTool3
 } from "./chunk-UBX7QYBD.js";
@@ -280,4 +280,4 @@ export {
   VercelToolFactory,
   MorphClient
 };
-//# sourceMappingURL=chunk-WSSSSBWU.js.map
+//# sourceMappingURL=chunk-QFIHUCTF.js.map

package/dist/client.cjs

@@ -1446,120 +1446,6 @@ function formatAgentToolOutput(toolName, args, output, options = {}) {
   return sharedFormatter.format(toolName, args, output, options);
 }
 
-// tools/warp_grep/agent/grep_helpers.ts
-var GrepState = class {
-  seenLines = /* @__PURE__ */ new Set();
-  isNew(path4, lineNumber) {
-    const key = this.makeKey(path4, lineNumber);
-    return !this.seenLines.has(key);
-  }
-  add(path4, lineNumber) {
-    this.seenLines.add(this.makeKey(path4, lineNumber));
-  }
-  makeKey(path4, lineNumber) {
-    return `${path4}:${lineNumber}`;
-  }
-};
-var MAX_GREP_OUTPUT_CHARS_PER_TURN = 6e4;
-function extractMatchFields(payload) {
-  const text = payload.replace(/\r?\n$/, "");
-  if (!text || text.startsWith("[error]")) {
-    return null;
-  }
-  const firstSep = text.indexOf(":");
-  if (firstSep === -1) {
-    return null;
-  }
-  let filePath = text.slice(0, firstSep).trim();
-  if (!filePath) {
-    return null;
-  }
-  if (filePath.startsWith("./") || filePath.startsWith(".\\")) {
-    filePath = filePath.slice(2);
-  }
-  const remainder = text.slice(firstSep + 1);
-  const secondSep = remainder.indexOf(":");
-  if (secondSep === -1) {
-    return null;
-  }
-  const linePart = remainder.slice(0, secondSep);
-  const lineNumber = Number.parseInt(linePart, 10);
-  if (!Number.isInteger(lineNumber) || lineNumber <= 0) {
-    return null;
-  }
-  let contentSegment = remainder.slice(secondSep + 1);
-  const columnSep = contentSegment.indexOf(":");
-  if (columnSep !== -1 && /^\d+$/.test(contentSegment.slice(0, columnSep))) {
-    contentSegment = contentSegment.slice(columnSep + 1);
-  }
-  const content = contentSegment.trim();
-  if (!content) {
-    return null;
-  }
-  return { path: filePath, lineNumber, content };
-}
-function parseAndFilterGrepOutput(rawOutput, state) {
-  const matches = [];
-  if (typeof rawOutput !== "string" || !rawOutput.trim()) {
-    return matches;
-  }
-  for (const line of rawOutput.split(/\r?\n/)) {
-    const fields = extractMatchFields(line);
-    if (!fields) {
-      continue;
-    }
-    if (state.isNew(fields.path, fields.lineNumber)) {
-      matches.push(fields);
-      state.add(fields.path, fields.lineNumber);
-    }
-  }
-  return matches;
-}
-function truncateOutput(payload, maxChars) {
-  if (payload.length <= maxChars) {
-    return payload;
-  }
-  const note = "... (output truncated)";
-  const available = maxChars - note.length - 1;
-  if (available <= 0) {
-    return note;
-  }
-  if (payload.length <= available) {
-    return `${payload.slice(0, available).replace(/\n$/, "")}
-${note}`;
-  }
-  const core = payload.slice(0, Math.max(0, available - 1));
-  const trimmed = core.replace(/\n$/, "").replace(/\s+$/, "");
-  const snippet = trimmed ? `${trimmed}\u2026` : "\u2026";
-  return `${snippet}
-${note}`;
-}
-function formatTurnGrepOutput(matches, maxChars = MAX_GREP_OUTPUT_CHARS_PER_TURN) {
-  if (!matches || matches.length === 0) {
-    return "No new matches found.";
-  }
-  const matchesByFile = /* @__PURE__ */ new Map();
-  for (const match of matches) {
-    if (!matchesByFile.has(match.path)) {
-      matchesByFile.set(match.path, []);
-    }
-    matchesByFile.get(match.path).push(match);
-  }
-  const lines = [];
-  const sortedPaths = Array.from(matchesByFile.keys()).sort();
-  sortedPaths.forEach((filePath, index) => {
-    if (index > 0) {
-      lines.push("");
-    }
-    lines.push(filePath);
-    const sortedMatches = matchesByFile.get(filePath).slice().sort((a, b) => a.lineNumber - b.lineNumber);
-    for (const match of sortedMatches) {
-      lines.push(`${match.lineNumber}:${match.content}`);
-    }
-  });
-  return truncateOutput(lines.join("\n"), maxChars);
-}
-
 // tools/warp_grep/tools/finish.ts
 async function readFinishFiles(repoRoot, files, reader) {
   const out = [];
@@ -1655,7 +1541,6 @@ async function runWarpGrep(config) {
   const model = config.model || DEFAULT_MODEL;
   const provider = config.provider;
   const errors = [];
-  const grepState = new GrepState();
   let finishMeta;
   let terminationReason = "terminated";
   for (let round = 1; round <= maxRounds; round += 1) {
@@ -1681,10 +1566,25 @@ async function runWarpGrep(config) {
       const msg = c.arguments?.message || "Command skipped due to parsing error";
       formatted.push(msg);
     }
-    const otherPromises = [];
+    const allPromises = [];
+    for (const c of grepCalls) {
+      const args = c.arguments ?? {};
+      allPromises.push(
+        provider.grep({ pattern: args.pattern, path: args.path }).then(
+          (grepRes) => {
+            if (grepRes.error) {
+              return { terminate: true, error: grepRes.error };
+            }
+            const output = grepRes.lines.join("\n") || "no matches";
+            return formatAgentToolOutput("grep", args, output, { isError: false });
+          },
+          (err) => formatAgentToolOutput("grep", args, String(err), { isError: true })
+        )
+      );
+    }
     for (const c of analyseCalls) {
       const args = c.arguments ?? {};
-      otherPromises.push(
+      allPromises.push(
         toolAnalyse(provider, args).then(
           (p) => formatAgentToolOutput("analyse", args, p, { isError: false }),
           (err) => formatAgentToolOutput("analyse", args, String(err), { isError: true })
@@ -1693,38 +1593,24 @@ async function runWarpGrep(config) {
     }
     for (const c of readCalls) {
       const args = c.arguments ?? {};
-      otherPromises.push(
+      allPromises.push(
         toolRead(provider, args).then(
           (p) => formatAgentToolOutput("read", args, p, { isError: false }),
           (err) => formatAgentToolOutput("read", args, String(err), { isError: true })
         )
       );
     }
-    const otherResults = await Promise.all(otherPromises);
-    formatted.push(...otherResults);
-    for (const c of grepCalls) {
-      const args = c.arguments ?? {};
-      try {
-        const grepRes = await provider.grep({ pattern: args.pattern, path: args.path });
-        if (grepRes.error) {
-          errors.push({ message: grepRes.error });
-          terminationReason = "terminated";
-          return {
-            terminationReason: "terminated",
-            messages,
-            errors
-          };
-        }
-        const rawOutput = Array.isArray(grepRes.lines) ? grepRes.lines.join("\n") : "";
-        const newMatches = parseAndFilterGrepOutput(rawOutput, grepState);
-        let formattedPayload = formatTurnGrepOutput(newMatches);
-        if (formattedPayload === "No new matches found.") {
-          formattedPayload = "no new matches";
-        }
-        formatted.push(formatAgentToolOutput("grep", args, formattedPayload, { isError: false }));
-      } catch (err) {
-        formatted.push(formatAgentToolOutput("grep", args, String(err), { isError: true }));
+    const allResults = await Promise.all(allPromises);
+    for (const result of allResults) {
+      if (typeof result === "object" && "terminate" in result) {
+        errors.push({ message: result.error });
+        return {
+          terminationReason: "terminated",
+          messages,
+          errors
+        };
       }
+      formatted.push(result);
     }
     if (formatted.length > 0) {
       const turnsUsed = round;