fixes

KKonstantinov · KKonstantinov · commit b8e397a2e98d · 2026-04-24T16:01:21.000+03:00
diff --git a/packages/codemod/src/migrations/v1-to-v2/mappings/schemaToMethodMap.ts b/packages/codemod/src/migrations/v1-to-v2/mappings/schemaToMethodMap.ts
@@ -13,7 +13,8 @@ export const SCHEMA_TO_METHOD: Record<string, string> = {
     ElicitRequestSchema: 'elicitation/create',
     SetLevelRequestSchema: 'logging/setLevel',
     PingRequestSchema: 'ping',
-    CompleteRequestSchema: 'completion/complete'
+    CompleteRequestSchema: 'completion/complete',
+    ListRootsRequestSchema: 'roots/list'
 };
 
 export const NOTIFICATION_SCHEMA_TO_METHOD: Record<string, string> = {
@@ -24,5 +25,6 @@ export const NOTIFICATION_SCHEMA_TO_METHOD: Record<string, string> = {
     ResourceUpdatedNotificationSchema: 'notifications/resources/updated',
     ProgressNotificationSchema: 'notifications/progress',
     CancelledNotificationSchema: 'notifications/cancelled',
-    InitializedNotificationSchema: 'notifications/initialized'
+    InitializedNotificationSchema: 'notifications/initialized',
+    RootsListChangedNotificationSchema: 'notifications/roots/list_changed'
 };
diff --git a/packages/codemod/src/migrations/v1-to-v2/transforms/contextTypes.ts b/packages/codemod/src/migrations/v1-to-v2/transforms/contextTypes.ts
@@ -65,6 +65,18 @@ export const contextTypesTransform: Transform = {
 
             const body = callbackArg.getBody();
 
+            const otherParams = callbackArg.getParameters().filter(p => p !== extraParam);
+            if (otherParams.some(p => p.getName() === CTX_PARAM_NAME)) {
+                diagnostics.push(
+                    warning(
+                        sourceFile.getFilePath(),
+                        extraParam.getStartLineNumber(),
+                        `Cannot rename '${EXTRA_PARAM_NAME}' to '${CTX_PARAM_NAME}': another parameter is already named '${CTX_PARAM_NAME}'. Manual migration required.`
+                    )
+                );
+                continue;
+            }
+
             if (body) {
                 let ctxAlreadyInScope = false;
                 body.forEachDescendant(node => {
diff --git a/packages/codemod/src/migrations/v1-to-v2/transforms/expressMiddleware.ts b/packages/codemod/src/migrations/v1-to-v2/transforms/expressMiddleware.ts
@@ -3,13 +3,13 @@ import { Node, SyntaxKind } from 'ts-morph';
 
 import type { Diagnostic, Transform, TransformContext, TransformResult } from '../../../types.js';
 import { info } from '../../../utils/diagnostics.js';
-import { hasMcpImports } from '../../../utils/importUtils.js';
+import { isImportedFromMcp } from '../../../utils/importUtils.js';
 
 export const expressMiddlewareTransform: Transform = {
     name: 'Express middleware signature migration',
     id: 'express-middleware',
     apply(sourceFile: SourceFile, _context: TransformContext): TransformResult {
-        if (!hasMcpImports(sourceFile)) {
+        if (!isImportedFromMcp(sourceFile, 'hostHeaderValidation')) {
             return { changesCount: 0, diagnostics: [] };
         }
 
diff --git a/packages/codemod/src/migrations/v1-to-v2/transforms/mcpServerApi.ts b/packages/codemod/src/migrations/v1-to-v2/transforms/mcpServerApi.ts
@@ -261,10 +261,9 @@ function migrateResourceCall(call: CallExpression, _sourceFile: SourceFile): boo
     const uriArg = args[1]!;
     const uriText = uriArg.getText();
 
-    expr.getNameNode().replaceWithText('registerResource');
-
     if (args.length === 3) {
         // server.resource(name, uri, callback) → server.registerResource(name, uri, {}, callback)
+        expr.getNameNode().replaceWithText('registerResource');
         const callbackText = args[2]!.getText();
         for (let i = args.length - 1; i >= 0; i--) {
             call.removeArgument(i);
@@ -273,6 +272,7 @@ function migrateResourceCall(call: CallExpression, _sourceFile: SourceFile): boo
     } else if (args.length === 4) {
         // server.resource(name, uri, metadata, callback) → server.registerResource(name, uri, metadata, callback)
         // Already has metadata, just rename the method
+        expr.getNameNode().replaceWithText('registerResource');
     } else {
         return false;
     }
diff --git a/packages/codemod/src/migrations/v1-to-v2/transforms/removedApis.ts b/packages/codemod/src/migrations/v1-to-v2/transforms/removedApis.ts
@@ -93,9 +93,10 @@ function handleIsomorphicHeaders(sourceFile: SourceFile, diagnostics: Diagnostic
 
     if (!foundImport || !foundImportDecl) return 0;
 
+    const localName = foundImport.getAliasNode()?.getText() ?? 'IsomorphicHeaders';
     const line = foundImportDecl.getStartLineNumber();
 
-    renameAllReferences(sourceFile, 'IsomorphicHeaders', 'Headers');
+    renameAllReferences(sourceFile, localName, 'Headers');
     changesCount++;
 
     foundImport.remove();
@@ -134,12 +135,13 @@ function handleStreamableHTTPError(sourceFile: SourceFile, diagnostics: Diagnost
 
     if (!foundImport || !foundImportDecl) return 0;
 
+    const localName = foundImport.getAliasNode()?.getText() ?? 'StreamableHTTPError';
     const line = foundImportDecl.getStartLineNumber();
     const moduleSpec = foundImportDecl.getModuleSpecifierValue();
 
     for (const node of sourceFile.getDescendantsOfKind(SyntaxKind.NewExpression)) {
         const expr = node.getExpression();
-        if (!Node.isIdentifier(expr) || expr.getText() !== 'StreamableHTTPError') continue;
+        if (!Node.isIdentifier(expr) || expr.getText() !== localName) continue;
         diagnostics.push(
             warning(
                 sourceFile.getFilePath(),
@@ -150,7 +152,7 @@ function handleStreamableHTTPError(sourceFile: SourceFile, diagnostics: Diagnost
         );
     }
 
-    renameAllReferences(sourceFile, 'StreamableHTTPError', 'SdkError');
+    renameAllReferences(sourceFile, localName, 'SdkError');
     changesCount++;
 
     foundImport.remove();
diff --git a/packages/codemod/src/migrations/v1-to-v2/transforms/schemaParamRemoval.ts b/packages/codemod/src/migrations/v1-to-v2/transforms/schemaParamRemoval.ts
@@ -4,7 +4,7 @@ import { Node, SyntaxKind } from 'ts-morph';
 import type { Transform, TransformContext, TransformResult } from '../../../types.js';
 import { isImportedFromMcp, removeUnusedImport } from '../../../utils/importUtils.js';
 
-const TARGET_METHODS = new Set(['request', 'callTool', 'send']);
+const TARGET_METHODS = new Set(['request', 'callTool', 'send', 'sendRequest']);
 
 export const schemaParamRemovalTransform: Transform = {
     name: 'Schema parameter removal',
@@ -33,7 +33,7 @@ export const schemaParamRemovalTransform: Transform = {
             call.removeArgument(1);
             changesCount++;
 
-            removeUnusedImport(sourceFile, schemaName);
+            removeUnusedImport(sourceFile, schemaName, true);
         }
 
         return { changesCount, diagnostics: [] };
diff --git a/packages/codemod/src/migrations/v1-to-v2/transforms/symbolRenames.ts b/packages/codemod/src/migrations/v1-to-v2/transforms/symbolRenames.ts
@@ -312,7 +312,7 @@ function handleSchemaInput(sourceFile: SourceFile, context: TransformContext, di
         });
         const isServerFile = sourceFile.getImportDeclarations().some(i => {
             const spec = i.getModuleSpecifierValue();
-            return spec.includes('/server') || spec === '@modelcontextprotocol/server';
+            return spec.includes('/server/') || spec === '@modelcontextprotocol/server';
         });
         const targetModule = resolveTypesPackage(context, isClientFile, isServerFile);
 
diff --git a/packages/codemod/test/v1-to-v2/transforms/contextTypes.test.ts b/packages/codemod/test/v1-to-v2/transforms/contextTypes.test.ts
@@ -183,6 +183,22 @@ describe('context-types transform', () => {
         expect(sourceFile.getFullText()).toContain('extra.signal');
     });
 
+    it('emits warning when another parameter is already named ctx', () => {
+        const input = [
+            `server.setRequestHandler('tools/call', async (ctx, extra) => {`,
+            `    const s = extra.signal;`,
+            `    return { content: [] };`,
+            `});`,
+            ''
+        ].join('\n');
+        const project = new Project({ useInMemoryFileSystem: true });
+        const sourceFile = project.createSourceFile('test.ts', MCP_IMPORT + input);
+        const result = contextTypesTransform.apply(sourceFile, ctx);
+        expect(result.diagnostics.length).toBeGreaterThan(0);
+        expect(result.diagnostics[0]!.message).toContain('another parameter');
+        expect(sourceFile.getFullText()).toContain('extra.signal');
+    });
+
     it('emits warning when ctx variable already exists in scope', () => {
         const input = [
             `const ctx = getApplicationContext();`,
diff --git a/packages/codemod/test/v1-to-v2/transforms/expressMiddleware.test.ts b/packages/codemod/test/v1-to-v2/transforms/expressMiddleware.test.ts
@@ -93,4 +93,16 @@ describe('express-middleware transform', () => {
         expect(result.changesCount).toBe(0);
         expect(text).toContain("{ allowedHosts: ['localhost'] }");
     });
+
+    it('does not modify non-MCP hostHeaderValidation even when other MCP imports exist', () => {
+        const input = [
+            `import { McpServer } from '@modelcontextprotocol/server';`,
+            `import { hostHeaderValidation } from './my-middleware.js';`,
+            `app.use(hostHeaderValidation({ allowedHosts: ['localhost'] }));`,
+            ''
+        ].join('\n');
+        const { text, result } = applyTransform(input);
+        expect(result.changesCount).toBe(0);
+        expect(text).toContain("{ allowedHosts: ['localhost'] }");
+    });
 });
diff --git a/packages/codemod/test/v1-to-v2/transforms/handlerRegistration.test.ts b/packages/codemod/test/v1-to-v2/transforms/handlerRegistration.test.ts
@@ -104,15 +104,39 @@ describe('handler-registration transform', () => {
         expect(result).not.toContain("'tools/call'");
     });
 
-    it('only removes MCP import when same symbol exists in non-MCP package', () => {
+    it('does not remove non-MCP import when MCP import of same name is consumed', () => {
         const input = [
             `import { CallToolRequestSchema } from './local-schemas.js';`,
             `import { CallToolRequestSchema as McpSchema } from '@modelcontextprotocol/sdk/types.js';`,
-            `server.setRequestHandler(McpSchema, async () => ({ content: [] }));`,
-            `validateSchema(CallToolRequestSchema);`,
+            `server.setRequestHandler(CallToolRequestSchema, async () => ({ content: [] }));`,
+            `validateSchema(McpSchema);`,
             ''
         ].join('\n');
         const result = applyTransform(input);
         expect(result).toContain("from './local-schemas.js'");
+        expect(result).toContain("'tools/call'");
+        expect(result).not.toMatch(/setRequestHandler\(CallToolRequestSchema/);
+    });
+
+    it('replaces ListRootsRequestSchema with method string', () => {
+        const input = [
+            `import { ListRootsRequestSchema } from '@modelcontextprotocol/sdk/types.js';`,
+            `client.setRequestHandler(ListRootsRequestSchema, async () => ({ roots: [] }));`,
+            ''
+        ].join('\n');
+        const result = applyTransform(input);
+        expect(result).toContain("'roots/list'");
+        expect(result).not.toContain('ListRootsRequestSchema');
+    });
+
+    it('replaces RootsListChangedNotificationSchema with method string', () => {
+        const input = [
+            `import { RootsListChangedNotificationSchema } from '@modelcontextprotocol/sdk/types.js';`,
+            `server.setNotificationHandler(RootsListChangedNotificationSchema, async () => {});`,
+            ''
+        ].join('\n');
+        const result = applyTransform(input);
+        expect(result).toContain("'notifications/roots/list_changed'");
+        expect(result).not.toContain('RootsListChangedNotificationSchema');
     });
 });
diff --git a/packages/codemod/test/v1-to-v2/transforms/mcpServerApi.test.ts b/packages/codemod/test/v1-to-v2/transforms/mcpServerApi.test.ts
@@ -103,5 +103,8 @@ describe('mcp-server-api transform', () => {
         const result = mcpServerApiTransform.apply(sourceFile, ctx);
         expect(result.diagnostics.length).toBeGreaterThan(0);
         expect(result.diagnostics[0]!.message).toContain('Could not automatically migrate .resource()');
+        // Verify the method name was NOT mutated when migration fails
+        expect(sourceFile.getFullText()).toContain('.resource(');
+        expect(sourceFile.getFullText()).not.toContain('registerResource');
     });
 });
diff --git a/packages/codemod/test/v1-to-v2/transforms/removedApis.test.ts b/packages/codemod/test/v1-to-v2/transforms/removedApis.test.ts
@@ -229,5 +229,31 @@ describe('removed-apis transform', () => {
             const { text: second } = applyTransform(first);
             expect(second).toBe(first);
         });
+
+        it('handles aliased StreamableHTTPError import', () => {
+            const input = [
+                `import { StreamableHTTPError as SHE } from '@modelcontextprotocol/client';`,
+                `if (error instanceof SHE) {}`,
+                `throw new SHE(404, 'Not Found');`,
+                ''
+            ].join('\n');
+            const { text, result } = applyTransform(input);
+            expect(text).toContain('instanceof SdkError');
+            expect(text).not.toMatch(/\bSHE\b/);
+            expect(text).toMatch(/import.*SdkError/);
+            const constructorWarning = result.diagnostics.find(d => d.message.includes('Constructor arguments differ'));
+            expect(constructorWarning).toBeDefined();
+        });
+    });
+
+    describe('IsomorphicHeaders alias', () => {
+        it('handles aliased IsomorphicHeaders import', () => {
+            const input = [`import { IsomorphicHeaders as IH } from '@modelcontextprotocol/server';`, `const h: IH = new IH();`, ''].join(
+                '\n'
+            );
+            const { text } = applyTransform(input);
+            expect(text).toContain('const h: Headers = new Headers()');
+            expect(text).not.toMatch(/\bIH\b/);
+        });
     });
 });
diff --git a/packages/codemod/test/v1-to-v2/transforms/schemaParamRemoval.test.ts b/packages/codemod/test/v1-to-v2/transforms/schemaParamRemoval.test.ts
@@ -74,4 +74,15 @@ describe('schema-param-removal transform', () => {
         const second = applyTransform(first);
         expect(second).toBe(first);
     });
+
+    it('removes schema from v1 sendRequest calls', () => {
+        const input = [
+            `import { CreateMessageResultSchema } from '@modelcontextprotocol/sdk/types.js';`,
+            `const result = await extra.sendRequest({ method: 'sampling/createMessage', params }, CreateMessageResultSchema);`,
+            ''
+        ].join('\n');
+        const result = applyTransform(input);
+        expect(result).not.toContain('CreateMessageResultSchema');
+        expect(result).toContain('extra.sendRequest(');
+    });
 });
