@openzeppelin/contracts-mcp 0.6.1 → 0.6.3

package/dist/apps/register.d.ts

@@ -2,7 +2,26 @@ import type { McpServer, RegisteredTool, ToolCallback } from '@modelcontextproto
 import type { ZodRawShapeCompat } from '@modelcontextprotocol/sdk/server/zod-compat.js';
 /** MIME type for MCP Apps HTML resources. */
 export declare const RESOURCE_MIME_TYPE = "text/html;profile=mcp-app";
+/**
+ * Kind placeholder baked into language HTML templates by the UI build.
+ * Duplicated in packages/ui (kind-placeholder.ts, package-mcp-apps.mjs); kept aligned by
+ * `kind placeholder stays in sync` in register.test.ts.
+ */
+export declare const MCP_KIND_PLACEHOLDER = "__OZ_MCP_KIND__";
+export type AppTemplate = 'solidity' | 'cairo' | 'stellar' | 'stylus' | 'confidential' | 'uniswap-hooks';
+export type ToolAppSpec = {
+    template: AppTemplate;
+    kind: string;
+};
+/**
+ * Exhaustive tool → language template + kind map.
+ * Kept in lockstep with packages/core kinds by `TOOL_APP_SPECS matches every core kind and UI language entry`
+ * in server.test.ts — do not add tools here without that test (and the UI entries/<language>.ts) passing.
+ * Overrides match MCP_TOOL_NAME_OVERRIDES in server.test.ts: solidity-rwa ← RealWorldAsset, uniswap-hooks ← Hooks.
+ */
+export declare const TOOL_APP_SPECS: Readonly<Record<string, ToolAppSpec>>;
 export declare function appResourceUri(toolName: string): string;
+export declare function getToolAppSpec(toolName: string): ToolAppSpec;
 export declare function readAppHtml(toolName: string): Promise<string>;
 type AppToolConfig<Args extends ZodRawShapeCompat> = {
     description: string;

package/dist/apps/register.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"register.d.ts","sourceRoot":"","sources":["../../src/apps/register.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AACvG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gDAAgD,CAAC;AAGxF,6CAA6C;AAC7C,eAAO,MAAM,kBAAkB,8BAA8B,CAAC;AAM9D,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEvD;AA8BD,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAW7D;AA0BD,KAAK,aAAa,CAAC,IAAI,SAAS,iBAAiB,IAAI;IACnD,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,IAAI,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,SAAS,iBAAiB,EAClE,MAAM,EAAE,SAAS,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,aAAa,CAAC,IAAI,CAAC,EAC3B,EAAE,EAAE,YAAY,CAAC,IAAI,CAAC,GACrB,cAAc,CAoBhB;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,MAAM,EAAE,0BAA0B,EAAE,MAAM;;;;;;;;;;;EAO1G;AAED,iGAAiG;AACjG,wBAAgB,eAAe,CAAC,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO;;;;;;;;;;;EAevG"}
+{"version":3,"file":"register.d.ts","sourceRoot":"","sources":["../../src/apps/register.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AACvG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gDAAgD,CAAC;AAGxF,6CAA6C;AAC7C,eAAO,MAAM,kBAAkB,8BAA8B,CAAC;AAM9D;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,oBAAoB,CAAC;AACtD,MAAM,MAAM,WAAW,GAAG,UAAU,GAAG,OAAO,GAAG,SAAS,GAAG,QAAQ,GAAG,cAAc,GAAG,eAAe,CAAC;AAEzG,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,EAAE,WAAW,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAgChE,CAAC;AAEF,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEvD;AAED,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,WAAW,CAU5D;AAiED,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAkB7D;AA2BD,KAAK,aAAa,CAAC,IAAI,SAAS,iBAAiB,IAAI;IACnD,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,IAAI,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,SAAS,iBAAiB,EAClE,MAAM,EAAE,SAAS,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,aAAa,CAAC,IAAI,CAAC,EAC3B,EAAE,EAAE,YAAY,CAAC,IAAI,CAAC,GACrB,cAAc,CAoBhB;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,MAAM,EAAE,0BAA0B,EAAE,MAAM;;;;;;;;;;;EAO1G;AAED,iGAAiG;AACjG,wBAAgB,eAAe,CAAC,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO;;;;;;;;;;;EAevG"}

package/dist/apps/register.js

@@ -3,8 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RESOURCE_MIME_TYPE = void 0;
+exports.TOOL_APP_SPECS = exports.MCP_KIND_PLACEHOLDER = exports.RESOURCE_MIME_TYPE = void 0;
 exports.appResourceUri = appResourceUri;
+exports.getToolAppSpec = getToolAppSpec;
 exports.readAppHtml = readAppHtml;
 exports.registerWizardAppTool = registerWizardAppTool;
 exports.wizardAppPrintResult = wizardAppPrintResult;
@@ -16,25 +17,92 @@ const utils_1 = require("../utils");
 exports.RESOURCE_MIME_TYPE = 'text/html;profile=mcp-app';
 const RESOURCE_URI_META_KEY = 'ui/resourceUri';
 const APPS_DIR = path_1.default.join(__dirname, '..', '..', 'apps');
+/**
+ * Kind placeholder baked into language HTML templates by the UI build.
+ * Duplicated in packages/ui (kind-placeholder.ts, package-mcp-apps.mjs); kept aligned by
+ * `kind placeholder stays in sync` in register.test.ts.
+ */
+exports.MCP_KIND_PLACEHOLDER = '__OZ_MCP_KIND__';
+/**
+ * Exhaustive tool → language template + kind map.
+ * Kept in lockstep with packages/core kinds by `TOOL_APP_SPECS matches every core kind and UI language entry`
+ * in server.test.ts — do not add tools here without that test (and the UI entries/<language>.ts) passing.
+ * Overrides match MCP_TOOL_NAME_OVERRIDES in server.test.ts: solidity-rwa ← RealWorldAsset, uniswap-hooks ← Hooks.
+ */
+exports.TOOL_APP_SPECS = {
+    'solidity-erc20': { template: 'solidity', kind: 'ERC20' },
+    'solidity-erc721': { template: 'solidity', kind: 'ERC721' },
+    'solidity-erc1155': { template: 'solidity', kind: 'ERC1155' },
+    'solidity-stablecoin': { template: 'solidity', kind: 'Stablecoin' },
+    'solidity-rwa': { template: 'solidity', kind: 'RealWorldAsset' },
+    'solidity-account': { template: 'solidity', kind: 'Account' },
+    'solidity-governor': { template: 'solidity', kind: 'Governor' },
+    'solidity-custom': { template: 'solidity', kind: 'Custom' },
+    'cairo-erc20': { template: 'cairo', kind: 'ERC20' },
+    'cairo-erc721': { template: 'cairo', kind: 'ERC721' },
+    'cairo-erc1155': { template: 'cairo', kind: 'ERC1155' },
+    'cairo-account': { template: 'cairo', kind: 'Account' },
+    'cairo-multisig': { template: 'cairo', kind: 'Multisig' },
+    'cairo-governor': { template: 'cairo', kind: 'Governor' },
+    'cairo-vesting': { template: 'cairo', kind: 'Vesting' },
+    'cairo-custom': { template: 'cairo', kind: 'Custom' },
+    'stellar-fungible': { template: 'stellar', kind: 'Fungible' },
+    'stellar-non-fungible': { template: 'stellar', kind: 'NonFungible' },
+    'stellar-stablecoin': { template: 'stellar', kind: 'Stablecoin' },
+    'stellar-governor': { template: 'stellar', kind: 'Governor' },
+    'stellar-vault': { template: 'stellar', kind: 'Vault' },
+    'stylus-erc20': { template: 'stylus', kind: 'ERC20' },
+    'stylus-erc721': { template: 'stylus', kind: 'ERC721' },
+    'stylus-erc1155': { template: 'stylus', kind: 'ERC1155' },
+    'confidential-erc7984': { template: 'confidential', kind: 'ERC7984' },
+    'uniswap-hooks': { template: 'uniswap-hooks', kind: 'Hooks' },
+};
 function appResourceUri(toolName) {
     return `ui://openzeppelin/${toolName}.html`;
 }
-/** Resolve HTML for a tool, throwing build guidance when the artifact is missing. */
-function resolveAppHtmlPath(toolName) {
-    const toolPath = path_1.default.join(APPS_DIR, `${toolName}.html`);
-    if (fs_1.default.existsSync(toolPath)) {
-        return toolPath;
+function getToolAppSpec(toolName) {
+    const spec = exports.TOOL_APP_SPECS[toolName];
+    if (spec === undefined) {
+        throw new Error(`MCP App mapping missing for ${toolName}. ` +
+            `Add it to TOOL_APP_SPECS in packages/mcp/src/apps/register.ts, then run: ` +
+            `yarn --cwd packages/mcp build:apps`);
     }
-    throw new Error(`MCP App HTML missing for ${toolName} (looked in ${APPS_DIR}). ` +
+    return spec;
+}
+/** Resolve language HTML template path, throwing build guidance when missing. */
+function resolveAppHtmlPath(template, toolName) {
+    const templatePath = path_1.default.join(APPS_DIR, `${template}.html`);
+    if (fs_1.default.existsSync(templatePath)) {
+        return templatePath;
+    }
+    throw new Error(`MCP App HTML missing for ${toolName} (looked for template ${template}.html in ${APPS_DIR}). ` +
         `Run: yarn --cwd packages/mcp build:apps ` +
         `(npm consumers: reinstall the package or report a packaging bug).`);
 }
+function injectKind(templateHtml, kind, toolName) {
+    // Replace the bare placeholder so either "__OZ_MCP_KIND__" or '__OZ_MCP_KIND__' becomes the kind.
+    const matches = templateHtml.split(exports.MCP_KIND_PLACEHOLDER).length - 1;
+    if (matches !== 1) {
+        throw new Error(`MCP App template for ${toolName} must contain exactly one ${exports.MCP_KIND_PLACEHOLDER} ` +
+            `kind placeholder (found ${matches}). Rebuild with yarn --cwd packages/mcp build:apps.`);
+    }
+    const html = templateHtml.split(exports.MCP_KIND_PLACEHOLDER).join(kind);
+    if (html.includes(exports.MCP_KIND_PLACEHOLDER)) {
+        throw new Error(`MCP App kind injection left a kind placeholder in HTML for ${toolName}`);
+    }
+    if (!html.includes(kind)) {
+        throw new Error(`MCP App kind injection failed to embed kind ${kind} for ${toolName}`);
+    }
+    return html;
+}
 /**
  * App HTML is an immutable build artifact, so it is read from disk at most once per tool and then
  * served from memory. Keyed by tool name rather than per request or per session, so the hosted
  * server holds one copy no matter how many sessions open the same app; memory is bounded by the
  * number of tools, not by traffic.
  *
+ * Language templates are shared on disk; kind is injected once per tool on first read.
+ *
  * The in-flight promise is cached so concurrent first reads share a single disk read, and a failed
  * read is evicted so a transient error cannot poison a tool for the process lifetime.
  *
@@ -43,12 +111,31 @@ function resolveAppHtmlPath(toolName) {
  * refactor. See that test for why the hosted server depends on them.
  */
 const htmlCache = new Map();
+const templateCache = new Map();
+function readTemplateHtml(template, toolName) {
+    const cached = templateCache.get(template);
+    if (cached !== undefined) {
+        return cached;
+    }
+    const pending = fs_1.default.promises.readFile(resolveAppHtmlPath(template, toolName), 'utf-8').catch((e) => {
+        templateCache.delete(template);
+        throw e;
+    });
+    templateCache.set(template, pending);
+    return pending;
+}
 function readAppHtml(toolName) {
     const cached = htmlCache.get(toolName);
     if (cached !== undefined) {
         return cached;
     }
-    const pending = fs_1.default.promises.readFile(resolveAppHtmlPath(toolName), 'utf-8').catch((e) => {
+    // Resolve mapping synchronously so unknown tools fail before advertising UI.
+    const spec = getToolAppSpec(toolName);
+    // Fail closed on missing template before caching a doomed read.
+    resolveAppHtmlPath(spec.template, toolName);
+    const pending = readTemplateHtml(spec.template, toolName)
+        .then(templateHtml => injectKind(templateHtml, spec.kind, toolName))
+        .catch((e) => {
         htmlCache.delete(toolName);
         throw e;
     });
@@ -59,7 +146,8 @@ function readAppHtml(toolName) {
 function registerWizardAppResource(server, toolName, options) {
     const uri = appResourceUri(toolName);
     // Fail closed: do not register a UI resource that cannot be served.
-    resolveAppHtmlPath(toolName);
+    const spec = getToolAppSpec(toolName);
+    resolveAppHtmlPath(spec.template, toolName);
     server.registerResource(options?.title ?? `${toolName} UI`, uri, {
         mimeType: exports.RESOURCE_MIME_TYPE,
         description: `Interactive Wizard UI for ${toolName}`,

package/dist/apps/register.js.map

@@ -1 +1 @@
-{"version":3,"file":"register.js","sourceRoot":"","sources":["../../src/apps/register.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"register.js","sourceRoot":"","sources":["../../src/apps/register.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openzeppelin/contracts-mcp",
-  "version": "0.6.1",
+  "version": "0.6.3",
   "description": "OpenZeppelin Contracts MCP Server",
   "license": "AGPL-3.0-only",
   "repository": "https://github.com/OpenZeppelin/contracts-wizard",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.29.0",
-    "@openzeppelin/wizard-common": "^0.5.4",
-    "@openzeppelin/wizard": "^0.10.12",
+    "@openzeppelin/wizard-common": "^0.5.5",
+    "@openzeppelin/wizard": "^0.10.13",
     "@openzeppelin/wizard-stylus": "^0.3.0",
     "@openzeppelin/wizard-stellar": "^0.6.3",
     "@openzeppelin/wizard-cairo": "^3.0.0",

package/src/apps/register.ts

@@ -11,29 +11,115 @@ const RESOURCE_URI_META_KEY = 'ui/resourceUri';
 
 const APPS_DIR = path.join(__dirname, '..', '..', 'apps');
 
+/**
+ * Kind placeholder baked into language HTML templates by the UI build.
+ * Duplicated in packages/ui (kind-placeholder.ts, package-mcp-apps.mjs); kept aligned by
+ * `kind placeholder stays in sync` in register.test.ts.
+ */
+export const MCP_KIND_PLACEHOLDER = '__OZ_MCP_KIND__';
+export type AppTemplate = 'solidity' | 'cairo' | 'stellar' | 'stylus' | 'confidential' | 'uniswap-hooks';
+
+export type ToolAppSpec = {
+  template: AppTemplate;
+  kind: string;
+};
+
+/**
+ * Exhaustive tool → language template + kind map.
+ * Kept in lockstep with packages/core kinds by `TOOL_APP_SPECS matches every core kind and UI language entry`
+ * in server.test.ts — do not add tools here without that test (and the UI entries/<language>.ts) passing.
+ * Overrides match MCP_TOOL_NAME_OVERRIDES in server.test.ts: solidity-rwa ← RealWorldAsset, uniswap-hooks ← Hooks.
+ */
+export const TOOL_APP_SPECS: Readonly<Record<string, ToolAppSpec>> = {
+  'solidity-erc20': { template: 'solidity', kind: 'ERC20' },
+  'solidity-erc721': { template: 'solidity', kind: 'ERC721' },
+  'solidity-erc1155': { template: 'solidity', kind: 'ERC1155' },
+  'solidity-stablecoin': { template: 'solidity', kind: 'Stablecoin' },
+  'solidity-rwa': { template: 'solidity', kind: 'RealWorldAsset' },
+  'solidity-account': { template: 'solidity', kind: 'Account' },
+  'solidity-governor': { template: 'solidity', kind: 'Governor' },
+  'solidity-custom': { template: 'solidity', kind: 'Custom' },
+
+  'cairo-erc20': { template: 'cairo', kind: 'ERC20' },
+  'cairo-erc721': { template: 'cairo', kind: 'ERC721' },
+  'cairo-erc1155': { template: 'cairo', kind: 'ERC1155' },
+  'cairo-account': { template: 'cairo', kind: 'Account' },
+  'cairo-multisig': { template: 'cairo', kind: 'Multisig' },
+  'cairo-governor': { template: 'cairo', kind: 'Governor' },
+  'cairo-vesting': { template: 'cairo', kind: 'Vesting' },
+  'cairo-custom': { template: 'cairo', kind: 'Custom' },
+
+  'stellar-fungible': { template: 'stellar', kind: 'Fungible' },
+  'stellar-non-fungible': { template: 'stellar', kind: 'NonFungible' },
+  'stellar-stablecoin': { template: 'stellar', kind: 'Stablecoin' },
+  'stellar-governor': { template: 'stellar', kind: 'Governor' },
+  'stellar-vault': { template: 'stellar', kind: 'Vault' },
+
+  'stylus-erc20': { template: 'stylus', kind: 'ERC20' },
+  'stylus-erc721': { template: 'stylus', kind: 'ERC721' },
+  'stylus-erc1155': { template: 'stylus', kind: 'ERC1155' },
+
+  'confidential-erc7984': { template: 'confidential', kind: 'ERC7984' },
+
+  'uniswap-hooks': { template: 'uniswap-hooks', kind: 'Hooks' },
+};
+
 export function appResourceUri(toolName: string): string {
   return `ui://openzeppelin/${toolName}.html`;
 }
 
-/** Resolve HTML for a tool, throwing build guidance when the artifact is missing. */
-function resolveAppHtmlPath(toolName: string): string {
-  const toolPath = path.join(APPS_DIR, `${toolName}.html`);
-  if (fs.existsSync(toolPath)) {
-    return toolPath;
+export function getToolAppSpec(toolName: string): ToolAppSpec {
+  const spec = TOOL_APP_SPECS[toolName];
+  if (spec === undefined) {
+    throw new Error(
+      `MCP App mapping missing for ${toolName}. ` +
+        `Add it to TOOL_APP_SPECS in packages/mcp/src/apps/register.ts, then run: ` +
+        `yarn --cwd packages/mcp build:apps`,
+    );
+  }
+  return spec;
+}
+
+/** Resolve language HTML template path, throwing build guidance when missing. */
+function resolveAppHtmlPath(template: AppTemplate, toolName: string): string {
+  const templatePath = path.join(APPS_DIR, `${template}.html`);
+  if (fs.existsSync(templatePath)) {
+    return templatePath;
   }
   throw new Error(
-    `MCP App HTML missing for ${toolName} (looked in ${APPS_DIR}). ` +
+    `MCP App HTML missing for ${toolName} (looked for template ${template}.html in ${APPS_DIR}). ` +
       `Run: yarn --cwd packages/mcp build:apps ` +
       `(npm consumers: reinstall the package or report a packaging bug).`,
   );
 }
 
+function injectKind(templateHtml: string, kind: string, toolName: string): string {
+  // Replace the bare placeholder so either "__OZ_MCP_KIND__" or '__OZ_MCP_KIND__' becomes the kind.
+  const matches = templateHtml.split(MCP_KIND_PLACEHOLDER).length - 1;
+  if (matches !== 1) {
+    throw new Error(
+      `MCP App template for ${toolName} must contain exactly one ${MCP_KIND_PLACEHOLDER} ` +
+        `kind placeholder (found ${matches}). Rebuild with yarn --cwd packages/mcp build:apps.`,
+    );
+  }
+  const html = templateHtml.split(MCP_KIND_PLACEHOLDER).join(kind);
+  if (html.includes(MCP_KIND_PLACEHOLDER)) {
+    throw new Error(`MCP App kind injection left a kind placeholder in HTML for ${toolName}`);
+  }
+  if (!html.includes(kind)) {
+    throw new Error(`MCP App kind injection failed to embed kind ${kind} for ${toolName}`);
+  }
+  return html;
+}
+
 /**
  * App HTML is an immutable build artifact, so it is read from disk at most once per tool and then
  * served from memory. Keyed by tool name rather than per request or per session, so the hosted
  * server holds one copy no matter how many sessions open the same app; memory is bounded by the
  * number of tools, not by traffic.
  *
+ * Language templates are shared on disk; kind is injected once per tool on first read.
+ *
  * The in-flight promise is cached so concurrent first reads share a single disk read, and a failed
  * read is evicted so a transient error cannot poison a tool for the process lifetime.
  *
@@ -42,16 +128,37 @@ function resolveAppHtmlPath(toolName: string): string {
  * refactor. See that test for why the hosted server depends on them.
  */
 const htmlCache = new Map<string, Promise<string>>();
+const templateCache = new Map<AppTemplate, Promise<string>>();
 
-export function readAppHtml(toolName: string): Promise<string> {
-  const cached = htmlCache.get(toolName);
+function readTemplateHtml(template: AppTemplate, toolName: string): Promise<string> {
+  const cached = templateCache.get(template);
   if (cached !== undefined) {
     return cached;
   }
-  const pending = fs.promises.readFile(resolveAppHtmlPath(toolName), 'utf-8').catch((e: unknown) => {
-    htmlCache.delete(toolName);
+  const pending = fs.promises.readFile(resolveAppHtmlPath(template, toolName), 'utf-8').catch((e: unknown) => {
+    templateCache.delete(template);
     throw e;
   });
+  templateCache.set(template, pending);
+  return pending;
+}
+
+export function readAppHtml(toolName: string): Promise<string> {
+  const cached = htmlCache.get(toolName);
+  if (cached !== undefined) {
+    return cached;
+  }
+  // Resolve mapping synchronously so unknown tools fail before advertising UI.
+  const spec = getToolAppSpec(toolName);
+  // Fail closed on missing template before caching a doomed read.
+  resolveAppHtmlPath(spec.template, toolName);
+
+  const pending = readTemplateHtml(spec.template, toolName)
+    .then(templateHtml => injectKind(templateHtml, spec.kind, toolName))
+    .catch((e: unknown) => {
+      htmlCache.delete(toolName);
+      throw e;
+    });
   htmlCache.set(toolName, pending);
   return pending;
 }
@@ -60,7 +167,8 @@ export function readAppHtml(toolName: string): Promise<string> {
 function registerWizardAppResource(server: McpServer, toolName: string, options?: { title?: string }): void {
   const uri = appResourceUri(toolName);
   // Fail closed: do not register a UI resource that cannot be served.
-  resolveAppHtmlPath(toolName);
+  const spec = getToolAppSpec(toolName);
+  resolveAppHtmlPath(spec.template, toolName);
   server.registerResource(
     options?.title ?? `${toolName} UI`,
     uri,