codemod iterations round 1#2274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KKonstantinov merged 2 commits into from
Jun 10, 2026
Merged

codemod iterations round 1 #2274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f33b9bc
codemod iterations round 1
KKonstantinov Jun 10, 2026
9df0b83
clean up
KKonstantinov Jun 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/codemod/src/bin/batchTest.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -87,6 +87,7 @@ const LOCAL_PACKAGE_DIRS: Record<string, string> = {
'@modelcontextprotocol/client': path.join(SDK_ROOT, 'packages/client'),
'@modelcontextprotocol/core': path.join(SDK_ROOT, 'packages/core'),
'@modelcontextprotocol/server': path.join(SDK_ROOT, 'packages/server'),
'@modelcontextprotocol/server-legacy': path.join(SDK_ROOT, 'packages/server-legacy'),
'@modelcontextprotocol/express': path.join(SDK_ROOT, 'packages/middleware/express'),
'@modelcontextprotocol/fastify': path.join(SDK_ROOT, 'packages/middleware/fastify'),
'@modelcontextprotocol/hono': path.join(SDK_ROOT, 'packages/middleware/hono'),
Expand Down
6 changes: 5 additions & 1 deletion packages/codemod/src/migrations/v1-to-v2/mappings/importMap.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,11 @@ export const IMPORT_MAP: Record<string, ImportMapping> = {
StreamableHTTPServerTransport: 'NodeStreamableHTTPServerTransport'
},
symbolTargetOverrides: {
StreamableHTTPServerTransport: '@modelcontextprotocol/node'
StreamableHTTPServerTransport: '@modelcontextprotocol/node',
// The companion options type moved with the transport. @modelcontextprotocol/node
// re-exports it under the same name (a backward-compat alias for
// WebStandardStreamableHTTPServerTransportOptions), so route it there without renaming.
StreamableHTTPServerTransportOptions: '@modelcontextprotocol/node'
}
},
'@modelcontextprotocol/sdk/server/webStandardStreamableHttp.js': {
Expand Down
87 changes: 68 additions & 19 deletions packages/codemod/src/migrations/v1-to-v2/transforms/specSchemaAccess.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -101,28 +101,15 @@ function handleReference(
return rewriteCapturedSafeParse(safeParseCall, localName, typeName, sourceFile, diagnostics);
}

diagnostics.push(
actionRequired(
sourceFile.getFilePath(),
ref,
`${localName}.safeParse() not available in v2. Use \`isSpecType.${typeName}(value)\` for boolean validation, ` +
`or \`specTypeSchemas.${typeName}['~standard'].validate(value)\` for full result.`
)
);
return false;
return rewriteUnsupportedSchemaCall(ref, safeParseCall, localName, typeName, 'safeParse', sourceFile, diagnostics);
}

// Pattern: XSchema.parse(v) — diagnostic only
// Pattern: XSchema.parse(v) — rewrite to the StandardSchema validate() primitive (or, when the
// result is used, swap the identifier) so we never leave behind an import of a non-exported schema.
if (isParsePattern(ref)) {
diagnostics.push(
actionRequired(
sourceFile.getFilePath(),
ref,
`${localName}.parse() not available in v2. Use \`isSpecType.${typeName}(value)\` for validation, ` +
`or \`specTypeSchemas.${typeName}['~standard'].validate(value)\` and check for issues.`
)
);
return false;
const parseAccess = ref.getParent() as import('ts-morph').PropertyAccessExpression;
const parseCall = parseAccess.getParent() as import('ts-morph').CallExpression;
return rewriteUnsupportedSchemaCall(ref, parseCall, localName, typeName, 'parse', sourceFile, diagnostics);
}

// Pattern: XSchema used as value (function arg, assignment, etc.)
Expand DownExpand Up@@ -327,6 +314,68 @@ function rewriteCapturedSafeParse(
return true;
}

/**
* Handles spec-schema usages that have no behavior-preserving v2 equivalent: the Zod-only
* methods `.parse()` and (uncaptured) `.safeParse()`. In v2 these schemas are StandardSchemaV1
* values that are NOT named public exports, so leaving the original import in place produces an
* unresolved-import error (e.g. `PromptSchema` is not exported by `@modelcontextprotocol/server`).
*
* - Result discarded (validation for side-effect only): rewrite `XSchema.parse(v)` →
* `specTypeSchemas.T['~standard'].validate(v)` so the code compiles. NOTE: `validate()` does not
* throw, so `.parse()`'s throw-on-invalid behavior is lost — flagged via an actionRequired comment.
* - Result used: swap only the identifier to `specTypeSchemas.T` so the import resolves; the
* `.parse()`/`.safeParse()` call and its result shape still need a manual fix (flagged).
*
* Either way the original (now non-exported) schema import is dropped by the caller's
* removeUnusedImport, so no dangling import survives.
*/
function rewriteUnsupportedSchemaCall(
ref: import('ts-morph').Node,
callNode: import('ts-morph').CallExpression,
localName: string,
typeName: string,
method: 'parse' | 'safeParse',
sourceFile: SourceFile,
diagnostics: Diagnostic[]
): boolean {
const resultDiscarded = Node.isExpressionStatement(callNode.getParent());

if (resultDiscarded) {
const argText = callNode
.getArguments()
.map(a => a.getText())
.join(', ');
const semantics =
method === 'parse'
? 'validate() does NOT throw on invalid input (parse() did) — if you relied on that, add `if (result.issues) throw …`.'
: 'the result shape changed from { success, data, error } to { value, issues }.';
diagnostics.push(
actionRequired(
sourceFile.getFilePath(),
callNode,
`Rewrote ${localName}.${method}() to specTypeSchemas.${typeName}['~standard'].validate(): ` +
`v2 spec schemas are StandardSchemaV1, not Zod. Note: ${semantics}`
)
);
callNode.replaceWithText(`specTypeSchemas.${typeName}['~standard'].validate(${argText})`);
ensureImport(sourceFile, 'specTypeSchemas');
return true;
}

diagnostics.push(
actionRequired(
sourceFile.getFilePath(),
ref,
`${localName}.${method}() is not available on v2 spec schemas (StandardSchemaV1, not Zod). ` +
`Replaced ${localName} with specTypeSchemas.${typeName}; rewrite the .${method}(...) call using ` +
`specTypeSchemas.${typeName}['~standard'].validate(...) (returns { value, issues }, does not throw).`
)
);
ref.replaceWithText(`specTypeSchemas.${typeName}`);
ensureImport(sourceFile, 'specTypeSchemas');
return true;
}

function ensureImport(sourceFile: SourceFile, symbol: string): void {
const existingImport = sourceFile.getImportDeclarations().find(imp => {
if (!isAnyMcpSpecifier(imp.getModuleSpecifierValue())) return false;
Expand Down
34 changes: 22 additions & 12 deletions packages/codemod/test/v1-to-v2/transforms/specSchemaAccess.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -210,10 +210,12 @@ describe('spec-schema-access transform', () => {
expect(text).not.toContain('return result.value');
});

it('falls back to diagnostic for non-captured safeParse (bare expression)', () => {
it('rewrites non-captured safeParse (bare expression) to validate()', () => {
const input = [`import { ToolSchema } from '@modelcontextprotocol/server';`, `ToolSchema.safeParse(data);`, ''].join('\n');
const { result } = applyTransform(input);
expect(result.changesCount).toBe(0);
const { text, result } = applyTransform(input);
expect(text).toContain("specTypeSchemas.Tool['~standard'].validate(data)");
expect(text).not.toMatch(/import\s*\{[^}]*ToolSchema[^}]*\}/);
expect(result.changesCount).toBeGreaterThan(0);
expect(result.diagnostics.length).toBe(1);
});
});
Expand DownExpand Up@@ -327,16 +329,24 @@ describe('spec-schema-access transform', () => {
});
});

describe('diagnostic only: .parse(v)', () => {
it('emits diagnostic for parse usage', () => {
describe('.parse(v)', () => {
it('rewrites discarded parse() to the validate() primitive', () => {
const input = [`import { ToolSchema } from '@modelcontextprotocol/server';`, `ToolSchema.parse(raw);`, ''].join('\n');
const { text, result } = applyTransform(input);
expect(text).toContain("specTypeSchemas.Tool['~standard'].validate(raw)");
expect(text).not.toMatch(/import\s*\{[^}]*ToolSchema[^}]*\}/);
expect(result.changesCount).toBeGreaterThan(0);
});

it('swaps the identifier (import stays resolvable) when the parse() result is used', () => {
const input = [`import { ToolSchema } from '@modelcontextprotocol/server';`, `const tool = ToolSchema.parse(raw);`, ''].join(
'\n'
);
const { text, result } = applyTransform(input);
expect(text).toContain('ToolSchema.parse');
expect(result.changesCount).toBe(0);
expect(result.diagnostics.length).toBe(1);
expect(result.diagnostics[0]!.message).toContain('isSpecType.Tool');
expect(text).toContain('specTypeSchemas.Tool.parse(raw)');
expect(text).not.toMatch(/import\s*\{[^}]*ToolSchema[^}]*\}/);
expect(result.changesCount).toBeGreaterThan(0);
expect(result.diagnostics[0]!.message).toContain('specTypeSchemas.Tool');
});
});

Expand DownExpand Up@@ -392,7 +402,7 @@ describe('spec-schema-access transform', () => {
expect(text).not.toMatch(/import\s*\{[^}]*CallToolRequestSchema[^}]*\}/);
});

it('keeps original schema import when some refs are diagnostic-only', () => {
it('removes the schema import even when a ref falls back to a parse()/safeParse() rewrite', () => {
const input = [
`import { CallToolRequestSchema } from '@modelcontextprotocol/server';`,
`const valid = CallToolRequestSchema.safeParse(data).success;`,
Expand All@@ -401,8 +411,8 @@ describe('spec-schema-access transform', () => {
].join('\n');
const { text } = applyTransform(input);
expect(text).toContain('isSpecType.CallToolRequest(data)');
expect(text).toContain('CallToolRequestSchema.parse');
expect(text).toMatch(/import\s*\{[^}]*CallToolRequestSchema[^}]*\}/);
expect(text).toContain('specTypeSchemas.CallToolRequest.parse(data)');
expect(text).not.toMatch(/import\s*\{[^}]*CallToolRequestSchema[^}]*\}/);
});

it('removes schema specifier from import that also has other symbols', () => {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
codemod iterations round 1#2274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

KKonstantinov
merged 2 commits into

from

Jun 10, 2026
 Merged


codemod iterations round 1
#2274
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f33b9bc

codemod iterations round 1


KKonstantinov Jun 10, 2026
9df0b83

clean up


KKonstantinov Jun 10, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
packages/codemod/src/bin/batchTest.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -87,6 +87,7 @@ const LOCAL_PACKAGE_DIRS: Record<string, string> = {
 '@modelcontextprotocol/client': path.join(SDK_ROOT, 'packages/client'),
 '@modelcontextprotocol/core': path.join(SDK_ROOT, 'packages/core'),
 '@modelcontextprotocol/server': path.join(SDK_ROOT, 'packages/server'),
 '@modelcontextprotocol/server-legacy': path.join(SDK_ROOT, 'packages/server-legacy'),
 '@modelcontextprotocol/express': path.join(SDK_ROOT, 'packages/middleware/express'),
 '@modelcontextprotocol/fastify': path.join(SDK_ROOT, 'packages/middleware/fastify'),
 '@modelcontextprotocol/hono': path.join(SDK_ROOT, 'packages/middleware/hono'),
Expand Down

6 changes: 5 additions & 1 deletion
packages/codemod/src/migrations/v1-to-v2/mappings/importMap.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,11 @@ export const IMPORT_MAP: Record<string, ImportMapping> = {
 StreamableHTTPServerTransport: 'NodeStreamableHTTPServerTransport'
 },
 symbolTargetOverrides: {
 StreamableHTTPServerTransport: '@modelcontextprotocol/node'
 StreamableHTTPServerTransport: '@modelcontextprotocol/node',
 // The companion options type moved with the transport. @modelcontextprotocol/node
 // re-exports it under the same name (a backward-compat alias for
 // WebStandardStreamableHTTPServerTransportOptions), so route it there without renaming.
 StreamableHTTPServerTransportOptions: '@modelcontextprotocol/node'
 }
 },
 '@modelcontextprotocol/sdk/server/webStandardStreamableHttp.js': {
Expand Down

87 changes: 68 additions & 19 deletions
packages/codemod/src/migrations/v1-to-v2/transforms/specSchemaAccess.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -101,28 +101,15 @@ function handleReference(
 return rewriteCapturedSafeParse(safeParseCall, localName, typeName, sourceFile, diagnostics);
 }

 diagnostics.push(
 actionRequired(
 sourceFile.getFilePath(),
 ref,
 `${localName}.safeParse() not available in v2. Use \`isSpecType.${typeName}(value)\` for boolean validation, ` +
 `or \`specTypeSchemas.${typeName}['~standard'].validate(value)\` for full result.`
 )
 );
 return false;
 return rewriteUnsupportedSchemaCall(ref, safeParseCall, localName, typeName, 'safeParse', sourceFile, diagnostics);
 }

 // Pattern: XSchema.parse(v) — diagnostic only
 // Pattern: XSchema.parse(v) — rewrite to the StandardSchema validate() primitive (or, when the
 // result is used, swap the identifier) so we never leave behind an import of a non-exported schema.
 if (isParsePattern(ref)) {
 diagnostics.push(
 actionRequired(
 sourceFile.getFilePath(),
 ref,
 `${localName}.parse() not available in v2. Use \`isSpecType.${typeName}(value)\` for validation, ` +
 `or \`specTypeSchemas.${typeName}['~standard'].validate(value)\` and check for issues.`
 )
 );
 return false;
 const parseAccess = ref.getParent() as import('ts-morph').PropertyAccessExpression;
 const parseCall = parseAccess.getParent() as import('ts-morph').CallExpression;
 return rewriteUnsupportedSchemaCall(ref, parseCall, localName, typeName, 'parse', sourceFile, diagnostics);
 }

 // Pattern: XSchema used as value (function arg, assignment, etc.)
Expand DownExpand Up@@ -327,6 +314,68 @@ function rewriteCapturedSafeParse(
 return true;
}

/**
 * Handles spec-schema usages that have no behavior-preserving v2 equivalent: the Zod-only
 * methods `.parse()` and (uncaptured) `.safeParse()`. In v2 these schemas are StandardSchemaV1
 * values that are NOT named public exports, so leaving the original import in place produces an
 * unresolved-import error (e.g. `PromptSchema` is not exported by `@modelcontextprotocol/server`).
 *
 * - Result discarded (validation for side-effect only): rewrite `XSchema.parse(v)` →
 * `specTypeSchemas.T['~standard'].validate(v)` so the code compiles. NOTE: `validate()` does not
 * throw, so `.parse()`'s throw-on-invalid behavior is lost — flagged via an actionRequired comment.
 * - Result used: swap only the identifier to `specTypeSchemas.T` so the import resolves; the
 * `.parse()`/`.safeParse()` call and its result shape still need a manual fix (flagged).
 *
 * Either way the original (now non-exported) schema import is dropped by the caller's
 * removeUnusedImport, so no dangling import survives.
 */
function rewriteUnsupportedSchemaCall(
 ref: import('ts-morph').Node,
 callNode: import('ts-morph').CallExpression,
 localName: string,
 typeName: string,
 method: 'parse' | 'safeParse',
 sourceFile: SourceFile,
 diagnostics: Diagnostic[]
): boolean {
 const resultDiscarded = Node.isExpressionStatement(callNode.getParent());

 if (resultDiscarded) {
 const argText = callNode
 .getArguments()
 .map(a => a.getText())
 .join(', ');
 const semantics =
 method === 'parse'
 ? 'validate() does NOT throw on invalid input (parse() did) — if you relied on that, add `if (result.issues) throw …`.'
 : 'the result shape changed from { success, data, error } to { value, issues }.';
 diagnostics.push(
 actionRequired(
 sourceFile.getFilePath(),
 callNode,
 `Rewrote ${localName}.${method}() to specTypeSchemas.${typeName}['~standard'].validate(): ` +
 `v2 spec schemas are StandardSchemaV1, not Zod. Note: ${semantics}`
 )
 );
 callNode.replaceWithText(`specTypeSchemas.${typeName}['~standard'].validate(${argText})`);
 ensureImport(sourceFile, 'specTypeSchemas');
 return true;
 }

 diagnostics.push(
 actionRequired(
 sourceFile.getFilePath(),
 ref,
 `${localName}.${method}() is not available on v2 spec schemas (StandardSchemaV1, not Zod). ` +
 `Replaced ${localName} with specTypeSchemas.${typeName}; rewrite the .${method}(...) call using ` +
 `specTypeSchemas.${typeName}['~standard'].validate(...) (returns { value, issues }, does not throw).`
 )
 );
 ref.replaceWithText(`specTypeSchemas.${typeName}`);
 ensureImport(sourceFile, 'specTypeSchemas');
 return true;
}

function ensureImport(sourceFile: SourceFile, symbol: string): void {
 const existingImport = sourceFile.getImportDeclarations().find(imp => {
 if (!isAnyMcpSpecifier(imp.getModuleSpecifierValue())) return false;
Expand Down

34 changes: 22 additions & 12 deletions
packages/codemod/test/v1-to-v2/transforms/specSchemaAccess.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -210,10 +210,12 @@ describe('spec-schema-access transform', () => {
 expect(text).not.toContain('return result.value');
 });

 it('falls back to diagnostic for non-captured safeParse (bare expression)', () => {
 it('rewrites non-captured safeParse (bare expression) to validate()', () => {
 const input = [`import { ToolSchema } from '@modelcontextprotocol/server';`, `ToolSchema.safeParse(data);`, ''].join('\n');
 const { result } = applyTransform(input);
 expect(result.changesCount).toBe(0);
 const { text, result } = applyTransform(input);
 expect(text).toContain("specTypeSchemas.Tool['~standard'].validate(data)");
 expect(text).not.toMatch(/import\s*\{[^}]*ToolSchema[^}]*\}/);
 expect(result.changesCount).toBeGreaterThan(0);
 expect(result.diagnostics.length).toBe(1);
 });
 });
Expand DownExpand Up@@ -327,16 +329,24 @@ describe('spec-schema-access transform', () => {
 });
 });

 describe('diagnostic only: .parse(v)', () => {
 it('emits diagnostic for parse usage', () => {
 describe('.parse(v)', () => {
 it('rewrites discarded parse() to the validate() primitive', () => {
 const input = [`import { ToolSchema } from '@modelcontextprotocol/server';`, `ToolSchema.parse(raw);`, ''].join('\n');
 const { text, result } = applyTransform(input);
 expect(text).toContain("specTypeSchemas.Tool['~standard'].validate(raw)");
 expect(text).not.toMatch(/import\s*\{[^}]*ToolSchema[^}]*\}/);
 expect(result.changesCount).toBeGreaterThan(0);
 });

 it('swaps the identifier (import stays resolvable) when the parse() result is used', () => {
 const input = [`import { ToolSchema } from '@modelcontextprotocol/server';`, `const tool = ToolSchema.parse(raw);`, ''].join(
 '\n'
 );
 const { text, result } = applyTransform(input);
 expect(text).toContain('ToolSchema.parse');
 expect(result.changesCount).toBe(0);
 expect(result.diagnostics.length).toBe(1);
 expect(result.diagnostics[0]!.message).toContain('isSpecType.Tool');
 expect(text).toContain('specTypeSchemas.Tool.parse(raw)');
 expect(text).not.toMatch(/import\s*\{[^}]*ToolSchema[^}]*\}/);
 expect(result.changesCount).toBeGreaterThan(0);
 expect(result.diagnostics[0]!.message).toContain('specTypeSchemas.Tool');
 });
 });

Expand DownExpand Up@@ -392,7 +402,7 @@ describe('spec-schema-access transform', () => {
 expect(text).not.toMatch(/import\s*\{[^}]*CallToolRequestSchema[^}]*\}/);
 });

 it('keeps original schema import when some refs are diagnostic-only', () => {
 it('removes the schema import even when a ref falls back to a parse()/safeParse() rewrite', () => {
 const input = [
 `import { CallToolRequestSchema } from '@modelcontextprotocol/server';`,
 `const valid = CallToolRequestSchema.safeParse(data).success;`,
Expand All@@ -401,8 +411,8 @@ describe('spec-schema-access transform', () => {
 ].join('\n');
 const { text } = applyTransform(input);
 expect(text).toContain('isSpecType.CallToolRequest(data)');
 expect(text).toContain('CallToolRequestSchema.parse');
 expect(text).toMatch(/import\s*\{[^}]*CallToolRequestSchema[^}]*\}/);
 expect(text).toContain('specTypeSchemas.CallToolRequest.parse(data)');
 expect(text).not.toMatch(/import\s*\{[^}]*CallToolRequestSchema[^}]*\}/);
 });

 it('removes schema specifier from import that also has other symbols', () => {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
codemod iterations round 1#2274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

KKonstantinov
merged 2 commits into

from

Jun 10, 2026
 Merged


codemod iterations round 1
#2274
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f33b9bc

codemod iterations round 1


KKonstantinov Jun 10, 2026
9df0b83

clean up


KKonstantinov Jun 10, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
packages/codemod/src/bin/batchTest.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -87,6 +87,7 @@ const LOCAL_PACKAGE_DIRS: Record<string, string> = {
 '@modelcontextprotocol/client': path.join(SDK_ROOT, 'packages/client'),
 '@modelcontextprotocol/core': path.join(SDK_ROOT, 'packages/core'),
 '@modelcontextprotocol/server': path.join(SDK_ROOT, 'packages/server'),
 '@modelcontextprotocol/server-legacy': path.join(SDK_ROOT, 'packages/server-legacy'),
 '@modelcontextprotocol/express': path.join(SDK_ROOT, 'packages/middleware/express'),
 '@modelcontextprotocol/fastify': path.join(SDK_ROOT, 'packages/middleware/fastify'),
 '@modelcontextprotocol/hono': path.join(SDK_ROOT, 'packages/middleware/hono'),
Expand Down

6 changes: 5 additions & 1 deletion
packages/codemod/src/migrations/v1-to-v2/mappings/importMap.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,11 @@ export const IMPORT_MAP: Record<string, ImportMapping> = {
 StreamableHTTPServerTransport: 'NodeStreamableHTTPServerTransport'
 },
 symbolTargetOverrides: {
 StreamableHTTPServerTransport: '@modelcontextprotocol/node'
 StreamableHTTPServerTransport: '@modelcontextprotocol/node',
 // The companion options type moved with the transport. @modelcontextprotocol/node
 // re-exports it under the same name (a backward-compat alias for
 // WebStandardStreamableHTTPServerTransportOptions), so route it there without renaming.
 StreamableHTTPServerTransportOptions: '@modelcontextprotocol/node'
 }
 },
 '@modelcontextprotocol/sdk/server/webStandardStreamableHttp.js': {
Expand Down

87 changes: 68 additions & 19 deletions
packages/codemod/src/migrations/v1-to-v2/transforms/specSchemaAccess.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -101,28 +101,15 @@ function handleReference(
 return rewriteCapturedSafeParse(safeParseCall, localName, typeName, sourceFile, diagnostics);
 }

 diagnostics.push(
 actionRequired(
 sourceFile.getFilePath(),
 ref,
 `${localName}.safeParse() not available in v2. Use \`isSpecType.${typeName}(value)\` for boolean validation, ` +
 `or \`specTypeSchemas.${typeName}['~standard'].validate(value)\` for full result.`
 )
 );
 return false;
 return rewriteUnsupportedSchemaCall(ref, safeParseCall, localName, typeName, 'safeParse', sourceFile, diagnostics);
 }

 // Pattern: XSchema.parse(v) — diagnostic only
 // Pattern: XSchema.parse(v) — rewrite to the StandardSchema validate() primitive (or, when the
 // result is used, swap the identifier) so we never leave behind an import of a non-exported schema.
 if (isParsePattern(ref)) {
 diagnostics.push(
 actionRequired(
 sourceFile.getFilePath(),
 ref,
 `${localName}.parse() not available in v2. Use \`isSpecType.${typeName}(value)\` for validation, ` +
 `or \`specTypeSchemas.${typeName}['~standard'].validate(value)\` and check for issues.`
 )
 );
 return false;
 const parseAccess = ref.getParent() as import('ts-morph').PropertyAccessExpression;
 const parseCall = parseAccess.getParent() as import('ts-morph').CallExpression;
 return rewriteUnsupportedSchemaCall(ref, parseCall, localName, typeName, 'parse', sourceFile, diagnostics);
 }

 // Pattern: XSchema used as value (function arg, assignment, etc.)
Expand DownExpand Up@@ -327,6 +314,68 @@ function rewriteCapturedSafeParse(
 return true;
}

/**
 * Handles spec-schema usages that have no behavior-preserving v2 equivalent: the Zod-only
 * methods `.parse()` and (uncaptured) `.safeParse()`. In v2 these schemas are StandardSchemaV1
 * values that are NOT named public exports, so leaving the original import in place produces an
 * unresolved-import error (e.g. `PromptSchema` is not exported by `@modelcontextprotocol/server`).
 *
 * - Result discarded (validation for side-effect only): rewrite `XSchema.parse(v)` →
 * `specTypeSchemas.T['~standard'].validate(v)` so the code compiles. NOTE: `validate()` does not
 * throw, so `.parse()`'s throw-on-invalid behavior is lost — flagged via an actionRequired comment.
 * - Result used: swap only the identifier to `specTypeSchemas.T` so the import resolves; the
 * `.parse()`/`.safeParse()` call and its result shape still need a manual fix (flagged).
 *
 * Either way the original (now non-exported) schema import is dropped by the caller's
 * removeUnusedImport, so no dangling import survives.
 */
function rewriteUnsupportedSchemaCall(
 ref: import('ts-morph').Node,
 callNode: import('ts-morph').CallExpression,
 localName: string,
 typeName: string,
 method: 'parse' | 'safeParse',
 sourceFile: SourceFile,
 diagnostics: Diagnostic[]
): boolean {
 const resultDiscarded = Node.isExpressionStatement(callNode.getParent());

 if (resultDiscarded) {
 const argText = callNode
 .getArguments()
 .map(a => a.getText())
 .join(', ');
 const semantics =
 method === 'parse'
 ? 'validate() does NOT throw on invalid input (parse() did) — if you relied on that, add `if (result.issues) throw …`.'
 : 'the result shape changed from { success, data, error } to { value, issues }.';
 diagnostics.push(
 actionRequired(
 sourceFile.getFilePath(),
 callNode,
 `Rewrote ${localName}.${method}() to specTypeSchemas.${typeName}['~standard'].validate(): ` +
 `v2 spec schemas are StandardSchemaV1, not Zod. Note: ${semantics}`
 )
 );
 callNode.replaceWithText(`specTypeSchemas.${typeName}['~standard'].validate(${argText})`);
 ensureImport(sourceFile, 'specTypeSchemas');
 return true;
 }

 diagnostics.push(
 actionRequired(
 sourceFile.getFilePath(),
 ref,
 `${localName}.${method}() is not available on v2 spec schemas (StandardSchemaV1, not Zod). ` +
 `Replaced ${localName} with specTypeSchemas.${typeName}; rewrite the .${method}(...) call using ` +
 `specTypeSchemas.${typeName}['~standard'].validate(...) (returns { value, issues }, does not throw).`
 )
 );
 ref.replaceWithText(`specTypeSchemas.${typeName}`);
 ensureImport(sourceFile, 'specTypeSchemas');
 return true;
}

function ensureImport(sourceFile: SourceFile, symbol: string): void {
 const existingImport = sourceFile.getImportDeclarations().find(imp => {
 if (!isAnyMcpSpecifier(imp.getModuleSpecifierValue())) return false;
Expand Down

34 changes: 22 additions & 12 deletions
packages/codemod/test/v1-to-v2/transforms/specSchemaAccess.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -210,10 +210,12 @@ describe('spec-schema-access transform', () => {
 expect(text).not.toContain('return result.value');
 });

 it('falls back to diagnostic for non-captured safeParse (bare expression)', () => {
 it('rewrites non-captured safeParse (bare expression) to validate()', () => {
 const input = [`import { ToolSchema } from '@modelcontextprotocol/server';`, `ToolSchema.safeParse(data);`, ''].join('\n');
 const { result } = applyTransform(input);
 expect(result.changesCount).toBe(0);
 const { text, result } = applyTransform(input);
 expect(text).toContain("specTypeSchemas.Tool['~standard'].validate(data)");
 expect(text).not.toMatch(/import\s*\{[^}]*ToolSchema[^}]*\}/);
 expect(result.changesCount).toBeGreaterThan(0);
 expect(result.diagnostics.length).toBe(1);
 });
 });
Expand DownExpand Up@@ -327,16 +329,24 @@ describe('spec-schema-access transform', () => {
 });
 });

 describe('diagnostic only: .parse(v)', () => {
 it('emits diagnostic for parse usage', () => {
 describe('.parse(v)', () => {
 it('rewrites discarded parse() to the validate() primitive', () => {
 const input = [`import { ToolSchema } from '@modelcontextprotocol/server';`, `ToolSchema.parse(raw);`, ''].join('\n');
 const { text, result } = applyTransform(input);
 expect(text).toContain("specTypeSchemas.Tool['~standard'].validate(raw)");
 expect(text).not.toMatch(/import\s*\{[^}]*ToolSchema[^}]*\}/);
 expect(result.changesCount).toBeGreaterThan(0);
 });

 it('swaps the identifier (import stays resolvable) when the parse() result is used', () => {
 const input = [`import { ToolSchema } from '@modelcontextprotocol/server';`, `const tool = ToolSchema.parse(raw);`, ''].join(
 '\n'
 );
 const { text, result } = applyTransform(input);
 expect(text).toContain('ToolSchema.parse');
 expect(result.changesCount).toBe(0);
 expect(result.diagnostics.length).toBe(1);
 expect(result.diagnostics[0]!.message).toContain('isSpecType.Tool');
 expect(text).toContain('specTypeSchemas.Tool.parse(raw)');
 expect(text).not.toMatch(/import\s*\{[^}]*ToolSchema[^}]*\}/);
 expect(result.changesCount).toBeGreaterThan(0);
 expect(result.diagnostics[0]!.message).toContain('specTypeSchemas.Tool');
 });
 });

Expand DownExpand Up@@ -392,7 +402,7 @@ describe('spec-schema-access transform', () => {
 expect(text).not.toMatch(/import\s*\{[^}]*CallToolRequestSchema[^}]*\}/);
 });

 it('keeps original schema import when some refs are diagnostic-only', () => {
 it('removes the schema import even when a ref falls back to a parse()/safeParse() rewrite', () => {
 const input = [
 `import { CallToolRequestSchema } from '@modelcontextprotocol/server';`,
 `const valid = CallToolRequestSchema.safeParse(data).success;`,
Expand All@@ -401,8 +411,8 @@ describe('spec-schema-access transform', () => {
 ].join('\n');
 const { text } = applyTransform(input);
 expect(text).toContain('isSpecType.CallToolRequest(data)');
 expect(text).toContain('CallToolRequestSchema.parse');
 expect(text).toMatch(/import\s*\{[^}]*CallToolRequestSchema[^}]*\}/);
 expect(text).toContain('specTypeSchemas.CallToolRequest.parse(data)');
 expect(text).not.toMatch(/import\s*\{[^}]*CallToolRequestSchema[^}]*\}/);
 });

 it('removes schema specifier from import that also has other symbols', () => {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
codemod iterations round 1#2274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

KKonstantinov
merged 2 commits into

from

Jun 10, 2026
 Merged


codemod iterations round 1
#2274
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f33b9bc

codemod iterations round 1


KKonstantinov Jun 10, 2026
9df0b83

clean up


KKonstantinov Jun 10, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
packages/codemod/src/bin/batchTest.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -87,6 +87,7 @@ const LOCAL_PACKAGE_DIRS: Record<string, string> = {
 '@modelcontextprotocol/client': path.join(SDK_ROOT, 'packages/client'),
 '@modelcontextprotocol/core': path.join(SDK_ROOT, 'packages/core'),
 '@modelcontextprotocol/server': path.join(SDK_ROOT, 'packages/server'),
 '@modelcontextprotocol/server-legacy': path.join(SDK_ROOT, 'packages/server-legacy'),
 '@modelcontextprotocol/express': path.join(SDK_ROOT, 'packages/middleware/express'),
 '@modelcontextprotocol/fastify': path.join(SDK_ROOT, 'packages/middleware/fastify'),
 '@modelcontextprotocol/hono': path.join(SDK_ROOT, 'packages/middleware/hono'),
Expand Down

6 changes: 5 additions & 1 deletion
packages/codemod/src/migrations/v1-to-v2/mappings/importMap.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,11 @@ export const IMPORT_MAP: Record<string, ImportMapping> = {
 StreamableHTTPServerTransport: 'NodeStreamableHTTPServerTransport'
 },
 symbolTargetOverrides: {
 StreamableHTTPServerTransport: '@modelcontextprotocol/node'
 StreamableHTTPServerTransport: '@modelcontextprotocol/node',
 // The companion options type moved with the transport. @modelcontextprotocol/node
 // re-exports it under the same name (a backward-compat alias for
 // WebStandardStreamableHTTPServerTransportOptions), so route it there without renaming.
 StreamableHTTPServerTransportOptions: '@modelcontextprotocol/node'
 }
 },
 '@modelcontextprotocol/sdk/server/webStandardStreamableHttp.js': {
Expand Down

87 changes: 68 additions & 19 deletions
packages/codemod/src/migrations/v1-to-v2/transforms/specSchemaAccess.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -101,28 +101,15 @@ function handleReference(
 return rewriteCapturedSafeParse(safeParseCall, localName, typeName, sourceFile, diagnostics);
 }

 diagnostics.push(
 actionRequired(
 sourceFile.getFilePath(),
 ref,
 `${localName}.safeParse() not available in v2. Use \`isSpecType.${typeName}(value)\` for boolean validation, ` +
 `or \`specTypeSchemas.${typeName}['~standard'].validate(value)\` for full result.`
 )
 );
 return false;
 return rewriteUnsupportedSchemaCall(ref, safeParseCall, localName, typeName, 'safeParse', sourceFile, diagnostics);
 }

 // Pattern: XSchema.parse(v) — diagnostic only
 // Pattern: XSchema.parse(v) — rewrite to the StandardSchema validate() primitive (or, when the
 // result is used, swap the identifier) so we never leave behind an import of a non-exported schema.
 if (isParsePattern(ref)) {
 diagnostics.push(
 actionRequired(
 sourceFile.getFilePath(),
 ref,
 `${localName}.parse() not available in v2. Use \`isSpecType.${typeName}(value)\` for validation, ` +
 `or \`specTypeSchemas.${typeName}['~standard'].validate(value)\` and check for issues.`
 )
 );
 return false;
 const parseAccess = ref.getParent() as import('ts-morph').PropertyAccessExpression;
 const parseCall = parseAccess.getParent() as import('ts-morph').CallExpression;
 return rewriteUnsupportedSchemaCall(ref, parseCall, localName, typeName, 'parse', sourceFile, diagnostics);
 }

 // Pattern: XSchema used as value (function arg, assignment, etc.)
Expand DownExpand Up@@ -327,6 +314,68 @@ function rewriteCapturedSafeParse(
 return true;
}

/**
 * Handles spec-schema usages that have no behavior-preserving v2 equivalent: the Zod-only
 * methods `.parse()` and (uncaptured) `.safeParse()`. In v2 these schemas are StandardSchemaV1
 * values that are NOT named public exports, so leaving the original import in place produces an
 * unresolved-import error (e.g. `PromptSchema` is not exported by `@modelcontextprotocol/server`).
 *
 * - Result discarded (validation for side-effect only): rewrite `XSchema.parse(v)` →
 * `specTypeSchemas.T['~standard'].validate(v)` so the code compiles. NOTE: `validate()` does not
 * throw, so `.parse()`'s throw-on-invalid behavior is lost — flagged via an actionRequired comment.
 * - Result used: swap only the identifier to `specTypeSchemas.T` so the import resolves; the
 * `.parse()`/`.safeParse()` call and its result shape still need a manual fix (flagged).
 *
 * Either way the original (now non-exported) schema import is dropped by the caller's
 * removeUnusedImport, so no dangling import survives.
 */
function rewriteUnsupportedSchemaCall(
 ref: import('ts-morph').Node,
 callNode: import('ts-morph').CallExpression,
 localName: string,
 typeName: string,
 method: 'parse' | 'safeParse',
 sourceFile: SourceFile,
 diagnostics: Diagnostic[]
): boolean {
 const resultDiscarded = Node.isExpressionStatement(callNode.getParent());

 if (resultDiscarded) {
 const argText = callNode
 .getArguments()
 .map(a => a.getText())
 .join(', ');
 const semantics =
 method === 'parse'
 ? 'validate() does NOT throw on invalid input (parse() did) — if you relied on that, add `if (result.issues) throw …`.'
 : 'the result shape changed from { success, data, error } to { value, issues }.';
 diagnostics.push(
 actionRequired(
 sourceFile.getFilePath(),
 callNode,
 `Rewrote ${localName}.${method}() to specTypeSchemas.${typeName}['~standard'].validate(): ` +
 `v2 spec schemas are StandardSchemaV1, not Zod. Note: ${semantics}`
 )
 );
 callNode.replaceWithText(`specTypeSchemas.${typeName}['~standard'].validate(${argText})`);
 ensureImport(sourceFile, 'specTypeSchemas');
 return true;
 }

 diagnostics.push(
 actionRequired(
 sourceFile.getFilePath(),
 ref,
 `${localName}.${method}() is not available on v2 spec schemas (StandardSchemaV1, not Zod). ` +
 `Replaced ${localName} with specTypeSchemas.${typeName}; rewrite the .${method}(...) call using ` +
 `specTypeSchemas.${typeName}['~standard'].validate(...) (returns { value, issues }, does not throw).`
 )
 );
 ref.replaceWithText(`specTypeSchemas.${typeName}`);
 ensureImport(sourceFile, 'specTypeSchemas');
 return true;
}

function ensureImport(sourceFile: SourceFile, symbol: string): void {
 const existingImport = sourceFile.getImportDeclarations().find(imp => {
 if (!isAnyMcpSpecifier(imp.getModuleSpecifierValue())) return false;
Expand Down

34 changes: 22 additions & 12 deletions
packages/codemod/test/v1-to-v2/transforms/specSchemaAccess.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -210,10 +210,12 @@ describe('spec-schema-access transform', () => {
 expect(text).not.toContain('return result.value');
 });

 it('falls back to diagnostic for non-captured safeParse (bare expression)', () => {
 it('rewrites non-captured safeParse (bare expression) to validate()', () => {
 const input = [`import { ToolSchema } from '@modelcontextprotocol/server';`, `ToolSchema.safeParse(data);`, ''].join('\n');
 const { result } = applyTransform(input);
 expect(result.changesCount).toBe(0);
 const { text, result } = applyTransform(input);
 expect(text).toContain("specTypeSchemas.Tool['~standard'].validate(data)");
 expect(text).not.toMatch(/import\s*\{[^}]*ToolSchema[^}]*\}/);
 expect(result.changesCount).toBeGreaterThan(0);
 expect(result.diagnostics.length).toBe(1);
 });
 });
Expand DownExpand Up@@ -327,16 +329,24 @@ describe('spec-schema-access transform', () => {
 });
 });

 describe('diagnostic only: .parse(v)', () => {
 it('emits diagnostic for parse usage', () => {
 describe('.parse(v)', () => {
 it('rewrites discarded parse() to the validate() primitive', () => {
 const input = [`import { ToolSchema } from '@modelcontextprotocol/server';`, `ToolSchema.parse(raw);`, ''].join('\n');
 const { text, result } = applyTransform(input);
 expect(text).toContain("specTypeSchemas.Tool['~standard'].validate(raw)");
 expect(text).not.toMatch(/import\s*\{[^}]*ToolSchema[^}]*\}/);
 expect(result.changesCount).toBeGreaterThan(0);
 });

 it('swaps the identifier (import stays resolvable) when the parse() result is used', () => {
 const input = [`import { ToolSchema } from '@modelcontextprotocol/server';`, `const tool = ToolSchema.parse(raw);`, ''].join(
 '\n'
 );
 const { text, result } = applyTransform(input);
 expect(text).toContain('ToolSchema.parse');
 expect(result.changesCount).toBe(0);
 expect(result.diagnostics.length).toBe(1);
 expect(result.diagnostics[0]!.message).toContain('isSpecType.Tool');
 expect(text).toContain('specTypeSchemas.Tool.parse(raw)');
 expect(text).not.toMatch(/import\s*\{[^}]*ToolSchema[^}]*\}/);
 expect(result.changesCount).toBeGreaterThan(0);
 expect(result.diagnostics[0]!.message).toContain('specTypeSchemas.Tool');
 });
 });

Expand DownExpand Up@@ -392,7 +402,7 @@ describe('spec-schema-access transform', () => {
 expect(text).not.toMatch(/import\s*\{[^}]*CallToolRequestSchema[^}]*\}/);
 });

 it('keeps original schema import when some refs are diagnostic-only', () => {
 it('removes the schema import even when a ref falls back to a parse()/safeParse() rewrite', () => {
 const input = [
 `import { CallToolRequestSchema } from '@modelcontextprotocol/server';`,
 `const valid = CallToolRequestSchema.safeParse(data).success;`,
Expand All@@ -401,8 +411,8 @@ describe('spec-schema-access transform', () => {
 ].join('\n');
 const { text } = applyTransform(input);
 expect(text).toContain('isSpecType.CallToolRequest(data)');
 expect(text).toContain('CallToolRequestSchema.parse');
 expect(text).toMatch(/import\s*\{[^}]*CallToolRequestSchema[^}]*\}/);
 expect(text).toContain('specTypeSchemas.CallToolRequest.parse(data)');
 expect(text).not.toMatch(/import\s*\{[^}]*CallToolRequestSchema[^}]*\}/);
 });

 it('removes schema specifier from import that also has other symbols', () => {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
codemod iterations round 1#2274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

KKonstantinov
merged 2 commits into

from

Jun 10, 2026
 Merged


codemod iterations round 1
#2274
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f33b9bc

codemod iterations round 1


KKonstantinov Jun 10, 2026
9df0b83

clean up


KKonstantinov Jun 10, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
packages/codemod/src/bin/batchTest.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -87,6 +87,7 @@ const LOCAL_PACKAGE_DIRS: Record<string, string> = {
 '@modelcontextprotocol/client': path.join(SDK_ROOT, 'packages/client'),
 '@modelcontextprotocol/core': path.join(SDK_ROOT, 'packages/core'),
 '@modelcontextprotocol/server': path.join(SDK_ROOT, 'packages/server'),
 '@modelcontextprotocol/server-legacy': path.join(SDK_ROOT, 'packages/server-legacy'),
 '@modelcontextprotocol/express': path.join(SDK_ROOT, 'packages/middleware/express'),
 '@modelcontextprotocol/fastify': path.join(SDK_ROOT, 'packages/middleware/fastify'),
 '@modelcontextprotocol/hono': path.join(SDK_ROOT, 'packages/middleware/hono'),
Expand Down

6 changes: 5 additions & 1 deletion
packages/codemod/src/migrations/v1-to-v2/mappings/importMap.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,11 @@ export const IMPORT_MAP: Record<string, ImportMapping> = {
 StreamableHTTPServerTransport: 'NodeStreamableHTTPServerTransport'
 },
 symbolTargetOverrides: {
 StreamableHTTPServerTransport: '@modelcontextprotocol/node'
 StreamableHTTPServerTransport: '@modelcontextprotocol/node',
 // The companion options type moved with the transport. @modelcontextprotocol/node
 // re-exports it under the same name (a backward-compat alias for
 // WebStandardStreamableHTTPServerTransportOptions), so route it there without renaming.
 StreamableHTTPServerTransportOptions: '@modelcontextprotocol/node'
 }
 },
 '@modelcontextprotocol/sdk/server/webStandardStreamableHttp.js': {
Expand Down

87 changes: 68 additions & 19 deletions
packages/codemod/src/migrations/v1-to-v2/transforms/specSchemaAccess.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -101,28 +101,15 @@ function handleReference(
 return rewriteCapturedSafeParse(safeParseCall, localName, typeName, sourceFile, diagnostics);
 }

 diagnostics.push(
 actionRequired(
 sourceFile.getFilePath(),
 ref,
 `${localName}.safeParse() not available in v2. Use \`isSpecType.${typeName}(value)\` for boolean validation, ` +
 `or \`specTypeSchemas.${typeName}['~standard'].validate(value)\` for full result.`
 )
 );
 return false;
 return rewriteUnsupportedSchemaCall(ref, safeParseCall, localName, typeName, 'safeParse', sourceFile, diagnostics);
 }

 // Pattern: XSchema.parse(v) — diagnostic only
 // Pattern: XSchema.parse(v) — rewrite to the StandardSchema validate() primitive (or, when the
 // result is used, swap the identifier) so we never leave behind an import of a non-exported schema.
 if (isParsePattern(ref)) {
 diagnostics.push(
 actionRequired(
 sourceFile.getFilePath(),
 ref,
 `${localName}.parse() not available in v2. Use \`isSpecType.${typeName}(value)\` for validation, ` +
 `or \`specTypeSchemas.${typeName}['~standard'].validate(value)\` and check for issues.`
 )
 );
 return false;
 const parseAccess = ref.getParent() as import('ts-morph').PropertyAccessExpression;
 const parseCall = parseAccess.getParent() as import('ts-morph').CallExpression;
 return rewriteUnsupportedSchemaCall(ref, parseCall, localName, typeName, 'parse', sourceFile, diagnostics);
 }

 // Pattern: XSchema used as value (function arg, assignment, etc.)
Expand DownExpand Up@@ -327,6 +314,68 @@ function rewriteCapturedSafeParse(
 return true;
}

/**
 * Handles spec-schema usages that have no behavior-preserving v2 equivalent: the Zod-only
 * methods `.parse()` and (uncaptured) `.safeParse()`. In v2 these schemas are StandardSchemaV1
 * values that are NOT named public exports, so leaving the original import in place produces an
 * unresolved-import error (e.g. `PromptSchema` is not exported by `@modelcontextprotocol/server`).
 *
 * - Result discarded (validation for side-effect only): rewrite `XSchema.parse(v)` →
 * `specTypeSchemas.T['~standard'].validate(v)` so the code compiles. NOTE: `validate()` does not
 * throw, so `.parse()`'s throw-on-invalid behavior is lost — flagged via an actionRequired comment.
 * - Result used: swap only the identifier to `specTypeSchemas.T` so the import resolves; the
 * `.parse()`/`.safeParse()` call and its result shape still need a manual fix (flagged).
 *
 * Either way the original (now non-exported) schema import is dropped by the caller's
 * removeUnusedImport, so no dangling import survives.
 */
function rewriteUnsupportedSchemaCall(
 ref: import('ts-morph').Node,
 callNode: import('ts-morph').CallExpression,
 localName: string,
 typeName: string,
 method: 'parse' | 'safeParse',
 sourceFile: SourceFile,
 diagnostics: Diagnostic[]
): boolean {
 const resultDiscarded = Node.isExpressionStatement(callNode.getParent());

 if (resultDiscarded) {
 const argText = callNode
 .getArguments()
 .map(a => a.getText())
 .join(', ');
 const semantics =
 method === 'parse'
 ? 'validate() does NOT throw on invalid input (parse() did) — if you relied on that, add `if (result.issues) throw …`.'
 : 'the result shape changed from { success, data, error } to { value, issues }.';
 diagnostics.push(
 actionRequired(
 sourceFile.getFilePath(),
 callNode,
 `Rewrote ${localName}.${method}() to specTypeSchemas.${typeName}['~standard'].validate(): ` +
 `v2 spec schemas are StandardSchemaV1, not Zod. Note: ${semantics}`
 )
 );
 callNode.replaceWithText(`specTypeSchemas.${typeName}['~standard'].validate(${argText})`);
 ensureImport(sourceFile, 'specTypeSchemas');
 return true;
 }

 diagnostics.push(
 actionRequired(
 sourceFile.getFilePath(),
 ref,
 `${localName}.${method}() is not available on v2 spec schemas (StandardSchemaV1, not Zod). ` +
 `Replaced ${localName} with specTypeSchemas.${typeName}; rewrite the .${method}(...) call using ` +
 `specTypeSchemas.${typeName}['~standard'].validate(...) (returns { value, issues }, does not throw).`
 )
 );
 ref.replaceWithText(`specTypeSchemas.${typeName}`);
 ensureImport(sourceFile, 'specTypeSchemas');
 return true;
}

function ensureImport(sourceFile: SourceFile, symbol: string): void {
 const existingImport = sourceFile.getImportDeclarations().find(imp => {
 if (!isAnyMcpSpecifier(imp.getModuleSpecifierValue())) return false;
Expand Down

34 changes: 22 additions & 12 deletions
packages/codemod/test/v1-to-v2/transforms/specSchemaAccess.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -210,10 +210,12 @@ describe('spec-schema-access transform', () => {
 expect(text).not.toContain('return result.value');
 });

 it('falls back to diagnostic for non-captured safeParse (bare expression)', () => {
 it('rewrites non-captured safeParse (bare expression) to validate()', () => {
 const input = [`import { ToolSchema } from '@modelcontextprotocol/server';`, `ToolSchema.safeParse(data);`, ''].join('\n');
 const { result } = applyTransform(input);
 expect(result.changesCount).toBe(0);
 const { text, result } = applyTransform(input);
 expect(text).toContain("specTypeSchemas.Tool['~standard'].validate(data)");
 expect(text).not.toMatch(/import\s*\{[^}]*ToolSchema[^}]*\}/);
 expect(result.changesCount).toBeGreaterThan(0);
 expect(result.diagnostics.length).toBe(1);
 });
 });
Expand DownExpand Up@@ -327,16 +329,24 @@ describe('spec-schema-access transform', () => {
 });
 });

 describe('diagnostic only: .parse(v)', () => {
 it('emits diagnostic for parse usage', () => {
 describe('.parse(v)', () => {
 it('rewrites discarded parse() to the validate() primitive', () => {
 const input = [`import { ToolSchema } from '@modelcontextprotocol/server';`, `ToolSchema.parse(raw);`, ''].join('\n');
 const { text, result } = applyTransform(input);
 expect(text).toContain("specTypeSchemas.Tool['~standard'].validate(raw)");
 expect(text).not.toMatch(/import\s*\{[^}]*ToolSchema[^}]*\}/);
 expect(result.changesCount).toBeGreaterThan(0);
 });

 it('swaps the identifier (import stays resolvable) when the parse() result is used', () => {
 const input = [`import { ToolSchema } from '@modelcontextprotocol/server';`, `const tool = ToolSchema.parse(raw);`, ''].join(
 '\n'
 );
 const { text, result } = applyTransform(input);
 expect(text).toContain('ToolSchema.parse');
 expect(result.changesCount).toBe(0);
 expect(result.diagnostics.length).toBe(1);
 expect(result.diagnostics[0]!.message).toContain('isSpecType.Tool');
 expect(text).toContain('specTypeSchemas.Tool.parse(raw)');
 expect(text).not.toMatch(/import\s*\{[^}]*ToolSchema[^}]*\}/);
 expect(result.changesCount).toBeGreaterThan(0);
 expect(result.diagnostics[0]!.message).toContain('specTypeSchemas.Tool');
 });
 });

Expand DownExpand Up@@ -392,7 +402,7 @@ describe('spec-schema-access transform', () => {
 expect(text).not.toMatch(/import\s*\{[^}]*CallToolRequestSchema[^}]*\}/);
 });

 it('keeps original schema import when some refs are diagnostic-only', () => {
 it('removes the schema import even when a ref falls back to a parse()/safeParse() rewrite', () => {
 const input = [
 `import { CallToolRequestSchema } from '@modelcontextprotocol/server';`,
 `const valid = CallToolRequestSchema.safeParse(data).success;`,
Expand All@@ -401,8 +411,8 @@ describe('spec-schema-access transform', () => {
 ].join('\n');
 const { text } = applyTransform(input);
 expect(text).toContain('isSpecType.CallToolRequest(data)');
 expect(text).toContain('CallToolRequestSchema.parse');
 expect(text).toMatch(/import\s*\{[^}]*CallToolRequestSchema[^}]*\}/);
 expect(text).toContain('specTypeSchemas.CallToolRequest.parse(data)');
 expect(text).not.toMatch(/import\s*\{[^}]*CallToolRequestSchema[^}]*\}/);
 });

 it('removes schema specifier from import that also has other symbols', () => {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
codemod iterations round 1#2274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

KKonstantinov
merged 2 commits into

from

Jun 10, 2026
 Merged


codemod iterations round 1
#2274
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f33b9bc

codemod iterations round 1


KKonstantinov Jun 10, 2026
9df0b83

clean up


KKonstantinov Jun 10, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
packages/codemod/src/bin/batchTest.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -87,6 +87,7 @@ const LOCAL_PACKAGE_DIRS: Record<string, string> = {
 '@modelcontextprotocol/client': path.join(SDK_ROOT, 'packages/client'),
 '@modelcontextprotocol/core': path.join(SDK_ROOT, 'packages/core'),
 '@modelcontextprotocol/server': path.join(SDK_ROOT, 'packages/server'),
 '@modelcontextprotocol/server-legacy': path.join(SDK_ROOT, 'packages/server-legacy'),
 '@modelcontextprotocol/express': path.join(SDK_ROOT, 'packages/middleware/express'),
 '@modelcontextprotocol/fastify': path.join(SDK_ROOT, 'packages/middleware/fastify'),
 '@modelcontextprotocol/hono': path.join(SDK_ROOT, 'packages/middleware/hono'),
Expand Down

6 changes: 5 additions & 1 deletion
packages/codemod/src/migrations/v1-to-v2/mappings/importMap.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,11 @@ export const IMPORT_MAP: Record<string, ImportMapping> = {
 StreamableHTTPServerTransport: 'NodeStreamableHTTPServerTransport'
 },
 symbolTargetOverrides: {
 StreamableHTTPServerTransport: '@modelcontextprotocol/node'
 StreamableHTTPServerTransport: '@modelcontextprotocol/node',
 // The companion options type moved with the transport. @modelcontextprotocol/node
 // re-exports it under the same name (a backward-compat alias for
 // WebStandardStreamableHTTPServerTransportOptions), so route it there without renaming.
 StreamableHTTPServerTransportOptions: '@modelcontextprotocol/node'
 }
 },
 '@modelcontextprotocol/sdk/server/webStandardStreamableHttp.js': {
Expand Down

87 changes: 68 additions & 19 deletions
packages/codemod/src/migrations/v1-to-v2/transforms/specSchemaAccess.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -101,28 +101,15 @@ function handleReference(
 return rewriteCapturedSafeParse(safeParseCall, localName, typeName, sourceFile, diagnostics);
 }

 diagnostics.push(
 actionRequired(
 sourceFile.getFilePath(),
 ref,
 `${localName}.safeParse() not available in v2. Use \`isSpecType.${typeName}(value)\` for boolean validation, ` +
 `or \`specTypeSchemas.${typeName}['~standard'].validate(value)\` for full result.`
 )
 );
 return false;
 return rewriteUnsupportedSchemaCall(ref, safeParseCall, localName, typeName, 'safeParse', sourceFile, diagnostics);
 }

 // Pattern: XSchema.parse(v) — diagnostic only
 // Pattern: XSchema.parse(v) — rewrite to the StandardSchema validate() primitive (or, when the
 // result is used, swap the identifier) so we never leave behind an import of a non-exported schema.
 if (isParsePattern(ref)) {
 diagnostics.push(
 actionRequired(
 sourceFile.getFilePath(),
 ref,
 `${localName}.parse() not available in v2. Use \`isSpecType.${typeName}(value)\` for validation, ` +
 `or \`specTypeSchemas.${typeName}['~standard'].validate(value)\` and check for issues.`
 )
 );
 return false;
 const parseAccess = ref.getParent() as import('ts-morph').PropertyAccessExpression;
 const parseCall = parseAccess.getParent() as import('ts-morph').CallExpression;
 return rewriteUnsupportedSchemaCall(ref, parseCall, localName, typeName, 'parse', sourceFile, diagnostics);
 }

 // Pattern: XSchema used as value (function arg, assignment, etc.)
Expand DownExpand Up@@ -327,6 +314,68 @@ function rewriteCapturedSafeParse(
 return true;
}

/**
 * Handles spec-schema usages that have no behavior-preserving v2 equivalent: the Zod-only
 * methods `.parse()` and (uncaptured) `.safeParse()`. In v2 these schemas are StandardSchemaV1
 * values that are NOT named public exports, so leaving the original import in place produces an
 * unresolved-import error (e.g. `PromptSchema` is not exported by `@modelcontextprotocol/server`).
 *
 * - Result discarded (validation for side-effect only): rewrite `XSchema.parse(v)` →
 * `specTypeSchemas.T['~standard'].validate(v)` so the code compiles. NOTE: `validate()` does not
 * throw, so `.parse()`'s throw-on-invalid behavior is lost — flagged via an actionRequired comment.
 * - Result used: swap only the identifier to `specTypeSchemas.T` so the import resolves; the
 * `.parse()`/`.safeParse()` call and its result shape still need a manual fix (flagged).
 *
 * Either way the original (now non-exported) schema import is dropped by the caller's
 * removeUnusedImport, so no dangling import survives.
 */
function rewriteUnsupportedSchemaCall(
 ref: import('ts-morph').Node,
 callNode: import('ts-morph').CallExpression,
 localName: string,
 typeName: string,
 method: 'parse' | 'safeParse',
 sourceFile: SourceFile,
 diagnostics: Diagnostic[]
): boolean {
 const resultDiscarded = Node.isExpressionStatement(callNode.getParent());

 if (resultDiscarded) {
 const argText = callNode
 .getArguments()
 .map(a => a.getText())
 .join(', ');
 const semantics =
 method === 'parse'
 ? 'validate() does NOT throw on invalid input (parse() did) — if you relied on that, add `if (result.issues) throw …`.'
 : 'the result shape changed from { success, data, error } to { value, issues }.';
 diagnostics.push(
 actionRequired(
 sourceFile.getFilePath(),
 callNode,
 `Rewrote ${localName}.${method}() to specTypeSchemas.${typeName}['~standard'].validate(): ` +
 `v2 spec schemas are StandardSchemaV1, not Zod. Note: ${semantics}`
 )
 );
 callNode.replaceWithText(`specTypeSchemas.${typeName}['~standard'].validate(${argText})`);
 ensureImport(sourceFile, 'specTypeSchemas');
 return true;
 }

 diagnostics.push(
 actionRequired(
 sourceFile.getFilePath(),
 ref,
 `${localName}.${method}() is not available on v2 spec schemas (StandardSchemaV1, not Zod). ` +
 `Replaced ${localName} with specTypeSchemas.${typeName}; rewrite the .${method}(...) call using ` +
 `specTypeSchemas.${typeName}['~standard'].validate(...) (returns { value, issues }, does not throw).`
 )
 );
 ref.replaceWithText(`specTypeSchemas.${typeName}`);
 ensureImport(sourceFile, 'specTypeSchemas');
 return true;
}

function ensureImport(sourceFile: SourceFile, symbol: string): void {
 const existingImport = sourceFile.getImportDeclarations().find(imp => {
 if (!isAnyMcpSpecifier(imp.getModuleSpecifierValue())) return false;
Expand Down

34 changes: 22 additions & 12 deletions
packages/codemod/test/v1-to-v2/transforms/specSchemaAccess.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -210,10 +210,12 @@ describe('spec-schema-access transform', () => {
 expect(text).not.toContain('return result.value');
 });

 it('falls back to diagnostic for non-captured safeParse (bare expression)', () => {
 it('rewrites non-captured safeParse (bare expression) to validate()', () => {
 const input = [`import { ToolSchema } from '@modelcontextprotocol/server';`, `ToolSchema.safeParse(data);`, ''].join('\n');
 const { result } = applyTransform(input);
 expect(result.changesCount).toBe(0);
 const { text, result } = applyTransform(input);
 expect(text).toContain("specTypeSchemas.Tool['~standard'].validate(data)");
 expect(text).not.toMatch(/import\s*\{[^}]*ToolSchema[^}]*\}/);
 expect(result.changesCount).toBeGreaterThan(0);
 expect(result.diagnostics.length).toBe(1);
 });
 });
Expand DownExpand Up@@ -327,16 +329,24 @@ describe('spec-schema-access transform', () => {
 });
 });

 describe('diagnostic only: .parse(v)', () => {
 it('emits diagnostic for parse usage', () => {
 describe('.parse(v)', () => {
 it('rewrites discarded parse() to the validate() primitive', () => {
 const input = [`import { ToolSchema } from '@modelcontextprotocol/server';`, `ToolSchema.parse(raw);`, ''].join('\n');
 const { text, result } = applyTransform(input);
 expect(text).toContain("specTypeSchemas.Tool['~standard'].validate(raw)");
 expect(text).not.toMatch(/import\s*\{[^}]*ToolSchema[^}]*\}/);
 expect(result.changesCount).toBeGreaterThan(0);
 });

 it('swaps the identifier (import stays resolvable) when the parse() result is used', () => {
 const input = [`import { ToolSchema } from '@modelcontextprotocol/server';`, `const tool = ToolSchema.parse(raw);`, ''].join(
 '\n'
 );
 const { text, result } = applyTransform(input);
 expect(text).toContain('ToolSchema.parse');
 expect(result.changesCount).toBe(0);
 expect(result.diagnostics.length).toBe(1);
 expect(result.diagnostics[0]!.message).toContain('isSpecType.Tool');
 expect(text).toContain('specTypeSchemas.Tool.parse(raw)');
 expect(text).not.toMatch(/import\s*\{[^}]*ToolSchema[^}]*\}/);
 expect(result.changesCount).toBeGreaterThan(0);
 expect(result.diagnostics[0]!.message).toContain('specTypeSchemas.Tool');
 });
 });

Expand DownExpand Up@@ -392,7 +402,7 @@ describe('spec-schema-access transform', () => {
 expect(text).not.toMatch(/import\s*\{[^}]*CallToolRequestSchema[^}]*\}/);
 });

 it('keeps original schema import when some refs are diagnostic-only', () => {
 it('removes the schema import even when a ref falls back to a parse()/safeParse() rewrite', () => {
 const input = [
 `import { CallToolRequestSchema } from '@modelcontextprotocol/server';`,
 `const valid = CallToolRequestSchema.safeParse(data).success;`,
Expand All@@ -401,8 +411,8 @@ describe('spec-schema-access transform', () => {
 ].join('\n');
 const { text } = applyTransform(input);
 expect(text).toContain('isSpecType.CallToolRequest(data)');
 expect(text).toContain('CallToolRequestSchema.parse');
 expect(text).toMatch(/import\s*\{[^}]*CallToolRequestSchema[^}]*\}/);
 expect(text).toContain('specTypeSchemas.CallToolRequest.parse(data)');
 expect(text).not.toMatch(/import\s*\{[^}]*CallToolRequestSchema[^}]*\}/);
 });

 it('removes schema specifier from import that also has other symbols', () => {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
codemod iterations round 1#2274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

KKonstantinov
merged 2 commits into

from

Jun 10, 2026
 Merged


codemod iterations round 1
#2274
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f33b9bc

codemod iterations round 1


KKonstantinov Jun 10, 2026
9df0b83

clean up


KKonstantinov Jun 10, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
packages/codemod/src/bin/batchTest.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -87,6 +87,7 @@ const LOCAL_PACKAGE_DIRS: Record<string, string> = {
 '@modelcontextprotocol/client': path.join(SDK_ROOT, 'packages/client'),
 '@modelcontextprotocol/core': path.join(SDK_ROOT, 'packages/core'),
 '@modelcontextprotocol/server': path.join(SDK_ROOT, 'packages/server'),
 '@modelcontextprotocol/server-legacy': path.join(SDK_ROOT, 'packages/server-legacy'),
 '@modelcontextprotocol/express': path.join(SDK_ROOT, 'packages/middleware/express'),
 '@modelcontextprotocol/fastify': path.join(SDK_ROOT, 'packages/middleware/fastify'),
 '@modelcontextprotocol/hono': path.join(SDK_ROOT, 'packages/middleware/hono'),
Expand Down

6 changes: 5 additions & 1 deletion
packages/codemod/src/migrations/v1-to-v2/mappings/importMap.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,11 @@ export const IMPORT_MAP: Record<string, ImportMapping> = {
 StreamableHTTPServerTransport: 'NodeStreamableHTTPServerTransport'
 },
 symbolTargetOverrides: {
 StreamableHTTPServerTransport: '@modelcontextprotocol/node'
 StreamableHTTPServerTransport: '@modelcontextprotocol/node',
 // The companion options type moved with the transport. @modelcontextprotocol/node
 // re-exports it under the same name (a backward-compat alias for
 // WebStandardStreamableHTTPServerTransportOptions), so route it there without renaming.
 StreamableHTTPServerTransportOptions: '@modelcontextprotocol/node'
 }
 },
 '@modelcontextprotocol/sdk/server/webStandardStreamableHttp.js': {
Expand Down

87 changes: 68 additions & 19 deletions
packages/codemod/src/migrations/v1-to-v2/transforms/specSchemaAccess.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -101,28 +101,15 @@ function handleReference(
 return rewriteCapturedSafeParse(safeParseCall, localName, typeName, sourceFile, diagnostics);
 }

 diagnostics.push(
 actionRequired(
 sourceFile.getFilePath(),
 ref,
 `${localName}.safeParse() not available in v2. Use \`isSpecType.${typeName}(value)\` for boolean validation, ` +
 `or \`specTypeSchemas.${typeName}['~standard'].validate(value)\` for full result.`
 )
 );
 return false;
 return rewriteUnsupportedSchemaCall(ref, safeParseCall, localName, typeName, 'safeParse', sourceFile, diagnostics);
 }

 // Pattern: XSchema.parse(v) — diagnostic only
 // Pattern: XSchema.parse(v) — rewrite to the StandardSchema validate() primitive (or, when the
 // result is used, swap the identifier) so we never leave behind an import of a non-exported schema.
 if (isParsePattern(ref)) {
 diagnostics.push(
 actionRequired(
 sourceFile.getFilePath(),
 ref,
 `${localName}.parse() not available in v2. Use \`isSpecType.${typeName}(value)\` for validation, ` +
 `or \`specTypeSchemas.${typeName}['~standard'].validate(value)\` and check for issues.`
 )
 );
 return false;
 const parseAccess = ref.getParent() as import('ts-morph').PropertyAccessExpression;
 const parseCall = parseAccess.getParent() as import('ts-morph').CallExpression;
 return rewriteUnsupportedSchemaCall(ref, parseCall, localName, typeName, 'parse', sourceFile, diagnostics);
 }

 // Pattern: XSchema used as value (function arg, assignment, etc.)
Expand DownExpand Up@@ -327,6 +314,68 @@ function rewriteCapturedSafeParse(
 return true;
}

/**
 * Handles spec-schema usages that have no behavior-preserving v2 equivalent: the Zod-only
 * methods `.parse()` and (uncaptured) `.safeParse()`. In v2 these schemas are StandardSchemaV1
 * values that are NOT named public exports, so leaving the original import in place produces an
 * unresolved-import error (e.g. `PromptSchema` is not exported by `@modelcontextprotocol/server`).
 *
 * - Result discarded (validation for side-effect only): rewrite `XSchema.parse(v)` →
 * `specTypeSchemas.T['~standard'].validate(v)` so the code compiles. NOTE: `validate()` does not
 * throw, so `.parse()`'s throw-on-invalid behavior is lost — flagged via an actionRequired comment.
 * - Result used: swap only the identifier to `specTypeSchemas.T` so the import resolves; the
 * `.parse()`/`.safeParse()` call and its result shape still need a manual fix (flagged).
 *
 * Either way the original (now non-exported) schema import is dropped by the caller's
 * removeUnusedImport, so no dangling import survives.
 */
function rewriteUnsupportedSchemaCall(
 ref: import('ts-morph').Node,
 callNode: import('ts-morph').CallExpression,
 localName: string,
 typeName: string,
 method: 'parse' | 'safeParse',
 sourceFile: SourceFile,
 diagnostics: Diagnostic[]
): boolean {
 const resultDiscarded = Node.isExpressionStatement(callNode.getParent());

 if (resultDiscarded) {
 const argText = callNode
 .getArguments()
 .map(a => a.getText())
 .join(', ');
 const semantics =
 method === 'parse'
 ? 'validate() does NOT throw on invalid input (parse() did) — if you relied on that, add `if (result.issues) throw …`.'
 : 'the result shape changed from { success, data, error } to { value, issues }.';
 diagnostics.push(
 actionRequired(
 sourceFile.getFilePath(),
 callNode,
 `Rewrote ${localName}.${method}() to specTypeSchemas.${typeName}['~standard'].validate(): ` +
 `v2 spec schemas are StandardSchemaV1, not Zod. Note: ${semantics}`
 )
 );
 callNode.replaceWithText(`specTypeSchemas.${typeName}['~standard'].validate(${argText})`);
 ensureImport(sourceFile, 'specTypeSchemas');
 return true;
 }

 diagnostics.push(
 actionRequired(
 sourceFile.getFilePath(),
 ref,
 `${localName}.${method}() is not available on v2 spec schemas (StandardSchemaV1, not Zod). ` +
 `Replaced ${localName} with specTypeSchemas.${typeName}; rewrite the .${method}(...) call using ` +
 `specTypeSchemas.${typeName}['~standard'].validate(...) (returns { value, issues }, does not throw).`
 )
 );
 ref.replaceWithText(`specTypeSchemas.${typeName}`);
 ensureImport(sourceFile, 'specTypeSchemas');
 return true;
}

function ensureImport(sourceFile: SourceFile, symbol: string): void {
 const existingImport = sourceFile.getImportDeclarations().find(imp => {
 if (!isAnyMcpSpecifier(imp.getModuleSpecifierValue())) return false;
Expand Down

34 changes: 22 additions & 12 deletions
packages/codemod/test/v1-to-v2/transforms/specSchemaAccess.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -210,10 +210,12 @@ describe('spec-schema-access transform', () => {
 expect(text).not.toContain('return result.value');
 });

 it('falls back to diagnostic for non-captured safeParse (bare expression)', () => {
 it('rewrites non-captured safeParse (bare expression) to validate()', () => {
 const input = [`import { ToolSchema } from '@modelcontextprotocol/server';`, `ToolSchema.safeParse(data);`, ''].join('\n');
 const { result } = applyTransform(input);
 expect(result.changesCount).toBe(0);
 const { text, result } = applyTransform(input);
 expect(text).toContain("specTypeSchemas.Tool['~standard'].validate(data)");
 expect(text).not.toMatch(/import\s*\{[^}]*ToolSchema[^}]*\}/);
 expect(result.changesCount).toBeGreaterThan(0);
 expect(result.diagnostics.length).toBe(1);
 });
 });
Expand DownExpand Up@@ -327,16 +329,24 @@ describe('spec-schema-access transform', () => {
 });
 });

 describe('diagnostic only: .parse(v)', () => {
 it('emits diagnostic for parse usage', () => {
 describe('.parse(v)', () => {
 it('rewrites discarded parse() to the validate() primitive', () => {
 const input = [`import { ToolSchema } from '@modelcontextprotocol/server';`, `ToolSchema.parse(raw);`, ''].join('\n');
 const { text, result } = applyTransform(input);
 expect(text).toContain("specTypeSchemas.Tool['~standard'].validate(raw)");
 expect(text).not.toMatch(/import\s*\{[^}]*ToolSchema[^}]*\}/);
 expect(result.changesCount).toBeGreaterThan(0);
 });

 it('swaps the identifier (import stays resolvable) when the parse() result is used', () => {
 const input = [`import { ToolSchema } from '@modelcontextprotocol/server';`, `const tool = ToolSchema.parse(raw);`, ''].join(
 '\n'
 );
 const { text, result } = applyTransform(input);
 expect(text).toContain('ToolSchema.parse');
 expect(result.changesCount).toBe(0);
 expect(result.diagnostics.length).toBe(1);
 expect(result.diagnostics[0]!.message).toContain('isSpecType.Tool');
 expect(text).toContain('specTypeSchemas.Tool.parse(raw)');
 expect(text).not.toMatch(/import\s*\{[^}]*ToolSchema[^}]*\}/);
 expect(result.changesCount).toBeGreaterThan(0);
 expect(result.diagnostics[0]!.message).toContain('specTypeSchemas.Tool');
 });
 });

Expand DownExpand Up@@ -392,7 +402,7 @@ describe('spec-schema-access transform', () => {
 expect(text).not.toMatch(/import\s*\{[^}]*CallToolRequestSchema[^}]*\}/);
 });

 it('keeps original schema import when some refs are diagnostic-only', () => {
 it('removes the schema import even when a ref falls back to a parse()/safeParse() rewrite', () => {
 const input = [
 `import { CallToolRequestSchema } from '@modelcontextprotocol/server';`,
 `const valid = CallToolRequestSchema.safeParse(data).success;`,
Expand All@@ -401,8 +411,8 @@ describe('spec-schema-access transform', () => {
 ].join('\n');
 const { text } = applyTransform(input);
 expect(text).toContain('isSpecType.CallToolRequest(data)');
 expect(text).toContain('CallToolRequestSchema.parse');
 expect(text).toMatch(/import\s*\{[^}]*CallToolRequestSchema[^}]*\}/);
 expect(text).toContain('specTypeSchemas.CallToolRequest.parse(data)');
 expect(text).not.toMatch(/import\s*\{[^}]*CallToolRequestSchema[^}]*\}/);
 });

 it('removes schema specifier from import that also has other symbols', () => {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
codemod iterations round 1#2274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

KKonstantinov
merged 2 commits into

from

Jun 10, 2026
 Merged


codemod iterations round 1
#2274
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f33b9bc

codemod iterations round 1


KKonstantinov Jun 10, 2026
9df0b83

clean up


KKonstantinov Jun 10, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
packages/codemod/src/bin/batchTest.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -87,6 +87,7 @@ const LOCAL_PACKAGE_DIRS: Record<string, string> = {
 '@modelcontextprotocol/client': path.join(SDK_ROOT, 'packages/client'),
 '@modelcontextprotocol/core': path.join(SDK_ROOT, 'packages/core'),
 '@modelcontextprotocol/server': path.join(SDK_ROOT, 'packages/server'),
 '@modelcontextprotocol/server-legacy': path.join(SDK_ROOT, 'packages/server-legacy'),
 '@modelcontextprotocol/express': path.join(SDK_ROOT, 'packages/middleware/express'),
 '@modelcontextprotocol/fastify': path.join(SDK_ROOT, 'packages/middleware/fastify'),
 '@modelcontextprotocol/hono': path.join(SDK_ROOT, 'packages/middleware/hono'),
Expand Down

6 changes: 5 additions & 1 deletion
packages/codemod/src/migrations/v1-to-v2/mappings/importMap.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,11 @@ export const IMPORT_MAP: Record<string, ImportMapping> = {
 StreamableHTTPServerTransport: 'NodeStreamableHTTPServerTransport'
 },
 symbolTargetOverrides: {
 StreamableHTTPServerTransport: '@modelcontextprotocol/node'
 StreamableHTTPServerTransport: '@modelcontextprotocol/node',
 // The companion options type moved with the transport. @modelcontextprotocol/node
 // re-exports it under the same name (a backward-compat alias for
 // WebStandardStreamableHTTPServerTransportOptions), so route it there without renaming.
 StreamableHTTPServerTransportOptions: '@modelcontextprotocol/node'
 }
 },
 '@modelcontextprotocol/sdk/server/webStandardStreamableHttp.js': {
Expand Down

87 changes: 68 additions & 19 deletions
packages/codemod/src/migrations/v1-to-v2/transforms/specSchemaAccess.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -101,28 +101,15 @@ function handleReference(
 return rewriteCapturedSafeParse(safeParseCall, localName, typeName, sourceFile, diagnostics);
 }

 diagnostics.push(
 actionRequired(
 sourceFile.getFilePath(),
 ref,
 `${localName}.safeParse() not available in v2. Use \`isSpecType.${typeName}(value)\` for boolean validation, ` +
 `or \`specTypeSchemas.${typeName}['~standard'].validate(value)\` for full result.`
 )
 );
 return false;
 return rewriteUnsupportedSchemaCall(ref, safeParseCall, localName, typeName, 'safeParse', sourceFile, diagnostics);
 }

 // Pattern: XSchema.parse(v) — diagnostic only
 // Pattern: XSchema.parse(v) — rewrite to the StandardSchema validate() primitive (or, when the
 // result is used, swap the identifier) so we never leave behind an import of a non-exported schema.
 if (isParsePattern(ref)) {
 diagnostics.push(
 actionRequired(
 sourceFile.getFilePath(),
 ref,
 `${localName}.parse() not available in v2. Use \`isSpecType.${typeName}(value)\` for validation, ` +
 `or \`specTypeSchemas.${typeName}['~standard'].validate(value)\` and check for issues.`
 )
 );
 return false;
 const parseAccess = ref.getParent() as import('ts-morph').PropertyAccessExpression;
 const parseCall = parseAccess.getParent() as import('ts-morph').CallExpression;
 return rewriteUnsupportedSchemaCall(ref, parseCall, localName, typeName, 'parse', sourceFile, diagnostics);
 }

 // Pattern: XSchema used as value (function arg, assignment, etc.)
Expand DownExpand Up@@ -327,6 +314,68 @@ function rewriteCapturedSafeParse(
 return true;
}

/**
 * Handles spec-schema usages that have no behavior-preserving v2 equivalent: the Zod-only
 * methods `.parse()` and (uncaptured) `.safeParse()`. In v2 these schemas are StandardSchemaV1
 * values that are NOT named public exports, so leaving the original import in place produces an
 * unresolved-import error (e.g. `PromptSchema` is not exported by `@modelcontextprotocol/server`).
 *
 * - Result discarded (validation for side-effect only): rewrite `XSchema.parse(v)` →
 * `specTypeSchemas.T['~standard'].validate(v)` so the code compiles. NOTE: `validate()` does not
 * throw, so `.parse()`'s throw-on-invalid behavior is lost — flagged via an actionRequired comment.
 * - Result used: swap only the identifier to `specTypeSchemas.T` so the import resolves; the
 * `.parse()`/`.safeParse()` call and its result shape still need a manual fix (flagged).
 *
 * Either way the original (now non-exported) schema import is dropped by the caller's
 * removeUnusedImport, so no dangling import survives.
 */
function rewriteUnsupportedSchemaCall(
 ref: import('ts-morph').Node,
 callNode: import('ts-morph').CallExpression,
 localName: string,
 typeName: string,
 method: 'parse' | 'safeParse',
 sourceFile: SourceFile,
 diagnostics: Diagnostic[]
): boolean {
 const resultDiscarded = Node.isExpressionStatement(callNode.getParent());

 if (resultDiscarded) {
 const argText = callNode
 .getArguments()
 .map(a => a.getText())
 .join(', ');
 const semantics =
 method === 'parse'
 ? 'validate() does NOT throw on invalid input (parse() did) — if you relied on that, add `if (result.issues) throw …`.'
 : 'the result shape changed from { success, data, error } to { value, issues }.';
 diagnostics.push(
 actionRequired(
 sourceFile.getFilePath(),
 callNode,
 `Rewrote ${localName}.${method}() to specTypeSchemas.${typeName}['~standard'].validate(): ` +
 `v2 spec schemas are StandardSchemaV1, not Zod. Note: ${semantics}`
 )
 );
 callNode.replaceWithText(`specTypeSchemas.${typeName}['~standard'].validate(${argText})`);
 ensureImport(sourceFile, 'specTypeSchemas');
 return true;
 }

 diagnostics.push(
 actionRequired(
 sourceFile.getFilePath(),
 ref,
 `${localName}.${method}() is not available on v2 spec schemas (StandardSchemaV1, not Zod). ` +
 `Replaced ${localName} with specTypeSchemas.${typeName}; rewrite the .${method}(...) call using ` +
 `specTypeSchemas.${typeName}['~standard'].validate(...) (returns { value, issues }, does not throw).`
 )
 );
 ref.replaceWithText(`specTypeSchemas.${typeName}`);
 ensureImport(sourceFile, 'specTypeSchemas');
 return true;
}

function ensureImport(sourceFile: SourceFile, symbol: string): void {
 const existingImport = sourceFile.getImportDeclarations().find(imp => {
 if (!isAnyMcpSpecifier(imp.getModuleSpecifierValue())) return false;
Expand Down

34 changes: 22 additions & 12 deletions
packages/codemod/test/v1-to-v2/transforms/specSchemaAccess.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -210,10 +210,12 @@ describe('spec-schema-access transform', () => {
 expect(text).not.toContain('return result.value');
 });

 it('falls back to diagnostic for non-captured safeParse (bare expression)', () => {
 it('rewrites non-captured safeParse (bare expression) to validate()', () => {
 const input = [`import { ToolSchema } from '@modelcontextprotocol/server';`, `ToolSchema.safeParse(data);`, ''].join('\n');
 const { result } = applyTransform(input);
 expect(result.changesCount).toBe(0);
 const { text, result } = applyTransform(input);
 expect(text).toContain("specTypeSchemas.Tool['~standard'].validate(data)");
 expect(text).not.toMatch(/import\s*\{[^}]*ToolSchema[^}]*\}/);
 expect(result.changesCount).toBeGreaterThan(0);
 expect(result.diagnostics.length).toBe(1);
 });
 });
Expand DownExpand Up@@ -327,16 +329,24 @@ describe('spec-schema-access transform', () => {
 });
 });

 describe('diagnostic only: .parse(v)', () => {
 it('emits diagnostic for parse usage', () => {
 describe('.parse(v)', () => {
 it('rewrites discarded parse() to the validate() primitive', () => {
 const input = [`import { ToolSchema } from '@modelcontextprotocol/server';`, `ToolSchema.parse(raw);`, ''].join('\n');
 const { text, result } = applyTransform(input);
 expect(text).toContain("specTypeSchemas.Tool['~standard'].validate(raw)");
 expect(text).not.toMatch(/import\s*\{[^}]*ToolSchema[^}]*\}/);
 expect(result.changesCount).toBeGreaterThan(0);
 });

 it('swaps the identifier (import stays resolvable) when the parse() result is used', () => {
 const input = [`import { ToolSchema } from '@modelcontextprotocol/server';`, `const tool = ToolSchema.parse(raw);`, ''].join(
 '\n'
 );
 const { text, result } = applyTransform(input);
 expect(text).toContain('ToolSchema.parse');
 expect(result.changesCount).toBe(0);
 expect(result.diagnostics.length).toBe(1);
 expect(result.diagnostics[0]!.message).toContain('isSpecType.Tool');
 expect(text).toContain('specTypeSchemas.Tool.parse(raw)');
 expect(text).not.toMatch(/import\s*\{[^}]*ToolSchema[^}]*\}/);
 expect(result.changesCount).toBeGreaterThan(0);
 expect(result.diagnostics[0]!.message).toContain('specTypeSchemas.Tool');
 });
 });

Expand DownExpand Up@@ -392,7 +402,7 @@ describe('spec-schema-access transform', () => {
 expect(text).not.toMatch(/import\s*\{[^}]*CallToolRequestSchema[^}]*\}/);
 });

 it('keeps original schema import when some refs are diagnostic-only', () => {
 it('removes the schema import even when a ref falls back to a parse()/safeParse() rewrite', () => {
 const input = [
 `import { CallToolRequestSchema } from '@modelcontextprotocol/server';`,
 `const valid = CallToolRequestSchema.safeParse(data).success;`,
Expand All@@ -401,8 +411,8 @@ describe('spec-schema-access transform', () => {
 ].join('\n');
 const { text } = applyTransform(input);
 expect(text).toContain('isSpecType.CallToolRequest(data)');
 expect(text).toContain('CallToolRequestSchema.parse');
 expect(text).toMatch(/import\s*\{[^}]*CallToolRequestSchema[^}]*\}/);
 expect(text).toContain('specTypeSchemas.CallToolRequest.parse(data)');
 expect(text).not.toMatch(/import\s*\{[^}]*CallToolRequestSchema[^}]*\}/);
 });

 it('removes schema specifier from import that also has other symbols', () => {
Expand Down
Loading