@lobehub/chat 1.96.19 → 1.97.0

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

@@ -2,7 +2,6 @@
 import { PluginErrorType } from '@lobehub/chat-plugin-sdk';
 import isEqual from 'fast-deep-equal';
 import { t } from 'i18next';
-import { Md5 } from 'ts-md5';
 import { StateCreator } from 'zustand/vanilla';
 
 import { LOADING_FLAT } from '@/const/message';
@@ -21,10 +20,12 @@ import {
   ChatToolPayload,
   CreateMessageParams,
   MessageToolCall,
+  ToolsCallingContext,
 } from '@/types/message';
 import { merge } from '@/utils/merge';
 import { safeParseJSON } from '@/utils/safeParseJSON';
 import { setNamespace } from '@/utils/storeDebug';
+import { genToolCallShortMD5Hash } from '@/utils/toolCall';
 
 import { chatSelectors } from '../message/selectors';
 import { threadSelectors } from '../thread/selectors';
@@ -79,6 +80,7 @@ export interface ChatPluginAction {
   ) => AbortController | undefined;
   internal_transformToolCalls: (toolCalls: MessageToolCall[]) => ChatToolPayload[];
   internal_updatePluginError: (id: string, error: ChatMessageError) => Promise<void>;
+  internal_constructToolsCallingContext: (id: string) => ToolsCallingContext | undefined;
 }
 
 export const chatPlugin: StateCreator<
@@ -453,8 +455,12 @@ export const chatPlugin: StateCreator<
     }
   },
   invokeMCPTypePlugin: async (id, payload) => {
-    const { internal_updateMessageContent, refreshMessages, internal_togglePluginApiCalling } =
-      get();
+    const {
+      internal_updateMessageContent,
+      refreshMessages,
+      internal_togglePluginApiCalling,
+      internal_constructToolsCallingContext,
+    } = get();
     let data: string = '';
 
     try {
@@ -464,9 +470,12 @@ export const chatPlugin: StateCreator<
         n('fetchPlugin/start') as string,
       );
 
+      const context = internal_constructToolsCallingContext(id);
       const result = await mcpService.invokeMcpToolCall(payload, {
         signal: abortController?.signal,
+        topicId: context?.topicId,
       });
+
       if (!!result) data = result;
     } catch (error) {
       console.log(error);
@@ -514,7 +523,7 @@ export const chatPlugin: StateCreator<
           const md5 = apiName.replace(PLUGIN_SCHEMA_API_MD5_PREFIX, '');
           const manifest = pluginSelectors.getToolManifestById(identifier)(useToolStore.getState());
 
-          const api = manifest?.api.find((api) => Md5.hashStr(api.name).toString() === md5);
+          const api = manifest?.api.find((api) => genToolCallShortMD5Hash(api.name) === md5);
           if (api) {
             payload.apiName = api.name;
           }
@@ -531,4 +540,13 @@ export const chatPlugin: StateCreator<
     await messageService.updateMessage(id, { error });
     await refreshMessages();
   },
+
+  internal_constructToolsCallingContext: (id: string) => {
+    const message = chatSelectors.getMessageById(id)(get());
+    if (!message) return;
+
+    return {
+      topicId: message.topicId,
+    };
+  },
 });

package/src/store/discover/index.ts

@@ -0,0 +1 @@
+export { type DiscoverStore, getDiscoverStoreState, useDiscoverStore } from './store';

package/src/store/discover/slices/assistant/action.ts

@@ -0,0 +1,73 @@
+import { CategoryItem, CategoryListQuery } from '@lobehub/market-sdk';
+import useSWR, { type SWRResponse } from 'swr';
+import type { StateCreator } from 'zustand/vanilla';
+
+import { discoverService } from '@/services/discover';
+import { DiscoverStore } from '@/store/discover';
+import { globalHelpers } from '@/store/global/helpers';
+import {
+  AssistantListResponse,
+  AssistantQueryParams,
+  DiscoverAssistantDetail,
+  IdentifiersResponse,
+} from '@/types/discover';
+
+export interface AssistantAction {
+  useAssistantCategories: (params: CategoryListQuery) => SWRResponse<CategoryItem[]>;
+  useAssistantDetail: (params: {
+    identifier: string;
+  }) => SWRResponse<DiscoverAssistantDetail | undefined>;
+  useAssistantIdentifiers: () => SWRResponse<IdentifiersResponse>;
+  useAssistantList: (params?: AssistantQueryParams) => SWRResponse<AssistantListResponse>;
+}
+
+export const createAssistantSlice: StateCreator<
+  DiscoverStore,
+  [['zustand/devtools', never]],
+  [],
+  AssistantAction
+> = () => ({
+  useAssistantCategories: (params) => {
+    const locale = globalHelpers.getCurrentLanguage();
+    return useSWR(
+      ['assistant-categories', locale, ...Object.values(params)].filter(Boolean).join('-'),
+      async () => discoverService.getAssistantCategories(params),
+      {
+        revalidateOnFocus: false,
+      },
+    );
+  },
+
+  useAssistantDetail: (params) => {
+    const locale = globalHelpers.getCurrentLanguage();
+    return useSWR(
+      ['assistant-details', locale, params.identifier].filter(Boolean).join('-'),
+      async () => discoverService.getAssistantDetail(params),
+      {
+        revalidateOnFocus: false,
+      },
+    );
+  },
+
+  useAssistantIdentifiers: () => {
+    return useSWR('assistant-identifiers', async () => discoverService.getAssistantIdentifiers(), {
+      revalidateOnFocus: false,
+    });
+  },
+
+  useAssistantList: (params = {}) => {
+    const locale = globalHelpers.getCurrentLanguage();
+    return useSWR(
+      ['assistant-list', locale, ...Object.values(params)].filter(Boolean).join('-'),
+      async () =>
+        discoverService.getAssistantList({
+          ...params,
+          page: params.page ? Number(params.page) : 1,
+          pageSize: params.pageSize ? Number(params.pageSize) : 21,
+        }),
+      {
+        revalidateOnFocus: false,
+      },
+    );
+  },
+});

package/src/store/discover/slices/assistant/index.ts

@@ -0,0 +1 @@
+export * from './action';

package/src/store/discover/slices/mcp/action.ts

@@ -0,0 +1,70 @@
+import { CategoryItem, CategoryListQuery } from '@lobehub/market-sdk';
+import { type SWRResponse } from 'swr';
+import type { StateCreator } from 'zustand/vanilla';
+
+import { useClientDataSWR } from '@/libs/swr';
+import { discoverService } from '@/services/discover';
+import { DiscoverStore } from '@/store/discover';
+import { globalHelpers } from '@/store/global/helpers';
+import {
+  DiscoverMcpDetail,
+  IdentifiersResponse,
+  McpListResponse,
+  McpQueryParams,
+} from '@/types/discover';
+
+export interface MCPAction {
+  useFetchMcpDetail: (params: {
+    identifier?: string;
+    version?: string;
+  }) => SWRResponse<DiscoverMcpDetail>;
+  useFetchMcpList: (params: McpQueryParams) => SWRResponse<McpListResponse>;
+  useMcpCategories: (params: CategoryListQuery) => SWRResponse<CategoryItem[]>;
+  useMcpIdentifiers: () => SWRResponse<IdentifiersResponse>;
+}
+
+export const createMCPSlice: StateCreator<
+  DiscoverStore,
+  [['zustand/devtools', never]],
+  [],
+  MCPAction
+> = () => ({
+  useFetchMcpDetail: ({ identifier, version }) => {
+    const locale = globalHelpers.getCurrentLanguage();
+
+    return useClientDataSWR(
+      !identifier ? null : ['mcp-detail', locale, identifier, version].filter(Boolean).join('-'),
+      async () => discoverService.getMcpDetail({ identifier: identifier!, version }),
+    );
+  },
+
+  useFetchMcpList: (params: any) => {
+    const locale = globalHelpers.getCurrentLanguage();
+    return useClientDataSWR(
+      ['mcp-list', locale, ...Object.values(params)].filter(Boolean).join('-'),
+      async () =>
+        discoverService.getMcpList({
+          ...params,
+          page: params.page ? Number(params.page) : 1,
+          pageSize: params.pageSize ? Number(params.pageSize) : 21,
+        }),
+    );
+  },
+
+  useMcpCategories: (params) => {
+    const locale = globalHelpers.getCurrentLanguage();
+    return useClientDataSWR(
+      ['mcp-categories', locale, ...Object.values(params)].join('-'),
+      async () => discoverService.getMcpCategories(params),
+      {
+        revalidateOnFocus: false,
+      },
+    );
+  },
+
+  useMcpIdentifiers: () => {
+    return useClientDataSWR('mcp-identifiers', async () => discoverService.getMcpIdentifiers(), {
+      revalidateOnFocus: false,
+    });
+  },
+});

package/src/store/discover/slices/mcp/index.ts

@@ -0,0 +1 @@
+export * from './action';

package/src/store/discover/slices/model/action.ts

@@ -0,0 +1,70 @@
+import { CategoryItem, CategoryListQuery } from '@lobehub/market-sdk';
+import useSWR, { type SWRResponse } from 'swr';
+import type { StateCreator } from 'zustand/vanilla';
+
+import { discoverService } from '@/services/discover';
+import { DiscoverStore } from '@/store/discover';
+import { globalHelpers } from '@/store/global/helpers';
+import {
+  DiscoverModelDetail,
+  IdentifiersResponse,
+  ModelListResponse,
+  ModelQueryParams,
+} from '@/types/discover';
+
+export interface ModelAction {
+  useModelCategories: (params: CategoryListQuery) => SWRResponse<CategoryItem[]>;
+  useModelDetail: (params: { identifier: string }) => SWRResponse<DiscoverModelDetail | undefined>;
+  useModelIdentifiers: () => SWRResponse<IdentifiersResponse>;
+  useModelList: (params?: ModelQueryParams) => SWRResponse<ModelListResponse>;
+}
+
+export const createModelSlice: StateCreator<
+  DiscoverStore,
+  [['zustand/devtools', never]],
+  [],
+  ModelAction
+> = () => ({
+  useModelCategories: (params) => {
+    return useSWR(
+      ['model-categories', ...Object.values(params)].filter(Boolean).join('-'),
+      async () => discoverService.getModelCategories(params),
+      {
+        revalidateOnFocus: false,
+      },
+    );
+  },
+
+  useModelDetail: (params) => {
+    const locale = globalHelpers.getCurrentLanguage();
+    return useSWR(
+      ['model-details', locale, params.identifier].filter(Boolean).join('-'),
+      async () => discoverService.getModelDetail(params),
+      {
+        revalidateOnFocus: false,
+      },
+    );
+  },
+
+  useModelIdentifiers: () => {
+    return useSWR('model-identifiers', async () => discoverService.getModelIdentifiers(), {
+      revalidateOnFocus: false,
+    });
+  },
+
+  useModelList: (params = {}) => {
+    const locale = globalHelpers.getCurrentLanguage();
+    return useSWR(
+      ['model-list', locale, ...Object.values(params)].filter(Boolean).join('-'),
+      async () =>
+        discoverService.getModelList({
+          ...params,
+          page: params.page ? Number(params.page) : 1,
+          pageSize: params.pageSize ? Number(params.pageSize) : 21,
+        }),
+      {
+        revalidateOnFocus: false,
+      },
+    );
+  },
+});

package/src/store/discover/slices/model/index.ts

@@ -0,0 +1 @@
+export * from './action';

package/src/store/discover/slices/plugin/action.ts

@@ -0,0 +1,76 @@
+import { CategoryItem, CategoryListQuery } from '@lobehub/market-sdk';
+import useSWR, { type SWRResponse } from 'swr';
+import type { StateCreator } from 'zustand/vanilla';
+
+import { discoverService } from '@/services/discover';
+import { DiscoverStore } from '@/store/discover';
+import { globalHelpers } from '@/store/global/helpers';
+import {
+  DiscoverPluginDetail,
+  IdentifiersResponse,
+  PluginListResponse,
+  PluginQueryParams,
+} from '@/types/discover';
+
+export interface PluginAction {
+  usePluginCategories: (params: CategoryListQuery) => SWRResponse<CategoryItem[]>;
+  usePluginDetail: (params: {
+    identifier?: string;
+    withManifest?: boolean;
+  }) => SWRResponse<DiscoverPluginDetail | undefined>;
+  usePluginIdentifiers: () => SWRResponse<IdentifiersResponse>;
+  usePluginList: (params?: PluginQueryParams) => SWRResponse<PluginListResponse>;
+}
+
+export const createPluginSlice: StateCreator<
+  DiscoverStore,
+  [['zustand/devtools', never]],
+  [],
+  PluginAction
+> = () => ({
+  usePluginCategories: (params) => {
+    const locale = globalHelpers.getCurrentLanguage();
+    return useSWR(
+      ['plugin-categories', locale, ...Object.values(params)].filter(Boolean).join('-'),
+      async () => discoverService.getPluginCategories(params),
+      {
+        revalidateOnFocus: false,
+      },
+    );
+  },
+
+  usePluginDetail: ({ identifier, withManifest }) => {
+    const locale = globalHelpers.getCurrentLanguage();
+    return useSWR(
+      !identifier
+        ? null
+        : ['plugin-details', locale, identifier, withManifest].filter(Boolean).join('-'),
+      async () => discoverService.getPluginDetail({ identifier: identifier!, withManifest }),
+      {
+        revalidateOnFocus: false,
+      },
+    );
+  },
+
+  usePluginIdentifiers: () => {
+    return useSWR('plugin-identifiers', async () => discoverService.getPluginIdentifiers(), {
+      revalidateOnFocus: false,
+    });
+  },
+
+  usePluginList: (params = {}) => {
+    const locale = globalHelpers.getCurrentLanguage();
+    return useSWR(
+      ['plugin-list', locale, ...Object.values(params)].filter(Boolean).join('-'),
+      async () =>
+        discoverService.getPluginList({
+          ...params,
+          page: params.page ? Number(params.page) : 1,
+          pageSize: params.pageSize ? Number(params.pageSize) : 21,
+        }),
+      {
+        revalidateOnFocus: false,
+      },
+    );
+  },
+});

package/src/store/discover/slices/plugin/index.ts

@@ -0,0 +1 @@
+export * from './action';

package/src/store/discover/slices/provider/action.ts

@@ -0,0 +1,61 @@
+import useSWR, { type SWRResponse } from 'swr';
+import type { StateCreator } from 'zustand/vanilla';
+
+import { discoverService } from '@/services/discover';
+import { DiscoverStore } from '@/store/discover';
+import { globalHelpers } from '@/store/global/helpers';
+import {
+  DiscoverProviderDetail,
+  IdentifiersResponse,
+  ProviderListResponse,
+  ProviderQueryParams,
+} from '@/types/discover';
+
+export interface ProviderAction {
+  useProviderDetail: (params: {
+    identifier: string;
+    withReadme?: boolean;
+  }) => SWRResponse<DiscoverProviderDetail | undefined>;
+  useProviderIdentifiers: () => SWRResponse<IdentifiersResponse>;
+  useProviderList: (params?: ProviderQueryParams) => SWRResponse<ProviderListResponse>;
+}
+
+export const createProviderSlice: StateCreator<
+  DiscoverStore,
+  [['zustand/devtools', never]],
+  [],
+  ProviderAction
+> = () => ({
+  useProviderDetail: (params) => {
+    const locale = globalHelpers.getCurrentLanguage();
+    return useSWR(
+      ['provider-details', locale, params.identifier].filter(Boolean).join('-'),
+      async () => discoverService.getProviderDetail(params),
+      {
+        revalidateOnFocus: false,
+      },
+    );
+  },
+
+  useProviderIdentifiers: () => {
+    return useSWR('provider-identifiers', async () => discoverService.getProviderIdentifiers(), {
+      revalidateOnFocus: false,
+    });
+  },
+
+  useProviderList: (params = {}) => {
+    const locale = globalHelpers.getCurrentLanguage();
+    return useSWR(
+      ['provider-list', locale, ...Object.values(params)].filter(Boolean).join('-'),
+      async () =>
+        discoverService.getProviderList({
+          ...params,
+          page: params.page ? Number(params.page) : 1,
+          pageSize: params.pageSize ? Number(params.pageSize) : 21,
+        }),
+      {
+        revalidateOnFocus: false,
+      },
+    );
+  },
+});

package/src/store/discover/slices/provider/index.ts

@@ -0,0 +1 @@
+export * from './action';

package/src/store/discover/store.ts

@@ -0,0 +1,39 @@
+import { shallow } from 'zustand/shallow';
+import { createWithEqualityFn } from 'zustand/traditional';
+import { StateCreator } from 'zustand/vanilla';
+
+import { createDevtools } from '../middleware/createDevtools';
+import { AssistantAction, createAssistantSlice } from './slices/assistant/action';
+import { MCPAction, createMCPSlice } from './slices/mcp';
+import { ModelAction, createModelSlice } from './slices/model/action';
+import { PluginAction, createPluginSlice } from './slices/plugin/action';
+import { ProviderAction, createProviderSlice } from './slices/provider/action';
+
+//  ===============  聚合 createStoreFn ============ //
+
+export type DiscoverStore = MCPAction &
+  AssistantAction &
+  ProviderAction &
+  ModelAction &
+  PluginAction;
+
+const createStore: StateCreator<DiscoverStore, [['zustand/devtools', never]]> = (
+  ...parameters
+) => ({
+  ...createMCPSlice(...parameters),
+  ...createAssistantSlice(...parameters),
+  ...createProviderSlice(...parameters),
+  ...createModelSlice(...parameters),
+  ...createPluginSlice(...parameters),
+});
+
+//  ===============  实装 useStore ============ //
+
+const devtools = createDevtools('discover');
+
+export const useDiscoverStore = createWithEqualityFn<DiscoverStore>()(
+  devtools(createStore),
+  shallow,
+);
+
+export const getDiscoverStoreState = () => useDiscoverStore.getState();

package/src/store/tool/initialState.ts

@@ -1,13 +1,19 @@
 import { BuiltinToolState, initialBuiltinToolState } from './slices/builtin';
 import { CustomPluginState, initialCustomPluginState } from './slices/customPlugin';
+import { MCPStoreState, initialMCPStoreState } from './slices/mcpStore';
 import { PluginState, initialPluginState } from './slices/plugin';
-import { PluginStoreState, initialPluginStoreState } from './slices/store';
+import { PluginStoreState, initialPluginStoreState } from './slices/oldStore';
 
-export type ToolStoreState = PluginState & CustomPluginState & PluginStoreState & BuiltinToolState;
+export type ToolStoreState = PluginState &
+  CustomPluginState &
+  PluginStoreState &
+  BuiltinToolState &
+  MCPStoreState;
 
 export const initialState: ToolStoreState = {
   ...initialPluginState,
   ...initialCustomPluginState,
   ...initialPluginStoreState,
   ...initialBuiltinToolState,
+  ...initialMCPStoreState,
 };

package/src/store/tool/selectors/index.ts

@@ -1,5 +1,6 @@
 export { builtinToolSelectors } from '../slices/builtin/selectors';
 export { customPluginSelectors } from '../slices/customPlugin/selectors';
+export { mcpStoreSelectors } from '../slices/mcpStore/selectors';
+export { pluginStoreSelectors } from '../slices/oldStore/selectors';
 export { pluginSelectors } from '../slices/plugin/selectors';
-export { pluginStoreSelectors } from '../slices/store/selectors';
 export { toolSelectors } from './tool';

package/src/store/tool/selectors/tool.test.ts

@@ -123,7 +123,7 @@ describe('toolSelectors', () => {
         {
           type: 'function',
           function: {
-            name: 'long-long-plugin-with-id____MD5HASH_396eae4c671da3fb642c49ad2b9e8790',
+            name: 'long-long-plugin-with-id____MD5HASH_396eae4c671da3fb',
           },
         },
       ]);
@@ -185,6 +185,8 @@ describe('toolSelectors', () => {
           identifier: 'plugin-1',
           type: 'plugin',
           meta: { title: 'Plugin 1', description: 'Plugin 1 description' },
+          title: 'Plugin 1',
+          description: 'Plugin 1 description',
         },
         {
           type: 'plugin',

package/src/store/tool/selectors/tool.ts

@@ -75,8 +75,20 @@ const metaList =
 
 const getMetaById =
   (id: string, showDalle: boolean = true) =>
-  (s: ToolStoreState): MetaData | undefined =>
-    metaList(showDalle)(s).find((m) => m.identifier === id)?.meta;
+  (s: ToolStoreState): MetaData | undefined => {
+    const item = metaList(showDalle)(s).find((m) => m.identifier === id);
+
+    if (!item) return;
+
+    if (item.meta) return item.meta;
+
+    return {
+      avatar: item?.avatar,
+      backgroundColor: item?.backgroundColor,
+      description: item?.description,
+      title: item?.title,
+    };
+  };
 
 const getManifestById =
   (id: string) =>