@morphllm/morphsdk 0.2.125 → 0.2.126

package/dist/client.cjs

@@ -36,7 +36,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@morphllm/morphsdk",
-      version: "0.2.125",
+      version: "0.2.126",
       description: "TypeScript SDK and CLI for Morph Fast Apply integration",
       type: "module",
       main: "./dist/index.cjs",
@@ -178,7 +178,7 @@ var init_package = __esm({
         "!dist/**/*.test.*"
       ],
       scripts: {
-        build: "tsup version.ts index.ts edge.ts client.ts tools/index.ts tools/fastapply/index.ts tools/fastapply/core.ts tools/fastapply/apply.ts tools/fastapply/types.ts tools/fastapply/prompts.ts tools/fastapply/anthropic.ts tools/fastapply/openai.ts tools/fastapply/vercel.ts tools/codebase_search/index.ts tools/codebase_search/core.ts tools/codebase_search/types.ts tools/codebase_search/prompts.ts tools/codebase_search/anthropic.ts tools/codebase_search/openai.ts tools/codebase_search/vercel.ts tools/warp_grep/index.ts tools/warp_grep/client.ts tools/warp_grep/openai.ts tools/warp_grep/anthropic.ts tools/warp_grep/vercel.ts tools/warp_grep/gemini.ts tools/warp_grep/harness.ts tools/warp_grep/agent/config.ts tools/warp_grep/agent/prompt.ts tools/warp_grep/agent/parser.ts tools/warp_grep/agent/runner.ts tools/warp_grep/agent/types.ts tools/warp_grep/agent/formatter.ts tools/warp_grep/providers/types.ts tools/warp_grep/providers/local.ts tools/warp_grep/providers/remote.ts tools/warp_grep/providers/code_storage_http.ts tools/warp_grep/tools/grep.ts tools/warp_grep/tools/analyse.ts tools/warp_grep/tools/read.ts tools/warp_grep/tools/finish.ts tools/warp_grep/utils/paths.ts tools/warp_grep/utils/github.ts tools/warp_grep/utils/ripgrep.ts tools/warp_grep/utils/format.ts tools/warp_grep/utils/files.ts git/index.ts git/client.ts git/config.ts git/types.ts tools/browser/index.ts tools/browser/core.ts tools/browser/types.ts tools/browser/prompts.ts tools/browser/anthropic.ts tools/browser/openai.ts tools/browser/vercel.ts tools/browser/live.ts tools/browser/errors.ts tools/browser/profiles/index.ts tools/browser/profiles/core.ts tools/browser/profiles/types.ts modelrouter/index.ts modelrouter/core.ts modelrouter/types.ts tools/compact/index.ts tools/compact/core.ts tools/compact/types.ts tools/utils/resilience.ts --format esm,cjs --sourcemap --clean --dts --dts-resolve",
+        build: "tsup version.ts index.ts edge.ts client.ts tools/index.ts tools/fastapply/index.ts tools/fastapply/core.ts tools/fastapply/apply.ts tools/fastapply/types.ts tools/fastapply/prompts.ts tools/fastapply/anthropic.ts tools/fastapply/openai.ts tools/fastapply/vercel.ts tools/codebase_search/index.ts tools/codebase_search/core.ts tools/codebase_search/types.ts tools/codebase_search/prompts.ts tools/codebase_search/anthropic.ts tools/codebase_search/openai.ts tools/codebase_search/vercel.ts tools/warp_grep/index.ts tools/warp_grep/client.ts tools/warp_grep/openai.ts tools/warp_grep/anthropic.ts tools/warp_grep/vercel.ts tools/warp_grep/gemini.ts tools/warp_grep/harness.ts tools/warp_grep/agent/config.ts tools/warp_grep/agent/parser.ts tools/warp_grep/agent/runner.ts tools/warp_grep/agent/types.ts tools/warp_grep/agent/formatter.ts tools/warp_grep/providers/types.ts tools/warp_grep/providers/local.ts tools/warp_grep/providers/remote.ts tools/warp_grep/providers/code_storage_http.ts tools/warp_grep/tools/grep.ts tools/warp_grep/tools/analyse.ts tools/warp_grep/tools/read.ts tools/warp_grep/tools/finish.ts tools/warp_grep/utils/paths.ts tools/warp_grep/utils/github.ts tools/warp_grep/utils/ripgrep.ts tools/warp_grep/utils/format.ts tools/warp_grep/utils/files.ts git/index.ts git/client.ts git/config.ts git/types.ts tools/browser/index.ts tools/browser/core.ts tools/browser/types.ts tools/browser/prompts.ts tools/browser/anthropic.ts tools/browser/openai.ts tools/browser/vercel.ts tools/browser/live.ts tools/browser/errors.ts tools/browser/profiles/index.ts tools/browser/profiles/core.ts tools/browser/profiles/types.ts modelrouter/index.ts modelrouter/core.ts modelrouter/types.ts tools/compact/index.ts tools/compact/core.ts tools/compact/types.ts tools/utils/resilience.ts --format esm,cjs --sourcemap --clean --dts --dts-resolve",
         prepare: "npm run build",
         typecheck: "tsc --noEmit",
         lint: "eslint .",
@@ -490,7 +490,7 @@ var init_config = __esm({
       ".*"
     ];
     DEFAULT_EXCLUDES = (process.env.MORPH_WARP_GREP_EXCLUDE || "").split(",").map((s) => s.trim()).filter(Boolean).concat(BUILTIN_EXCLUDES);
-    DEFAULT_MODEL = "morph-warp-grep-v1";
+    DEFAULT_MODEL = "morph-warp-grep-v2";
   }
 });
 
@@ -645,7 +645,8 @@ var local_exports = {};
 __export(local_exports, {
   LocalRipgrepProvider: () => LocalRipgrepProvider
 });
-function shouldSkip2(name) {
+function shouldSkip2(name, allowNames) {
+  if (allowNames?.has(name)) return false;
   if (SKIP_NAMES2.has(name)) return true;
   if (name.startsWith(".")) return true;
   for (const ext of SKIP_EXTENSIONS2) {
@@ -740,10 +741,14 @@ var init_local = __esm({
       ".js.map"
     ]);
     LocalRipgrepProvider = class {
-      constructor(repoRoot, excludes = DEFAULT_EXCLUDES) {
+      constructor(repoRoot, excludes = DEFAULT_EXCLUDES, options) {
         this.repoRoot = repoRoot;
         this.excludes = excludes;
+        if (options?.allowNames?.length) {
+          this.allowNames = new Set(options.allowNames);
+        }
       }
+      allowNames;
       async grep(params) {
         let abs;
         try {
@@ -757,6 +762,7 @@ var init_local = __esm({
         const stat = await import_promises2.default.stat(abs).catch(() => null);
         if (!stat) return { lines: [] };
         const targetArg = abs === import_path5.default.resolve(this.repoRoot) ? "." : toRepoRelative(this.repoRoot, abs);
+        const contextLines = params.context_lines !== void 0 ? String(params.context_lines) : "1";
         const args = [
           "--no-config",
           "--no-heading",
@@ -766,9 +772,10 @@ var init_local = __esm({
           "--trim",
           "--max-columns=400",
           "-C",
-          "1",
+          contextLines,
+          ...params.case_sensitive === false ? ["--ignore-case"] : [],
           ...params.glob ? ["--glob", params.glob] : [],
-          ...this.excludes.flatMap((e) => ["-g", `!${e}`]),
+          ...this.excludes.filter((e) => !this.allowNames?.has(e)).flatMap((e) => ["-g", `!${e}`]),
           params.pattern,
           targetArg || "."
         ];
@@ -793,10 +800,9 @@ Details: ${res.stderr}` : ""}`
         }
         const lines = (res.stdout || "").trim().split(/\r?\n/).filter((l) => l.length > 0);
         if (lines.length > AGENT_CONFIG.MAX_OUTPUT_LINES) {
-          return {
-            lines: [],
-            error: "query not specific enough, tool tried to return too much context and failed"
-          };
+          const truncated = lines.slice(0, AGENT_CONFIG.MAX_OUTPUT_LINES);
+          truncated.push(`... (output truncated at ${AGENT_CONFIG.MAX_OUTPUT_LINES} of ${lines.length} lines)`);
+          return { lines: truncated };
         }
         return { lines };
       }
@@ -870,7 +876,7 @@ Details: ${res.stderr}` : ""}`
         }
         if (out.length > AGENT_CONFIG.MAX_READ_LINES) {
           const truncated = out.slice(0, AGENT_CONFIG.MAX_READ_LINES);
-          truncated.push(`... [truncated: showing ${AGENT_CONFIG.MAX_READ_LINES} of ${out.length} lines]`);
+          truncated.push(`... (output truncated at ${AGENT_CONFIG.MAX_READ_LINES} of ${out.length} lines)`);
           return { lines: truncated };
         }
         return { lines: out };
@@ -890,6 +896,7 @@ Details: ${res.stderr}` : ""}`
         const maxDepth = params.maxDepth ?? AGENT_CONFIG.MAX_LIST_DEPTH;
         const regex = params.pattern ? new RegExp(params.pattern) : null;
         const repoRoot = this.repoRoot;
+        const allowNames = this.allowNames;
         const results = [];
         let timedOut = false;
         const startTime = Date.now();
@@ -907,7 +914,7 @@ Details: ${res.stderr}` : ""}`
           }
           for (const entry of entries) {
             if (timedOut || results.length >= maxResults) break;
-            if (shouldSkip2(entry.name)) continue;
+            if (shouldSkip2(entry.name, allowNames)) continue;
             if (regex && !regex.test(entry.name)) continue;
             const full = import_path5.default.join(dir, entry.name);
             const isDir = entry.isDirectory();
@@ -2470,483 +2477,130 @@ async function checkHealth(config = {}) {
 // tools/warp_grep/agent/runner.ts
 init_config();
 
-// tools/warp_grep/agent/prompt.ts
-var SYSTEM_PROMPT = `You are a code search agent. Your task is to find all relevant code for a given search_string.
-
-### workflow
-You have exactly 4 turns. The 4th turn MUST be a \`finish\` call. Each turn allows up to 8 parallel tool calls.
-
-- Turn 1: Map the territory OR dive deep (based on search_string specificity)
-- Turn 2-3: Refine based on findings
-- Turn 4: MUST call \`finish\` with all relevant code locations
-- You MAY call \`finish\` early if confident\u2014but never before at least 1 search turn.
-- The user strongly prefers if you can call the finish tool early, but you must be correct
-
-Remember, if the task feels easy to you, it is strongly desirable to call 'finish' early using fewer turns, but quality over speed
-
-### tools
-Tool calls use nested XML elements:
-\`\`\`xml
-<tool_name>
-  <parameter>value</parameter>
-</tool_name>
-\`\`\`
-
-### \`list_directory\`
-Directory tree view. Shows structure of a path, optionally filtered by regex pattern.
-
-Elements:
-- \`<path>\` (required): Directory path to list (use \`.\` for repo root)
-- \`<pattern>\` (optional): Regex to filter results
-
-Examples:
-\`\`\`
-<list_directory>
-  <path>src/services</path>
-</list_directory>
-
-<list_directory>
-  <path>lib/utils</path>
-  <pattern>.*\\.(ts|js)$</pattern>
-</list_directory>
-\`\`\`
-
-### \`read\`
-Read file contents. Supports multiple line ranges.
-- Returns numbered lines for easy reference
-- ALWAYS include import statements (usually lines 1-20). Better to over-include than miss context.
-
-Elements:
-- \`<path>\` (required): File path to read
-- \`<lines>\` (optional): Line ranges like "1-50,75-80,100-120" (omit to read entire file)
-
-Examples:
-\`\`\`
-<read>
-  <path>src/main.py</path>
-</read>
-
-<read>
-  <path>src/auth.py</path>
-  <lines>1-20,45-80,150-200</lines>
-</read>
-\`\`\`
-
-### \`grep\`
-Search for pattern matches across files. Returns matches with 1 line of context above and below.
-- Match lines use \`:\` separator \u2192 \`filepath:linenum:content\`
-- Context lines use \`-\` separator \u2192 \`filepath-linenum-content\`
-
-Elements:
-- \`<pattern>\` (required): Search pattern (regex). Use \`(a|b)\` for OR patterns.
-- \`<sub_dir>\` (optional): Subdirectory to search in (defaults to \`.\`)
-- \`<glob>\` (optional): File pattern filter like \`*.py\` or \`*.{ts,tsx}\`
-
-Examples:
-\`\`\`
-<grep>
-  <pattern>(authenticate|authorize|login)</pattern>
-  <sub_dir>src/auth/</sub_dir>
-</grep>
-
-<grep>
-  <pattern>class.*(Service|Controller)</pattern>
-  <glob>*.{ts,js}</glob>
-</grep>
-
-<grep>
-  <pattern>(DB_HOST|DATABASE_URL|connection)</pattern>
-  <glob>*.{py,yaml,env}</glob>
-  <sub_dir>lib/</sub_dir>
-</grep>
-\`\`\`
-
-### \`finish\`
-Submit final answer with all relevant code locations. Uses nested \`<file>\` elements.
-
-File elements:
-- \`<path>\` (required): File path
-- \`<lines>\` (optional): Line ranges like "1-50,75-80" (\`*\` for entire file)
-
-ALWAYS include import statements (usually lines 1-20). Better to over-include than miss context.
-
-Examples:
-\`\`\`
-<finish>
-  <file>
-    <path>src/auth.py</path>
-    <lines>1-15,25-50,75-80</lines>
-  </file>
-  <file>
-    <path>src/models/user.py</path>
-    <lines>*</lines>
-  </file>
-</finish>
-\`\`\`
-</tools>
-
-<strategy>
-**Before your first tool call, classify the search_string:**
-
-| Search_string Type | Round 1 Strategy | Early Finish? |
-|------------|------------------|---------------|
-| **Specific** (function name, error string, unique identifier) | 8 parallel greps on likely paths | Often by round 2 |
-| **Conceptual** (how does X work, where is Y handled) | list_directory + 2-3 broad greps | Rarely early |
-| **Exploratory** (find all tests, list API endpoints) | list_directory at multiple depths | Usually needs 3 rounds |
-
-**Parallel call patterns:**
-- **Shotgun grep**: Same pattern, 8 different directories\u2014fast coverage
-- **Variant grep**: 8 pattern variations (synonyms, naming conventions)\u2014catches inconsistent codebases
-- **Funnel**: 1 list_directory + 7 greps\u2014orient and search simultaneously
-- **Deep read**: 8 reads on files you already identified\u2014gather full context fast
-
-**Tool call expectations:**
-- Low quality tool calls are ones that give back sparse information. This either means they are not well thought out and are not educated guesses OR, they are too broad and give back too many results.
-- High quality tool calls strike a balance between complexity in the tool call to exclude results we know we don't want, and how wide the search space is so that we don't miss anything. It is ok to start off with wider search spaces, but is imperative that you use your intuition from there on out and seek high quality tool calls only.
-- You are not starting blind, you have some information about root level repo structure going in, so use that to prevent making trivial repo wide queries.
-- The grep tool shows you which file path and line numbers the pattern was found in, use this information smartly when trying to read the file.
-</strategy>
-
-<output_format>
-EVERY response MUST follow this exact format:
-
-1. First, wrap your reasoning in \`<think>...</think>\` tags containing:
-   - Search_string classification (specific/conceptual/exploratory)
-   - Confidence estimate (can I finish in 1-2 rounds?)
-   - This round's parallel strategy
-   - What signals would let me finish early?
-
-2. Then, output up to 8 tool calls using nested XML elements.
-
-Example:
-\`\`\`
-<think>
-This is a specific search_string about authentication. I'll grep for auth-related patterns.
-High confidence I can finish in 2 rounds if I find the auth module. I have already been shown the repo's structure at root
-Strategy: Shotgun grep across likely directories.
-</think>
-<grep>
-  <pattern>(authenticate|login|session)</pattern>
-  <sub_dir>src/auth/</sub_dir>
-</grep>
-<grep>
-  <pattern>(middleware|interceptor)</pattern>
-  <glob>*.{ts,js}</glob>
-</grep>
-<list_directory>
-  <path>src/auth</path>
-</list_directory>
-\`\`\`
-
-Finishing example:
-\`\`\`
-<think>
-I think I have a rough idea, but this is my last turn so I must call the finish tool regardless.
-</think>
-<finish>
-  <file>
-    <path>src/auth/login.py</path>
-    <lines>1-50</lines>
-  </file>
-  <file>
-    <path>src/middleware/session.py</path>
-    <lines>10-80</lines>
-  </file>
-</finish>
-\`\`\`
-
-No commentary outside \`<think>\`. No explanations after tool calls.
-</output_format>
-
-use as all 8 tool calls to be optimal
-
-<finishing_requirements>
-When calling \`finish\`:
-- Include the import section (typically lines 1-20) of each file
-- Include all function/class definitions that are relevant
-- Include any type definitions, interfaces, or constants used
-- Better to over-include than leave the user missing context
-- If unsure about boundaries, include more rather than less
-</finishing_requirements>`;
-function getSystemPrompt() {
-  return SYSTEM_PROMPT;
-}
-
 // tools/warp_grep/agent/parser.ts
-var VALID_COMMANDS = ["list_directory", "grep", "read", "finish"];
+var VALID_COMMANDS = ["list_directory", "ripgrep", "read", "finish"];
 function isValidCommand(name) {
   return VALID_COMMANDS.includes(name);
 }
-function getXmlElementText(xml, tagName) {
-  const regex = new RegExp(`<${tagName}>([\\s\\S]*?)</${tagName}>`, "i");
-  const match = xml.match(regex);
-  return match ? match[1].trim() : null;
-}
-function parseNestedXmlTools(text) {
+function parseQwen3ToolCalls(text) {
   const tools = [];
-  const toolRegex = /<([a-z_][a-z0-9_]*)>([\s\S]*?)<\/\1>/gi;
+  const toolCallRegex = /<tool_call>\s*<function=([a-z_][a-z0-9_]*)>([\s\S]*?)<\/function>\s*<\/tool_call>/gi;
   let match;
-  while ((match = toolRegex.exec(text)) !== null) {
-    const rawToolName = match[1].toLowerCase();
-    const content = match[2];
-    if (!isValidCommand(rawToolName)) continue;
-    const toolName = rawToolName;
-    if (toolName === "list_directory") {
-      const path5 = getXmlElementText(content, "path");
-      const pattern = getXmlElementText(content, "pattern");
-      if (path5) {
-        tools.push({ name: "list_directory", arguments: { path: path5, pattern } });
+  while ((match = toolCallRegex.exec(text)) !== null) {
+    const funcName = match[1].toLowerCase();
+    const body = match[2];
+    if (!isValidCommand(funcName)) continue;
+    const params = {};
+    const paramRegex = /<parameter=([a-z_][a-z0-9_]*)>([\s\S]*?)<\/parameter>/gi;
+    let paramMatch;
+    while ((paramMatch = paramRegex.exec(body)) !== null) {
+      params[paramMatch[1].toLowerCase()] = paramMatch[2].trim();
+    }
+    if (funcName === "ripgrep") {
+      const pattern = params.pattern;
+      if (!pattern) continue;
+      const args = {
+        pattern,
+        path: params.path || ".",
+        ...params.glob && { glob: params.glob },
+        ...params.context_lines && { context_lines: parseInt(params.context_lines, 10) },
+        ...params.case_sensitive && { case_sensitive: params.case_sensitive === "true" }
+      };
+      tools.push({ name: "grep", arguments: args });
+    } else if (funcName === "list_directory") {
+      const command = params.command;
+      const directPath = params.path;
+      let dirPath = directPath || ".";
+      if (!directPath && command) {
+        const tokens = command.trim().split(/\s+/);
+        const pathTokens = tokens.slice(1).filter((t) => !t.startsWith("-") && !t.startsWith("|") && !t.startsWith("\\("));
+        if (pathTokens.length > 0) {
+          dirPath = pathTokens[0];
+        }
       }
-    } else if (toolName === "grep") {
-      const pattern = getXmlElementText(content, "pattern");
-      const subDir = getXmlElementText(content, "sub_dir");
-      const glob = getXmlElementText(content, "glob");
-      if (pattern) {
-        tools.push({
-          name: "grep",
-          arguments: {
-            pattern,
-            path: subDir || ".",
-            ...glob && { glob }
+      tools.push({ name: "list_directory", arguments: { path: dirPath, pattern: params.pattern || null } });
+    } else if (funcName === "read") {
+      const filePath = params.path;
+      if (!filePath) continue;
+      const args = { path: filePath };
+      const linesStr = params.lines;
+      if (linesStr) {
+        const ranges = [];
+        for (const rangeStr of linesStr.split(",")) {
+          const trimmed = rangeStr.trim();
+          if (!trimmed) continue;
+          const [s, e] = trimmed.split("-").map((v) => parseInt(v.trim(), 10));
+          if (Number.isFinite(s) && Number.isFinite(e)) {
+            ranges.push([s, e]);
+          } else if (Number.isFinite(s)) {
+            ranges.push([s, s]);
           }
-        });
+        }
+        if (ranges.length === 1) {
+          args.start = ranges[0][0];
+          args.end = ranges[0][1];
+        } else if (ranges.length > 1) {
+          args.lines = ranges;
+        }
+      }
+      tools.push({ name: "read", arguments: args });
+    } else if (funcName === "finish") {
+      if (params.result && !params.files) {
+        tools.push({ name: "finish", arguments: { files: [], textResult: params.result } });
+        continue;
+      }
+      const filesStr = params.files;
+      if (!filesStr) {
+        tools.push({ name: "finish", arguments: { files: [], textResult: "No relevant code found." } });
+        continue;
       }
-    } else if (toolName === "read") {
-      const path5 = getXmlElementText(content, "path");
-      const linesStr = getXmlElementText(content, "lines");
-      if (path5) {
-        const args = { path: path5 };
-        if (linesStr) {
+      const files = [];
+      for (const line of filesStr.split("\n")) {
+        const trimmed = line.trim();
+        if (!trimmed) continue;
+        const colonIdx = trimmed.indexOf(":");
+        if (colonIdx === -1) {
+          files.push({ path: trimmed, lines: "*" });
+        } else {
+          const filePath = trimmed.slice(0, colonIdx);
+          const rangesPart = trimmed.slice(colonIdx + 1);
           const ranges = [];
-          for (const rangeStr of linesStr.split(",")) {
-            const trimmed = rangeStr.trim();
-            if (!trimmed) continue;
-            const [s, e] = trimmed.split("-").map((v) => parseInt(v.trim(), 10));
+          for (const rangeStr of rangesPart.split(",")) {
+            const rt = rangeStr.trim();
+            if (!rt || rt === "*") {
+              files.push({ path: filePath, lines: "*" });
+              break;
+            }
+            const [s, e] = rt.split("-").map((v) => parseInt(v.trim(), 10));
             if (Number.isFinite(s) && Number.isFinite(e)) {
               ranges.push([s, e]);
             } else if (Number.isFinite(s)) {
               ranges.push([s, s]);
             }
           }
-          if (ranges.length === 1) {
-            args.start = ranges[0][0];
-            args.end = ranges[0][1];
-          } else if (ranges.length > 1) {
-            args.lines = ranges;
-          }
-        }
-        tools.push({ name: "read", arguments: args });
-      }
-    } else if (toolName === "finish") {
-      const fileRegex = /<file>([\s\S]*?)<\/file>/gi;
-      const files = [];
-      let fileMatch;
-      while ((fileMatch = fileRegex.exec(content)) !== null) {
-        const fileContent = fileMatch[1];
-        const filePath = getXmlElementText(fileContent, "path");
-        const linesStr = getXmlElementText(fileContent, "lines");
-        if (filePath) {
-          if (!linesStr || linesStr.trim() === "*") {
+          if (ranges.length > 0) {
+            files.push({ path: filePath, lines: ranges });
+          } else if (!files.some((f) => f.path === filePath)) {
             files.push({ path: filePath, lines: "*" });
-          } else {
-            const ranges = [];
-            for (const rangeStr of linesStr.split(",")) {
-              const [s, e] = rangeStr.split("-").map((v) => parseInt(v.trim(), 10));
-              if (Number.isFinite(s) && Number.isFinite(e)) {
-                ranges.push([s, e]);
-              }
-            }
-            if (ranges.length > 0) {
-              files.push({ path: filePath, lines: ranges });
-            } else {
-              files.push({ path: filePath, lines: "*" });
-            }
           }
         }
       }
       if (files.length > 0) {
         tools.push({ name: "finish", arguments: { files } });
       } else {
-        const raw = content.replace(/<[^>]*>/g, "").trim();
-        const textResult = !raw || raw === "*" ? "No relevant code found." : raw;
-        tools.push({ name: "finish", arguments: { files: [], textResult } });
+        tools.push({ name: "finish", arguments: { files: [], textResult: filesStr } });
       }
     }
   }
-  if (tools.length === 0) {
-    const fnFinishMatch = text.match(/<function=finish>([\s\S]*?)<\/function>/i);
-    if (fnFinishMatch) {
-      const inner = fnFinishMatch[1];
-      const paramMatch = inner.match(/<parameter=result>([\s\S]*?)<\/parameter>/i);
-      const raw = (paramMatch ? paramMatch[1] : inner).trim();
-      const textResult = !raw || raw === "*" ? "No relevant code found." : raw;
-      tools.push({ name: "finish", arguments: { files: [], textResult } });
-    }
-  }
   return tools;
 }
-function preprocessText(text) {
-  const processed = text.replace(/<think>[\s\S]*?<\/think>/gi, "").replace(/<\/?tool_call>/gi, "");
-  const nestedTools = parseNestedXmlTools(processed);
-  const toolCallLines = [];
-  const allLines = processed.split(/\r?\n/).map((l) => l.trim());
-  for (const line of allLines) {
-    if (!line) continue;
-    if (line.startsWith("<")) continue;
-    const firstWord = line.split(/\s/)[0];
-    if (VALID_COMMANDS.includes(firstWord)) {
-      if (!toolCallLines.includes(line)) {
-        toolCallLines.push(line);
-      }
-    }
-  }
-  return { lines: toolCallLines, nestedTools };
-}
 var LLMResponseParser = class {
-  finishSpecSplitRe = /,(?=[^,\s]+:)/;
   parse(text) {
     if (typeof text !== "string") {
       throw new TypeError("Command text must be a string.");
     }
-    const { lines, nestedTools } = preprocessText(text);
-    const commands = [...nestedTools];
-    let finishAccumulator = null;
-    lines.forEach((line) => {
-      if (!line || line.startsWith("#")) return;
-      const parts = this.splitLine(line);
-      if (parts.length === 0) return;
-      const cmd = parts[0];
-      switch (cmd) {
-        case "list_directory":
-          this.handleListDirectory(parts, line, commands);
-          break;
-        case "grep":
-          this.handleGrep(parts, line, commands);
-          break;
-        case "read":
-          this.handleRead(parts, line, commands);
-          break;
-        case "finish":
-          finishAccumulator = this.handleFinish(parts, line, commands, finishAccumulator);
-          break;
-        default:
-          break;
-      }
-    });
-    if (finishAccumulator) {
-      const map = finishAccumulator;
-      const entries = [...map.entries()];
-      const filesPayload = entries.map(([path5, ranges]) => ({
-        path: path5,
-        lines: [...ranges].sort((a, b) => a[0] - b[0])
-      }));
-      commands.push({ name: "finish", arguments: { files: filesPayload } });
-    }
-    return commands;
-  }
-  splitLine(line) {
-    const parts = [];
-    let current = "";
-    let inSingle = false;
-    for (let i = 0; i < line.length; i++) {
-      const ch = line[i];
-      if (ch === "'" && line[i - 1] !== "\\") {
-        inSingle = !inSingle;
-        current += ch;
-      } else if (!inSingle && /\s/.test(ch)) {
-        if (current) {
-          parts.push(current);
-          current = "";
-        }
-      } else {
-        current += ch;
-      }
-    }
-    if (current) parts.push(current);
-    return parts;
-  }
-  /** Helper to create a _skip tool call with an error message */
-  skip(message) {
-    return { name: "_skip", arguments: { message } };
-  }
-  handleListDirectory(parts, rawLine, commands) {
-    if (parts.length < 2) {
-      commands.push(this.skip(
-        `[SKIPPED] Your command "${rawLine}" is missing a path. Correct format: list_directory <path> [pattern]. Example: list_directory src/`
-      ));
-      return;
-    }
-    const path5 = parts[1];
-    const pattern = parts[2]?.replace(/^"|"$/g, "") ?? null;
-    commands.push({ name: "list_directory", arguments: { path: path5, pattern } });
-  }
-  handleGrep(parts, rawLine, commands) {
-    if (parts.length < 3) {
-      commands.push(this.skip(
-        `[SKIPPED] Your command "${rawLine}" is missing arguments. Correct format: grep '<pattern>' <path>. Example: grep 'TODO' src/`
-      ));
-      return;
-    }
-    let pat = parts[1];
-    if (pat.startsWith("'") && pat.endsWith("'")) {
-      pat = pat.slice(1, -1);
-    }
-    if (!pat) {
-      commands.push(this.skip(
-        `[SKIPPED] Your command "${rawLine}" has an empty pattern. Provide a non-empty search pattern. Example: grep 'function' src/`
-      ));
-      return;
-    }
-    commands.push({ name: "grep", arguments: { pattern: pat, path: parts[2] } });
-  }
-  handleRead(parts, rawLine, commands) {
-    if (parts.length < 2) {
-      commands.push(this.skip(
-        `[SKIPPED] Your command "${rawLine}" is missing a path. Correct format: read <path> or read <path>:<start>-<end>. Example: read src/index.ts:1-50`
-      ));
-      return;
-    }
-    const spec = parts[1];
-    const rangeIdx = spec.indexOf(":");
-    if (rangeIdx === -1) {
-      commands.push({ name: "read", arguments: { path: spec } });
-      return;
-    }
-    const filePath = spec.slice(0, rangeIdx);
-    const range = spec.slice(rangeIdx + 1);
-    const [s, e] = range.split("-").map((v) => parseInt(v, 10));
-    if (!Number.isFinite(s) || !Number.isFinite(e)) {
-      commands.push({ name: "read", arguments: { path: filePath } });
-      return;
-    }
-    commands.push({ name: "read", arguments: { path: filePath, start: s, end: e } });
-  }
-  handleFinish(parts, rawLine, commands, acc) {
-    const map = acc ?? /* @__PURE__ */ new Map();
-    const args = parts.slice(1);
-    for (const token of args) {
-      const [filePath, rangesText] = token.split(":", 2);
-      if (!filePath || !rangesText) {
-        commands.push(this.skip(
-          `[SKIPPED] Invalid finish token "${token}". Correct format: finish <path>:<start>-<end>. Example: finish src/index.ts:1-50`
-        ));
-        continue;
-      }
-      const rangeSpecs = rangesText.split(",").filter(Boolean);
-      for (const spec of rangeSpecs) {
-        const [s, e] = spec.split("-").map((v) => parseInt(v, 10));
-        if (!Number.isFinite(s) || !Number.isFinite(e) || e < s) {
-          commands.push(this.skip(
-            `[SKIPPED] Invalid range "${spec}" in "${token}". Ranges must be <start>-<end> where start <= end. Example: 1-50`
-          ));
-          continue;
-        }
-        const arr = map.get(filePath) ?? [];
-        arr.push([s, e]);
-        map.set(filePath, arr);
-      }
-    }
-    return map;
+    const withoutThink = text.replace(/<think>[\s\S]*?<\/think>/gi, "");
+    return parseQwen3ToolCalls(withoutThink);
   }
 };
 
@@ -3016,14 +2670,12 @@ async function toolListDirectory(provider, args) {
   }
   const { entries: list } = await getListRecursive(initialDepth);
   if (!list.length) return "empty";
-  if (list.length >= maxResults) {
-    return "query not specific enough, tool called tried to return too much context and failed";
-  }
-  return list.map((e) => {
+  const tree = list.map((e) => {
     const indent = "  ".repeat(e.depth);
     const name = e.type === "dir" ? `${e.name}/` : e.name;
     return `${indent}${name}`;
   }).join("\n");
+  return tree;
 }
 
 // tools/warp_grep/agent/tools/finish.ts
@@ -3086,90 +2738,19 @@ function mergeRanges(ranges) {
 
 // tools/warp_grep/agent/formatter.ts
 var ToolOutputFormatter = class {
-  format(toolName, args, output, options = {}) {
+  format(toolName, _args, output, options = {}) {
     const name = (toolName ?? "").trim();
     if (!name) {
       return "";
     }
     const payload = output?.toString?.()?.trim?.() ?? "";
     const isError = Boolean(options.isError);
-    const safeArgs = args ?? {};
     if (!payload && !isError) {
       return "";
     }
-    switch (name) {
-      case "read":
-        return this.formatRead(safeArgs, payload, isError);
-      case "list_directory":
-        return this.formatListDirectory(safeArgs, payload, isError);
-      case "grep":
-        return this.formatGrep(safeArgs, payload, isError);
-      default:
-        return payload ? `<tool_output>
-${payload}
-</tool_output>` : "";
-    }
-  }
-  formatRead(args, payload, isError) {
-    if (isError) {
-      return payload;
-    }
-    const path5 = this.asString(args.path) || "...";
-    const start = args.start;
-    const end = args.end;
-    const linesArray = args.lines;
-    const attributes = [`path="${path5}"`];
-    if (linesArray && linesArray.length > 0) {
-      const rangeStr = linesArray.map(([s, e]) => `${s}-${e}`).join(",");
-      attributes.push(`lines="${rangeStr}"`);
-    } else if (start !== void 0 && end !== void 0) {
-      attributes.push(`lines="${start}-${end}"`);
-    }
-    return `<read ${attributes.join(" ")}>
-${payload}
-</read>`;
-  }
-  formatListDirectory(args, payload, isError) {
-    const path5 = this.asString(args.path) || ".";
-    const pattern = this.asString(args.pattern);
-    const attributes = [`path="${path5}"`];
-    if (pattern) {
-      attributes.push(`pattern="${pattern}"`);
-    }
-    if (isError) {
-      attributes.push('status="error"');
-    }
-    return `<list_directory ${attributes.join(" ")}>
+    return `<tool_response>
 ${payload}
-</list_directory>`;
-  }
-  formatGrep(args, payload, isError) {
-    const pattern = this.asString(args.pattern);
-    const subDir = this.asString(args.path);
-    const glob = this.asString(args.glob);
-    const attributes = [];
-    if (pattern !== void 0) {
-      attributes.push(`pattern="${pattern}"`);
-    }
-    if (subDir !== void 0) {
-      attributes.push(`sub_dir="${subDir}"`);
-    }
-    if (glob !== void 0) {
-      attributes.push(`glob="${glob}"`);
-    }
-    if (isError) {
-      attributes.push('status="error"');
-    }
-    const attrText = attributes.length ? ` ${attributes.join(" ")}` : "";
-    return `<grep${attrText}>
-${payload}
-</grep>`;
-  }
-  asString(value) {
-    if (value === null || value === void 0) {
-      return void 0;
-    }
-    return String(value);
+</tool_response>`;
   }
 };
 var sharedFormatter = new ToolOutputFormatter();
@@ -3198,12 +2779,15 @@ function calculateContextBudget(messages) {
   const maxK = Math.round(maxChars / 1e3);
   return `<context_budget>${percent}% (${usedK}K/${maxK}K chars)</context_budget>`;
 }
-async function buildInitialState(repoRoot, query, provider) {
+async function buildInitialState(repoRoot, query, provider, options) {
+  const budget = calculateContextBudget([]);
+  const turnTag = `Turn 0/${AGENT_CONFIG.MAX_TURNS}`;
+  const treeDepth = options?.query_type === "node_modules" ? 1 : 2;
   try {
     const entries = await provider.listDirectory({
       path: ".",
       maxResults: AGENT_CONFIG.MAX_OUTPUT_LINES,
-      maxDepth: 2
+      maxDepth: treeDepth
     });
     const treeLines = entries.map((e) => {
       const indent = "  ".repeat(e.depth);
@@ -3219,7 +2803,9 @@ ${treeOutput}
 
 <search_string>
 ${query}
-</search_string>`;
+</search_string>
+${budget}
+${turnTag}`;
   } catch {
     const repoName = import_path2.default.basename(repoRoot);
     return `<repo_structure>
@@ -3228,7 +2814,9 @@ ${repoName}/
 
 <search_string>
 ${query}
-</search_string>`;
+</search_string>
+${budget}
+${turnTag}`;
   }
 }
 function enforceContextLimit(messages, maxChars = AGENT_CONFIG.MAX_CONTEXT_CHARS) {
@@ -3316,14 +2904,13 @@ async function runWarpGrep(config) {
   const timeoutMs = config.timeout ?? AGENT_CONFIG.TIMEOUT_MS;
   const timings = { turns: [], timeout_ms: timeoutMs };
   const repoRoot = import_path3.default.resolve(config.repoRoot || process.cwd());
+  const model = config.model || DEFAULT_MODEL;
   const messages = [];
-  messages.push({ role: "system", content: getSystemPrompt() });
+  const maxTurns = AGENT_CONFIG.MAX_TURNS;
   const initialStateStart = Date.now();
-  const initialState = await buildInitialState(repoRoot, config.query, config.provider);
+  const initialState = await buildInitialState(repoRoot, config.query, config.provider, { query_type: config.query_type });
   timings.initial_state_ms = Date.now() - initialStateStart;
   messages.push({ role: "user", content: initialState });
-  const maxTurns = AGENT_CONFIG.MAX_TURNS;
-  const model = config.model || DEFAULT_MODEL;
   const provider = config.provider;
   const errors = [];
   let finishMeta;
@@ -3373,7 +2960,7 @@ async function runWarpGrep(config) {
       const args = c.arguments ?? {};
       allPromises.push(
         toolGrep(provider, args).then(
-          ({ output }) => formatAgentToolOutput("grep", args, output, { isError: false }),
+          ({ output }) => formatAgentToolOutput("grep", args, output),
           (err) => formatAgentToolOutput("grep", args, String(err), { isError: true })
         )
       );
@@ -3382,7 +2969,7 @@ async function runWarpGrep(config) {
       const args = c.arguments ?? {};
       allPromises.push(
         toolListDirectory(provider, args).then(
-          (p) => formatAgentToolOutput("list_directory", args, p, { isError: false }),
+          (p) => formatAgentToolOutput("list_directory", args, p),
           (err) => formatAgentToolOutput("list_directory", args, String(err), { isError: true })
         )
       );
@@ -3391,7 +2978,7 @@ async function runWarpGrep(config) {
       const args = c.arguments ?? {};
       allPromises.push(
         toolRead(provider, args).then(
-          (p) => formatAgentToolOutput("read", args, p, { isError: false }),
+          (p) => formatAgentToolOutput("read", args, p),
           (err) => formatAgentToolOutput("read", args, String(err), { isError: true })
         )
       );
@@ -3475,14 +3062,13 @@ async function* runWarpGrepStreaming(config) {
   const timeoutMs = config.timeout ?? AGENT_CONFIG.TIMEOUT_MS;
   const timings = { turns: [], timeout_ms: timeoutMs };
   const repoRoot = import_path3.default.resolve(config.repoRoot || process.cwd());
+  const model = config.model || DEFAULT_MODEL;
   const messages = [];
-  messages.push({ role: "system", content: getSystemPrompt() });
+  const maxTurns = AGENT_CONFIG.MAX_TURNS;
   const initialStateStart = Date.now();
-  const initialState = await buildInitialState(repoRoot, config.query, config.provider);
+  const initialState = await buildInitialState(repoRoot, config.query, config.provider, { query_type: config.query_type });
   timings.initial_state_ms = Date.now() - initialStateStart;
   messages.push({ role: "user", content: initialState });
-  const maxTurns = AGENT_CONFIG.MAX_TURNS;
-  const model = config.model || DEFAULT_MODEL;
   const provider = config.provider;
   const errors = [];
   let finishMeta;
@@ -3539,7 +3125,7 @@ async function* runWarpGrepStreaming(config) {
       const args = c.arguments ?? {};
       allPromises.push(
         toolGrep(provider, args).then(
-          ({ output }) => formatAgentToolOutput("grep", args, output, { isError: false }),
+          ({ output }) => formatAgentToolOutput("grep", args, output),
           (err) => formatAgentToolOutput("grep", args, String(err), { isError: true })
         )
       );
@@ -3548,7 +3134,7 @@ async function* runWarpGrepStreaming(config) {
       const args = c.arguments ?? {};
       allPromises.push(
         toolListDirectory(provider, args).then(
-          (p) => formatAgentToolOutput("list_directory", args, p, { isError: false }),
+          (p) => formatAgentToolOutput("list_directory", args, p),
           (err) => formatAgentToolOutput("list_directory", args, String(err), { isError: true })
         )
       );
@@ -3557,7 +3143,7 @@ async function* runWarpGrepStreaming(config) {
       const args = c.arguments ?? {};
       allPromises.push(
         toolRead(provider, args).then(
-          (p) => formatAgentToolOutput("read", args, p, { isError: false }),
+          (p) => formatAgentToolOutput("read", args, p),
           (err) => formatAgentToolOutput("read", args, String(err), { isError: true })
         )
       );
@@ -3735,10 +3321,9 @@ var RemoteCommandsProvider = class {
       const stdout = await this.commands.grep(params.pattern, params.path, params.glob);
       const lines = (stdout || "").trim().split(/\r?\n/).filter((l) => l.length > 0);
       if (lines.length > AGENT_CONFIG.MAX_OUTPUT_LINES) {
-        return {
-          lines: [],
-          error: "Query not specific enough - too many results returned. Try a more specific pattern."
-        };
+        const truncated = lines.slice(0, AGENT_CONFIG.MAX_OUTPUT_LINES);
+        truncated.push(`... (output truncated at ${AGENT_CONFIG.MAX_OUTPUT_LINES} of ${lines.length} lines)`);
+        return { lines: truncated };
       }
       return { lines };
     } catch (error) {
@@ -3768,7 +3353,7 @@ var RemoteCommandsProvider = class {
       const lines = contentLines.map((content, idx) => `${start + idx}|${content}`);
       if (lines.length > AGENT_CONFIG.MAX_READ_LINES) {
         const truncated = lines.slice(0, AGENT_CONFIG.MAX_READ_LINES);
-        truncated.push(`... [truncated: showing ${AGENT_CONFIG.MAX_READ_LINES} of ${lines.length} lines]`);
+        truncated.push(`... (output truncated at ${AGENT_CONFIG.MAX_READ_LINES} of ${lines.length} lines)`);
         return { lines: truncated };
       }
       return { lines };
@@ -5319,9 +4904,6 @@ function createWarpGrepTool(config) {
     },
     formatResult: (result) => {
       return formatResult(result);
-    },
-    getSystemPrompt: () => {
-      return getSystemPrompt();
     }
   });
 }
@@ -5341,9 +4923,6 @@ function createGitHubSearchTool(config) {
     },
     formatResult: (result) => {
       return formatResult(result);
-    },
-    getSystemPrompt: () => {
-      return getSystemPrompt();
     }
   });
 }
@@ -5516,7 +5095,7 @@ var editFileTool = {
 async function execute(input, config) {
   return executeEditFile(input, config);
 }
-function getSystemPrompt2() {
+function getSystemPrompt() {
   return EDIT_FILE_SYSTEM_PROMPT;
 }
 function formatResult3(result) {
@@ -5545,7 +5124,7 @@ function createEditFileTool(config = {}) {
       return formatResult3(result);
     },
     getSystemPrompt: () => {
-      return getSystemPrompt2();
+      return getSystemPrompt();
     }
   });
 }
@@ -5625,9 +5204,6 @@ function createWarpGrepTool2(config) {
     },
     formatResult: (result) => {
       return formatResult(result);
-    },
-    getSystemPrompt: () => {
-      return getSystemPrompt();
     }
   });
 }
@@ -5644,9 +5220,6 @@ function createGitHubSearchTool2(config) {
     },
     formatResult: (result) => {
       return formatResult(result);
-    },
-    getSystemPrompt: () => {
-      return getSystemPrompt();
     }
   });
 }