@lobehub/lobehub 2.0.0-next.313 → 2.0.0-next.315

package/src/server/services/toolExecution/index.ts

@@ -1,6 +1,11 @@
 import { type ChatToolPayload } from '@lobechat/types';
+import { safeParseJSON } from '@lobechat/utils';
 import debug from 'debug';
 
+import { type CloudMCPParams, type ToolCallContent } from '@/libs/mcp';
+import { contentBlocksToString } from '@/server/services/mcp/contentProcessor';
+
+import { DiscoverService } from '../discover';
 import { type MCPService } from '../mcp';
 import { type PluginGatewayService } from '../pluginGateway';
 import { type BuiltinToolsExecutor } from './builtin';
@@ -121,12 +126,20 @@ export class ToolExecutionService {
       };
     }
 
-    // Construct MCPClientParams from the mcp config
-
-    log('Calling MCP service with params for: %s:%s', identifier, apiName);
+    log(
+      'Calling MCP service with params for: %s:%s (type: %s)',
+      identifier,
+      apiName,
+      mcpParams.type,
+    );
 
     try {
-      // Call the MCP service
+      // Check if this is a cloud MCP endpoint
+      if (mcpParams.type === 'cloud') {
+        return await this.executeCloudMCPTool(payload, context, mcpParams);
+      }
+
+      // For stdio/http/sse types, use standard MCP service
       const result = await this.mcpService.callTool({
         argsStr: args,
         clientParams: mcpParams,
@@ -152,6 +165,59 @@ export class ToolExecutionService {
       };
     }
   }
+
+  private async executeCloudMCPTool(
+    payload: ChatToolPayload,
+    context: ToolExecutionContext,
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    _mcpParams: CloudMCPParams,
+  ): Promise<ToolExecutionResult> {
+    const { identifier, apiName, arguments: args } = payload;
+
+    log('Executing Cloud MCP tool: %s:%s via cloud gateway', identifier, apiName);
+
+    try {
+      // Create DiscoverService with user context
+      const discoverService = new DiscoverService({
+        userInfo: context.userId ? { userId: context.userId } : undefined,
+      });
+
+      // Parse arguments
+      const apiParams = safeParseJSON(args) || {};
+
+      // Call cloud MCP endpoint via Market API
+      // Returns CloudGatewayResponse: { content: ToolCallContent[], isError?: boolean }
+      const cloudResult = await discoverService.callCloudMcpEndpoint({
+        apiParams,
+        identifier,
+        toolName: apiName,
+      });
+
+      const cloudResultContent = (cloudResult?.content ?? []) as ToolCallContent[];
+
+      // Convert content blocks to string (same as market router does)
+      const content = contentBlocksToString(cloudResultContent);
+      const state = { ...cloudResult, content: cloudResultContent };
+
+      log('Cloud MCP tool execution successful for: %s:%s', identifier, apiName);
+
+      return {
+        content,
+        state,
+        success: !cloudResult?.isError,
+      };
+    } catch (error) {
+      log('Cloud MCP tool execution failed for %s:%s: %O', identifier, apiName, error);
+      return {
+        content: (error as Error).message,
+        error: {
+          code: 'CLOUD_MCP_EXECUTION_ERROR',
+          message: (error as Error).message,
+        },
+        success: false,
+      };
+    }
+  }
 }
 
 export * from './types';

package/src/server/services/toolExecution/serverRuntimes/cloudSandbox.ts

@@ -3,6 +3,7 @@ import {
   CloudSandboxIdentifier,
 } from '@lobechat/builtin-tool-cloud-sandbox';
 
+import { FileService } from '@/server/services/file';
 import { MarketService } from '@/server/services/market';
 import { ServerSandboxService } from '@/server/services/sandbox';
 
@@ -18,8 +19,14 @@ export const cloudSandboxRuntime: ServerRuntimeRegistration = {
       throw new Error('userId and topicId are required for Cloud Sandbox execution');
     }
 
+    if (!context.serverDB) {
+      throw new Error('serverDB is required for Cloud Sandbox execution');
+    }
+
     const marketService = new MarketService({ userInfo: { userId: context.userId } });
+    const fileService = new FileService(context.serverDB, context.userId);
     const sandboxService = new ServerSandboxService({
+      fileService,
       marketService,
       topicId: context.topicId,
       userId: context.userId,

package/src/services/electron/system.ts

@@ -1,6 +1,6 @@
 import type {
   ElectronAppState,
-  WindowResizableParams,
+  WindowMinimumSizeParams,
   WindowSizeParams,
 } from '@lobechat/electron-client-ipc';
 
@@ -36,14 +36,14 @@ class ElectronSystemService {
     return this.ipc.windows.minimizeWindow();
   }
 
-  async setWindowResizable(params: WindowResizableParams): Promise<void> {
-    return this.ipc.windows.setWindowResizable(params);
-  }
-
   async setWindowSize(params: WindowSizeParams): Promise<void> {
     return this.ipc.windows.setWindowSize(params);
   }
 
+  async setWindowMinimumSize(params: WindowMinimumSizeParams): Promise<void> {
+    return this.ipc.windows.setWindowMinimumSize(params);
+  }
+
   async openExternalLink(url: string): Promise<void> {
     return this.ipc.system.openExternalLink(url);
   }