@lobehub/lobehub 2.0.0-next.280 → 2.0.0-next.282

package/src/store/agentGroup/slices/lifecycle.ts

@@ -14,10 +14,16 @@ export interface ChatGroupLifecycleAction {
     silent?: boolean,
   ) => Promise<string>;
   /**
+   * @deprecated Use switchTopic(undefined) instead
    * Switch to a new topic in the group
    * Clears activeTopicId and navigates to group root
    */
   switchToNewTopic: () => void;
+  /**
+   * Switch to a topic in the group with proper route handling
+   * @param topicId - Topic ID to switch to, or undefined/null for new topic
+   */
+  switchTopic: (topicId?: string | null) => void;
 }
 
 export const chatGroupLifecycleSlice: StateCreator<
@@ -57,13 +63,20 @@ export const chatGroupLifecycleSlice: StateCreator<
   },
 
   switchToNewTopic: () => {
+    get().switchTopic(undefined);
+  },
+
+  switchTopic: (topicId) => {
     const { activeGroupId, router } = get();
     if (!activeGroupId || !router) return;
 
-    useChatStore.setState({ activeTopicId: undefined });
+    // Update chat store's activeTopicId
+    useChatStore.getState().switchTopic(topicId ?? undefined);
 
+    // Navigate with replace to avoid stale query params
     router.push(urlJoin('/group', activeGroupId), {
-      query: { bt: null, tab: null, thread: null, topic: null },
+      query: { topic: topicId ?? null },
+      replace: true,
     });
   },
 });

package/src/app/[variants]/(main)/group/_layout/Sidebar/Topic/hooks/useTopicNavigation.ts

@@ -1,49 +0,0 @@
-import { usePathname } from 'next/navigation';
-import { useCallback } from 'react';
-import urlJoin from 'url-join';
-
-import { useQueryRoute } from '@/hooks/useQueryRoute';
-import { useAgentGroupStore } from '@/store/agentGroup';
-import { useChatStore } from '@/store/chat';
-import { useGlobalStore } from '@/store/global';
-
-/**
- * Hook to handle topic navigation with automatic route detection
- * If in agent sub-route (e.g., /agent/:aid/profile), navigate back to chat first
- */
-export const useTopicNavigation = () => {
-  const pathname = usePathname();
-  const activeGroupId = useAgentGroupStore((s) => s.activeGroupId);
-  const router = useQueryRoute();
-  const toggleConfig = useGlobalStore((s) => s.toggleMobileTopic);
-  const switchTopic = useChatStore((s) => s.switchTopic);
-
-  const isInAgentSubRoute = useCallback(() => {
-    if (!activeGroupId) return false;
-    const agentBasePath = `/group/${activeGroupId}`;
-    // If pathname has more segments after /agent/:aid, it's a sub-route
-    return (
-      pathname.startsWith(agentBasePath) &&
-      pathname !== agentBasePath &&
-      pathname !== `${agentBasePath}/`
-    );
-  }, [pathname, activeGroupId]);
-
-  const navigateToTopic = useCallback(
-    (topicId?: string) => {
-      // If in agent sub-route, navigate back to agent chat first
-      if (isInAgentSubRoute() && activeGroupId) {
-        router.push(urlJoin('/group', activeGroupId as string));
-      }
-
-      switchTopic(topicId);
-      toggleConfig(false);
-    },
-    [activeGroupId, router, switchTopic, toggleConfig, isInAgentSubRoute],
-  );
-
-  return {
-    isInAgentSubRoute: isInAgentSubRoute(),
-    navigateToTopic,
-  };
-};