Demonstrate registration of tools conditioned upon client capability support. Also, obviated need for clientConnected callback to pass sessionId because we defer initial fetching of roots happens when you run the get-roots-list tool.

* In how-it-works.md,
  - added a section on conditional tool registration

* In server/index.ts
  - import registerConditionalTools
  - in an oninitialized handler for the server, call registerConditionalTools
  - removed clientConnected from ServerFactoryResponse and all mentions in docs

* In tools/index.ts
  - export a registerConditionalTools function
  - refactor/move calls to registerGetRootsListTool, registerTriggerElicitationRequestTool, and registerTriggerSamplingRequestTool out of registerTools and into registerConditionalTools

* In server/roots.ts
  - only act if client supports roots
  - remove setInterval from call to requestRoots. It isn't happening during the initialze handshake anymore, so it doesn't interfere with that process if called immediaately

* In get-roots-list.ts, trigger-elicitation-request.ts, and trigger-sampling-request.ts,
  - only register tool if client supports capability

* Throughout the rest of the files, removing all references to `clientConnected`
This commit is contained in:
cliffhall 2025-12-15 17:51:30 -05:00
commit 1b8f376b90
3 changed files with 323 additions and 323 deletions

View file

@ -25,7 +25,7 @@ const transports: Map<string, SSEServerTransport> = new Map<
// Handle GET requests for new SSE streams
app.get("/sse", async (req, res) => {
let transport: SSEServerTransport;
const { server, clientConnected, cleanup } = createServer();
const { server, cleanup } = createServer();
// Session Id should not exist for GET /sse requests
if (req?.query?.sessionId) {
@ -40,10 +40,9 @@ app.get("/sse", async (req, res) => {
transport = new SSEServerTransport("/message", res);
transports.set(transport.sessionId, transport);
// Connect server to transport and invoke clientConnected callback
// Connect server to transport
await server.connect(transport);
const sessionId = transport.sessionId;
clientConnected(sessionId);
console.error("Client Connected: ", sessionId);
// Handle close of connection

View file

@ -8,18 +8,16 @@ console.error("Starting default (STDIO) server...");
/**
* The main method
* - Initializes the StdioServerTransport, sets up the server,
* - Connects the transport to the server, invokes the `clientConnected` callback,
* - Handles cleanup on process exit.
*
* @return {Promise<void>} A promise that resolves when the main function has executed and the process exits.
*/
async function main(): Promise<void> {
const transport = new StdioServerTransport();
const { server, clientConnected, cleanup } = createServer();
const { server, cleanup } = createServer();
// Connect transport to server and invoke clientConnected callback
// Connect transport to server
await server.connect(transport);
clientConnected();
// Cleanup on exit
process.on("SIGINT", async () => {

View file

@ -38,7 +38,7 @@ app.post("/mcp", async (req: Request, res: Response) => {
// Reuse existing transport
transport = transports.get(sessionId)!;
} else if (!sessionId) {
const { server, clientConnected, cleanup } = createServer();
const { server, cleanup } = createServer();
// New initialization request
const eventStore = new InMemoryEventStore();
@ -68,7 +68,6 @@ app.post("/mcp", async (req: Request, res: Response) => {
// Connect the transport to the MCP server BEFORE handling the request
// so responses can flow back through the same transport
await server.connect(transport);
clientConnected(transport.sessionId);
await transport.handleRequest(req, res);
return;
} else {