@lobehub/lobehub 2.0.0-next.27 → 2.0.0-next.29

package/src/store/chat/slices/thread/action.test.ts

@@ -764,7 +764,7 @@ describe('thread action', () => {
 
         const createMessageSpy = vi
           .spyOn(result.current, 'internal_createMessage')
-          .mockResolvedValue('new-msg-id');
+          .mockResolvedValue({ id: 'new-msg-id', messages: [] });
         const coreProcessSpy = vi
           .spyOn(result.current, 'internal_coreProcessMessage')
           .mockResolvedValue();
@@ -803,7 +803,10 @@ describe('thread action', () => {
           });
         });
 
-        vi.spyOn(result.current, 'internal_createMessage').mockResolvedValue('new-msg-id');
+        vi.spyOn(result.current, 'internal_createMessage').mockResolvedValue({
+          id: 'new-msg-id',
+          messages: [],
+        });
         vi.spyOn(result.current, 'internal_coreProcessMessage').mockResolvedValue();
         vi.spyOn(result.current, 'internal_createTmpMessage').mockReturnValue('temp-msg-id');
         vi.spyOn(result.current, 'internal_toggleMessageLoading');
@@ -833,7 +836,10 @@ describe('thread action', () => {
           });
         });
 
-        vi.spyOn(result.current, 'internal_createMessage').mockResolvedValue('new-msg-id');
+        vi.spyOn(result.current, 'internal_createMessage').mockResolvedValue({
+          id: 'new-msg-id',
+          messages: [],
+        });
         vi.spyOn(result.current, 'internal_coreProcessMessage').mockResolvedValue();
         vi.spyOn(result.current, 'internal_createTmpMessage').mockReturnValue('temp-msg-id');
         vi.spyOn(result.current, 'internal_toggleMessageLoading');
@@ -855,7 +861,10 @@ describe('thread action', () => {
         });
 
         vi.spyOn(result.current, 'internal_shouldUseRAG').mockReturnValue(true);
-        vi.spyOn(result.current, 'internal_createMessage').mockResolvedValue('new-msg-id');
+        vi.spyOn(result.current, 'internal_createMessage').mockResolvedValue({
+          id: 'new-msg-id',
+          messages: [],
+        });
         vi.spyOn(result.current, 'internal_createTmpMessage').mockReturnValue('temp-msg-id');
         vi.spyOn(result.current, 'internal_toggleMessageLoading');
 

package/src/store/chat/slices/thread/action.ts

@@ -158,7 +158,9 @@ export const chatThreadMessage: StateCreator<
       tempMessageId = get().internal_createTmpMessage(newMessage);
       get().internal_toggleMessageLoading(true, tempMessageId);
 
-      parentMessageId = await get().internal_createMessage(newMessage, { tempMessageId });
+      const result = await get().internal_createMessage(newMessage, { tempMessageId });
+      if (!result) return;
+      parentMessageId = result.id;
     }
 
     get().internal_toggleMessageLoading(false, tempMessageId);

package/src/store/tool/slices/mcpStore/action.test.ts

@@ -20,6 +20,44 @@ vi.mock('@/utils/sleep', () => ({
   sleep: vi.fn().mockResolvedValue(undefined),
 }));
 
+const ORIGINAL_DESKTOP_ENV = process.env.NEXT_PUBLIC_IS_DESKTOP_APP;
+
+const bootstrapToolStoreWithDesktop = async (isDesktopEnv: boolean) => {
+  vi.resetModules();
+  vi.mock('zustand/traditional');
+  process.env.NEXT_PUBLIC_IS_DESKTOP_APP = isDesktopEnv ? '1' : '0';
+
+  vi.doMock('@lobechat/const', async () => {
+    const actual = await vi.importActual<typeof import('@lobechat/const')>('@lobechat/const');
+    return {
+      ...actual,
+      isDesktop: isDesktopEnv,
+    };
+  });
+
+  const storeModule = await import('@/store/tool');
+  const discoverModule = await import('@/services/discover');
+  const helpersModule = await import('@/store/global/helpers');
+
+  const cleanup = () => {
+    vi.resetModules();
+    vi.doUnmock('@lobechat/const');
+    vi.mock('zustand/traditional');
+    if (ORIGINAL_DESKTOP_ENV === undefined) {
+      delete process.env.NEXT_PUBLIC_IS_DESKTOP_APP;
+    } else {
+      process.env.NEXT_PUBLIC_IS_DESKTOP_APP = ORIGINAL_DESKTOP_ENV;
+    }
+  };
+
+  return {
+    useToolStore: storeModule.useToolStore,
+    discoverService: discoverModule.discoverService,
+    globalHelpers: helpersModule.globalHelpers,
+    cleanup,
+  };
+};
+
 beforeEach(() => {
   vi.clearAllMocks();
 
@@ -48,6 +86,14 @@ afterEach(() => {
   vi.restoreAllMocks();
 });
 
+afterAll(() => {
+  if (ORIGINAL_DESKTOP_ENV === undefined) {
+    delete process.env.NEXT_PUBLIC_IS_DESKTOP_APP;
+  } else {
+    process.env.NEXT_PUBLIC_IS_DESKTOP_APP = ORIGINAL_DESKTOP_ENV;
+  }
+});
+
 describe('mcpStore actions', () => {
   describe('updateMCPInstallProgress', () => {
     it('should update install progress for an identifier', () => {
@@ -487,7 +533,9 @@ describe('mcpStore actions', () => {
         expect(result.current.data).toEqual(mockData);
       });
 
-      expect(discoverService.getMCPPluginList).toHaveBeenCalledWith({ page: 1, pageSize: 20 });
+      expect(discoverService.getMCPPluginList).toHaveBeenCalledWith(
+        expect.objectContaining({ page: 1, pageSize: 20, connectionType: 'http' }),
+      );
 
       const state = useToolStore.getState();
       expect(state.mcpPluginItems).toEqual(mockData.items);
@@ -542,7 +590,9 @@ describe('mcpStore actions', () => {
       renderHook(() => useToolStore.getState().useFetchMCPPluginList(params));
 
       await waitFor(() => {
-        expect(discoverService.getMCPPluginList).toHaveBeenCalledWith(params);
+        expect(discoverService.getMCPPluginList).toHaveBeenCalledWith(
+          expect.objectContaining({ ...params, connectionType: 'http' }),
+        );
       });
     });
 
@@ -561,9 +611,51 @@ describe('mcpStore actions', () => {
       renderHook(() => useToolStore.getState().useFetchMCPPluginList(params));
 
       await waitFor(() => {
-        expect(discoverService.getMCPPluginList).toHaveBeenCalledWith(params);
+        expect(discoverService.getMCPPluginList).toHaveBeenCalledWith(
+          expect.objectContaining({ ...params, connectionType: 'http' }),
+        );
       });
     });
+
+    it('should not append connectionType in desktop environment', async () => {
+      const {
+        useToolStore: desktopStore,
+        discoverService: desktopDiscoverService,
+        globalHelpers: desktopGlobalHelpers,
+        cleanup,
+      } = await bootstrapToolStoreWithDesktop(true);
+
+      const mockData = {
+        items: [{ identifier: 'desktop-plugin', name: 'Desktop Plugin' }] as PluginItem[],
+        categories: [],
+        totalCount: 1,
+        totalPages: 1,
+        currentPage: 1,
+        pageSize: 20,
+      };
+
+      try {
+        vi.spyOn(desktopGlobalHelpers, 'getCurrentLanguage').mockReturnValue('en-US');
+        const fetchSpy = vi
+          .spyOn(desktopDiscoverService, 'getMCPPluginList')
+          .mockResolvedValue(mockData);
+
+        const { result } = renderHook(() =>
+          desktopStore.getState().useFetchMCPPluginList({ page: 1, pageSize: 20 }),
+        );
+
+        await waitFor(() => {
+          expect(result.current.data).toEqual(mockData);
+        });
+
+        expect(fetchSpy).toHaveBeenCalledTimes(1);
+        const [firstCallArgs] = fetchSpy.mock.calls[0];
+        expect(firstCallArgs).toMatchObject({ page: 1, pageSize: 20 });
+        expect(firstCallArgs.connectionType).toBeUndefined();
+      } finally {
+        cleanup();
+      }
+    });
   });
 
   describe('installMCPPlugin', () => {

package/src/store/tool/slices/mcpStore/action.ts

@@ -1,19 +1,21 @@
 import { LobeChatPluginManifest } from '@lobehub/chat-plugin-sdk';
 import { PluginItem, PluginListResponse } from '@lobehub/market-sdk';
 import { TRPCClientError } from '@trpc/client';
+import debug from 'debug';
 import { produce } from 'immer';
 import { uniqBy } from 'lodash-es';
 import { gt, valid } from 'semver';
 import useSWR, { SWRResponse } from 'swr';
 import { StateCreator } from 'zustand/vanilla';
 
-import { CURRENT_VERSION } from '@/const/version';
+import { CURRENT_VERSION, isDesktop } from '@lobechat/const';
 import { MCPErrorData } from '@/libs/mcp/types';
 import { discoverService } from '@/services/discover';
 import { mcpService } from '@/services/mcp';
 import { pluginService } from '@/services/plugin';
 import { globalHelpers } from '@/store/global/helpers';
 import { mcpStoreSelectors } from '@/store/tool/selectors';
+import { McpConnectionType } from '@/types/discover';
 import {
   CheckMcpInstallResult,
   MCPErrorInfo,
@@ -28,8 +30,41 @@ import { setNamespace } from '@/utils/storeDebug';
 import { ToolStore } from '../../store';
 import { MCPStoreState } from './initialState';
 
+const log = debug('lobe-mcp:store:action');
+
 const n = setNamespace('mcpStore');
 
+const doesConfigSchemaRequireInput = (configSchema?: any) => {
+  if (!configSchema) return false;
+
+  const hasRequiredArray =
+    Array.isArray(configSchema.required) && configSchema.required.some(Boolean);
+
+  const hasRequiredProperty =
+    !!configSchema.properties &&
+    Object.values(configSchema.properties).some(
+      (property: any) => property && property.required === true,
+    );
+
+  return hasRequiredArray || hasRequiredProperty;
+};
+
+const toNonEmptyStringRecord = (input?: Record<string, any>) => {
+  if (!input) return undefined;
+
+  const entries = Object.entries(input).filter(
+    ([, value]) => value !== undefined && value !== null,
+  );
+
+  if (entries.length === 0) return undefined;
+
+  return entries.reduce<Record<string, string>>((acc, [key, value]) => {
+    acc[key] = typeof value === 'string' ? value : String(value);
+
+    return acc;
+  }, {});
+};
+
 // 测试连接结果类型
 export interface TestMcpConnectionResult {
   error?: string;
@@ -101,6 +136,7 @@ export const createMCPPluginStoreSlice: StateCreator<
 
   installMCPPlugin: async (identifier, options = {}) => {
     const { resume = false, config, skipDepsCheck } = options;
+    const normalizedConfig = toNonEmptyStringRecord(config);
     let plugin = mcpStoreSelectors.getPluginById(identifier)(get());
 
     if (!plugin || !plugin.manifestUrl) {
@@ -149,12 +185,8 @@ export const createMCPPluginStoreSlice: StateCreator<
         }
 
         data = configInfo.manifest;
-        connection = {
-          ...configInfo.connection,
-          config, // 合并用户提供的配置
-        };
+        connection = configInfo.connection ? { ...configInfo.connection } : undefined;
         result = configInfo.checkResult;
-        connection = configInfo.connection;
       } else {
         // 正常模式：从头开始安装
 
@@ -175,59 +207,137 @@ export const createMCPPluginStoreSlice: StateCreator<
           install: true,
         });
 
-        // 步骤 2: 检查安装环境
-        updateMCPInstallProgress(identifier, {
-          progress: 30,
-          step: MCPInstallStep.CHECKING_INSTALLATION,
+        const deploymentOptions: any[] = Array.isArray(data.deploymentOptions)
+          ? data.deploymentOptions
+          : [];
+
+        const httpOption = deploymentOptions.find(
+          (option) => option?.connection?.url && option?.connection?.type === 'http',
+        ) ||
+          deploymentOptions.find(
+            (option) => option?.connection?.url && !option?.connection?.type,
+          );
+
+        const hasNonHttpDeployment = deploymentOptions.some((option) => {
+          const type = option?.connection?.type;
+          if (!type && option?.connection?.url) return false;
+
+          return type && type !== 'http';
         });
 
-        // 检查是否已被取消
-        if (abortController.signal.aborted) {
-          return;
-        }
+        const shouldUseHttpDeployment = !!httpOption && (!hasNonHttpDeployment || !isDesktop);
 
-        result = await mcpService.checkInstallation(data, abortController.signal);
+        if (shouldUseHttpDeployment && httpOption) {
+          // ✅ HTTP 类型：跳过系统依赖检查，直接使用 URL
+          log('HTTP MCP detected, skipping system dependency check');
 
-        if (!result.success) {
-          updateMCPInstallProgress(identifier, undefined);
-          return;
-        }
+          connection = {
+            auth: httpOption.connection?.auth || { type: 'none' },
+            headers: httpOption.connection?.headers,
+            type: 'http',
+            url: httpOption.connection?.url,
+          };
+
+          log('Using HTTP connection: %O', { type: connection.type, url: connection.url });
 
-        // 步骤 3: 检查系统依赖是否满足
-        if (!skipDepsCheck && !result.allDependenciesMet) {
-          // 依赖不满足，暂停安装流程并显示依赖安装引导
+          const configSchema = httpOption.connection?.configSchema;
+          const needsConfig = doesConfigSchemaRequireInput(configSchema);
+
+          if (needsConfig && !normalizedConfig) {
+            updateMCPInstallProgress(identifier, {
+              configSchema,
+              connection,
+              manifest: data,
+              needsConfig: true,
+              progress: 50,
+              step: MCPInstallStep.CONFIGURATION_REQUIRED,
+            });
+
+            updateInstallLoadingState(identifier, undefined);
+            return false;
+          }
+        } else {
+          // ❌ stdio 类型：需要完整的系统依赖检查流程
+
+          // 步骤 2: 检查安装环境
           updateMCPInstallProgress(identifier, {
-            connection: result.connection,
-            manifest: data,
-            progress: 40,
-            step: MCPInstallStep.DEPENDENCIES_REQUIRED,
-            systemDependencies: result.systemDependencies,
+            progress: 30,
+            step: MCPInstallStep.CHECKING_INSTALLATION,
           });
 
-          // 暂停安装流程，等待用户安装依赖
-          updateInstallLoadingState(identifier, undefined);
-          return false; // 返回 false 表示需要安装依赖
+          // 检查是否已被取消
+          if (abortController.signal.aborted) {
+            return;
+          }
+
+          result = await mcpService.checkInstallation(data, abortController.signal);
+
+          if (!result.success) {
+            updateMCPInstallProgress(identifier, undefined);
+            return;
+          }
+
+          // 步骤 3: 检查系统依赖是否满足
+          if (!skipDepsCheck && !result.allDependenciesMet) {
+            // 依赖不满足，暂停安装流程并显示依赖安装引导
+            updateMCPInstallProgress(identifier, {
+              connection: result.connection,
+              manifest: data,
+              progress: 40,
+              step: MCPInstallStep.DEPENDENCIES_REQUIRED,
+              systemDependencies: result.systemDependencies,
+            });
+
+            // 暂停安装流程，等待用户安装依赖
+            updateInstallLoadingState(identifier, undefined);
+            return false; // 返回 false 表示需要安装依赖
+          }
+
+          // 步骤 4: 检查是否需要配置
+          if (result.needsConfig) {
+            // 需要配置，暂停安装流程
+            updateMCPInstallProgress(identifier, {
+              checkResult: result,
+              configSchema: result.configSchema,
+              connection: result.connection,
+              manifest: data,
+              needsConfig: true,
+              progress: 50,
+              step: MCPInstallStep.CONFIGURATION_REQUIRED,
+            });
+
+            // 暂停安装流程，等待用户配置
+            updateInstallLoadingState(identifier, undefined);
+            return false; // 返回 false 表示需要配置
+          }
+
+          connection = result.connection;
         }
+      }
 
-        // 步骤 4: 检查是否需要配置
-        if (result.needsConfig) {
-          // 需要配置，暂停安装流程
-          updateMCPInstallProgress(identifier, {
-            checkResult: result,
-            configSchema: result.configSchema,
-            connection: result.connection,
-            manifest: data,
-            needsConfig: true,
-            progress: 50,
-            step: MCPInstallStep.CONFIGURATION_REQUIRED,
-          });
+      let mergedHttpHeaders: Record<string, string> | undefined;
+      let mergedStdioEnv: Record<string, string> | undefined;
+
+      if (connection?.type === 'http') {
+        const baseHeaders = toNonEmptyStringRecord(connection.headers);
 
-          // 暂停安装流程，等待用户配置
-          updateInstallLoadingState(identifier, undefined);
-          return false; // 返回 false 表示需要配置
+        if (baseHeaders || normalizedConfig) {
+          mergedHttpHeaders = {
+            ...baseHeaders,
+            ...normalizedConfig,
+          };
         }
+      }
+
+      if (connection?.type === 'stdio') {
+        const baseEnv = toNonEmptyStringRecord(connection.env);
 
-        connection = result.connection;
+        if (baseEnv || normalizedConfig) {
+          mergedStdioEnv = {
+            ...baseEnv,
+            ...normalizedConfig,
+          };
+        }
       }
 
       // 获取服务器清单逻辑
@@ -251,7 +361,7 @@ export const createMCPPluginStoreSlice: StateCreator<
           {
             args: connection.args,
             command: connection.command!,
-            env: config,
+            env: mergedStdioEnv,
             name: identifier, // 将配置作为环境变量传递（resume 模式下）
           },
           { avatar: plugin.icon, description: plugin.description, name: data.name },
@@ -261,6 +371,8 @@ export const createMCPPluginStoreSlice: StateCreator<
       if (connection?.type === 'http') {
         manifest = await mcpService.getStreamableMcpServerManifest(
           {
+            auth: connection.auth,
+            headers: mergedHttpHeaders,
             identifier,
             metadata: {
               avatar: plugin.icon,
@@ -318,7 +430,7 @@ export const createMCPPluginStoreSlice: StateCreator<
         customParams: { mcp: connection },
         identifier: plugin.identifier,
         manifest: manifest,
-        settings: config,
+        settings: normalizedConfig,
         type: 'plugin',
       });
 
@@ -347,7 +459,7 @@ export const createMCPPluginStoreSlice: StateCreator<
           resources: (manifest as any).resources,
           tools: (manifest as any).tools,
         },
-        platform: result!.platform,
+        platform: result?.platform || process.platform,
         success: true,
         userAgent,
         version: manifest.version || data.version,
@@ -423,7 +535,7 @@ export const createMCPPluginStoreSlice: StateCreator<
         installDurationMs,
         installParams: connection,
         metadata: errorInfo.metadata,
-        platform: result!.platform,
+        platform: result?.platform || process.platform,
         success: false,
         userAgent,
         version: data?.version,
@@ -581,10 +693,22 @@ export const createMCPPluginStoreSlice: StateCreator<
 
   useFetchMCPPluginList: (params) => {
     const locale = globalHelpers.getCurrentLanguage();
+    const requestParams = isDesktop ? params : { ...params, connectionType: McpConnectionType.http };
+    const swrKeyParts = [
+      'useFetchMCPPluginList',
+      locale,
+      requestParams.page,
+      requestParams.pageSize,
+      requestParams.q,
+      requestParams.connectionType,
+    ];
+    const swrKey = swrKeyParts.filter((part) => part !== undefined && part !== null && part !== '')
+      .join('-');
+    const page = requestParams.page ?? 1;
 
     return useSWR<PluginListResponse>(
-      ['useFetchMCPPluginList', locale, ...Object.values(params)].filter(Boolean).join('-'),
-      () => discoverService.getMCPPluginList(params),
+      swrKey,
+      () => discoverService.getMCPPluginList(requestParams),
       {
         onSuccess(data) {
           set(
@@ -602,7 +726,7 @@ export const createMCPPluginStoreSlice: StateCreator<
               }
 
               // 累积数据逻辑
-              if (params.page === 1) {
+              if (page === 1) {
                 // 第一页，直接设置
                 draft.mcpPluginItems = uniqBy(data.items, 'identifier');
               } else {

package/src/store/tool/slices/oldStore/initialState.ts

@@ -1,4 +1,3 @@
-import { isDesktop } from '@/const/version';
 import { DiscoverPluginItem } from '@/types/discover';
 
 export type PluginInstallLoadingMap = Record<string, boolean | undefined>;
@@ -47,7 +46,7 @@ export const initialPluginStoreState: PluginStoreState = {
   // Plugin list state management initial values
   currentPluginPage: 1,
   displayMode: 'grid',
-  listType: isDesktop ? PluginStoreTabs.MCP : PluginStoreTabs.Plugin,
+  listType: PluginStoreTabs.MCP,
   oldPluginItems: [],
   pluginInstallLoading: {},
   pluginInstallProgress: {},