@mcp-ts/sdk 2.5.0 → 2.5.1

package/dist/{tool-router-CVLBaCwH.d.mts → tool-router-C9ECn3FX.d.mts}

@@ -1,5 +1,5 @@
 import { Tool } from '@modelcontextprotocol/sdk/types.js';
-import { A as ToolClientProvider, T as ToolClient } from './types-DK_NGWd4.mjs';
+import { A as ToolClientProvider, T as ToolClient } from './types-CbFbPkfQ.mjs';
 
 /**
  * ToolIndex — Lightweight in-memory search index for MCP tool discovery.

package/dist/{tool-router-CS9l0w4a.d.ts → tool-router-CUSSk6lT.d.ts}

@@ -1,5 +1,5 @@
 import { Tool } from '@modelcontextprotocol/sdk/types.js';
-import { A as ToolClientProvider, T as ToolClient } from './types-DK_NGWd4.js';
+import { A as ToolClientProvider, T as ToolClient } from './types-CbFbPkfQ.js';
 
 /**
  * ToolIndex — Lightweight in-memory search index for MCP tool discovery.

package/dist/{types-DK_NGWd4.d.mts → types-CbFbPkfQ.d.mts}

@@ -210,7 +210,7 @@ interface ToolPolicy {
     toolIds: string[];
     updatedAt: number;
 }
-type McpRpcMethod = 'connect' | 'disconnect' | 'listTools' | 'callTool' | 'listSessions' | 'getSession' | 'finishAuth' | 'listPrompts' | 'getPrompt' | 'listResources' | 'readResource' | 'setToolPolicy' | 'getToolPolicy';
+type McpRpcMethod = 'connect' | 'disconnect' | 'reconnect' | 'listTools' | 'callTool' | 'listSessions' | 'getSession' | 'finishAuth' | 'listPrompts' | 'getPrompt' | 'listResources' | 'readResource' | 'setToolPolicy' | 'getToolPolicy';
 interface McpRpcRequest {
     id: string;
     method: McpRpcMethod;
@@ -235,6 +235,7 @@ interface ConnectParams {
 interface DisconnectParams {
     sessionId: string;
 }
+type ReconnectParams = ConnectParams;
 interface SessionParams {
     sessionId: string;
 }
@@ -266,7 +267,7 @@ interface SetToolPolicyParams {
 interface GetToolPolicyParams {
     sessionId: string;
 }
-type McpRpcParams = ConnectParams | DisconnectParams | SessionParams | CallToolParams | GetPromptParams | ReadResourceParams | FinishAuthParams | SetToolPolicyParams | GetToolPolicyParams | undefined;
+type McpRpcParams = ConnectParams | DisconnectParams | ReconnectParams | SessionParams | CallToolParams | GetPromptParams | ReadResourceParams | FinishAuthParams | SetToolPolicyParams | GetToolPolicyParams | undefined;
 interface SessionInfo {
     sessionId: string;
     serverId?: string;

package/dist/{types-DK_NGWd4.d.ts → types-CbFbPkfQ.d.ts}

@@ -210,7 +210,7 @@ interface ToolPolicy {
     toolIds: string[];
     updatedAt: number;
 }
-type McpRpcMethod = 'connect' | 'disconnect' | 'listTools' | 'callTool' | 'listSessions' | 'getSession' | 'finishAuth' | 'listPrompts' | 'getPrompt' | 'listResources' | 'readResource' | 'setToolPolicy' | 'getToolPolicy';
+type McpRpcMethod = 'connect' | 'disconnect' | 'reconnect' | 'listTools' | 'callTool' | 'listSessions' | 'getSession' | 'finishAuth' | 'listPrompts' | 'getPrompt' | 'listResources' | 'readResource' | 'setToolPolicy' | 'getToolPolicy';
 interface McpRpcRequest {
     id: string;
     method: McpRpcMethod;
@@ -235,6 +235,7 @@ interface ConnectParams {
 interface DisconnectParams {
     sessionId: string;
 }
+type ReconnectParams = ConnectParams;
 interface SessionParams {
     sessionId: string;
 }
@@ -266,7 +267,7 @@ interface SetToolPolicyParams {
 interface GetToolPolicyParams {
     sessionId: string;
 }
-type McpRpcParams = ConnectParams | DisconnectParams | SessionParams | CallToolParams | GetPromptParams | ReadResourceParams | FinishAuthParams | SetToolPolicyParams | GetToolPolicyParams | undefined;
+type McpRpcParams = ConnectParams | DisconnectParams | ReconnectParams | SessionParams | CallToolParams | GetPromptParams | ReadResourceParams | FinishAuthParams | SetToolPolicyParams | GetToolPolicyParams | undefined;
 interface SessionInfo {
     sessionId: string;
     serverId?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mcp-ts/sdk",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "publishConfig": {
     "access": "public"
   },
@@ -206,4 +206,4 @@
   "engines": {
     "node": ">=18.0.0"
   }
-}
+}

package/src/client/core/sse-client.ts

@@ -102,6 +102,10 @@ export class SSEClient {
     return this.sendRequest<DisconnectResult>('disconnect', { sessionId });
   }
 
+  async reconnectToServer(params: ConnectParams): Promise<ConnectResult> {
+    return this.sendRequest<ConnectResult>('reconnect', params);
+  }
+
   async setToolPolicy(
     sessionId: string,
     toolPolicy: Pick<ToolPolicy, 'mode'> & { toolIds?: string[] }

package/src/client/react/oauth-popup.tsx

@@ -135,7 +135,6 @@ export function createOAuthPopupRedirectHandler(
     openCenteredPopup(url, {
       ...options,
       onBlocked: options.onBlocked ?? ((blockedUrl) => {
-        window.alert('Popup blocked! Allow popups for this site to complete authentication.');
         window.location.href = blockedUrl;
       }),
     });
@@ -179,30 +178,26 @@ export function useMcpOAuthPopup<TConnection extends OAuthPopupConnectionLike>(
             : '';
       const targetSessionId = rawState ? parseOAuthState(rawState)?.sessionId || rawState : '';
 
-      if (popupWindow && targetSessionId) {
+      if (targetSessionId) {
         pendingPopupsRef.current.set(targetSessionId, { popupWindow, state: rawState });
       }
 
       if (!targetSessionId) {
-        if (popupWindow) {
-          postPopupResult(popupWindow, {
-            success: false,
-            error: 'Missing OAuth session identifier',
-          });
-        }
+        postPopupResult(popupWindow, {
+          success: false,
+          error: 'Missing OAuth session identifier',
+        });
         return;
       }
 
       const targetSession = connections.find((connection) => connection.sessionId === targetSessionId);
       if (!targetSession) {
-        if (popupWindow) {
-          postPopupResult(popupWindow, {
-            sessionId: targetSessionId,
-            state: rawState,
-            success: false,
-            error: 'OAuth session not found in the current client state',
-          });
-        }
+        postPopupResult(popupWindow, {
+          sessionId: targetSessionId,
+          state: rawState,
+          success: false,
+          error: 'OAuth session not found in the current client state',
+        });
         return;
       }
 
@@ -217,14 +212,12 @@ export function useMcpOAuthPopup<TConnection extends OAuthPopupConnectionLike>(
       } catch (error) {
         processingCodesRef.current.delete(codeKey);
         pendingPopupsRef.current.delete(targetSession.sessionId);
-        if (popupWindow) {
-          postPopupResult(popupWindow, {
-            sessionId: rawState,
-            state: rawState,
-            success: false,
-            error: error instanceof Error ? error.message : 'Failed to finish auth',
-          });
-        }
+        postPopupResult(popupWindow, {
+          sessionId: rawState,
+          state: rawState,
+          success: false,
+          error: error instanceof Error ? error.message : 'Failed to finish auth',
+        });
       }
     };
 

package/src/client/react/use-mcp.ts

@@ -516,24 +516,15 @@ export function useMcp(options: UseMcpOptions): McpClient {
         throw new Error('SSE client not initialized');
       }
 
-      // Find and disconnect existing session for the same server
-      const existing = connections.find(
-        (c: McpConnection) => c.serverId === params.serverId || c.serverUrl === params.serverUrl
-      );
-      if (existing) {
-        await clientRef.current.disconnectFromServer(existing.sessionId);
-        if (isMountedRef.current) {
-          setConnections((prev: McpConnection[]) =>
-            prev.filter((c: McpConnection) => c.sessionId !== existing.sessionId)
-          );
-        }
-      }
+      const result = await clientRef.current.reconnectToServer(params);
+
+      // The server emits connection events for the new session via SSE,
+      // so local state is kept in sync automatically. No manual removal
+      // of the old session or insertion of the new one needed here.
 
-      // Connect fresh
-      const result = await clientRef.current.connectToServer(params);
       return result.sessionId;
     },
-    [connections]
+    []
   );
 
   /**

package/src/server/handlers/sse-handler.ts

@@ -18,6 +18,7 @@ import type {
   McpRpcResponse,
   ConnectParams,
   DisconnectParams,
+  ReconnectParams,
   SessionParams,
   CallToolParams,
   GetPromptParams,
@@ -166,6 +167,10 @@ export class SSEConnectionManager {
           result = await this.connect(request.params as ConnectParams);
           break;
 
+        case 'reconnect':
+          result = await this.reconnect(request.params as ReconnectParams);
+          break;
+
         case 'disconnect':
           result = await this.disconnect(request.params as DisconnectParams);
           break;
@@ -363,6 +368,87 @@ export class SSEConnectionManager {
     }
   }
 
+  /**
+   * Reconnect to an MCP server — tears down the active client transport/connection
+   * and creates a fresh connection while reusing the existing session credentials in a single RPC call.
+   */
+  private async reconnect(params: ReconnectParams): Promise<ConnectResult> {
+    const { serverId: rawServerId, serverName, serverUrl, callbackUrl, transportType } = params;
+    const headers = normalizeHeaders(params.headers);
+
+    // Normalize serverId the same way connect() does
+    const serverId = rawServerId && rawServerId.length <= 12
+      ? rawServerId
+      : generateServerId();
+
+    // Find existing session for the same server to reuse its session ID
+    const existingSessions = await sessions.list(this.userId);
+    const duplicate = existingSessions.find(s =>
+      s.serverId === serverId || s.serverUrl === serverUrl
+    );
+
+    // Reuse the duplicate sessionId if present, otherwise generate a new one
+    const sessionId = duplicate ? duplicate.sessionId : await sessions.generateSessionId();
+
+    if (duplicate) {
+      // Disconnect any active in-memory client transport without deleting the database session
+      const existingClient = this.clients.get(duplicate.sessionId);
+      if (existingClient) {
+        await existingClient.disconnect();
+        this.clients.delete(duplicate.sessionId);
+      }
+    }
+
+    try {
+      const clientMetadata = await this.getResolvedClientMetadata();
+
+      // Create a new client instantiating the reused session ID (which preserves DCR credentials and tokens)
+      const client = new MCPClient({
+        userId: this.userId,
+        sessionId,
+        serverId,
+        serverName,
+        serverUrl,
+        callbackUrl,
+        transportType,
+        headers,
+        ...clientMetadata,
+      });
+
+      this.clients.set(sessionId, client);
+
+      client.onConnectionEvent((event) => {
+        this.emitConnectionEvent(event);
+      });
+
+      client.onObservabilityEvent((event) => {
+        this.sendEvent(event);
+      });
+
+      await client.connect();
+      await this.listPolicyFilteredTools(sessionId);
+
+      return { sessionId, success: true };
+    } catch (error) {
+      if (error instanceof UnauthorizedError) {
+        this.clients.delete(sessionId);
+        return { sessionId, success: true };
+      }
+
+      this.emitConnectionEvent({
+        type: 'error',
+        sessionId,
+        serverId,
+        error: error instanceof Error ? error.message : 'Connection failed',
+        errorType: 'connection',
+        timestamp: Date.now(),
+      });
+
+      this.clients.delete(sessionId);
+      throw error;
+    }
+  }
+
   /**
    * Disconnect from an MCP server
    */

package/src/shared/types.ts

@@ -182,6 +182,7 @@ export interface ToolPolicy {
 export type McpRpcMethod =
   | 'connect'
   | 'disconnect'
+  | 'reconnect'
   | 'listTools'
   | 'callTool'
   | 'listSessions'
@@ -223,6 +224,8 @@ export interface DisconnectParams {
   sessionId: string;
 }
 
+export type ReconnectParams = ConnectParams;
+
 export interface SessionParams {
   sessionId: string;
 }
@@ -264,6 +267,7 @@ export interface GetToolPolicyParams {
 export type McpRpcParams =
   | ConnectParams
   | DisconnectParams
+  | ReconnectParams
   | SessionParams
   | CallToolParams
   | GetPromptParams