Skip to content

Commit a635732

Browse files
committed
chore: cache all client capabilities and drop support for roots
Roots are currently broken: modelcontextprotocol/typescript-sdk#1167
1 parent 483a41c commit a635732

12 files changed

Lines changed: 73 additions & 213 deletions

File tree

‎apps/gateway/src/e2e/helpers/http-server-manager.ts‎

Lines changed: 9 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import type {
99
ISamplingPonyfill,
1010
ServerConfig,
1111
MCPClientConfig,
12-
DownstreamCapabilities,
12+
ClientCapabilities,
1313
} from "../../types/interfaces.js";
1414
import { MCPGatewayServer } from "../../mcp/gateway-server.js";
1515
import { registerProxyHandlers } from "../../handlers/proxy-handlers.js";
@@ -21,7 +21,6 @@ import type { IToolRegistry } from "../../tools/tool-registry.js";
2121
import {
2222
createSessionTempDir,
2323
cleanupSessionTempDir,
24-
findValidLocalRoot,
2524
} from "../../utils/index.js";
2625

2726
export class HttpServerManager {
@@ -97,31 +96,12 @@ export class HttpServerManager {
9796
// Store capabilities for this session
9897
capabilityStore.setCapabilities(sessionId, capabilities);
9998

100-
// Request roots and determine working directory FIRST
101-
// This must happen before initializing the ponyfill since it needs the cwd
102-
let workingDirectory: string;
103-
104-
try {
105-
const roots = await gatewayServer.requestRootsFromClient();
106-
const validRoot = roots ? findValidLocalRoot(roots) : undefined;
107-
108-
if (validRoot) {
109-
logger.info(
110-
`Session ${sessionId}: Using client root as cwd: ${validRoot}`,
111-
);
112-
workingDirectory = validRoot;
113-
} else {
114-
logger.info(
115-
`Session ${sessionId}: No valid local roots, using tempdir`,
116-
);
117-
workingDirectory = createSessionTempDir(sessionId);
118-
}
119-
} catch (error) {
120-
logger.warn(
121-
`Session ${sessionId}: Failed to determine cwd from roots, using tempdir: ${error instanceof Error ? error.message : String(error)}`,
122-
);
123-
workingDirectory = createSessionTempDir(sessionId);
124-
}
99+
// Create session-isolated tempdir for sampling ponyfill
100+
// Note: roots/list is currently broken in the TS SDK, so we always use tempdir
101+
const workingDirectory = createSessionTempDir(sessionId);
102+
logger.info(
103+
`Session ${sessionId}: Using tempdir as cwd: ${workingDirectory}`,
104+
);
125105

126106
// Store working directory BEFORE initializing ponyfill
127107
capabilityStore.setWorkingDirectory(sessionId, workingDirectory);
@@ -273,7 +253,7 @@ async function initializeClientsForSession(
273253
sessionId: string,
274254
config: ServerConfig,
275255
clientManager: IMCPClientManager,
276-
capabilities?: DownstreamCapabilities,
256+
capabilities?: ClientCapabilities,
277257
): Promise<void> {
278258
const initPromises: Promise<void>[] = [];
279259

@@ -300,7 +280,7 @@ async function initializeSingleClient(
300280
clientConfig: MCPClientConfig,
301281
sessionId: string,
302282
clientManager: IMCPClientManager,
303-
capabilities?: DownstreamCapabilities,
283+
capabilities?: ClientCapabilities,
304284
): Promise<void> {
305285
if (clientConfig.type === "http") {
306286
await clientManager.addHttpClient(

‎apps/gateway/src/handlers/proxy-handlers.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import type {
66
ILogger,
77
IMCPClientManager,
88
ISamplingPonyfill,
9-
DownstreamCapabilities,
9+
ClientCapabilities,
1010
} from "../types/interfaces.js";
1111
import type { MCPGatewayServer } from "../mcp/gateway-server.js";
1212

@@ -20,7 +20,7 @@ export function registerProxyHandlers(
2020
clientManager: IMCPClientManager,
2121
gatewayServer: MCPGatewayServer,
2222
logger: ILogger,
23-
capabilities: DownstreamCapabilities,
23+
capabilities: ClientCapabilities,
2424
samplingPonyfill?: ISamplingPonyfill,
2525
): void {
2626
const clients = clientManager.getClientsBySession(sessionId);

‎apps/gateway/src/index.ts‎

Lines changed: 11 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import type { ContainerBindingMap } from "./container/binding-map.js";
55
import { TYPES } from "./types/index.js";
66
import type {
77
ClientConnectionResult,
8-
DownstreamCapabilities,
8+
ClientCapabilities,
99
ICapabilityStore,
1010
ILogger,
1111
IMCPClientManager,
@@ -31,7 +31,6 @@ import { ensureServerLogDir, getServerLogPath } from "./utils/log-paths.js";
3131
import {
3232
createSessionTempDir,
3333
cleanupSessionTempDir,
34-
findValidLocalRoot,
3534
} from "./utils/index.js";
3635

3736
interface InitializationResult {
@@ -53,7 +52,7 @@ async function initializeClientsForSession(
5352
sessionId: string,
5453
config: ServerConfig,
5554
clientManager: IMCPClientManager,
56-
clientCapabilities?: DownstreamCapabilities,
55+
clientCapabilities?: ClientCapabilities,
5756
): Promise<InitializationResult> {
5857
// Ensure server log directory exists for stdio server stderr redirection
5958
ensureServerLogDir();
@@ -221,39 +220,11 @@ async function startHttpMode(
221220
// Store capabilities for this session
222221
capabilityStore.setCapabilities(sessionId, capabilities);
223222

224-
// Request roots and determine working directory FIRST
225-
// This must happen before initializing the ponyfill since it needs the cwd
226-
let workingDirectory: string;
227-
228-
logger.debug(`Session ${sessionId}: About to request roots`);
229-
230-
try {
231-
const roots = await gatewayServer.requestRootsFromClient();
232-
logger.debug(
233-
`Session ${sessionId}: Roots request completed, roots=${!!roots}`,
234-
);
235-
const validRoot = roots ? findValidLocalRoot(roots) : undefined;
236-
237-
if (validRoot) {
238-
logger.info(
239-
`Session ${sessionId}: Using client root as cwd: ${validRoot}`,
240-
);
241-
workingDirectory = validRoot;
242-
} else {
243-
logger.info(
244-
`Session ${sessionId}: No valid local roots, using tempdir`,
245-
);
246-
workingDirectory = createSessionTempDir(sessionId);
247-
}
248-
} catch (error) {
249-
logger.warn(
250-
`Session ${sessionId}: Failed to determine cwd from roots, using tempdir: ${error instanceof Error ? error.message : String(error)}`,
251-
);
252-
workingDirectory = createSessionTempDir(sessionId);
253-
}
254-
255-
logger.debug(
256-
`Session ${sessionId}: Working directory determined: ${workingDirectory}`,
223+
// Create session-isolated tempdir for sampling ponyfill
224+
// Note: roots/list is currently broken in the TS SDK, so we always use tempdir
225+
const workingDirectory = createSessionTempDir(sessionId);
226+
logger.info(
227+
`Session ${sessionId}: Using tempdir as cwd: ${workingDirectory}`,
257228
);
258229

259230
// Store working directory BEFORE initializing ponyfill
@@ -457,32 +428,10 @@ async function startStdioMode(
457428
// Store capabilities
458429
capabilityStore.setCapabilities(SESSION_ID, capabilities);
459430

460-
// Request roots and determine working directory FIRST
461-
// This must happen before initializing the ponyfill since it needs the cwd
462-
let workingDirectory: string;
463-
464-
logger.debug("About to request roots");
465-
466-
try {
467-
const roots = await gatewayServer.requestRootsFromClient();
468-
logger.debug(`Roots request completed, roots=${!!roots}`);
469-
const validRoot = roots ? findValidLocalRoot(roots) : undefined;
470-
471-
if (validRoot) {
472-
logger.info(`Using client root as cwd: ${validRoot}`);
473-
workingDirectory = validRoot;
474-
} else {
475-
logger.info(`No valid local roots, using tempdir`);
476-
workingDirectory = createSessionTempDir(SESSION_ID);
477-
}
478-
} catch (error) {
479-
logger.warn(
480-
`Failed to determine cwd from roots, using tempdir: ${error instanceof Error ? error.message : String(error)}`,
481-
);
482-
workingDirectory = createSessionTempDir(SESSION_ID);
483-
}
484-
485-
logger.debug(`Working directory determined: ${workingDirectory}`);
431+
// Create session-isolated tempdir for sampling ponyfill
432+
// Note: roots/list is currently broken in the TS SDK, so we always use tempdir
433+
const workingDirectory = createSessionTempDir(SESSION_ID);
434+
logger.info(`Using tempdir as cwd: ${workingDirectory}`);
486435

487436
// Store working directory BEFORE initializing ponyfill
488437
capabilityStore.setWorkingDirectory(SESSION_ID, workingDirectory);

‎apps/gateway/src/mcp/gateway-server.ts‎

Lines changed: 8 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,17 @@ import {
55
ReadResourceRequestSchema,
66
ListPromptsRequestSchema,
77
GetPromptRequestSchema,
8-
ListRootsRequestSchema,
98
} from "@modelcontextprotocol/sdk/types.js";
109
import type {
1110
CreateMessageRequest,
1211
CreateMessageResult,
1312
ElicitRequest,
1413
ElicitResult,
15-
Root,
1614
} from "@modelcontextprotocol/sdk/types.js";
1715
import type {
1816
IMCPClientManager,
1917
ILogger,
20-
DownstreamCapabilities,
18+
ClientCapabilities,
2119
} from "../types/interfaces.js";
2220
import { $inject } from "../container/decorators.js";
2321
import { TYPES } from "../types/index.js";
@@ -62,7 +60,7 @@ import type { IToolRegistry } from "../tools/tool-registry.js";
6260
* Receives the client's capabilities so upstream connections can be configured accordingly.
6361
*/
6462
export type OnDownstreamInitializedCallback = (
65-
capabilities: DownstreamCapabilities,
63+
capabilities: ClientCapabilities,
6664
) => void | Promise<void>;
6765

6866
@injectable()
@@ -217,14 +215,11 @@ export class MCPGatewayServer {
217215
this.server.server.oninitialized = async () => {
218216
const clientCaps = this.server.server.getClientCapabilities();
219217

220-
// Extract the capabilities we care about for proxying
221-
const downstreamCaps: DownstreamCapabilities = {
222-
sampling: clientCaps?.sampling,
223-
elicitation: clientCaps?.elicitation,
224-
};
218+
// Forward all client capabilities to upstream servers
219+
const downstreamCaps: ClientCapabilities = clientCaps || {};
225220

226221
this.logger.debug(
227-
`Downstream client initialized with capabilities: sampling=${!!downstreamCaps.sampling}, elicitation=${!!downstreamCaps.elicitation}`,
222+
`Downstream client initialized with capabilities: sampling=${!!downstreamCaps.sampling}, elicitation=${!!downstreamCaps.elicitation}, roots=${!!downstreamCaps.roots}`,
228223
);
229224

230225
// Call the callback and await it to ensure proper initialization order
@@ -236,14 +231,12 @@ export class MCPGatewayServer {
236231
* Get the downstream client's capabilities after initialization.
237232
* Returns undefined if the client hasn't initialized yet.
238233
*/
239-
getDownstreamCapabilities(): DownstreamCapabilities | undefined {
234+
getClientCapabilities(): ClientCapabilities | undefined {
240235
const clientCaps = this.server.server.getClientCapabilities();
241236
if (!clientCaps) return undefined;
242237

243-
return {
244-
sampling: clientCaps.sampling,
245-
elicitation: clientCaps.elicitation,
246-
};
238+
// Return all client capabilities
239+
return clientCaps;
247240
}
248241

249242
getServer(): McpServer {
@@ -307,41 +300,4 @@ export class MCPGatewayServer {
307300
}
308301
}
309302

310-
/**
311-
* Request the list of roots from the downstream client.
312-
* Returns undefined if the client doesn't support roots or the request fails.
313-
*
314-
* @returns The list of roots from the client, or undefined if unavailable
315-
*/
316-
async requestRootsFromClient(): Promise<Root[] | undefined> {
317-
try {
318-
this.logger.debug("Requesting roots from downstream client");
319-
320-
// Add a timeout to prevent blocking if client doesn't support roots
321-
const timeoutMs = 1000;
322-
const timeoutPromise = new Promise<never>((_, reject) =>
323-
setTimeout(() => reject(new Error("Timeout")), timeoutMs),
324-
);
325-
326-
const requestPromise = this.server.server.request(
327-
{ method: "roots/list" },
328-
ListRootsRequestSchema,
329-
);
330-
331-
const result = (await Promise.race([
332-
requestPromise,
333-
timeoutPromise,
334-
])) as unknown as {
335-
roots: Root[];
336-
};
337-
338-
this.logger.debug(`Received ${result.roots.length} root(s) from client`);
339-
return result.roots;
340-
} catch {
341-
this.logger.debug(
342-
"Downstream client does not support roots or request failed",
343-
);
344-
return undefined;
345-
}
346-
}
347303
}

0 commit comments

Comments
 (0)