@webmcp-auto-ui/core 2.5.26 → 2.5.28

package/src/polyfill.ts

@@ -4,8 +4,10 @@
  * Implements the 17 MUST HAVE features of the W3C WebMCP Draft CG Report
  * (2026-03-27) plus ecosystem extras.
  *
- * Architecture: module-level state (no class) for tree-shakability.
- * Zero external dependencies.
+ * Architecture: shared module-level state (toolMap, polyfillOptions,
+ * installState) mutated by installPolyfill/uninstallPolyfill. Installs a
+ * single `navigator.modelContext` descriptor at init time; cleanup restores
+ * the previous descriptor. Zero external dependencies.
  *
  * @license AGPL-3.0-or-later
  */
@@ -39,6 +41,14 @@ import { validateJsonSchema } from './validate.js';
 /** Install state for save/restore of previous descriptors (Fix 7) */
 interface InstallState {
   installed: boolean;
+  /**
+   * True only when we actually overrode navigator.modelContext. When native
+   * WebMCP is present and forcePolyfill is false we short-circuit installation
+   * and MUST NOT touch navigator on cleanup — otherwise we would delete the
+   * native implementation.
+   */
+  didOverride: boolean;
+  didOverrideTesting: boolean;
   previousModelContextDescriptor?: PropertyDescriptor;
   previousModelContextTestingDescriptor?: PropertyDescriptor;
 }
@@ -60,7 +70,7 @@ let toolsChangedCallback: ToolsChangedCallback | null = null;
 let polyfillOptions: WebMCPPolyfillOptions = {};
 
 /** Install state — tracks whether we installed and the previous descriptors */
-const installState: InstallState = { installed: false };
+const installState: InstallState = { installed: false, didOverride: false, didOverrideTesting: false };
 
 // ---------------------------------------------------------------------------
 // Internal helpers
@@ -753,6 +763,8 @@ export function initializeWebMCPPolyfill(
   // forcePolyfill is checked BEFORE the native skip so it takes precedence
   if (hasNativeWebMCP() && !polyfillOptions.forcePolyfill) {
     installState.installed = true;
+    installState.didOverride = false;
+    installState.didOverrideTesting = false;
     return;
   }
 
@@ -781,6 +793,7 @@ export function initializeWebMCPPolyfill(
       writable: false,
       enumerable: true,
     });
+    installState.didOverride = true;
 
     // Fix 14 — installTestingShim option
     const shimOption = polyfillOptions.installTestingShim ?? 'if-missing';
@@ -794,6 +807,7 @@ export function initializeWebMCPPolyfill(
         writable: false,
         enumerable: true,
       });
+      installState.didOverrideTesting = true;
     }
   }
 
@@ -818,32 +832,39 @@ export function cleanupWebMCPPolyfill(): void {
   // Clear callback slot
   toolsChangedCallback = null;
 
-  // Fix 7 — Restore previous descriptors instead of deleting
+  // Fix 7 — Restore previous descriptors instead of deleting.
+  // Guard with didOverride/didOverrideTesting: when native WebMCP was present
+  // and we short-circuited install, we never defined properties on navigator
+  // and must NOT delete or overwrite them here (that would remove the native).
   if (typeof navigator !== 'undefined') {
     try {
-      if (installState.previousModelContextDescriptor) {
-        Object.defineProperty(
-          navigator,
-          'modelContext',
-          installState.previousModelContextDescriptor,
-        );
-      } else {
-        delete (navigator as Navigator & Record<string, unknown>).modelContext;
+      if (installState.didOverride) {
+        if (installState.previousModelContextDescriptor) {
+          Object.defineProperty(
+            navigator,
+            'modelContext',
+            installState.previousModelContextDescriptor,
+          );
+        } else {
+          delete (navigator as Navigator & Record<string, unknown>).modelContext;
+        }
       }
 
-      if (installState.previousModelContextTestingDescriptor) {
-        Object.defineProperty(
-          navigator,
-          'modelContextTesting',
-          installState.previousModelContextTestingDescriptor,
-        );
-      } else {
-        const testingDesc = Object.getOwnPropertyDescriptor(
-          navigator,
-          'modelContextTesting',
-        );
-        if (testingDesc?.configurable) {
-          delete (navigator as Navigator & Record<string, unknown>).modelContextTesting;
+      if (installState.didOverrideTesting) {
+        if (installState.previousModelContextTestingDescriptor) {
+          Object.defineProperty(
+            navigator,
+            'modelContextTesting',
+            installState.previousModelContextTestingDescriptor,
+          );
+        } else {
+          const testingDesc = Object.getOwnPropertyDescriptor(
+            navigator,
+            'modelContextTesting',
+          );
+          if (testingDesc?.configurable) {
+            delete (navigator as Navigator & Record<string, unknown>).modelContextTesting;
+          }
         }
       }
     } catch (e) {
@@ -854,6 +875,8 @@ export function cleanupWebMCPPolyfill(): void {
   // Reset options and install state
   polyfillOptions = {};
   installState.installed = false;
+  installState.didOverride = false;
+  installState.didOverrideTesting = false;
   installState.previousModelContextDescriptor = undefined;
   installState.previousModelContextTestingDescriptor = undefined;
 }

package/src/webmcp-server.ts

@@ -586,12 +586,20 @@ export function createWebMcpServer(
       const allTools = [...customTools];
 
       if (builtinTools) {
-        // Rebuild widget_display description with current widget names
+        // Rebuild widget_display description with current widget names.
+        // Clone the tool descriptor rather than mutating builtinTools in place,
+        // so multiple servers / repeated layer() calls don't stomp on each
+        // other's description (the function refs are preserved).
         const names = [...widgets.keys()];
-        const displayTool = builtinTools.find(t => t.name === 'widget_display')!;
-        displayTool.description = `Render a widget on the user's canvas with the specified type and parameters. Use this tool whenever you need to display data visually — charts, tables, statistics, timelines, maps, galleries, etc. The widget type must match one of the available widget names (use search_recipes or get_recipe first to learn the exact schema). Returns the widget's unique ID for later updates via the canvas tool. Do NOT use this tool for plain text responses. Available widgets: ${names.join(', ')}.`;
+        const dynamicDescription = `Render a widget on the user's canvas with the specified type and parameters. Use this tool whenever you need to display data visually — charts, tables, statistics, timelines, maps, galleries, etc. The widget type must match one of the available widget names (use search_recipes or get_recipe first to learn the exact schema). Returns the widget's unique ID for later updates via the canvas tool. Do NOT use this tool for plain text responses. Available widgets: ${names.join(', ')}.`;
 
-        allTools.push(...builtinTools);
+        for (const tool of builtinTools) {
+          if (tool.name === 'widget_display') {
+            allTools.push({ ...tool, description: dynamicDescription });
+          } else {
+            allTools.push({ ...tool });
+          }
+        }
       }
 
       // Merge flow recipes into the layer's recipe list so the UI can browse them