support streamable http

Author: aheizi

package-lock.json

@@ -407,7 +407,7 @@
 		"@google-cloud/vertexai": "^1.9.3",
 		"@google/genai": "^0.9.0",
 		"@mistralai/mistralai": "^1.3.6",
-		"@modelcontextprotocol/sdk": "^1.7.0",
+		"@modelcontextprotocol/sdk": "^1.10.2",
 		"@types/clone-deep": "^4.0.4",
 		"@types/pdf-parse": "^1.1.4",
 		"@types/tmp": "^0.2.6",

package.json

@@ -2,7 +2,7 @@ import * as vscode from "vscode"
 import { ClineProvider } from "../../core/webview/ClineProvider"
 import type { ConfigChangeEvent } from "./config"
 import { ConfigManager } from "./config"
-import { ConnectionFactory, ConnectionManager, SseHandler, StdioHandler } from "./connection"
+import { ConnectionFactory, ConnectionManager, SseHandler, StdioHandler, StreamableHttpHandler } from "./connection"
 import { ConfigSource, McpConnection, McpResourceResponse, McpServer, McpToolCallResponse, ServerConfig } from "./types"
 
 export class McpHub {
@@ -24,6 +24,7 @@ export class McpHub {
 		)
 		connectionFactory.registerHandler(new StdioHandler())
 		connectionFactory.registerHandler(new SseHandler())
+		connectionFactory.registerHandler(new StreamableHttpHandler())
 
 		this.connectionManager = new ConnectionManager(this.configManager, connectionFactory)
 

src/services/mcp/McpHub.ts

@@ -112,7 +112,10 @@ describe("McpHub", () => {
 		mockConfigManager.updateServerConfig = jest.fn().mockResolvedValue(undefined)
 
 		// Mock ConnectionFactory
-		mockConnectionFactory = new ConnectionFactory(mockConfigManager) as jest.Mocked<ConnectionFactory>
+		mockConnectionFactory = new ConnectionFactory(
+			mockConfigManager,
+			mockProvider as ClineProvider,
+		) as jest.Mocked<ConnectionFactory>
 
 		// Mock ConnectionManager
 		mockConnectionManager = new ConnectionManager(

src/services/mcp/__tests__/McpHub.test.ts

@@ -20,9 +20,10 @@ const createServerConfigSchema = () => {
 			args: z.array(z.string()).optional(),
 			cwd: z.string().default(() => vscode.workspace.workspaceFolders?.at(0)?.uri.fsPath ?? process.cwd()),
 			env: z.record(z.string()).optional(),
-			// Ensure no SSE fields are present
+			// Ensure no HTTP fields are present
 			url: z.undefined().optional(),
 			headers: z.undefined().optional(),
+			sessionId: z.undefined().optional(),
 		})
 			.transform((data) => ({
 				...data,
@@ -35,6 +36,7 @@ const createServerConfigSchema = () => {
 			type: z.enum(["sse"]).optional(),
 			url: z.string().url("URL must be a valid URL format"),
 			headers: z.record(z.string()).optional(),
+			sessionId: z.undefined().optional(),
 			// Ensure no stdio fields are present
 			command: z.undefined().optional(),
 			args: z.undefined().optional(),
@@ -46,6 +48,26 @@ const createServerConfigSchema = () => {
 				type: "sse" as const,
 			}))
 			.refine((data) => data.type === undefined || data.type === "sse", { message: typeErrorMessage }),
+
+		// Streamable HTTP config (has url field and optional sessionId)
+		BaseConfigSchema.extend({
+			type: z.enum(["streamable-http"]).optional(),
+			url: z.string().url("URL must be a valid URL format"),
+			headers: z.record(z.string()).optional(),
+			sessionId: z.string().optional(),
+			// Ensure no stdio fields are present
+			command: z.undefined().optional(),
+			args: z.undefined().optional(),
+			cwd: z.undefined().optional(),
+			env: z.undefined().optional(),
+		})
+			.transform((data) => ({
+				...data,
+				type: "streamable-http" as const,
+			}))
+			.refine((data) => data.type === undefined || data.type === "streamable-http", {
+				message: typeErrorMessage,
+			}),
 	])
 }
 

src/services/mcp/config/validation.ts

@@ -2,6 +2,7 @@ import { ServerConfig, McpConnection, McpServer, ConfigSource } from "../types"
 import { ConnectionHandler } from "./ConnectionHandler"
 import { FileWatcher } from "./FileWatcher"
 import { ConfigManager } from "../config"
+import { ClineProvider } from "../../../core/webview/ClineProvider"
 
 /**
  * Connection factory class
@@ -11,11 +12,11 @@ export class ConnectionFactory {
 	private handlers: ConnectionHandler[] = []
 	private connections: McpConnection[] = []
 	private fileWatcher: FileWatcher
-	private provider: any
+	private provider: ClineProvider
 	private configHandler: ConfigManager
 	private onStatusChange?: (server: McpServer) => void
 
-	constructor(configHandler: ConfigManager, provider?: any, onStatusChange?: (server: McpServer) => void) {
+	constructor(configHandler: ConfigManager, provider: ClineProvider, onStatusChange?: (server: McpServer) => void) {
 		this.configHandler = configHandler
 		this.fileWatcher = new FileWatcher()
 		this.provider = provider
@@ -58,7 +59,8 @@ export class ConnectionFactory {
 			if (patchedConfig.command) {
 				patchedConfig.type = "stdio"
 			} else if (patchedConfig.url) {
-				patchedConfig.type = "sse"
+				// If url is present, prefer streamable-http if headers are present, otherwise use sse
+				patchedConfig.type = patchedConfig.headers ? "streamable-http" : "sse"
 			}
 		}
 

src/services/mcp/connection/ConnectionFactory.ts

@@ -124,8 +124,13 @@ export class ConnectionManager {
 					const currentConfig = JSON.parse(existingServer.config)
 
 					const stripNonConnectionFields = (configObj: any) => {
-						// Exclude alwaysAllow and timeout, timeout changes do not trigger reconnection
-						const { alwaysAllow: _alwaysAllow, timeout: _timeout, ...rest } = configObj
+						// Exclude changes do not trigger reconnection
+						const {
+							alwaysAllow: _alwaysAllow,
+							timeout: _timeout,
+							sessionId: _sessionId,
+							...rest
+						} = configObj
 						return rest
 					}