tool management via server instance

Author: chipgpt

src/server/mcp.test.ts

@@ -529,9 +529,9 @@ describe("tool()", () => {
   });
 
   /***
-   * Test: Tool self removal
+   * Test: Tool disable, enable, and remove via tool instance
    */
-  test("should remove tool when using tool.remove()", async () => {
+  test("should manage tool when using tool instance", async () => {
     const mcpServer = new McpServer({
       name: "test server",
       version: "1.0",
@@ -547,18 +547,28 @@ describe("tool()", () => {
       ],
     }));
 
-    expect(mcpServer['_registeredTools']['test']).toBeDefined();
+    expect(mcpServer['_registeredTools'].test).toBeDefined();
+
+    // Now disable the tool
+    tool.disable();
+
+    expect(mcpServer['_registeredTools'].test.enabled).toBe(false);
+
+    // Now enable the tool
+    tool.enable();
+
+    expect(mcpServer['_registeredTools'].test.enabled).toBe(true);
 
     // Now delete the tool
     tool.remove();
 
-    expect(mcpServer['_registeredTools']['test']).toBeUndefined();
+    expect(mcpServer['_registeredTools'].test).toBeUndefined();
   });
 
   /***
-   * Test: Tool server removal
+   * Test: Tool disable, enable, and remove via server instance
    */
-  test("should remove tool when using server.removeTool(...)", async () => {
+  test("should manage tool when using server instance", async () => {
     const mcpServer = new McpServer({
       name: "test server",
       version: "1.0",
@@ -574,12 +584,22 @@ describe("tool()", () => {
       ],
     }));
 
-    expect(mcpServer['_registeredTools']['test']).toBeDefined();
+    expect(mcpServer['_registeredTools'].test).toBeDefined();
+
+    // Now disable the tool
+    mcpServer.disableTool("test");
+
+    expect(mcpServer['_registeredTools'].test.enabled).toBe(false);
+
+    // Now enable the tool
+    mcpServer.enableTool("test");
+
+    expect(mcpServer['_registeredTools'].test.enabled).toBe(true);
 
     // Now delete the tool
     mcpServer.removeTool("test");
 
-    expect(mcpServer['_registeredTools']['test']).toBeUndefined();
+    expect(mcpServer['_registeredTools'].test).toBeUndefined();
   });
 
   /***

src/server/mcp.ts

@@ -955,6 +955,39 @@ export class McpServer {
     );
   }
 
+  /**
+   * Enables a tool from the server by name.
+   * Does nothing if the tool is not registered.
+   */
+  enableTool(name: string) {
+    const tool = this._registeredTools[name];
+    if (tool) {
+      tool.enable();
+    }
+  };
+
+  /**
+   * Disables a tool from the server by name.
+   * Does nothing if the tool is not registered.
+   */
+  disableTool(name: string) {
+    const tool = this._registeredTools[name];
+    if (tool) {
+      tool.disable();
+    }
+  };
+
+  /**
+   * Updates a tool from the server by name.
+   * Does nothing if the tool is not registered.
+   */
+  updateTool<InputArgs extends ZodRawShape, OutputArgs extends ZodRawShape>(name: string, updates: ToolUpdates<InputArgs, OutputArgs>) {
+    const tool = this._registeredTools[name];
+    if (tool) {
+      tool.update(updates);
+    }
+  };
+
   /**
    * Removes a tool from the server by name.
    * Does nothing if the tool is not registered.
@@ -1184,6 +1217,18 @@ export type ToolCallback<Args extends undefined | ZodRawShape = undefined> =
   ) => CallToolResult | Promise<CallToolResult>
   : (extra: RequestHandlerExtra<ServerRequest, ServerNotification>) => CallToolResult | Promise<CallToolResult>;
 
+export type ToolUpdates<InputArgs extends ZodRawShape, OutputArgs extends ZodRawShape> = {
+  name?: string | null,
+  title?: string,
+  description?: string,
+  paramsSchema?: InputArgs,
+  outputSchema?: OutputArgs,
+  annotations?: ToolAnnotations,
+  _meta?: Record<string, unknown>,
+  callback?: ToolCallback<InputArgs>,
+  enabled?: boolean
+}
+
 export type RegisteredTool = {
   title?: string;
   description?: string;
@@ -1196,17 +1241,8 @@ export type RegisteredTool = {
   enable(): void;
   disable(): void;
   update<InputArgs extends ZodRawShape, OutputArgs extends ZodRawShape>(
-    updates: {
-      name?: string | null,
-      title?: string,
-      description?: string,
-      paramsSchema?: InputArgs,
-      outputSchema?: OutputArgs,
-      annotations?: ToolAnnotations,
-      _meta?: Record<string, unknown>,
-      callback?: ToolCallback<InputArgs>,
-      enabled?: boolean
-    }): void
+    updates: ToolUpdates<InputArgs, OutputArgs>
+  ): void
   remove(): void
 };