Merge branch 'main' into fix/preserve-login-after-install

Author: Wendong-Fan

src/components/ChatBox/index.tsx

@@ -102,7 +102,6 @@ export default function ChatBox(): JSX.Element {
 		const task = chatStore.tasks[_taskId];
 		const isTaskBusy = (
 			// running or paused counts as busy
-			// TODO: Bug where when replay end hasMessages = false & status = running
 			(task.status === 'running' && !task.hasMessages) || task.status === 'pause' ||
 			// splitting phase: has to_sub_tasks not confirmed OR skeleton computing
 			task.messages.some(m => m.step === 'to_sub_tasks' && !m.isConfirm) ||
@@ -111,6 +110,10 @@ export default function ChatBox(): JSX.Element {
 			(!!task.messages.find(m => m.step === 'to_sub_tasks' && !m.isConfirm) && task.status === 'pending')
 		);
 
+		//Fixes bug where doesn't matter the SSE order or final state of the chatStore
+		const isReplayChatStore = chatStore.tasks[_taskId as string]?.type === "replay";
+		const queueTask = isTaskBusy && !isReplayChatStore;
+
 		console.log(`Current task is ${isTaskBusy} with ${task}`);
 
 		if (textareaRef.current) textareaRef.current.style.height = "60px";
@@ -152,7 +155,7 @@ export default function ChatBox(): JSX.Element {
 				}
 			} else {
 				// If current task is busy (splitting/confirm/running), queue the new message instead of sending immediately
-				if (isTaskBusy) {
+				if (queueTask) {
 					const project_id = projectStore.activeProjectId;
 					// Queue the message locally; do not send to backend yet.
 					const currentAttaches = JSON.parse(JSON.stringify(task.attaches)) || [];

src/lib/replay.ts

@@ -1,3 +1,5 @@
+import { ChatStore } from "@/store/chatStore";
+import { ProjectStore } from "@/store/projectStore";
 import { NavigateFunction } from "react-router-dom";
 
 /**
@@ -11,7 +13,7 @@ import { NavigateFunction } from "react-router-dom";
  * @param historyId - The history ID for the replay
  */
 export const replayProject = async (
-	projectStore: any,
+	projectStore: ProjectStore,
 	navigate: NavigateFunction,
 	projectId: string,
 	question: string,
@@ -36,8 +38,8 @@ export const replayProject = async (
  * @param navigate - The navigate function from useNavigate hook
  */
 export const replayActiveTask = async (
-	chatStore: any,
-	projectStore: any,
+	chatStore: ChatStore,
+	projectStore: ProjectStore,
 	navigate: NavigateFunction
 ) => {
 	const taskId = chatStore.activeTaskId as string;
@@ -57,9 +59,10 @@ export const replayActiveTask = async (
 	if (project && project.chatStores) {
 		Object.entries(project.chatStores).forEach(([chatStoreId, chatStoreData]: [string, any]) => {
 			const timestamp = project.chatStoreTimestamps[chatStoreId] || 0;
-			
-			if (chatStoreData.tasks) {
-				Object.values(chatStoreData.tasks).forEach((task: any) => {
+			const chatState = chatStoreData.getState();
+
+			if (chatState.tasks) {
+				Object.values(chatState.tasks).forEach((task: any) => {
 					// Check messages for user content
 					if (task.messages && task.messages.length > 0) {
 						const userMessage = task.messages.find((msg: any) => msg.role === 'user');
@@ -68,33 +71,6 @@ export const replayActiveTask = async (
 							earliestTimestamp = timestamp;
 						}
 					}
-					
-					// Check task info for original questions
-					if (task.taskInfo && task.taskInfo.length > 0) {
-						task.taskInfo.forEach((info: any) => {
-							if (info.content && timestamp < earliestTimestamp) {
-								question = info.content;
-								earliestTimestamp = timestamp;
-							}
-						});
-					}
-					
-					// Check agent logs for original task content
-					if (task.taskAssigning) {
-						task.taskAssigning.forEach((agent: any) => {
-							if (agent.log) {
-								agent.log.forEach((logEntry: any) => {
-									if (logEntry.data && logEntry.data.message) {
-										const match = logEntry.data.message.match(/==============================\n(.*?)\n==============================/s);
-										if (match && match[1] && timestamp < earliestTimestamp) {
-											question = match[1].trim();
-											earliestTimestamp = timestamp;
-										}
-									}
-								});
-							}
-						});
-					}
 				});
 			}
 		});
@@ -103,6 +79,7 @@ export const replayActiveTask = async (
 	// Fallback to current task's first message if no question found
 	if (!question && chatStore.tasks[taskId] && chatStore.tasks[taskId].messages[0]) {
 		question = chatStore.tasks[taskId].messages[0].content;
+		console.log("[REPLAY] question fall back to ", question);
 	}
 
 	const historyId = projectStore.getHistoryId(projectId);

src/store/projectStore.ts

@@ -196,7 +196,8 @@ const projectStore = create<ProjectStore>()((set, get) => ({
 			queuedMessages: [], // Initialize empty queued messages array
 			metadata: {
 				status: 'active',
-				historyId: historyId
+				historyId: historyId,
+				tags: type === ProjectType.REPLAY ? ["replay"] : []
 			}
 		};
 
@@ -472,27 +473,34 @@ const projectStore = create<ProjectStore>()((set, get) => ({
 		}
 
 		console.log(`[ProjectStore] Created replay project ${replayProjectId} for ${taskIds.length} tasks`);
-		
+
 		// For each taskId, create a chat store within the project and call replay
-		taskIds.forEach(async (taskId, index) => {
-			console.log(`[ProjectStore] Creating replay for task ${index + 1}/${taskIds.length}: ${taskId}`);
-			
-			// Create a new chat store for this task
-			const chatId = createChatStore(replayProjectId, `Task ${taskId}`);
-			
-			if (chatId) {
-				const project = get().projects[replayProjectId];
-				const chatStore = project.chatStores[chatId];
-				
-				if (chatStore) {					
-					// Call replay on the chat store with the taskId, question, and 0 delay
-					await chatStore.getState().replay(taskId, question, 0.2);
-					console.log(`[ProjectStore] Started replay for task ${taskId}`);
+		(async () => {
+			for (let index = 0; index < taskIds.length; index++) {
+				const taskId = taskIds[index];
+				console.log(`[ProjectStore] Creating replay for task ${index + 1}/${taskIds.length}: ${taskId}`);
+
+				// Create a new chat store for this task
+				const chatId = createChatStore(replayProjectId, `Task ${taskId}`);
+
+				if (chatId) {
+					const project = get().projects[replayProjectId];
+					const chatStore = project.chatStores[chatId];
+
+					if (chatStore) {
+						// Call replay on the chat store with the taskId, question, and 0 delay
+						try {
+							await chatStore.getState().replay(taskId, question, 0.2);
+							console.log(`[ProjectStore] Started replay for task ${taskId}`);
+						} catch (error) {
+							console.error(`[ProjectStore] Failed to replay task ${taskId}:`, error);
+						}
+					}
 				}
 			}
-		});
-		
-		console.log(`[ProjectStore] Completed replay setup for ${taskIds.length} tasks`);
+			console.log(`[ProjectStore] Completed replay setup for ${taskIds.length} tasks`);
+		})();
+
 		return replayProjectId;
 	},
 

test/integration/chatStore/activeQueue.test.tsx

@@ -13,26 +13,7 @@ import '../../../src/store/chatStore'
 
 import { useProjectStore } from '../../../src/store/projectStore'
 import useChatStoreAdapter from '../../../src/hooks/useChatStoreAdapter'
-import { mockFetchEventSource } from '../../mocks/sse.mock'
-
-// Helper function for sequential SSE events
-const createSSESequence = (events: Array<{ event: any; delay: number }>) => {
-  return async (onMessage: (data: any) => void) => {
-    for (let i = 0; i < events.length; i++) {
-      const { event, delay } = events[i]
-      
-      await new Promise<void>((resolve) => {
-        setTimeout(() => {
-          console.log(`Sending SSE Event ${i + 1}:`, event.step);
-          onMessage({
-            data: JSON.stringify(event)
-          })
-          resolve()
-        }, delay)
-      })
-    }
-  }
-}
+import { mockFetchEventSource, createSSESequence } from '../../mocks/sse.mock'
 
 // Mock electron IPC
 (global as any).ipcRenderer = {