use mcp request handler extra to send notifications

Author: MQ37

src/mcp/server.ts

@@ -344,7 +344,7 @@ export class ActorsMcpServer {
          * @param {object} request - The request object containing tool name and arguments.
          * @throws {McpError} - based on the McpServer class code from the typescript MCP SDK
          */
-        this.server.setRequestHandler(CallToolRequestSchema, async (request) => {
+        this.server.setRequestHandler(CallToolRequestSchema, async (request, extra) => {
             // eslint-disable-next-line prefer-const
             let { name, arguments: args } = request.params;
             const apifyToken = (request.params.apifyToken || process.env.APIFY_TOKEN) as string;
@@ -412,6 +412,7 @@ export class ActorsMcpServer {
                     const internalTool = tool.tool as HelperTool;
                     const res = await internalTool.call({
                         args,
+                        extra,
                         apifyMcpServer: this,
                         mcpServer: this.server,
                         apifyToken,

src/tools/helpers.ts

@@ -78,7 +78,7 @@ export const addTool: ToolEntry = {
         ajvValidate: ajv.compile(zodToJsonSchema(addToolArgsSchema)),
         // TODO: I don't like that we are passing apifyMcpServer and mcpServer to the tool
         call: async (toolArgs) => {
-            const { apifyMcpServer, mcpServer, apifyToken, args } = toolArgs;
+            const { apifyMcpServer, apifyToken, args, extra } = toolArgs;
             const parsed = addToolArgsSchema.parse(args);
             if (apifyMcpServer.listAllToolNames().includes(parsed.actorName)) {
                 return {
@@ -90,7 +90,7 @@ export const addTool: ToolEntry = {
             }
             const tools = await getActorsAsTools([parsed.actorName], apifyToken);
             const toolsAdded = apifyMcpServer.upsertTools(tools, true);
-            await mcpServer.notification({ method: 'notifications/tools/list_changed' });
+            await extra.sendNotification({ method: 'notifications/tools/list_changed' });
 
             return {
                 content: [{
@@ -121,13 +121,13 @@ export const removeTool: ToolEntry = {
         ajvValidate: ajv.compile(zodToJsonSchema(removeToolArgsSchema)),
         // TODO: I don't like that we are passing apifyMcpServer and mcpServer to the tool
         call: async (toolArgs) => {
-            const { apifyMcpServer, mcpServer, args } = toolArgs;
+            const { apifyMcpServer, args, extra } = toolArgs;
             const parsed = removeToolArgsSchema.parse(args);
             // Check if tool exists before attempting removal
             if (!apifyMcpServer.tools.has(parsed.toolName)) {
                 // Send notification so client can update its tool list
                 // just in case the client tool list is out of sync
-                await mcpServer.notification({ method: 'notifications/tools/list_changed' });
+                await extra.sendNotification({ method: 'notifications/tools/list_changed' });
                 return {
                     content: [{
                         type: 'text',
@@ -136,7 +136,7 @@ export const removeTool: ToolEntry = {
                 };
             }
             const removedTools = apifyMcpServer.removeToolsByName([parsed.toolName], true);
-            await mcpServer.notification({ method: 'notifications/tools/list_changed' });
+            await extra.sendNotification({ method: 'notifications/tools/list_changed' });
             return { content: [{ type: 'text', text: `Tools removed: ${removedTools.join(', ')}` }] };
         },
     } as InternalTool,

src/types.ts

@@ -1,4 +1,6 @@
 import type { Server } from '@modelcontextprotocol/sdk/server/index.js';
+import type { RequestHandlerExtra } from '@modelcontextprotocol/sdk/shared/protocol.js';
+import type { Notification, Request } from '@modelcontextprotocol/sdk/types.js';
 import type { ValidateFunction } from 'ajv';
 import type { ActorDefaultRunOptions, ActorDefinition } from 'apify-client';
 
@@ -80,6 +82,10 @@ export interface ActorTool extends ToolBase {
 export type InternalToolArgs = {
     /** Arguments passed to the tool */
     args: Record<string, unknown>;
+    /** MCP server extra args.
+     * Can be used to send notifications from the server to the client.
+     */
+    extra: RequestHandlerExtra<Request, Notification>;
     /** Reference to the Apify MCP server instance */
     apifyMcpServer: ActorsMcpServer;
     /** Reference to the MCP server instance */