mcp-use 1.10.0-canary.3 → 1.10.0-canary.4

package/dist/index.js

@@ -3,6 +3,7 @@ import {
   streamEventsToAISDK,
   streamEventsToAISDKWithTools
 } from "./chunk-EW4MJSHA.js";
+import "./chunk-JQKKMUCT.js";
 import "./chunk-ZFZPZ4GE.js";
 import {
   AcquireActiveMCPServerTool,
@@ -43,6 +44,10 @@ import {
   MCPSession,
   WebSocketConnector
 } from "./chunk-QBTQXCAI.js";
+import {
+  BrowserOAuthClientProvider,
+  onMcpAuthorization
+} from "./chunk-3R5PDYIN.js";
 import {
   BaseConnector
 } from "./chunk-LTA4LQTH.js";
@@ -50,11 +55,6 @@ import {
   Logger,
   logger
 } from "./chunk-34R6SIER.js";
-import "./chunk-JQKKMUCT.js";
-import {
-  BrowserOAuthClientProvider,
-  onMcpAuthorization
-} from "./chunk-3R5PDYIN.js";
 import {
   ElicitationDeclinedError,
   ElicitationTimeoutError,

package/dist/src/browser.js

@@ -17,6 +17,10 @@ import {
   MCPSession,
   WebSocketConnector
 } from "../chunk-QBTQXCAI.js";
+import {
+  BrowserOAuthClientProvider,
+  onMcpAuthorization
+} from "../chunk-3R5PDYIN.js";
 import {
   BaseConnector
 } from "../chunk-LTA4LQTH.js";
@@ -24,10 +28,6 @@ import {
   Logger,
   logger
 } from "../chunk-34R6SIER.js";
-import {
-  BrowserOAuthClientProvider,
-  onMcpAuthorization
-} from "../chunk-3R5PDYIN.js";
 import "../chunk-MTHLLDCX.js";
 import "../chunk-3GQAWCBQ.js";
 export {

package/dist/src/react/index.js

@@ -11,11 +11,11 @@ import {
   useWidgetTheme
 } from "../../chunk-VPHP7ERH.js";
 import "../../chunk-QBTQXCAI.js";
-import "../../chunk-LTA4LQTH.js";
-import "../../chunk-34R6SIER.js";
 import {
   onMcpAuthorization
 } from "../../chunk-3R5PDYIN.js";
+import "../../chunk-LTA4LQTH.js";
+import "../../chunk-34R6SIER.js";
 import "../../chunk-MTHLLDCX.js";
 import "../../chunk-3GQAWCBQ.js";
 export {

package/dist/src/server/index.cjs

@@ -1108,37 +1108,12 @@ function binary(base64Data, mimeType) {
 }
 __name(binary, "binary");
 function widget(config) {
-  const {
-    name,
-    data,
-    message,
-    invoking,
-    invoked,
-    widgetAccessible = true,
-    resultCanProduceWidget = true,
-    buildId
-  } = config;
-  const randomId = Math.random().toString(36).substring(2, 15);
-  const buildIdPart = buildId ? `-${buildId}` : "";
-  const uniqueUri = `ui://widget/${name}${buildIdPart}-${randomId}.html`;
-  const metadata = {
-    "openai/outputTemplate": uniqueUri,
-    "openai/widgetAccessible": widgetAccessible,
-    "openai/resultCanProduceWidget": resultCanProduceWidget
-  };
-  if (invoking) {
-    metadata["openai/toolInvocation/invoking"] = invoking;
-  }
-  if (invoked) {
-    metadata["openai/toolInvocation/invoked"] = invoked;
-  }
-  const displayMessage = message || `Displaying ${name}`;
+  const { data, message } = config;
   return {
-    _meta: metadata,
     content: [
       {
         type: "text",
-        text: displayMessage
+        text: message || ""
       }
     ],
     // structuredContent will be injected as window.openai.toolOutput by Apps SDK
@@ -1816,6 +1791,7 @@ function createWidgetRegistration(widgetName, metadata, html2, serverConfig, isD
   const props = metadata.inputs || {};
   const description = metadata.description || `Widget: ${widgetName}`;
   const title = metadata.title || widgetName;
+  const exposeAsTool = metadata.exposeAsTool !== void 0 ? metadata.exposeAsTool : true;
   const mcp_connect_domain = serverConfig.serverBaseUrl ? new URL(serverConfig.serverBaseUrl || "").origin : null;
   return {
     name: widgetName,
@@ -1831,7 +1807,8 @@ function createWidgetRegistration(widgetName, metadata, html2, serverConfig, isD
         type: "appsSdk",
         props,
         html: html2,
-        dev: isDev
+        dev: isDev,
+        exposeAsTool
       },
       ...metadata._meta || {}
     },
@@ -2401,6 +2378,12 @@ __name(setupWidgetRoutes, "setupWidgetRoutes");
 // src/server/widgets/ui-resource-registration.ts
 function uiResourceRegistration(server, definition) {
   const displayName = definition.title || definition.name;
+  if (definition.type === "appsSdk" && definition._meta) {
+    server.widgetDefinitions.set(
+      definition.name,
+      definition._meta
+    );
+  }
   let resourceUri;
   let mimeType;
   switch (definition.type) {
@@ -2480,71 +2463,76 @@ function uiResourceRegistration(server, definition) {
       }, "readCallback")
     });
   }
-  const toolMetadata = definition._meta || {};
-  if (definition.type === "appsSdk" && definition.appsSdkMetadata) {
-    toolMetadata["openai/outputTemplate"] = resourceUri;
-    const toolMetadataFields = [
-      "openai/toolInvocation/invoking",
-      "openai/toolInvocation/invoked",
-      "openai/widgetAccessible",
-      "openai/resultCanProduceWidget"
-    ];
-    for (const field of toolMetadataFields) {
-      if (definition.appsSdkMetadata[field] !== void 0) {
-        toolMetadata[field] = definition.appsSdkMetadata[field];
+  const widgetMetadata = definition._meta?.["mcp-use/widget"];
+  const exposeAsTool = definition.exposeAsTool ?? widgetMetadata?.exposeAsTool ?? true;
+  if (exposeAsTool) {
+    const toolMetadata = definition._meta || {};
+    if (definition.type === "appsSdk" && definition.appsSdkMetadata) {
+      toolMetadata["openai/outputTemplate"] = resourceUri;
+      const toolMetadataFields = [
+        "openai/toolInvocation/invoking",
+        "openai/toolInvocation/invoked",
+        "openai/widgetAccessible",
+        "openai/resultCanProduceWidget"
+      ];
+      for (const field of toolMetadataFields) {
+        if (definition.appsSdkMetadata[field] !== void 0) {
+          toolMetadata[field] = definition.appsSdkMetadata[field];
+        }
       }
     }
-  }
-  server.tool(
-    {
-      name: definition.name,
-      title: definition.title,
-      description: definition.description,
-      inputs: convertPropsToInputs(definition.props),
-      _meta: Object.keys(toolMetadata).length > 0 ? toolMetadata : void 0
-    },
-    async (params) => {
-      const uiResource = await createWidgetUIResource(
-        definition,
-        params,
-        serverConfig
-      );
-      if (definition.type === "appsSdk") {
-        const randomId = Math.random().toString(36).substring(2, 15);
-        const uniqueUri = generateWidgetUri(
-          definition.name,
-          server.buildId,
-          ".html",
-          randomId
+    server.tool(
+      {
+        name: definition.name,
+        title: definition.title,
+        description: definition.description,
+        inputs: convertPropsToInputs(definition.props),
+        annotations: definition.toolAnnotations,
+        _meta: Object.keys(toolMetadata).length > 0 ? toolMetadata : void 0
+      },
+      async (params) => {
+        const uiResource = await createWidgetUIResource(
+          definition,
+          params,
+          serverConfig
         );
-        const uniqueToolMetadata = {
-          ...toolMetadata,
-          "openai/outputTemplate": uniqueUri
-        };
+        if (definition.type === "appsSdk") {
+          const randomId = Math.random().toString(36).substring(2, 15);
+          const uniqueUri = generateWidgetUri(
+            definition.name,
+            server.buildId,
+            ".html",
+            randomId
+          );
+          const uniqueToolMetadata = {
+            ...toolMetadata,
+            "openai/outputTemplate": uniqueUri
+          };
+          return {
+            _meta: uniqueToolMetadata,
+            content: [
+              {
+                type: "text",
+                text: `Displaying ${displayName}`
+              }
+            ],
+            // structuredContent will be injected as window.openai.toolOutput by Apps SDK
+            structuredContent: params
+          };
+        }
         return {
-          _meta: uniqueToolMetadata,
           content: [
             {
               type: "text",
-              text: `Displaying ${displayName}`
-            }
-          ],
-          // structuredContent will be injected as window.openai.toolOutput by Apps SDK
-          structuredContent: params
+              text: `Displaying ${displayName}`,
+              description: `Show MCP-UI widget for ${displayName}`
+            },
+            uiResource
+          ]
         };
       }
-      return {
-        content: [
-          {
-            type: "text",
-            text: `Displaying ${displayName}`,
-            description: `Show MCP-UI widget for ${displayName}`
-          },
-          uiResource
-        ]
-      };
-    }
-  );
+    );
+  }
   return server;
 }
 __name(uiResourceRegistration, "uiResourceRegistration");
@@ -3662,9 +3650,9 @@ async function setupOAuthForServer(app, oauthProvider, baseUrl, state) {
 __name(setupOAuthForServer, "setupOAuthForServer");
 
 // src/server/mcp-server.ts
-var MCPServer = class {
+var MCPServerClass = class {
   static {
-    __name(this, "MCPServer");
+    __name(this, "MCPServerClass");
   }
   /**
    * Native MCP server instance from @modelcontextprotocol/sdk
@@ -3688,8 +3676,6 @@ var MCPServer = class {
   buildId;
   sessions = /* @__PURE__ */ new Map();
   idleCleanupInterval;
-  oauthConfig;
-  // Store OAuth config for lazy initialization
   oauthSetupState = {
     complete: false,
     provider: void 0,
@@ -3707,6 +3693,11 @@ var MCPServer = class {
     resources: /* @__PURE__ */ new Map(),
     resourceTemplates: /* @__PURE__ */ new Map()
   };
+  /**
+   * Storage for widget definitions, used to inject metadata into tool responses
+   * when using the widget() helper with returnsWidget option
+   */
+  widgetDefinitions = /* @__PURE__ */ new Map();
   /**
    * Resource subscription manager for tracking and notifying resource updates
    */
@@ -3753,7 +3744,7 @@ var MCPServer = class {
       }
     );
     this.app = createHonoApp(requestLogger);
-    this.oauthConfig = config.oauth;
+    this.oauthProvider = config.oauth;
     this.wrapRegistrationMethods();
     return createHonoProxy(this, this.app);
   }
@@ -3768,14 +3759,54 @@ var MCPServer = class {
     const originalResourceTemplate = registerResourceTemplate;
     const self = this;
     this.tool = ((toolDefinition, callback) => {
-      const actualCallback = callback || toolDefinition.cb;
+      const widgetConfig = toolDefinition.widget;
+      const widgetName = widgetConfig?.name;
+      if (widgetConfig && widgetName) {
+        const buildIdPart = self.buildId ? `-${self.buildId}` : "";
+        const outputTemplate = `ui://widget/${widgetName}${buildIdPart}.html`;
+        toolDefinition._meta = {
+          ...toolDefinition._meta,
+          "openai/outputTemplate": outputTemplate,
+          "openai/toolInvocation/invoking": widgetConfig.invoking ?? `Loading ${widgetName}...`,
+          "openai/toolInvocation/invoked": widgetConfig.invoked ?? `${widgetName} ready`,
+          "openai/widgetAccessible": widgetConfig.widgetAccessible ?? true,
+          "openai/resultCanProduceWidget": widgetConfig.resultCanProduceWidget ?? true
+        };
+      }
+      let actualCallback = callback || toolDefinition.cb;
+      if (widgetConfig && widgetName && actualCallback) {
+        const originalCallback = actualCallback;
+        actualCallback = /* @__PURE__ */ __name((async (params, ctx) => {
+          const result = await originalCallback(params, ctx);
+          const widgetDef = self.widgetDefinitions.get(widgetName);
+          if (result && typeof result === "object") {
+            const randomId = Math.random().toString(36).substring(2, 15);
+            const buildIdPart = self.buildId ? `-${self.buildId}` : "";
+            const uniqueUri = `ui://widget/${widgetName}${buildIdPart}-${randomId}.html`;
+            const responseMeta = {
+              ...widgetDef || {},
+              // Include mcp-use/widget and other widget metadata
+              "openai/outputTemplate": uniqueUri,
+              "openai/toolInvocation/invoking": widgetConfig.invoking ?? `Loading ${widgetName}...`,
+              "openai/toolInvocation/invoked": widgetConfig.invoked ?? `${widgetName} ready`,
+              "openai/widgetAccessible": widgetConfig.widgetAccessible ?? true,
+              "openai/resultCanProduceWidget": widgetConfig.resultCanProduceWidget ?? true
+            };
+            result._meta = responseMeta;
+            if (result.content?.[0]?.type === "text" && !result.content[0].text) {
+              result.content[0].text = `Displaying ${widgetName}`;
+            }
+          }
+          return result;
+        }), "actualCallback");
+      }
       if (actualCallback) {
         self.registrationRecipes.tools.set(toolDefinition.name, {
           config: toolDefinition,
           handler: actualCallback
         });
       }
-      return originalTool.call(self, toolDefinition, callback);
+      return originalTool.call(self, toolDefinition, actualCallback);
     });
     this.prompt = ((promptDefinition, callback) => {
       const actualCallback = callback || promptDefinition.cb;
@@ -4067,18 +4098,18 @@ var MCPServer = class {
       this.serverPort
     );
   }
-  // Tool registration helper
-  tool = toolRegistration;
+  // Tool registration helper - type is set in wrapRegistrationMethods
+  tool;
   // Schema conversion helpers (used by tool registration)
   convertZodSchemaToParams = convertZodSchemaToParams;
   createParamsSchema = createParamsSchema;
   // Template URI parsing helper (used by resource templates)
   parseTemplateUri = parseTemplateUri;
-  // Resource registration helpers
-  resource = registerResource;
-  resourceTemplate = registerResourceTemplate;
-  // Prompt registration helper
-  prompt = registerPrompt;
+  // Resource registration helpers - types are set in wrapRegistrationMethods
+  resource;
+  resourceTemplate;
+  // Prompt registration helper - type is set in wrapRegistrationMethods
+  prompt;
   // Notification helpers
   getActiveSessions = getActiveSessions;
   sendNotification = sendNotification;
@@ -4191,7 +4222,7 @@ var MCPServer = class {
       this.serverHost,
       this.serverPort
     );
-    if (this.oauthConfig && !this.oauthSetupState.complete && this.oauthProvider) {
+    if (this.oauthProvider && !this.oauthSetupState.complete) {
       await setupOAuthForServer(
         this.app,
         this.oauthProvider,
@@ -4244,7 +4275,7 @@ var MCPServer = class {
    * ```
    */
   async getHandler(options) {
-    if (this.oauthConfig && !this.oauthSetupState.complete && this.oauthProvider) {
+    if (this.oauthProvider && !this.oauthSetupState.complete) {
       await setupOAuthForServer(
         this.app,
         this.oauthProvider,
@@ -4314,8 +4345,9 @@ var MCPServer = class {
     }
   }
 };
+var MCPServer = MCPServerClass;
 function createMCPServer(name, config = {}) {
-  const instance = new MCPServer({
+  const instance = new MCPServerClass({
     name,
     version: config.version || "1.0.0",
     description: config.description,