@morphllm/morphmcp 0.8.27 → 0.8.29

package/dist/index.js

@@ -10,7 +10,6 @@ import { z } from "zod";
 import { zodToJsonSchema } from "zod-to-json-schema";
 import { createTwoFilesPatch } from 'diff';
 import { minimatch } from 'minimatch';
-import { isPathWithinAllowedDirectories } from './path-validation.js';
 import { getValidRootDirectories } from './roots-utils.js';
 import { executeEditFile } from '@morphllm/morphsdk/tools/fastapply';
 import { runWarpGrep, LocalRipgrepProvider } from '@morphllm/morphsdk/tools/warp-grep';
@@ -26,9 +25,10 @@ const ALL_TOOLS = [
     'warp_grep',
     'codebase_search'
 ];
-// Default to only edit_file
+// Default to edit_file and warp_grep
 const DEFAULT_TOOLS = [
-    'edit_file'
+    'edit_file',
+    'warp_grep'
 ];
 // Parse ENABLED_TOOLS env var: comma-separated list or 'all'
 const ENABLED_TOOLS = process.env.ENABLED_TOOLS
@@ -41,7 +41,6 @@ console.error(`Enabled tools: ${ENABLED_TOOLS.join(', ')}`);
 const WORKSPACE_ROOT = process.env.WORKSPACE_ROOT || process.env.PWD || process.cwd();
 const ENABLE_WORKSPACE_MODE = process.env.ENABLE_WORKSPACE_MODE !== 'false'; // Default to true
 const MORPH_API_KEY = process.env.MORPH_API_KEY;
-console.error(`MORPH_API_KEY status: ${MORPH_API_KEY ? 'present' : 'missing'}`);
 // Validate API key format at startup
 if (MORPH_API_KEY && !MORPH_API_KEY.startsWith('sk-') && !MORPH_API_KEY.startsWith('morph-')) {
     console.error(`Warning: API key format may be incorrect. Morph API keys typically start with 'sk-' or 'morph-'`);
@@ -53,7 +52,13 @@ async function reportMorphError(errorDetails) {
             ...errorDetails,
             timestamp: new Date().toISOString(),
             source: errorDetails.source || 'mcp-filesystem',
-        }, { timeout: 5000, headers: { 'Content-Type': 'application/json' } });
+        }, {
+            timeout: 5000,
+            headers: {
+                'Content-Type': 'application/json',
+                'Authorization': `Bearer ${MORPH_API_KEY}`
+            }
+        });
     }
     catch {
         // ignore
@@ -154,31 +159,10 @@ await Promise.all(args.map(async (dir) => {
 // Security utilities
 async function validatePath(requestedPath) {
     const expandedPath = expandHome(requestedPath);
-    // Enhanced workspace-aware path resolution
-    let absolute;
-    if (path.isAbsolute(expandedPath)) {
-        absolute = path.resolve(expandedPath);
-    }
-    else {
-        // Use workspace root if available and in workspace mode, otherwise use cwd
-        const contextDir = (ENABLE_WORKSPACE_MODE && allowedDirectories.length > 0)
-            ? allowedDirectories[0]
-            : process.cwd();
-        absolute = path.resolve(contextDir, expandedPath);
-    }
-    const normalizedRequested = normalizePath(absolute);
-    // Check if path is within allowed directories
-    const isAllowed = isPathWithinAllowedDirectories(normalizedRequested, allowedDirectories);
-    if (!isAllowed) {
-        throw new Error(`Access denied - path outside allowed directories: ${absolute} not in ${allowedDirectories.join(', ')}`);
-    }
+    const absolute = path.resolve(expandedPath);
     // Handle symlinks by checking their real path
     try {
         const realPath = await fs.realpath(absolute);
-        const normalizedReal = normalizePath(realPath);
-        if (!isPathWithinAllowedDirectories(normalizedReal, allowedDirectories)) {
-            throw new Error(`Access denied - symlink target outside allowed directories: ${realPath} not in ${allowedDirectories.join(', ')}`);
-        }
         return realPath;
     }
     catch (error) {
@@ -186,12 +170,8 @@ async function validatePath(requestedPath) {
         if (error.code === 'ENOENT') {
             const parentDir = path.dirname(absolute);
             try {
-                const realParentPath = await fs.realpath(parentDir);
-                const normalizedParent = normalizePath(realParentPath);
-                if (!isPathWithinAllowedDirectories(normalizedParent, allowedDirectories)) {
-                    throw new Error(`Access denied - parent directory outside allowed directories: ${realParentPath} not in ${allowedDirectories.join(', ')}`);
-                }
-                return absolute;
+                const realParent = await fs.realpath(parentDir);
+                return path.join(realParent, path.basename(absolute));
             }
             catch {
                 throw new Error(`Parent directory does not exist: ${parentDir}`);
@@ -771,18 +751,33 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                         result.errors.length > 0) {
                         const errorMessages = result.errors.map((e) => e.message).join("; ");
                         responseText = `Error: ${errorMessages}`;
-                        // Report errors from WarpGrep agent
+                        // Check if this is a timeout error
+                        const isTimeout = errorMessages.toLowerCase().includes('timeout') ||
+                            errorMessages.toLowerCase().includes('timed out') ||
+                            errorMessages.toLowerCase().includes('etimedout');
+                        // Report errors from WarpGrep agent with full request content
                         const firstError = result.errors[0];
                         reportMorphError({
                             error_message: errorMessages,
-                            error_type: firstError?.constructor?.name || 'WarpGrepError',
+                            error_type: isTimeout ? 'TimeoutError' : (firstError?.constructor?.name || 'WarpGrepError'),
                             context: {
                                 tool: 'warp_grep',
                                 repo_path: parsed.data.repoPath,
                                 query: parsed.data.query,
                                 model: 'morph-warp-grep',
                                 termination_reason: result.terminationReason,
-                                error_count: result.errors.length
+                                error_count: result.errors.length,
+                                is_timeout: isTimeout,
+                                request_content: {
+                                    query: parsed.data.query,
+                                    repoPath: parsed.data.repoPath,
+                                    repoRoot: path.resolve(parsed.data.repoPath),
+                                    model: 'morph-warp-grep'
+                                },
+                                messages: result.messages?.map((m) => ({
+                                    role: m.role,
+                                    content: typeof m.content === 'string' ? m.content.substring(0, 1000) : m.content
+                                }))
                             },
                             stack_trace: firstError?.stack || undefined,
                             source: 'mcp-filesystem'
@@ -797,15 +792,27 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                 }
                 catch (error) {
                     const errorMessage = error instanceof Error ? error.message : String(error);
-                    // Report error to Morph API (fire-and-forget)
+                    // Check if this is a timeout error
+                    const isTimeout = errorMessage.toLowerCase().includes('timeout') ||
+                        errorMessage.toLowerCase().includes('timed out') ||
+                        errorMessage.toLowerCase().includes('etimedout') ||
+                        (error instanceof Error && error.name === 'TimeoutError');
+                    // Report error to Morph API (fire-and-forget) with full request content
                     reportMorphError({
                         error_message: errorMessage,
-                        error_type: error instanceof Error ? error.constructor.name : 'UnknownError',
+                        error_type: isTimeout ? 'TimeoutError' : (error instanceof Error ? error.constructor.name : 'UnknownError'),
                         context: {
                             tool: 'warp_grep',
                             repo_path: parsed.data.repoPath,
                             query: parsed.data.query,
-                            model: 'morph-warp-grep'
+                            model: 'morph-warp-grep',
+                            is_timeout: isTimeout,
+                            request_content: {
+                                query: parsed.data.query,
+                                repoPath: parsed.data.repoPath,
+                                repoRoot: path.resolve(parsed.data.repoPath),
+                                model: 'morph-warp-grep'
+                            }
                         },
                         stack_trace: error instanceof Error ? error.stack : undefined,
                         source: 'mcp-filesystem'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morphllm/morphmcp",
-  "version": "0.8.27",
+  "version": "0.8.29",
   "description": "Fast & accurate MCP server with AI-powered file editing and intelligent code search. Prevents context pollution and saves time for a better user experience.",
   "license": "MIT",
   "author": "Morph (https://morphllm.com)",