claude fixes

Author: KKonstantinov

packages/codemod/src/cli.ts

@@ -143,7 +143,7 @@ for (const [name, migration] of listMigrations()) {
                 if (result.commentCount > 0) {
                     console.log(
                         `${result.commentCount} location(s) marked with ${CODEMOD_ERROR_PREFIX} comments — search your code to find them:\n` +
-                            `  grep -r '${CODEMOD_ERROR_PREFIX}' ${resolvedDir}\n`
+                            `  grep -r '${CODEMOD_ERROR_PREFIX}' "${resolvedDir}"\n`
                     );
                 }
 

packages/codemod/src/migrations/v1-to-v2/transforms/handlerRegistration.ts

@@ -3,7 +3,7 @@ import { Node, SyntaxKind } from 'ts-morph';
 
 import type { Diagnostic, Transform, TransformContext, TransformResult } from '../../../types.js';
 import { actionRequired } from '../../../utils/diagnostics.js';
-import { isImportedFromMcp, removeUnusedImport, resolveOriginalImportName } from '../../../utils/importUtils.js';
+import { hasMcpImports, isImportedFromMcp, removeUnusedImport, resolveOriginalImportName } from '../../../utils/importUtils.js';
 import { NOTIFICATION_SCHEMA_TO_METHOD, SCHEMA_TO_METHOD } from '../mappings/schemaToMethodMap.js';
 
 const ALL_SCHEMA_TO_METHOD: Record<string, string> = {
@@ -15,6 +15,10 @@ export const handlerRegistrationTransform: Transform = {
     name: 'Handler registration migration',
     id: 'handlers',
     apply(sourceFile: SourceFile, _context: TransformContext): TransformResult {
+        if (!hasMcpImports(sourceFile)) {
+            return { changesCount: 0, diagnostics: [] };
+        }
+
         let changesCount = 0;
         const diagnostics: Diagnostic[] = [];
 

packages/codemod/src/runner.ts

@@ -30,8 +30,9 @@ function insertDiagnosticComments(project: Project, fileResults: FileResult[]):
         // Insertions below mutate sf, but we process in descending line order, so
         // each insertText only shifts positions above the next insertion point —
         // prior byte offsets stay valid.
-        const sourceText = sf.getFullText().replaceAll('\r\n', '\n');
+        const sourceText = sf.getFullText();
         const lines = sourceText.split('\n');
+        const lineEnding = sourceText.includes('\r\n') ? '\r\n' : '\n';
 
         for (const diag of merged) {
             const lineIndex = diag.line - 1;
@@ -44,7 +45,7 @@ function insertDiagnosticComments(project: Project, fileResults: FileResult[]):
             const comment = `${indent}/* ${CODEMOD_ERROR_PREFIX} ${safeMessage} */`;
 
             const lineStart = lines.slice(0, lineIndex).reduce((sum, l) => sum + l.length + 1, 0);
-            sf.insertText(lineStart, comment + '\n');
+            sf.insertText(lineStart, comment + lineEnding);
             insertedCount++;
         }
     }

packages/codemod/test/commentInsertion.test.ts

@@ -1,12 +1,10 @@
 import { mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import path from 'node:path';
-import { Project } from 'ts-morph';
 import { afterEach, describe, expect, it } from 'vitest';
 
 import { getMigration } from '../src/migrations/index.js';
 import { run } from '../src/runner.js';
-import type { FileResult } from '../src/types.js';
 import { CODEMOD_ERROR_PREFIX } from '../src/utils/diagnostics.js';
 
 const migration = getMigration('v1-to-v2')!;
@@ -189,33 +187,40 @@ describe('comment insertion', () => {
     });
 
     it('merges same-line diagnostics into a single comment', () => {
-        // Test the merge logic directly with synthetic data via the Project API.
-        // Two diagnostics on the same line should produce one comment with joined messages.
-        const project = new Project({ useInMemoryFileSystem: true });
-        const sf = project.createSourceFile('test.ts', 'const a = 1;\nconst b = 2;\n');
-
-        const fileResults: FileResult[] = [
-            {
-                filePath: sf.getFilePath(),
-                changes: 0,
-                diagnostics: [
-                    { level: 'warning' as never, file: sf.getFilePath(), line: 2, message: 'First issue', insertComment: true },
-                    { level: 'warning' as never, file: sf.getFilePath(), line: 2, message: 'Second issue', insertComment: true }
-                ]
-            }
-        ];
-
-        // Import and call insertDiagnosticComments indirectly by checking the runner behavior.
-        // Since insertDiagnosticComments is not exported, we verify via integration:
-        // construct a scenario that produces two diagnostics for the same node.
-        // Instead, we verify the output format by checking the source file directly.
-        // For a true unit test, we'd need to export the function. For now, verify the
-        // merge behavior via the runner with a crafted input.
-
-        // Actually, we can use a file that triggers two actionRequired diagnostics on the same line.
-        // This is hard to construct naturally, so we test the runner output instead.
-        // The key invariant is: if we ever get same-line diagnostics, only one comment appears.
-        // The earlier tests already cover the single-comment case. This test documents the intent.
-        expect(fileResults[0]!.diagnostics.filter(d => d.line === 2).length).toBe(2);
+        const dir = createTempDir();
+        const input = [
+            `import { CallToolRequestSchema, ListToolsRequestSchema } from '@modelcontextprotocol/sdk/types.js';`,
+            `const a = CallToolRequestSchema.parse(data1); const b = ListToolsRequestSchema.parse(data2);`,
+            ``
+        ].join('\n');
+        writeFileSync(path.join(dir, 'server.ts'), input);
+
+        const result = run(migration, { targetDir: dir });
+
+        const output = readFileSync(path.join(dir, 'server.ts'), 'utf8');
+        const commentLines = output.split('\n').filter(l => l.includes(CODEMOD_ERROR_PREFIX));
+        expect(commentLines.length).toBe(1);
+        expect(commentLines[0]).toContain(' | ');
+        expect(result.commentCount).toBe(1);
+    });
+
+    it('handles CRLF line endings without corrupting the file', () => {
+        const dir = createTempDir();
+        const input = [
+            `import { CallToolRequestSchema } from '@modelcontextprotocol/sdk/types.js';`,
+            `const a = CallToolRequestSchema.parse(data);`,
+            ``
+        ].join('\r\n');
+        writeFileSync(path.join(dir, 'server.ts'), input);
+
+        run(migration, { targetDir: dir });
+
+        const output = readFileSync(path.join(dir, 'server.ts'), 'utf8');
+        expect(output).toContain(CODEMOD_ERROR_PREFIX);
+        const lines = output.split(/\r?\n/);
+        const commentIdx = lines.findIndex(l => l.includes(CODEMOD_ERROR_PREFIX));
+        expect(commentIdx).toBeGreaterThan(-1);
+        expect(lines[commentIdx]!.trim()).toMatch(/^\/\*.*\*\/$/);
+        expect(lines[commentIdx + 1]).toContain('.parse(data)');
     });
 });

packages/codemod/test/v1-to-v2/transforms/handlerRegistration.test.ts

@@ -162,6 +162,7 @@ describe('handler-registration transform', () => {
 
     it('emits diagnostic for custom method schema (not in spec map)', () => {
         const input = [
+            `import { Server } from '@modelcontextprotocol/sdk/server/index.js';`,
             `const AcmeSearch = z.object({ method: z.literal('acme/search'), params: z.object({ query: z.string() }) });`,
             `server.setRequestHandler(AcmeSearch, async (request) => {`,
             `    return { items: [] };`,
@@ -179,6 +180,7 @@ describe('handler-registration transform', () => {
 
     it('emits diagnostic for custom notification schema', () => {
         const input = [
+            `import { Server } from '@modelcontextprotocol/sdk/server/index.js';`,
             `const CustomNotification = z.object({ method: z.literal('acme/notify') });`,
             `server.setNotificationHandler(CustomNotification, async () => {});`,
             ''
@@ -192,6 +194,20 @@ describe('handler-registration transform', () => {
         expect(result.diagnostics[0]!.message).toContain('CustomNotification');
     });
 
+    it('skips files with no MCP imports', () => {
+        const input = [
+            `import { EventBus } from 'some-other-library';`,
+            `const CustomSchema = z.object({ method: z.literal('custom/op') });`,
+            `bus.setRequestHandler(CustomSchema, async (req) => {});`,
+            ''
+        ].join('\n');
+        const project = new Project({ useInMemoryFileSystem: true });
+        const sourceFile = project.createSourceFile('test.ts', input);
+        const result = handlerRegistrationTransform.apply(sourceFile, ctx);
+        expect(result.changesCount).toBe(0);
+        expect(result.diagnostics.length).toBe(0);
+    });
+
     it('replaces ListTasksRequestSchema with method string', () => {
         const input = [
             `import { ListTasksRequestSchema } from '@modelcontextprotocol/sdk/types.js';`,