@frontmcp/uipack 1.9.1-rc.3 → 1.9.2

package/adapters/index.d.ts

@@ -11,7 +11,7 @@ export { MCP_APPS_MIME_TYPE, MCP_APPS_EXTENSION_ID } from './constants';
 export { resolveServingMode, type ResolveServingModeOptions, type ServingModeResult, type AdapterPlatformType, } from './serving-mode';
 export { buildToolResponseContent, type ToolResponseContent, type BuildToolResponseContentOptions, } from './response-builder';
 export { isUIRenderFailure, type UIRenderFailure } from './render-failure';
-export { renderToolTemplate, type RenderToolTemplateOptions, type RenderToolTemplateResult } from './template-renderer';
+export { renderToolTemplate, warnIfComponentReference, type RenderToolTemplateOptions, type RenderToolTemplateResult, } from './template-renderer';
 export { detectContentType, type DetectedContentType } from './content-detector';
 export { buildChartHtml, buildMermaidHtml, buildPdfHtml, wrapDetectedContent } from './content-renderers';
 export { createDefaultBaseTemplate, type DefaultBaseTemplateOptions } from './base-template';

package/adapters/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/adapters/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAKH,OAAO,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAKxE,OAAO,EACL,kBAAkB,EAClB,KAAK,yBAAyB,EAC9B,KAAK,iBAAiB,EACtB,KAAK,mBAAmB,GACzB,MAAM,gBAAgB,CAAC;AAKxB,OAAO,EACL,wBAAwB,EACxB,KAAK,mBAAmB,EACxB,KAAK,+BAA+B,GACrC,MAAM,oBAAoB,CAAC;AAK5B,OAAO,EAAE,iBAAiB,EAAE,KAAK,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAK3E,OAAO,EAAE,kBAAkB,EAAE,KAAK,yBAAyB,EAAE,KAAK,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAKxH,OAAO,EAAE,iBAAiB,EAAE,KAAK,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACjF,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAK1G,OAAO,EAAE,yBAAyB,EAAE,KAAK,0BAA0B,EAAE,MAAM,iBAAiB,CAAC;AAK7F,OAAO,EAAE,qBAAqB,EAAE,KAAK,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAKzF,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/adapters/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAKH,OAAO,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAKxE,OAAO,EACL,kBAAkB,EAClB,KAAK,yBAAyB,EAC9B,KAAK,iBAAiB,EACtB,KAAK,mBAAmB,GACzB,MAAM,gBAAgB,CAAC;AAKxB,OAAO,EACL,wBAAwB,EACxB,KAAK,mBAAmB,EACxB,KAAK,+BAA+B,GACrC,MAAM,oBAAoB,CAAC;AAK5B,OAAO,EAAE,iBAAiB,EAAE,KAAK,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAK3E,OAAO,EACL,kBAAkB,EAClB,wBAAwB,EACxB,KAAK,yBAAyB,EAC9B,KAAK,wBAAwB,GAC9B,MAAM,qBAAqB,CAAC;AAK7B,OAAO,EAAE,iBAAiB,EAAE,KAAK,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACjF,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAK1G,OAAO,EAAE,yBAAyB,EAAE,KAAK,0BAA0B,EAAE,MAAM,iBAAiB,CAAC;AAK7F,OAAO,EAAE,qBAAqB,EAAE,KAAK,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAKzF,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC"}

package/adapters/index.js

@@ -33,6 +33,7 @@ __export(adapters_exports, {
   isUIRenderFailure: () => isUIRenderFailure,
   renderToolTemplate: () => renderToolTemplate,
   resolveServingMode: () => resolveServingMode,
+  warnIfComponentReference: () => warnIfComponentReference,
   wrapDetectedContent: () => wrapDetectedContent
 });
 module.exports = __toCommonJS(adapters_exports);
@@ -3077,7 +3078,7 @@ function noticeStringResult(toolName, logger) {
   if (noticedStringResultTools.has(toolName)) return;
   noticedStringResultTools.add(toolName);
   logger.warn(
-    `[frontmcp] The UI template of tool "${toolName}" returned a plain string containing markup, which is rendered as HTML. FrontMCP 1.9 will HTML-escape plain string results by default. Build the markup with ctx.helpers.html\`\u2026\` (interpolated values are escaped) or wrap safe markup with ctx.helpers.trustedHtml(), then set ui.escapeStringResults: true (or escapeStringResults: false to keep the current behaviour without this notice). See ${STRING_RESULT_DOCS}`
+    `[frontmcp] The UI template of tool "${toolName}" returned a plain string containing markup. FrontMCP 1.9 HTML-escapes plain string results by default, so it is shown as text. Build the markup with ctx.helpers.html\`\u2026\` (interpolated values are escaped) or wrap safe markup with ctx.helpers.trustedHtml(). Set ui.escapeStringResults: false to render plain strings as markup, or true to silence this notice. See ${STRING_RESULT_DOCS}`
   );
 }
 function renderUnwrappedResult(rawResult, options) {
@@ -3087,13 +3088,14 @@ function renderUnwrappedResult(rawResult, options) {
   if (typeof rawResult !== "string") {
     return `<pre>${escapeHtml(JSON.stringify(rawResult, null, 2))}</pre>`;
   }
-  if (detectContentType(rawResult) !== "html" || options.escapeStringResults === true) {
-    return escapeHtml(rawResult);
+  const looksLikeMarkup = detectContentType(rawResult) === "html";
+  if (looksLikeMarkup && options.escapeStringResults === false) {
+    return rawResult;
   }
-  if (options.escapeStringResults === void 0) {
+  if (looksLikeMarkup && options.escapeStringResults === void 0) {
     noticeStringResult(options.toolName, options.logger ?? console);
   }
-  return rawResult;
+  return escapeHtml(rawResult);
 }
 var warnedComponentReferences = /* @__PURE__ */ new WeakMap();
 function warnComponentReference(template, toolName, logger) {
@@ -3105,7 +3107,18 @@ function warnComponentReference(template, toolName, logger) {
     `[FrontMCP] Tool "${toolName}": \`ui.template\` is a React component reference, which cannot be bundled (there is no source file to compile), so the widget would render an empty page. Use \`template: { file: './widget.tsx' }\` instead.`
   );
 }
-function isReactElement(value) {
+var COMPILED_JSX_PATTERN = /\b(?:React\.createElement|_?jsx(?:s|DEV)?)\)?\s*\(/;
+function isComponentReference(template) {
+  if (isReactTypedObject(template)) return true;
+  if (typeof template !== "function" || detectUIType(template) !== "react") return false;
+  return isDefinitelyReactComponent(template) || COMPILED_JSX_PATTERN.test(Function.prototype.toString.call(template));
+}
+function warnIfComponentReference(toolName, template, logger = console) {
+  if (!isComponentReference(template)) return false;
+  warnComponentReference(template, toolName, logger);
+  return true;
+}
+function isReactTypedObject(value) {
   return typeof value === "object" && value !== null && "$$typeof" in value;
 }
 function isDefinitelyReactComponent(template) {
@@ -3145,7 +3158,7 @@ function renderToolTemplate(options) {
     if (isHtmlBuilder) {
       try {
         rawResult = template(ctx);
-        isHtmlBuilder = !isReactElement(rawResult);
+        isHtmlBuilder = !isReactTypedObject(rawResult);
       } catch (error) {
         if (uiType !== "react") throw error;
         isHtmlBuilder = false;
@@ -3174,6 +3187,7 @@ function renderToolTemplate(options) {
     hash = shellResult.hash;
     size = shellResult.size;
   } else {
+    if (isReactTypedObject(template)) warnComponentReference(template, toolName, options.logger ?? console);
     const shellResult = buildShell('<div id="root"></div>', shellConfig);
     html2 = shellResult.html;
     hash = shellResult.hash;
@@ -3288,5 +3302,6 @@ function buildCDNInfoForUIType(uiType) {
   isUIRenderFailure,
   renderToolTemplate,
   resolveServingMode,
+  warnIfComponentReference,
   wrapDetectedContent
 });

package/adapters/template-renderer.d.ts

@@ -46,8 +46,9 @@ export interface RenderToolTemplateOptions {
     };
     /**
      * HTML-escape a plain string returned by a template function; results built with
-     * `html` / `trustedHtml` stay markup. When unset, strings that look like HTML render as
-     * markup and a one-time notice per tool is logged; `false` keeps that without the notice.
+     * `html` / `trustedHtml` stay markup. Unset is the 1.9 default: strings are escaped, and a
+     * one-time notice per tool is logged when one looked like markup. `true` escapes without the
+     * notice; `false` renders strings that look like HTML as markup.
      */
     escapeStringResults?: boolean;
     /** Receives the one-time string-result notice. Defaults to `console`. */
@@ -70,6 +71,15 @@ export interface RenderToolTemplateResult {
     /** Platform-specific metadata */
     meta: Record<string, unknown>;
 }
+/**
+ * Warn, once per tool, that `template` is a React component reference the widget cannot bundle.
+ * The server calls this while it registers UI tools, so the warning appears at startup (#769).
+ *
+ * @returns Whether the template is a component reference
+ */
+export declare function warnIfComponentReference(toolName: string, template: unknown, logger?: {
+    warn: (message: string) => void;
+}): boolean;
 /**
  * Render a tool template into HTML.
  *

package/adapters/template-renderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"template-renderer.d.ts","sourceRoot":"","sources":["../../src/adapters/template-renderer.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAIxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAQnD;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACxC,gBAAgB;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,iBAAiB;IACjB,KAAK,EAAE,OAAO,CAAC;IACf,kBAAkB;IAClB,MAAM,EAAE,OAAO,CAAC;IAChB,qDAAqD;IACrD,QAAQ,EAAE,OAAO,CAAC;IAClB,4CAA4C;IAC5C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,kDAAkD;IAClD,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B;;;;;OAKG;IACH,YAAY,CAAC,EAAE,KAAK,GAAG,QAAQ,CAAC;IAChC;;;;OAIG;IACH,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB;;;OAGG;IACH,GAAG,CAAC,EAAE;QAAE,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;QAAC,eAAe,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IAChE;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,yEAAyE;IACzE,MAAM,CAAC,EAAE;QAAE,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;KAAE,CAAC;CAC9C;AAED;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACvC,+BAA+B;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,2BAA2B;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,mBAAmB;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,oBAAoB;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,iCAAiC;IACjC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC/B;AA8FD;;;;;;;;;;GAUG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,yBAAyB,GAAG,wBAAwB,CAoH/F"}
+{"version":3,"file":"template-renderer.d.ts","sourceRoot":"","sources":["../../src/adapters/template-renderer.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAIxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAQnD;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACxC,gBAAgB;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,iBAAiB;IACjB,KAAK,EAAE,OAAO,CAAC;IACf,kBAAkB;IAClB,MAAM,EAAE,OAAO,CAAC;IAChB,qDAAqD;IACrD,QAAQ,EAAE,OAAO,CAAC;IAClB,4CAA4C;IAC5C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,kDAAkD;IAClD,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B;;;;;OAKG;IACH,YAAY,CAAC,EAAE,KAAK,GAAG,QAAQ,CAAC;IAChC;;;;OAIG;IACH,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB;;;OAGG;IACH,GAAG,CAAC,EAAE;QAAE,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;QAAC,eAAe,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IAChE;;;;;OAKG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,yEAAyE;IACzE,MAAM,CAAC,EAAE;QAAE,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;KAAE,CAAC;CAC9C;AAED;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACvC,+BAA+B;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,2BAA2B;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,mBAAmB;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,oBAAoB;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,iCAAiC;IACjC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC/B;AAiGD;;;;;GAKG;AACH,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,OAAO,EACjB,MAAM,GAAE;IAAE,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;CAAY,GACpD,OAAO,CAIT;AAeD;;;;;;;;;;GAUG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,yBAAyB,GAAG,wBAAwB,CAqH/F"}

package/esm/adapters/index.mjs

@@ -3048,7 +3048,7 @@ function noticeStringResult(toolName, logger) {
   if (noticedStringResultTools.has(toolName)) return;
   noticedStringResultTools.add(toolName);
   logger.warn(
-    `[frontmcp] The UI template of tool "${toolName}" returned a plain string containing markup, which is rendered as HTML. FrontMCP 1.9 will HTML-escape plain string results by default. Build the markup with ctx.helpers.html\`\u2026\` (interpolated values are escaped) or wrap safe markup with ctx.helpers.trustedHtml(), then set ui.escapeStringResults: true (or escapeStringResults: false to keep the current behaviour without this notice). See ${STRING_RESULT_DOCS}`
+    `[frontmcp] The UI template of tool "${toolName}" returned a plain string containing markup. FrontMCP 1.9 HTML-escapes plain string results by default, so it is shown as text. Build the markup with ctx.helpers.html\`\u2026\` (interpolated values are escaped) or wrap safe markup with ctx.helpers.trustedHtml(). Set ui.escapeStringResults: false to render plain strings as markup, or true to silence this notice. See ${STRING_RESULT_DOCS}`
   );
 }
 function renderUnwrappedResult(rawResult, options) {
@@ -3058,13 +3058,14 @@ function renderUnwrappedResult(rawResult, options) {
   if (typeof rawResult !== "string") {
     return `<pre>${escapeHtml(JSON.stringify(rawResult, null, 2))}</pre>`;
   }
-  if (detectContentType(rawResult) !== "html" || options.escapeStringResults === true) {
-    return escapeHtml(rawResult);
+  const looksLikeMarkup = detectContentType(rawResult) === "html";
+  if (looksLikeMarkup && options.escapeStringResults === false) {
+    return rawResult;
   }
-  if (options.escapeStringResults === void 0) {
+  if (looksLikeMarkup && options.escapeStringResults === void 0) {
     noticeStringResult(options.toolName, options.logger ?? console);
   }
-  return rawResult;
+  return escapeHtml(rawResult);
 }
 var warnedComponentReferences = /* @__PURE__ */ new WeakMap();
 function warnComponentReference(template, toolName, logger) {
@@ -3076,7 +3077,18 @@ function warnComponentReference(template, toolName, logger) {
     `[FrontMCP] Tool "${toolName}": \`ui.template\` is a React component reference, which cannot be bundled (there is no source file to compile), so the widget would render an empty page. Use \`template: { file: './widget.tsx' }\` instead.`
   );
 }
-function isReactElement(value) {
+var COMPILED_JSX_PATTERN = /\b(?:React\.createElement|_?jsx(?:s|DEV)?)\)?\s*\(/;
+function isComponentReference(template) {
+  if (isReactTypedObject(template)) return true;
+  if (typeof template !== "function" || detectUIType(template) !== "react") return false;
+  return isDefinitelyReactComponent(template) || COMPILED_JSX_PATTERN.test(Function.prototype.toString.call(template));
+}
+function warnIfComponentReference(toolName, template, logger = console) {
+  if (!isComponentReference(template)) return false;
+  warnComponentReference(template, toolName, logger);
+  return true;
+}
+function isReactTypedObject(value) {
   return typeof value === "object" && value !== null && "$$typeof" in value;
 }
 function isDefinitelyReactComponent(template) {
@@ -3116,7 +3128,7 @@ function renderToolTemplate(options) {
     if (isHtmlBuilder) {
       try {
         rawResult = template(ctx);
-        isHtmlBuilder = !isReactElement(rawResult);
+        isHtmlBuilder = !isReactTypedObject(rawResult);
       } catch (error) {
         if (uiType !== "react") throw error;
         isHtmlBuilder = false;
@@ -3145,6 +3157,7 @@ function renderToolTemplate(options) {
     hash = shellResult.hash;
     size = shellResult.size;
   } else {
+    if (isReactTypedObject(template)) warnComponentReference(template, toolName, options.logger ?? console);
     const shellResult = buildShell('<div id="root"></div>', shellConfig);
     html2 = shellResult.html;
     hash = shellResult.hash;
@@ -3258,5 +3271,6 @@ export {
   isUIRenderFailure,
   renderToolTemplate,
   resolveServingMode,
+  warnIfComponentReference,
   wrapDetectedContent
 };

package/esm/index.mjs

@@ -4319,7 +4319,7 @@ function noticeStringResult(toolName, logger) {
   if (noticedStringResultTools.has(toolName)) return;
   noticedStringResultTools.add(toolName);
   logger.warn(
-    `[frontmcp] The UI template of tool "${toolName}" returned a plain string containing markup, which is rendered as HTML. FrontMCP 1.9 will HTML-escape plain string results by default. Build the markup with ctx.helpers.html\`\u2026\` (interpolated values are escaped) or wrap safe markup with ctx.helpers.trustedHtml(), then set ui.escapeStringResults: true (or escapeStringResults: false to keep the current behaviour without this notice). See ${STRING_RESULT_DOCS}`
+    `[frontmcp] The UI template of tool "${toolName}" returned a plain string containing markup. FrontMCP 1.9 HTML-escapes plain string results by default, so it is shown as text. Build the markup with ctx.helpers.html\`\u2026\` (interpolated values are escaped) or wrap safe markup with ctx.helpers.trustedHtml(). Set ui.escapeStringResults: false to render plain strings as markup, or true to silence this notice. See ${STRING_RESULT_DOCS}`
   );
 }
 function renderUnwrappedResult(rawResult, options) {
@@ -4329,13 +4329,14 @@ function renderUnwrappedResult(rawResult, options) {
   if (typeof rawResult !== "string") {
     return `<pre>${escapeHtml(JSON.stringify(rawResult, null, 2))}</pre>`;
   }
-  if (detectContentType(rawResult) !== "html" || options.escapeStringResults === true) {
-    return escapeHtml(rawResult);
+  const looksLikeMarkup = detectContentType(rawResult) === "html";
+  if (looksLikeMarkup && options.escapeStringResults === false) {
+    return rawResult;
   }
-  if (options.escapeStringResults === void 0) {
+  if (looksLikeMarkup && options.escapeStringResults === void 0) {
     noticeStringResult(options.toolName, options.logger ?? console);
   }
-  return rawResult;
+  return escapeHtml(rawResult);
 }
 var warnedComponentReferences = /* @__PURE__ */ new WeakMap();
 function warnComponentReference(template, toolName, logger) {
@@ -4347,7 +4348,18 @@ function warnComponentReference(template, toolName, logger) {
     `[FrontMCP] Tool "${toolName}": \`ui.template\` is a React component reference, which cannot be bundled (there is no source file to compile), so the widget would render an empty page. Use \`template: { file: './widget.tsx' }\` instead.`
   );
 }
-function isReactElement(value) {
+var COMPILED_JSX_PATTERN = /\b(?:React\.createElement|_?jsx(?:s|DEV)?)\)?\s*\(/;
+function isComponentReference(template) {
+  if (isReactTypedObject(template)) return true;
+  if (typeof template !== "function" || detectUIType(template) !== "react") return false;
+  return isDefinitelyReactComponent(template) || COMPILED_JSX_PATTERN.test(Function.prototype.toString.call(template));
+}
+function warnIfComponentReference(toolName, template, logger = console) {
+  if (!isComponentReference(template)) return false;
+  warnComponentReference(template, toolName, logger);
+  return true;
+}
+function isReactTypedObject(value) {
   return typeof value === "object" && value !== null && "$$typeof" in value;
 }
 function isDefinitelyReactComponent(template) {
@@ -4387,7 +4399,7 @@ function renderToolTemplate(options) {
     if (isHtmlBuilder) {
       try {
         rawResult = template(ctx);
-        isHtmlBuilder = !isReactElement(rawResult);
+        isHtmlBuilder = !isReactTypedObject(rawResult);
       } catch (error) {
         if (uiType !== "react") throw error;
         isHtmlBuilder = false;
@@ -4416,6 +4428,7 @@ function renderToolTemplate(options) {
     hash = shellResult.hash;
     size = shellResult.size;
   } else {
+    if (isReactTypedObject(template)) warnComponentReference(template, toolName, options.logger ?? console);
     const shellResult = buildShell('<div id="root"></div>', shellConfig);
     html2 = shellResult.html;
     hash = shellResult.hash;
@@ -4617,5 +4630,6 @@ export {
   validateCSPDomain,
   validateImportMap,
   validateShellTemplate,
+  warnIfComponentReference,
   wrapDetectedContent
 };

package/esm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@frontmcp/uipack",
-  "version": "1.9.1-rc.3",
+  "version": "1.9.2",
   "description": "FrontMCP UIpack - HTML shell builder, pluggable import resolver, and NPM component loader for MCP UI (React-free core)",
   "author": "AgentFront <info@agentfront.dev>",
   "homepage": "https://docs.agentfront.dev",
@@ -61,7 +61,7 @@
     "typescript": "^5.9.3"
   },
   "peerDependencies": {
-    "@frontmcp/lazy-zod": "1.9.1-rc.3",
+    "@frontmcp/lazy-zod": "1.9.2",
     "esbuild": ">=0.27.0 <1"
   },
   "peerDependenciesMeta": {

package/index.js

@@ -121,6 +121,7 @@ __export(index_exports, {
   validateCSPDomain: () => validateCSPDomain,
   validateImportMap: () => validateImportMap,
   validateShellTemplate: () => validateShellTemplate,
+  warnIfComponentReference: () => warnIfComponentReference,
   wrapDetectedContent: () => wrapDetectedContent
 });
 module.exports = __toCommonJS(index_exports);
@@ -4436,7 +4437,7 @@ function noticeStringResult(toolName, logger) {
   if (noticedStringResultTools.has(toolName)) return;
   noticedStringResultTools.add(toolName);
   logger.warn(
-    `[frontmcp] The UI template of tool "${toolName}" returned a plain string containing markup, which is rendered as HTML. FrontMCP 1.9 will HTML-escape plain string results by default. Build the markup with ctx.helpers.html\`\u2026\` (interpolated values are escaped) or wrap safe markup with ctx.helpers.trustedHtml(), then set ui.escapeStringResults: true (or escapeStringResults: false to keep the current behaviour without this notice). See ${STRING_RESULT_DOCS}`
+    `[frontmcp] The UI template of tool "${toolName}" returned a plain string containing markup. FrontMCP 1.9 HTML-escapes plain string results by default, so it is shown as text. Build the markup with ctx.helpers.html\`\u2026\` (interpolated values are escaped) or wrap safe markup with ctx.helpers.trustedHtml(). Set ui.escapeStringResults: false to render plain strings as markup, or true to silence this notice. See ${STRING_RESULT_DOCS}`
   );
 }
 function renderUnwrappedResult(rawResult, options) {
@@ -4446,13 +4447,14 @@ function renderUnwrappedResult(rawResult, options) {
   if (typeof rawResult !== "string") {
     return `<pre>${escapeHtml(JSON.stringify(rawResult, null, 2))}</pre>`;
   }
-  if (detectContentType(rawResult) !== "html" || options.escapeStringResults === true) {
-    return escapeHtml(rawResult);
+  const looksLikeMarkup = detectContentType(rawResult) === "html";
+  if (looksLikeMarkup && options.escapeStringResults === false) {
+    return rawResult;
   }
-  if (options.escapeStringResults === void 0) {
+  if (looksLikeMarkup && options.escapeStringResults === void 0) {
     noticeStringResult(options.toolName, options.logger ?? console);
   }
-  return rawResult;
+  return escapeHtml(rawResult);
 }
 var warnedComponentReferences = /* @__PURE__ */ new WeakMap();
 function warnComponentReference(template, toolName, logger) {
@@ -4464,7 +4466,18 @@ function warnComponentReference(template, toolName, logger) {
     `[FrontMCP] Tool "${toolName}": \`ui.template\` is a React component reference, which cannot be bundled (there is no source file to compile), so the widget would render an empty page. Use \`template: { file: './widget.tsx' }\` instead.`
   );
 }
-function isReactElement(value) {
+var COMPILED_JSX_PATTERN = /\b(?:React\.createElement|_?jsx(?:s|DEV)?)\)?\s*\(/;
+function isComponentReference(template) {
+  if (isReactTypedObject(template)) return true;
+  if (typeof template !== "function" || detectUIType(template) !== "react") return false;
+  return isDefinitelyReactComponent(template) || COMPILED_JSX_PATTERN.test(Function.prototype.toString.call(template));
+}
+function warnIfComponentReference(toolName, template, logger = console) {
+  if (!isComponentReference(template)) return false;
+  warnComponentReference(template, toolName, logger);
+  return true;
+}
+function isReactTypedObject(value) {
   return typeof value === "object" && value !== null && "$$typeof" in value;
 }
 function isDefinitelyReactComponent(template) {
@@ -4504,7 +4517,7 @@ function renderToolTemplate(options) {
     if (isHtmlBuilder) {
       try {
         rawResult = template(ctx);
-        isHtmlBuilder = !isReactElement(rawResult);
+        isHtmlBuilder = !isReactTypedObject(rawResult);
       } catch (error) {
         if (uiType !== "react") throw error;
         isHtmlBuilder = false;
@@ -4533,6 +4546,7 @@ function renderToolTemplate(options) {
     hash = shellResult.hash;
     size = shellResult.size;
   } else {
+    if (isReactTypedObject(template)) warnComponentReference(template, toolName, options.logger ?? console);
     const shellResult = buildShell('<div id="root"></div>', shellConfig);
     html2 = shellResult.html;
     hash = shellResult.hash;
@@ -4735,5 +4749,6 @@ function buildCDNInfoForUIType(uiType) {
   validateCSPDomain,
   validateImportMap,
   validateShellTemplate,
+  warnIfComponentReference,
   wrapDetectedContent
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@frontmcp/uipack",
-  "version": "1.9.1-rc.3",
+  "version": "1.9.2",
   "description": "FrontMCP UIpack - HTML shell builder, pluggable import resolver, and NPM component loader for MCP UI (React-free core)",
   "author": "AgentFront <info@agentfront.dev>",
   "homepage": "https://docs.agentfront.dev",
@@ -61,7 +61,7 @@
     "typescript": "^5.9.3"
   },
   "peerDependencies": {
-    "@frontmcp/lazy-zod": "1.9.1-rc.3",
+    "@frontmcp/lazy-zod": "1.9.2",
     "esbuild": ">=0.27.0 <1"
   },
   "peerDependenciesMeta": {

package/shell/trusted-html.d.ts

@@ -2,8 +2,8 @@
  * Trusted Markup
  *
  * Explicit markup values for UI template functions. A template result built with {@link html}
- * or wrapped with {@link trustedHtml} is rendered as HTML; with `escapeStringResults` on, a plain
- * string result is escaped instead.
+ * or wrapped with {@link trustedHtml} is rendered as HTML; a plain string result is escaped instead
+ * (unless `escapeStringResults: false`).
  *
  * @packageDocumentation
  */

package/types/ui-config.d.ts

@@ -182,8 +182,8 @@ export interface TemplateHelpers {
      */
     html: (strings: TemplateStringsArray, ...values: unknown[]) => TrustedHtml;
     /**
-     * Mark markup you produced or sanitized yourself as trusted, so it renders as HTML even when
-     * `escapeStringResults` is on. Never pass raw tool output or user input.
+     * Mark markup you produced or sanitized yourself as trusted, so it renders as HTML although plain
+     * string results are escaped. Never pass raw tool output or user input.
      */
     trustedHtml: (markup: string) => TrustedHtml;
 }
@@ -349,11 +349,11 @@ export interface UITemplateConfig<In = unknown, Out = unknown> {
     /**
      * HTML-escape a plain string returned by a template function.
      *
-     * - `true`: plain strings are escaped and shown as text; markup built with
-     *   `ctx.helpers.html` or wrapped with `ctx.helpers.trustedHtml` still renders as HTML.
-     * - unset (1.8 default): strings that look like HTML render as markup, and a one-time
-     *   notice per tool recommends `html` because 1.9 will escape string results by default.
-     * - `false`: keep rendering strings as markup without the notice.
+     * - unset (1.9 default): plain strings are escaped and shown as text, and a one-time notice per
+     *   tool is logged when one looked like markup; markup built with `ctx.helpers.html` or wrapped
+     *   with `ctx.helpers.trustedHtml` still renders as HTML.
+     * - `true`: the same, without the notice.
+     * - `false`: strings that look like HTML render as markup (the 1.8 behaviour).
      *
      * Overrides the server-wide `@FrontMcp({ ui: { escapeStringResults } })` default.
      * Static string templates (`template: '<div>…</div>'`) are author markup and never escaped.