@anyshift/mcp-proxy 0.6.2 → 0.6.4

package/dist/index.js

@@ -19,6 +19,7 @@ import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js'
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
 import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js';
+import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
 import { ListToolsRequestSchema, CallToolRequestSchema } from '@modelcontextprotocol/sdk/types.js';
 import { createJqTool } from './jq/index.js';
 import { createTimeseriesTool } from './timeseries/index.js';
@@ -119,11 +120,16 @@ const CHILD_ARGS = process.env.MCP_PROXY_CHILD_ARGS
     : [];
 /**
  * MCP_PROXY_REMOTE_URL (OPTIONAL)
- * SSE URL of a remote MCP server to connect to instead of spawning a child process
- * When set, the proxy connects as an SSE client to the remote server
+ * URL of a remote MCP server to connect to instead of spawning a child process
  * Example: "http://internal-server:3100/sse"
  */
 const REMOTE_URL = process.env.MCP_PROXY_REMOTE_URL;
+/**
+ * MCP_PROXY_REMOTE_TRANSPORT (OPTIONAL, default: "sse")
+ * Transport protocol for connecting to a remote MCP server.
+ * Values: "sse" (legacy GET-based SSE), "streamable-http" (POST-based, newer MCP spec)
+ */
+const REMOTE_TRANSPORT = process.env.MCP_PROXY_REMOTE_TRANSPORT || 'sse';
 /**
  * MCP_PROXY_REMOTE_HEADERS (OPTIONAL)
  * JSON string of custom headers to send with SSE/POST requests to the remote server
@@ -295,7 +301,7 @@ for (const [key, value] of Object.entries(process.env)) {
 // ============================================================================
 if (ENABLE_LOGGING) {
     console.debug('[mcp-proxy] Configuration:');
-    console.debug(`  Mode: ${REMOTE_URL ? 'remote (SSE)' : CHILD_COMMAND ? 'wrapper' : 'standalone (JQ only)'}`);
+    console.debug(`  Mode: ${REMOTE_URL ? `remote (${REMOTE_TRANSPORT})` : CHILD_COMMAND ? 'wrapper' : 'standalone (JQ only)'}`);
     if (REMOTE_URL) {
         console.debug(`  Remote URL: ${REMOTE_URL}`);
         console.debug(`  Remote headers: ${REMOTE_HEADERS ? 'configured' : 'none'}`);
@@ -360,20 +366,26 @@ async function main() {
             }
             headers['X-Client-Credentials'] = REMOTE_CREDENTIALS;
         }
-        const childTransport = new SSEClientTransport(new URL(REMOTE_URL), {
-            eventSourceInit: {
-                fetch: (url, init) => {
-                    // Merge headers using the Headers API (case-insensitive set avoids duplicates
-                    // when requestInit headers are also passed through init by the SDK)
-                    const merged = new Headers(init?.headers);
-                    for (const [key, value] of Object.entries(headers)) {
-                        merged.set(key, value);
-                    }
-                    return fetch(url, { ...init, headers: merged });
+        let childTransport;
+        if (REMOTE_TRANSPORT === 'streamable-http') {
+            childTransport = new StreamableHTTPClientTransport(new URL(REMOTE_URL), {
+                requestInit: { headers },
+            });
+        }
+        else {
+            childTransport = new SSEClientTransport(new URL(REMOTE_URL), {
+                eventSourceInit: {
+                    fetch: (url, init) => {
+                        const merged = new Headers(init?.headers);
+                        for (const [key, value] of Object.entries(headers)) {
+                            merged.set(key, value);
+                        }
+                        return fetch(url, { ...init, headers: merged });
+                    },
                 },
-            },
-            requestInit: { headers },
-        });
+                requestInit: { headers },
+            });
+        }
         childClient = new Client({
             name: 'mcp-proxy-client',
             version: '1.0.0'
@@ -417,6 +429,51 @@ async function main() {
         console.debug('[mcp-proxy] Standalone mode - no child MCP');
     }
     // ------------------------------------------------------------------------
+    // 2.5. STORE ORIGINAL TOOL SCHEMAS FOR SMART PARAMETER SANITIZATION
+    // ------------------------------------------------------------------------
+    // Create a map of original tool schemas (before proxy param injection)
+    // This allows us to detect if description/isRetryAttempt/originalToolId were
+    // originally part of the child tool's schema (to handle parameter name collisions)
+    const originalToolSchemas = new Map();
+    if (childToolsResponse.tools) {
+        for (const tool of childToolsResponse.tools) {
+            const originalParams = new Set();
+            if (tool.inputSchema?.properties) {
+                for (const paramName of Object.keys(tool.inputSchema.properties)) {
+                    originalParams.add(paramName);
+                }
+            }
+            originalToolSchemas.set(tool.name, originalParams);
+        }
+    }
+    /**
+     * Sanitize tool arguments before forwarding to child MCP.
+     * Removes proxy parameters (description, isRetryAttempt, originalToolId)
+     * ONLY if they weren't originally part of the child tool's schema.
+     * This handles parameter name collisions gracefully.
+     */
+    function sanitizeToolArgs(toolName, args) {
+        const originalParams = originalToolSchemas.get(toolName);
+        if (!originalParams) {
+            // If we don't have schema info, pass through all args (safer than stripping)
+            return args;
+        }
+        const sanitized = {};
+        const proxyParamNames = Object.keys(PROXY_PARAMS);
+        for (const [key, value] of Object.entries(args)) {
+            // Keep the parameter if:
+            // 1. It's NOT a proxy parameter, OR
+            // 2. It WAS in the original tool's schema (collision case)
+            if (!proxyParamNames.includes(key) || originalParams.has(key)) {
+                sanitized[key] = value;
+            }
+            else if (ENABLE_LOGGING) {
+                console.debug(`[mcp-proxy] Stripping proxy parameter '${key}' from ${toolName} call`);
+            }
+        }
+        return sanitized;
+    }
+    // ------------------------------------------------------------------------
     // 3. CREATE PROXY SERVER
     // ------------------------------------------------------------------------
     const server = new Server({
@@ -641,9 +698,11 @@ async function main() {
             if (ENABLE_LOGGING) {
                 console.debug(`[mcp-proxy] Forwarding to child MCP: ${toolName}`);
             }
+            // Sanitize arguments: remove proxy parameters that weren't in original tool schema
+            const sanitizedArgs = sanitizeToolArgs(toolName, toolArgs);
             result = await childClient.callTool({
                 name: toolName,
-                arguments: toolArgs
+                arguments: sanitizedArgs
             });
             // Check if child MCP returned an error
             const childReturnedError = !!result.isError;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anyshift/mcp-proxy",
-  "version": "0.6.2",
+  "version": "0.6.4",
   "description": "Generic MCP proxy that adds truncation, file writing, and JQ capabilities to any MCP server",
   "type": "module",
   "main": "dist/index.js",