Revert the handler signature change

Author: sf-cboscenco

packages/b2c-dx-mcp/package.json

@@ -96,7 +96,6 @@
     "@modelcontextprotocol/sdk": "1.26.0",
     "@oclif/core": "catalog:",
     "@salesforce/b2c-tooling-sdk": "workspace:*",
-    "glob": "catalog:",
     "ts-morph": "^27.0.0",
     "yaml": "2.8.1",
     "zod": "3.25.76"

packages/b2c-dx-mcp/src/registry.ts

@@ -266,6 +266,6 @@ async function registerTools(tools: McpTool[], server: B2CDxMcpServer, allowNonG
 
     // Register the tool
     // TODO: Telemetry - Tool registration includes timing/error tracking
-    server.addTool(tool.name, tool.description, tool.inputSchema, async (args, context) => tool.handler(args, context));
+    server.addTool(tool.name, tool.description, tool.inputSchema, async (args) => tool.handler(args));
   }
 }

packages/b2c-dx-mcp/src/server.ts

@@ -72,18 +72,15 @@ export class B2CDxMcpServer extends McpServer {
     name: string,
     description: string,
     inputSchema: ZodRawShape,
-    handler: (
-      args: Record<string, unknown>,
-      context: RequestHandlerExtra<ServerRequest, ServerNotification>,
-    ) => Promise<CallToolResult>,
+    handler: (args: Record<string, unknown>) => Promise<CallToolResult>,
   ): void {
     const wrappedHandler = async (
       args: Record<string, unknown>,
-      extra: RequestHandlerExtra<ServerRequest, ServerNotification>,
+      _extra: RequestHandlerExtra<ServerRequest, ServerNotification>,
     ): Promise<CallToolResult> => {
       const startTime = Date.now();
       try {
-        const result = await handler(args, extra);
+        const result = await handler(args);
         const runTimeMs = Date.now() - startTime;
 
         await this.telemetry

packages/b2c-dx-mcp/src/tools/adapter.ts

@@ -73,8 +73,6 @@
 
 import {z, type ZodRawShape, type ZodObject, type ZodType} from 'zod';
 import type {B2CInstance} from '@salesforce/b2c-tooling-sdk';
-import type {ServerNotification, ServerRequest} from '@modelcontextprotocol/sdk/types.js';
-import type {RequestHandlerExtra} from '@modelcontextprotocol/sdk/shared/protocol.js';
 import type {McpTool, ToolResult, Toolset} from '../utils/index.js';
 import type {Services, MrtConfig} from '../services.js';
 
@@ -280,10 +278,7 @@ export function createToolAdapter<TInput, TOutput>(
     toolsets,
     isGA,
 
-    async handler(
-      rawArgs: Record<string, unknown>,
-      _mcpContext: RequestHandlerExtra<ServerRequest, ServerNotification>,
-    ): Promise<ToolResult> {
+    async handler(rawArgs: Record<string, unknown>): Promise<ToolResult> {
       // 1. Validate input with Zod
       const parseResult = zodSchema.safeParse(rawArgs);
       if (!parseResult.success) {

packages/b2c-dx-mcp/src/tools/page-designer-decorator/README.md

@@ -241,7 +241,6 @@ pnpm run test:agent -- test/tools/page-designer-decorator/index.test.ts
 ```
 
 The test suite covers:
-
 - Component discovery (name-based, kebab-case, nested, path-based, custom paths, name collisions)
 - Auto mode (basic, type inference, complex props exclusion, UI-only props exclusion, edge cases)
 - Interactive mode (all steps: analyze, select_props, configure_attrs, configure_regions, confirm_generation)

packages/b2c-dx-mcp/src/tools/page-designer-decorator/index.ts

@@ -5,8 +5,6 @@
  */
 
 import {z, type ZodRawShape} from 'zod';
-import type {ServerNotification, ServerRequest} from '@modelcontextprotocol/sdk/types.js';
-import type {RequestHandlerExtra} from '@modelcontextprotocol/sdk/shared/protocol.js';
 import {componentAnalyzer, generateTypeSuggestions, resolveComponent, type TypeSuggestion} from './analyzer.js';
 import {generateDecoratorCode, type AttributeContext, type MetadataContext} from './templates/decorator-generator.js';
 import {pageDesignerDecoratorRules} from './rules.js';
@@ -619,7 +617,7 @@ export function createPageDesignerDecoratorTool(loadServices: () => Services): M
     toolsets: ['STOREFRONTNEXT'],
     isGA: false,
 
-    async handler(args: Record<string, unknown>, _context: RequestHandlerExtra<ServerRequest, ServerNotification>) {
+    async handler(args: Record<string, unknown>) {
       try {
         // Validate and parse input
         const validatedArgs = pageDesignerDecoratorSchema.parse(args) as PageDesignerDecoratorInput;

packages/b2c-dx-mcp/src/utils/types.ts

@@ -5,8 +5,7 @@
  */
 
 import type {z, ZodRawShape} from 'zod';
-import type {CallToolResult, ServerNotification, ServerRequest} from '@modelcontextprotocol/sdk/types.js';
-import type {RequestHandlerExtra} from '@modelcontextprotocol/sdk/shared/protocol.js';
+import type {CallToolResult} from '@modelcontextprotocol/sdk/types.js';
 import type {Toolset} from './constants.js';
 
 /**
@@ -36,10 +35,7 @@ export interface McpToolConfig<T extends ZodRawShape = ZodRawShape> {
  */
 export interface McpTool<T extends ZodRawShape = ZodRawShape> extends McpToolConfig<T> {
   /** Handler function that executes the tool */
-  handler: (
-    args: z.infer<z.ZodObject<T>>,
-    context: RequestHandlerExtra<ServerRequest, ServerNotification>,
-  ) => Promise<ToolResult>;
+  handler: (args: z.infer<z.ZodObject<T>>) => Promise<ToolResult>;
 }
 
 /**

packages/b2c-dx-mcp/test/tools/adapter.test.ts

@@ -183,21 +183,18 @@ describe('tools/adapter', () => {
       );
 
       // Test with valid input
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      const validResult = await tool.handler({name: 'test', count: 5}, {} as any);
+      const validResult = await tool.handler({name: 'test', count: 5});
       expect(validResult.isError).to.be.undefined;
       expect(getResultText(validResult)).to.equal('Received: test, 5');
 
       // Test with missing required field
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      const missingResult = await tool.handler({count: 5}, {} as any);
+      const missingResult = await tool.handler({count: 5});
       expect(missingResult.isError).to.be.true;
       expect(getResultText(missingResult)).to.include('Invalid input');
       expect(getResultText(missingResult)).to.include('name');
 
       // Test with invalid type
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      const invalidTypeResult = await tool.handler({name: 'test', count: 'not-a-number'}, {} as any);
+      const invalidTypeResult = await tool.handler({name: 'test', count: 'not-a-number'});
       expect(invalidTypeResult.isError).to.be.true;
       expect(getResultText(invalidTypeResult)).to.include('Invalid input');
     });
@@ -220,8 +217,7 @@ describe('tools/adapter', () => {
         loadServices,
       );
 
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      const result = await tool.handler({email: 'not-an-email'}, {} as any);
+      const result = await tool.handler({email: 'not-an-email'});
 
       expect(result.isError).to.be.true;
       expect(getResultText(result)).to.include('Invalid input');
@@ -246,8 +242,7 @@ describe('tools/adapter', () => {
         loadServices,
       );
 
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      const result = await tool.handler({}, {} as any);
+      const result = await tool.handler({});
 
       expect(result.isError).to.be.true;
       expect(getResultText(result)).to.include('Execution error');
@@ -272,8 +267,7 @@ describe('tools/adapter', () => {
         loadServices,
       );
 
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      const result = await tool.handler({}, {} as any);
+      const result = await tool.handler({});
 
       expect(result.isError).to.be.true;
       expect(getResultText(result)).to.include('Execution error');
@@ -300,8 +294,7 @@ describe('tools/adapter', () => {
         loadServices,
       );
 
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      await tool.handler({}, {} as any);
+      await tool.handler({});
 
       const services = loadServices();
       expect(receivedServices).to.equal(services);
@@ -329,8 +322,7 @@ describe('tools/adapter', () => {
         loadServices,
       );
 
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      const result = await tool.handler({projectName: 'my-storefront'}, {} as any);
+      const result = await tool.handler({projectName: 'my-storefront'});
 
       expect(result.isError).to.be.undefined;
       expect(getResultText(result)).to.equal('Created project: my-storefront');
@@ -357,8 +349,7 @@ describe('tools/adapter', () => {
         loadServices,
       );
 
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      const result = await tool.handler({}, {} as any);
+      const result = await tool.handler({});
 
       expect(result.isError).to.be.undefined;
       const parsed = JSON.parse(getResultText(result));
@@ -407,14 +398,12 @@ describe('tools/adapter', () => {
       );
 
       // Without optional field
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      const result1 = await tool.handler({required: 'value'}, {} as any);
+      const result1 = await tool.handler({required: 'value'});
       expect(result1.isError).to.be.undefined;
       expect(getResultText(result1)).to.equal('required: value, optional: not provided');
 
       // With optional field
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      const result2 = await tool.handler({required: 'value', optional: 'present'}, {} as any);
+      const result2 = await tool.handler({required: 'value', optional: 'present'});
       expect(result2.isError).to.be.undefined;
       expect(getResultText(result2)).to.equal('required: value, optional: present');
     });
@@ -437,8 +426,7 @@ describe('tools/adapter', () => {
         loadServices,
       );
 
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      const result = await tool.handler({items: ['a', 'b', 'c']}, {} as any);
+      const result = await tool.handler({items: ['a', 'b', 'c']});
 
       expect(result.isError).to.be.undefined;
       expect(getResultText(result)).to.equal('a, b, c');
@@ -464,8 +452,7 @@ describe('tools/adapter', () => {
       );
 
       // Test with too short name
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      const result = await tool.handler({name: 'ab', age: 25}, {} as any);
+      const result = await tool.handler({name: 'ab', age: 25});
       expect(result.isError).to.be.true;
       expect(getResultText(result)).to.include('Name must be at least 3 characters');
     });
@@ -491,8 +478,7 @@ describe('tools/adapter', () => {
         );
 
         // Default is now false, so tool should execute without instance
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const result = await tool.handler({}, {} as any);
+        const result = await tool.handler({});
 
         expect(result.isError).to.be.undefined;
         expect(contextReceived?.b2cInstance).to.be.undefined;
@@ -514,8 +500,7 @@ describe('tools/adapter', () => {
           loadServices,
         );
 
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const result = await tool.handler({}, {} as any);
+        const result = await tool.handler({});
 
         expect(result.isError).to.be.true;
         expect(getResultText(result)).to.include('B2C instance error');
@@ -549,8 +534,7 @@ describe('tools/adapter', () => {
           loadServices,
         );
 
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const result = await tool.handler({}, {} as any);
+        const result = await tool.handler({});
 
         expect(result.isError).to.be.undefined;
         expect(contextReceived?.mrtConfig?.auth).to.be.undefined;
@@ -579,8 +563,7 @@ describe('tools/adapter', () => {
           loadServices,
         );
 
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const result = await tool.handler({}, {} as any);
+        const result = await tool.handler({});
 
         expect(result.isError).to.be.undefined;
         expect(contextReceived?.mrtConfig?.auth).to.not.be.undefined;
@@ -612,8 +595,7 @@ describe('tools/adapter', () => {
           loadServices,
         );
 
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const result = await tool.handler({}, {} as any);
+        const result = await tool.handler({});
 
         expect(result.isError).to.be.undefined;
         expect(contextReceived?.mrtConfig?.auth).to.not.be.undefined;
@@ -647,8 +629,7 @@ describe('tools/adapter', () => {
           loadServices,
         );
 
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const result = await tool.handler({}, {} as any);
+        const result = await tool.handler({});
 
         expect(result.isError).to.be.undefined;
         expect(contextReceived?.mrtConfig?.auth).to.not.be.undefined;
@@ -676,8 +657,7 @@ describe('tools/adapter', () => {
           loadServices,
         );
 
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const result = await tool.handler({}, {} as any);
+        const result = await tool.handler({});
 
         expect(result.isError).to.be.undefined;
         expect(contextReceived?.b2cInstance).to.be.undefined;
@@ -704,8 +684,7 @@ describe('tools/adapter', () => {
           loadServices,
         );
 
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const result = await tool.handler({}, {} as any);
+        const result = await tool.handler({});
 
         expect(result.isError).to.be.true;
         expect(getResultText(result)).to.include('MRT auth error');
@@ -744,21 +723,16 @@ describe('tools/adapter', () => {
         );
 
         // Empty list
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const emptyResult = await tool.handler({items: []}, {} as any);
+        const emptyResult = await tool.handler({items: []});
         expect(getResultText(emptyResult)).to.equal('No items found.');
 
         // With items
-        const itemsResult = await tool.handler(
-          {
-            items: [
-              {id: 1, name: 'First'},
-              {id: 2, name: 'Second'},
-            ],
-          },
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          {} as any,
-        );
+        const itemsResult = await tool.handler({
+          items: [
+            {id: 1, name: 'First'},
+            {id: 2, name: 'Second'},
+          ],
+        });
         expect(getResultText(itemsResult)).to.include('Found 2 items:');
         expect(getResultText(itemsResult)).to.include('1: First');
         expect(getResultText(itemsResult)).to.include('2: Second');
@@ -794,13 +768,11 @@ describe('tools/adapter', () => {
           loadServices,
         );
 
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const successResult = await tool.handler({operation: 'succeed'}, {} as any);
+        const successResult = await tool.handler({operation: 'succeed'});
         expect(successResult.isError).to.be.undefined;
         expect(getResultText(successResult)).to.equal('Operation succeeded');
 
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const failResult = await tool.handler({operation: 'fail'}, {} as any);
+        const failResult = await tool.handler({operation: 'fail'});
         expect(failResult.isError).to.be.true;
         expect(getResultText(failResult)).to.equal('Operation failed');
       });