首页布局优化前

desktop/src/store/chatStore.ts

@@ -207,7 +207,25 @@ export const useChatStore = create<ChatState>()(
         return { currentAgent: agent };
       }
 
+      // Save current conversation before switching
       const conversations = upsertActiveConversation([...state.conversations], state);
+
+      // Try to find existing conversation for this agent
+      const agentConversation = conversations.find(c => c.agentId === agent.id);
+
+      if (agentConversation) {
+        // Restore the agent's previous conversation
+        return {
+          conversations,
+          currentAgent: agent,
+          messages: [...agentConversation.messages],
+          sessionKey: agentConversation.sessionKey,
+          isStreaming: false,
+          currentConversationId: agentConversation.id,
+        };
+      }
+
+      // No existing conversation, start fresh
       return {
         conversations,
         currentAgent: agent,
@@ -627,7 +645,7 @@ export const useChatStore = create<ChatState>()(
       partialize: (state) => ({
         conversations: state.conversations,
         currentModel: state.currentModel,
-        messages: state.messages,
+        currentAgentId: state.currentAgent?.id,
         currentConversationId: state.currentConversationId,
       }),
       onRehydrateStorage: () => (state) => {
@@ -642,6 +660,15 @@ export const useChatStore = create<ChatState>()(
             }
           }
         }
+
+        // Restore messages from current conversation if exists
+        if (state?.currentConversationId && state.conversations) {
+          const currentConv = state.conversations.find(c => c.id === state.currentConversationId);
+          if (currentConv) {
+            state.messages = [...currentConv.messages];
+            state.sessionKey = currentConv.sessionKey;
+          }
+        }
       },
     },
   ),