@morphllm/morphsdk 0.2.115 → 0.2.117

package/dist/tools/warp_grep/index.js

@@ -18,11 +18,11 @@ import {
   executeToolCall,
   executeWarpGrep,
   formatResult
-} from "../../chunk-NTDAIKZI.js";
+} from "../../chunk-OVNPKTEG.js";
 import {
   runWarpGrep,
   runWarpGrepStreaming
-} from "../../chunk-RBTL6EJG.js";
+} from "../../chunk-RBOCP2MX.js";
 import {
   RemoteCommandsProvider
 } from "../../chunk-PUGSTXLO.js";

package/dist/tools/warp_grep/openai.cjs

@@ -1368,27 +1368,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();