From ea80a7c663c638a837d58c4d29d84bb5d01d9447 Mon Sep 17 00:00:00 2001
From: stevehuynh <stevehuynh2002@gmail.com>
Date: Wed, 14 May 2025 21:48:05 +1000
Subject: [PATCH] fix: now deletes only the current version of MCP-remote

---
 src/lib/utils.ts | 22 ++++++++++++----------
 src/proxy.ts     |  2 +-
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/lib/utils.ts b/src/lib/utils.ts
index 7a36bda..d0d5be2 100644
--- a/src/lib/utils.ts
+++ b/src/lib/utils.ts
@@ -3,7 +3,7 @@ import { Client } from '@modelcontextprotocol/sdk/client/index.js'
 import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js'
 import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js'
 import { Transport } from '@modelcontextprotocol/sdk/shared/transport.js'
-import fs from 'fs'
+import * as fsSync from 'fs'
 import path from 'path'
 import os from 'os'
 import { OAuthClientInformationFull, OAuthClientInformationFullSchema } from '@modelcontextprotocol/sdk/shared/auth.js'
@@ -12,7 +12,7 @@ import { getConfigFilePath, readJsonFile } from './mcp-auth-config'
 import express from 'express'
 import net from 'net'
 import crypto from 'crypto'
-import fs from 'fs/promises'
+import * as fs from 'fs/promises'
 
 // Connection constants
 export const REASON_AUTH_NEEDED = 'authentication-needed'
@@ -37,15 +37,17 @@ export function log(str: string, ...rest: unknown[]) {
  */
 function clearMcpAuthFiles() {
   try {
-    const mcpDir = path.join(os.homedir(), '.mcp-auth')
-    log('Short timeout reached, clearing MCP auth files')
-    // Check if the directory exists
-    if (fs.existsSync(mcpDir)) {
-      // Delete the entire directory and its contents
-      fs.rmSync(mcpDir, { recursive: true, force: true })
-      log('MCP auth directory cleared successfully')
+    const baseConfigDir = process.env.MCP_REMOTE_CONFIG_DIR || path.join(os.homedir(), '.mcp-auth')
+    const versionDir = path.join(baseConfigDir, `mcp-remote-${MCP_REMOTE_VERSION}`)
+    
+    log('Short timeout reached, clearing MCP auth files for current version')
+    // Check if the version directory exists
+    if (fsSync.existsSync(versionDir)) {
+      // Delete only the current version directory and its contents
+      fsSync.rmSync(versionDir, { recursive: true, force: true })
+      log(`MCP auth directory for version ${MCP_REMOTE_VERSION} cleared successfully`)
     } else {
-      log('No MCP directory found, nothing to clear')
+      log(`No MCP directory found for version ${MCP_REMOTE_VERSION}, nothing to clear`)
     }
   } catch (error) {
     log('Error clearing MCP auth files:', error)
diff --git a/src/proxy.ts b/src/proxy.ts
index 58e29f3..d087eb7 100644
--- a/src/proxy.ts
+++ b/src/proxy.ts
@@ -136,7 +136,7 @@ to the CA certificate file. If using claude_desktop_config.json, this might look
 }
 
 // Parse command-line arguments and run the proxy
-parseCommandLineArgs(process.argv.slice(2), 3334, 'Usage: npx tsx proxy.ts <https://server-url> [callback-port]')
+parseCommandLineArgs(process.argv.slice(2), 'Usage: npx tsx proxy.ts <https://server-url> [callback-port]')
   .then(({ serverUrl, callbackPort, headers, transportStrategy, shortTimeout }) => {
     return runProxy(serverUrl, callbackPort, headers, transportStrategy, shortTimeout)
   })