@lobehub/lobehub 2.0.0-next.5 → 2.0.0-next.50

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: {},

package/src/store/user/initialState.ts

@@ -1,19 +1,13 @@
 import { UserAuthState, initialAuthState } from './slices/auth/initialState';
 import { CommonState, initialCommonState } from './slices/common/initialState';
-import { ModelListState, initialModelListState } from './slices/modelList/initialState';
 import { UserPreferenceState, initialPreferenceState } from './slices/preference/initialState';
 import { UserSettingsState, initialSettingsState } from './slices/settings/initialState';
 
-export type UserState = UserSettingsState &
-  UserPreferenceState &
-  UserAuthState &
-  ModelListState &
-  CommonState;
+export type UserState = UserSettingsState & UserPreferenceState & UserAuthState & CommonState;
 
 export const initialState: UserState = {
   ...initialSettingsState,
   ...initialPreferenceState,
   ...initialAuthState,
   ...initialCommonState,
-  ...initialModelListState,
 };

package/src/store/user/selectors.ts

@@ -1,11 +1,7 @@
 export { authSelectors, userProfileSelectors } from './slices/auth/selectors';
+export { labPreferSelectors, preferenceSelectors } from './slices/preference/selectors';
 export {
   keyVaultsConfigSelectors,
-  modelConfigSelectors,
-  modelProviderSelectors,
-} from './slices/modelList/selectors';
-export { preferenceSelectors } from './slices/preference/selectors';
-export {
   settingsSelectors,
   systemAgentSelectors,
   userGeneralSettingsSelectors,

package/src/store/user/slices/common/action.test.ts

@@ -4,7 +4,6 @@ import { withSWR } from '~test-utils';
 
 import { DEFAULT_PREFERENCE } from '@/const/user';
 import { userService } from '@/services/user';
-import { ClientService } from '@/services/user/_deprecated';
 import { useUserStore } from '@/store/user';
 import { preferenceSelectors } from '@/store/user/selectors';
 import { GlobalServerConfig } from '@/types/serverConfig';
@@ -31,9 +30,7 @@ describe('createCommonSlice', () => {
       const avatar = 'data:image/png;base64,';
 
       const spyOn = vi.spyOn(result.current, 'refreshUserState');
-      const updateAvatarSpy = vi
-        .spyOn(ClientService.prototype, 'updateAvatar')
-        .mockResolvedValue(undefined);
+      const updateAvatarSpy = vi.spyOn(userService, 'updateAvatar').mockResolvedValue({} as any);
 
       await act(async () => {
         await result.current.updateAvatar(avatar);

package/src/store/user/slices/common/action.ts

@@ -24,6 +24,7 @@ const GET_USER_STATE_KEY = 'initUserState';
 export interface CommonAction {
   refreshUserState: () => Promise<void>;
   updateAvatar: (avatar: string) => Promise<void>;
+  updateKeyVaultConfig: (provider: string, config: any) => Promise<void>;
   useCheckTrace: (shouldFetch: boolean) => SWRResponse;
   useInitUserState: (
     isLogin: boolean | undefined,
@@ -50,6 +51,10 @@ export const createCommonSlice: StateCreator<
     await get().refreshUserState();
   },
 
+  updateKeyVaultConfig: async (provider, config) => {
+    await get().setSettings({ keyVaults: { [provider]: config } });
+  },
+
   useCheckTrace: (shouldFetch) =>
     useSWR<boolean>(
       shouldFetch ? 'checkTrace' : null,
@@ -65,7 +70,6 @@ export const createCommonSlice: StateCreator<
         revalidateOnFocus: false,
       },
     ),
-
   useInitUserState: (isLogin, serverConfig, options) =>
     useOnlyFetchOnceSWR<UserInitializationState>(
       !!isLogin ? GET_USER_STATE_KEY : null,
@@ -79,7 +83,6 @@ export const createCommonSlice: StateCreator<
             const serverSettings: PartialDeep<UserSettings> = {
               defaultAgent: serverConfig.defaultAgent,
               image: serverConfig.image,
-              languageModel: serverConfig.languageModel,
               systemAgent: serverConfig.systemAgent,
             };
 
@@ -112,7 +115,6 @@ export const createCommonSlice: StateCreator<
                 isUserHasConversation: data.hasConversation,
                 isUserStateInit: true,
                 preference,
-                serverLanguageModel: serverConfig.languageModel,
                 settings: data.settings || {},
                 subscriptionPlan: data.subscriptionPlan,
                 user,
@@ -128,7 +130,6 @@ export const createCommonSlice: StateCreator<
               lastName: data.lastName,
               username: data.username,
             });
-            get().refreshDefaultModelProviderList({ trigger: 'fetchUserState' });
           }
         },
       },

package/src/store/user/slices/preference/action.ts

@@ -2,7 +2,7 @@ import type { StateCreator } from 'zustand/vanilla';
 
 import { userService } from '@/services/user';
 import type { UserStore } from '@/store/user';
-import { UserGuide, UserPreference } from '@/types/user';
+import { UserGuide, UserLab, UserPreference } from '@/types/user';
 import { merge } from '@/utils/merge';
 import { setNamespace } from '@/utils/storeDebug';
 
@@ -10,6 +10,7 @@ const n = setNamespace('preference');
 
 export interface PreferenceAction {
   updateGuideState: (guide: Partial<UserGuide>) => Promise<void>;
+  updateLab: (lab: Partial<UserLab>) => Promise<void>;
   updatePreference: (preference: Partial<UserPreference>, action?: any) => Promise<void>;
 }
 
@@ -25,6 +26,12 @@ export const createPreferenceSlice: StateCreator<
     await updatePreference({ guide: nextGuide });
   },
 
+  updateLab: async (lab) => {
+    const { updatePreference } = get();
+    const nextLab = merge(get().preference.lab, lab);
+    await updatePreference({ lab: nextLab }, n('updateLab'));
+  },
+
   updatePreference: async (preference, action) => {
     const nextPreference = merge(get().preference, preference);
 

package/src/store/user/slices/preference/selectors/index.ts

@@ -0,0 +1,2 @@
+export * from './labPrefer';
+export * from './preference';

package/src/store/user/slices/preference/selectors/labPrefer.ts

@@ -0,0 +1,10 @@
+import { DEFAULT_PREFERENCE } from '@lobechat/const';
+
+import type { UserState } from '@/store/user/initialState';
+
+export const labPreferSelectors = {
+  enableGroupChat: (s: UserState): boolean =>
+    s.preference.lab?.enableGroupChat ?? DEFAULT_PREFERENCE.lab!.enableGroupChat!,
+  enableInputMarkdown: (s: UserState): boolean =>
+    s.preference.lab?.enableInputMarkdown ?? DEFAULT_PREFERENCE.lab!.enableInputMarkdown!,
+};

package/src/store/user/slices/preference/{selectors.ts → selectors/preference.ts}

@@ -21,10 +21,8 @@ const shouldTriggerFileInKnowledgeBaseTip = (s: UserStore) =>
 const isPreferenceInit = (s: UserStore) => s.isUserStateInit;
 
 export const preferenceSelectors = {
-  enableGroupChat: (s: UserStore) => s.preference.enableGroupChat || false,
   hideSettingsMoveGuide,
   hideSyncAlert,
-  inputMarkdownRender: (s: UserStore) => !s.preference.disableInputMarkdownRender,
   isPreferenceInit,
   shouldTriggerFileInKnowledgeBaseTip,
   showUploadFileInKnowledgeBaseTip,

package/src/store/user/slices/settings/action.ts

@@ -18,6 +18,7 @@ import { difference } from '@/utils/difference';
 import { merge } from '@/utils/merge';
 
 export interface UserSettingsAction {
+  addToolToAllowList: (toolKey: string) => Promise<void>;
   importAppSettings: (settings: UserSettings) => Promise<void>;
   importUrlShareSettings: (settingsParams: string | null) => Promise<void>;
   internal_createSignal: () => AbortController;
@@ -39,6 +40,20 @@ export const createSettingsSlice: StateCreator<
   [],
   UserSettingsAction
 > = (set, get) => ({
+  addToolToAllowList: async (toolKey) => {
+    const currentAllowList = get().settings.tool?.humanIntervention?.allowList || [];
+
+    if (currentAllowList.includes(toolKey)) return;
+
+    await get().setSettings({
+      tool: {
+        humanIntervention: {
+          allowList: [...currentAllowList, toolKey],
+        },
+      },
+    });
+  },
+
   importAppSettings: async (importAppSettings) => {
     const { setSettings } = get();
 

package/src/store/user/slices/settings/selectors/index.ts

@@ -1,3 +1,4 @@
 export { userGeneralSettingsSelectors } from './general';
+export { keyVaultsConfigSelectors } from './keyVaults';
 export { settingsSelectors } from './settings';
 export { systemAgentSelectors } from './systemAgent';

package/src/store/user/slices/settings/selectors/keyVaults.ts

@@ -0,0 +1,21 @@
+import { UserStore } from '@/store/user';
+import { UserKeyVaults } from '@/types/user/settings';
+
+import { currentSettings } from './settings';
+
+export const keyVaultsSettings = (s: UserStore): UserKeyVaults =>
+  currentSettings(s).keyVaults || {};
+
+const getVaultByProvider = (provider: string) => (s: UserStore) =>
+  // @ts-ignore
+  (keyVaultsSettings(s)[provider] || {}) as any;
+
+const password = (s: UserStore) => keyVaultsSettings(s).password || '';
+
+export const keyVaultsConfigSelectors = {
+  getVaultByProvider,
+
+  keyVaultsSettings,
+
+  password,
+};

package/src/store/user/store.ts

@@ -7,7 +7,6 @@ import { createDevtools } from '../middleware/createDevtools';
 import { type UserState, initialState } from './initialState';
 import { type UserAuthAction, createAuthSlice } from './slices/auth/action';
 import { type CommonAction, createCommonSlice } from './slices/common/action';
-import { type ModelListAction, createModelListSlice } from './slices/modelList/action';
 import { type PreferenceAction, createPreferenceSlice } from './slices/preference/action';
 import { type UserSettingsAction, createSettingsSlice } from './slices/settings/action';
 
@@ -16,7 +15,6 @@ import { type UserSettingsAction, createSettingsSlice } from './slices/settings/
 export type UserStore = UserState &
   UserSettingsAction &
   PreferenceAction &
-  ModelListAction &
   UserAuthAction &
   CommonAction;
 
@@ -26,7 +24,6 @@ const createStore: StateCreator<UserStore, [['zustand/devtools', never]]> = (...
   ...createPreferenceSlice(...parameters),
   ...createAuthSlice(...parameters),
   ...createCommonSlice(...parameters),
-  ...createModelListSlice(...parameters),
 });
 
 //  ===============  实装 useStore ============ //

package/src/tools/index.ts

@@ -4,7 +4,6 @@ import { isDesktop } from '@/const/version';
 
 import { ArtifactsManifest } from './artifacts';
 import { CodeInterpreterManifest } from './code-interpreter';
-import { DalleManifest } from './dalle';
 import { LocalSystemManifest } from './local-system';
 import { WebBrowsingManifest } from './web-browsing';
 
@@ -14,11 +13,6 @@ export const builtinTools: LobeBuiltinTool[] = [
     manifest: ArtifactsManifest,
     type: 'builtin',
   },
-  {
-    identifier: DalleManifest.identifier,
-    manifest: DalleManifest,
-    type: 'builtin',
-  },
   {
     hidden: !isDesktop,
     identifier: LocalSystemManifest.identifier,

package/src/tools/renders.ts

@@ -2,15 +2,12 @@ import { BuiltinRender } from '@lobechat/types';
 
 import { CodeInterpreterManifest } from './code-interpreter';
 import CodeInterpreterRender from './code-interpreter/Render';
-import { DalleManifest } from './dalle';
-import DalleRender from './dalle/Render';
 import { LocalSystemManifest } from './local-system';
 import LocalFilesRender from './local-system/Render';
 import { WebBrowsingManifest } from './web-browsing';
 import WebBrowsing from './web-browsing/Render';
 
 export const BuiltinToolsRenders: Record<string, BuiltinRender> = {
-  [DalleManifest.identifier]: DalleRender as BuiltinRender,
   [WebBrowsingManifest.identifier]: WebBrowsing as BuiltinRender,
   [LocalSystemManifest.identifier]: LocalFilesRender as BuiltinRender,
   [CodeInterpreterManifest.identifier]: CodeInterpreterRender as BuiltinRender,

package/src/tools/web-browsing/Portal/Search/Footer.tsx

@@ -4,12 +4,12 @@ import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
 import { useChatStore } from '@/store/chat';
-import { chatPortalSelectors, chatSelectors } from '@/store/chat/selectors';
+import { chatPortalSelectors, messageStateSelectors } from '@/store/chat/selectors';
 
 const Footer = () => {
   const [messageId, isAIGenerating, triggerAIMessage, saveSearchResult] = useChatStore((s) => [
     chatPortalSelectors.toolMessageId(s),
-    chatSelectors.isAIGenerating(s),
+    messageStateSelectors.isAIGenerating(s),
     s.triggerAIMessage,
     s.saveSearchResult,
   ]);

package/src/tools/web-browsing/Render/Search/ConfigForm/Form.tsx

@@ -23,7 +23,7 @@ const Form = memo<ProviderApiKeyFormProps>(({ provider, id }) => {
   const [apiKey, baseURL, setConfig] = useUserStore((s) => [
     keyVaultsConfigSelectors.getVaultByProvider(provider as any)(s)?.apiKey,
     keyVaultsConfigSelectors.getVaultByProvider(provider as any)(s)?.baseURL,
-    s.updateKeyVaultSettings,
+    s.updateKeyVaultConfig,
   ]);
 
   const [showKey, setShow] = useState(false);