mcp-use 1.5.1-canary.1 → 1.5.1-canary.3

package/dist/src/server/index.js

@@ -592,6 +592,22 @@ var McpServer = class {
     }
     return `http://${this.serverHost}:${this.serverPort}`;
   }
+  /**
+   * Gets additional CSP URLs from environment variable
+   * Supports comma-separated list or single URL
+   * @returns Array of URLs to add to CSP resource_domains
+   */
+  getCSPUrls() {
+    const cspUrlsEnv = getEnv2("CSP_URLS");
+    if (!cspUrlsEnv) {
+      console.log("[CSP] No CSP_URLS environment variable found");
+      return [];
+    }
+    console.log("[CSP] Found CSP_URLS environment variable:", cspUrlsEnv);
+    const urls = cspUrlsEnv.split(",").map((url) => url.trim()).filter((url) => url.length > 0);
+    console.log("[CSP] Parsed CSP URLs:", urls);
+    return urls;
+  }
   /**
    * Define a static resource that can be accessed by clients
    *
@@ -763,11 +779,6 @@ var McpServer = class {
    */
   tool(toolDefinition) {
     const inputSchema = this.createParamsSchema(toolDefinition.inputs || []);
-    const context = {
-      sample: /* @__PURE__ */ __name(async (params, options) => {
-        return await this.createMessage(params, options);
-      }, "sample")
-    };
     this.server.registerTool(
       toolDefinition.name,
       {
@@ -777,7 +788,98 @@ var McpServer = class {
         annotations: toolDefinition.annotations,
         _meta: toolDefinition._meta
       },
-      async (params) => {
+      async (params, extra) => {
+        const progressToken = extra?._meta?.progressToken;
+        const context = {
+          /**
+           * Request sampling from the client's LLM with automatic progress notifications.
+           *
+           * Progress notifications are sent every 5 seconds (configurable) while waiting
+           * for the sampling response. This prevents client-side timeouts when
+           * resetTimeoutOnProgress is enabled.
+           *
+           * @param params - Sampling parameters (messages, model preferences, etc.)
+           * @param options - Optional configuration
+           * @param options.timeout - Timeout in milliseconds (default: no timeout / Infinity)
+           * @param options.progressIntervalMs - Interval between progress notifications (default: 5000ms)
+           * @param options.onProgress - Optional callback called each time progress is reported
+           * @returns The sampling result from the client's LLM
+           */
+          sample: /* @__PURE__ */ __name(async (sampleParams, options) => {
+            const {
+              timeout,
+              progressIntervalMs = 5e3,
+              onProgress
+            } = options ?? {};
+            let progressCount = 0;
+            let completed = false;
+            let progressInterval = null;
+            if (progressToken && extra?.sendNotification) {
+              progressInterval = setInterval(async () => {
+                if (completed) return;
+                progressCount++;
+                const progressData = {
+                  progress: progressCount,
+                  total: void 0,
+                  message: `Waiting for LLM response... (${progressCount * Math.round(progressIntervalMs / 1e3)}s elapsed)`
+                };
+                if (onProgress) {
+                  try {
+                    onProgress(progressData);
+                  } catch {
+                  }
+                }
+                try {
+                  await extra.sendNotification({
+                    method: "notifications/progress",
+                    params: {
+                      progressToken,
+                      progress: progressData.progress,
+                      total: progressData.total,
+                      message: progressData.message
+                    }
+                  });
+                } catch {
+                }
+              }, progressIntervalMs);
+            }
+            try {
+              const samplePromise = this.createMessage(sampleParams);
+              if (timeout && timeout !== Infinity) {
+                const timeoutPromise = new Promise((_, reject) => {
+                  setTimeout(
+                    () => reject(
+                      new Error(`Sampling timed out after ${timeout}ms`)
+                    ),
+                    timeout
+                  );
+                });
+                return await Promise.race([samplePromise, timeoutPromise]);
+              }
+              return await samplePromise;
+            } finally {
+              completed = true;
+              if (progressInterval) {
+                clearInterval(progressInterval);
+              }
+            }
+          }, "sample"),
+          /**
+           * Send a progress notification to the client.
+           * Only works if the client requested progress updates for this tool call.
+           */
+          reportProgress: progressToken && extra?.sendNotification ? async (progress, total, message) => {
+            await extra.sendNotification({
+              method: "notifications/progress",
+              params: {
+                progressToken,
+                progress,
+                total,
+                message
+              }
+            });
+          } : void 0
+        };
         if (toolDefinition.cb.length >= 2) {
           return await toolDefinition.cb(params, context);
         }
@@ -1639,6 +1741,8 @@ if (container && Component) {
               "https://*.oaiusercontent.com",
               // always also add the base url of the server
               ...this.getServerBaseUrl() ? [this.getServerBaseUrl()] : [],
+              // add additional CSP URLs from environment variable
+              ...this.getCSPUrls(),
               ...metadata.appsSdkMetadata?.["openai/widgetCSP"]?.resource_domains || []
             ]
           }
@@ -1816,6 +1920,8 @@ if (container && Component) {
               "https://*.openai.com",
               // always also add the base url of the server
               ...this.getServerBaseUrl() ? [this.getServerBaseUrl()] : [],
+              // add additional CSP URLs from environment variable
+              ...this.getCSPUrls(),
               ...metadata.appsSdkMetadata?.["openai/widgetCSP"]?.resource_domains || []
             ]
           }
@@ -1868,14 +1974,7 @@ if (container && Component) {
     if (this.mcpMounted) return;
     const { StreamableHTTPServerTransport } = await import("@modelcontextprotocol/sdk/server/streamableHttp.js");
     const idleTimeoutMs = this.config.sessionIdleTimeoutMs ?? 3e5;
-    const createNewTransport = /* @__PURE__ */ __name(async (closeOldSessionId) => {
-      if (closeOldSessionId && this.sessions.has(closeOldSessionId)) {
-        try {
-          this.sessions.get(closeOldSessionId).transport.close();
-        } catch (error) {
-        }
-        this.sessions.delete(closeOldSessionId);
-      }
+    const getTransportConfig = /* @__PURE__ */ __name(() => {
       const isProduction = this.isProductionMode();
       let allowedOrigins = this.config.allowedOrigins;
       let enableDnsRebindingProtection = false;
@@ -1887,6 +1986,17 @@ if (container && Component) {
         allowedOrigins = void 0;
         enableDnsRebindingProtection = false;
       }
+      return { allowedOrigins, enableDnsRebindingProtection };
+    }, "getTransportConfig");
+    const createNewTransport = /* @__PURE__ */ __name(async (closeOldSessionId) => {
+      if (closeOldSessionId && this.sessions.has(closeOldSessionId)) {
+        try {
+          this.sessions.get(closeOldSessionId).transport.close();
+        } catch (error) {
+        }
+        this.sessions.delete(closeOldSessionId);
+      }
+      const { allowedOrigins, enableDnsRebindingProtection } = getTransportConfig();
       const transport = new StreamableHTTPServerTransport({
         sessionIdGenerator: /* @__PURE__ */ __name(() => generateUUID(), "sessionIdGenerator"),
         enableJsonResponse: true,
@@ -1909,6 +2019,81 @@ if (container && Component) {
       await this.server.connect(transport);
       return transport;
     }, "createNewTransport");
+    const createAndAutoInitializeTransport = /* @__PURE__ */ __name(async (oldSessionId) => {
+      const { allowedOrigins, enableDnsRebindingProtection } = getTransportConfig();
+      const transport = new StreamableHTTPServerTransport({
+        sessionIdGenerator: /* @__PURE__ */ __name(() => oldSessionId, "sessionIdGenerator"),
+        // Reuse old session ID!
+        enableJsonResponse: true,
+        allowedOrigins,
+        enableDnsRebindingProtection,
+        // We'll manually store the session, so don't rely on onsessioninitialized
+        onsessionclosed: /* @__PURE__ */ __name((id) => {
+          if (id) {
+            this.sessions.delete(id);
+          }
+        }, "onsessionclosed")
+      });
+      await this.server.connect(transport);
+      this.sessions.set(oldSessionId, {
+        transport,
+        lastAccessedAt: Date.now()
+      });
+      const initBody = {
+        jsonrpc: "2.0",
+        method: "initialize",
+        params: {
+          protocolVersion: "2024-11-05",
+          capabilities: {},
+          clientInfo: { name: "mcp-use-auto-reconnect", version: "1.0.0" }
+        },
+        id: "__auto_init__"
+      };
+      const syntheticHeaders = {
+        "content-type": "application/json",
+        accept: "application/json, text/event-stream"
+        // SDK requires both!
+      };
+      const syntheticReq = {
+        method: "POST",
+        headers: syntheticHeaders,
+        header: /* @__PURE__ */ __name((name) => syntheticHeaders[name.toLowerCase()], "header"),
+        body: initBody
+      };
+      const syntheticRes = {
+        statusCode: 200,
+        setHeader: /* @__PURE__ */ __name(() => syntheticRes, "setHeader"),
+        writeHead: /* @__PURE__ */ __name((code) => {
+          syntheticRes.statusCode = code;
+          return syntheticRes;
+        }, "writeHead"),
+        write: /* @__PURE__ */ __name(() => true, "write"),
+        end: /* @__PURE__ */ __name(() => {
+        }, "end"),
+        on: /* @__PURE__ */ __name(() => syntheticRes, "on"),
+        once: /* @__PURE__ */ __name(() => syntheticRes, "once"),
+        removeListener: /* @__PURE__ */ __name(() => syntheticRes, "removeListener")
+      };
+      await new Promise((resolve) => {
+        syntheticRes.end = () => {
+          resolve();
+        };
+        transport.handleRequest(syntheticReq, syntheticRes, initBody);
+      });
+      if (syntheticRes.statusCode !== 200) {
+        console.error(
+          `[MCP] Auto-initialization failed with status ${syntheticRes.statusCode}`
+        );
+        this.sessions.delete(oldSessionId);
+        throw new Error(
+          `Auto-initialization failed: ${syntheticRes.statusCode}`
+        );
+      }
+      console.log(
+        `[MCP] Auto-initialized session ${oldSessionId} for seamless reconnection`
+      );
+      return transport;
+    }, "createAndAutoInitializeTransport");
     const getOrCreateTransport = /* @__PURE__ */ __name(async (sessionId, isInit = false) => {
       if (isInit) {
         return await createNewTransport(sessionId);
@@ -1922,9 +2107,9 @@ if (container && Component) {
         const autoCreate = this.config.autoCreateSessionOnInvalidId ?? true;
         if (autoCreate) {
           console.warn(
-            `[MCP] Session ${sessionId} not found (expired or invalid), auto-creating new session for seamless reconnection`
+            `[MCP] Session ${sessionId} not found (expired or invalid), auto-creating and initializing new session for seamless reconnection`
           );
-          return await createNewTransport(sessionId);
+          return await createAndAutoInitializeTransport(sessionId);
         } else {
           return null;
         }

package/dist/src/server/mcp-server.d.ts

@@ -1,4 +1,79 @@
 import type { CreateMessageRequest, CreateMessageResult } from "@modelcontextprotocol/sdk/types.js";
+/**
+ * Options for the sample() function in tool context.
+ */
+export interface SampleOptions {
+    /**
+     * Timeout in milliseconds for the sampling request.
+     * Default: no timeout (Infinity) - waits indefinitely for the LLM response.
+     * Set this if you want to limit how long to wait for sampling.
+     */
+    timeout?: number;
+    /**
+     * Interval in milliseconds between progress notifications.
+     * Default: 5000 (5 seconds).
+     * Progress notifications are sent to the client to prevent timeout
+     * when the client has resetTimeoutOnProgress enabled.
+     */
+    progressIntervalMs?: number;
+    /**
+     * Optional callback called each time a progress notification is sent.
+     * Useful for logging or custom progress handling.
+     */
+    onProgress?: (progress: {
+        progress: number;
+        total?: number;
+        message: string;
+    }) => void;
+}
+/**
+ * Context object passed to tool callbacks.
+ * Provides access to sampling and progress reporting capabilities.
+ */
+export interface ToolContext {
+    /**
+     * Request sampling from the client's LLM with automatic progress notifications.
+     *
+     * Progress notifications are sent every 5 seconds (configurable) while waiting
+     * for the sampling response. This prevents client-side timeouts when the client
+     * has `resetTimeoutOnProgress: true` enabled.
+     *
+     * By default, there is no timeout - the function waits indefinitely for the
+     * LLM response. Set `options.timeout` to limit the wait time.
+     *
+     * @param params - Sampling parameters (messages, model preferences, etc.)
+     * @param options - Optional configuration for timeout and progress
+     * @returns The sampling result from the client's LLM
+     *
+     * @example
+     * ```typescript
+     * // Basic usage - waits indefinitely with automatic progress notifications
+     * const result = await ctx.sample({
+     *   messages: [{ role: 'user', content: { type: 'text', text: 'Hello' } }],
+     * });
+     *
+     * // With timeout and custom progress handling
+     * const result = await ctx.sample(
+     *   { messages: [...] },
+     *   {
+     *     timeout: 120000, // 2 minute timeout
+     *     progressIntervalMs: 3000, // Report progress every 3 seconds
+     *     onProgress: ({ progress, message }) => console.log(message),
+     *   }
+     * );
+     * ```
+     */
+    sample: (params: CreateMessageRequest["params"], options?: SampleOptions) => Promise<CreateMessageResult>;
+    /**
+     * Send a progress notification to the client.
+     * Only available if the client requested progress updates for this tool call.
+     *
+     * @param progress - Current progress value (should increase with each call)
+     * @param total - Total progress value if known
+     * @param message - Optional message describing current progress
+     */
+    reportProgress?: (progress: number, total?: number, message?: string) => Promise<void>;
+}
 import type { RequestOptions } from "@modelcontextprotocol/sdk/shared/protocol.js";
 import { type Hono as HonoType } from "hono";
 import type { PromptDefinition, ResourceDefinition, ResourceTemplateDefinition, ServerConfig, ToolDefinition, UIResourceDefinition } from "./types/index.js";
@@ -33,6 +108,12 @@ export declare class McpServer {
      * @returns The complete base URL for the server
      */
     private getServerBaseUrl;
+    /**
+     * Gets additional CSP URLs from environment variable
+     * Supports comma-separated list or single URL
+     * @returns Array of URLs to add to CSP resource_domains
+     */
+    private getCSPUrls;
     /**
      * Define a static resource that can be accessed by clients
      *

package/dist/src/server/mcp-server.d.ts.map

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

package/dist/src/server/types/tool.d.ts

@@ -1,7 +1,12 @@
 import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
 import type { InputDefinition } from "./common.js";
 import type { ToolAnnotations } from "@modelcontextprotocol/sdk/types.js";
-export type ToolCallback = (params: Record<string, any>) => Promise<CallToolResult>;
+import type { ToolContext } from "../mcp-server.js";
+/**
+ * Callback function for tool execution.
+ * Can optionally receive a ToolContext as the second parameter for sampling support.
+ */
+export type ToolCallback = (params: Record<string, any>, ctx?: ToolContext) => Promise<CallToolResult>;
 export interface ToolDefinition {
     /** Unique identifier for the tool */
     name: string;
@@ -11,7 +16,26 @@ export interface ToolDefinition {
     description?: string;
     /** Input parameter definitions */
     inputs?: InputDefinition[];
-    /** Async callback function that executes the tool */
+    /**
+     * Async callback function that executes the tool.
+     * Receives tool parameters and optionally a ToolContext for sampling support.
+     *
+     * @example
+     * ```typescript
+     * // Simple tool without sampling
+     * cb: async ({ name }) => ({
+     *   content: [{ type: 'text', text: `Hello, ${name}!` }]
+     * })
+     *
+     * // Tool with sampling support
+     * cb: async ({ text }, ctx) => {
+     *   const result = await ctx.sample({
+     *     messages: [{ role: 'user', content: { type: 'text', text } }]
+     *   });
+     *   return { content: result.content };
+     * }
+     * ```
+     */
     cb: ToolCallback;
     /** Tool annotations */
     annotations?: ToolAnnotations;

package/dist/src/server/types/tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tool.d.ts","sourceRoot":"","sources":["../../../../src/server/types/tool.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAE1E,MAAM,MAAM,YAAY,GAAG,CACzB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KACxB,OAAO,CAAC,cAAc,CAAC,CAAC;AAE7B,MAAM,WAAW,cAAc;IAC7B,qCAAqC;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,0DAA0D;IAC1D,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,wCAAwC;IACxC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kCAAkC;IAClC,MAAM,CAAC,EAAE,eAAe,EAAE,CAAC;IAC3B,qDAAqD;IACrD,EAAE,EAAE,YAAY,CAAC;IACjB,uBAAuB;IACvB,WAAW,CAAC,EAAE,eAAe,CAAC;IAC9B,4BAA4B;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC"}
+{"version":3,"file":"tool.d.ts","sourceRoot":"","sources":["../../../../src/server/types/tool.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEpD;;;GAGG;AACH,MAAM,MAAM,YAAY,GAAG,CACzB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC3B,GAAG,CAAC,EAAE,WAAW,KACd,OAAO,CAAC,cAAc,CAAC,CAAC;AAE7B,MAAM,WAAW,cAAc;IAC7B,qCAAqC;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,0DAA0D;IAC1D,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,wCAAwC;IACxC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kCAAkC;IAClC,MAAM,CAAC,EAAE,eAAe,EAAE,CAAC;IAC3B;;;;;;;;;;;;;;;;;;;OAmBG;IACH,EAAE,EAAE,YAAY,CAAC;IACjB,uBAAuB;IACvB,WAAW,CAAC,EAAE,eAAe,CAAC;IAC9B,4BAA4B;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mcp-use",
   "type": "module",
-  "version": "1.5.1-canary.1",
+  "version": "1.5.1-canary.3",
   "description": "Opinionated MCP Framework for TypeScript (@modelcontextprotocol/sdk compatible) - Build MCP Agents and Clients + MCP Servers with support for MCP-UI.",
   "author": "mcp-use, Inc.",
   "license": "MIT",
@@ -115,8 +115,8 @@
     "ws": "^8.18.2",
     "zod": "^3.25.48",
     "zod-to-json-schema": "^3.24.6",
-    "@mcp-use/cli": "2.3.1-canary.1",
-    "@mcp-use/inspector": "0.7.1-canary.1"
+    "@mcp-use/cli": "2.3.1-canary.3",
+    "@mcp-use/inspector": "0.7.1-canary.3"
   },
   "optionalDependencies": {
     "@tailwindcss/vite": "^4.1.15",