@morphllm/morphsdk 0.2.81 → 0.2.83

package/dist/tools/warp_grep/agent/runner.js

@@ -1,11 +1,11 @@
 import {
   runWarpGrep
-} from "../../../chunk-B3UC7UVA.js";
-import "../../../chunk-467MCW5R.js";
+} from "../../../chunk-QOYI77CN.js";
+import "../../../chunk-P2O5JKE5.js";
 import "../../../chunk-APP75CBN.js";
 import "../../../chunk-5QRN3JNB.js";
 import "../../../chunk-FMLHRJDF.js";
-import "../../../chunk-XT5ZO6ES.js";
+import "../../../chunk-5PNMAWLC.js";
 import "../../../chunk-4VWJFZVS.js";
 import "../../../chunk-PZ5AY32C.js";
 export {

package/dist/tools/warp_grep/agent/types.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../tools/warp_grep/agent/types.ts"],"sourcesContent":["// Core types for morph-warp-grep agent\n\nexport type ChatMessage = {\n  role: 'system' | 'user' | 'assistant';\n  content: string;\n};\n\nexport type ToolName = 'list_directory' | 'grep' | 'read' | 'finish' | '_skip';\n\nexport type ToolCall = {\n  name: ToolName;\n  arguments?: Record<string, unknown>;\n};\n\nexport type FinishFileSpec = {\n  path: string;\n  lines: '*' | Array<[number, number]>;\n};\n\nexport type ResolvedContext = {\n  path: string;\n  ranges: '*' | Array<[number, number]>;\n  content: string;\n};\n\nexport type AgentFinish = {\n  files: FinishFileSpec[];\n};\n\nexport type ResolvedFile = {\n  path: string;\n  content: string;\n};\n\nexport type AgentRunResult = {\n  terminationReason: 'completed' | 'terminated' | 'error';\n  messages: ChatMessage[];\n  finish?: { \n    payload: string; \n    metadata?: AgentFinish;\n    resolved?: ResolvedFile[];\n  };\n  errors?: Array<{ message: string }>;\n};\n\nexport type SessionConfig = {\n  query: string;\n  model?: string;\n  repoRoot: string;\n  excludes?: string[];\n  includes?: string[];\n  debug?: boolean;\n  provider?: unknown; // late-bound to provider interface to avoid cycles\n  /** Morph API key (defaults to MORPH_API_KEY env var) */\n  morphApiKey?: string;\n  /** Morph API base URL */\n  morphApiUrl?: string;\n  /** Retry configuration */\n  retryConfig?: import('../../utils/resilience.js').RetryConfig;\n};\n\n\n"],"mappings":";;;;;;;;;;;;;;;;AAAA;AAAA;","names":[]}
+{"version":3,"sources":["../../../../tools/warp_grep/agent/types.ts"],"sourcesContent":["// Core types for morph-warp-grep agent\n\nexport type ChatMessage = {\n  role: 'system' | 'user' | 'assistant';\n  content: string;\n};\n\nexport type ToolName = 'list_directory' | 'grep' | 'read' | 'finish' | '_skip';\n\nexport type ToolCall = {\n  name: ToolName;\n  arguments?: Record<string, unknown>;\n};\n\nexport type FinishFileSpec = {\n  path: string;\n  lines: '*' | Array<[number, number]>;\n};\n\nexport type ResolvedContext = {\n  path: string;\n  ranges: '*' | Array<[number, number]>;\n  content: string;\n};\n\nexport type AgentFinish = {\n  files: FinishFileSpec[];\n};\n\nexport type ResolvedFile = {\n  path: string;\n  content: string;\n};\n\nexport type WarpGrepTurnMetrics = {\n  turn: number;\n  morph_api_ms: number;\n  local_tools_ms: number;\n};\n\nexport type WarpGrepExecutionMetrics = {\n  total_ms: number;\n  timeout_ms: number;\n  initial_state_ms: number;\n  turns: WarpGrepTurnMetrics[];\n  finish_resolution_ms?: number;\n};\n\nexport type AgentRunResult = {\n  terminationReason: 'completed' | 'terminated' | 'error';\n  messages: ChatMessage[];\n  finish?: { \n    payload: string; \n    metadata?: AgentFinish;\n    resolved?: ResolvedFile[];\n  };\n  errors?: Array<{ message: string }>;\n  timings?: WarpGrepExecutionMetrics;\n};\n\nexport type SessionConfig = {\n  query: string;\n  model?: string;\n  repoRoot: string;\n  excludes?: string[];\n  includes?: string[];\n  debug?: boolean;\n  provider?: unknown; // late-bound to provider interface to avoid cycles\n  /** Morph API key (defaults to MORPH_API_KEY env var) */\n  morphApiKey?: string;\n  /** Morph API base URL */\n  morphApiUrl?: string;\n  /** Retry configuration */\n  retryConfig?: import('../../utils/resilience.js').RetryConfig;\n  /** Timeout for model calls in ms (defaults to MORPH_WARP_GREP_TIMEOUT env var, then 30000) */\n  timeout?: number;\n};\n\n\n"],"mappings":";;;;;;;;;;;;;;;;AAAA;AAAA;","names":[]}

package/dist/tools/warp_grep/agent/types.d.ts

@@ -25,6 +25,18 @@ type ResolvedFile = {
     path: string;
     content: string;
 };
+type WarpGrepTurnMetrics = {
+    turn: number;
+    morph_api_ms: number;
+    local_tools_ms: number;
+};
+type WarpGrepExecutionMetrics = {
+    total_ms: number;
+    timeout_ms: number;
+    initial_state_ms: number;
+    turns: WarpGrepTurnMetrics[];
+    finish_resolution_ms?: number;
+};
 type AgentRunResult = {
     terminationReason: 'completed' | 'terminated' | 'error';
     messages: ChatMessage[];
@@ -36,6 +48,7 @@ type AgentRunResult = {
     errors?: Array<{
         message: string;
     }>;
+    timings?: WarpGrepExecutionMetrics;
 };
 type SessionConfig = {
     query: string;
@@ -51,6 +64,8 @@ type SessionConfig = {
     morphApiUrl?: string;
     /** Retry configuration */
     retryConfig?: RetryConfig;
+    /** Timeout for model calls in ms (defaults to MORPH_WARP_GREP_TIMEOUT env var, then 30000) */
+    timeout?: number;
 };
 
-export type { AgentFinish, AgentRunResult, ChatMessage, FinishFileSpec, ResolvedContext, ResolvedFile, SessionConfig, ToolCall, ToolName };
+export type { AgentFinish, AgentRunResult, ChatMessage, FinishFileSpec, ResolvedContext, ResolvedFile, SessionConfig, ToolCall, ToolName, WarpGrepExecutionMetrics, WarpGrepTurnMetrics };

package/dist/tools/warp_grep/anthropic.cjs

@@ -39,9 +39,15 @@ __export(anthropic_exports, {
 module.exports = __toCommonJS(anthropic_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,
@@ -983,7 +989,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(
@@ -1001,10 +1008,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;
@@ -1013,21 +1025,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");
@@ -1068,7 +1088,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);
     }
@@ -1077,6 +1099,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 ?? [];
@@ -1086,7 +1109,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) {
@@ -1094,6 +1118,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,
@@ -1113,13 +1138,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
   };
 }
 
@@ -1716,7 +1744,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) {