@lobehub/lobehub 2.0.0-next.284 → 2.0.0-next.286

package/src/features/ProfileEditor/AgentTool.tsx

@@ -1,6 +1,11 @@
 'use client';
 
-import { KLAVIS_SERVER_TYPES, type KlavisServerType } from '@lobechat/const';
+import {
+  KLAVIS_SERVER_TYPES,
+  type KlavisServerType,
+  LOBEHUB_SKILL_PROVIDERS,
+  type LobehubSkillProviderType,
+} from '@lobechat/const';
 import { Avatar, Button, Flexbox, Icon, type ItemType, Segmented } from '@lobehub/ui';
 import { createStaticStyles, cssVar } from 'antd-style';
 import isEqual from 'fast-deep-equal';
@@ -10,6 +15,7 @@ import { useTranslation } from 'react-i18next';
 
 import PluginAvatar from '@/components/Plugins/PluginAvatar';
 import KlavisServerItem from '@/features/ChatInput/ActionBar/Tools/KlavisServerItem';
+import LobehubSkillServerItem from '@/features/ChatInput/ActionBar/Tools/LobehubSkillServerItem';
 import ToolItem from '@/features/ChatInput/ActionBar/Tools/ToolItem';
 import ActionDropdown from '@/features/ChatInput/ActionBar/components/ActionDropdown';
 import PluginStore from '@/features/PluginStore';
@@ -22,6 +28,7 @@ import { useToolStore } from '@/store/tool';
 import {
   builtinToolSelectors,
   klavisStoreSelectors,
+  lobehubSkillStoreSelectors,
   pluginSelectors,
 } from '@/store/tool/selectors';
 import { type LobeToolMetaWithAvailability } from '@/store/tool/slices/builtin/selectors';
@@ -81,6 +88,19 @@ const KlavisIcon = memo<Pick<KlavisServerType, 'icon' | 'label'>>(({ icon, label
   return <Icon className={styles.icon} fill={cssVar.colorText} icon={icon} size={18} />;
 });
 
+/**
+ * LobeHub Skill Provider 图标组件
+ */
+const LobehubSkillIcon = memo<Pick<LobehubSkillProviderType, 'icon' | 'label'>>(
+  ({ icon, label }) => {
+    if (typeof icon === 'string') {
+      return <img alt={label} className={styles.icon} height={18} src={icon} width={18} />;
+    }
+
+    return <Icon className={styles.icon} fill={cssVar.colorText} icon={icon} size={18} />;
+  },
+);
+
 export interface AgentToolProps {
   /**
    * Optional agent ID to use instead of currentAgentConfig
@@ -125,12 +145,18 @@ const AgentTool = memo<AgentToolProps>(
     );
 
     // Web browsing uses searchMode instead of plugins array - use byId selector
-    const isSearchEnabled = useAgentStore(chatConfigByIdSelectors.isEnableSearchById(effectiveAgentId));
+    const isSearchEnabled = useAgentStore(
+      chatConfigByIdSelectors.isEnableSearchById(effectiveAgentId),
+    );
 
     // Klavis 相关状态
     const allKlavisServers = useToolStore(klavisStoreSelectors.getServers, isEqual);
     const isKlavisEnabledInEnv = useServerConfigStore(serverConfigSelectors.enableKlavis);
 
+    // LobeHub Skill 相关状态
+    const allLobehubSkillServers = useToolStore(lobehubSkillStoreSelectors.getServers, isEqual);
+    const isLobehubSkillEnabled = useServerConfigStore(serverConfigSelectors.enableLobehubSkill);
+
     // Plugin store modal state
     const [modalOpen, setModalOpen] = useState(false);
     const [updating, setUpdating] = useState(false);
@@ -140,10 +166,12 @@ const AgentTool = memo<AgentToolProps>(
     const isInitializedRef = useRef(false);
 
     // Fetch plugins
-    const [useFetchPluginStore, useFetchUserKlavisServers] = useToolStore((s) => [
-      s.useFetchPluginStore,
-      s.useFetchUserKlavisServers,
-    ]);
+    const [useFetchPluginStore, useFetchUserKlavisServers, useFetchLobehubSkillConnections] =
+      useToolStore((s) => [
+        s.useFetchPluginStore,
+        s.useFetchUserKlavisServers,
+        s.useFetchLobehubSkillConnections,
+      ]);
     useFetchPluginStore();
     useFetchInstalledPlugins();
     useCheckPluginsIsInstalled(plugins);
@@ -151,6 +179,9 @@ const AgentTool = memo<AgentToolProps>(
     // 使用 SWR 加载用户的 Klavis 集成（从数据库）
     useFetchUserKlavisServers(isKlavisEnabledInEnv);
 
+    // 使用 SWR 加载用户的 LobeHub Skill 连接
+    useFetchLobehubSkillConnections(isLobehubSkillEnabled);
+
     // Toggle web browsing via searchMode - use byId action
     const toggleWebBrowsing = useCallback(async () => {
       if (!effectiveAgentId) return;
@@ -270,6 +301,19 @@ const AgentTool = memo<AgentToolProps>(
       [isKlavisEnabledInEnv, allKlavisServers],
     );
 
+    // LobeHub Skill Provider 列表项
+    const lobehubSkillItems = useMemo(
+      () =>
+        isLobehubSkillEnabled
+          ? LOBEHUB_SKILL_PROVIDERS.map((provider) => ({
+              icon: <LobehubSkillIcon icon={provider.icon} label={provider.label} />,
+              key: provider.id, // 使用 provider.id 作为 key，与 pluginId 保持一致
+              label: <LobehubSkillServerItem label={provider.label} provider={provider.id} />,
+            }))
+          : [],
+      [isLobehubSkillEnabled, allLobehubSkillServers],
+    );
+
     // Handle plugin remove via Tag close - use byId actions
     const handleRemovePlugin =
       (
@@ -292,7 +336,7 @@ const AgentTool = memo<AgentToolProps>(
       (id) => !builtinList.some((b) => b.identifier === id),
     ).length;
 
-    // 合并 builtin 工具和 Klavis 服务器
+    // 合并 builtin 工具、LobeHub Skill Providers 和 Klavis 服务器
     const builtinItems = useMemo(
       () => [
         // 原有的 builtin 工具
@@ -312,10 +356,12 @@ const AgentTool = memo<AgentToolProps>(
             />
           ),
         })),
+        // LobeHub Skill Providers
+        ...lobehubSkillItems,
         // Klavis 服务器
         ...klavisServerItems,
       ],
-      [filteredBuiltinList, klavisServerItems, isToolEnabled, handleToggleTool],
+      [filteredBuiltinList, klavisServerItems, lobehubSkillItems, isToolEnabled, handleToggleTool],
     );
 
     // Plugin items for dropdown
@@ -413,8 +459,17 @@ const AgentTool = memo<AgentToolProps>(
         plugins.includes(item.key as string),
       );
 
-      // 合并 builtin 和 Klavis
-      const allBuiltinItems = [...enabledBuiltinItems, ...connectedKlavisItems];
+      // 已连接的 LobeHub Skill Providers
+      const connectedLobehubSkillItems = lobehubSkillItems.filter((item) =>
+        plugins.includes(item.key as string),
+      );
+
+      // 合并 builtin、LobeHub Skill 和 Klavis
+      const allBuiltinItems = [
+        ...enabledBuiltinItems,
+        ...connectedKlavisItems,
+        ...connectedLobehubSkillItems,
+      ];
 
       if (allBuiltinItems.length > 0) {
         items.push({
@@ -462,6 +517,7 @@ const AgentTool = memo<AgentToolProps>(
     }, [
       filteredBuiltinList,
       klavisServerItems,
+      lobehubSkillItems,
       installedPluginList,
       plugins,
       isToolEnabled,
@@ -526,7 +582,7 @@ const AgentTool = memo<AgentToolProps>(
                   overflowY: 'visible',
                 },
               }}
-              minHeight={isKlavisEnabledInEnv ? 500 : undefined}
+              minHeight={isKlavisEnabledInEnv || isLobehubSkillEnabled ? 500 : undefined}
               minWidth={400}
               placement={'bottomLeft'}
               popupRender={(menu) => (
@@ -554,7 +610,7 @@ const AgentTool = memo<AgentToolProps>(
                     className={styles.scroller}
                     style={{
                       maxHeight: 500,
-                      minHeight: isKlavisEnabledInEnv ? 500 : undefined,
+                      minHeight: isKlavisEnabledInEnv || isLobehubSkillEnabled ? 500 : undefined,
                     }}
                   >
                     {menu}

package/src/features/ProfileEditor/PluginTag.tsx

@@ -1,6 +1,11 @@
 'use client';
 
-import { KLAVIS_SERVER_TYPES, type KlavisServerType } from '@lobechat/const';
+import {
+  KLAVIS_SERVER_TYPES,
+  type KlavisServerType,
+  LOBEHUB_SKILL_PROVIDERS,
+  type LobehubSkillProviderType,
+} from '@lobechat/const';
 import { Avatar, Icon, Tag } from '@lobehub/ui';
 import { createStaticStyles, cssVar } from 'antd-style';
 import isEqual from 'fast-deep-equal';
@@ -16,6 +21,7 @@ import { useToolStore } from '@/store/tool';
 import {
   builtinToolSelectors,
   klavisStoreSelectors,
+  lobehubSkillStoreSelectors,
   pluginSelectors,
 } from '@/store/tool/selectors';
 import { type LobeToolMetaWithAvailability } from '@/store/tool/slices/builtin/selectors';
@@ -31,6 +37,19 @@ const KlavisIcon = memo<Pick<KlavisServerType, 'icon' | 'label'>>(({ icon, label
   return <Icon fill={cssVar.colorText} icon={icon} size={16} />;
 });
 
+/**
+ * LobeHub Skill Provider 图标组件
+ */
+const LobehubSkillIcon = memo<Pick<LobehubSkillProviderType, 'icon' | 'label'>>(
+  ({ icon, label }) => {
+    if (typeof icon === 'string') {
+      return <img alt={label} height={16} src={icon} style={{ flexShrink: 0 }} width={16} />;
+    }
+
+    return <Icon fill={cssVar.colorText} icon={icon} size={16} />;
+  },
+);
+
 const styles = createStaticStyles(({ css, cssVar }) => ({
   notInstalledTag: css`
     border-color: ${cssVar.colorWarningBorder};
@@ -80,10 +99,14 @@ const PluginTag = memo<PluginTagProps>(
     const allKlavisServers = useToolStore(klavisStoreSelectors.getServers, isEqual);
     const isKlavisEnabledInEnv = useServerConfigStore(serverConfigSelectors.enableKlavis);
 
+    // LobeHub Skill 相关状态
+    const allLobehubSkillServers = useToolStore(lobehubSkillStoreSelectors.getServers, isEqual);
+    const isLobehubSkillEnabled = useServerConfigStore(serverConfigSelectors.enableLobehubSkill);
+
     // Check if plugin is installed
     const isInstalled = useToolStore(pluginSelectors.isPluginInstalled(identifier));
 
-    // Try to find in local lists first (including Klavis)
+    // Try to find in local lists first (including Klavis and LobehubSkill)
     const localMeta = useMemo(() => {
       // Check if it's a Klavis server type
       if (isKlavisEnabledInEnv) {
@@ -102,6 +125,23 @@ const PluginTag = memo<PluginTagProps>(
         }
       }
 
+      // Check if it's a LobeHub Skill provider
+      if (isLobehubSkillEnabled) {
+        const lobehubSkillProvider = LOBEHUB_SKILL_PROVIDERS.find((p) => p.id === identifier);
+        if (lobehubSkillProvider) {
+          // Check if this LobehubSkill provider is connected
+          const connectedServer = allLobehubSkillServers.find((s) => s.identifier === identifier);
+          return {
+            availableInWeb: true,
+            icon: lobehubSkillProvider.icon,
+            isInstalled: !!connectedServer,
+            label: lobehubSkillProvider.label,
+            title: lobehubSkillProvider.label,
+            type: 'lobehub-skill' as const,
+          };
+        }
+      }
+
       const builtinMeta = builtinList.find((p) => p.identifier === identifier);
       if (builtinMeta) {
         // availableInWeb is only present when using allMetaList
@@ -130,7 +170,15 @@ const PluginTag = memo<PluginTagProps>(
       }
 
       return null;
-    }, [identifier, builtinList, installedPluginList, isKlavisEnabledInEnv, allKlavisServers]);
+    }, [
+      identifier,
+      builtinList,
+      installedPluginList,
+      isKlavisEnabledInEnv,
+      allKlavisServers,
+      isLobehubSkillEnabled,
+      allLobehubSkillServers,
+    ]);
 
     // Fetch from remote if not found locally
     const usePluginDetail = useDiscoverStore((s) => s.usePluginDetail);
@@ -162,6 +210,11 @@ const PluginTag = memo<PluginTagProps>(
         return <KlavisIcon icon={meta.icon} label={meta.label} />;
       }
 
+      // LobeHub Skill type has icon property
+      if (meta.type === 'lobehub-skill' && 'icon' in meta && 'label' in meta) {
+        return <LobehubSkillIcon icon={meta.icon} label={meta.label} />;
+      }
+
       // Builtin type has avatar
       if (meta.type === 'builtin' && 'avatar' in meta && meta.avatar) {
         return <Avatar avatar={meta.avatar} shape={'square'} size={16} style={{ flexShrink: 0 }} />;

package/src/locales/default/setting.ts

@@ -278,6 +278,7 @@ export default {
   'plugin.settings.title': '{{id}} Skill Configuration',
   'plugin.settings.tooltip': 'Skill Configuration',
   'plugin.store': 'Skill Store',
+  'publishToCommunity': 'Publish to Community',
   'settingAgent.avatar.sizeExceeded': 'Image size exceeds 1MB limit, please choose a smaller image',
   'settingAgent.avatar.title': 'Avatar',
   'settingAgent.backgroundColor.title': 'Background Color',

package/src/locales/default/subscription.ts

@@ -62,6 +62,8 @@ export default {
   'funds.packages.expiresIn': 'Expires in {{days}} days',
   'funds.packages.expiresToday': 'Expires today',
   'funds.packages.expiringSoon': 'Expiring soon',
+  'funds.packages.gift': 'Gift',
+  'funds.packages.giftedOn': 'Gifted on {{date}}',
   'funds.packages.noPackages': 'No credit packages',
   'funds.packages.purchaseFirst': 'Purchase your first credit package',
   'funds.packages.purchasedOn': 'Purchased on {{date}}',

package/src/services/chat/index.ts

@@ -1,5 +1,5 @@
 import { AgentBuilderIdentifier } from '@lobechat/builtin-tool-agent-builder';
-import { KLAVIS_SERVER_TYPES } from '@lobechat/const';
+import { KLAVIS_SERVER_TYPES, LOBEHUB_SKILL_PROVIDERS } from '@lobechat/const';
 import type { OfficialToolItem } from '@lobechat/context-engine';
 import {
   type FetchSSEOptions,
@@ -41,6 +41,7 @@ import { getToolStoreState } from '@/store/tool';
 import {
   builtinToolSelectors,
   klavisStoreSelectors,
+  lobehubSkillStoreSelectors,
   pluginSelectors,
 } from '@/store/tool/selectors';
 import { getUserStoreState, useUserStore } from '@/store/user';
@@ -221,6 +222,28 @@ class ChatService {
         }
       }
 
+      // Get LobehubSkill providers (if enabled)
+      const isLobehubSkillEnabled =
+        typeof window !== 'undefined' &&
+        window.global_serverConfigStore?.getState()?.serverConfig?.enableLobehubSkill;
+
+      if (isLobehubSkillEnabled) {
+        const allLobehubSkillServers = lobehubSkillStoreSelectors.getServers(toolState);
+
+        for (const provider of LOBEHUB_SKILL_PROVIDERS) {
+          const server = allLobehubSkillServers.find((s) => s.identifier === provider.id);
+
+          officialTools.push({
+            description: `LobeHub Skill Provider: ${provider.label}`,
+            enabled: enabledPlugins.includes(provider.id),
+            identifier: provider.id,
+            installed: !!server,
+            name: provider.label,
+            type: 'lobehub-skill',
+          });
+        }
+      }
+
       agentBuilderContext = {
         ...baseContext,
         officialTools,

package/src/services/chat/mecha/contextEngineering.ts

@@ -1,7 +1,7 @@
 import { AgentBuilderIdentifier } from '@lobechat/builtin-tool-agent-builder';
 import { GroupAgentBuilderIdentifier } from '@lobechat/builtin-tool-group-agent-builder';
 import { GTDIdentifier } from '@lobechat/builtin-tool-gtd';
-import { KLAVIS_SERVER_TYPES, isDesktop } from '@lobechat/const';
+import { KLAVIS_SERVER_TYPES, LOBEHUB_SKILL_PROVIDERS, isDesktop } from '@lobechat/const';
 import {
   type AgentBuilderContext,
   type AgentGroupConfig,
@@ -29,7 +29,11 @@ import { getChatGroupStoreState } from '@/store/agentGroup';
 import { agentGroupSelectors } from '@/store/agentGroup/selectors';
 import { getChatStoreState } from '@/store/chat';
 import { getToolStoreState } from '@/store/tool';
-import { builtinToolSelectors, klavisStoreSelectors } from '@/store/tool/selectors';
+import {
+  builtinToolSelectors,
+  klavisStoreSelectors,
+  lobehubSkillStoreSelectors,
+} from '@/store/tool/selectors';
 
 import { isCanUseVideo, isCanUseVision } from '../helper';
 import {
@@ -217,6 +221,28 @@ export const contextEngineering = async ({
           }
         }
 
+        // Get LobehubSkill providers (if enabled)
+        const isLobehubSkillEnabled =
+          typeof window !== 'undefined' &&
+          window.global_serverConfigStore?.getState()?.serverConfig?.enableLobehubSkill;
+
+        if (isLobehubSkillEnabled) {
+          const allLobehubSkillServers = lobehubSkillStoreSelectors.getServers(toolState);
+
+          for (const provider of LOBEHUB_SKILL_PROVIDERS) {
+            const server = allLobehubSkillServers.find((s) => s.identifier === provider.id);
+
+            officialTools.push({
+              description: `LobeHub Skill Provider: ${provider.label}`,
+              enabled: enabledPlugins.includes(provider.id),
+              identifier: provider.id,
+              installed: !!server,
+              name: provider.label,
+              type: 'lobehub-skill',
+            });
+          }
+        }
+
         groupAgentBuilderContext = {
           config: {
             openingMessage: activeGroupDetail.config?.openingMessage || undefined,

package/src/store/chat/slices/plugin/actions/pluginTypes.ts

@@ -123,10 +123,20 @@ export const pluginTypes: StateCreator<
       const context = operationId ? { operationId } : undefined;
 
       // Get agent ID, group ID, and topic ID from operation context
-      const agentId = operation?.context?.agentId;
+      let agentId = operation?.context?.agentId;
       let groupId = operation?.context?.groupId;
       const topicId = operation?.context?.topicId;
 
+      // For agent-builder tools, inject activeAgentId from store if not in context
+      // This is needed because AgentBuilderProvider uses a separate scope for messages
+      // but the tools need the correct agentId for execution
+      if (payload.identifier === 'lobe-agent-builder') {
+        const activeAgentId = get().activeAgentId;
+        if (activeAgentId) {
+          agentId = activeAgentId;
+        }
+      }
+
       // For group-agent-builder tools, inject activeGroupId from store if not in context
       // This is needed because AgentBuilderProvider uses a separate scope for messages
       // but still needs groupId for tool execution

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

@@ -84,6 +84,31 @@ describe('SettingsAction', () => {
         expect.any(AbortSignal),
       );
     });
+
+    it('should include field in diffs when user resets it to default value', async () => {
+      const { result } = renderHook(() => useUserStore());
+
+      // First, set memory.enabled to false (non-default value)
+      await act(async () => {
+        await result.current.setSettings({ memory: { enabled: false } });
+      });
+
+      expect(userService.updateUserSettings).toHaveBeenLastCalledWith(
+        expect.objectContaining({ memory: { enabled: false } }),
+        expect.any(AbortSignal),
+      );
+
+      // Then, reset memory.enabled back to true (default value)
+      // This should still include memory in the diffs to override the previously saved value
+      await act(async () => {
+        await result.current.setSettings({ memory: { enabled: true } });
+      });
+
+      expect(userService.updateUserSettings).toHaveBeenLastCalledWith(
+        expect.objectContaining({ memory: { enabled: true } }),
+        expect.any(AbortSignal),
+      );
+    });
   });
 
   describe('updateDefaultAgent', () => {

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

@@ -103,6 +103,17 @@ export const createSettingsSlice: StateCreator<
     if (isEqual(prevSetting, nextSettings)) return;
 
     const diffs = difference(nextSettings, defaultSettings);
+
+    // When user resets a field to default value, we need to explicitly include it in diffs
+    // to override the previously saved non-default value in the backend
+    const changedFields = difference(nextSettings, prevSetting);
+    for (const key of Object.keys(changedFields)) {
+      // Only handle fields that were previously set by user (exist in prevSetting)
+      if (key in prevSetting && !(key in diffs)) {
+        (diffs as any)[key] = (nextSettings as any)[key];
+      }
+    }
+
     set({ settings: diffs }, false, 'optimistic_updateSettings');
 
     const abortController = get().internal_createSignal();