@lobehub/lobehub 2.0.0-next.283 → 2.0.0-next.285

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/layout/GlobalProvider/index.tsx

@@ -64,6 +64,7 @@ const GlobalLayout = async ({
               serverConfig={serverConfig}
             >
               <QueryProvider>
+                <StoreInitialization />
                 <GroupWizardProvider>
                   <DragUploadProvider>
                     <LazyMotion features={domMax}>
@@ -76,7 +77,6 @@ const GlobalLayout = async ({
                   </DragUploadProvider>
                 </GroupWizardProvider>
               </QueryProvider>
-              <StoreInitialization />
               <Suspense>
                 {ENABLE_BUSINESS_FEATURES ? <ReferralProvider /> : null}
                 <ImportSettings />

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