@morphllm/morphsdk 0.2.81 → 0.2.83

package/dist/tools/warp_grep/client.js

@@ -3,18 +3,18 @@ import {
   executeToolCall,
   executeWarpGrep,
   formatResult
-} from "../../chunk-4VMIPD4G.js";
-import "../../chunk-B3UC7UVA.js";
-import "../../chunk-PHJQ4N3T.js";
-import "../../chunk-467MCW5R.js";
+} from "../../chunk-HRK53IKL.js";
+import "../../chunk-QOYI77CN.js";
+import "../../chunk-PUGSTXLO.js";
+import "../../chunk-P2O5JKE5.js";
 import "../../chunk-APP75CBN.js";
 import "../../chunk-5QRN3JNB.js";
 import "../../chunk-FMLHRJDF.js";
-import "../../chunk-4NI25AKV.js";
+import "../../chunk-4KMBU6T3.js";
 import "../../chunk-G2RSY56Q.js";
 import "../../chunk-YPKNMYD4.js";
 import "../../chunk-TPP2UGQP.js";
-import "../../chunk-XT5ZO6ES.js";
+import "../../chunk-5PNMAWLC.js";
 import "../../chunk-4VWJFZVS.js";
 import "../../chunk-PZ5AY32C.js";
 export {

package/dist/tools/warp_grep/gemini.cjs

@@ -41,9 +41,15 @@ __export(gemini_exports, {
 module.exports = __toCommonJS(gemini_exports);
 
 // 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,
@@ -985,7 +991,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(
@@ -1003,10 +1010,15 @@ async function callModel(messages, model, options = {}) {
   return content;
 }
 async function runWarpGrep(config) {
+  const totalStart = Date.now();
+  const timeoutMs = config.timeout ?? AGENT_CONFIG.TIMEOUT_MS;
+  const timings = { turns: [], timeout_ms: timeoutMs };
   const repoRoot = import_path2.default.resolve(config.repoRoot || process.cwd());
   const messages = [];
   messages.push({ role: "system", content: getSystemPrompt() });
+  const initialStateStart = Date.now();
   const initialState = await buildInitialState(repoRoot, config.query, config.provider);
+  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;
@@ -1015,21 +1027,29 @@ async function runWarpGrep(config) {
   let finishMeta;
   let terminationReason = "terminated";
   for (let turn = 1; turn <= maxTurns; turn += 1) {
+    const turnMetrics = { turn, morph_api_ms: 0, local_tools_ms: 0 };
     enforceContextLimit(messages);
+    const modelCallStart = Date.now();
     const assistantContent = await callModel(messages, model, {
       morphApiKey: config.morphApiKey,
       morphApiUrl: config.morphApiUrl,
-      retryConfig: config.retryConfig
+      retryConfig: config.retryConfig,
+      timeout: timeoutMs
     }).catch((e) => {
       errors.push({ message: e instanceof Error ? e.message : String(e) });
       return "";
     });
-    if (!assistantContent) break;
+    turnMetrics.morph_api_ms = Date.now() - modelCallStart;
+    if (!assistantContent) {
+      timings.turns.push(turnMetrics);
+      break;
+    }
     messages.push({ role: "assistant", content: assistantContent });
     const toolCalls = parser.parse(assistantContent);
     if (toolCalls.length === 0) {
       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);
       break;
     }
     const finishCalls = toolCalls.filter((c) => c.name === "finish");
@@ -1070,7 +1090,9 @@ async function runWarpGrep(config) {
         )
       );
     }
+    const toolExecStart = Date.now();
     const allResults = await Promise.all(allPromises);
+    turnMetrics.local_tools_ms = Date.now() - toolExecStart;
     for (const result of allResults) {
       formatted.push(result);
     }
@@ -1079,6 +1101,7 @@ async function runWarpGrep(config) {
       const contextBudget = calculateContextBudget(messages);
       messages.push({ role: "user", content: formatted.join("\n") + turnMessage + "\n" + contextBudget });
     }
+    timings.turns.push(turnMetrics);
     if (finishCalls.length) {
       const fc = finishCalls[0];
       const files = fc.arguments?.files ?? [];
@@ -1088,7 +1111,8 @@ async function runWarpGrep(config) {
     }
   }
   if (terminationReason !== "completed" || !finishMeta) {
-    return { terminationReason, messages, errors };
+    timings.total_ms = Date.now() - totalStart;
+    return { terminationReason, messages, errors, timings };
   }
   const parts = ["Relevant context found:"];
   for (const f of finishMeta.files) {
@@ -1096,6 +1120,7 @@ async function runWarpGrep(config) {
     parts.push(`- ${f.path}: ${ranges}`);
   }
   const payload = parts.join("\n");
+  const finishResolutionStart = Date.now();
   const fileReadErrors = [];
   const resolved = await readFinishFiles(
     repoRoot,
@@ -1115,13 +1140,16 @@ async function runWarpGrep(config) {
       }
     }
   );
+  timings.finish_resolution_ms = Date.now() - finishResolutionStart;
   if (fileReadErrors.length > 0) {
     errors.push(...fileReadErrors.map((e) => ({ message: `File read error: ${e.path} - ${e.error}` })));
   }
+  timings.total_ms = Date.now() - totalStart;
   return {
     terminationReason: "completed",
     messages,
-    finish: { payload, metadata: finishMeta, resolved }
+    finish: { payload, metadata: finishMeta, resolved },
+    timings
   };
 }
 
@@ -1718,7 +1746,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) {