@lobehub/lobehub 2.1.3 → 2.1.5

package/packages/model-runtime/src/core/openaiCompatibleFactory/index.ts

@@ -73,6 +73,7 @@ export interface OpenAICompatibleFactoryOptions<T extends Record<string, any> =
   baseURL?: string;
   chatCompletion?: {
     excludeUsage?: boolean;
+    forceImageBase64?: boolean;
     handleError?: (
       error: any,
       options: ConstructorOptions<T>,
@@ -387,7 +388,9 @@ export const createOpenAICompatibleRuntime = <T extends Record<string, any> = an
           this.baseURL = targetBaseURL;
         }
 
-        const messages = await convertOpenAIMessages(postPayload.messages);
+        const messages = await convertOpenAIMessages(postPayload.messages, {
+          forceImageBase64: chatCompletion?.forceImageBase64,
+        });
 
         let response: Stream<OpenAI.Chat.Completions.ChatCompletionChunk>;
 
@@ -877,7 +880,9 @@ export const createOpenAICompatibleRuntime = <T extends Record<string, any> = an
       delete res.frequency_penalty;
       delete res.presence_penalty;
 
-      const input = await convertOpenAIResponseInputs(messages as any);
+      const input = await convertOpenAIResponseInputs(messages as any, {
+        forceImageBase64: chatCompletion?.forceImageBase64,
+      });
 
       const isStreaming = payload.stream !== false;
       log(
@@ -1006,7 +1011,9 @@ export const createOpenAICompatibleRuntime = <T extends Record<string, any> = an
 
       if (shouldUseResponses) {
         log('calling responses.create for tool calling');
-        const input = await convertOpenAIResponseInputs(messages as any);
+        const input = await convertOpenAIResponseInputs(messages as any, {
+          forceImageBase64: chatCompletion?.forceImageBase64,
+        });
 
         const res = await this.client.responses.create(
           {

package/packages/model-runtime/src/core/streams/google/google-ai.test.ts

@@ -251,16 +251,16 @@ describe('GoogleGenerativeAIStream', () => {
       expect(chunks).toEqual(
         [
           'id: chat_1',
-          'event: content_part',
-          'data: {"content":"234","partType":"text"}\n',
+          'event: text',
+          'data: "234"\n',
 
           'id: chat_1',
           'event: text',
           'data: ""\n',
 
           'id: chat_1',
-          'event: content_part',
-          `data: {"content":"567890\\n","partType":"text"}\n`,
+          'event: text',
+          `data: "567890\\n"\n`,
           // stop
           'id: chat_1',
           'event: stop',
@@ -384,12 +384,12 @@ describe('GoogleGenerativeAIStream', () => {
           `data: {"content":"**Finalizing Interpretation**\\n\\n","inReasoning":true,"partType":"text"}\n`,
 
           'id: chat_1',
-          'event: content_part',
-          `data: {"content":"简单来说，","partType":"text"}\n`,
+          'event: text',
+          'data: "简单来说，"\n',
 
           'id: chat_1',
-          'event: content_part',
-          `data: {"content":"文本内容。","partType":"text"}\n`,
+          'event: text',
+          'data: "文本内容。"\n',
           // stop
           'id: chat_1',
           'event: stop',
@@ -471,12 +471,12 @@ describe('GoogleGenerativeAIStream', () => {
       expect(chunks).toEqual(
         [
           'id: chat_1',
-          'event: content_part',
-          'data: {"content":"234","partType":"text"}\n',
+          'event: text',
+          'data: "234"\n',
 
           'id: chat_1',
-          'event: content_part',
-          `data: {"content":"567890\\n","partType":"text"}\n`,
+          'event: text',
+          'data: "567890\\n"\n',
           // stop
           'id: chat_1',
           'event: stop',
@@ -1103,7 +1103,7 @@ describe('GoogleGenerativeAIStream', () => {
               content: {
                 parts: [
                   {
-                    text: '**Planning the Solution**\n\nI\'m solidifying my plan...',
+                    text: "**Planning the Solution**\n\nI'm solidifying my plan...",
                     thought: true,
                   },
                 ],
@@ -1901,5 +1901,46 @@ describe('GoogleGenerativeAIStream', () => {
         ].map((i) => i + '\n'),
       );
     });
+
+    it('should NOT use multimodal processing if only thoughtsTokenCount is present in metadata but no thought parts', async () => {
+      vi.spyOn(uuidModule, 'nanoid').mockReturnValueOnce('1');
+
+      const data = [
+        {
+          candidates: [
+            {
+              content: {
+                parts: [{ text: 'Hello world' }],
+                role: 'model',
+              },
+              index: 0,
+            },
+          ],
+          usageMetadata: {
+            promptTokenCount: 10,
+            candidatesTokenCount: 2,
+            totalTokenCount: 17,
+            thoughtsTokenCount: 5,
+          },
+          modelVersion: 'gemini-2.5-flash',
+        },
+      ];
+
+      const mockGoogleStream = new ReadableStream({
+        start(controller) {
+          data.forEach((item) => {
+            controller.enqueue(item);
+          });
+          controller.close();
+        },
+      });
+
+      const protocolStream = GoogleGenerativeAIStream(mockGoogleStream);
+      const chunks = await decodeStreamChunks(protocolStream);
+
+      // Should use 'text' event, not 'content_part'
+      expect(chunks).toContain('event: text\n');
+      expect(chunks).not.toContain('event: content_part\n');
+    });
   });
 });

package/packages/model-runtime/src/core/streams/google/index.ts

@@ -120,7 +120,6 @@ const transformGoogleGenerativeAIStream = (
     const hasReasoningParts = parts.some((p: any) => p.thought === true);
     const hasImageParts = parts.some((p: any) => p.inlineData);
     const hasThoughtSignature = parts.some((p: any) => p.thoughtSignature);
-    const hasThoughtsInMetadata = (usageMetadata as any)?.thoughtsTokenCount > 0;
 
     // Check model version to determine if new format should be used
     const modelVersion = (chunk as any).modelVersion || '';
@@ -144,8 +143,7 @@ const transformGoogleGenerativeAIStream = (
     // 1. There are reasoning parts in current chunk (thought: true)
     // 2. There are multiple parts with images (multimodal content)
     // 3. There are thoughtSignature in parts (reasoning metadata attached to content)
-    // 4. There is thoughtsTokenCount in metadata (indicates response contains reasoning)
-    // 5. This is Gemini 3 model with image generation (always use new format for consistency)
+    // 4. This is Gemini 3 model with image generation (always use new format for consistency)
     // BUT NOT for:
     // - The legacy single-image scenario
     // - Grounding metadata scenario (uses legacy text + grounding events)
@@ -153,7 +151,6 @@ const transformGoogleGenerativeAIStream = (
       (hasReasoningParts ||
         (hasImageParts && parts.length > 1) ||
         hasThoughtSignature ||
-        hasThoughtsInMetadata ||
         isGemini3Model) &&
       !isSingleImageWithFinish &&
       !hasGroundingMetadata;

package/packages/model-runtime/src/providers/moonshot/index.ts

@@ -15,8 +15,9 @@ export interface MoonshotModelCard {
 export const params = {
   baseURL: 'https://api.moonshot.cn/v1',
   chatCompletion: {
+    forceImageBase64: true,
     handlePayload: (payload: ChatStreamPayload) => {
-      const { enabledSearch, messages, temperature, tools, ...rest } = payload;
+      const { enabledSearch, messages, model, temperature, thinking, tools, ...rest } = payload;
 
       const filteredMessages = messages.map((message: any) => {
         let normalizedMessage = message;
@@ -51,12 +52,33 @@ export const params = {
           ]
         : tools;
 
-      // Resolve parameters with normalization
+      const isK25Model = model === 'kimi-k2.5';
+
+      if (isK25Model) {
+        const thinkingParam =
+          thinking?.type === 'disabled' ? { type: 'disabled' } : { type: 'enabled' };
+        const isThinkingEnabled = thinkingParam.type === 'enabled';
+
+        return {
+          ...rest,
+          frequency_penalty: 0,
+          messages: filteredMessages,
+          model,
+          presence_penalty: 0,
+          temperature: isThinkingEnabled ? 1 : 0.6,
+          thinking: thinkingParam,
+          tools: moonshotTools,
+          top_p: 0.95,
+        } as any;
+      }
+
+      // Resolve parameters with normalization for non-K2.5 models
       const resolvedParams = resolveParameters({ temperature }, { normalizeTemperature: true });
 
       return {
         ...rest,
         messages: filteredMessages,
+        model,
         temperature: resolvedParams.temperature,
         tools: moonshotTools,
       } as any;

package/packages/model-runtime/src/providers/qwen/index.ts

@@ -47,24 +47,25 @@ export const LobeQwenAI = createOpenAICompatibleRuntime({
         ...rest,
         ...(model.includes('-thinking')
           ? {
-              enable_thinking: true,
+            enable_thinking: true,
+            thinking_budget:
+              thinking?.budget_tokens === 0 ? 0 : thinking?.budget_tokens || undefined,
+          }
+          : [
+            'qwen3',
+            'qwen-turbo',
+            'qwen-plus',
+            'qwen-flash',
+            'deepseek-v3.1',
+            'deepseek-v3.2',
+            'glm',
+            'kimi-k2.5',
+          ].some((keyword) => model.toLowerCase().includes(keyword))
+            ? {
+              enable_thinking: thinking !== undefined ? thinking.type === 'enabled' : false,
               thinking_budget:
                 thinking?.budget_tokens === 0 ? 0 : thinking?.budget_tokens || undefined,
             }
-          : [
-                'qwen3',
-                'qwen-turbo',
-                'qwen-plus',
-                'qwen-flash',
-                'deepseek-v3.1',
-                'deepseek-v3.2',
-                'glm',
-              ].some((keyword) => model.toLowerCase().includes(keyword))
-            ? {
-                enable_thinking: thinking !== undefined ? thinking.type === 'enabled' : false,
-                thinking_budget:
-                  thinking?.budget_tokens === 0 ? 0 : thinking?.budget_tokens || undefined,
-              }
             : {}),
         frequency_penalty: undefined,
         model,

package/src/features/ChatInput/ActionBar/Tools/KlavisServerItem.tsx

@@ -15,6 +15,11 @@ const POLL_INTERVAL_MS = 1000; // 每秒轮询一次
 const POLL_TIMEOUT_MS = 15_000; // 15 秒超时
 
 interface KlavisServerItemProps {
+  /**
+   * Optional agent ID to use instead of currentAgentConfig
+   * Used in group profile to specify which member's plugins to toggle
+   */
+  agentId?: string;
   /**
    * Identifier used for storage (e.g., 'google-calendar')
    */
@@ -28,7 +33,7 @@ interface KlavisServerItemProps {
 }
 
 const KlavisServerItem = memo<KlavisServerItemProps>(
-  ({ identifier, label, server, serverName }) => {
+  ({ identifier, label, server, serverName, agentId }) => {
     const { t } = useTranslation('setting');
     const [isConnecting, setIsConnecting] = useState(false);
     const [isToggling, setIsToggling] = useState(false);
@@ -43,6 +48,10 @@ const KlavisServerItem = memo<KlavisServerItemProps>(
     const createKlavisServer = useToolStore((s) => s.createKlavisServer);
     const refreshKlavisServerTools = useToolStore((s) => s.refreshKlavisServerTools);
 
+    // Get effective agent ID (agentId prop or current active agent)
+    const activeAgentId = useAgentStore((s) => s.activeAgentId);
+    const effectiveAgentId = agentId || activeAgentId || '';
+
     // 清理所有定时器
     const cleanup = useCallback(() => {
       if (windowCheckIntervalRef.current) {
@@ -162,10 +171,24 @@ const KlavisServerItem = memo<KlavisServerItemProps>(
 
     // Get plugin ID for this server (使用 identifier 作为 pluginId)
     const pluginId = server ? server.identifier : '';
-    const [checked, togglePlugin] = useAgentStore((s) => [
-      agentSelectors.currentAgentPlugins(s).includes(pluginId),
-      s.togglePlugin,
-    ]);
+    const plugins =
+      useAgentStore(agentSelectors.getAgentConfigById(effectiveAgentId))?.plugins || [];
+    const checked = plugins.includes(pluginId);
+    const updateAgentConfigById = useAgentStore((s) => s.updateAgentConfigById);
+
+    // Toggle plugin for the effective agent
+    const togglePlugin = useCallback(
+      async (pluginIdToToggle: string) => {
+        if (!effectiveAgentId) return;
+        const currentPlugins = plugins;
+        const hasPlugin = currentPlugins.includes(pluginIdToToggle);
+        const newPlugins = hasPlugin
+          ? currentPlugins.filter((id) => id !== pluginIdToToggle)
+          : [...currentPlugins, pluginIdToToggle];
+        await updateAgentConfigById(effectiveAgentId, { plugins: newPlugins });
+      },
+      [effectiveAgentId, plugins, updateAgentConfigById],
+    );
 
     const handleConnect = async () => {
       if (!userId) {

package/src/features/ChatInput/ActionBar/Tools/LobehubSkillServerItem.tsx

@@ -13,6 +13,11 @@ const POLL_INTERVAL_MS = 1000;
 const POLL_TIMEOUT_MS = 15_000;
 
 interface LobehubSkillServerItemProps {
+  /**
+   * Optional agent ID to use instead of currentAgentConfig
+   * Used in group profile to specify which member's plugins to toggle
+   */
+  agentId?: string;
   /**
    * Display label for the provider
    */
@@ -23,7 +28,7 @@ interface LobehubSkillServerItemProps {
   provider: string;
 }
 
-const LobehubSkillServerItem = memo<LobehubSkillServerItemProps>(({ provider, label }) => {
+const LobehubSkillServerItem = memo<LobehubSkillServerItemProps>(({ provider, label, agentId }) => {
   const { t } = useTranslation('setting');
   const [isConnecting, setIsConnecting] = useState(false);
   const [isToggling, setIsToggling] = useState(false);
@@ -38,6 +43,10 @@ const LobehubSkillServerItem = memo<LobehubSkillServerItemProps>(({ provider, la
   const checkStatus = useToolStore((s) => s.checkLobehubSkillStatus);
   const getAuthorizeUrl = useToolStore((s) => s.getLobehubSkillAuthorizeUrl);
 
+  // Get effective agent ID (agentId prop or current active agent)
+  const activeAgentId = useAgentStore((s) => s.activeAgentId);
+  const effectiveAgentId = agentId || activeAgentId || '';
+
   const cleanup = useCallback(() => {
     if (windowCheckIntervalRef.current) {
       clearInterval(windowCheckIntervalRef.current);
@@ -129,10 +138,23 @@ const LobehubSkillServerItem = memo<LobehubSkillServerItemProps>(({ provider, la
   );
 
   const pluginId = server ? server.identifier : '';
-  const [checked, togglePlugin] = useAgentStore((s) => [
-    agentSelectors.currentAgentPlugins(s).includes(pluginId),
-    s.togglePlugin,
-  ]);
+  const plugins = useAgentStore(agentSelectors.getAgentConfigById(effectiveAgentId))?.plugins || [];
+  const checked = plugins.includes(pluginId);
+  const updateAgentConfigById = useAgentStore((s) => s.updateAgentConfigById);
+
+  // Toggle plugin for the effective agent
+  const togglePlugin = useCallback(
+    async (pluginIdToToggle: string) => {
+      if (!effectiveAgentId) return;
+      const currentPlugins = plugins;
+      const hasPlugin = currentPlugins.includes(pluginIdToToggle);
+      const newPlugins = hasPlugin
+        ? currentPlugins.filter((id) => id !== pluginIdToToggle)
+        : [...currentPlugins, pluginIdToToggle];
+      await updateAgentConfigById(effectiveAgentId, { plugins: newPlugins });
+    },
+    [effectiveAgentId, plugins, updateAgentConfigById],
+  );
 
   // Listen for OAuth success message from popup window
   useEffect(() => {
@@ -156,9 +178,10 @@ const LobehubSkillServerItem = memo<LobehubSkillServerItemProps>(({ provider, la
           .lobehubSkillServers?.find((s) => s.identifier === provider);
         if (latestServer?.status === LobehubSkillStatus.CONNECTED) {
           const newPluginId = latestServer.identifier;
-          const isAlreadyEnabled = agentSelectors
-            .currentAgentPlugins(useAgentStore.getState())
-            .includes(newPluginId);
+          const currentAgentPlugins =
+            agentSelectors.getAgentConfigById(effectiveAgentId)(useAgentStore.getState())
+              ?.plugins || [];
+          const isAlreadyEnabled = currentAgentPlugins.includes(newPluginId);
           if (!isAlreadyEnabled) {
             console.log('[LobehubSkill] Auto-enabling plugin:', newPluginId);
             togglePlugin(newPluginId);
@@ -169,7 +192,7 @@ const LobehubSkillServerItem = memo<LobehubSkillServerItemProps>(({ provider, la
 
     window.addEventListener('message', handleMessage);
     return () => window.removeEventListener('message', handleMessage);
-  }, [provider, cleanup, checkStatus, togglePlugin]);
+  }, [provider, cleanup, checkStatus, togglePlugin, effectiveAgentId]);
 
   const handleConnect = async () => {
     // 只有已连接状态才阻止重新连接

package/src/features/ChatInput/ActionBar/Tools/useControls.tsx

@@ -176,6 +176,7 @@ export const useControls = ({ setUpdating }: { setUpdating: (updating: boolean)
             key: type.identifier,
             label: (
               <KlavisServerItem
+                agentId={agentId}
                 identifier={type.identifier}
                 label={type.label}
                 server={getServerByName(type.identifier)}
@@ -184,7 +185,7 @@ export const useControls = ({ setUpdating }: { setUpdating: (updating: boolean)
             ),
           }))
         : [],
-    [isKlavisEnabledInEnv, allKlavisServers, installedKlavisIds, recommendedKlavisIds],
+    [isKlavisEnabledInEnv, allKlavisServers, installedKlavisIds, recommendedKlavisIds, agentId],
   );
 
   // LobeHub Skill Provider 列表项 - 只展示已安装或推荐的
@@ -197,10 +198,22 @@ export const useControls = ({ setUpdating }: { setUpdating: (updating: boolean)
           ).map((provider) => ({
             icon: <LobehubSkillIcon icon={provider.icon} label={provider.label} />,
             key: provider.id, // 使用 provider.id 作为 key，与 pluginId 保持一致
-            label: <LobehubSkillServerItem label={provider.label} provider={provider.id} />,
+            label: (
+              <LobehubSkillServerItem
+                agentId={agentId}
+                label={provider.label}
+                provider={provider.id}
+              />
+            ),
           }))
         : [],
-    [isLobehubSkillEnabled, allLobehubSkillServers, installedLobehubIds, recommendedLobehubIds],
+    [
+      isLobehubSkillEnabled,
+      allLobehubSkillServers,
+      installedLobehubIds,
+      recommendedLobehubIds,
+      agentId,
+    ],
   );
 
   // Builtin 工具列表项（不包含 Klavis 和 LobeHub Skill）

package/src/features/ProfileEditor/AgentTool.tsx

@@ -271,6 +271,7 @@ const AgentTool = memo<AgentToolProps>(
               key: type.identifier,
               label: (
                 <KlavisServerItem
+                  agentId={effectiveAgentId}
                   identifier={type.identifier}
                   label={type.label}
                   server={getServerByName(type.identifier)}
@@ -279,7 +280,7 @@ const AgentTool = memo<AgentToolProps>(
               ),
             }))
           : [],
-      [isKlavisEnabledInEnv, allKlavisServers],
+      [isKlavisEnabledInEnv, allKlavisServers, effectiveAgentId],
     );
 
     // LobeHub Skill Provider 列表项
@@ -289,10 +290,16 @@ const AgentTool = memo<AgentToolProps>(
           ? LOBEHUB_SKILL_PROVIDERS.map((provider) => ({
               icon: <LobehubSkillIcon icon={provider.icon} label={provider.label} />,
               key: provider.id, // 使用 provider.id 作为 key，与 pluginId 保持一致
-              label: <LobehubSkillServerItem label={provider.label} provider={provider.id} />,
+              label: (
+                <LobehubSkillServerItem
+                  agentId={effectiveAgentId}
+                  label={provider.label}
+                  provider={provider.id}
+                />
+              ),
             }))
           : [],
-      [isLobehubSkillEnabled, allLobehubSkillServers],
+      [isLobehubSkillEnabled, allLobehubSkillServers, effectiveAgentId],
     );
 
     // Handle plugin remove via Tag close - use byId actions

package/src/server/routers/lambda/__tests__/integration/aiAgent/execAgent.integration.test.ts

@@ -232,14 +232,15 @@ describe('execAgent', () => {
         })
         .returning();
 
-      const [thread] = await serverDB
+      const threadResult = (await serverDB
         .insert(threads)
         .values({
           topicId: topic.id,
           type: 'standalone',
           userId,
         })
-        .returning();
+        .returning()) as { id: string }[];
+      const thread = threadResult[0];
 
       const caller = aiAgentRouter.createCaller(createTestContext());