@lobehub/chat 1.82.1 → 1.82.2

package/src/features/PluginDevModal/MCPManifestForm/utils.ts

@@ -0,0 +1,151 @@
+import { LobeChatPluginManifest } from '@lobehub/chat-plugin-sdk';
+
+import { safeParseJSON } from '@/utils/safeParseJSON';
+
+// （McpConfig, McpServers, ParsedMcpInput 接口定义保持不变）
+interface McpConfig {
+  args?: string[];
+  command?: string;
+  url?: string;
+}
+
+interface McpServers {
+  [key: string]: McpConfig;
+}
+
+interface ParsedMcpInput {
+  manifest?: LobeChatPluginManifest;
+  mcpServers?: McpServers;
+}
+
+// 移除 DuplicateIdentifier
+export enum McpParseErrorCode {
+  EmptyMcpServers = 'EmptyMcpServers',
+  InvalidJsonStructure = 'InvalidJsonStructure',
+  InvalidMcpStructure = 'InvalidMcpStructure',
+  ManifestNotSupported = 'ManifestNotSupported',
+}
+
+// 移除 isDuplicate
+interface ParseSuccessResult {
+  identifier: string;
+  mcpConfig: McpConfig & { type: 'stdio' | 'http' };
+  status: 'success';
+}
+
+interface ParseErrorResult {
+  errorCode: McpParseErrorCode;
+  // identifier 字段仍然可能有用，用于在结构错误时也能显示用户输入的 ID
+  identifier?: string;
+  status: 'error';
+}
+
+interface ParseNoOpResult {
+  status: 'noop';
+}
+
+export type ParseResult = ParseSuccessResult | ParseErrorResult | ParseNoOpResult;
+
+export const parseMcpInput = (value: string): ParseResult => {
+  const parsedJson = safeParseJSON<ParsedMcpInput | McpServers>(value);
+
+  if (parsedJson && typeof parsedJson === 'object' && !Array.isArray(parsedJson)) {
+    // 1. Check for the nested "mcpServers" structure
+    if (
+      'mcpServers' in parsedJson &&
+      typeof parsedJson.mcpServers === 'object' &&
+      parsedJson.mcpServers !== null
+    ) {
+      const mcpKeys = Object.keys(parsedJson.mcpServers);
+
+      if (mcpKeys.length > 0) {
+        const identifier = mcpKeys[0];
+        // @ts-expect-error type 不一样
+        const mcpConfig = parsedJson.mcpServers[identifier];
+
+        if (mcpConfig && typeof mcpConfig === 'object' && !Array.isArray(mcpConfig)) {
+          let type: 'stdio' | 'http' | undefined;
+          let resultMcpConfig: McpConfig & { type?: 'stdio' | 'http' } = {};
+
+          if (mcpConfig.command && Array.isArray(mcpConfig.args)) {
+            type = 'stdio';
+            resultMcpConfig = { ...mcpConfig, type };
+          } else if (mcpConfig.url) {
+            type = 'http';
+            resultMcpConfig = { type, url: mcpConfig.url };
+          } else {
+            return {
+              errorCode: McpParseErrorCode.InvalidMcpStructure,
+              identifier,
+              status: 'error',
+            };
+          }
+
+          return {
+            identifier,
+            mcpConfig: resultMcpConfig as McpConfig & { type: 'stdio' | 'http' },
+            status: 'success',
+          };
+        }
+        // mcpConfig is invalid or not an object
+        return {
+          errorCode: McpParseErrorCode.InvalidMcpStructure,
+          identifier: identifier,
+          status: 'error',
+        };
+      } else {
+        // mcpServers object is empty
+        return { errorCode: McpParseErrorCode.EmptyMcpServers, status: 'error' };
+      }
+    }
+    // 3. Check for the flat structure (identifier as top-level key)
+    else {
+      const topLevelKeys = Object.keys(parsedJson);
+
+      // Allow exactly one top-level key which is the identifier
+      if (topLevelKeys.length === 1) {
+        const identifier = topLevelKeys[0];
+        // biome-ignore lint/suspicious/noExplicitAny: <explanation>
+        const mcpConfig = (parsedJson as any)[identifier];
+
+        if (mcpConfig && typeof mcpConfig === 'object' && !Array.isArray(mcpConfig)) {
+          let type: 'stdio' | 'http' | undefined;
+          let resultMcpConfig: McpConfig & { type?: 'stdio' | 'http' } = {};
+
+          // Explicitly check properties of mcpConfig
+          if (mcpConfig.command && Array.isArray(mcpConfig.args)) {
+            type = 'stdio';
+            resultMcpConfig = { ...mcpConfig, type };
+          } else if (mcpConfig.url) {
+            type = 'http';
+            // For the flat structure, ensure only 'url' is included for http type
+            resultMcpConfig = { type, url: mcpConfig.url };
+          } else {
+            // Invalid structure within the identifier's value
+            return {
+              errorCode: McpParseErrorCode.InvalidMcpStructure,
+              identifier, // We have the identifier here
+              status: 'error',
+            };
+          }
+
+          // Structure parsed successfully
+          return {
+            identifier,
+            mcpConfig: resultMcpConfig as McpConfig & { type: 'stdio' | 'http' },
+            status: 'success',
+          };
+        } else {
+          // The value associated with the single key is not a valid config object
+          return { errorCode: McpParseErrorCode.InvalidMcpStructure, identifier, status: 'error' };
+        }
+      } else {
+        // Neither mcpServers nor manifest, and not a single top-level key structure
+        return { errorCode: McpParseErrorCode.InvalidJsonStructure, status: 'error' };
+      }
+    }
+  }
+
+  // Input is not a valid JSON object or failed safeParseJSON
+  return { status: 'noop' }; // Or potentially InvalidJsonStructure if safeParse failed but wasn't null/undefined?
+};

package/src/features/PluginDevModal/index.tsx

@@ -36,10 +36,14 @@ const DevModal = memo<DevModalProps>(
       form.setFieldsValue(value);
     }, []);
 
+    useEffect(() => {
+      if (mode === 'create' && !open) form.resetFields();
+    }, [open]);
+
     const buttonStyle = mobile ? { flex: 1 } : { margin: 0 };
 
     const footer = (
-      <Flexbox flex={1} gap={12} horizontal justify={'flex-end'}>
+      <Flexbox flex={1} gap={12} horizontal justify={'space-between'}>
         {isEditMode ? (
           <Popconfirm
             arrow={false}
@@ -60,25 +64,29 @@ const DevModal = memo<DevModalProps>(
               {t('delete', { ns: 'common' })}
             </Button>
           </Popconfirm>
-        ) : null}
-        <Button
-          onClick={() => {
-            onOpenChange(false);
-          }}
-          style={buttonStyle}
-        >
-          {t('cancel', { ns: 'common' })}
-        </Button>
-        <Button
-          loading={submitting}
-          onClick={() => {
-            form.submit();
-          }}
-          style={buttonStyle}
-          type={'primary'}
-        >
-          {t(isEditMode ? 'dev.update' : 'dev.save')}
-        </Button>
+        ) : (
+          <div />
+        )}
+        <Flexbox gap={12} horizontal>
+          <Button
+            onClick={() => {
+              onOpenChange(false);
+            }}
+            style={buttonStyle}
+          >
+            {t('cancel', { ns: 'common' })}
+          </Button>
+          <Button
+            loading={submitting}
+            onClick={() => {
+              form.submit();
+            }}
+            style={buttonStyle}
+            type={'primary'}
+          >
+            {t(isEditMode ? 'dev.update' : 'dev.save')}
+          </Button>
+        </Flexbox>
       </Flexbox>
     );
 
@@ -100,6 +108,7 @@ const DevModal = memo<DevModalProps>(
       >
         <Modal
           allowFullscreen
+          destroyOnClose
           footer={footer}
           okText={t('dev.save')}
           onCancel={(e) => {
@@ -166,10 +175,10 @@ const DevModal = memo<DevModalProps>(
                   showIcon
                   type={'info'}
                 />
-                <UrlManifestForm form={form} isEditMode={mode === 'edit'} />
+                <UrlManifestForm form={form} isEditMode={isEditMode} />
               </>
             )}
-            {configMode === 'mcp' && <MCPManifestForm form={form} />}
+            {configMode === 'mcp' && <MCPManifestForm form={form} isEditMode={isEditMode} />}
             <PluginPreview form={form} />
           </Flexbox>
         </Modal>

package/src/libs/agent-runtime/utils/openaiCompatibleFactory/index.ts

@@ -354,7 +354,7 @@ export const LobeOpenAICompatibleFactory = <T extends Record<string, any> = any>
     async textToImage(payload: TextToImagePayload) {
       try {
         const res = await this.client.images.generate(payload);
-        return res.data.map((o) => o.url) as string[];
+        return (res.data || []).map((o) => o.url) as string[];
       } catch (error) {
         throw this.handleError(error);
       }

package/src/locales/default/plugin.ts

@@ -7,6 +7,7 @@ export default {
     payload: '插件载荷',
     pluginState: '插件 State',
     response: '返回结果',
+    title: '插件详情',
     tool_call: '工具调用请求',
   },
   detailModal: {
@@ -50,11 +51,13 @@ export default {
         desc: '传递给 STDIO 命令的参数列表，一般在这里输入 MCP 服务器名称',
         label: '命令参数',
         placeholder: '例如：mcp-hello-world',
+        required: '请输入启动参数',
       },
       command: {
         desc: '用于启动 MCP STDIO Server 的可执行文件或脚本',
         label: '命令',
         placeholder: '例如：npx / uv / docker 等',
+        required: '请输入启动命令',
       },
       endpoint: {
         desc: '输入你的 MCP Streamable HTTP Server 的地址',
@@ -62,25 +65,31 @@ export default {
       },
       identifier: {
         desc: '为你的 MCP 插件指定一个名称，需要使用英文字符',
-        invalid: '只能输入英文字符、数字 、- 和_ 这两个符号',
+        invalid: '标识符只能包含字母、数字、连字符和下划线',
         label: 'MCP 插件名称',
         placeholder: '例如：my-mcp-plugin',
+        required: '请输入 MCP 服务标识符',
       },
+      previewManifest: '预览插件描述文件',
+      testConnection: '测试连接',
+      testConnectionTip: '测试连接成功后 MCP 插件才可以被正常使用',
       type: {
         desc: '选择 MCP 插件的通信方式，网页版只支持 Streamable HTTP',
         httpFeature1: '兼容网页版与桌面端',
-        httpFeature2: '连接远程 MCP 服务端, 无需额外安装配置',
+        httpFeature2: '连接远程 MCP 服务器, 无需额外安装配置',
         httpShortDesc: '基于流式 HTTP 的通信协议',
         label: 'MCP 插件类型',
         stdioFeature1: '更低的通信延迟, 适合本地执行',
-        stdioFeature2: '通过系统标准输入输出通信，需在本地安装运行 MCP 服务端',
+        stdioFeature2: '需在本地安装运行 MCP 服务器',
         stdioNotAvailable: 'STDIO 模式仅在桌面版可用',
         stdioShortDesc: '基于标准输入输出的通信协议',
         title: 'MCP 插件类型',
       },
       url: {
         desc: '输入你的 MCP Server Streamable HTTP 地址，不会以 /sse 结尾',
+        invalid: '请输入有效的 URL 地址',
         label: 'Streamable HTTP Endpoint URL',
+        required: '请输入 MCP 服务 URL',
       },
     },
     meta: {
@@ -108,12 +117,14 @@ export default {
         label: '标识符',
         pattenErrorMessage: '只能输入英文字符、数字 、- 和_ 这两个符号',
       },
+      lobe: '{{appName}} 插件',
       manifest: {
         desc: '{{appName}}将会通过该链接安装插件',
         label: '插件描述文件 (Manifest) URL',
         preview: '预览 Manifest',
         refresh: '刷新',
       },
+      openai: 'OpenAI 插件',
       title: {
         desc: '插件标题',
         label: '标题',
@@ -156,6 +167,7 @@ export default {
     noManifest: '描述文件不存在',
     openAPIInvalid: 'OpenAPI 解析失败，错误: \n\n {{error}}',
     reinstallError: '插件 {{name}} 刷新失败',
+    testConnectionFailed: '获取 Manifest 失败: {{error}}',
     urlError: '该链接没有返回 JSON 格式的内容, 请确保是有效的链接',
   },
   inspector: {
@@ -234,5 +246,6 @@ export default {
     },
     title: '插件商店',
   },
+  unknownError: '未知错误',
   unknownPlugin: '未知插件',
 };

package/src/server/services/mcp/index.ts

@@ -1,4 +1,5 @@
 import { LobeChatPluginApi, LobeChatPluginManifest, PluginSchema } from '@lobehub/chat-plugin-sdk';
+import { McpError } from '@modelcontextprotocol/sdk/types.js';
 import { TRPCError } from '@trpc/server';
 import debug from 'debug';
 
@@ -61,6 +62,12 @@ class MCPService {
 
       return result;
     } catch (error) {
+      if (error instanceof McpError) {
+        const mcpError = error as McpError;
+
+        return mcpError.message;
+      }
+
       console.error(`Error calling tool "${toolName}" for params %O:`, params, error);
       // Propagate a TRPCError
       throw new TRPCError({