feat: mcp tools as plugins

src/__tests__/__snapshots__/options.defaults.test.ts.snap

@@ -37,7 +37,7 @@ exports[`options defaults should return specific properties: defaults 1`] = `
     "invokeTimeoutMs": 10000,
     "loadTimeoutMs": 5000,
   },
-  "pluginIsolation": "none",
+  "pluginIsolation": "strict",
   "repoName": "patternfly-mcp",
   "resourceMemoOptions": {
     "default": {

src/__tests__/__snapshots__/options.test.ts.snap

@@ -17,6 +17,8 @@ exports[`parseCliOptions should attempt to parse args with --allowed-hosts 1`] =
     "stderr": false,
     "transport": "stdio",
   },
+  "pluginIsolation": undefined,
+  "toolModules": [],
 }
 `;
 
@@ -37,6 +39,8 @@ exports[`parseCliOptions should attempt to parse args with --allowed-origins 1`]
     "stderr": false,
     "transport": "stdio",
   },
+  "pluginIsolation": undefined,
+  "toolModules": [],
 }
 `;
 
@@ -52,6 +56,8 @@ exports[`parseCliOptions should attempt to parse args with --docs-host flag 1`]
     "stderr": false,
     "transport": "stdio",
   },
+  "pluginIsolation": undefined,
+  "toolModules": [],
 }
 `;
 
@@ -69,6 +75,8 @@ exports[`parseCliOptions should attempt to parse args with --http and --host 1`]
     "stderr": false,
     "transport": "stdio",
   },
+  "pluginIsolation": undefined,
+  "toolModules": [],
 }
 `;
 
@@ -86,6 +94,8 @@ exports[`parseCliOptions should attempt to parse args with --http and --port 1`]
     "stderr": false,
     "transport": "stdio",
   },
+  "pluginIsolation": undefined,
+  "toolModules": [],
 }
 `;
 
@@ -101,6 +111,8 @@ exports[`parseCliOptions should attempt to parse args with --http and invalid --
     "stderr": false,
     "transport": "stdio",
   },
+  "pluginIsolation": undefined,
+  "toolModules": [],
 }
 `;
 
@@ -116,6 +128,8 @@ exports[`parseCliOptions should attempt to parse args with --http flag 1`] = `
     "stderr": false,
     "transport": "stdio",
   },
+  "pluginIsolation": undefined,
+  "toolModules": [],
 }
 `;
 
@@ -131,6 +145,8 @@ exports[`parseCliOptions should attempt to parse args with --log-level flag 1`]
     "stderr": false,
     "transport": "stdio",
   },
+  "pluginIsolation": undefined,
+  "toolModules": [],
 }
 `;
 
@@ -146,6 +162,8 @@ exports[`parseCliOptions should attempt to parse args with --log-stderr flag and
     "stderr": true,
     "transport": "stdio",
   },
+  "pluginIsolation": undefined,
+  "toolModules": [],
 }
 `;
 
@@ -161,6 +179,8 @@ exports[`parseCliOptions should attempt to parse args with --verbose flag 1`] =
     "stderr": false,
     "transport": "stdio",
   },
+  "pluginIsolation": undefined,
+  "toolModules": [],
 }
 `;
 
@@ -176,6 +196,8 @@ exports[`parseCliOptions should attempt to parse args with --verbose flag and --
     "stderr": false,
     "transport": "stdio",
   },
+  "pluginIsolation": undefined,
+  "toolModules": [],
 }
 `;
 
@@ -191,6 +213,8 @@ exports[`parseCliOptions should attempt to parse args with other arguments 1`] =
     "stderr": false,
     "transport": "stdio",
   },
+  "pluginIsolation": undefined,
+  "toolModules": [],
 }
 `;
 
@@ -206,5 +230,7 @@ exports[`parseCliOptions should attempt to parse args without --docs-host flag 1
     "stderr": false,
     "transport": "stdio",
   },
+  "pluginIsolation": undefined,
+  "toolModules": [],
 }
 `;

src/__tests__/__snapshots__/server.test.ts.snap

@@ -6,6 +6,9 @@ exports[`runServer should allow server to be stopped, http stop server: diagnost
     [
       "Server logging enabled.",
     ],
+    [
+      "No external tools loaded.",
+    ],
     [
       "Registered tool: usePatternFlyDocs",
     ],
@@ -35,6 +38,9 @@ exports[`runServer should allow server to be stopped, stdio stop server: diagnos
     [
       "Server logging enabled.",
     ],
+    [
+      "No external tools loaded.",
+    ],
     [
       "Registered tool: usePatternFlyDocs",
     ],
@@ -64,6 +70,9 @@ exports[`runServer should attempt to run server, create transport, connect, and
     [
       "Server logging enabled.",
     ],
+    [
+      "No external tools loaded.",
+    ],
     [
       "test-server-4 server running on stdio transport",
     ],
@@ -98,6 +107,9 @@ exports[`runServer should attempt to run server, disable SIGINT handler: diagnos
     [
       "Server logging enabled.",
     ],
+    [
+      "No external tools loaded.",
+    ],
     [
       "test-server-7 server running on stdio transport",
     ],
@@ -127,6 +139,9 @@ exports[`runServer should attempt to run server, enable SIGINT handler explicitl
     [
       "Server logging enabled.",
     ],
+    [
+      "No external tools loaded.",
+    ],
     [
       "test-server-8 server running on stdio transport",
     ],
@@ -161,12 +176,18 @@ exports[`runServer should attempt to run server, register a tool: diagnostics 1`
     [
       "Server logging enabled.",
     ],
+    [
+      "No external tools loaded.",
+    ],
     [
       "Registered tool: loremIpsum",
     ],
     [
       "test-server-5 server running on stdio transport",
     ],
+    [
+      "Built-in tool at index 0 is missing the static name property, "toolName"",
+    ],
     [
       "Tool "loremIpsum" has a non Zod inputSchema. This may cause unexpected issues.",
     ],
@@ -203,6 +224,9 @@ exports[`runServer should attempt to run server, register multiple tools: diagno
     [
       "Server logging enabled.",
     ],
+    [
+      "No external tools loaded.",
+    ],
     [
       "Registered tool: loremIpsum",
     ],
@@ -212,6 +236,12 @@ exports[`runServer should attempt to run server, register multiple tools: diagno
     [
       "test-server-6 server running on stdio transport",
     ],
+    [
+      "Built-in tool at index 0 is missing the static name property, "toolName"",
+    ],
+    [
+      "Built-in tool at index 1 is missing the static name property, "toolName"",
+    ],
     [
       "Tool "loremIpsum" has a non Zod inputSchema. This may cause unexpected issues.",
     ],
@@ -252,6 +282,9 @@ exports[`runServer should attempt to run server, use custom options: diagnostics
     [
       "Server logging enabled.",
     ],
+    [
+      "No external tools loaded.",
+    ],
     [
       "test-server-3 server running on stdio transport",
     ],
@@ -286,6 +319,9 @@ exports[`runServer should attempt to run server, use default tools, http: diagno
     [
       "Server logging enabled.",
     ],
+    [
+      "No external tools loaded.",
+    ],
     [
       "Registered tool: usePatternFlyDocs",
     ],
@@ -333,6 +369,9 @@ exports[`runServer should attempt to run server, use default tools, stdio: diagn
     [
       "Server logging enabled.",
     ],
+    [
+      "No external tools loaded.",
+    ],
     [
       "Registered tool: usePatternFlyDocs",
     ],

src/__tests__/__snapshots__/server.tools.test.ts.snap

@@ -17,6 +17,9 @@ exports[`composeTools should attempt to setup creators, file package creators 1`
 exports[`composeTools should attempt to setup creators, file package creators, Node.js 20 1`] = `
 {
   "log": [
+    [
+      "Existing Tools Host session detected test-session-id. Shutting down the existing host before creating a new one.",
+    ],
     [
       "External tool plugins require Node >= 22; skipping file-based tools.",
     ],
@@ -27,14 +30,21 @@ exports[`composeTools should attempt to setup creators, file package creators, N
 
 exports[`composeTools should attempt to setup creators, file package creators, Node.js 24 1`] = `
 {
-  "log": [],
+  "log": [
+    [
+      "Existing Tools Host session detected test-session-id. Shutting down the existing host before creating a new one.",
+    ],
+  ],
   "toolsCount": 5,
 }
 `;
 
 exports[`composeTools should attempt to setup creators, file package creators, Node.js undefined 1`] = `
 {
   "log": [
+    [
+      "Existing Tools Host session detected test-session-id. Shutting down the existing host before creating a new one.",
+    ],
     [
       "External tool plugins require Node >= 22; skipping file-based tools.",
     ],
@@ -46,6 +56,9 @@ exports[`composeTools should attempt to setup creators, file package creators, N
 exports[`composeTools should attempt to setup creators, file package duplicate creators 1`] = `
 {
   "log": [
+    [
+      "Existing Tools Host session detected test-session-id. Shutting down the existing host before creating a new one.",
+    ],
     [
       "Skipping tool plugin "@patternfly/tools" – name already used by built-in/inline tool.",
     ],
@@ -56,14 +69,21 @@ exports[`composeTools should attempt to setup creators, file package duplicate c
 
 exports[`composeTools should attempt to setup creators, inline and file package creators 1`] = `
 {
-  "log": [],
+  "log": [
+    [
+      "Existing Tools Host session detected test-session-id. Shutting down the existing host before creating a new one.",
+    ],
+  ],
   "toolsCount": 7,
 }
 `;
 
 exports[`composeTools should attempt to setup creators, inline and file package creators duplicate builtin creators 1`] = `
 {
   "log": [
+    [
+      "Existing Tools Host session detected test-session-id. Shutting down the existing host before creating a new one.",
+    ],
     [
       "Skipping inline tool "loremipsum" because a tool with the same name is already provided (built-in or earlier).",
     ],
@@ -78,6 +98,9 @@ exports[`composeTools should attempt to setup creators, inline and file package
 exports[`composeTools should attempt to setup creators, inline and file package creators, duplicates 1`] = `
 {
   "log": [
+    [
+      "Existing Tools Host session detected test-session-id. Shutting down the existing host before creating a new one.",
+    ],
     [
       "Skipping tool plugin "@patternfly/tools" – name already used by built-in/inline tool.",
     ],
@@ -92,6 +115,9 @@ exports[`composeTools should attempt to setup creators, inline and file package
 exports[`composeTools should attempt to setup creators, inline and file package creators, duplicates, Node.js 20 1`] = `
 {
   "log": [
+    [
+      "Existing Tools Host session detected test-session-id. Shutting down the existing host before creating a new one.",
+    ],
     [
       "External tool plugins require Node >= 22; skipping file-based tools.",
     ],

src/__tests__/index.test.ts

@@ -8,6 +8,7 @@ import { runServer } from '../server';
 jest.mock('../options');
 jest.mock('../options.context');
 jest.mock('../server');
+jest.mock('../server.tools');
 
 const mockParseCliOptions = parseCliOptions as jest.MockedFunction<typeof parseCliOptions>;
 const mockSetOptions = setOptions as jest.MockedFunction<typeof setOptions>;

src/__tests__/options.context.test.ts

@@ -13,24 +13,33 @@ const MockStdioServerTransport = StdioServerTransport as jest.MockedClass<typeof
 
 describe('setOptions', () => {
   it('should ignore valid but incorrect options for merged options', () => {
-    const updatedOptions = setOptions({ logging: 'oops' as any, resourceMemoOptions: 'gotcha' as any, toolMemoOptions: 'really?' as any });
+    const updatedOptions = setOptions({
+      logging: 'oops' as any,
+      resourceMemoOptions: 'gotcha' as any,
+      toolMemoOptions: 'really?' as any,
+      pluginIsolation: 'fun' as any
+    });
 
     expect(updatedOptions.logging.protocol).toBe(DEFAULT_OPTIONS.logging.protocol);
     expect(updatedOptions.resourceMemoOptions?.readFile?.expire).toBe(DEFAULT_OPTIONS.resourceMemoOptions?.readFile?.expire);
     expect(updatedOptions.toolMemoOptions?.fetchDocs?.expire).toBe(DEFAULT_OPTIONS.toolMemoOptions?.fetchDocs?.expire);
+    expect(updatedOptions.pluginIsolation).toBe(DEFAULT_OPTIONS.pluginIsolation);
   });
 
   it('should ignore null/invalid nested overrides safely', () => {
-    const updatedOptions = setOptions({ logging: null as any, resourceMemoOptions: null as any });
+    const updatedOptions = setOptions({ logging: null as any, resourceMemoOptions: null as any, pluginIsolation: null as any });
 
-    expect(typeof updatedOptions.logging.protocol === 'boolean').toBe(true);
+    expect(typeof updatedOptions.logging.protocol).toBe('boolean');
     expect(updatedOptions.logging.protocol).toBe(DEFAULT_OPTIONS.logging.protocol);
 
-    expect(typeof updatedOptions.resourceMemoOptions?.readFile?.expire === 'number').toBe(true);
+    expect(typeof updatedOptions.resourceMemoOptions?.readFile?.expire).toBe('number');
     expect(updatedOptions.resourceMemoOptions?.readFile?.expire).toBe(DEFAULT_OPTIONS.resourceMemoOptions?.readFile?.expire);
 
-    expect(typeof updatedOptions.toolMemoOptions?.fetchDocs?.expire === 'number').toBe(true);
+    expect(typeof updatedOptions.toolMemoOptions?.fetchDocs?.expire).toBe('number');
     expect(updatedOptions.toolMemoOptions?.fetchDocs?.expire).toBe(DEFAULT_OPTIONS.toolMemoOptions?.fetchDocs?.expire);
+
+    expect(typeof updatedOptions.pluginIsolation).toBe('string');
+    expect(updatedOptions.pluginIsolation).toBe(DEFAULT_OPTIONS.pluginIsolation);
   });
 });
 

src/__tests__/server.toolsUser.test.ts

@@ -18,7 +18,7 @@ import {
   sanitizeStaticToolName,
   type Tool,
   type ToolCreator,
-  type MultiToolConfig,
+  type ToolMultiConfig,
   type ToolConfig
 } from '../server.toolsUser';
 import { isZodSchema } from '../server.schema';
@@ -710,7 +710,7 @@ describe('createMcpTool', () => {
         createMcpTool(['dolorSit', { description: 'dolor sit', inputSchema: { type: 'object', properties: {} } }, () => {}]),
         createMcpTool('@scope/pkg4'),
         '@scope/pkg5'
-      ] as MultiToolConfig
+      ] as ToolMultiConfig
     }
   ])('should normalize configs, $description', ({ config }) => {
     const result = createMcpTool(config);