@morphllm/morphsdk 0.2.80 → 0.2.82

package/dist/tools/warp_grep/index.cjs

@@ -53,9 +53,15 @@ module.exports = __toCommonJS(warp_grep_exports);
 var import_zod = require("zod");
 
 // tools/warp_grep/agent/config.ts
+var parseEnvTimeout = (envValue, defaultMs) => {
+  if (!envValue) return defaultMs;
+  const parsed = parseInt(envValue, 10);
+  return isNaN(parsed) || parsed <= 0 ? defaultMs : parsed;
+};
 var AGENT_CONFIG = {
   MAX_TURNS: 4,
-  TIMEOUT_MS: 3e4,
+  /** Default timeout for model calls. Can be overridden via MORPH_WARP_GREP_TIMEOUT env var (in ms) */
+  TIMEOUT_MS: parseEnvTimeout(process.env.MORPH_WARP_GREP_TIMEOUT, 3e4),
   MAX_CONTEXT_CHARS: 54e4,
   MAX_OUTPUT_LINES: 200,
   MAX_READ_LINES: 800,
@@ -621,10 +627,25 @@ async function toolGrep(provider, args) {
 }
 
 // tools/warp_grep/agent/tools/read.ts
+function isValidRange(start, end) {
+  return typeof start === "number" && typeof end === "number" && Number.isFinite(start) && Number.isFinite(end) && start > 0 && end >= start;
+}
 async function toolRead(provider, args) {
-  if (args.lines && args.lines.length > 0) {
+  if (args.lines && Array.isArray(args.lines) && args.lines.length > 0) {
+    const validRanges = [];
+    for (const range of args.lines) {
+      if (Array.isArray(range) && range.length >= 2 && isValidRange(range[0], range[1])) {
+        validRanges.push([range[0], range[1]]);
+      }
+    }
+    if (validRanges.length === 0) {
+      const res2 = await provider.read({ path: args.path });
+      if (res2.error) return res2.error;
+      if (!res2.lines.length) return "(empty file)";
+      return res2.lines.join("\n");
+    }
     const chunks = [];
-    for (const [start, end] of args.lines) {
+    for (const [start, end] of validRanges) {
       const res2 = await provider.read({ path: args.path, start, end });
       if (res2.error) return res2.error;
       chunks.push(res2.lines.join("\n"));
@@ -660,23 +681,36 @@ async function toolListDirectory(provider, args) {
 }
 
 // tools/warp_grep/agent/tools/finish.ts
+function isValidRange2(range) {
+  return Array.isArray(range) && range.length >= 2 && typeof range[0] === "number" && typeof range[1] === "number" && Number.isFinite(range[0]) && Number.isFinite(range[1]) && range[0] > 0 && range[1] >= range[0];
+}
+function extractValidRanges(lines) {
+  if (!Array.isArray(lines)) return null;
+  const valid = [];
+  for (const range of lines) {
+    if (isValidRange2(range)) {
+      valid.push([range[0], range[1]]);
+    }
+  }
+  return valid.length > 0 ? valid : null;
+}
 function normalizeFinishFiles(files) {
   return files.map((f) => {
-    if (f.lines === "*") {
-      return { path: f.path, lines: "*" };
-    }
-    const merged = mergeRanges(f.lines);
-    return { path: f.path, lines: merged };
+    if (f.lines === "*") return { path: f.path, lines: "*" };
+    const validRanges = extractValidRanges(f.lines);
+    if (!validRanges) return { path: f.path, lines: "*" };
+    return { path: f.path, lines: mergeRanges(validRanges) };
   });
 }
 async function readFinishFiles(repoRoot, files, reader) {
   const out = [];
   for (const f of files) {
-    if (f.lines === "*") {
+    const validRanges = f.lines === "*" ? null : extractValidRanges(f.lines);
+    if (f.lines === "*" || !validRanges) {
       const lines = await reader(f.path);
       out.push({ path: f.path, ranges: "*", content: lines.join("\n") });
     } else {
-      const ranges = mergeRanges(f.lines);
+      const ranges = mergeRanges(validRanges);
       const chunks = [];
       for (const [s, e] of ranges) {
         const lines = await reader(f.path, s, e);
@@ -977,7 +1011,8 @@ async function callModel(messages, model, options = {}) {
     },
     options.retryConfig
   );
-  const resp = await withTimeout(fetchPromise, AGENT_CONFIG.TIMEOUT_MS, "morph-warp-grep request timed out");
+  const timeoutMs = options.timeout ?? AGENT_CONFIG.TIMEOUT_MS;
+  const resp = await withTimeout(fetchPromise, timeoutMs, "morph-warp-grep request timed out");
   if (!resp.ok) {
     if (resp.status === 404) {
       throw new Error(
@@ -1011,7 +1046,8 @@ async function runWarpGrep(config) {
     const assistantContent = await callModel(messages, model, {
       morphApiKey: config.morphApiKey,
       morphApiUrl: config.morphApiUrl,
-      retryConfig: config.retryConfig
+      retryConfig: config.retryConfig,
+      timeout: config.timeout
     }).catch((e) => {
       errors.push({ message: e instanceof Error ? e.message : String(e) });
       return "";
@@ -1084,7 +1120,7 @@ async function runWarpGrep(config) {
   }
   const parts = ["Relevant context found:"];
   for (const f of finishMeta.files) {
-    const ranges = f.lines === "*" ? "*" : f.lines.map(([s, e]) => `${s}-${e}`).join(", ");
+    const ranges = f.lines === "*" ? "*" : Array.isArray(f.lines) ? f.lines.map(([s, e]) => `${s}-${e}`).join(", ") : "*";
     parts.push(`- ${f.path}: ${ranges}`);
   }
   const payload = parts.join("\n");
@@ -1444,11 +1480,19 @@ Details: ${res.stderr}` : ""}`
       };
     }
     const total = lines.length;
-    let s = params.start ?? 1;
-    let e = Math.min(params.end ?? total, total);
-    if (s > total && total > 0) {
-      s = 1;
-      e = total;
+    const rawStart = params.start;
+    const rawEnd = params.end;
+    let s = 1;
+    let e = total;
+    const startValid = rawStart === void 0 || Number.isFinite(rawStart) && rawStart > 0;
+    const endValid = rawEnd === void 0 || Number.isFinite(rawEnd) && rawEnd > 0;
+    if (startValid && endValid) {
+      s = rawStart ?? 1;
+      e = Math.min(rawEnd ?? total, total);
+      if (s > total && total > 0 || s > e) {
+        s = 1;
+        e = total;
+      }
     }
     const out = [];
     for (let i = s; i <= e; i += 1) {
@@ -1624,8 +1668,13 @@ var RemoteCommandsProvider = class {
    * Read file and add line numbers
    */
   async read(params) {
-    const start = params.start ?? 1;
-    const end = params.end ?? 1e6;
+    const rawStart = params.start;
+    const rawEnd = params.end;
+    const startValid = rawStart === void 0 || Number.isFinite(rawStart) && rawStart > 0;
+    const endValid = rawEnd === void 0 || Number.isFinite(rawEnd) && rawEnd > 0;
+    const rangeValid = startValid && endValid && (rawStart === void 0 || rawEnd === void 0 || rawStart <= rawEnd);
+    const start = rangeValid && rawStart !== void 0 ? rawStart : 1;
+    const end = rangeValid && rawEnd !== void 0 ? rawEnd : 1e6;
     try {
       const stdout = await this.commands.read(params.path, start, end);
       const contentLines = (stdout || "").split("\n");
@@ -1729,7 +1778,8 @@ var WarpGrepClient = class {
         debug: input.debug ?? this.config.debug,
         morphApiKey: this.config.morphApiKey,
         morphApiUrl: this.config.morphApiUrl,
-        retryConfig: this.config.retryConfig
+        retryConfig: this.config.retryConfig,
+        timeout: this.config.timeout
       }
     );
   }
@@ -1750,7 +1800,8 @@ async function executeToolCall(input, config) {
     debug: config.debug ?? false,
     morphApiKey: config.morphApiKey,
     morphApiUrl: config.morphApiUrl,
-    retryConfig: config.retryConfig
+    retryConfig: config.retryConfig,
+    timeout: config.timeout
   });
   const finish = result.finish;
   if (result.terminationReason !== "completed" || !finish?.metadata) {