@lobehub/chat 1.109.0 → 1.110.0

package/src/features/ProtocolUrlHandler/InstallPlugin/OfficialPluginInstallModal/Detail.tsx

@@ -0,0 +1,44 @@
+'use client';
+
+import { memo, useState } from 'react';
+import { Flexbox } from 'react-layout-kit';
+
+import MCPInstallProgress from '@/features/MCP/MCPInstallProgress';
+import Deployment from '@/features/MCPPluginDetail/Deployment';
+import { DetailContextConfig, DetailProvider } from '@/features/MCPPluginDetail/DetailProvider';
+import Header from '@/features/MCPPluginDetail/Header';
+import Nav from '@/features/MCPPluginDetail/Nav';
+import Overview from '@/features/MCPPluginDetail/Overview';
+import Schema from '@/features/MCPPluginDetail/Schema';
+import Score from '@/features/MCPPluginDetail/Score';
+import { McpNavKey } from '@/types/discover';
+
+interface OfficialDetailProps {
+  data: DetailContextConfig;
+  identifier: string;
+}
+
+const OfficialDetail = memo<OfficialDetailProps>(({ data, identifier }) => {
+  const [activeTab, setActiveTab] = useState(McpNavKey.Overview);
+
+  return (
+    <DetailProvider config={data}>
+      <Flexbox gap={16}>
+        <Header inModal />
+        <MCPInstallProgress identifier={identifier} />
+
+        <Nav activeTab={activeTab as McpNavKey} inModal noSettings setActiveTab={setActiveTab} />
+        <Flexbox gap={24}>
+          {activeTab === McpNavKey.Overview && <Overview inModal />}
+          {activeTab === McpNavKey.Deployment && <Deployment />}
+          {activeTab === McpNavKey.Schema && <Schema />}
+          {activeTab === McpNavKey.Score && <Score />}
+        </Flexbox>
+      </Flexbox>
+    </DetailProvider>
+  );
+});
+
+OfficialDetail.displayName = 'OfficialDetail';
+
+export default OfficialDetail;

package/src/features/ProtocolUrlHandler/InstallPlugin/OfficialPluginInstallModal/index.tsx

@@ -0,0 +1,105 @@
+'use client';
+
+import { Block, Modal, Text } from '@lobehub/ui';
+import { App } from 'antd';
+import { memo, useCallback, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import DetailLoading from '@/features/PluginStore/McpList/Detail/Loading';
+import { useAgentStore } from '@/store/agent';
+import { useDiscoverStore } from '@/store/discover';
+import { useToolStore } from '@/store/tool';
+import { pluginSelectors } from '@/store/tool/slices/plugin/selectors';
+
+import { McpInstallRequest } from '../types';
+import OfficialDetail from './Detail';
+
+interface OfficialPluginInstallModalProps {
+  installRequest: McpInstallRequest | null;
+  onComplete: () => void;
+}
+
+const OfficialPluginInstallModal = memo<OfficialPluginInstallModalProps>(
+  ({ installRequest, onComplete }) => {
+    const { message } = App.useApp();
+    const { t } = useTranslation(['plugin', 'common']);
+    const [loading, setLoading] = useState(false);
+
+    // 获取 MCP 插件详情
+    const useMcpDetail = useDiscoverStore((s) => s.useFetchMcpDetail);
+    const identifier = installRequest?.pluginId || '';
+
+    const [installed, installMCPPlugin] = useToolStore((s) => [
+      pluginSelectors.isPluginInstalled(identifier!)(s),
+
+      s.installMCPPlugin,
+    ]);
+    const togglePlugin = useAgentStore((s) => s.togglePlugin);
+
+    const { data, isLoading } = useMcpDetail({ identifier });
+
+    const handleConfirm = useCallback(async () => {
+      if (!installRequest || !data) return;
+
+      setLoading(true);
+      try {
+        setLoading(true);
+        await installMCPPlugin(identifier);
+        await togglePlugin(identifier);
+        setLoading(false);
+
+        message.success(t('protocolInstall.messages.installSuccess', { name: data.name }));
+        onComplete();
+      } catch (error) {
+        console.error('Official plugin installation error:', error);
+        message.error(t('protocolInstall.messages.installError'));
+        setLoading(false);
+      }
+    }, [installRequest, data]);
+
+    if (!installRequest) return null;
+
+    // 渲染内容
+    const renderContent = () => {
+      // 如果正在加载，显示骨架屏
+      if (isLoading || !identifier) {
+        return <DetailLoading />;
+      }
+
+      // 如果加载失败或没有数据，显示错误信息
+      if (!data) {
+        return (
+          <Block>
+            <Text type="danger">{t('protocolInstall.messages.manifestError')}</Text>
+          </Block>
+        );
+      }
+
+      return <OfficialDetail data={data} identifier={identifier} />;
+    };
+
+    return (
+      <Modal
+        confirmLoading={loading}
+        okButtonProps={{
+          disabled: installed || isLoading,
+          type: installed ? 'default' : 'primary',
+        }}
+        okText={
+          installed ? t('protocolInstall.actions.installed') : t('protocolInstall.actions.install')
+        }
+        onCancel={onComplete}
+        onOk={handleConfirm}
+        open
+        title={t('protocolInstall.official.title')}
+        width={800}
+      >
+        {renderContent()}
+      </Modal>
+    );
+  },
+);
+
+OfficialPluginInstallModal.displayName = 'OfficialPluginInstallModal';
+
+export default OfficialPluginInstallModal;

package/src/features/ProtocolUrlHandler/InstallPlugin/index.tsx

@@ -0,0 +1,55 @@
+'use client';
+
+import { memo } from 'react';
+
+import CustomPluginInstallModal from './CustomPluginInstallModal';
+import OfficialPluginInstallModal from './OfficialPluginInstallModal';
+import { McpInstallRequest, PluginSource } from './types';
+
+interface PluginInstallConfirmModalProps {
+  installRequest: McpInstallRequest | null;
+  onComplete: () => void;
+}
+
+/**
+ * 根据安装请求的来源确定插件类型
+ */
+const getPluginSource = (request: McpInstallRequest): PluginSource => {
+  const { marketId } = request;
+
+  // 官方 LobeHub 插件
+  if (marketId === 'lobehub') {
+    return PluginSource.OFFICIAL;
+  }
+
+  // 第三方市场插件（包括可信和不可信的）
+  if (marketId && marketId !== 'lobehub') {
+    return PluginSource.MARKETPLACE;
+  }
+
+  // 自定义插件（没有 marketId）
+  return PluginSource.CUSTOM;
+};
+
+const PluginInstallConfirmModal = memo<PluginInstallConfirmModalProps>(
+  ({ installRequest, onComplete }) => {
+    if (!installRequest) return null;
+
+    const pluginSource = getPluginSource(installRequest);
+
+    if (pluginSource === PluginSource.OFFICIAL)
+      return <OfficialPluginInstallModal installRequest={installRequest} onComplete={onComplete} />;
+
+    return (
+      <CustomPluginInstallModal
+        installRequest={installRequest}
+        isMarketplace={pluginSource === PluginSource.MARKETPLACE}
+        onComplete={onComplete}
+      />
+    );
+  },
+);
+
+PluginInstallConfirmModal.displayName = 'PluginInstallConfirmModal';
+
+export default PluginInstallConfirmModal;

package/src/features/ProtocolUrlHandler/InstallPlugin/types.ts

@@ -0,0 +1,45 @@
+import { McpInstallSchema } from '@lobechat/electron-client-ipc';
+
+export enum PluginSource {
+  CUSTOM = 'custom',
+  MARKETPLACE = 'marketplace',
+  OFFICIAL = 'official',
+}
+
+export interface McpInstallRequest {
+  marketId?: string;
+  pluginId: string;
+  schema?: McpInstallSchema;
+  source: string;
+}
+
+export interface BaseContentProps {
+  installRequest: McpInstallRequest;
+}
+
+export interface ModalConfig {
+  okText: string;
+  title: string;
+  width?: number;
+}
+
+// 可信的第三方市场列表
+export const TRUSTED_MARKETPLACES = {
+  higress: {
+    description: 'Enterprise-grade MCP plugins for cloud-native applications',
+    name: 'Higress Marketplace',
+    website: 'https://higress.ai',
+  },
+  mcprouter: {
+    description: 'Community-driven MCP plugin marketplace',
+    name: 'MCPRouter',
+    website: 'https://mcprouter.com',
+  },
+  smithery: {
+    description: 'Professional MCP plugins and tools',
+    name: 'Smithery',
+    website: 'https://smithery.ai',
+  },
+} as const;
+
+export type TrustedMarketplaceId = keyof typeof TRUSTED_MARKETPLACES;

package/src/features/ProtocolUrlHandler/index.tsx

@@ -0,0 +1,30 @@
+'use client';
+
+import { useWatchBroadcast } from '@lobechat/electron-client-ipc';
+import { useCallback, useState } from 'react';
+
+import { McpInstallRequest } from '@/features/ProtocolUrlHandler/InstallPlugin/types';
+
+import PluginInstallConfirmModal from './InstallPlugin';
+
+const ProtocolUrlHandler = () => {
+  const [installRequest, setInstallRequest] = useState<McpInstallRequest | null>(null);
+
+  const handleMcpInstallRequest = useCallback(
+    (data: { marketId?: string; pluginId: string; schema: any }) => {
+      // 将原始数据传递给子组件处理
+      setInstallRequest(data as McpInstallRequest);
+    },
+    [],
+  );
+
+  const handleComplete = useCallback(() => {
+    setInstallRequest(null);
+  }, []);
+
+  useWatchBroadcast('mcpInstallRequest', handleMcpInstallRequest);
+
+  return <PluginInstallConfirmModal installRequest={installRequest} onComplete={handleComplete} />;
+};
+
+export default ProtocolUrlHandler;

package/src/libs/model-runtime/anthropic/index.ts

@@ -27,6 +27,9 @@ type anthropicTools = Anthropic.Tool | Anthropic.WebSearchTool20250305;
 
 const modelsWithSmallContextWindow = new Set(['claude-3-opus-20240229', 'claude-3-haiku-20240307']);
 
+// Opus 4.1 models that don't allow both temperature and top_p parameters
+const opus41Models = new Set(['claude-opus-4-1', 'claude-opus-4-1-20250805']);
+
 const DEFAULT_BASE_URL = 'https://api.anthropic.com';
 
 interface AnthropicAIParams extends ClientOptions {
@@ -189,6 +192,10 @@ export class LobeAnthropicAI implements LobeRuntimeAI {
       } satisfies Anthropic.MessageCreateParams;
     }
 
+    // For Opus 4.1 models, we can only set either temperature OR top_p, not both
+    const isOpus41Model = opus41Models.has(model);
+    const shouldSetTemperature = payload.temperature !== undefined;
+
     return {
       // claude 3 series model hax max output token of 4096, 3.x series has 8192
       // https://docs.anthropic.com/en/docs/about-claude/models/all-models#:~:text=200K-,Max%20output,-Normal%3A
@@ -196,9 +203,15 @@ export class LobeAnthropicAI implements LobeRuntimeAI {
       messages: postMessages,
       model,
       system: systemPrompts,
-      temperature: payload.temperature !== undefined ? temperature / 2 : undefined,
+      // For Opus 4.1 models: prefer temperature over top_p if both are provided
+      temperature: isOpus41Model 
+        ? (shouldSetTemperature ? temperature / 2 : undefined)
+        : (payload.temperature !== undefined ? temperature / 2 : undefined),
       tools: postTools,
-      top_p,
+      // For Opus 4.1 models: only set top_p if temperature is not set
+      top_p: isOpus41Model 
+        ? (shouldSetTemperature ? undefined : top_p)
+        : top_p,
     } satisfies Anthropic.MessageCreateParams;
   }
 

package/src/libs/model-runtime/utils/modelParse.ts

@@ -30,8 +30,8 @@ export const MODEL_LIST_CONFIGS = {
   },
   openai: {
     excludeKeywords: ['audio'],
-    functionCallKeywords: ['4o', '4.1', 'o3', 'o4'],
-    reasoningKeywords: ['o1', 'o3', 'o4'],
+    functionCallKeywords: ['4o', '4.1', 'o3', 'o4', 'oss'],
+    reasoningKeywords: ['o1', 'o3', 'o4', 'oss'],
     visionKeywords: ['4o', '4.1', 'o4'],
   },
   qwen: {

package/src/libs/model-runtime/utils/streams/ollama.test.ts

@@ -7,63 +7,109 @@ import { OllamaStream } from './ollama';
 
 describe('OllamaStream', () => {
   describe('should transform Ollama stream to protocol stream', () => {
-    it('reasoning', async () => {
-      vi.spyOn(uuidModule, 'nanoid').mockReturnValueOnce('2');
-
-      const messages = [
-        '<think>',
-        '这是一个思考过程',
-        '，需要仔细分析问题。',
-        '</think>',
-        '根据分析，我的答案是：',
-        '这是最终答案。',
-      ];
+    describe('reasoning', () => {
+      it('reasoning with thinking tag', async () => {
+        vi.spyOn(uuidModule, 'nanoid').mockReturnValueOnce('2');
 
-      const mockOllamaStream = new ReadableStream<ChatResponse>({
-        start(controller) {
-          messages.forEach((content) => {
-            controller.enqueue({ message: { content }, done: false } as ChatResponse);
-          });
-          controller.enqueue({ message: { content: '' }, done: true } as ChatResponse);
-          controller.close();
-        },
+        const messages = [
+          '<think>',
+          '这是一个思考过程',
+          '，需要仔细分析问题。',
+          '</think>',
+          '根据分析，我的答案是：',
+          '这是最终答案。',
+        ];
+
+        const mockOllamaStream = new ReadableStream<ChatResponse>({
+          start(controller) {
+            messages.forEach((content) => {
+              controller.enqueue({ message: { content }, done: false } as ChatResponse);
+            });
+            controller.enqueue({ message: { content: '' }, done: true } as ChatResponse);
+            controller.close();
+          },
+        });
+
+        const protocolStream = OllamaStream(mockOllamaStream);
+
+        const decoder = new TextDecoder();
+        const chunks = [];
+
+        // @ts-ignore
+        for await (const chunk of protocolStream) {
+          chunks.push(decoder.decode(chunk, { stream: true }));
+        }
+
+        expect(chunks).toEqual(
+          [
+            'id: chat_2',
+            'event: reasoning',
+            `data: ""\n`,
+            'id: chat_2',
+            'event: reasoning',
+            `data: "这是一个思考过程"\n`,
+            'id: chat_2',
+            'event: reasoning',
+            `data: "，需要仔细分析问题。"\n`,
+            'id: chat_2',
+            'event: text',
+            `data: ""\n`,
+            'id: chat_2',
+            'event: text',
+            `data: "根据分析，我的答案是："\n`,
+            'id: chat_2',
+            'event: text',
+            `data: "这是最终答案。"\n`,
+            'id: chat_2',
+            'event: stop',
+            `data: "finished"\n`,
+          ].map((line) => `${line}\n`),
+        );
       });
 
-      const protocolStream = OllamaStream(mockOllamaStream);
+      it('thinking field', async () => {
+        vi.spyOn(uuidModule, 'nanoid').mockReturnValueOnce('1');
 
-      const decoder = new TextDecoder();
-      const chunks = [];
+        const mockOllamaStream = new ReadableStream<ChatResponse>({
+          start(controller) {
+            controller.enqueue({ message: { thinking: 'Hello' }, done: false } as ChatResponse);
+            controller.enqueue({ message: { thinking: ' world!' }, done: false } as ChatResponse);
+            controller.enqueue({ message: { thinking: '' }, done: true } as ChatResponse);
 
-      // @ts-ignore
-      for await (const chunk of protocolStream) {
-        chunks.push(decoder.decode(chunk, { stream: true }));
-      }
+            controller.close();
+          },
+        });
 
-      expect(chunks).toEqual(
-        [
-          'id: chat_2',
-          'event: reasoning',
-          `data: ""\n`,
-          'id: chat_2',
-          'event: reasoning',
-          `data: "这是一个思考过程"\n`,
-          'id: chat_2',
-          'event: reasoning',
-          `data: "，需要仔细分析问题。"\n`,
-          'id: chat_2',
-          'event: text',
-          `data: ""\n`,
-          'id: chat_2',
-          'event: text',
-          `data: "根据分析，我的答案是："\n`,
-          'id: chat_2',
-          'event: text',
-          `data: "这是最终答案。"\n`,
-          'id: chat_2',
-          'event: stop',
-          `data: "finished"\n`,
-        ].map((line) => `${line}\n`),
-      );
+        const onStartMock = vi.fn();
+        const onTextMock = vi.fn();
+        const onCompletionMock = vi.fn();
+
+        const protocolStream = OllamaStream(mockOllamaStream, {
+          onStart: onStartMock,
+          onText: onTextMock,
+          onCompletion: onCompletionMock,
+        });
+
+        const decoder = new TextDecoder();
+        const chunks = [];
+
+        // @ts-ignore
+        for await (const chunk of protocolStream) {
+          chunks.push(decoder.decode(chunk, { stream: true }));
+        }
+
+        expect(chunks).toEqual([
+          'id: chat_1\n',
+          'event: reasoning\n',
+          `data: "Hello"\n\n`,
+          'id: chat_1\n',
+          'event: reasoning\n',
+          `data: " world!"\n\n`,
+          'id: chat_1\n',
+          'event: stop\n',
+          `data: "finished"\n\n`,
+        ]);
+      });
     });
 
     it('text', async () => {

package/src/libs/model-runtime/utils/streams/ollama.ts

@@ -17,6 +17,10 @@ const transformOllamaStream = (chunk: ChatResponse, stack: StreamContext): Strea
     return { data: 'finished', id: stack.id, type: 'stop' };
   }
 
+  if (chunk.message.thinking) {
+    return { data: chunk.message.thinking, id: stack.id, type: 'reasoning' };
+  }
+
   if (chunk.message.tool_calls && chunk.message.tool_calls.length > 0) {
     return {
       data: chunk.message.tool_calls.map((value, index) => ({

package/src/locales/default/plugin.ts

@@ -308,6 +308,66 @@ export default {
     skipDependencies: '跳过检查',
   },
   pluginList: '插件列表',
+  protocolInstall: {
+    actions: {
+      install: '安装',
+      installAnyway: '仍要安装',
+      installed: '已安装',
+    },
+    config: {
+      args: '参数',
+      command: '命令',
+      env: '环境变量',
+      headers: '请求头',
+      title: '配置信息',
+      type: {
+        http: '类型: HTTP',
+        label: '类型',
+        stdio: '类型: Stdio',
+      },
+      url: '服务地址',
+    },
+    custom: {
+      badge: '自定义插件',
+      security: {
+        description: '此插件未经过官方验证，安装可能存在安全风险！请确保您信任插件来源。',
+        title: '⚠️ 安全风险提示',
+      },
+      title: '安装自定义插件',
+    },
+    marketplace: {
+      title: '安装第三方插件',
+      trustedBy: '由 {{name}} 提供',
+      unverified: {
+        title: '未经验证的第三方插件',
+        warning: '此插件来自未验证的第三方市场，安装前请确认您信任该来源。',
+      },
+      verified: '已验证',
+    },
+    messages: {
+      connectionTestFailed: '连接测试失败',
+      installError: '插件安装失败，请重试',
+      installSuccess: '插件 {{name}} 安装成功！',
+      manifestError: '获取插件详情失败，请检查网络连接后重试',
+      manifestNotFound: '未能获取插件描述文件',
+    },
+    meta: {
+      author: '作者',
+      homepage: '主页',
+      identifier: '标识符',
+      source: '来源',
+      version: '版本',
+    },
+    official: {
+      badge: 'LobeHub 官方插件',
+      description: '此插件由 LobeHub 官方开发和维护，经过严格的安全审核，可放心使用。',
+      loadingMessage: '正在获取插件详情...',
+      loadingTitle: '加载中',
+      title: '安装官方插件',
+    },
+    title: '安装 MCP 插件',
+    warning: '⚠️ 请确认您信任此插件的来源，恶意插件可能会危害您的系统安全。',
+  },
   search: {
     apiName: {
       crawlMultiPages: '读取多个页面内容',