@flutchai/flutch-sdk 0.4.1 → 0.5.0

package/dist/index.cjs

@@ -4489,7 +4489,8 @@ async function executeToolWithAttachments(params) {
     injectIntoArg = "data",
     sourceAttachmentId,
     threadId,
-    toolSchema
+    toolSchema,
+    mcpServers
   } = params;
   const argsWithInjection = { ...enrichedArgs };
   try {
@@ -4520,7 +4521,8 @@ async function executeToolWithAttachments(params) {
     toolCall.name,
     argsWithInjection,
     executionContext,
-    config
+    config,
+    mcpServers
   );
   try {
     if (success && rawResult !== void 0 && content.length > threshold) {
@@ -6380,12 +6382,13 @@ var McpToolFilter = class _McpToolFilter {
    * @param toolsConfig Array of tool configurations with dynamic config
    * @returns Array of LangChain Tool instances with dynamic schemas
    */
-  async getFilteredTools(toolsConfig = []) {
+  async getFilteredTools(toolsConfig = [], mcpServers, context) {
     this.logger.debug(
       `[DEBUG] Getting filtered tools with dynamic schemas. Config: ${JSON.stringify(toolsConfig)}`
     );
     this.logger.debug(`[DEBUG] MCP Runtime URL: ${this.mcpRuntimeUrl}`);
-    if (toolsConfig.length === 0) {
+    const hasInlineServers = !!(mcpServers && mcpServers.length > 0);
+    if (toolsConfig.length === 0 && !hasInlineServers) {
       this.logger.debug("No tools configured, returning empty array");
       return [];
     }
@@ -6393,10 +6396,13 @@ var McpToolFilter = class _McpToolFilter {
       this.logger.debug(
         `[DEBUG] Making HTTP POST request to: ${this.mcpRuntimeUrl}/tools/schemas`
       );
-      this.logger.debug(`[DEBUG] Request body: ${JSON.stringify(toolsConfig)}`);
+      const requestBody = { tools: toolsConfig };
+      if (hasInlineServers) requestBody.mcpServers = mcpServers;
+      if (context) requestBody.context = context;
+      this.logger.debug(`[DEBUG] Request body: ${JSON.stringify(requestBody)}`);
       const response = await axios2__default.default.post(
         `${this.mcpRuntimeUrl}/tools/schemas`,
-        { tools: toolsConfig },
+        requestBody,
         {
           timeout: 5e3,
           headers: {
@@ -6413,14 +6419,14 @@ var McpToolFilter = class _McpToolFilter {
       );
       const mcpClient = {
         getTools: async () => dynamicTools,
-        executeTool: async (name, args, context) => {
+        executeTool: async (name, args, context2) => {
           this.logger.debug(`[DEBUG] Executing tool ${name} with args:`, args);
           const response2 = await axios2__default.default.post(
             `${this.mcpRuntimeUrl}/tools/execute`,
             {
               name,
               arguments: args || {},
-              context
+              context: context2
             }
           );
           return response2.data;
@@ -6559,7 +6565,7 @@ exports.McpRuntimeHttpClient = class McpRuntimeHttpClient {
   /**
    * Execute a tool by name with given arguments
    */
-  async executeTool(name, args, context) {
+  async executeTool(name, args, context, mcpServers) {
     try {
       this.logger.debug(`Executing tool: ${name} with args:`, args);
       const payload = {
@@ -6569,6 +6575,9 @@ exports.McpRuntimeHttpClient = class McpRuntimeHttpClient {
       if (context) {
         payload.context = context;
       }
+      if (mcpServers && mcpServers.length > 0) {
+        payload.mcpServers = mcpServers;
+      }
       const response = await this.httpClient.post("/tools/execute", payload);
       this.logger.log(`Tool ${name} executed successfully`);
       return response.data;
@@ -6619,7 +6628,7 @@ exports.McpRuntimeHttpClient = class McpRuntimeHttpClient {
    * @param config - RunnableConfig with callbacks
    * @returns Tool execution result with content
    */
-  async executeToolWithEvents(toolCallId, toolName, enrichedArgs, executionContext, config) {
+  async executeToolWithEvents(toolCallId, toolName, enrichedArgs, executionContext, config, mcpServers) {
     const parsedConfig = manager.parseCallbackConfigArg(config);
     const callbackManager = manager.CallbackManager.configure(parsedConfig.callbacks);
     let runManager;
@@ -6641,7 +6650,8 @@ exports.McpRuntimeHttpClient = class McpRuntimeHttpClient {
       const result = await this.executeTool(
         toolName,
         enrichedArgs,
-        executionContext
+        executionContext,
+        mcpServers
       );
       const content = result.success ? JSON.stringify(result) : result.error || JSON.stringify(result);
       await runManager?.handleToolEnd(content);
@@ -6850,13 +6860,17 @@ var ModelInitializer = class _ModelInitializer {
    * Example: "model123:0.7:4096" or "model123:0.7:4096:a1b2c3d4e5f6g7h8"
    */
   generateModelCacheKey(config) {
-    return generateModelCacheKey(
+    const base = generateModelCacheKey(
       config.modelId,
       config.temperature,
       config.maxTokens,
       config.toolsConfig,
       config.baseURL
     );
+    if (config.mcpServers && config.mcpServers.length > 0) {
+      return `${base}:mcp:${JSON.stringify(config.mcpServers)}`;
+    }
+    return base;
   }
   // Chat model creators
   chatModelCreators = {
@@ -7132,11 +7146,13 @@ var ModelInitializer = class _ModelInitializer {
       ...model.metadata,
       modelId: config.modelId
     };
-    if (config.toolsConfig || config.customTools) {
+    if (config.toolsConfig || config.customTools || config.mcpServers && config.mcpServers.length > 0) {
       const boundModel = await this.bindToolsToModel(
         model,
         config.toolsConfig,
-        config.customTools
+        config.customTools,
+        config.mcpServers,
+        config.mcpContext
       );
       this.modelInstanceCache.set(cacheKey, boundModel);
       return boundModel;
@@ -7153,24 +7169,27 @@ var ModelInitializer = class _ModelInitializer {
    * - Runnable when tools are bound (model.bindTools returns Runnable)
    * - BaseChatModel when no tools
    */
-  async bindToolsToModel(model, toolsConfig, customTools) {
+  async bindToolsToModel(model, toolsConfig, customTools, mcpServers, mcpContext) {
     const allTools = [];
-    if (toolsConfig && toolsConfig.length > 0) {
+    const enabledToolsConfig = (toolsConfig || []).filter(
+      (tc) => tc.enabled !== false
+    );
+    const hasInlineServers = !!(mcpServers && mcpServers.length > 0);
+    if (enabledToolsConfig.length > 0 || hasInlineServers) {
       try {
-        const enabledToolsConfig = toolsConfig.filter(
-          (tc) => tc.enabled !== false
+        this.logger.debug(
+          `Fetching ${enabledToolsConfig.length} tools (+${mcpServers?.length || 0} inline server(s)) with dynamic schemas from MCP Runtime`
         );
-        if (enabledToolsConfig.length > 0) {
-          this.logger.debug(
-            `Fetching ${enabledToolsConfig.length} tools with dynamic schemas from MCP Runtime: ${enabledToolsConfig.map((tc) => tc.toolName).join(", ")}`
-          );
-          const mcpToolFilter = new McpToolFilter();
-          const mcpTools = await mcpToolFilter.getFilteredTools(enabledToolsConfig);
-          this.logger.debug(
-            `Successfully fetched ${mcpTools.length} tools with dynamic schemas from MCP Runtime`
-          );
-          allTools.push(...mcpTools);
-        }
+        const mcpToolFilter = new McpToolFilter();
+        const mcpTools = await mcpToolFilter.getFilteredTools(
+          enabledToolsConfig,
+          mcpServers,
+          mcpContext
+        );
+        this.logger.debug(
+          `Successfully fetched ${mcpTools.length} tools with dynamic schemas from MCP Runtime`
+        );
+        allTools.push(...mcpTools);
       } catch (error) {
         this.logger.error(
           `Failed to fetch tools from MCP Runtime: ${error instanceof Error ? error.message : String(error)}`