@morphllm/morphsdk 0.2.153 → 0.2.155

package/dist/client.cjs

@@ -36,7 +36,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@morphllm/morphsdk",
-      version: "0.2.153",
+      version: "0.2.155",
       description: "TypeScript SDK and CLI for Morph Fast Apply integration",
       type: "module",
       main: "./dist/index.cjs",
@@ -367,10 +367,11 @@ async function applyEdit(input, config = {}) {
     if (debug) {
       console.log(`[FastApply] Applying edit to code (${input.originalCode.length} chars)`);
     }
+    const instruction = input.instruction ?? input.instructions ?? "";
     const { content: mergedCode, completionId } = await callMorphAPI(
       input.originalCode,
       input.codeEdit,
-      input.instructions,
+      instruction,
       filepath,
       config
     );
@@ -1084,7 +1085,8 @@ async function executeEditFile(input, config = {}) {
       }
       if (debug) console.log(`[FastApply] File doesn't exist, will create new file`);
     }
-    const { content: mergedCode, completionId } = await callMorphAPI2(originalCode, input.code_edit, input.instructions, input.target_filepath, config);
+    const instruction = input.instruction ?? input.instructions ?? "";
+    const { content: mergedCode, completionId } = await callMorphAPI2(originalCode, input.code_edit, instruction, input.target_filepath, config);
     const udiff = config.generateUdiff !== false ? generateUdiff2(originalCode, mergedCode, input.target_filepath) : void 0;
     if (config.autoWrite !== false) {
       await writeFile(fullPath, mergedCode, "utf-8");
@@ -3463,6 +3465,131 @@ function parseGitHubUrl(input) {
   );
 }
 
+// tools/compact/core.ts
+var DEFAULT_API_URL4 = "https://api.morphllm.com";
+var DEFAULT_TIMEOUT2 = 12e4;
+var CompactClient = class {
+  config;
+  constructor(config = {}) {
+    this.config = {
+      ...config,
+      morphApiUrl: config.morphApiUrl ?? DEFAULT_API_URL4,
+      timeout: config.timeout ?? DEFAULT_TIMEOUT2
+    };
+  }
+  /**
+   * Compact messages or text via /v1/compact.
+   * Returns per-message `compacted_line_ranges` showing which lines were removed.
+   *
+   * @example
+   * ```typescript
+   * const client = new CompactClient({ morphApiKey: 'sk-...' });
+   * const result = await client.compact({
+   *   input: codeFile,
+   *   query: "authentication",
+   *   compressionRatio: 0.5,
+   * });
+   * console.log(result.output);
+   * ```
+   */
+  async compact(input) {
+    const apiKey = this.config.morphApiKey || (typeof process !== "undefined" ? process.env?.MORPH_API_KEY : void 0);
+    const debug = this.config.debug || false;
+    if (!apiKey) {
+      throw new Error(
+        "Morph API key not found. Set MORPH_API_KEY environment variable or pass morphApiKey in config."
+      );
+    }
+    const url = `${this.config.morphApiUrl}/v1/compact`;
+    if (debug) {
+      console.log(`[Compact] Calling ${url}`);
+    }
+    const body = {
+      compression_ratio: input.compressionRatio ?? 0.5,
+      preserve_recent: input.preserveRecent ?? 2,
+      model: input.model ?? "morph-compactor",
+      include_line_ranges: input.includeLineRanges ?? true,
+      include_markers: input.includeMarkers ?? true
+    };
+    if (input.query !== void 0) {
+      body.query = input.query;
+    }
+    if (input.messages) {
+      body.messages = input.messages;
+    } else if (typeof input.input === "string") {
+      body.input = input.input;
+    } else if (Array.isArray(input.input)) {
+      body.messages = input.input;
+    } else {
+      throw new Error("Either 'input' or 'messages' must be provided");
+    }
+    const startTime = Date.now();
+    const response = await fetch(url, {
+      method: "POST",
+      headers: {
+        "Authorization": `Bearer ${apiKey}`,
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify(body),
+      signal: AbortSignal.timeout(this.config.timeout)
+    });
+    if (!response.ok) {
+      const text = await response.text();
+      throw new Error(`Compact API error ${response.status}: ${text}`);
+    }
+    const data = await response.json();
+    if (debug) {
+      console.log(`[Compact] compact() done in ${Date.now() - startTime}ms`);
+    }
+    return data;
+  }
+};
+
+// tools/compact/utils.ts
+async function compactFileContexts(files, query, apiKey, apiUrl, maxTokens = 1e4, maxConcurrency = 3) {
+  const totalLength = files.reduce((sum, file) => sum + file.content.length, 0);
+  const estimatedTokens = totalLength / 3;
+  if (estimatedTokens <= maxTokens) {
+    return files;
+  }
+  let compressionRatio = maxTokens / estimatedTokens;
+  compressionRatio = Math.max(0.3, Math.min(0.99, compressionRatio));
+  const client = new CompactClient({
+    morphApiKey: apiKey,
+    morphApiUrl: apiUrl
+  });
+  const results = [];
+  const inProgress = /* @__PURE__ */ new Set();
+  for (const file of files) {
+    if (file.content.length < 500) {
+      results.push({ path: file.path, content: file.content });
+      continue;
+    }
+    const task = async () => {
+      try {
+        const result = await client.compact({
+          input: file.content,
+          query,
+          compressionRatio,
+          preserveRecent: 0
+        });
+        results.push({ path: file.path, content: result.output });
+      } catch (error) {
+        console.error(`[compactFileContexts] Failed to compact file ${file.path}:`, error);
+        results.push({ path: file.path, content: file.content });
+      }
+    };
+    const promise = task().finally(() => inProgress.delete(promise));
+    inProgress.add(promise);
+    if (inProgress.size >= maxConcurrency) {
+      await Promise.race(inProgress);
+    }
+  }
+  await Promise.all(inProgress);
+  const orderMap = new Map(files.map((f, i) => [f.path, i]));
+  return results.sort((a, b) => (orderMap.get(a.path) ?? 0) - (orderMap.get(b.path) ?? 0));
+}
+
 // tools/warp_grep/client.ts
 var DEFAULT_CODE_SEARCH_URL = "https://morphllm.com";
 async function getLocalProvider(repoRoot, excludes, allowNames) {
@@ -3585,20 +3712,9 @@ async function executeToolCall(input, config) {
     timeout: config.timeout,
     search_type: config.search_type
   });
-  const finish = result.finish;
-  if (result.terminationReason !== "completed" || !finish?.metadata) {
-    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,
-    content: r.content,
-    lines: r.ranges
-  }));
-  return { success: true, contexts, summary: finish.payload };
+  return processAgentResult(result, parsed.search_term, config.morphApiKey, config.morphApiUrl);
 }
-function processAgentResult(result) {
+async function processAgentResult(result, searchTerm, apiKey, apiUrl) {
   const finish = result.finish;
   if (result.terminationReason !== "completed" || !finish?.metadata) {
     const errorDetails = result.errors?.map((e) => e.message).join("; ") || "unknown reason";
@@ -3610,6 +3726,15 @@ function processAgentResult(result) {
     content: r.content,
     lines: r.ranges
   }));
+  try {
+    const compactable = contexts.map((c) => ({ path: c.file, content: c.content }));
+    const compacted = await compactFileContexts(compactable, searchTerm, apiKey, apiUrl);
+    for (let i = 0; i < contexts.length; i++) {
+      contexts[i].content = compacted[i].content;
+    }
+  } catch (error) {
+    console.error(`[warp_grep] Failed to compact result contexts:`, error);
+  }
   return { success: true, contexts, summary: finish.payload };
 }
 async function* executeToolCallStreaming(input, config) {
@@ -3638,7 +3763,7 @@ async function* executeToolCallStreaming(input, config) {
     }
     yield value;
   }
-  return processAgentResult(agentResult);
+  return processAgentResult(agentResult, parsed.search_term, config.morphApiKey, config.morphApiUrl);
 }
 async function fetchRawGitHubFile(owner, repo, filePath, branch, timeout) {
   const branches = branch ? [branch] : ["HEAD"];
@@ -3746,7 +3871,7 @@ var PermissionError = class extends GitHubError {
 
 // tools/github/core.ts
 var DEFAULT_BASE_URL = "https://api.morphllm.com";
-var DEFAULT_TIMEOUT2 = 3e4;
+var DEFAULT_TIMEOUT3 = 3e4;
 var GitHubClient = class {
   apiKey;
   baseUrl;
@@ -3777,7 +3902,7 @@ var GitHubClient = class {
   constructor(config = {}) {
     this.apiKey = config.apiKey || process.env.MORPH_API_KEY || "";
     this.baseUrl = config.baseUrl || DEFAULT_BASE_URL;
-    this.timeout = config.timeout || DEFAULT_TIMEOUT2;
+    this.timeout = config.timeout || DEFAULT_TIMEOUT3;
     this.debug = config.debug || false;
     this.defaultInstallationId = config.installationId;
     if (!this.apiKey) {
@@ -4609,86 +4734,6 @@ var MorphGit = class {
 var import_isomorphic_git2 = __toESM(require("isomorphic-git"), 1);
 var import_node2 = __toESM(require("isomorphic-git/http/node"), 1);
 
-// tools/compact/core.ts
-var DEFAULT_API_URL4 = "http://192.222.56.183:8811";
-var DEFAULT_TIMEOUT3 = 12e4;
-var CompactClient = class {
-  config;
-  constructor(config = {}) {
-    this.config = {
-      ...config,
-      morphApiUrl: config.morphApiUrl ?? DEFAULT_API_URL4,
-      timeout: config.timeout ?? DEFAULT_TIMEOUT3
-    };
-  }
-  /**
-   * Compact messages or text via /v1/compact.
-   * Returns per-message `compacted_line_ranges` showing which lines were removed.
-   *
-   * @example
-   * ```typescript
-   * const client = new CompactClient({ morphApiKey: 'sk-...' });
-   * const result = await client.compact({
-   *   input: codeFile,
-   *   query: "authentication",
-   *   compressionRatio: 0.5,
-   * });
-   * console.log(result.output);
-   * ```
-   */
-  async compact(input) {
-    const apiKey = this.config.morphApiKey || (typeof process !== "undefined" ? process.env?.MORPH_API_KEY : void 0);
-    const debug = this.config.debug || false;
-    if (!apiKey) {
-      throw new Error(
-        "Morph API key not found. Set MORPH_API_KEY environment variable or pass morphApiKey in config."
-      );
-    }
-    const url = `${this.config.morphApiUrl}/v1/compact`;
-    if (debug) {
-      console.log(`[Compact] Calling ${url}`);
-    }
-    const body = {
-      compression_ratio: input.compressionRatio ?? 0.5,
-      preserve_recent: input.preserveRecent ?? 2,
-      model: input.model ?? "morph-compactor",
-      include_line_ranges: input.includeLineRanges ?? true,
-      include_markers: input.includeMarkers ?? true
-    };
-    if (input.query !== void 0) {
-      body.query = input.query;
-    }
-    if (input.messages) {
-      body.messages = input.messages;
-    } else if (typeof input.input === "string") {
-      body.input = input.input;
-    } else if (Array.isArray(input.input)) {
-      body.messages = input.input;
-    } else {
-      throw new Error("Either 'input' or 'messages' must be provided");
-    }
-    const startTime = Date.now();
-    const response = await fetch(url, {
-      method: "POST",
-      headers: {
-        "Authorization": `Bearer ${apiKey}`,
-        "Content-Type": "application/json"
-      },
-      body: JSON.stringify(body),
-      signal: AbortSignal.timeout(this.config.timeout)
-    });
-    if (!response.ok) {
-      const text = await response.text();
-      throw new Error(`Compact API error ${response.status}: ${text}`);
-    }
-    const data = await response.json();
-    if (debug) {
-      console.log(`[Compact] compact() done in ${Date.now() - startTime}ms`);
-    }
-    return data;
-  }
-};
-
 // modelrouter/core.ts
 var DEFAULT_CONFIG3 = {
   apiUrl: "https://api.morphllm.com",
@@ -5110,7 +5155,7 @@ var editFileTool = {
           type: "string",
           description: "The path of the target file to modify"
         },
-        instructions: {
+        instruction: {
           type: "string",
           description: "A single sentence describing what you are changing (first person)"
         },
@@ -5119,7 +5164,7 @@ var editFileTool = {
           description: "The lazy edit with // ... existing code ... markers"
         }
       },
-      required: ["target_filepath", "instructions", "code_edit"]
+      required: ["target_filepath", "instruction", "code_edit"]
     }
   }
 };
@@ -5341,7 +5386,7 @@ var editFileTool2 = {
         type: "string",
         description: "The path of the target file to modify"
       },
-      instructions: {
+      instruction: {
         type: "string",
         description: "A single sentence describing what you are changing (first person)"
       },
@@ -5350,7 +5395,7 @@ var editFileTool2 = {
         description: "The lazy edit with // ... existing code ... markers"
       }
     },
-    required: ["target_filepath", "instructions", "code_edit"]
+    required: ["target_filepath", "instruction", "code_edit"]
   }
 };
 function formatResult5(result) {
@@ -5895,7 +5940,7 @@ var import_ai3 = require("ai");
 var import_zod3 = require("zod");
 var editFileSchema = import_zod3.z.object({
   target_filepath: import_zod3.z.string().describe("The path of the target file to modify"),
-  instructions: import_zod3.z.string().describe("A single sentence describing what you are changing (first person)"),
+  instruction: import_zod3.z.string().describe("A single sentence describing what you are changing (first person)"),
   code_edit: import_zod3.z.string().describe("The lazy edit with // ... existing code ... markers")
 });
 var editFileTool3 = (0, import_ai3.tool)({
@@ -5904,7 +5949,7 @@ var editFileTool3 = (0, import_ai3.tool)({
   execute: async (params) => {
     const result = await executeEditFile({
       target_filepath: params.target_filepath,
-      instructions: params.instructions,
+      instruction: params.instruction,
       code_edit: params.code_edit
     });
     if (!result.success) {
@@ -5921,7 +5966,7 @@ var editFileTool3 = (0, import_ai3.tool)({
 function createEditFileTool3(config = {}) {
   const schema = import_zod3.z.object({
     target_filepath: import_zod3.z.string().describe("The path of the target file to modify"),
-    instructions: import_zod3.z.string().describe("A single sentence describing what you are changing (first person)"),
+    instruction: import_zod3.z.string().describe("A single sentence describing what you are changing (first person)"),
     code_edit: import_zod3.z.string().describe("The lazy edit with // ... existing code ... markers")
   });
   return (0, import_ai3.tool)({
@@ -5931,7 +5976,7 @@ function createEditFileTool3(config = {}) {
       const result = await executeEditFile(
         {
           target_filepath: params.target_filepath,
-          instructions: params.instructions,
+          instruction: params.instruction,
           code_edit: params.code_edit
         },
         config