@frontmcp/uipack 1.8.5 → 1.8.7

package/esm/shell/index.mjs

@@ -105,6 +105,23 @@ function __applySizingCss(sizing) {
   }
 }
 
+function __measureHeight() {
+  // <html> at fit-content includes body margins and collapsed child margins;
+  // content overflowing a fixed-height body is added; a px max-height clamps.
+  var de = document.documentElement;
+  var body = document.body;
+  if (!de || !body) return 0;
+  var prev = de.style.height;
+  de.style.height = 'fit-content';
+  var dr = de.getBoundingClientRect();
+  var br = body.getBoundingClientRect();
+  var h = Math.max(dr.height, br.top + body.scrollHeight + Math.max(0, dr.bottom - br.bottom) - dr.top);
+  de.style.height = prev;
+  var maxHeight = getComputedStyle(de).maxHeight;
+  var mx = maxHeight && maxHeight.slice(-2) === 'px' ? parseFloat(maxHeight) : NaN;
+  return Math.ceil(isNaN(mx) ? h : Math.min(h, mx));
+}
+
 function __initAutoResize() {
   if (typeof window === 'undefined') return;
   // Idempotent: a re-injected IIFE must not stack observers.
@@ -127,23 +144,30 @@ function __initAutoResize() {
   if (typeof ResizeObserver === 'undefined') return;
 
   function startObserving() {
-    var target = document.getElementById('root') || document.body;
-    if (!target) return;
+    if (!document.body) return;
+    var targets = [document.documentElement, document.body];
+    var root = document.getElementById('root');
+    if (root) targets.push(root);
 
     var rafId = null;
     var lastReported = -1;
     function report() {
       rafId = null;
       try {
-        var rect = target.getBoundingClientRect();
-        var height = Math.ceil(rect.height);
-        var width = Math.ceil(rect.width);
+        // Before the handshake an ext-apps host can't receive the report; the
+        // bridge:ready listener below sends it once the bridge is up.
+        if (window.FrontMcpBridge && window.FrontMcpBridge.initialized === false) return;
+        var height = __measureHeight();
+        var width = Math.ceil(document.documentElement.getBoundingClientRect().width);
         if (height === lastReported || height <= 0) return;
         lastReported = height;
         var payload = { height: height, width: width };
         if (sizing.aspectRatio != null) payload.aspectRatio = sizing.aspectRatio;
         if (window.FrontMcpBridge && typeof window.FrontMcpBridge.setSize === 'function') {
-          window.FrontMcpBridge.setSize(payload).catch(function() {});
+          window.FrontMcpBridge.setSize(payload).catch(function() {
+            // Forget a rejected report so the same height is sent again.
+            if (lastReported === height) lastReported = -1;
+          });
         }
         window.dispatchEvent(new CustomEvent('widget:resize', { detail: payload }));
       } catch (e) {}
@@ -164,9 +188,17 @@ function __initAutoResize() {
         window.__mcpResizeObserver.disconnect();
       }
       var ro = new ResizeObserver(function() { schedule(); });
-      ro.observe(target);
+      for (var i = 0; i < targets.length; i++) ro.observe(targets[i]);
       window.__mcpResizeObserver = ro;
     } catch (e) {}
+    // Report once the bridge is ready (the report scheduled below is skipped
+    // while the handshake is still pending).
+    var readySent = false;
+    window.addEventListener('bridge:ready', function() {
+      if (readySent) return;
+      readySent = true;
+      schedule();
+    });
     // Report once on init so the host gets an initial measurement.
     schedule();
   }
@@ -214,12 +246,57 @@ function detectViewport() {
   return undefined;
 }
 
+function __applyHostTheme(theme) {
+  // Follow a host-supplied theme: <meta name="color-scheme"> sets the frame's
+  // canvas and form controls (a widget's own :root color-scheme still wins),
+  // <html data-theme> is a styling hook. The OS fallback is never written.
+  if (theme !== 'light' && theme !== 'dark') return;
+  if (typeof document === 'undefined' || !document.documentElement) return;
+  try {
+    var meta = document.querySelector('meta[name="color-scheme"]');
+    var head = document.head || document.getElementsByTagName('head')[0];
+    if (!meta && head) {
+      meta = document.createElement('meta');
+      meta.setAttribute('name', 'color-scheme');
+      head.appendChild(meta);
+    }
+    if (meta) meta.setAttribute('content', theme);
+    document.documentElement.setAttribute('data-theme', theme);
+  } catch (e) {}
+}
+
+function extractToolOutput(params) {
+  // A host sends a CallToolResult: prefer structuredContent, then parsed text, then the raw content.
+  if (!params) return undefined;
+  if (params.structuredContent !== undefined && params.structuredContent !== null) return params.structuredContent;
+  var content = params.content;
+  if (Array.isArray(content)) {
+    for (var i = 0; i < content.length; i++) {
+      var item = content[i];
+      if (item && item.type === 'text' && typeof item.text === 'string') {
+        try { return JSON.parse(item.text); } catch (e) { return item.text; }
+      }
+    }
+  }
+  return content;
+}
+
 function readInjectedData() {
   var data = { toolInput: {}, toolOutput: undefined, structuredContent: undefined };
   if (typeof window !== 'undefined') {
     if (window.__mcpToolInput) data.toolInput = window.__mcpToolInput;
     if (window.__mcpToolOutput) data.toolOutput = window.__mcpToolOutput;
     if (window.__mcpStructuredContent) data.structuredContent = window.__mcpStructuredContent;
+    // The OpenAI Apps SDK hands the widget its data as window.openai.toolInput / toolOutput
+    // (toolOutput is the tool's structuredContent).
+    var oa = window.openai;
+    if (oa && typeof oa === 'object') {
+      if (oa.toolInput && !window.__mcpToolInput) data.toolInput = oa.toolInput;
+      if (oa.toolOutput !== undefined && oa.toolOutput !== null) {
+        if (data.toolOutput === undefined) data.toolOutput = oa.toolOutput;
+        if (data.structuredContent === undefined) data.structuredContent = oa.toolOutput;
+      }
+    }
   }
   return data;
 }
@@ -268,7 +345,24 @@ var OpenAIAdapter = {
     if (sdk.displayMode) {
       context.hostContext.displayMode = sdk.displayMode;
     }
-    // Note: OpenAI SDK does not have an onContextChange equivalent
+    // The Apps SDK re-dispatches the changed globals in an 'openai:set_globals' event.
+    window.addEventListener('openai:set_globals', function(event) {
+      var globals = (event && event.detail && event.detail.globals) || window.openai || {};
+      if (globals.toolInput !== undefined && globals.toolInput !== null) {
+        context.toolInput = globals.toolInput;
+        window.dispatchEvent(new CustomEvent('tool:input', { detail: { arguments: context.toolInput } }));
+      }
+      if (globals.toolOutput !== undefined && globals.toolOutput !== null) {
+        context.structuredContent = globals.toolOutput;
+        context.notifyToolResult(globals.toolOutput);
+      }
+      if (globals.theme && globals.theme !== context.hostContext.theme) {
+        context.notifyContextChange({ theme: globals.theme });
+      }
+      if (globals.displayMode && globals.displayMode !== context.hostContext.displayMode) {
+        context.notifyContextChange({ displayMode: globals.displayMode });
+      }
+    });
     return Promise.resolve();
   },
   callTool: function(context, name, args) {
@@ -320,6 +414,8 @@ var ExtAppsAdapter = {
   pendingRequests: {},
   requestId: 0,
   hostCapabilities: {},
+  handshakeSettled: false,
+  pendingSize: null,
   canHandle: function() {
     if (typeof window === 'undefined') return false;
     if (window.parent === window) return false;
@@ -413,9 +509,10 @@ var ExtAppsAdapter = {
         window.dispatchEvent(new CustomEvent('tool:input-partial', { detail: { arguments: context.toolInput } }));
         break;
       case 'ui/notifications/tool-result':
-        context.toolOutput = params.content;
+        var resultOutput = extractToolOutput(params);
+        context.toolOutput = resultOutput;
         context.structuredContent = params.structuredContent;
-        context.notifyToolResult(params.content);
+        context.notifyToolResult(resultOutput);
         window.dispatchEvent(new CustomEvent('tool:result', { detail: params }));
         break;
       case 'ui/notifications/host-context-changed':
@@ -469,6 +566,15 @@ var ExtAppsAdapter = {
       window.parent.postMessage({ jsonrpc: '2.0', id: id, method: method, params: params }, targetOrigin);
     });
   },
+  sendNotification: function(method, params) {
+    // JSON-RPC notification: no id, no response. Same origin rule as sendRequest.
+    if (!this.trustedOrigin && this.trustedOrigins.length === 0) {
+      return Promise.reject(new Error('Cannot send notification: no trusted origin established'));
+    }
+    var targetOrigin = this.trustedOrigin || this.trustedOrigins[0];
+    window.parent.postMessage({ jsonrpc: '2.0', method: method, params: params }, targetOrigin);
+    return Promise.resolve();
+  },
   sendHandshake: function(context) {
     // Send ui/initialize using '*' as target origin since TOFU hasn't
     // been established yet. The response from the host will establish
@@ -485,6 +591,7 @@ var ExtAppsAdapter = {
       var timeout = setTimeout(function() {
         delete self.pendingRequests[id];
         // Handshake timeout is non-fatal \u2014 notifications may still arrive
+        self.settleHandshake();
         resolve();
       }, 10000);
 
@@ -498,7 +605,9 @@ var ExtAppsAdapter = {
             supportsDisplayModes: true
           });
           if (result.hostContext) {
-            Object.assign(context.hostContext, result.hostContext);
+            // Notify (not a silent merge) so onContextChange listeners and the
+            // host theme see the handshake's context.
+            context.notifyContextChange(result.hostContext);
           }
           // Send ui/notifications/initialized to tell the host the view is ready.
           // Per MCP Apps spec, the host waits for this before sending tool-result.
@@ -508,9 +617,10 @@ var ExtAppsAdapter = {
             method: 'ui/notifications/initialized',
             params: {}
           }, targetOrigin);
+          self.settleHandshake();
           resolve();
         },
-        reject: function(err) { resolve(); }, // Non-fatal
+        reject: function(err) { self.settleHandshake(); resolve(); }, // Non-fatal
         timeout: timeout
       };
 
@@ -524,6 +634,18 @@ var ExtAppsAdapter = {
   performHandshake: function(context) {
     return this.sendHandshake(context);
   },
+  settleHandshake: function() {
+    // Deliver the latest size requested while no host origin was trusted.
+    this.handshakeSettled = true;
+    var pending = this.pendingSize;
+    if (!pending) return;
+    this.pendingSize = null;
+    this.sendNotification('ui/notifications/size-changed', pending.params).then(function(result) {
+      for (var i = 0; i < pending.waiters.length; i++) pending.waiters[i].resolve(result);
+    }, function(err) {
+      for (var i = 0; i < pending.waiters.length; i++) pending.waiters[i].reject(err);
+    });
+  },
   callTool: function(context, name, args) {
     if (!this.hostCapabilities.serverTools && !this.hostCapabilities.serverToolProxy) {
       return Promise.reject(new Error('Server tool proxy not supported'));
@@ -545,13 +667,22 @@ var ExtAppsAdapter = {
     return this.sendRequest('ui/setDisplayMode', { mode: mode });
   },
   setSize: function(context, size) {
-    // FrontMCP sizing channel \u2014 parallels ui/setDisplayMode. Reports the
-    // measured/desired widget dimensions to the host.
-    return this.sendRequest('ui/setSize', {
-      height: size && size.height,
-      width: size && size.width,
-      aspectRatio: size && size.aspectRatio
-    });
+    // Standard ext-apps sizing: the view tells the host its dimensions with the
+    // ui/notifications/size-changed notification ({ width?, height? } in px).
+    var params = {};
+    if (size && typeof size.width === 'number') params.width = size.width;
+    if (size && typeof size.height === 'number') params.height = size.height;
+    if (!this.handshakeSettled && !this.trustedOrigin && this.trustedOrigins.length === 0) {
+      // No host origin yet: keep only the latest size and send it when the
+      // handshake settles; every caller's promise follows that one request.
+      var self = this;
+      if (!this.pendingSize) this.pendingSize = { params: params, waiters: [] };
+      this.pendingSize.params = params;
+      return new Promise(function(resolve, reject) {
+        self.pendingSize.waiters.push({ resolve: resolve, reject: reject });
+      });
+    }
+    return this.sendNotification('ui/notifications/size-changed', params);
   },
   requestClose: function(context) {
     return this.sendRequest('ui/close', {});
@@ -797,6 +928,7 @@ function FrontMcpBridge() {
     toolResultListeners: [],
     notifyContextChange: function(changes) {
       Object.assign(this.hostContext, changes);
+      if (changes && changes.theme) __applyHostTheme(changes.theme);
       for (var i = 0; i < this.contextListeners.length; i++) {
         try { this.contextListeners[i](changes); } catch(e) {}
       }
@@ -973,7 +1105,7 @@ FrontMcpBridge.prototype.requestDisplayMode = function(mode) {
 
 // Report a desired widget size to the host. \`size\` is { height?, width?, aspectRatio? }.
 // Per-adapter behaviour: Claude/generic no-op (host measures the DOM),
-// ext-apps sends ui/setSize, OpenAI forwards to its SDK when available.
+// ext-apps sends ui/notifications/size-changed, OpenAI forwards to its SDK when available.
 FrontMcpBridge.prototype.setSize = function(size) {
   if (!this._adapter) return Promise.reject(new Error('Not initialized'));
   if (!this._adapter.setSize) return Promise.resolve();
@@ -1075,7 +1207,7 @@ FrontMcpBridge.prototype._setupDataToolCallHandler = function() {
         target.classList.add('opacity-50', 'cursor-not-allowed');
 
         // Add spinner for buttons
-        var spinner = '<svg class="animate-spin -ml-1 mr-2 h-4 w-4 inline" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle><path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path></svg>';
+        var spinner = '<svg class="animate-spin -ml-1 mr-2 h-4 w-4 inline" style="width:1em;height:1em;vertical-align:-0.125em" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle><path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path></svg>';
         if (target.tagName === 'BUTTON') {
           target.innerHTML = spinner + 'Loading...';
         }
@@ -1156,7 +1288,22 @@ function minifyJS(code) {
   if (code.length > MAX_MINIFY_CODE_LENGTH) {
     return code;
   }
-  return code.replace(/\/\*[\s\S]*?\*\//g, "").replace(/(^|[^:])\/\/.*$/gm, "$1").replace(/\s+/g, " ").replace(/\s*([{};,:()[\]])\s*/g, "$1").replace(/;\}/g, "}").trim();
+  const out = [];
+  let inBlockComment = false;
+  for (const raw of code.split("\n")) {
+    const line = raw.trim();
+    if (inBlockComment) {
+      if (line.includes("*/")) inBlockComment = false;
+      continue;
+    }
+    if (line === "" || line.startsWith("//")) continue;
+    if (line.startsWith("/*")) {
+      if (!line.includes("*/")) inBlockComment = true;
+      continue;
+    }
+    out.push(line);
+  }
+  return out.join("\n");
 }
 function generatePlatformBundle(platform, options = {}) {
   const platformAdapters = {