@lobehub/lobehub 2.0.0-next.327 → 2.0.0-next.329

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

@@ -4,7 +4,9 @@ import {
   AgentRuntime,
   type AgentRuntimeContext,
   type AgentState,
+  type Cost,
   GeneralChatAgent,
+  type Usage,
   computeStepContext,
 } from '@lobechat/agent-runtime';
 import { PageAgentIdentifier } from '@lobechat/builtin-tool-page-agent';
@@ -130,7 +132,7 @@ export interface StreamingExecutorAction {
      */
     parentOperationId?: string;
     skipCreateFirstMessage?: boolean;
-  }) => Promise<void>;
+  }) => Promise<{ cost?: Cost; usage?: Usage } | void>;
 }
 
 export const streamingExecutor: StateCreator<
@@ -875,5 +877,8 @@ export const streamingExecutor: StateCreator<
         console.error('Desktop notification error:', error);
       }
     }
+
+    // Return usage and cost data for caller to use
+    return { cost: state.cost, usage: state.usage };
   },
 });

package/src/store/chat/slices/message/actions/query.ts

@@ -1,9 +1,11 @@
 import { parse } from '@lobechat/conversation-flow';
 import { type ConversationContext, type UIChatMessage } from '@lobechat/types';
 import isEqual from 'fast-deep-equal';
+import { type SWRResponse } from 'swr';
 import { type StateCreator } from 'zustand/vanilla';
 
-import { mutate } from '@/libs/swr';
+import { mutate, useClientDataSWRWithSync } from '@/libs/swr';
+import { messageService } from '@/services/message';
 import { type ChatStore } from '@/store/chat/store';
 
 import { type MessageMapKeyInput, messageMapKey } from '../../../utils/messageMapKey';
@@ -39,6 +41,18 @@ export interface MessageQueryAction {
       operationId?: string;
     },
   ) => void;
+
+  /**
+   * Fetch messages for a specific context using SWR
+   * Used for fetching thread messages or messages for a specific context
+   *
+   * @param context - Conversation context with agentId, topicId, threadId, etc.
+   * @param skipFetch - When true, SWR key is null and no fetch occurs
+   */
+  useFetchMessages: (
+    context: ConversationContext,
+    skipFetch?: boolean,
+  ) => SWRResponse<UIChatMessage[]>;
 }
 
 export const messageQuery: StateCreator<
@@ -111,4 +125,22 @@ export const messageQuery: StateCreator<
       params?.action ?? 'replaceMessages',
     );
   },
+
+  useFetchMessages: (context, skipFetch) => {
+    // Skip fetch when skipFetch is true or required fields are missing
+    const shouldFetch = !skipFetch && !!context.agentId && !!context.topicId;
+
+    return useClientDataSWRWithSync<UIChatMessage[]>(
+      shouldFetch ? ['CHAT_STORE_FETCH_MESSAGES', context] : null,
+      () => messageService.getMessages(context),
+      {
+        onData: (data) => {
+          if (!data || !context.topicId) return;
+
+          // Use replaceMessages to store the fetched messages
+          get().replaceMessages(data, { action: 'useFetchMessages', context });
+        },
+      },
+    );
+  },
 });

package/src/store/chat/slices/message/selectors/displayMessage.test.ts

@@ -347,6 +347,16 @@ describe('displayMessageSelectors', () => {
         messageMapKey({ agentId: 'testId', groupId: 'groupId', topicId: 'topicId' }),
       );
     });
+
+    it('should generate correct key with activeThreadId for thread conversations', () => {
+      const state: Partial<ChatStore> = {
+        activeAgentId: 'testId',
+        activeThreadId: 'threadId',
+        activeTopicId: 'topicId',
+      };
+      const result = displayMessageSelectors.currentDisplayChatKey(state as ChatStore);
+      expect(result).toBe('thread_testId_topicId_threadId');
+    });
   });
 
   describe('activeDisplayMessages with group chat messages', () => {

package/src/store/chat/slices/message/selectors/displayMessage.ts

@@ -30,6 +30,7 @@ export const currentDisplayChatKey = (s: ChatStoreState) =>
   messageMapKey({
     agentId: s.activeAgentId,
     groupId: s.activeGroupId,
+    threadId: s.activeThreadId,
     topicId: s.activeTopicId,
   });
 

package/src/store/chat/slices/operation/types.ts

@@ -53,6 +53,10 @@ export type OperationType =
   | 'groupAgentGenerate' // Group agent generate (deprecated, use groupAgentStream)
   | 'groupAgentStream' // Group agent SSE stream (sub-operation of execServerAgentRuntime)
 
+  // === Async Task (Desktop only) ===
+  | 'execClientTask' // Execute single async sub-agent task on desktop client
+  | 'execClientTasks' // Execute multiple async sub-agent tasks on desktop client
+
   // === Others ===
   | 'translate' // Translate message
   | 'topicSummary' // Topic summary

package/src/store/chat/slices/topic/action.test.ts

@@ -28,6 +28,7 @@ vi.mock('zustand/traditional');
 vi.mock('@/services/topic', () => ({
   topicService: {
     removeTopics: vi.fn(),
+    removeTopicsByAgentId: vi.fn(),
     removeAllTopic: vi.fn(),
     removeTopic: vi.fn(),
     cloneTopic: vi.fn(),
@@ -570,7 +571,7 @@ describe('topic action', () => {
         await result.current.removeSessionTopics();
       });
 
-      expect(topicService.removeTopics).toHaveBeenCalledWith(activeAgentId);
+      expect(topicService.removeTopicsByAgentId).toHaveBeenCalledWith(activeAgentId);
       expect(refreshTopicSpy).toHaveBeenCalled();
       expect(switchTopicSpy).toHaveBeenCalled();
     });

package/src/store/chat/slices/topic/action.ts

@@ -567,7 +567,7 @@ export const chatTopic: StateCreator<
     const { switchTopic, activeAgentId, refreshTopic } = get();
     if (!activeAgentId) return;
 
-    await topicService.removeTopics(activeAgentId);
+    await topicService.removeTopicsByAgentId(activeAgentId);
     await refreshTopic();
 
     // switch to default topic