mcp-server-sfmc 2.0.0 → 2.1.1

package/dist/index.js

@@ -21,7 +21,21 @@ import { ECMASCRIPT_BUILTINS, KNOWN_UNSUPPORTED, polyfillByPrototypeName, polyfi
 function projectPackageRoot() {
     return path.join(path.dirname(fileURLToPath(import.meta.url)), '..');
 }
-const pkg = JSON.parse(fs.readFileSync(path.join(projectPackageRoot(), 'package.json'), 'utf8'));
+const packageJsonPath = path.join(projectPackageRoot(), 'package.json');
+const package_ = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+/**
+ * Normalize a completion item's `label` (which may be a string or a
+ * `{ label: string }` object) to its plain-string form.
+ * @param item - A completion item with a string or object label.
+ * @param item.label
+ * @returns {string} The label text.
+ */
+function labelText(item) {
+    if (typeof item.label === 'string') {
+        return item.label;
+    }
+    return item.label.label;
+}
 // ---------------------------------------------------------------------------
 // Server instance
 // ---------------------------------------------------------------------------
@@ -84,7 +98,7 @@ const SERVER_INSTRUCTIONS = 'This server provides authoritative SFMC language in
     'and route the query to the right doc index (or both for MCN). Only fall back to the individual ' +
     'search tools when you need to scope by `product_focus` (MCE only) or when you are **certain** ' +
     'which doc index to target.';
-const server = new McpServer({ name: 'mcp-server-sfmc', version: pkg.version }, { instructions: SERVER_INSTRUCTIONS });
+const server = new McpServer({ name: 'mcp-server-sfmc', version: package_.version }, { instructions: SERVER_INSTRUCTIONS });
 function detectLanguage(code, hint) {
     if (hint === 'ssjs')
         return 'ssjs';
@@ -106,6 +120,17 @@ function detectLanguage(code, hint) {
         return 'ssjs';
     return 'ampscript';
 }
+/**
+ * Extracts the human-readable text from a diagnostic message, which may be a
+ * plain string or a `{ value }` wrapper depending on the language-service type.
+ * @param message
+ */
+function diagnosticMessage(message) {
+    if (typeof message === 'string') {
+        return message;
+    }
+    return message.value;
+}
 function formatDiagnostics(diagnostics) {
     if (diagnostics.length === 0)
         return 'No issues found.';
@@ -113,17 +138,17 @@ function formatDiagnostics(diagnostics) {
         .map((d) => {
         const sev = d.severity === 1 ? 'ERROR' : d.severity === 2 ? 'WARNING' : 'INFO';
         const loc = `line ${d.range.start.line + 1}, col ${d.range.start.character + 1}`;
-        const message = typeof d.message === 'string' ? d.message : d.message.value;
+        const message = diagnosticMessage(d.message);
         return `[${sev}] ${loc}: ${message}`;
     })
         .join('\n');
 }
 function formatHandlebarsHelper(helper) {
-    const params = helper.params
+    const parameters = helper.params
         .map((p) => {
-        const req = p.optional ? '(optional)' : '(required)';
+        const request = p.optional ? '(optional)' : '(required)';
         const variadic = p.variadic ? ' (variadic)' : '';
-        return `  - ${p.name}: ${p.type}${variadic} ${req}${p.description ? ' — ' + p.description : ''}`;
+        return `  - ${p.name}: ${p.type}${variadic} ${request}${p.description ? ' — ' + p.description : ''}`;
     })
         .join('\n');
     const subexpr = helper.subexpressionOnly
@@ -135,7 +160,7 @@ function formatHandlebarsHelper(helper) {
         `**Type:** ${helper.helperType}\n\n` +
         `**Returns:** ${helper.returnType}\n\n` +
         `**Description:** ${helper.description}\n\n` +
-        `**Parameters:**\n${params || '  (none)'}` +
+        `**Parameters:**\n${parameters || '  (none)'}` +
         subexpr +
         `\n\n✅ **Marketing Cloud Next:** Supported since API v${helper.mcnSince}.0` +
         (helper.docUrl ? `\n\n[Documentation](${helper.docUrl})` : ''));
@@ -237,28 +262,28 @@ server.tool('lookup_ampscript_function', 'Look up the signature, parameters, des
     'Case-insensitive. Returns null if the function is not found.', {
     name: z.string().describe('The AMPscript function name, e.g. "Lookup", "DateAdd", "IIf".'),
 }, ({ name }) => {
-    const fn = sfmcLanguageService.lookupAmpscriptFunction(name);
-    if (!fn) {
+    const function_ = sfmcLanguageService.lookupAmpscriptFunction(name);
+    if (!function_) {
         return { content: [{ type: 'text', text: `AMPscript function "${name}" not found.` }] };
     }
-    const params = fn.params
+    const parameters = function_.params
         .map((p) => {
-        const req = p.optional ? '(optional)' : '(required)';
-        return `  - ${p.name}: ${p.type ?? 'any'} ${req}${p.description ? ' — ' + p.description : ''}`;
+        const request = p.optional ? '(optional)' : '(required)';
+        return `  - ${p.name}: ${p.type ?? 'any'} ${request}${p.description ? ' — ' + p.description : ''}`;
     })
         .join('\n');
-    const examples = fn.example ? '\n\nExample:\n' + fn.example : '';
+    const examples = function_.example ? '\n\nExample:\n' + function_.example : '';
     // MCN compatibility badge
-    const fnMcnSince = fn.mcnSince ?? null;
-    const fnMcnNotes = fn.mcnNotes ?? null;
-    const mcnLine = fnMcnSince === null
+    const functionMcnSince = function_.mcnSince ?? null;
+    const functionMcnNotes = function_.mcnNotes ?? null;
+    const mcnLine = functionMcnSince === null
         ? '\n\n❌ **Marketing Cloud Next:** Not supported'
-        : `\n\n✅ **Marketing Cloud Next:** Supported since API v${fnMcnSince}.0` +
-            (fnMcnNotes ? `\n> **MCN Note:** ${fnMcnNotes}` : '');
-    const text = `## ${fn.name}\n\n` +
-        `**Category:** ${fn.category ?? 'Unknown'}\n\n` +
-        `**Description:** ${fn.description ?? ''}\n\n` +
-        `**Parameters:**\n${params || '  (none)'}` +
+        : `\n\n✅ **Marketing Cloud Next:** Supported since API v${functionMcnSince}.0` +
+            (functionMcnNotes ? `\n> **MCN Note:** ${functionMcnNotes}` : '');
+    const text = `## ${function_.name}\n\n` +
+        `**Category:** ${function_.category ?? 'Unknown'}\n\n` +
+        `**Description:** ${function_.description ?? ''}\n\n` +
+        `**Parameters:**\n${parameters || '  (none)'}` +
         examples +
         mcnLine;
     return { content: [{ type: 'text', text }] };
@@ -528,35 +553,37 @@ server.tool('lookup_ssjs_function', 'Authoritative lookup (sourced ONLY from the
 }, ({ name, owner }) => {
     // Strip namespace prefix for lookup
     const bare = name.replace(/^(Platform\.(Function|Variable|Response|Request|ClientBrowser|Recipient|DateTime)\.|WSProxy\.|HTTP\.|Script\.Util\.|Function\.|Variable\.|Response\.|Request\.)/i, '');
-    const fn = sfmcLanguageService.lookupSsjsFunction(bare);
-    if (!fn) {
+    const function_ = sfmcLanguageService.lookupSsjsFunction(bare);
+    if (!function_) {
         // Fall through to the ECMAScript built-in / polyfill / unsupported catalogs.
         const builtinResult = lookupSsjsBuiltin(name, owner);
         return { content: [{ type: 'text', text: builtinResult.text }] };
     }
-    const params = (fn.params ?? [])
+    const parameters = (function_.params ?? [])
         .map((p) => {
         const isOptional = p.optional || p.required === false;
-        const req = isOptional ? '(optional)' : '(required)';
-        return `  - ${p.name}: ${p.type ?? 'any'} ${req}${p.description ? ' — ' + p.description : ''}`;
+        const request = isOptional ? '(optional)' : '(required)';
+        return `  - ${p.name}: ${p.type ?? 'any'} ${request}${p.description ? ' — ' + p.description : ''}`;
     })
         .join('\n');
     const badges = [];
-    if (fn.deprecated) {
+    if (function_.deprecated) {
         badges.push('⚠️ **Deprecated** — avoid in new code.');
     }
-    if (fn.requiresCoreLoad) {
+    if (function_.requiresCoreLoad) {
         badges.push('⚠️ **Requires** `Platform.Load("core", "1.1.5")` before calling this method.');
     }
-    const header = fn.isStatic ? `## ${fn.name} *(static)*` : `## ${fn.name}`;
+    const header = function_.isStatic
+        ? `## ${function_.name} *(static)*`
+        : `## ${function_.name}`;
     const badgeBlock = badges.length > 0 ? badges.join('\n') + '\n\n' : '';
-    const aliasLine = fn.aliasOf ? `**Alias of:** \`${fn.aliasOf}\`\n\n` : '';
+    const aliasLine = function_.aliasOf ? `**Alias of:** \`${function_.aliasOf}\`\n\n` : '';
     const text = `${header}\n\n` +
         badgeBlock +
         aliasLine +
-        `**Description:** ${fn.description ?? ''}\n\n` +
-        `**Parameters:**\n${params || '  (none)'}\n\n` +
-        `**Returns:** ${fn.returnType ?? 'void'}`;
+        `**Description:** ${function_.description ?? ''}\n\n` +
+        `**Parameters:**\n${parameters || '  (none)'}\n\n` +
+        `**Returns:** ${function_.returnType ?? 'void'}`;
     return { content: [{ type: 'text', text }] };
 });
 // ---------------------------------------------------------------------------
@@ -580,13 +607,13 @@ server.tool('review_change', 'Review a code diff for SFMC (AMPscript, SSJS, or H
 }, ({ diff, language = 'auto', maxProblems = 50 }) => {
     // Extract added lines from the unified diff
     const addedLines = [];
-    let lineNum = 0;
+    let lineNumber = 0;
     const lineMap = []; // maps index in addedLines to original diff line number
     for (const line of diff.split('\n')) {
-        lineNum++;
+        lineNumber++;
         if (line.startsWith('+') && !line.startsWith('+++')) {
             addedLines.push(line.slice(1));
-            lineMap.push(lineNum);
+            lineMap.push(lineNumber);
         }
     }
     if (addedLines.length === 0) {
@@ -599,8 +626,8 @@ server.tool('review_change', 'Review a code diff for SFMC (AMPscript, SSJS, or H
             ? detectLanguage(addedCode, 'html')
             : language;
     const settings = { maxNumberOfProblems: maxProblems };
-    const doc = { text: addedCode, languageId: detectedLang, uri: 'diff' };
-    const diagnostics = sfmcLanguageService.validate(doc, settings);
+    const document = { text: addedCode, languageId: detectedLang, uri: 'diff' };
+    const diagnostics = sfmcLanguageService.validate(document, settings);
     if (diagnostics.length === 0) {
         return {
             content: [
@@ -615,7 +642,7 @@ server.tool('review_change', 'Review a code diff for SFMC (AMPscript, SSJS, or H
     for (const d of diagnostics) {
         const sev = d.severity === 1 ? '🔴 ERROR' : d.severity === 2 ? '🟡 WARNING' : '🔵 INFO';
         const origLine = lineMap[d.range.start.line] ?? d.range.start.line + 1;
-        const message = typeof d.message === 'string' ? d.message : d.message.value;
+        const message = diagnosticMessage(d.message);
         output.push(`${sev} (diff line ${origLine}): ${message}`);
     }
     return { content: [{ type: 'text', text: output.join('\n') }] };
@@ -644,15 +671,15 @@ server.tool('suggest_fix', 'Generate a corrected version of SFMC code based on v
         ? detectLanguage(code)
         : detectLanguage(code, language);
     const settings = { maxNumberOfProblems: 50, targetPlatform: target };
-    const doc = { text: code, languageId: detectedLang, uri: 'fix-target' };
-    const diagnostics = sfmcLanguageService.validate(doc, settings);
+    const document = { text: code, languageId: detectedLang, uri: 'fix-target' };
+    const diagnostics = sfmcLanguageService.validate(document, settings);
     const lines = code.split('\n');
     const suggestions = [];
     for (const d of diagnostics) {
         const lineText = lines[d.range.start.line] ?? '';
         // Diagnostic.message widened to `string | MarkupContent` in newer LSP types; the
         // SFMC language service only emits plain strings, so unwrap MarkupContent to its value.
-        const message = typeof d.message === 'string' ? d.message : d.message.value;
+        const message = diagnosticMessage(d.message);
         suggestions.push(`Line ${d.range.start.line + 1}: ${message}\n` +
             `  Code: ${lineText.trim()}\n` +
             `  Fix: ${getFixSuggestion(message, lineText, detectedLang)}`);
@@ -707,9 +734,9 @@ function getFixSuggestion(message, line, lang) {
     if (m.includes('html comment'))
         return 'Remove the `<!-- -->` wrapper; use `/* comment */` inside AMPscript.';
     if (m.includes('unknown function')) {
-        const fnMatch = message.match(/"([^"]+)"/);
-        if (fnMatch)
-            return `Check spelling — did you mean a known AMPscript function? ("${fnMatch[1]}")`;
+        const functionMatch = message.match(/"([^"]+)"/);
+        if (functionMatch)
+            return `Check spelling — did you mean a known AMPscript function? ("${functionMatch[1]}")`;
     }
     if (m.includes('expects'))
         return 'Check the number and types of arguments against the function signature.';
@@ -730,13 +757,11 @@ server.tool('get_ampscript_completions', 'Return a list of AMPscript function na
         .optional()
         .describe("Target platform. Use 'next' to return only completions supported in Marketing Cloud Next."),
 }, ({ code, line, character, target }) => {
-    const doc = { text: code, languageId: 'ampscript', uri: 'completions' };
-    let items = sfmcLanguageService.getCompletions(doc, { line, character });
+    const document = { text: code, languageId: 'ampscript', uri: 'completions' };
+    let items = sfmcLanguageService.getCompletions(document, { line, character });
     if (target === 'next') {
         items = items.filter((item) => {
-            const label = typeof item.label === 'string'
-                ? item.label
-                : item.label.label;
+            const label = labelText(item);
             // Keep keywords and variables (non-function entries); filter out MCN-unsupported functions
             return !label.includes('(') || isMcnSupported(label.replace(/\(.*/, '').trim());
         });
@@ -744,9 +769,7 @@ server.tool('get_ampscript_completions', 'Return a list of AMPscript function na
     const formatted = items
         .slice(0, 50)
         .map((item) => {
-        const label = typeof item.label === 'string'
-            ? item.label
-            : item.label.label;
+        const label = labelText(item);
         return `- ${label}${item.detail ? ` — ${item.detail}` : ''}`;
     })
         .join('\n');
@@ -789,19 +812,12 @@ server.tool('get_ssjs_completions', 'Return a list of SSJS Platform functions, W
     }
     const items = sfmcLanguageService.getSsjsCompletionCatalog();
     const filtered = filter
-        ? items.filter((item) => {
-            const label = typeof item.label === 'string'
-                ? item.label
-                : item.label.label;
-            return label.toLowerCase().startsWith(filter.toLowerCase());
-        })
+        ? items.filter((item) => labelText(item).toLowerCase().startsWith(filter.toLowerCase()))
         : items;
     const formatted = filtered
         .slice(0, 80)
         .map((item) => {
-        const label = typeof item.label === 'string'
-            ? item.label
-            : item.label.label;
+        const label = labelText(item);
         return `- ${label}${item.detail ? ` — ${item.detail}` : ''}`;
     })
         .join('\n');
@@ -829,19 +845,12 @@ server.tool('get_handlebars_completions', 'Return Marketing Cloud Next (MCN) Han
 }, ({ filter }) => {
     const items = sfmcLanguageService.getHandlebarsCompletionCatalog();
     const filtered = filter
-        ? items.filter((item) => {
-            const label = typeof item.label === 'string'
-                ? item.label
-                : item.label.label;
-            return label.toLowerCase().startsWith(filter.toLowerCase());
-        })
+        ? items.filter((item) => labelText(item).toLowerCase().startsWith(filter.toLowerCase()))
         : items;
     const formatted = filtered
         .slice(0, 80)
         .map((item) => {
-        const label = typeof item.label === 'string'
-            ? item.label
-            : item.label.label;
+        const label = labelText(item);
         return `- ${label}${item.detail ? ` — ${item.detail}` : ''}`;
     })
         .join('\n');
@@ -955,9 +964,9 @@ server.tool('search_mce_help', MCE_HELP_TOOL_DESC, {
             : `No matches for this query with product_focus="${focus}". Try broader keywords or product_focus="any".`;
         return { content: [{ type: 'text', text: hint }] };
     }
-    const lines = hits.map((h, i) => {
+    const lines = hits.map((h, index) => {
         const excerpt = h.chunk.body.replaceAll(/\s+/g, ' ').slice(0, 520);
-        return (`### ${i + 1}. ${h.chunk.relativePath} — ${h.chunk.heading}\n` +
+        return (`### ${index + 1}. ${h.chunk.relativePath} — ${h.chunk.heading}\n` +
             `**Product:** ${h.chunk.productLabel}\n` +
             `**Score:** ${h.score}\n\n` +
             `${excerpt}${h.chunk.body.length > 520 ? '…' : ''}\n`);
@@ -971,11 +980,11 @@ server.tool('search_mce_help', MCE_HELP_TOOL_DESC, {
 // ---------------------------------------------------------------------------
 server.resource('ampscript-function-catalog', 'sfmc://ampscript/functions', async () => {
     const functions = sfmcLanguageService.getAllAmpscriptFunctions();
-    const lines = functions.map((fn) => {
-        const paramList = fn.params
+    const lines = functions.map((function_) => {
+        const parameterList = function_.params
             .map((p) => p.optional ? `[${p.name}: ${p.type ?? 'any'}]` : `${p.name}: ${p.type ?? 'any'}`)
             .join(', ');
-        return `${fn.name}(${paramList}) — ${fn.description ?? ''}`;
+        return `${function_.name}(${parameterList}) — ${function_.description ?? ''}`;
     });
     return {
         contents: [
@@ -993,13 +1002,13 @@ server.resource('ampscript-function-catalog', 'sfmc://ampscript/functions', asyn
 // ---------------------------------------------------------------------------
 server.resource('ssjs-function-catalog', 'sfmc://ssjs/functions', async () => {
     const functions = sfmcLanguageService.getAllSsjsFunctions();
-    const lines = functions.map((fn) => {
-        const paramList = (fn.params ?? [])
+    const lines = functions.map((function_) => {
+        const parameterList = (function_.params ?? [])
             .map((p) => p.optional || p.required === false
             ? `[${p.name}: ${p.type ?? 'any'}]`
             : `${p.name}: ${p.type ?? 'any'}`)
             .join(', ');
-        return `${fn.name}(${paramList}) — ${fn.description ?? ''}`;
+        return `${function_.name}(${parameterList}) — ${function_.description ?? ''}`;
     });
     return {
         contents: [
@@ -1018,13 +1027,13 @@ server.resource('ssjs-function-catalog', 'sfmc://ssjs/functions', async () => {
 server.resource('handlebars-helper-catalog', 'sfmc://handlebars/helpers', async () => {
     const helpers = sfmcLanguageService.listHandlebarsHelpers();
     const lines = helpers.map((h) => {
-        const paramList = h.params
+        const parameterList = h.params
             .map((p) => {
             const inner = `${p.name}: ${p.type}`;
             return p.optional ? `[${inner}]` : inner;
         })
             .join(', ');
-        return `{{${h.name} ${paramList}}} — (${h.category}, ${h.origin}, v${h.mcnSince}.0+) ${h.description}`;
+        return `{{${h.name} ${parameterList}}} — (${h.category}, ${h.origin}, v${h.mcnSince}.0+) ${h.description}`;
     });
     return {
         contents: [
@@ -1140,7 +1149,7 @@ server.resource('mce-product-context', 'sfmc://mce/product-context', async () =>
 // ---------------------------------------------------------------------------
 server.resource('mce-help-index', 'sfmc://mce/help-index', async () => {
     const chunks = getChunks();
-    const files = [...new Set(chunks.map((c) => c.relativePath))].sort();
+    const files = [...new Set(chunks.map((c) => c.relativePath))].sort((a, b) => a.localeCompare(b));
     const stats = getMceHelpStats();
     const scopeRows = Object.entries(stats.breakdown)
         .sort(([, a], [, b]) => b - a)
@@ -1159,7 +1168,7 @@ server.resource('mce-help-index', 'sfmc://mce/help-index', async () => {
 // ---------------------------------------------------------------------------
 server.resource('mcn-help-index', 'sfmc://mcn/help-index', async () => {
     const chunks = getMcnChunks();
-    const files = [...new Set(chunks.map((c) => c.relativePath))].sort();
+    const files = [...new Set(chunks.map((c) => c.relativePath))].sort((a, b) => a.localeCompare(b));
     const stats = getMcnHelpStats();
     const text = `# Bundled Marketing Cloud Next developer API docs (${stats.chunkCount} sections from ${stats.fileCount} files)\n\n` +
         `## Files\n\n` +
@@ -1270,16 +1279,16 @@ server.tool('search_help', 'Unified help search that automatically detects the t
     const sections = [];
     if (platform === 'next') {
         // MCN: search both the developer API reference and the MCN operational/admin help
-        const devHits = searchMcnHelp(query, Math.ceil(limit / 2));
+        const developmentHits = searchMcnHelp(query, Math.ceil(limit / 2));
         const opsHits = searchMceHelp(query, Math.floor(limit / 2), 'next');
-        if (devHits.length > 0) {
-            const parts = devHits.map(({ chunk }) => `### ${chunk.heading}\n*Source: ${chunk.relativePath}*\n\n${chunk.body}`);
+        if (developmentHits.length > 0) {
+            const parts = developmentHits.map(({ chunk }) => `### ${chunk.heading}\n*Source: ${chunk.relativePath}*\n\n${chunk.body}`);
             sections.push(`## MCN Developer API Docs\n\n${parts.join('\n\n---\n\n')}`);
         }
         if (opsHits.length > 0) {
-            const parts = opsHits.map((h, i) => {
+            const parts = opsHits.map((h, index) => {
                 const excerpt = h.chunk.body.replaceAll(/\s+/g, ' ').slice(0, 520);
-                return (`### ${i + 1}. ${h.chunk.relativePath} — ${h.chunk.heading}\n` +
+                return (`### ${index + 1}. ${h.chunk.relativePath} — ${h.chunk.heading}\n` +
                     `**Score:** ${h.score}\n\n` +
                     `${excerpt}${h.chunk.body.length > 520 ? '…' : ''}`);
             });
@@ -1309,9 +1318,9 @@ server.tool('search_help', 'Unified help search that automatically detects the t
                 : `No results found for "${query}". Try broader keywords.`;
             return { content: [{ type: 'text', text: hint }] };
         }
-        const parts = hits.map((h, i) => {
+        const parts = hits.map((h, index) => {
             const excerpt = h.chunk.body.replaceAll(/\s+/g, ' ').slice(0, 520);
-            return (`### ${i + 1}. ${h.chunk.relativePath} — ${h.chunk.heading}\n` +
+            return (`### ${index + 1}. ${h.chunk.relativePath} — ${h.chunk.heading}\n` +
                 `**Product:** ${h.chunk.productLabel}\n` +
                 `**Score:** ${h.score}\n\n` +
                 `${excerpt}${h.chunk.body.length > 520 ? '…' : ''}`);
@@ -1482,6 +1491,23 @@ server.prompt('reviewSfmcCode', 'Review SFMC code for correctness, best practice
     const platformNote = target === 'next'
         ? '\n- **Marketing Cloud Next compatibility**: Flag any AMPscript functions not supported in MCN (API v67.0+), and any SSJS blocks (SSJS is not supported in MCN).'
         : '';
+    const fenceLang = detectedLang === 'ssjs' ? 'javascript' : detectedLang;
+    const checklistItems = detectedLang === 'ampscript'
+        ? [
+            '- Delimiter balance (%%[ ]%%, %%= =%%)',
+            '- IF/ENDIF, FOR/NEXT block balance',
+            '- Correct function names and argument counts',
+            '- Correct comment syntax (/* */ only)',
+            '- Proper variable declaration with @',
+        ]
+        : [
+            '- No ES6+ syntax (var, not let/const; no arrow functions)',
+            '- Platform.Load before Core library objects',
+            '- Correct Platform.Function calls',
+            '- WSProxy error handling',
+            '- No sensitive data in logs or responses',
+        ];
+    const checklist = checklistItems.join('\n') + platformNote;
     return {
         messages: [
             {
@@ -1498,26 +1524,12 @@ server.prompt('reviewSfmcCode', 'Review SFMC code for correctness, best practice
                         focus ? `Focus especially on: ${focus}` : '',
                         '',
                         '## Code to Review',
-                        '```' + (detectedLang === 'ssjs' ? 'javascript' : detectedLang),
+                        '```' + fenceLang,
                         code,
                         '```',
                         '',
                         '## Review checklist',
-                        detectedLang === 'ampscript'
-                            ? [
-                                '- Delimiter balance (%%[ ]%%, %%= =%%)',
-                                '- IF/ENDIF, FOR/NEXT block balance',
-                                '- Correct function names and argument counts',
-                                '- Correct comment syntax (/* */ only)',
-                                '- Proper variable declaration with @',
-                            ].join('\n') + platformNote
-                            : [
-                                '- No ES6+ syntax (var, not let/const; no arrow functions)',
-                                '- Platform.Load before Core library objects',
-                                '- Correct Platform.Function calls',
-                                '- WSProxy error handling',
-                                '- No sensitive data in logs or responses',
-                            ].join('\n') + platformNote,
+                        checklist,
                     ]
                         .filter(Boolean)
                         .join('\n'),
@@ -1633,16 +1645,56 @@ server.prompt('answerMceHowTo', 'Answer a Marketing Cloud **administration or se
 // ---------------------------------------------------------------------------
 // Tool: check_mcn_compatibility
 // ---------------------------------------------------------------------------
+const mcnFileObjectSchema = z.object({
+    filename: z.string().describe('File name (e.g. "email-template.html").'),
+    content: z.string().describe('Full file content to analyze.'),
+});
+const mcnFileArraySchema = z.array(mcnFileObjectSchema).describe('List of files to analyze.');
+/**
+ * Returns the reason for the first non-migratable SSJS pattern that matches the
+ * given block code, or an empty string when none match.
+ * @param blockCode
+ */
+function firstNonMigratableSsjsReason(blockCode) {
+    for (const { pattern, reason } of NON_MIGRATABLE_SSJS_PATTERNS) {
+        pattern.lastIndex = 0;
+        if (pattern.test(blockCode)) {
+            return reason;
+        }
+    }
+    return '';
+}
+/**
+ * Scans content for recognized Handlebars helper usages, deduplicated by
+ * helper name and approximate line. Matching is data-driven via the LSP lookup.
+ * @param content
+ */
+function collectHandlebarsHelperUsages(content) {
+    const helperCallPattern = /\{\{[#/]?\s*([a-zA-Z][\w-]*)/g;
+    const seenHelper = new Set();
+    const usages = [];
+    let helperMatch;
+    while ((helperMatch = helperCallPattern.exec(content)) !== null) {
+        const token = helperMatch[1];
+        const helper = sfmcLanguageService.lookupHandlebarsHelper(token);
+        if (!helper) {
+            continue;
+        }
+        const line = content.slice(0, helperMatch.index).split('\n').length;
+        const dedupeKey = `${helper.name}@${line}`;
+        if (seenHelper.has(dedupeKey)) {
+            continue;
+        }
+        seenHelper.add(dedupeKey);
+        usages.push({ name: helper.name, line, mcnSince: helper.mcnSince });
+    }
+    return usages;
+}
 server.tool('check_mcn_compatibility', 'Analyze one or more AMPscript/HTML files for Marketing Cloud Next (MCN) readiness. ' +
     'Returns an executive summary and a per-file, per-function report with migration difficulty. ' +
     'SSJS blocks that only use Platform.Function.* calls are classified as "Needs conversion" (not "Not migratable"). ' +
     'Use this tool before using rewrite_for_mcn.', {
-    files: z
-        .array(z.object({
-        filename: z.string().describe('File name (e.g. "email-template.html").'),
-        content: z.string().describe('Full file content to analyze.'),
-    }))
-        .describe('List of files to analyze.'),
+    files: mcnFileArraySchema,
 }, ({ files }) => {
     const results = [];
     for (const { filename, content } of files) {
@@ -1690,14 +1742,7 @@ server.tool('check_mcn_compatibility', 'Analyze one or more AMPscript/HTML files
             const blockCode = blockMatch[1];
             const lineApprox = content.slice(0, blockMatch.index).split('\n').length;
             // Check for non-migratable patterns
-            let notMigratableReason = '';
-            for (const { pattern, reason } of NON_MIGRATABLE_SSJS_PATTERNS) {
-                pattern.lastIndex = 0;
-                if (pattern.test(blockCode)) {
-                    notMigratableReason = reason;
-                    break;
-                }
-            }
+            const notMigratableReason = firstNonMigratableSsjsReason(blockCode);
             if (notMigratableReason) {
                 ssjsBlocks.push({
                     index: blockIndex,
@@ -1727,7 +1772,7 @@ server.tool('check_mcn_compatibility', 'Analyze one or more AMPscript/HTML files
             }).filter((d) => d.source === 'handlebars');
             for (const d of hbsDiagnostics) {
                 const severity = d.severity === 1 ? 'error' : d.severity === 2 ? 'warning' : 'info';
-                const message = typeof d.message === 'string' ? d.message : d.message.value;
+                const message = diagnosticMessage(d.message);
                 handlebarsProblems.push({
                     line: d.range.start.line + 1,
                     severity,
@@ -1737,26 +1782,10 @@ server.tool('check_mcn_compatibility', 'Analyze one or more AMPscript/HTML files
             // Report recognized helper usages with their MCN availability version.
             // Helper names are matched against handlebars-data via the LSP lookup so
             // this stays data-driven (no hand-maintained helper list).
-            const helperCallPattern = /\{\{[#/]?\s*([a-zA-Z][\w-]*)/g;
-            const seenHelper = new Set();
-            let helperMatch;
-            while ((helperMatch = helperCallPattern.exec(content)) !== null) {
-                const token = helperMatch[1];
-                const helper = sfmcLanguageService.lookupHandlebarsHelper(token);
-                if (!helper) {
-                    continue;
-                }
-                const line = content.slice(0, helperMatch.index).split('\n').length;
-                const dedupeKey = `${helper.name}@${line}`;
-                if (seenHelper.has(dedupeKey)) {
-                    continue;
-                }
-                seenHelper.add(dedupeKey);
-                handlebarsHelpers.push({ name: helper.name, line, mcnSince: helper.mcnSince });
-            }
+            handlebarsHelpers.push(...collectHandlebarsHelperUsages(content));
         }
         // 3. Assess per-file difficulty
-        const hasCloudPagesFn = ampFunctions.some((f) => CLOUDPAGES_ONLY_FUNCTIONS.has(f.name.toLowerCase()) &&
+        const hasCloudPagesFunction = ampFunctions.some((f) => CLOUDPAGES_ONLY_FUNCTIONS.has(f.name.toLowerCase()) &&
             f.status === 'not-supported');
         const hasNotMigratableSsjs = ssjsBlocks.some((b) => b.status === 'not-migratable');
         const hasUnsupportedAmp = ampFunctions.some((f) => f.status === 'not-supported' &&
@@ -1766,7 +1795,7 @@ server.tool('check_mcn_compatibility', 'Analyze one or more AMPscript/HTML files
         const hasHandlebarsError = handlebarsProblems.some((p) => p.severity === 'error');
         const hasHandlebarsWarning = handlebarsProblems.some((p) => p.severity === 'warning');
         let difficulty;
-        if (hasCloudPagesFn || hasNotMigratableSsjs) {
+        if (hasCloudPagesFunction || hasNotMigratableSsjs) {
             difficulty = 'not-migratable';
         }
         else if (hasUnsupportedAmp || hasConvertibleSsjs || hasHandlebarsError) {
@@ -1836,18 +1865,18 @@ server.tool('check_mcn_compatibility', 'Analyze one or more AMPscript/HTML files
         }
         if (result.ampFunctions.length > 0) {
             fileLines.push('| Function | Line | Status | Reason |', '|---|---|---|---|');
-            for (const fn of result.ampFunctions) {
-                const icon = fn.status === 'supported'
+            for (const function_ of result.ampFunctions) {
+                const icon = function_.status === 'supported'
                     ? '✅'
-                    : fn.status === 'needs-review'
+                    : function_.status === 'needs-review'
                         ? '⚠️'
                         : '❌';
-                const statusLabel = fn.status === 'supported'
+                const statusLabel = function_.status === 'supported'
                     ? 'Supported'
-                    : fn.status === 'needs-review'
+                    : function_.status === 'needs-review'
                         ? 'Needs review'
                         : 'Not supported';
-                fileLines.push(`| ${fn.name} | ${fn.line} | ${icon} ${statusLabel} | ${fn.reason} |`);
+                fileLines.push(`| ${function_.name} | ${function_.line} | ${icon} ${statusLabel} | ${function_.reason} |`);
             }
         }
         else if (result.ssjsBlocks.length === 0 &&
@@ -1951,7 +1980,8 @@ server.tool('rewrite_for_mcn', 'Deterministically rewrite AMPscript (and optiona
     });
     // Reassess difficulty
     const hasMigratable = allNonMigratable.length > 0;
-    const difficulty = hasMigratable && allNonMigratable.some((i) => i.reason.includes('not-migratable'))
+    const difficulty = hasMigratable &&
+        allNonMigratable.some((index) => index.reason.includes('not-migratable'))
         ? 'not-migratable'
         : ampResult.difficulty;
     const result = {
@@ -2382,7 +2412,7 @@ server.tool('get_server_version', 'Return the running mcp-server-sfmc version an
                 type: 'text',
                 text: JSON.stringify({
                     name: 'mcp-server-sfmc',
-                    version: pkg.version,
+                    version: package_.version,
                     mceHelp: { chunkCount: mce.chunkCount, fileCount: mceFileCount },
                     mcnHelp: { chunkCount: mcn.chunkCount, fileCount: mcn.fileCount },
                 }, null, 2),
@@ -2395,15 +2425,18 @@ server.tool('get_server_version', 'Return the running mcp-server-sfmc version an
 // ---------------------------------------------------------------------------
 async function main() {
     if (process.argv.includes('--version') || process.argv.includes('-v')) {
-        process.stdout.write(pkg.version + '\n');
+        process.stdout.write(package_.version + '\n');
         return;
     }
     const transport = new StdioServerTransport();
     await server.connect(transport);
     process.stderr.write('mcp-server-sfmc running on stdio\n');
 }
-main().catch((ex) => {
+try {
+    await main();
+}
+catch (ex) {
     process.stderr.write(`Fatal: ${String(ex)}\n`);
     process.exit(1);
-});
+}
 //# sourceMappingURL=index.js.map