fixes

Author: KKonstantinov

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

@@ -144,7 +144,7 @@ function handleReference(
 
     if (parent && Node.isShorthandPropertyAssignment(parent)) {
         const line = ref.getStartLineNumber();
-        parent.replaceWithText(`${localName}: specTypeSchemas.${typeName}`);
+        parent.replaceWithText(`'${localName}': specTypeSchemas.${typeName}`);
         ensureImport(sourceFile, 'specTypeSchemas');
         diagnostics.push(
             warning(
@@ -156,6 +156,14 @@ function handleReference(
         return true;
     }
 
+    if (parent && Node.isPropertyAssignment(parent) && parent.getNameNode() === ref) {
+        return false;
+    }
+
+    if (parent && Node.isBindingElement(parent) && parent.getPropertyNameNode() === ref) {
+        return false;
+    }
+
     // Value position: replace identifier with specTypeSchemas.X
     const line = ref.getStartLineNumber();
     ref.replaceWithText(`specTypeSchemas.${typeName}`);

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

@@ -192,12 +192,35 @@ describe('spec-schema-access transform', () => {
             expect(result.changesCount).toBe(0);
         });
 
-        it('expands shorthand property assignment', () => {
+        it('expands shorthand property assignment and removes import', () => {
             const input = [`import { ToolSchema } from '@modelcontextprotocol/server';`, `const schemas = { ToolSchema };`, ''].join('\n');
             const { text, result } = applyTransform(input);
-            expect(text).toContain('ToolSchema: specTypeSchemas.Tool');
+            expect(text).toContain("'ToolSchema': specTypeSchemas.Tool");
+            expect(text).not.toMatch(/import\s*\{[^}]*ToolSchema[^}]*\}/);
             expect(result.changesCount).toBeGreaterThan(0);
         });
+
+        it('skips PropertyAssignment name-node (non-shorthand)', () => {
+            const input = [
+                `import { ToolSchema } from '@modelcontextprotocol/server';`,
+                `const schemas = { ToolSchema: myValidator };`,
+                ''
+            ].join('\n');
+            const { text, result } = applyTransform(input);
+            expect(text).toContain('ToolSchema: myValidator');
+            expect(result.changesCount).toBe(0);
+        });
+
+        it('skips BindingElement property-name', () => {
+            const input = [
+                `import { ToolSchema } from '@modelcontextprotocol/server';`,
+                `const { ToolSchema: local } = obj;`,
+                ''
+            ].join('\n');
+            const { text, result } = applyTransform(input);
+            expect(text).toContain('ToolSchema: local');
+            expect(result.changesCount).toBe(0);
+        });
     });
 
     describe('aliased imports', () => {