@morphllm/morphsdk 0.2.114 → 0.2.116

package/dist/tools/warp_grep/anthropic.js

@@ -2,12 +2,12 @@ import {
   createWarpGrepTool,
   execute,
   warpGrepTool
-} from "../../chunk-ALTKGCG5.js";
+} from "../../chunk-5JARN2NG.js";
 import "../../chunk-KW7OEGZK.js";
 import {
   formatResult
-} from "../../chunk-23R562QJ.js";
-import "../../chunk-YY7NZLAI.js";
+} from "../../chunk-OVNPKTEG.js";
+import "../../chunk-RBOCP2MX.js";
 import "../../chunk-PUGSTXLO.js";
 import "../../chunk-3MLWXJTJ.js";
 import "../../chunk-SNGGSPYJ.js";

package/dist/tools/warp_grep/client.cjs

@@ -569,6 +569,7 @@ var client_exports = {};
 __export(client_exports, {
   WarpGrepClient: () => WarpGrepClient,
   executeToolCall: () => executeToolCall,
+  executeToolCallStreaming: () => executeToolCallStreaming,
   executeWarpGrep: () => executeWarpGrep,
   formatResult: () => formatResult
 });
@@ -1366,27 +1367,41 @@ async function callModel(messages, model, options = {}) {
     maxRetries: options.retryConfig?.maxRetries,
     timeout: timeoutMs
   });
-  let data;
-  try {
-    data = await client.chat.completions.create({
-      model,
-      temperature: 0,
-      max_tokens: 1024,
-      messages
-    });
-  } catch (error) {
-    if (error instanceof import_openai.default.APIError && error.status === 404) {
+  const MAX_EMPTY_RETRIES = 1;
+  for (let attempt = 0; attempt <= MAX_EMPTY_RETRIES; attempt++) {
+    let data;
+    try {
+      data = await client.chat.completions.create({
+        model,
+        temperature: 0,
+        max_tokens: 1024,
+        messages
+      });
+    } catch (error) {
+      if (error instanceof import_openai.default.APIError && error.status === 404) {
+        throw new Error(
+          "The endpoint you are trying to call is likely deprecated. Please update with: npm cache clean --force && npx -y @morphllm/morphmcp@latest or visit: https://morphllm.com/mcp"
+        );
+      }
+      throw error;
+    }
+    const choice = data?.choices?.[0];
+    const content = choice?.message?.content;
+    if (content && typeof content === "string") {
+      return content;
+    }
+    if (attempt === MAX_EMPTY_RETRIES) {
+      const finishReason = choice?.finish_reason ?? "unknown";
+      const hasToolCalls = Array.isArray(choice?.message?.tool_calls) && choice.message.tool_calls.length > 0;
+      const choicesLen = data?.choices?.length ?? 0;
+      const contentType = content === null ? "null" : content === void 0 ? "undefined" : typeof content;
       throw new Error(
-        "The endpoint you are trying to call is likely deprecated. Please update with: npm cache clean --force && npx -y @morphllm/morphmcp@latest or visit: https://morphllm.com/mcp"
+        `Invalid response from model: content=${contentType}, finish_reason=${finishReason}, has_tool_calls=${hasToolCalls}, choices_length=${choicesLen}`
       );
     }
-    throw error;
-  }
-  const content = data?.choices?.[0]?.message?.content;
-  if (!content || typeof content !== "string") {
-    throw new Error("Invalid response from model");
+    await new Promise((resolve) => setTimeout(resolve, 200));
   }
-  return content;
+  throw new Error("Invalid response from model");
 }
 async function runWarpGrep(config) {
   const totalStart = Date.now();
@@ -1415,17 +1430,21 @@ async function runWarpGrep(config) {
       retryConfig: config.retryConfig,
       timeout: timeoutMs
     }).catch((e) => {
-      errors.push({ message: e instanceof Error ? e.message : String(e) });
+      const errMsg = e instanceof Error ? e.message : String(e);
+      console.error(`[warp_grep] Morph API call failed on turn ${turn}:`, errMsg);
+      errors.push({ message: errMsg });
       return "";
     });
     turnMetrics.morph_api_ms = Date.now() - modelCallStart;
     if (!assistantContent) {
+      console.error(`[warp_grep] Empty response from Morph API on turn ${turn}. Errors so far:`, errors);
       timings.turns.push(turnMetrics);
       break;
     }
     messages.push({ role: "assistant", content: assistantContent });
     const toolCalls = parser.parse(assistantContent);
     if (toolCalls.length === 0) {
+      console.error(`[warp_grep] No tool calls parsed on turn ${turn}. Assistant content (first 500 chars):`, assistantContent.slice(0, 500));
       errors.push({ message: "No tool calls produced by the model. Your MCP is likely out of date! Update it by running: rm -rf ~/.npm/_npx && npm cache clean --force && npx -y @morphllm/morphmcp@latest" });
       terminationReason = "terminated";
       timings.turns.push(turnMetrics);
@@ -1558,17 +1577,21 @@ async function* runWarpGrepStreaming(config) {
       retryConfig: config.retryConfig,
       timeout: timeoutMs
     }).catch((e) => {
-      errors.push({ message: e instanceof Error ? e.message : String(e) });
+      const errMsg = e instanceof Error ? e.message : String(e);
+      console.error(`[warp_grep:stream] Morph API call failed on turn ${turn}:`, errMsg);
+      errors.push({ message: errMsg });
       return "";
     });
     turnMetrics.morph_api_ms = Date.now() - modelCallStart;
     if (!assistantContent) {
+      console.error(`[warp_grep:stream] Empty response from Morph API on turn ${turn}. Errors so far:`, errors);
       timings.turns.push(turnMetrics);
       break;
     }
     messages.push({ role: "assistant", content: assistantContent });
     const toolCalls = parser.parse(assistantContent);
     if (toolCalls.length === 0) {
+      console.error(`[warp_grep:stream] No tool calls parsed on turn ${turn}. Assistant content (first 500 chars):`, assistantContent.slice(0, 500));
       errors.push({ message: "No tool calls produced by the model. Your MCP is likely out of date! Update it by running: rm -rf ~/.npm/_npx && npm cache clean --force && npx -y @morphllm/morphmcp@latest" });
       terminationReason = "terminated";
       timings.turns.push(turnMetrics);
@@ -1922,7 +1945,9 @@ async function executeToolCall(input, config) {
   });
   const finish = result.finish;
   if (result.terminationReason !== "completed" || !finish?.metadata) {
-    return { success: false, error: "Search did not complete" };
+    const errorDetails = result.errors?.map((e) => e.message).join("; ") || "unknown reason";
+    console.error(`[warp_grep] executeToolCall failed. Reason: ${result.terminationReason}. Errors: ${errorDetails}. Turns: ${result.timings?.turns?.length ?? 0}`);
+    return { success: false, error: `Search did not complete: ${errorDetails}` };
   }
   const contexts = (finish.resolved ?? []).map((r) => ({
     file: r.path,
@@ -1934,7 +1959,9 @@ async function executeToolCall(input, config) {
 function processAgentResult(result) {
   const finish = result.finish;
   if (result.terminationReason !== "completed" || !finish?.metadata) {
-    return { success: false, error: "Search did not complete" };
+    const errorDetails = result.errors?.map((e) => e.message).join("; ") || "unknown reason";
+    console.error(`[warp_grep] processAgentResult failed. Reason: ${result.terminationReason}. Errors: ${errorDetails}. Turns: ${result.timings?.turns?.length ?? 0}`);
+    return { success: false, error: `Search did not complete: ${errorDetails}` };
   }
   const contexts = (finish.resolved ?? []).map((r) => ({
     file: r.path,
@@ -1997,6 +2024,7 @@ function formatResult(result) {
 0 && (module.exports = {
   WarpGrepClient,
   executeToolCall,
+  executeToolCallStreaming,
   executeWarpGrep,
   formatResult
 });