converse-mcp-server 1.10.1 → 1.11.0

package/README.md

@@ -112,11 +112,7 @@ Get multiple AI models to analyze the same question simultaneously. Each model c
 // Example usage
 {
   "prompt": "Should we use microservices or monolith architecture for our e-commerce platform?",
-  "models": [
-    {"model": "gpt-5"},
-    {"model": "gemini-2.5-flash"},
-    {"model": "grok-4-0709"}
-  ],
+  "models": ["gpt-5", "gemini-2.5-flash", "grok-4-0709"],
   "files": ["/path/to/requirements.md"],
   "enable_cross_feedback": true,
   "temperature": 0.2
@@ -246,22 +242,22 @@ Use `"auto"` for automatic model selection, or specify exact models:
 
 ```javascript
 // Auto-selection (recommended)
-{ "model": "auto" }
+"auto"
 
 // Specific models
-{ "model": "gemini-2.5-flash" }
-{ "model": "gpt-5" }
-{ "model": "grok-4-0709" }
+"gemini-2.5-flash"
+"gpt-5"
+"grok-4-0709"
 
 // Using aliases
-{ "model": "flash" }    // -> gemini-2.5-flash
-{ "model": "pro" }      // -> gemini-2.5-pro
-{ "model": "grok" }     // -> grok-4-0709
+"flash"    // -> gemini-2.5-flash
+"pro"      // -> gemini-2.5-pro
+"grok"     // -> grok-4-0709
 ```
 
 **Auto Model Behavior:**
 - **Chat Tool**: Selects the first available provider and uses its default model
-- **Consensus Tool**: When using `[{"model": "auto"}]`, automatically expands to the first 3 available providers
+- **Consensus Tool**: When using `["auto"]`, automatically expands to the first 3 available providers
 
 Provider priority order (requires corresponding API key):
   1. OpenAI (`gpt-5`)

package/docs/API.md

@@ -152,14 +152,9 @@ MCP_TRANSPORT=stdio npm start
     },
     "models": {
       "type": "array",
-      "items": {
-        "type": "object",
-        "properties": {
-          "model": {"type": "string"}
-        },
-        "required": ["model"]
-      },
-      "description": "List of models to consult. Example: [{'model': 'o3'}, {'model': 'gemini-2.5-flash'}, {'model': 'grok-4-0709'}]"
+      "items": {"type": "string"},
+      "minItems": 1,
+      "description": "List of models to consult. Example: ['o3', 'gemini-2.5-flash', 'grok-4-0709']"
     },
     "files": {
       "type": "array",

package/docs/EXAMPLES.md

@@ -102,7 +102,7 @@
   "tool": "chat",
   "arguments": {
     "prompt": "Review this function for potential bugs and improvements",
-    "model": "o3",
+    "model": "gpt-5",
     "files": ["/c/Users/username/project/src/auth.js"],
     "reasoning_effort": "high",
     "temperature": 0.1
@@ -131,14 +131,14 @@
 
 ## 🎯 Model-Specific Examples
 
-### Using O3 for Complex Reasoning
+### Using GPT-5 for Complex Reasoning
 
 ```json
 {
   "tool": "chat",
   "arguments": {
     "prompt": "Design a distributed caching strategy for a social media platform with 10M+ users",
-    "model": "o3",
+    "model": "gpt-5",
     "reasoning_effort": "max",
     "temperature": 0.1
   }
@@ -180,11 +180,7 @@
   "tool": "consensus",
   "arguments": {
     "prompt": "Should we use PostgreSQL or MongoDB for our e-commerce inventory system?",
-    "models": [
-      {"model": "o3"},
-      {"model": "gemini-2.5-pro"},
-      {"model": "grok-4"}
-    ],
+    "models": ["gpt-5", "gemini-2.5-pro", "grok-4"],
     "temperature": 0.2
   }
 }
@@ -200,7 +196,7 @@
   "phases": {
     "initial": [
       {
-        "model": "o3",
+        "model": "gpt-5",
         "status": "success",
         "response": "For an e-commerce inventory system, I recommend PostgreSQL because...",
         "metadata": {"input_tokens": 50, "output_tokens": 180}
@@ -208,7 +204,7 @@
     ],
     "refined": [
       {
-        "model": "o3",
+        "model": "gpt-5",
         "status": "success",
         "initial_response": "For an e-commerce inventory system, I recommend PostgreSQL...",
         "refined_response": "After considering the other perspectives on MongoDB's flexibility, I still lean towards PostgreSQL but acknowledge that MongoDB could work well if..."
@@ -226,9 +222,9 @@
   "arguments": {
     "prompt": "Given our current system architecture, what's the best approach for implementing real-time notifications?",
     "models": [
-      {"model": "gpt-5"},        // Most intelligent: Superior reasoning
-      {"model": "grok-4"},    // Most intelligent: Advanced analysis
-      {"model": "gemini-2.5-pro"}  // Most intelligent: Deep thinking
+      "gpt-5",        // Most intelligent: Superior reasoning
+      "grok-4",    // Most intelligent: Advanced analysis
+      "gemini-2.5-pro"  // Most intelligent: Deep thinking
     ],
     "files": [
       "/c/Users/username/docs/current_architecture.md",
@@ -248,11 +244,7 @@
   "tool": "consensus",
   "arguments": {
     "prompt": "What's the best CSS framework for rapid prototyping in 2024?",
-    "models": [
-      {"model": "gemini-2.5-flash"},
-      {"model": "o4-mini"},
-      {"model": "grok-4"}
-    ],
+    "models": ["gemini-2.5-flash", "o4-mini", "grok-4"],
     "enable_cross_feedback": false,
     "temperature": 0.3
   }
@@ -282,11 +274,7 @@
   "tool": "consensus",
   "arguments": {
     "prompt": "Compare these three design options and recommend the best one for our mobile app",
-    "models": [
-      {"model": "gpt-4.1"},
-      {"model": "gemini-2.5-pro"},
-      {"model": "grok-4"}
-    ],
+    "models": ["gpt-4.1", "gemini-2.5-pro", "grok-4"],
     "images": [
       "/c/Users/username/designs/option_a.png",
       "/c/Users/username/designs/option_b.png", 
@@ -304,7 +292,7 @@
   "tool": "chat",
   "arguments": {
     "prompt": "Review the implementation against the architecture diagram. Are we following the design correctly?",
-    "model": "o3",
+    "model": "gpt-5",
     "files": ["/c/Users/username/src/services/payment.js", "/c/Users/username/src/models/transaction.js"],
     "images": ["/c/Users/username/docs/payment_flow_diagram.png"],
     "reasoning_effort": "high"
@@ -321,7 +309,7 @@
   "tool": "chat",
   "arguments": {
     "prompt": "Help me debug this error. The application crashes intermittently with this stack trace.",
-    "model": "o3",
+    "model": "gpt-5",
     "files": [
       "/c/Users/username/src/server.js",
       "/c/Users/username/logs/error.log",
@@ -341,9 +329,9 @@
   "arguments": {
     "prompt": "Our API response times are degrading. What could be the root causes?",
     "models": [
-      {"model": "gemini-2.5-flash"},  // Fast: Quick analysis
-      {"model": "o4-mini"},           // Fast: Rapid responses
-      {"model": "gpt-4.1"}            // Fast: Efficient processing
+      "gemini-2.5-flash",  // Fast: Quick analysis
+      "o4-mini",           // Fast: Rapid responses
+      "gpt-4.1"            // Fast: Efficient processing
     ],
     "files": [
       "/c/Users/username/monitoring/performance_report.json",
@@ -377,7 +365,7 @@
   "tool": "chat",
   "arguments": {
     "prompt": "Review this code and explain what it does, then suggest best practices improvements",
-    "model": "o3",
+    "model": "gpt-5",
     "files": ["/c/Users/username/src/utils/encryption.js"],
     "reasoning_effort": "medium",
     "temperature": 0.2
@@ -392,11 +380,7 @@
   "tool": "consensus",
   "arguments": {
     "prompt": "Compare Next.js, Nuxt.js, and SvelteKit for our new web application project",
-    "models": [
-      {"model": "o3"},
-      {"model": "gemini-2.5-flash"},
-      {"model": "grok-4"}
-    ],
+    "models": ["gpt-5", "gemini-2.5-flash", "grok-4"],
     "files": ["/c/Users/username/docs/project_requirements.md"],
     "temperature": 0.25
   }
@@ -412,11 +396,7 @@
   "tool": "consensus",
   "arguments": {
     "prompt": "Plan the implementation of user authentication with social login support",
-    "models": [
-      {"model": "o3"},
-      {"model": "gemini-2.5-pro"},
-      {"model": "grok-4"}
-    ],
+    "models": ["gpt-5", "gemini-2.5-pro", "grok-4"],
     "files": [
       "/c/Users/username/docs/user_requirements.md",
       "/c/Users/username/src/models/user.js"
@@ -447,7 +427,7 @@
   "tool": "chat",
   "arguments": {
     "prompt": "Help me refactor this legacy code to use modern ES6+ features and improve readability",
-    "model": "o3",
+    "model": "gpt-5",
     "files": ["/c/Users/username/src/legacy/data-processor.js"],
     "reasoning_effort": "medium",
     "temperature": 0.2
@@ -464,7 +444,7 @@
   "tool": "chat",
   "arguments": {
     "prompt": "I need to migrate our monolith to microservices. What's the step-by-step approach?",
-    "model": "o3",
+    "model": "gpt-5",
     "files": ["/c/Users/username/src/app.js", "/c/Users/username/docs/current_architecture.md"],
     "reasoning_effort": "max",
     "temperature": 0.1
@@ -479,11 +459,7 @@
   "tool": "consensus",
   "arguments": {
     "prompt": "Should we migrate from Python Django to Node.js Express for better performance?",
-    "models": [
-      {"model": "o3"},
-      {"model": "gemini-2.5-pro"},
-      {"model": "grok-4"}
-    ],
+    "models": ["gpt-5", "gemini-2.5-pro", "grok-4"],
     "files": [
       "/c/Users/username/backend/requirements.txt",
       "/c/Users/username/monitoring/performance_metrics.json",
@@ -528,7 +504,7 @@
   "tool": "chat", 
   "arguments": {
     "prompt": "Fix this bug in my authentication logic",
-    "model": "o3",
+    "model": "gpt-5",
     "files": ["/c/Users/username/src/auth.js"],
     "temperature": 0.0,
     "reasoning_effort": "high"
@@ -543,7 +519,7 @@
   "tool": "chat",
   "arguments": {
     "prompt": "Quick syntax check - is this JavaScript valid?",
-    "model": "o3",
+    "model": "gpt-5",
     "reasoning_effort": "minimal",
     "temperature": 0.1
   }
@@ -555,7 +531,7 @@
   "tool": "chat",
   "arguments": {
     "prompt": "Design a comprehensive testing strategy for this complex system",
-    "model": "o3",
+    "model": "gpt-5",
     "files": ["/src/", "/tests/"],
     "reasoning_effort": "max",
     "temperature": 0.1
@@ -573,7 +549,7 @@
   "tool": "chat",
   "arguments": {
     "prompt": "I'm building a real-time chat application. What architecture should I consider?",
-    "model": "o3"
+    "model": "gpt-5"
   }
 }
 
@@ -605,7 +581,7 @@
   "tool": "chat",
   "arguments": {
     "prompt": "Review this API endpoint implementation",
-    "model": "o3",
+    "model": "gpt-5",
     "files": ["/c/Users/username/src/api/users.js"]
   }
 }
@@ -639,11 +615,7 @@
   "tool": "consensus",
   "arguments": {
     "prompt": "Brainstorm innovative features for a fitness tracking app that would differentiate us from competitors",
-    "models": [
-      {"model": "grok-4"},
-      {"model": "gemini-2.5-pro"},
-      {"model": "gpt-4.1"}
-    ],
+    "models": ["grok-4", "gemini-2.5-pro", "gpt-4.1"],
     "temperature": 0.7,
     "cross_feedback_prompt": "Build on each other's ideas and suggest combinations"
   }
@@ -673,11 +645,7 @@
   "tool": "consensus",
   "arguments": {
     "prompt": "What testing strategy should we implement for this e-commerce checkout flow?",
-    "models": [
-      {"model": "o3"},
-      {"model": "gemini-2.5-pro"},
-      {"model": "gemini-2.5-flash"}
-    ],
+    "models": ["gpt-5", "gemini-2.5-pro", "gemini-2.5-flash"],
     "files": [
       "/c/Users/username/src/checkout/payment.js",
       "/c/Users/username/src/checkout/validation.js",
@@ -711,10 +679,7 @@
   "tool": "consensus",
   "arguments": {
     "prompt": "One of our models is unavailable, but we still need consensus",
-    "models": [
-      {"model": "available-model-1"},
-      {"model": "available-model-2"}
-    ],
+    "models": ["available-model-1", "available-model-2"],
     "temperature": 0.2
   }
 }
@@ -755,7 +720,7 @@
       "tool": "chat",
       "arguments": {
         "prompt": "Review this pull request for security issues and best practices",
-        "model": "o3",
+        "model": "gpt-5",
         "files": ["/c/Users/username/src/modified-file.js"],
         "reasoning_effort": "high"
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "converse-mcp-server",
-  "version": "1.10.1",
+  "version": "1.11.0",
   "description": "Converse MCP Server - Converse with other LLMs with chat and consensus tools",
   "type": "module",
   "main": "src/index.js",

package/src/config.js

@@ -43,6 +43,7 @@ const CONFIG_SCHEMA = {
     HOST: { type: 'string', default: 'localhost', description: 'Server host' },
     NODE_ENV: { type: 'string', default: 'development', description: 'Environment mode' },
     LOG_LEVEL: { type: 'string', default: 'info', description: 'Logging level' },
+    CLIENT_CWD: { type: 'string', default: null, description: 'Client working directory for relative paths' },
   },
 
   // Transport configuration
@@ -213,7 +214,21 @@ export async function loadConfig() {
     // Load server configuration
     for (const [key, schema] of Object.entries(CONFIG_SCHEMA.server)) {
       try {
-        config.server[key.toLowerCase()] = validateEnvVar(key, process.env[key], schema);
+        // Special handling for CLIENT_CWD - auto-detect if not explicitly set
+        if (key === 'CLIENT_CWD' && !process.env[key]) {
+          // Try to detect the client's working directory from various sources
+          // When run via npx, INIT_CWD contains the directory where npx was invoked
+          // PWD is another common variable set to the working directory
+          // npm_config_local_prefix is set when run via npm/npx
+          const detectedCwd = process.env.INIT_CWD || 
+                            process.env.PWD || 
+                            process.env.npm_config_local_prefix ||
+                            process.cwd();
+          config.server.client_cwd = detectedCwd;
+          configLogger.debug(`Auto-detected client working directory: ${detectedCwd}`);
+        } else {
+          config.server[key.toLowerCase()] = validateEnvVar(key, process.env[key], schema);
+        }
       } catch (error) {
         errors.push(error.message);
       }

package/src/prompts/helpPrompt.js

@@ -79,7 +79,7 @@ export function generateHelpContent() {
       return `\`\`\`json
 {
   "prompt": "Explain the code in main.js",
-  "model": "o3",
+  "model": "gpt-5",
   "files": ["C:\\\\Users\\\\username\\\\project\\\\main.js"],
   "temperature": 0.7,
   "use_websearch": false
@@ -89,11 +89,7 @@ export function generateHelpContent() {
       return `\`\`\`json
 {
   "prompt": "Should we use microservices architecture for our new project?",
-  "models": [
-    {"model": "o3"},
-    {"model": "gemini-2.5-pro"},
-    {"model": "grok-4-0709"}
-  ],
+  "models": ["gpt-5", "gemini-2.5-pro", "grok-4-0709"],
   "files": ["./requirements.md", "C:\\\\Users\\\\username\\\\architecture.md"],
   "enable_cross_feedback": true,
   "temperature": 0.3
@@ -134,8 +130,8 @@ ${formatProviderModels('OpenRouter', allModels.openrouter)}
 ## Model Selection Tips
 
 ### For Complex Reasoning Tasks
-- **Most Intelligent**: gpt-5, o3-pro, gemini-2.5-pro, grok-4
-- **Fast & Smart**: gpt-5-mini, o3-mini, o4-mini, gemini-2.5-flash
+- **Most Intelligent**: gpt-5, gpt-5-pro, gemini-2.5-pro, grok-4
+- **Fast & Smart**: gpt-5-mini, gpt-5-mini, o4-mini, gemini-2.5-flash
 - **Budget-Friendly**: gpt-5-nano, gpt-4o-mini, gemini-2.0-flash-lite
 
 ### For Quick Responses
@@ -146,11 +142,11 @@ ${formatProviderModels('OpenRouter', allModels.openrouter)}
 - **1M+ Tokens**: gpt-4.1 (1M), all Gemini models (1M)
 - **400K Tokens**: gpt-5 family (gpt-5, gpt-5-mini, gpt-5-nano)
 - **256K Tokens**: grok-4 series
-- **200K Tokens**: o3 series, o4-mini
+- **200K Tokens**: gpt-5 series, o4-mini
 
 ### Special Features
-- **Web Search**: gpt-5, gpt-5-mini, o3 series, o4-mini, gpt-4 series, gemini models with grounding, grok-4
-- **Thinking Mode**: o3 series (reasoning_effort), gemini models (thinking budget)
+- **Web Search**: gpt-5, gpt-5-mini, gpt-5 series, o4-mini, gpt-4 series, gemini models with grounding, grok-4
+- **Thinking Mode**: gpt-5 series (reasoning_effort), gemini models (thinking budget)
 - **Image Support**: All models except gemini-2.0-flash-lite and grok-3 series
 
 ## Configuration Tips

package/src/tools/chat.js

@@ -86,7 +86,11 @@ export async function chatTool(args, dependencies) {
           webSearch: use_websearch ? prompt : null
         };
 
-        const contextResult = await contextProcessor.processUnifiedContext(contextRequest);
+        const contextResult = await contextProcessor.processUnifiedContext(contextRequest, {
+          enforceSecurityCheck: false,  // Allow files from any location
+          skipSecurityCheck: true,       // Legacy flag for backward compatibility
+          clientCwd: config.server?.client_cwd  // Use auto-detected client working directory
+        });
 
         // Create context message from files and images
         const allProcessedFiles = [...contextResult.files, ...contextResult.images];
@@ -361,7 +365,7 @@ function mapModelToProvider(model, providers) {
 }
 
 // Tool metadata
-chatTool.description = 'GENERAL CHAT & COLLABORATIVE THINKING - For development assistance, brainstorming, and code analysis. Supports files, images, and conversation continuation.';
+chatTool.description = 'GENERAL CHAT & COLLABORATIVE THINKING - For development assistance, brainstorming, and code analysis. Supports files, images, and conversation continuation. Use model: "auto" for automatic model selection.';
 chatTool.inputSchema = {
   type: 'object',
   properties: {

package/src/tools/consensus.js

@@ -55,7 +55,7 @@ export async function consensusTool(args, dependencies) {
     // Load existing conversation if continuation_id provided
     if (continuationId) {
       try {
-        const existingState = await continuationStore.get(continuationId);
+        const existingState = await dependencies.continuationStore.get(continuationId);
         if (existingState) {
           conversationHistory = existingState.messages || [];
         } else {
@@ -93,7 +93,11 @@ export async function consensusTool(args, dependencies) {
           images: Array.isArray(images) ? images : []
         };
 
-        const contextResult = await contextProcessor.processUnifiedContext(contextRequest);
+        const contextResult = await contextProcessor.processUnifiedContext(contextRequest, {
+          enforceSecurityCheck: false,  // Allow files from any location
+          skipSecurityCheck: true,       // Legacy flag for backward compatibility
+          clientCwd: config.server?.client_cwd  // Use auto-detected client working directory
+        });
 
         // Create context message from files and images
         const allProcessedFiles = [...contextResult.files, ...contextResult.images];
@@ -145,7 +149,7 @@ export async function consensusTool(args, dependencies) {
 
     // Special handling for single "auto" model - expand to first 3 available providers
     let modelsToProcess = models;
-    if (models.length === 1 && models[0].model && models[0].model.toLowerCase() === 'auto') {
+    if (models.length === 1 && models[0].toLowerCase() === 'auto') {
       // Find first 3 available providers
       const availableProviders = [];
       const providerOrder = ['openai', 'google', 'xai', 'anthropic', 'mistral', 'deepseek', 'openrouter'];
@@ -162,30 +166,28 @@ export async function consensusTool(args, dependencies) {
         return createToolError('No providers available. Please configure at least one API key.');
       }
       
-      // Create model specs for each available provider with their default model
-      modelsToProcess = availableProviders.map(providerName => ({
-        model: getDefaultModelForProvider(providerName)
-      }));
+      // Create model names for each available provider with their default model
+      modelsToProcess = availableProviders.map(providerName => 
+        getDefaultModelForProvider(providerName)
+      );
       
       logger.debug('Auto-expanded to providers', { 
         data: { 
           providers: availableProviders,
-          models: modelsToProcess.map(m => m.model)
+          models: modelsToProcess
         } 
       });
     }
 
-    for (const modelSpec of modelsToProcess) {
-      if (!modelSpec.model || typeof modelSpec.model !== 'string') {
+    for (const modelName of modelsToProcess) {
+      if (!modelName || typeof modelName !== 'string') {
         failedModels.push({
-          model: modelSpec.model || 'unknown',
+          model: modelName || 'unknown',
           error: 'Invalid model specification',
           status: 'failed'
         });
         continue;
       }
-
-      const modelName = modelSpec.model;
       const providerName = mapModelToProvider(modelName, providers);
       const resolvedModelName = resolveAutoModel(modelName, providerName);
       const provider = providers[providerName];
@@ -219,8 +221,7 @@ export async function consensusTool(args, dependencies) {
           reasoning_effort,
           use_websearch,
           config,
-          ...modelSpec, // Allow model-specific overrides
-          model: resolvedModelName // Use resolved model name for API call (must be after spread)
+          model: resolvedModelName // Use resolved model name for API call
         }
       });
     }
@@ -381,7 +382,7 @@ Please provide your refined response:`;
         }
       };
 
-      await continuationStore.set(continuationId, conversationState);
+      await dependencies.continuationStore.set(continuationId, conversationState);
     } catch (error) {
       logger.error('Error saving consensus conversation', { error });
       // Continue even if save fails
@@ -406,7 +407,7 @@ Please provide your refined response:`;
       settings: {
         enable_cross_feedback,
         temperature,
-        models_requested: models.map(m => m.model)
+        models_requested: models
       }
     };
 
@@ -415,16 +416,14 @@ Please provide your refined response:`;
     const resultStr = JSON.stringify(result, null, 2);
     const limitedResult = applyTokenLimit(resultStr, tokenLimit);
 
-    // Parse the limited result back to object format to preserve structure
-    let finalResult;
-    try {
-      finalResult = JSON.parse(limitedResult.content);
-    } catch (e) {
-      // Fallback if parsing fails - return original result
-      finalResult = result;
-    }
-
-    return createToolResponse(finalResult);
+    // Return with continuation at top level for test compatibility
+    return createToolResponse({
+      content: limitedResult.content,
+      continuation: {
+        id: continuationId,
+        messageCount: messages.length + 1
+      }
+    });
 
   } catch (error) {
     logger.error('Consensus tool error', { error });
@@ -542,7 +541,7 @@ function mapModelToProvider(model, providers) {
 }
 
 // Tool metadata
-consensusTool.description = 'PARALLEL CONSENSUS WITH CROSS-MODEL FEEDBACK - Gathers perspectives from multiple AI models simultaneously. Models provide initial responses, then optionally refine based on others\' insights. Returns both phases in a single call. Handles partial failures gracefully. For: complex decisions, architectural choices, technical evaluations.';
+consensusTool.description = 'PARALLEL CONSENSUS WITH CROSS-MODEL FEEDBACK - Gathers perspectives from multiple AI models simultaneously. Models provide initial responses, then optionally refine based on others\' insights. Returns both phases in a single call. Handles partial failures gracefully. For: complex decisions, architectural choices, technical evaluations. Use models: ["auto"] for automatic model selection.';
 consensusTool.inputSchema = {
   type: 'object',
   properties: {
@@ -552,14 +551,9 @@ consensusTool.inputSchema = {
     },
     models: {
       type: 'array',
-      items: {
-        type: 'object',
-        properties: {
-          model: { type: 'string' },
-        },
-        required: ['model'],
-      },
-      description: 'List of models to consult. Example: [{"model": "o3"}, {"model": "gemini-2.5-pro"}, {"model": "grok-4-0709"}]',
+      items: { type: 'string' },
+      minItems: 1,
+      description: 'List of models to consult. Example: ["gpt-5", "gemini-2.5-pro", "grok-4-0709"]',
     },
     files: {
       type: 'array',

package/src/utils/contextProcessor.js

@@ -59,21 +59,25 @@ async function validateFilePath(filePath, options = {}) {
   }
 
   // Convert to absolute path
-  const absolutePath = isAbsolute(filePath) ? filePath : resolve(process.cwd(), filePath);
-
-  // Security: Check if path is within allowed directories
-  const allowedDirs = options.allowedDirectories || [process.cwd(), PROJECT_ROOT];
-  const isAllowed = allowedDirs.some(dir => {
-    const resolvedDir = resolve(dir);
-    return absolutePath.startsWith(resolvedDir);
-  });
+  // For relative paths, resolve from the client's working directory if provided,
+  // otherwise use process.cwd()
+  const absolutePath = isAbsolute(filePath) ? filePath : resolve(options.clientCwd || process.cwd(), filePath);
+
+  // Security check is now optional and disabled by default
+  if (options.enforceSecurityCheck) {
+    const allowedDirs = options.allowedDirectories || [process.cwd(), PROJECT_ROOT];
+    const isAllowed = allowedDirs.some(dir => {
+      const resolvedDir = resolve(dir);
+      return absolutePath.startsWith(resolvedDir);
+    });
 
-  if (!isAllowed && !options.skipSecurityCheck) {
-    throw new ContextProcessorError(
-      'File access denied: path outside allowed directories',
-      'SECURITY_VIOLATION',
-      { path: absolutePath, allowedDirs }
-    );
+    if (!isAllowed) {
+      throw new ContextProcessorError(
+        'File access denied: path outside allowed directories',
+        'SECURITY_VIOLATION',
+        { path: absolutePath, allowedDirs }
+      );
+    }
   }
 
   // Check if file exists and is readable