@lobehub/lobehub 2.0.0-next.160 → 2.0.0-next.162

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

@@ -6,7 +6,7 @@ import { StateCreator } from 'zustand/vanilla';
 
 import { ChatStore } from '@/store/chat/store';
 import { useToolStore } from '@/store/tool';
-import { pluginSelectors } from '@/store/tool/selectors';
+import { klavisStoreSelectors, pluginSelectors } from '@/store/tool/selectors';
 import { builtinTools } from '@/tools';
 
 import { displayMessageSelectors } from '../../message/selectors';
@@ -40,11 +40,16 @@ export const pluginInternals: StateCreator<
     const toolStoreState = useToolStore.getState();
     const manifests: Record<string, LobeChatPluginManifest> = {};
 
+    // Track source for each identifier
+    const sourceMap: Record<string, 'builtin' | 'plugin' | 'mcp' | 'klavis'> = {};
+
     // Get all installed plugins
     const installedPlugins = pluginSelectors.installedPlugins(toolStoreState);
     for (const plugin of installedPlugins) {
       if (plugin.manifest) {
         manifests[plugin.identifier] = plugin.manifest as LobeChatPluginManifest;
+        // Check if this plugin has MCP params
+        sourceMap[plugin.identifier] = plugin.customParams?.mcp ? 'mcp' : 'plugin';
       }
     }
 
@@ -52,10 +57,25 @@ export const pluginInternals: StateCreator<
     for (const tool of builtinTools) {
       if (tool.manifest) {
         manifests[tool.identifier] = tool.manifest as LobeChatPluginManifest;
+        sourceMap[tool.identifier] = 'builtin';
+      }
+    }
+
+    // Get all Klavis tools
+    const klavisTools = klavisStoreSelectors.klavisAsLobeTools(toolStoreState);
+    for (const tool of klavisTools) {
+      if (tool.manifest) {
+        manifests[tool.identifier] = tool.manifest as LobeChatPluginManifest;
+        sourceMap[tool.identifier] = 'klavis';
       }
     }
 
-    return toolNameResolver.resolve(toolCalls, manifests);
+    // Resolve tool calls and add source field
+    const resolved = toolNameResolver.resolve(toolCalls, manifests);
+    return resolved.map((payload) => ({
+      ...payload,
+      source: sourceMap[payload.identifier],
+    }));
   },
 
   internal_constructToolsCallingContext: (id: string) => {

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

@@ -32,6 +32,11 @@ export interface PluginTypesAction {
    */
   invokeDefaultTypePlugin: (id: string, payload: any) => Promise<string | undefined>;
 
+  /**
+   * Invoke Klavis type plugin
+   */
+  invokeKlavisTypePlugin: (id: string, payload: ChatToolPayload) => Promise<string | undefined>;
+
   /**
    * Invoke markdown type plugin
    */
@@ -60,6 +65,11 @@ export const pluginTypes: StateCreator<
   PluginTypesAction
 > = (set, get) => ({
   invokeBuiltinTool: async (id, payload) => {
+    // Check if this is a Klavis tool by source field
+    if (payload.source === 'klavis') {
+      return await get().invokeKlavisTypePlugin(id, payload);
+    }
+
     // run tool api call
     // @ts-ignore
     const { [payload.apiName]: action } = get();
@@ -82,6 +92,104 @@ export const pluginTypes: StateCreator<
     return data;
   },
 
+  invokeKlavisTypePlugin: async (id, payload) => {
+    const {
+      optimisticUpdateMessageContent,
+      optimisticUpdatePluginState,
+      optimisticUpdateMessagePluginError,
+    } = get();
+
+    let data: MCPToolCallResult | undefined;
+
+    // Get message to extract sessionId/topicId
+    const message = dbMessageSelectors.getDbMessageById(id)(get());
+
+    // Get abort controller from operation
+    const operationId = get().messageOperationMap[id];
+    const operation = operationId ? get().operations[operationId] : undefined;
+    const abortController = operation?.abortController;
+
+    log(
+      '[invokeKlavisTypePlugin] messageId=%s, tool=%s, operationId=%s, aborted=%s',
+      id,
+      payload.apiName,
+      operationId,
+      abortController?.signal.aborted,
+    );
+
+    try {
+      // payload.identifier 现在是存储用的 identifier（如 'google-calendar'）
+      const identifier = payload.identifier;
+      const klavisServers = useToolStore.getState().servers || [];
+      const server = klavisServers.find((s) => s.identifier === identifier);
+
+      if (!server) {
+        throw new Error(`Klavis server not found: ${identifier}`);
+      }
+
+      // Parse arguments
+      const args = safeParseJSON(payload.arguments) || {};
+
+      // Call Klavis tool via store action
+      const result = await useToolStore.getState().callKlavisTool({
+        serverUrl: server.serverUrl,
+        toolArgs: args,
+        toolName: payload.apiName,
+      });
+
+      if (!result.success) {
+        throw new Error(result.error || 'Klavis tool execution failed');
+      }
+
+      // result.data is MCPToolCallProcessedResult from server
+      // Convert to MCPToolCallResult format
+      const toolResult = result.data;
+      if (toolResult) {
+        data = {
+          content: toolResult.content,
+          error: toolResult.state?.isError ? toolResult.state : undefined,
+          state: toolResult.state,
+          success: toolResult.success,
+        };
+      }
+    } catch (error) {
+      console.error('[invokeKlavisTypePlugin] Error:', error);
+
+      // ignore the aborted request error
+      const err = error as Error;
+      if (err.message.includes('aborted')) {
+        log('[invokeKlavisTypePlugin] Request aborted: messageId=%s, tool=%s', id, payload.apiName);
+      } else {
+        const result = await messageService.updateMessageError(id, error as any, {
+          sessionId: message?.sessionId,
+          topicId: message?.topicId,
+        });
+        if (result?.success && result.messages) {
+          get().replaceMessages(result.messages, {
+            sessionId: message?.sessionId,
+            topicId: message?.topicId,
+          });
+        }
+      }
+    }
+
+    // 如果报错则结束了
+    if (!data) return;
+
+    // operationId already declared above, reuse it
+    const context = operationId ? { operationId } : undefined;
+
+    await Promise.all([
+      optimisticUpdateMessageContent(id, data.content, undefined, context),
+      (async () => {
+        if (data.success) await optimisticUpdatePluginState(id, data.state, context);
+        else await optimisticUpdateMessagePluginError(id, data.error, context);
+      })(),
+    ]);
+
+    return data.content;
+  },
+
   invokeMarkdownTypePlugin: async (id, payload) => {
     const { internal_callPluginApi } = get();
 

package/src/store/serverConfig/index.ts

@@ -1,2 +1,2 @@
-export { featureFlagsSelectors } from './selectors';
+export { featureFlagsSelectors, serverConfigSelectors } from './selectors';
 export { useServerConfigStore } from './store';

package/src/store/serverConfig/selectors.ts

@@ -3,6 +3,7 @@ import { ServerConfigStore } from './store';
 export const featureFlagsSelectors = (s: ServerConfigStore) => s.featureFlags;
 
 export const serverConfigSelectors = {
+  enableKlavis: (s: ServerConfigStore) => s.serverConfig.enableKlavis || false,
   enableUploadFileToServer: (s: ServerConfigStore) => s.serverConfig.enableUploadFileToServer,
   enabledAccessCode: (s: ServerConfigStore) => !!s.serverConfig?.enabledAccessCode,
   enabledOAuthSSO: (s: ServerConfigStore) => s.serverConfig.enabledOAuthSSO,

package/src/store/tool/initialState.ts

@@ -1,5 +1,6 @@
 import { BuiltinToolState, initialBuiltinToolState } from './slices/builtin';
 import { CustomPluginState, initialCustomPluginState } from './slices/customPlugin';
+import { KlavisStoreState, initialKlavisStoreState } from './slices/klavisStore';
 import { MCPStoreState, initialMCPStoreState } from './slices/mcpStore';
 import { PluginState, initialPluginState } from './slices/plugin';
 import { PluginStoreState, initialPluginStoreState } from './slices/oldStore';
@@ -8,7 +9,8 @@ export type ToolStoreState = PluginState &
   CustomPluginState &
   PluginStoreState &
   BuiltinToolState &
-  MCPStoreState;
+  MCPStoreState &
+  KlavisStoreState;
 
 export const initialState: ToolStoreState = {
   ...initialPluginState,
@@ -16,4 +18,5 @@ export const initialState: ToolStoreState = {
   ...initialPluginStoreState,
   ...initialBuiltinToolState,
   ...initialMCPStoreState,
+  ...initialKlavisStoreState,
 };

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

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

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

@@ -3,9 +3,11 @@ import { LobeToolMeta } from '@lobechat/types';
 import { shouldEnableTool } from '@/helpers/toolFilters';
 
 import type { ToolStoreState } from '../../initialState';
+import { KlavisServerStatus } from '../klavisStore';
 
-const metaList = (s: ToolStoreState): LobeToolMeta[] =>
-  s.builtinTools
+const metaList = (s: ToolStoreState): LobeToolMeta[] => {
+  // Get builtin tools meta list
+  const builtinMetas = s.builtinTools
     .filter((item) => {
       // Filter hidden tools
       if (item.hidden) return false;
@@ -19,9 +21,29 @@ const metaList = (s: ToolStoreState): LobeToolMeta[] =>
       author: 'LobeHub',
       identifier: t.identifier,
       meta: t.manifest.meta,
-      type: 'builtin',
+      type: 'builtin' as const,
     }));
 
+  // Get Klavis servers as builtin tools meta
+  const klavisMetas = (s.servers || [])
+    .filter((server) => server.status === KlavisServerStatus.CONNECTED && server.tools?.length)
+    .map((server) => ({
+      author: 'Klavis',
+      // 使用 identifier 作为存储标识符（如 'google-calendar'）
+      identifier: server.identifier,
+      meta: {
+        avatar: '☁️',
+        description: `Klavis MCP Server: ${server.serverName}`,
+        tags: ['klavis', 'mcp'],
+        // title 仍然使用 serverName 显示友好名称
+        title: server.serverName,
+      },
+      type: 'builtin' as const,
+    }));
+
+  return [...builtinMetas, ...klavisMetas];
+};
+
 export const builtinToolSelectors = {
   metaList,
 };