@openzeppelin/contracts-mcp 0.5.10 → 0.6.1

package/src/stellar/tools/fungible.ts

@@ -1,15 +1,20 @@
 import type { McpServer, RegisteredTool } from '@modelcontextprotocol/sdk/server/mcp.js';
 import type { FungibleOptions } from '@openzeppelin/wizard-stellar';
 import { fungible } from '@openzeppelin/wizard-stellar';
-import { safePrintRustCodeBlock, makeDetailedPrompt } from '../../utils';
+import { makeDetailedPrompt } from '../../utils';
 import { stellarFungibleSchema } from '@openzeppelin/wizard-common/schemas';
 import { stellarPrompts } from '@openzeppelin/wizard-common';
+import { registerWizardAppTool, wizardAppPrintResult } from '../../apps/register';
 
 export function registerStellarFungible(server: McpServer): RegisteredTool {
-  return server.tool(
+  return registerWizardAppTool(
+    server,
     'stellar-fungible',
-    makeDetailedPrompt(stellarPrompts.Fungible),
-    stellarFungibleSchema,
+    {
+      description: makeDetailedPrompt(stellarPrompts.Fungible),
+      inputSchema: stellarFungibleSchema,
+      title: 'Stellar Fungible',
+    },
     async ({
       name,
       symbol,
@@ -38,14 +43,7 @@ export function registerStellarFungible(server: McpServer): RegisteredTool {
         info,
         explicitImplementations,
       };
-      return {
-        content: [
-          {
-            type: 'text',
-            text: safePrintRustCodeBlock(() => fungible.print(opts)),
-          },
-        ],
-      };
+      return wizardAppPrintResult(opts, () => fungible.print(opts), 'rust');
     },
   );
 }

package/src/stellar/tools/governor.ts

@@ -1,15 +1,20 @@
 import type { McpServer, RegisteredTool } from '@modelcontextprotocol/sdk/server/mcp.js';
 import type { GovernorOptions } from '@openzeppelin/wizard-stellar';
 import { governor } from '@openzeppelin/wizard-stellar';
-import { safePrintRustCodeBlock, makeDetailedPrompt } from '../../utils';
+import { makeDetailedPrompt } from '../../utils';
 import { stellarGovernorSchema } from '@openzeppelin/wizard-common/schemas';
 import { stellarPrompts } from '@openzeppelin/wizard-common';
+import { registerWizardAppTool, wizardAppPrintResult } from '../../apps/register';
 
 export function registerStellarGovernor(server: McpServer): RegisteredTool {
-  return server.tool(
+  return registerWizardAppTool(
+    server,
     'stellar-governor',
-    makeDetailedPrompt(stellarPrompts.Governor),
-    stellarGovernorSchema,
+    {
+      description: makeDetailedPrompt(stellarPrompts.Governor),
+      inputSchema: stellarGovernorSchema,
+      title: 'Stellar Governor',
+    },
     async ({
       name,
       version,
@@ -36,14 +41,7 @@ export function registerStellarGovernor(server: McpServer): RegisteredTool {
         explicitImplementations,
         info,
       };
-      return {
-        content: [
-          {
-            type: 'text',
-            text: safePrintRustCodeBlock(() => governor.print(opts)),
-          },
-        ],
-      };
+      return wizardAppPrintResult(opts, () => governor.print(opts), 'rust');
     },
   );
 }

package/src/stellar/tools/non-fungible.ts

@@ -1,15 +1,20 @@
 import type { McpServer, RegisteredTool } from '@modelcontextprotocol/sdk/server/mcp.js';
 import type { NonFungibleOptions } from '@openzeppelin/wizard-stellar';
 import { nonFungible } from '@openzeppelin/wizard-stellar';
-import { safePrintRustCodeBlock, makeDetailedPrompt } from '../../utils';
+import { makeDetailedPrompt } from '../../utils';
 import { stellarNonFungibleSchema } from '@openzeppelin/wizard-common/schemas';
 import { stellarPrompts } from '@openzeppelin/wizard-common';
+import { registerWizardAppTool, wizardAppPrintResult } from '../../apps/register';
 
 export function registerStellarNonFungible(server: McpServer): RegisteredTool {
-  return server.tool(
+  return registerWizardAppTool(
+    server,
     'stellar-non-fungible',
-    makeDetailedPrompt(stellarPrompts.NonFungible),
-    stellarNonFungibleSchema,
+    {
+      description: makeDetailedPrompt(stellarPrompts.NonFungible),
+      inputSchema: stellarNonFungibleSchema,
+      title: 'Stellar Non-Fungible',
+    },
     async ({
       name,
       symbol,
@@ -40,14 +45,7 @@ export function registerStellarNonFungible(server: McpServer): RegisteredTool {
         info,
         explicitImplementations,
       };
-      return {
-        content: [
-          {
-            type: 'text',
-            text: safePrintRustCodeBlock(() => nonFungible.print(opts)),
-          },
-        ],
-      };
+      return wizardAppPrintResult(opts, () => nonFungible.print(opts), 'rust');
     },
   );
 }

package/src/stellar/tools/stablecoin.ts

@@ -1,15 +1,20 @@
 import type { McpServer, RegisteredTool } from '@modelcontextprotocol/sdk/server/mcp.js';
 import type { StablecoinOptions } from '@openzeppelin/wizard-stellar';
 import { stablecoin } from '@openzeppelin/wizard-stellar';
-import { safePrintRustCodeBlock, makeDetailedPrompt } from '../../utils';
+import { makeDetailedPrompt } from '../../utils';
 import { stellarStablecoinSchema } from '@openzeppelin/wizard-common/schemas';
 import { stellarPrompts } from '@openzeppelin/wizard-common';
+import { registerWizardAppTool, wizardAppPrintResult } from '../../apps/register';
 
 export function registerStellarStablecoin(server: McpServer): RegisteredTool {
-  return server.tool(
+  return registerWizardAppTool(
+    server,
     'stellar-stablecoin',
-    makeDetailedPrompt(stellarPrompts.Stablecoin),
-    stellarStablecoinSchema,
+    {
+      description: makeDetailedPrompt(stellarPrompts.Stablecoin),
+      inputSchema: stellarStablecoinSchema,
+      title: 'Stellar Stablecoin',
+    },
     async ({
       name,
       symbol,
@@ -40,14 +45,7 @@ export function registerStellarStablecoin(server: McpServer): RegisteredTool {
         explicitImplementations,
         info,
       };
-      return {
-        content: [
-          {
-            type: 'text',
-            text: safePrintRustCodeBlock(() => stablecoin.print(opts)),
-          },
-        ],
-      };
+      return wizardAppPrintResult(opts, () => stablecoin.print(opts), 'rust');
     },
   );
 }

package/src/stellar/tools/vault.ts

@@ -1,15 +1,20 @@
 import type { McpServer, RegisteredTool } from '@modelcontextprotocol/sdk/server/mcp.js';
 import type { VaultOptions } from '@openzeppelin/wizard-stellar';
 import { vault } from '@openzeppelin/wizard-stellar';
-import { safePrintRustCodeBlock, makeDetailedPrompt } from '../../utils';
+import { makeDetailedPrompt } from '../../utils';
 import { stellarVaultSchema } from '@openzeppelin/wizard-common/schemas';
 import { stellarPrompts } from '@openzeppelin/wizard-common';
+import { registerWizardAppTool, wizardAppPrintResult } from '../../apps/register';
 
 export function registerStellarVault(server: McpServer): RegisteredTool {
-  return server.tool(
+  return registerWizardAppTool(
+    server,
     'stellar-vault',
-    makeDetailedPrompt(stellarPrompts.Vault),
-    stellarVaultSchema,
+    {
+      description: makeDetailedPrompt(stellarPrompts.Vault),
+      inputSchema: stellarVaultSchema,
+      title: 'Stellar Vault',
+    },
     async ({ name, symbol, decimalsOffset, pausable, upgradeable, access, explicitImplementations, info }) => {
       const opts: VaultOptions = {
         name,
@@ -21,14 +26,7 @@ export function registerStellarVault(server: McpServer): RegisteredTool {
         explicitImplementations,
         info,
       };
-      return {
-        content: [
-          {
-            type: 'text',
-            text: safePrintRustCodeBlock(() => vault.print(opts)),
-          },
-        ],
-      };
+      return wizardAppPrintResult(opts, () => vault.print(opts), 'rust');
     },
   );
 }

package/src/stylus/tools/erc1155.ts

@@ -1,15 +1,20 @@
 import type { McpServer, RegisteredTool } from '@modelcontextprotocol/sdk/server/mcp.js';
 import type { ERC1155Options } from '@openzeppelin/wizard-stylus';
 import { erc1155 } from '@openzeppelin/wizard-stylus';
-import { safePrintRustCodeBlock, makeDetailedPrompt } from '../../utils';
+import { makeDetailedPrompt } from '../../utils';
 import { stylusERC1155Schema } from '@openzeppelin/wizard-common/schemas';
 import { stylusPrompts } from '@openzeppelin/wizard-common';
+import { registerWizardAppTool, wizardAppPrintResult } from '../../apps/register';
 
 export function registerStylusERC1155(server: McpServer): RegisteredTool {
-  return server.tool(
+  return registerWizardAppTool(
+    server,
     'stylus-erc1155',
-    makeDetailedPrompt(stylusPrompts.ERC1155),
-    stylusERC1155Schema,
+    {
+      description: makeDetailedPrompt(stylusPrompts.ERC1155),
+      inputSchema: stylusERC1155Schema,
+      title: 'Stylus ERC1155',
+    },
     async ({ name, burnable, supply, info }) => {
       const opts: ERC1155Options = {
         name,
@@ -17,14 +22,7 @@ export function registerStylusERC1155(server: McpServer): RegisteredTool {
         supply,
         info,
       };
-      return {
-        content: [
-          {
-            type: 'text',
-            text: safePrintRustCodeBlock(() => erc1155.print(opts)),
-          },
-        ],
-      };
+      return wizardAppPrintResult(opts, () => erc1155.print(opts), 'rust');
     },
   );
 }

package/src/stylus/tools/erc20.ts

@@ -1,15 +1,20 @@
 import type { McpServer, RegisteredTool } from '@modelcontextprotocol/sdk/server/mcp.js';
 import type { ERC20Options } from '@openzeppelin/wizard-stylus';
 import { erc20 } from '@openzeppelin/wizard-stylus';
-import { safePrintRustCodeBlock, makeDetailedPrompt } from '../../utils';
+import { makeDetailedPrompt } from '../../utils';
 import { stylusERC20Schema } from '@openzeppelin/wizard-common/schemas';
 import { stylusPrompts } from '@openzeppelin/wizard-common';
+import { registerWizardAppTool, wizardAppPrintResult } from '../../apps/register';
 
 export function registerStylusERC20(server: McpServer): RegisteredTool {
-  return server.tool(
+  return registerWizardAppTool(
+    server,
     'stylus-erc20',
-    makeDetailedPrompt(stylusPrompts.ERC20),
-    stylusERC20Schema,
+    {
+      description: makeDetailedPrompt(stylusPrompts.ERC20),
+      inputSchema: stylusERC20Schema,
+      title: 'Stylus ERC20',
+    },
     async ({ name, burnable, permit, flashmint, info }) => {
       const opts: ERC20Options = {
         name,
@@ -18,14 +23,7 @@ export function registerStylusERC20(server: McpServer): RegisteredTool {
         flashmint,
         info,
       };
-      return {
-        content: [
-          {
-            type: 'text',
-            text: safePrintRustCodeBlock(() => erc20.print(opts)),
-          },
-        ],
-      };
+      return wizardAppPrintResult(opts, () => erc20.print(opts), 'rust');
     },
   );
 }

package/src/stylus/tools/erc721.ts

@@ -1,15 +1,20 @@
 import type { McpServer, RegisteredTool } from '@modelcontextprotocol/sdk/server/mcp.js';
 import type { ERC721Options } from '@openzeppelin/wizard-stylus';
 import { erc721 } from '@openzeppelin/wizard-stylus';
-import { safePrintRustCodeBlock, makeDetailedPrompt } from '../../utils';
+import { makeDetailedPrompt } from '../../utils';
 import { stylusERC721Schema } from '@openzeppelin/wizard-common/schemas';
 import { stylusPrompts } from '@openzeppelin/wizard-common';
+import { registerWizardAppTool, wizardAppPrintResult } from '../../apps/register';
 
 export function registerStylusERC721(server: McpServer): RegisteredTool {
-  return server.tool(
+  return registerWizardAppTool(
+    server,
     'stylus-erc721',
-    makeDetailedPrompt(stylusPrompts.ERC721),
-    stylusERC721Schema,
+    {
+      description: makeDetailedPrompt(stylusPrompts.ERC721),
+      inputSchema: stylusERC721Schema,
+      title: 'Stylus ERC721',
+    },
     async ({ name, burnable, enumerable, info }) => {
       const opts: ERC721Options = {
         name,
@@ -17,14 +22,7 @@ export function registerStylusERC721(server: McpServer): RegisteredTool {
         enumerable,
         info,
       };
-      return {
-        content: [
-          {
-            type: 'text',
-            text: safePrintRustCodeBlock(() => erc721.print(opts)),
-          },
-        ],
-      };
+      return wizardAppPrintResult(opts, () => erc721.print(opts), 'rust');
     },
   );
 }

package/src/uniswap-hooks/tools/hooks.ts

@@ -1,14 +1,19 @@
 import type { McpServer, RegisteredTool } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { hooks, type HooksOptions } from '@openzeppelin/wizard-uniswap-hooks';
 import { uniswapHooksHooksSchema } from '@openzeppelin/wizard-common/schemas';
-import { makeDetailedPrompt, safePrintSolidityCodeBlock } from '../../utils';
+import { makeDetailedPrompt } from '../../utils';
 import { uniswapHooksPrompts } from '@openzeppelin/wizard-common';
+import { registerWizardAppTool, wizardAppPrintResult } from '../../apps/register';
 
 export function registerUniswapHooks(server: McpServer): RegisteredTool {
-  return server.tool(
+  return registerWizardAppTool(
+    server,
     'uniswap-hooks',
-    makeDetailedPrompt(uniswapHooksPrompts.Hooks),
-    uniswapHooksHooksSchema,
+    {
+      description: makeDetailedPrompt(uniswapHooksPrompts.Hooks),
+      inputSchema: uniswapHooksHooksSchema,
+      title: 'Uniswap Hooks',
+    },
     async ({
       hook,
       name,
@@ -35,15 +40,7 @@ export function registerUniswapHooks(server: McpServer): RegisteredTool {
         access,
         info,
       };
-
-      return {
-        content: [
-          {
-            type: 'text',
-            text: safePrintSolidityCodeBlock(() => hooks.print(opts)),
-          },
-        ],
-      };
+      return wizardAppPrintResult(opts, () => hooks.print(opts), 'solidity');
     },
   );
 }

package/src/utils.ts

@@ -3,49 +3,26 @@ import { OptionsError as OptionsErrorCairo } from '@openzeppelin/wizard-cairo';
 import { OptionsError as OptionsErrorStylus } from '@openzeppelin/wizard-stylus';
 import { OptionsError as OptionsErrorStellar } from '@openzeppelin/wizard-stellar';
 
-function safePrintCodeBlock(printFn: () => string, syntaxHighlightingLanguage: string): string {
-  try {
-    return `\
+/** Wraps contract source code in a Markdown code block with the given syntax highlighting. */
+export function codeBlock(code: string, syntaxHighlightingLanguage: string): string {
+  return `\
 \`\`\`${syntaxHighlightingLanguage}
-${printFn()}
+${code}
 \`\`\`
 `;
-  } catch (e) {
-    if (
-      e instanceof OptionsErrorSolidity ||
-      e instanceof OptionsErrorCairo ||
-      e instanceof OptionsErrorStylus ||
-      e instanceof OptionsErrorStellar
-    ) {
-      return `${e.message}\n\n${JSON.stringify(e.messages, null, 2)}`;
-    } else {
-      return `Unexpected error: ${e}`;
-    }
-  }
 }
 
-/**
- * Prints the contract source code, wrapped in a Markdown code block with syntax highlighting as `solidity`.
- * Or prints the error message if an error occurs.
- */
-export function safePrintSolidityCodeBlock(printFn: () => string): string {
-  return safePrintCodeBlock(printFn, 'solidity');
-}
-
-/**
- * Prints the contract source code, wrapped in a Markdown code block with syntax highlighting as `cairo`.
- * Or prints the error message if an error occurs.
- */
-export function safePrintCairoCodeBlock(printFn: () => string): string {
-  return safePrintCodeBlock(printFn, 'cairo');
-}
-
-/**
- * Prints the contract source code, wrapped in a Markdown code block with syntax highlighting as `rust`.
- * Or prints the error message if an error occurs.
- */
-export function safePrintRustCodeBlock(printFn: () => string): string {
-  return safePrintCodeBlock(printFn, 'rust');
+/** Renders a failed contract print as Markdown, detailing per-field messages for Wizard options errors. */
+export function formatPrintError(e: unknown): string {
+  if (
+    e instanceof OptionsErrorSolidity ||
+    e instanceof OptionsErrorCairo ||
+    e instanceof OptionsErrorStylus ||
+    e instanceof OptionsErrorStellar
+  ) {
+    return `${e.message}\n\n${JSON.stringify(e.messages, null, 2)}`;
+  }
+  return `Unexpected error: ${e}`;
 }
 
 /**