@lobehub/lobehub 2.0.0-next.104 → 2.0.0-next.106

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

@@ -18,12 +18,25 @@ export const params = {
     handlePayload: (payload: ChatStreamPayload) => {
       const { enabledSearch, messages, temperature, tools, ...rest } = payload;
 
-      // 为 assistant 空消息添加一个空格 (#8418)
-      const filteredMessages = messages.map((message) => {
+      const filteredMessages = messages.map((message: any) => {
+        let normalizedMessage = message;
+
+        // 为 assistant 空消息添加一个空格 (#8418)
         if (message.role === 'assistant' && (!message.content || message.content === '')) {
-          return { ...message, content: ' ' };
+          normalizedMessage = { ...normalizedMessage, content: ' ' };
+        }
+
+        // Interleaved thinking
+        if (message.role === 'assistant' && message.reasoning) {
+          const { reasoning, ...messageWithoutReasoning } = normalizedMessage;
+          return {
+            ...messageWithoutReasoning,
+            ...(!reasoning.signature && reasoning.content
+              ? { reasoning_content: reasoning.content }
+              : {}),
+          };
         }
-        return message;
+        return normalizedMessage;
       });
 
       const moonshotTools = enabledSearch

package/packages/model-runtime/src/utils/postProcessModelList.ts

@@ -1,10 +1,13 @@
 import type { ChatModelCard } from '@lobechat/types';
+import { omit } from 'lodash-es';
 import { AiModelType, CHAT_MODEL_IMAGE_GENERATION_PARAMS } from 'model-bank';
 
 // Whitelist for automatic image model generation
 export const IMAGE_GENERATION_MODEL_WHITELIST = [
   'gemini-2.5-flash-image-preview',
   'gemini-2.5-flash-image-preview:free',
+  'gemini-3-pro-image-preview',
+  'gemini-3-pro-image-preview:free',
   // More models can be added in the future
 ] as const;
 
@@ -41,19 +44,18 @@ export async function postProcessModelList(
     const matchingModels = finalModels.filter((model) => model.id.endsWith(whitelistPattern));
 
     for (const model of matchingModels) {
-      // Blacklist: remove unnecessary properties, keep the rest
-      const {
-        files,           // drop
-        functionCall,    // drop
-        reasoning,       // drop
-        search,          // drop
-        imageOutput,     // drop
-        video,           // drop
-        vision,          // drop
-        type: _dropType, // will be overwritten
-        parameters: _dropParams, // will be overwritten
-        ...rest
-      } = model;
+      // Remove unnecessary properties, keep the rest
+      const rest = omit(model, [
+        'files',
+        'functionCall',
+        'reasoning',
+        'search',
+        'imageOutput',
+        'video',
+        'vision',
+        'type',
+        'parameters',
+      ]);
 
       imageModels.push({
         ...rest, // Keep other fields (such as displayName, pricing, enabled, contextWindowTokens, etc.)

package/packages/types/src/user/settings/keyVaults.ts

@@ -51,73 +51,5 @@ export interface SearchEngineKeyVaults {
 }
 
 export interface UserKeyVaults extends SearchEngineKeyVaults {
-  ai21?: OpenAICompatibleKeyVault;
-  ai302?: OpenAICompatibleKeyVault;
-  ai360?: OpenAICompatibleKeyVault;
-  aihubmix?: OpenAICompatibleKeyVault;
-  akashchat?: OpenAICompatibleKeyVault;
-  anthropic?: OpenAICompatibleKeyVault;
-  azure?: AzureOpenAIKeyVault;
-  azureai?: AzureOpenAIKeyVault;
-  baichuan?: OpenAICompatibleKeyVault;
-  bedrock?: AWSBedrockKeyVault;
-  bfl?: any;
-  cerebras?: OpenAICompatibleKeyVault;
-  cloudflare?: CloudflareKeyVault;
-  cohere?: OpenAICompatibleKeyVault;
-  cometapi?: OpenAICompatibleKeyVault;
-  comfyui?: ComfyUIKeyVault;
-  deepseek?: OpenAICompatibleKeyVault;
-  fal?: FalKeyVault;
-  fireworksai?: OpenAICompatibleKeyVault;
-  giteeai?: OpenAICompatibleKeyVault;
-  github?: OpenAICompatibleKeyVault;
-  google?: OpenAICompatibleKeyVault;
-  groq?: OpenAICompatibleKeyVault;
-  higress?: OpenAICompatibleKeyVault;
-  huggingface?: OpenAICompatibleKeyVault;
-  hunyuan?: OpenAICompatibleKeyVault;
-  infiniai?: OpenAICompatibleKeyVault;
-  internlm?: OpenAICompatibleKeyVault;
-  jina?: OpenAICompatibleKeyVault;
-  lmstudio?: OpenAICompatibleKeyVault;
-  lobehub?: any;
-  minimax?: OpenAICompatibleKeyVault;
-  mistral?: OpenAICompatibleKeyVault;
-  modelscope?: OpenAICompatibleKeyVault;
-  moonshot?: OpenAICompatibleKeyVault;
-  nebius?: OpenAICompatibleKeyVault;
-  newapi?: OpenAICompatibleKeyVault;
-  novita?: OpenAICompatibleKeyVault;
-  nvidia?: OpenAICompatibleKeyVault;
-  ollama?: OpenAICompatibleKeyVault;
-  ollamacloud?: OpenAICompatibleKeyVault;
-  openai?: OpenAICompatibleKeyVault;
-  openrouter?: OpenAICompatibleKeyVault;
-  password?: string;
-  perplexity?: OpenAICompatibleKeyVault;
-  ppio?: OpenAICompatibleKeyVault;
-  qiniu?: OpenAICompatibleKeyVault;
-  qwen?: OpenAICompatibleKeyVault;
-  sambanova?: OpenAICompatibleKeyVault;
   search1api?: OpenAICompatibleKeyVault;
-  sensenova?: OpenAICompatibleKeyVault;
-  siliconcloud?: OpenAICompatibleKeyVault;
-  spark?: OpenAICompatibleKeyVault;
-  stepfun?: OpenAICompatibleKeyVault;
-  taichu?: OpenAICompatibleKeyVault;
-  tencentcloud?: OpenAICompatibleKeyVault;
-  togetherai?: OpenAICompatibleKeyVault;
-  upstage?: OpenAICompatibleKeyVault;
-  v0?: OpenAICompatibleKeyVault;
-  vercelaigateway?: OpenAICompatibleKeyVault;
-  vertexai?: VertexAIKeyVault;
-  vllm?: OpenAICompatibleKeyVault;
-  volcengine?: OpenAICompatibleKeyVault;
-  wenxin?: OpenAICompatibleKeyVault;
-  xai?: OpenAICompatibleKeyVault;
-  xinference?: OpenAICompatibleKeyVault;
-  zenmux?: OpenAICompatibleKeyVault;
-  zeroone?: OpenAICompatibleKeyVault;
-  zhipu?: OpenAICompatibleKeyVault;
 }

package/packages/utils/src/client/parserPlaceholder.ts

@@ -87,7 +87,7 @@ export const VARIABLE_GENERATORS = {
   random_digit: () => Math.floor(Math.random() * 10).toString(),
 
   /**
-   * UUID 类模板变量
+   * UUID-type template variables
    *
    * | Value | Example |
    * |-------|---------|

package/src/services/__tests__/_auth.test.ts

@@ -23,10 +23,7 @@ const mockTogetherAIAPIKey = 'togetherai-api-key';
 // mock the traditional zustand
 vi.mock('zustand/traditional');
 
-const setModelProviderConfig = <T extends GlobalLLMProviderKey>(
-  provider: T,
-  config: Partial<UserKeyVaults[T]>,
-) => {
+const setModelProviderConfig = (provider: string, config: any) => {
   useUserStore.setState({
     settings: { keyVaults: { [provider]: config } },
   });

package/src/services/_auth.ts

@@ -13,7 +13,7 @@ import { ModelProvider } from 'model-bank';
 
 import { aiProviderSelectors, useAiInfraStore } from '@/store/aiInfra';
 import { useUserStore } from '@/store/user';
-import { keyVaultsConfigSelectors, userProfileSelectors } from '@/store/user/selectors';
+import { userProfileSelectors } from '@/store/user/selectors';
 import { obfuscatePayloadWithXOR } from '@/utils/client/xor-obfuscation';
 
 import { resolveRuntimeProvider } from './chat/helper';
@@ -105,10 +105,9 @@ export const getProviderAuthPayload = (
 };
 
 const createAuthTokenWithPayload = (payload = {}) => {
-  const accessCode = keyVaultsConfigSelectors.password(useUserStore.getState());
   const userId = userProfileSelectors.userId(useUserStore.getState());
 
-  return obfuscatePayloadWithXOR<ClientSecretPayload>({ accessCode, userId, ...payload });
+  return obfuscatePayloadWithXOR<ClientSecretPayload>({ userId, ...payload });
 };
 
 interface AuthParams {

package/src/services/_header.ts

@@ -1,12 +1,6 @@
-import {
-  LOBE_CHAT_ACCESS_CODE,
-  LOBE_USER_ID,
-  OPENAI_API_KEY_HEADER_KEY,
-  OPENAI_END_POINT,
-} from '@/const/fetch';
+import { LOBE_USER_ID, OPENAI_API_KEY_HEADER_KEY, OPENAI_END_POINT } from '@/const/fetch';
 import { aiProviderSelectors, useAiInfraStore } from '@/store/aiInfra';
 import { useUserStore } from '@/store/user';
-import { keyVaultsConfigSelectors } from '@/store/user/selectors';
 
 /**
  * TODO: Need to be removed after tts refactor
@@ -22,7 +16,6 @@ export const createHeaderWithOpenAI = (header?: HeadersInit): HeadersInit => {
   // eslint-disable-next-line no-undef
   return {
     ...header,
-    [LOBE_CHAT_ACCESS_CODE]: keyVaultsConfigSelectors.password(state),
     [LOBE_USER_ID]: state.user?.id || '',
     [OPENAI_API_KEY_HEADER_KEY]: keyVaults.apiKey || '',
     [OPENAI_END_POINT]: keyVaults.baseURL || '',

package/src/store/chat/agents/__tests__/createAgentExecutors/call-llm.test.ts

@@ -58,6 +58,9 @@ describe('call_llm executor', () => {
           sessionId: 'test-session',
           topicId: 'test-topic',
         }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
       );
     });
 
@@ -229,6 +232,9 @@ describe('call_llm executor', () => {
         expect.objectContaining({
           parentId: 'msg_payload_parent',
         }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
       );
     });
 
@@ -262,6 +268,9 @@ describe('call_llm executor', () => {
         expect.objectContaining({
           parentId: 'msg_context_parent',
         }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
       );
     });
   });
@@ -1061,6 +1070,9 @@ describe('call_llm executor', () => {
           model: 'claude-3-opus',
           provider: 'anthropic',
         }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
       );
       expect(mockStore.internal_fetchAIChatMessage).toHaveBeenCalledWith(
         expect.objectContaining({
@@ -1180,6 +1192,9 @@ describe('call_llm executor', () => {
         expect.objectContaining({
           threadId,
         }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
       );
     });
 
@@ -1211,6 +1226,9 @@ describe('call_llm executor', () => {
         expect.objectContaining({
           threadId: undefined,
         }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
       );
     });
   });

package/src/store/chat/agents/__tests__/createAgentExecutors/call-tool.test.ts

@@ -156,17 +156,22 @@ describe('call_tool executor', () => {
       });
 
       // Then
-      expect(mockStore.optimisticCreateMessage).toHaveBeenCalledWith({
-        content: '',
-        groupId: 'group_789',
-        parentId: 'msg_parent_123',
-        plugin: toolCall,
-        role: 'tool',
-        sessionId: 'sess_123',
-        threadId: undefined,
-        tool_call_id: 'tool_call_xyz',
-        topicId: 'topic_456',
-      });
+      expect(mockStore.optimisticCreateMessage).toHaveBeenCalledWith(
+        expect.objectContaining({
+          content: '',
+          groupId: 'group_789',
+          parentId: 'msg_parent_123',
+          plugin: toolCall,
+          role: 'tool',
+          sessionId: 'sess_123',
+          threadId: undefined,
+          tool_call_id: 'tool_call_xyz',
+          topicId: 'topic_456',
+        }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
+      );
     });
 
     it('should use assistant message groupId for tool message', async () => {
@@ -194,6 +199,9 @@ describe('call_tool executor', () => {
         expect.objectContaining({
           groupId: 'group_special',
         }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
       );
     });
 
@@ -222,6 +230,9 @@ describe('call_tool executor', () => {
         expect.objectContaining({
           parentId: 'msg_custom_parent',
         }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
       );
     });
 
@@ -262,6 +273,9 @@ describe('call_tool executor', () => {
         expect.objectContaining({
           plugin: toolCall,
         }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
       );
     });
   });
@@ -1542,6 +1556,9 @@ describe('call_tool executor', () => {
         expect.objectContaining({
           groupId: undefined,
         }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
       );
       expect(result.events).toHaveLength(1);
     });
@@ -1570,6 +1587,9 @@ describe('call_tool executor', () => {
         expect.objectContaining({
           groupId: undefined,
         }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
       );
     });
 
@@ -1641,6 +1661,9 @@ describe('call_tool executor', () => {
         expect.objectContaining({
           topicId: undefined,
         }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
       );
     });
 
@@ -1679,6 +1702,9 @@ describe('call_tool executor', () => {
             type: 'builtin',
           }),
         }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
       );
       expect(result.events).toHaveLength(1);
     });
@@ -1768,6 +1794,9 @@ describe('call_tool executor', () => {
         expect.objectContaining({
           groupId: 'group_latest',
         }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
       );
     });
   });

package/src/store/chat/agents/__tests__/createAgentExecutors/helpers/assertions.ts

@@ -22,6 +22,9 @@ export const expectMessageCreated = (mockStore: ChatStore, role: 'assistant' | '
     expect.objectContaining({
       role,
     }),
+    expect.objectContaining({
+      operationId: expect.any(String),
+    }),
   );
 };
 

package/src/store/chat/agents/__tests__/createAgentExecutors/request-human-approve.test.ts

@@ -51,6 +51,9 @@ describe('request_human_approve executor', () => {
           parentId: 'msg_assistant',
           groupId: assistantMessage.groupId,
         }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
       );
     });
 
@@ -205,6 +208,9 @@ describe('request_human_approve executor', () => {
         expect.objectContaining({
           groupId: 'group_123',
         }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
       );
     });
 
@@ -232,6 +238,9 @@ describe('request_human_approve executor', () => {
         expect.objectContaining({
           parentId: 'msg_assistant_456',
         }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
       );
     });
   });
@@ -330,6 +339,9 @@ describe('request_human_approve executor', () => {
             tool_call_id: toolCall.id,
             pluginIntervention: { status: 'pending' },
           }),
+          expect.objectContaining({
+            operationId: expect.any(String),
+          }),
         );
       });
     });
@@ -539,6 +551,9 @@ describe('request_human_approve executor', () => {
         expect.objectContaining({
           parentId: 'msg_3_last',
         }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
       );
     });
   });

package/src/store/chat/agents/__tests__/createAgentExecutors/resolve-aborted-tools.test.ts

@@ -57,6 +57,9 @@ describe('resolve_aborted_tools executor', () => {
           topicId: 'test-topic',
           parentId: parentMessage.id,
         }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
       );
     });
 
@@ -114,6 +117,9 @@ describe('resolve_aborted_tools executor', () => {
             pluginIntervention: { status: 'aborted' },
             tool_call_id: toolCall.id,
           }),
+          expect.objectContaining({
+            operationId: expect.any(String),
+          }),
         );
       });
     });
@@ -193,17 +199,22 @@ describe('resolve_aborted_tools executor', () => {
       });
 
       // Then
-      expect(mockStore.optimisticCreateMessage).toHaveBeenCalledWith({
-        role: 'tool',
-        content: 'Tool execution was aborted by user.',
-        plugin: toolCall,
-        pluginIntervention: { status: 'aborted' },
-        tool_call_id: 'tool_abc',
-        parentId: 'msg_parent',
-        sessionId: 'sess_123',
-        topicId: 'topic_456',
-        threadId: undefined,
-      });
+      expect(mockStore.optimisticCreateMessage).toHaveBeenCalledWith(
+        expect.objectContaining({
+          role: 'tool',
+          content: 'Tool execution was aborted by user.',
+          plugin: toolCall,
+          pluginIntervention: { status: 'aborted' },
+          tool_call_id: 'tool_abc',
+          parentId: 'msg_parent',
+          sessionId: 'sess_123',
+          topicId: 'topic_456',
+          threadId: undefined,
+        }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
+      );
     });
 
     it('should preserve tool payload details', async () => {
@@ -240,6 +251,9 @@ describe('resolve_aborted_tools executor', () => {
         expect.objectContaining({
           plugin: toolCall,
         }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
       );
     });
 
@@ -264,6 +278,9 @@ describe('resolve_aborted_tools executor', () => {
         expect.objectContaining({
           topicId: undefined,
         }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
       );
     });
   });
@@ -481,6 +498,9 @@ describe('resolve_aborted_tools executor', () => {
         expect.objectContaining({
           plugin: toolCall,
         }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
       );
     });
 
@@ -571,6 +591,9 @@ describe('resolve_aborted_tools executor', () => {
             type: 'builtin',
           }),
         }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
       );
     });
 
@@ -606,6 +629,9 @@ describe('resolve_aborted_tools executor', () => {
             type: 'default',
           }),
         }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
       );
     });
 

package/src/store/chat/agents/createAgentExecutors.ts

@@ -89,16 +89,19 @@ export const createAgentExecutors = (context: {
           llmPayload.parentMessageId = context.parentId;
         }
         // Create assistant message (following server-side pattern)
-        const assistantMessageItem = await context.get().optimisticCreateMessage({
-          content: LOADING_FLAT,
-          model: llmPayload.model,
-          parentId: llmPayload.parentMessageId,
-          provider: llmPayload.provider,
-          role: 'assistant',
-          sessionId: opContext.sessionId!,
-          threadId: opContext.threadId,
-          topicId: opContext.topicId ?? undefined,
-        });
+        const assistantMessageItem = await context.get().optimisticCreateMessage(
+          {
+            content: LOADING_FLAT,
+            model: llmPayload.model,
+            parentId: llmPayload.parentMessageId,
+            provider: llmPayload.provider,
+            role: 'assistant',
+            sessionId: opContext.sessionId!,
+            threadId: opContext.threadId,
+            topicId: opContext.topicId ?? undefined,
+          },
+          { operationId: context.operationId },
+        );
 
         if (!assistantMessageItem) {
           throw new Error('Failed to create assistant message');
@@ -371,7 +374,9 @@ export const createAgentExecutors = (context: {
             topicId: opContext.topicId ?? undefined,
           };
 
-          const createPromise = context.get().optimisticCreateMessage(toolMessageParams);
+          const createPromise = context
+            .get()
+            .optimisticCreateMessage(toolMessageParams, { operationId: createToolMsgOpId });
           context.get().updateOperationMetadata(createToolMsgOpId, {
             createMessagePromise: createPromise,
           });
@@ -632,7 +637,9 @@ export const createAgentExecutors = (context: {
             topicId: opContext.topicId ?? undefined,
           };
 
-          const createResult = await context.get().optimisticCreateMessage(toolMessageParams);
+          const createResult = await context
+            .get()
+            .optimisticCreateMessage(toolMessageParams, { operationId: context.operationId });
 
           if (!createResult) {
             log(
@@ -709,7 +716,9 @@ export const createAgentExecutors = (context: {
           topicId: opContext.topicId ?? undefined,
         };
 
-        const createResult = await context.get().optimisticCreateMessage(toolMessageParams);
+        const createResult = await context
+          .get()
+          .optimisticCreateMessage(toolMessageParams, { operationId: context.operationId });
 
         if (createResult) {
           log(

package/src/store/chat/slices/aiChat/actions/conversationLifecycle.ts

@@ -261,6 +261,10 @@ export const conversationLifecycle: StateCreator<
 
     summaryTitle().catch(console.error);
 
+    // Complete sendMessage operation here - message creation is done
+    // execAgentRuntime is a separate operation (child) that handles AI response generation
+    get().completeOperation(operationId);
+
     // Get the current messages to generate AI response
     const displayMessages = displayMessageSelectors.activeDisplayMessages(get());
 
@@ -287,16 +291,8 @@ export const conversationLifecycle: StateCreator<
       if (userFiles.length > 0) {
         await getAgentStoreState().addFilesToAgent(userFiles, false);
       }
-
-      // Complete operation on success
-      get().completeOperation(operationId);
     } catch (e) {
       console.error(e);
-      // Fail operation on error
-      get().failOperation(operationId, {
-        type: e instanceof Error ? e.name : 'unknown_error',
-        message: e instanceof Error ? e.message : 'AI generation failed',
-      });
     } finally {
       if (data.topicId) get().internal_updateTopicLoading(data.topicId, false);
     }

package/src/store/chat/slices/builtinTool/actions/__tests__/search.test.ts

@@ -241,9 +241,18 @@ describe('search actions', () => {
     it('should update arguments and perform search', async () => {
       const { result } = renderHook(() => useChatStore());
       const spy = vi.spyOn(result.current, 'search');
-      const { triggerSearchAgain } = result.current;
 
       const messageId = 'test-message-id';
+      const operationId = 'op_test';
+
+      // Set up messageOperationMap so triggerSearchAgain can get operationId
+      useChatStore.setState({
+        messageOperationMap: {
+          [messageId]: operationId,
+        },
+      });
+
+      const { triggerSearchAgain } = result.current;
       const query: SearchQuery = {
         query: 'test query',
       };
@@ -252,7 +261,12 @@ describe('search actions', () => {
         await triggerSearchAgain(messageId, query, { aiSummary: true });
       });
 
-      expect(result.current.optimisticUpdatePluginArguments).toHaveBeenCalledWith(messageId, query);
+      expect(result.current.optimisticUpdatePluginArguments).toHaveBeenCalledWith(
+        messageId,
+        query,
+        false,
+        { operationId },
+      );
       expect(spy).toHaveBeenCalledWith(messageId, query, true);
     });
   });