fix: resolved navigation error on continue chat action (#558)

ayangweb · web-flow · commit 2dd8e3160c3b · 2025-05-26T10:56:29.000+08:00
* fix: resolved navigation error on continue chat action

* docs: update changelog
diff --git a/docs/content.en/docs/release-notes/_index.md b/docs/content.en/docs/release-notes/_index.md
@@ -46,6 +46,7 @@ Information about release notes of Coco Server is provided here.
 - fix: the scroll button is not displayed by default #552
 - fix: suggestion list position #553
 - fix: independent chat window has no data #554
+- fix: resolved navigation error on continue chat action #558
 
 ### ✈️ Improvements
 
diff --git a/src/components/Assistant/Chat.tsx b/src/components/Assistant/Chat.tsx
@@ -96,26 +96,25 @@ const ChatAI = memo(
       const setAskAiSessionId = useSearchStore(
         (state) => state.setAskAiSessionId
       );
+      const askAiServerId = useSearchStore((state) => {
+        return state.askAiServerId;
+      });
 
       useEffect(() => {
         activeChatProp && setActiveChat(activeChatProp);
       }, [activeChatProp]);
 
       useEffect(() => {
-        console.log("chats", chats);
-        console.log("askAiSessionId", askAiSessionId);
-        if (chats.length === 0 || !askAiSessionId) return;
+        if (askAiServerId || !askAiSessionId || chats.length === 0) return;
 
         const matched = chats.find((item) => item._id === askAiSessionId);
 
-        console.log("matched", matched);
-
         if (matched) {
           onSelectChat(matched);
 
           setAskAiSessionId(void 0);
         }
-      }, [chats, chats]);
+      }, [chats, askAiSessionId, askAiServerId]);
 
       const [Question, setQuestion] = useState<string>("");
 
diff --git a/src/components/Assistant/ServerList.tsx b/src/components/Assistant/ServerList.tsx
@@ -16,20 +16,18 @@ import { useConnectStore } from "@/stores/connectStore";
 import { Server as IServer } from "@/types/server";
 import StatusIndicator from "@/components/Cloud/StatusIndicator";
 import { useAuthStore } from "@/stores/authStore";
+import { useSearchStore } from "@/stores/searchStore";
 
 interface ServerListProps {
   reconnect: (server?: IServer) => void;
   clearChat: () => void;
 }
 
-export function ServerList({
-  reconnect,
-  clearChat,
-}: ServerListProps) {
+export function ServerList({ reconnect, clearChat }: ServerListProps) {
   const { t } = useTranslation();
 
-  const isCurrentLogin = useAuthStore(state => state.isCurrentLogin);
-  const setIsCurrentLogin = useAuthStore(state => state.setIsCurrentLogin);
+  const isCurrentLogin = useAuthStore((state) => state.isCurrentLogin);
+  const setIsCurrentLogin = useAuthStore((state) => state.setIsCurrentLogin);
   const serviceList = useShortcutsStore((state) => state.serviceList);
   const setEndpoint = useAppStore((state) => state.setEndpoint);
   const setCurrentService = useConnectStore((state) => state.setCurrentService);
@@ -40,7 +38,12 @@ export function ServerList({
 
   const [serverList, setServerList] = useState<IServer[]>([]);
   const [isRefreshing, setIsRefreshing] = useState(false);
-
+  const askAiServerId = useSearchStore((state) => {
+    return state.askAiServerId;
+  });
+  const setAskAiServerId = useSearchStore((state) => {
+    return state.setAskAiServerId;
+  });
   const serverListButtonRef = useRef<HTMLButtonElement>(null);
 
   const fetchServers = useCallback(
@@ -73,6 +76,19 @@ export function ServerList({
     [currentService?.id]
   );
 
+  useEffect(() => {
+    if (!askAiServerId || serverList.length === 0) return;
+
+    const matched = serverList.find((server) => {
+      return server.id === askAiServerId;
+    });
+
+    if (!matched) return;
+
+    switchServer(matched);
+    setAskAiServerId(void 0);
+  }, [serverList, askAiServerId]);
+
   useEffect(() => {
     if (!isTauri) return;
 
@@ -109,7 +125,7 @@ export function ServerList({
       setCurrentService(server);
       setEndpoint(server.endpoint);
       setMessages(""); // Clear previous messages
-      clearChat(); 
+      clearChat();
       //
       if (!server.public && !server.profile) {
         setIsCurrentLogin(false);
@@ -217,7 +233,7 @@ export function ServerList({
                         {server.name}
                       </div>
                       <div className="text-xs text-gray-500 dark:text-gray-400 truncate max-w-[200px]">
-                        AI Assistant: { server.stats?.assistant_count || 1}
+                        AI Assistant: {server.stats?.assistant_count || 1}
                       </div>
                     </div>
                   </div>
diff --git a/src/components/Search/AskAi.tsx b/src/components/Search/AskAi.tsx
@@ -1,9 +1,14 @@
-import { useAsyncEffect, useKeyPress, useMount, useUnmount } from "ahooks";
+import {
+  useAsyncEffect,
+  useKeyPress,
+  useMount,
+  useReactive,
+  useUnmount,
+} from "ahooks";
 import { useEffect, useRef, useState } from "react";
 
 import { ChatMessage } from "../ChatMessage";
 import { ASK_AI_CLIENT_ID, COPY_BUTTON_ID } from "@/constants";
-import { useConnectStore } from "@/stores/connectStore";
 import { useSearchStore } from "@/stores/searchStore";
 import platformAdapter from "@/utils/platformAdapter";
 import useMessageChunkData from "@/hooks/useMessageChunkData";
@@ -12,9 +17,13 @@ import { isMac } from "@/utils/platform";
 import { noop } from "lodash-es";
 import { useExtensionsStore } from "@/stores/extensionsStore";
 
+interface State {
+  serverId?: string;
+  assistantId?: string;
+}
+
 const AskAi = () => {
   const askAiMessage = useSearchStore((state) => state.askAiMessage);
-  const currentService = useConnectStore((state) => state.currentService);
   const addError = useAppStore((state) => state.addError);
   const setGoAskAi = useSearchStore((state) => state.setGoAskAi);
   const setSelectedAssistant = useSearchStore((state) => {
@@ -62,12 +71,27 @@ const AskAi = () => {
   const selectedAssistant = useSearchStore((state) => {
     return state.selectedAssistant;
   });
-  const assistantRef = useRef<any>(null);
+  const setAskAiServerId = useSearchStore((state) => {
+    return state.setAskAiServerId;
+  });
+  const state = useReactive<State>({});
 
   useEffect(() => {
-    if (!quickAiAccessAssistant) return;
+    if (state.serverId) return;
+
+    const server = selectedAssistant
+      ? selectedAssistant.querySource
+      : quickAiAccessServer;
 
-    assistantRef.current = selectedAssistant ?? quickAiAccessAssistant;
+    state.serverId = server?.id;
+  }, [selectedAssistant, quickAiAccessAssistant]);
+
+  useEffect(() => {
+    if (state.assistantId) return;
+
+    const assistant = selectedAssistant ?? quickAiAccessAssistant;
+
+    state.assistantId = assistant?.id;
   }, [selectedAssistant, quickAiAccessAssistant]);
 
   useMount(async () => {
@@ -134,37 +158,43 @@ const AskAi = () => {
   });
 
   useAsyncEffect(async () => {
-    if (!askAiMessage || !currentService?.id || !assistantRef.current) return;
+    if (!askAiMessage || !state.serverId || !state.assistantId) return;
 
     clearAllChunkData();
 
+    const { serverId, assistantId } = state;
+
+    console.log("serverId", serverId);
+    console.log("assistantId", assistantId);
+
     try {
       await platformAdapter.invokeBackend("ask_ai", {
         message: askAiMessage,
-        serverId: selectedAssistant
-          ? selectedAssistant.querySource.id
-          : quickAiAccessServer.id,
-        assistantId: assistantRef.current.id,
+        serverId,
+        assistantId,
         clientId: ASK_AI_CLIENT_ID,
       });
     } catch (error) {
       addError(String(error));
     }
-  }, [askAiMessage, assistantRef]);
+  }, [askAiMessage, state.serverId, state.assistantId]);
 
   useKeyPress("enter", async (event) => {
     const { metaKey, ctrlKey } = event;
 
     if (isTyping) return;
 
+    const { serverId } = state;
+
     if ((isMac && metaKey) || (!isMac && ctrlKey)) {
       await platformAdapter.commands("open_session_chat", {
-        serverId: currentService?.id,
+        serverId,
         sessionId: sessionIdRef.current,
       });
 
       platformAdapter.emitEvent("toggle-to-chat-mode");
 
+      setAskAiServerId(serverId);
       return setAskAiSessionId(sessionIdRef.current);
     }
 
diff --git a/src/hooks/useSyncStore.ts b/src/hooks/useSyncStore.ts
@@ -176,8 +176,6 @@ export const useSyncStore = () => {
       platformAdapter.listenEvent("change-extensions-store", ({ payload }) => {
         const { quickAiAccessServer, quickAiAccessAssistant } = payload;
 
-        console.log("quickAiAccessAssistant", quickAiAccessAssistant);
-
         setQuickAiAccessServer(quickAiAccessServer);
         setQuickAiAccessAssistant(quickAiAccessAssistant);
       }),
diff --git a/src/stores/searchStore.ts b/src/stores/searchStore.ts
@@ -22,6 +22,8 @@ export type ISearchStore = {
   setAskAiSessionId: (askAiSessionId?: string) => void;
   selectedAssistant?: any;
   setSelectedAssistant: (selectedAssistant?: any) => void;
+  askAiServerId?: string;
+  setAskAiServerId: (askAiServerId?: string) => void;
 };
 
 export const useSearchStore = create<ISearchStore>()(
@@ -54,6 +56,9 @@ export const useSearchStore = create<ISearchStore>()(
       setSelectedAssistant: (selectedAssistant) => {
         return set({ selectedAssistant });
       },
+      setAskAiServerId: (askAiServerId) => {
+        return set({ askAiServerId });
+      },
     }),
     {
       name: "search-store",
