@morphllm/morphsdk 0.2.60 → 0.2.63

package/dist/client.cjs

@@ -5,6 +5,9 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __commonJS = (cb, mod) => function __require() {
+  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -27,6 +30,15 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
+// node_modules/@vscode/ripgrep/lib/index.js
+var require_lib = __commonJS({
+  "node_modules/@vscode/ripgrep/lib/index.js"(exports2, module2) {
+    "use strict";
+    var path5 = require("path");
+    module2.exports.rgPath = path5.join(__dirname, `../bin/rg${process.platform === "win32" ? ".exe" : ""}`);
+  }
+});
+
 // client.ts
 var client_exports = {};
 __export(client_exports, {
@@ -1311,19 +1323,19 @@ function parseNestedXmlTools(text) {
         const filePath = getXmlElementText(fileContent, "path");
         const linesStr = getXmlElementText(fileContent, "lines");
         if (filePath && linesStr) {
-          const ranges = [];
-          for (const rangeStr of linesStr.split(",")) {
-            if (rangeStr.trim() === "*") {
-              ranges.push([1, 999999]);
-            } else {
+          if (linesStr.trim() === "*") {
+            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 });
+            if (ranges.length > 0) {
+              files.push({ path: filePath, lines: ranges });
+            }
           }
         }
       }
@@ -1335,33 +1347,9 @@ function parseNestedXmlTools(text) {
   return tools;
 }
 function preprocessText(text) {
-  let processed = text.replace(/<think>[\s\S]*?<\/think>/gi, "");
+  const processed = text.replace(/<think>[\s\S]*?<\/think>/gi, "").replace(/<\/?tool_call>/gi, "");
   const nestedTools = parseNestedXmlTools(processed);
-  const openingTagRegex = /<tool_call>|<tool>/gi;
-  const closingTagRegex = /<\/tool_call>|<\/tool>/gi;
-  const openingMatches = processed.match(openingTagRegex) || [];
-  const closingMatches = processed.match(closingTagRegex) || [];
-  if (openingMatches.length > closingMatches.length) {
-    const lastClosingMatch = /<\/tool_call>|<\/tool>/gi;
-    let lastClosingIndex = -1;
-    let match;
-    while ((match = lastClosingMatch.exec(processed)) !== null) {
-      lastClosingIndex = match.index + match[0].length;
-    }
-    if (lastClosingIndex > 0) {
-      processed = processed.slice(0, lastClosingIndex);
-    }
-  }
   const toolCallLines = [];
-  const toolTagRegex = /<tool_call>([\s\S]*?)<\/tool_call>|<tool>([\s\S]*?)<\/tool>/gi;
-  let tagMatch;
-  while ((tagMatch = toolTagRegex.exec(processed)) !== null) {
-    const content = (tagMatch[1] || tagMatch[2] || "").trim();
-    if (content) {
-      const lines = content.split(/\r?\n/).map((l) => l.trim()).filter((l) => l);
-      toolCallLines.push(...lines);
-    }
-  }
   const allLines = processed.split(/\r?\n/).map((l) => l.trim());
   for (const line of allLines) {
     if (!line) continue;
@@ -1578,13 +1566,18 @@ async function toolListDirectory(provider, args) {
 async function readFinishFiles(repoRoot, files, reader) {
   const out = [];
   for (const f of files) {
-    const ranges = mergeRanges(f.lines);
-    const chunks = [];
-    for (const [s, e] of ranges) {
-      const lines = await reader(f.path, s, e);
-      chunks.push(lines.join("\n"));
+    if (f.lines === "*") {
+      const lines = await reader(f.path);
+      out.push({ path: f.path, ranges: "*", content: lines.join("\n") });
+    } else {
+      const ranges = mergeRanges(f.lines);
+      const chunks = [];
+      for (const [s, e] of ranges) {
+        const lines = await reader(f.path, s, e);
+        chunks.push(lines.join("\n"));
+      }
+      out.push({ path: f.path, ranges, content: chunks.join("\n") });
     }
-    out.push({ path: f.path, ranges, content: chunks.join("\n") });
   }
   return out;
 }
@@ -1911,7 +1904,7 @@ async function runWarpGrep(config) {
   }
   const parts = ["Relevant context found:"];
   for (const f of finishMeta.files) {
-    const ranges = f.lines.map(([s, e]) => `${s}-${e}`).join(", ");
+    const ranges = f.lines === "*" ? "*" : f.lines.map(([s, e]) => `${s}-${e}`).join(", ");
     parts.push(`- ${f.path}: ${ranges}`);
   }
   const payload = parts.join("\n");
@@ -1950,9 +1943,20 @@ var import_path5 = __toESM(require("path"), 1);
 
 // tools/warp_grep/utils/ripgrep.ts
 var import_child_process = require("child_process");
-var import_ripgrep = require("@vscode/ripgrep");
 var resolvedRgPath = null;
 var rgPathChecked = false;
+var bundledRgPath = null;
+async function getBundledRgPath() {
+  if (bundledRgPath !== null) return bundledRgPath;
+  try {
+    const module2 = await Promise.resolve().then(() => __toESM(require_lib(), 1));
+    bundledRgPath = module2.rgPath;
+    return bundledRgPath;
+  } catch {
+    bundledRgPath = "";
+    return null;
+  }
+}
 function spawnRg(rgBinary, args, opts) {
   return new Promise((resolve2) => {
     const child = (0, import_child_process.spawn)(rgBinary, args, {
@@ -1983,11 +1987,14 @@ async function runRipgrep(args, opts) {
     return spawnRg(resolvedRgPath, args, opts);
   }
   if (!rgPathChecked) {
-    const result = await spawnRg(import_ripgrep.rgPath, args, opts);
-    if (!isBinaryFailure(result)) {
-      resolvedRgPath = import_ripgrep.rgPath;
-      rgPathChecked = true;
-      return result;
+    const bundledPath = await getBundledRgPath();
+    if (bundledPath) {
+      const result = await spawnRg(bundledPath, args, opts);
+      if (!isBinaryFailure(result)) {
+        resolvedRgPath = bundledPath;
+        rgPathChecked = true;
+        return result;
+      }
     }
     const fallbackResult = await spawnRg("rg", args, opts);
     if (!isBinaryFailure(fallbackResult)) {