@lobehub/lobehub 2.0.0-next.72 → 2.0.0-next.74

package/src/app/[variants]/(main)/chat/components/conversation/features/ThreadHydration.tsx

@@ -1,10 +1,10 @@
 'use client';
 
-import { useQueryState } from 'nuqs';
 import { memo, useEffect, useLayoutEffect } from 'react';
 import { createStoreUpdater } from 'zustand-utils';
 
 import { useFetchThreads } from '@/hooks/useFetchThreads';
+import { useQueryState } from '@/hooks/useQueryParam';
 import { useChatStore } from '@/store/chat';
 
 // sync outside state to useChatStore
@@ -26,7 +26,7 @@ const ThreadHydration = memo(() => {
     return () => {
       unsubscribe();
     };
-  }, []);
+  }, [setThread]); // ✅ 现在 setValue 是稳定的，可以安全地添加到依赖数组
 
   // should open portal automatically when portalThread is set
   useEffect(() => {

package/src/app/[variants]/(main)/chat/components/topic/features/Topic/TopicListContent/TopicItem/TopicContent.tsx

@@ -97,15 +97,15 @@ const TopicContent = memo<TopicContentProps>(({ id, title, fav, showMore }) => {
       },
       ...(isDesktop
         ? [
-          {
-            icon: <Icon icon={ExternalLink} />,
-            key: 'openInNewWindow',
-            label: t('actions.openInNewWindow'),
-            onClick: () => {
-              openTopicInNewWindow(activeId, id);
+            {
+              icon: <Icon icon={ExternalLink} />,
+              key: 'openInNewWindow',
+              label: t('actions.openInNewWindow'),
+              onClick: () => {
+                openTopicInNewWindow(activeId, id);
+              },
             },
-          },
-        ]
+          ]
         : []),
       {
         type: 'divider',
@@ -153,7 +153,16 @@ const TopicContent = memo<TopicContentProps>(({ id, title, fav, showMore }) => {
         },
       },
     ],
-    [id, activeId, autoRenameTopicTitle, duplicateTopic, removeTopic, t, toggleEditing, openTopicInNewWindow],
+    [
+      id,
+      activeId,
+      autoRenameTopicTitle,
+      duplicateTopic,
+      removeTopic,
+      t,
+      toggleEditing,
+      openTopicInNewWindow,
+    ],
   );
 
   return (
@@ -180,7 +189,7 @@ const TopicContent = memo<TopicContentProps>(({ id, title, fav, showMore }) => {
         spin={isLoading}
       />
       {!editing ? (
-        title === LOADING_FLAT ? (
+        title === LOADING_FLAT || (isLoading && !title) ? (
           <Flexbox flex={1} height={28} justify={'center'}>
             <BubblesLoading />
           </Flexbox>
@@ -190,7 +199,7 @@ const TopicContent = memo<TopicContentProps>(({ id, title, fav, showMore }) => {
             ellipsis={{ rows: 1, tooltip: { placement: 'left', title } }}
             onDoubleClick={() => {
               if (isDesktop) {
-                openTopicInNewWindow(activeId, id)
+                openTopicInNewWindow(activeId, id);
               }
             }}
             style={{ margin: 0 }}

package/src/app/[variants]/(main)/chat/features/PageTitle/index.tsx

@@ -3,7 +3,6 @@
 import { memo } from 'react';
 
 import PageTitle from '@/components/PageTitle';
-import { withSuspense } from '@/components/withSuspense';
 import { useChatStore } from '@/store/chat';
 import { topicSelectors } from '@/store/chat/selectors';
 import { useSessionStore } from '@/store/session';
@@ -16,4 +15,4 @@ const Title = memo(() => {
   return <PageTitle title={[topicTitle, agentTitle].filter(Boolean).join(' · ')} />;
 });
 
-export default withSuspense(Title);
+export default Title;

package/src/app/[variants]/(main)/chat/index.tsx

@@ -0,0 +1,29 @@
+'use client';
+
+import { memo } from 'react';
+
+import { DesktopWorkspace, MobileWorkspace } from './components/WorkspaceLayout';
+import TelemetryNotification from './components/features/TelemetryNotification';
+import PageTitle from './features/PageTitle';
+
+const MobileChatPage = memo(() => {
+  return (
+    <>
+      <PageTitle />
+      <MobileWorkspace />
+      <TelemetryNotification mobile={true} />
+    </>
+  );
+});
+
+const DesktopChatPage = memo(() => {
+  return (
+    <>
+      <PageTitle />
+      <DesktopWorkspace />
+      <TelemetryNotification mobile={false} />
+    </>
+  );
+});
+
+export { DesktopChatPage, MobileChatPage };

package/src/app/[variants]/(main)/chat/session/features/SessionHydration.tsx

@@ -1,14 +1,15 @@
 'use client';
 
-import { useQueryState } from 'nuqs';
-import { parseAsString } from 'nuqs/server';
 import { memo, useEffect } from 'react';
 import { createStoreUpdater } from 'zustand-utils';
 
+import { parseAsString, useQueryParam } from '@/hooks/useQueryParam';
 import { useAgentStore } from '@/store/agent';
 import { useChatStore } from '@/store/chat';
 import { useSessionStore } from '@/store/session';
 
+const THROTTLE_DELAY = 50;
+
 // sync outside state to useSessionStore
 const SessionHydration = memo(() => {
   const useStoreUpdater = createStoreUpdater(useSessionStore);
@@ -17,10 +18,11 @@ const SessionHydration = memo(() => {
   const [switchTopic] = useChatStore((s) => [s.switchTopic]);
 
   // two-way bindings the url and session store
-  const [session, setSession] = useQueryState(
-    'session',
-    parseAsString.withDefault('inbox').withOptions({ history: 'replace', throttleMs: 50 }),
-  );
+  const [session, setSession] = useQueryParam('session', parseAsString.withDefault('inbox'), {
+    history: 'replace',
+    throttleMs: THROTTLE_DELAY,
+  });
+
   useStoreUpdater('activeId', session);
   useAgentStoreUpdater('activeId', session);
   useChatStoreUpdater('activeId', session);

package/src/app/[variants]/(main)/chat/session/features/SessionListContent/Inbox/index.tsx

@@ -1,6 +1,6 @@
-import Link from 'next/link';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
+import { Link } from 'react-router-dom';
 
 import { DEFAULT_INBOX_AVATAR } from '@/const/meta';
 import { INBOX_SESSION_ID } from '@/const/session';
@@ -24,15 +24,12 @@ const Inbox = memo(() => {
   return (
     <Link
       aria-label={t('inbox.title')}
-      href={SESSION_CHAT_URL(INBOX_SESSION_ID, mobile)}
       onClick={async (e) => {
         e.preventDefault();
-
         if (activeId === INBOX_SESSION_ID && !mobile) {
           // If user tap the inbox again, open a new topic.
           // Only for desktop.
           const inboxMessages = chatSelectors.inboxActiveTopicMessages(getChatStoreState());
-
           if (inboxMessages.length > 0) {
             await openNewTopicOrSaveTopic();
           }
@@ -40,6 +37,7 @@ const Inbox = memo(() => {
           switchSession(INBOX_SESSION_ID);
         }
       }}
+      to={SESSION_CHAT_URL(INBOX_SESSION_ID, mobile)}
     >
       <ListItem
         active={activeId === INBOX_SESSION_ID}

package/src/app/[variants]/(main)/chat/session/features/SessionListContent/List/index.tsx

@@ -9,8 +9,8 @@ import LazyLoad from 'react-lazy-load';
 
 import { SESSION_CHAT_URL } from '@/const/url';
 import { useSwitchSession } from '@/hooks/useSwitchSession';
+import { useSessionStore, getSessionStoreState } from '@/store/session';
 import { featureFlagsSelectors, useServerConfigStore } from '@/store/serverConfig';
-import { getSessionStoreState, useSessionStore } from '@/store/session';
 import { sessionGroupSelectors, sessionSelectors } from '@/store/session/selectors';
 import { getUserStoreState } from '@/store/user';
 import { userProfileSelectors } from '@/store/user/selectors';

package/src/app/[variants]/(main)/chat/session/layout/Mobile/SessionHeader.tsx

@@ -3,8 +3,8 @@
 import { ActionIcon } from '@lobehub/ui';
 import { ChatHeader } from '@lobehub/ui/mobile';
 import { MessageSquarePlus } from 'lucide-react';
-import { useRouter } from 'next/navigation';
 import { memo } from 'react';
+import { useNavigate } from 'react-router-dom';
 import { Flexbox } from 'react-layout-kit';
 
 import { ProductLogo } from '@/components/Branding';
@@ -16,14 +16,14 @@ import { mobileHeaderSticky } from '@/styles/mobileHeader';
 
 const Header = memo(() => {
   const [createSession] = useSessionStore((s) => [s.createSession]);
-  const router = useRouter();
+  const navigate = useNavigate();
   const { showCreateSession } = useServerConfigStore(featureFlagsSelectors);
 
   return (
     <ChatHeader
       left={
         <Flexbox align={'center'} gap={8} horizontal style={{ marginLeft: 8 }}>
-          <UserAvatar onClick={() => router.push('/me')} size={32} />
+          <UserAvatar onClick={() => navigate('/me')} size={32} />
           <ProductLogo type={'text'} />
         </Flexbox>
       }

package/src/app/[variants]/(main)/chat/settings/_layout/Desktop/Header.tsx

@@ -1,9 +1,9 @@
 'use client';
 
 import { ChatHeader, ChatHeaderTitle } from '@lobehub/ui/chat';
-import { useRouter } from 'next/navigation';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
+import { useNavigate } from 'react-router-dom';
 
 import { pathString } from '@/utils/url';
 
@@ -11,12 +11,12 @@ import HeaderContent from '../../features/HeaderContent';
 
 const Header = memo(() => {
   const { t } = useTranslation('setting');
-  const router = useRouter();
+  const navigate = useNavigate();
 
   return (
     <ChatHeader
       left={<ChatHeaderTitle title={t('header.session')} />}
-      onBackClick={() => router.push(pathString('/chat', { search: location.search }))}
+      onBackClick={() => navigate(pathString('/chat', { search: location.search }))}
       right={<HeaderContent />}
       showBackButton
     />

package/src/app/[variants]/(main)/chat/settings/_layout/Mobile/Header.tsx

@@ -3,20 +3,20 @@
 import { ChatHeader } from '@lobehub/ui/mobile';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
+import { useNavigate } from 'react-router-dom';
 
-import { useQueryRoute } from '@/hooks/useQueryRoute';
 import { mobileHeaderSticky } from '@/styles/mobileHeader';
 
 import HeaderContent from '../../features/HeaderContent';
 
 const Header = memo(() => {
   const { t } = useTranslation('setting');
-  const router = useQueryRoute();
+  const navigate = useNavigate();
 
   return (
     <ChatHeader
       center={<ChatHeader.Title title={t('header.session')} />}
-      onBackClick={() => router.push('/chat')}
+      onBackClick={() => navigate(-1)}
       right={<HeaderContent />}
       showBackButton
       style={mobileHeaderSticky}

package/src/app/[variants]/(main)/chat/settings/features/PublishResultModal/index.tsx

@@ -2,9 +2,9 @@
 
 import { CheckCircleOutlined } from '@ant-design/icons';
 import { Button, Modal, Space } from 'antd';
-import { useRouter } from 'next/navigation';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
+import { useNavigate } from 'react-router-dom';
 
 interface PublishResultModalProps {
   identifier?: string;
@@ -13,13 +13,13 @@ interface PublishResultModalProps {
 }
 
 const PublishResultModal = memo<PublishResultModalProps>(({ identifier, onCancel, open }) => {
-  const router = useRouter();
+  const navigate = useNavigate();
   const { t } = useTranslation('setting');
   const { t: tCommon } = useTranslation('common');
 
   const handleGoToMarket = () => {
     if (identifier) {
-      router.push(`/discover/assistant/${identifier}`);
+      navigate(`/discover/assistant/${identifier}`);
     }
     onCancel();
   };

package/src/app/[variants]/(main)/chat/{components/SettingsPage.tsx → settings/index.tsx}

@@ -8,12 +8,9 @@ import { useTranslation } from 'react-i18next';
 
 import MobileContentLayout from '@/components/server/MobileNavLayout';
 import PageTitle from '@/components/PageTitle';
-import SafeSpacing from '@/components/SafeSpacing';
-import { HEADER_HEIGHT } from '@/const/layoutTokens';
 import { useCategory } from '@/features/AgentSetting/AgentCategory/useCategory';
 import AgentSettings from '@/features/AgentSetting/AgentSettings';
 import Footer from '@/features/Setting/Footer';
-import SettingContainer from '@/features/Setting/SettingContainer';
 import { useInitAgentConfig } from '@/hooks/useInitAgentConfig';
 import { useAgentStore } from '@/store/agent';
 import { agentSelectors } from '@/store/agent/selectors';
@@ -21,14 +18,9 @@ import { ChatSettingsTabs } from '@/store/global/initialState';
 import { useSessionStore } from '@/store/session';
 import { sessionMetaSelectors } from '@/store/session/selectors';
 
-import DesktopHeader from '../settings/_layout/Desktop/Header';
-import MobileHeader from '../settings/_layout/Mobile/Header';
+import MobileHeader from './_layout/Mobile/Header';
 
-interface SettingsPageProps {
-  mobile?: boolean;
-}
-
-const SettingsPage = memo<SettingsPageProps>(({ mobile = false }) => {
+export default memo(() => {
   const { t } = useTranslation('setting');
   const [tab, setTab] = useState(ChatSettingsTabs.Prompt);
   const theme = useTheme();
@@ -46,8 +38,8 @@ const SettingsPage = memo<SettingsPageProps>(({ mobile = false }) => {
 
   const { isLoading } = useInitAgentConfig();
 
-  const content = (
-    <>
+  return (
+    <MobileContentLayout header={<MobileHeader />}>
       <PageTitle title={t('header.sessionWithName', { name: title })} />
       <Tabs
         activeKey={tab}
@@ -67,28 +59,7 @@ const SettingsPage = memo<SettingsPageProps>(({ mobile = false }) => {
         onMetaChange={updateAgentMeta}
         tab={tab}
       />
-    </>
-  );
-
-  if (mobile) {
-    return (
-      <MobileContentLayout header={<MobileHeader />}>
-        {content}
-        <Footer />
-      </MobileContentLayout>
-    );
-  }
-
-  return (
-    <>
-      <DesktopHeader />
-      <SettingContainer addonAfter={<Footer />} addonBefore={<SafeSpacing height={HEADER_HEIGHT} />}>
-        {content}
-      </SettingContainer>
-    </>
+      <Footer />
+    </MobileContentLayout>
   );
 });
-
-SettingsPage.displayName = 'SettingsPage';
-
-export default SettingsPage;

package/src/app/[variants]/(main)/components/Link.tsx

@@ -0,0 +1,21 @@
+import React, { memo } from 'react';
+import { Link as ReactRouterLink, LinkProps as ReactRouterLinkProps } from 'react-router-dom';
+
+interface LinkProps extends Omit<ReactRouterLinkProps, 'to'> {
+  children?: React.ReactNode;
+  href?: string;
+  to?: string;
+}
+
+/**
+ * Link component for React Router
+ * Provides a Next.js-like API (href prop) while using React Router internally
+ */
+const Link = memo<LinkProps>(({ href, to, ...props }) => {
+  const linkTo = href || to || '/';
+  return <ReactRouterLink {...props} to={linkTo} />;
+});
+
+Link.displayName = 'Link';
+
+export default Link;

package/src/app/[variants]/(main)/discover/(detail)/_layout/{Desktop.tsx → Desktop/index.tsx}

@@ -1,12 +1,19 @@
-import { PropsWithChildren } from 'react';
+'use client';
+
+import { memo } from 'react';
+import { Outlet } from 'react-router-dom';
 import { Flexbox } from 'react-layout-kit';
 
-import { SCROLL_PARENT_ID } from '@/app/[variants]/(main)/discover/features/const';
+import { SCROLL_PARENT_ID } from '../../../features/const';
 import Footer from '@/features/Setting/Footer';
 
 const MAX_WIDTH = 1440;
 
-const Layout = ({ children }: PropsWithChildren) => {
+/**
+ * Desktop Discover Detail Layout
+ * Layout for detail pages (assistant, model, provider, mcp details)
+ */
+const DesktopDiscoverDetailLayout = memo(() => {
   return (
     <Flexbox
       align={'center'}
@@ -17,14 +24,15 @@ const Layout = ({ children }: PropsWithChildren) => {
       width={'100%'}
     >
       <Flexbox gap={24} style={{ maxWidth: MAX_WIDTH, minHeight: '100%' }} width={'100%'}>
-        {children}
+        <Outlet />
         <div />
         <Footer />
       </Flexbox>
     </Flexbox>
   );
-};
+});
+
+DesktopDiscoverDetailLayout.displayName = 'DesktopDiscoverDetailLayout';
 
-Layout.displayName = 'DesktopDiscoverDetailLayout';
 
-export default Layout;
+export default DesktopDiscoverDetailLayout;

package/src/app/[variants]/(main)/discover/(detail)/_layout/Mobile/index.tsx

@@ -1,15 +1,15 @@
-import { PropsWithChildren } from 'react';
 
 import { SCROLL_PARENT_ID } from '@/app/[variants]/(main)/discover/features/const';
 import MobileContentLayout from '@/components/server/MobileNavLayout';
 import Footer from '@/features/Setting/Footer';
 
 import Header from './Header';
+import { Outlet } from 'react-router-dom';
 
-const Layout = ({ children }: PropsWithChildren) => {
+const Layout = () => {
   return (
     <MobileContentLayout gap={16} header={<Header />} id={SCROLL_PARENT_ID} padding={16}>
-      {children}
+      <Outlet />
       <div />
       <Footer />
     </MobileContentLayout>

package/src/app/[variants]/(main)/discover/(detail)/assistant/{[...slugs]/features → features}/Details/Capabilities/Block.tsx

@@ -2,7 +2,7 @@ import { Tag } from '@lobehub/ui';
 import { ReactNode, memo } from 'react';
 import { Flexbox } from 'react-layout-kit';
 
-import Title from '../../../../../../features/Title';
+import Title from '../../../../../features/Title';
 
 interface BlockProps {
   children?: ReactNode;

package/src/app/[variants]/(main)/discover/(detail)/assistant/{[...slugs]/features → features}/Details/Overview/index.tsx

@@ -10,7 +10,7 @@ import { DEFAULT_USER_AVATAR_URL } from '@/const/meta';
 import { useUserStore } from '@/store/user';
 import { authSelectors, userProfileSelectors } from '@/store/user/selectors';
 
-import Title from '../../../../../../features/Title';
+import Title from '../../../../../features/Title';
 import { useDetailContext } from '../../DetailProvider';
 
 const Overview = memo(() => {

package/src/app/[variants]/(main)/discover/(detail)/assistant/{[...slugs]/features → features}/Details/Related/index.tsx

@@ -6,8 +6,8 @@ import { Flexbox } from 'react-layout-kit';
 import { useQuery } from '@/hooks/useQuery';
 import { AssistantMarketSource } from '@/types/discover';
 
-import McpList from '../../../../../../(list)/assistant/features/List';
-import Title from '../../../../../../features/Title';
+import McpList from '../../../../../(list)/assistant/features/List';
+import Title from '../../../../../features/Title';
 import { useDetailContext } from '../../DetailProvider';
 
 const Related = memo(() => {

package/src/app/[variants]/(main)/discover/(detail)/assistant/{[...slugs]/features → features}/Details/SystemRole/index.tsx

@@ -5,9 +5,9 @@ import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
-import TokenTag from '../../../../../../(list)/assistant/features/List/TokenTag';
-import Title from '../../../../../../features/Title';
-import MarkdownRender from '../../../../../features/MakedownRender';
+import TokenTag from '../../../../../(list)/assistant/features/List/TokenTag';
+import Title from '../../../../../features/Title';
+import MarkdownRender from '../../../../features/MakedownRender';
 import { useDetailContext } from '../../DetailProvider';
 import TagList from './TagList';
 

package/src/app/[variants]/(main)/discover/(detail)/assistant/{[...slugs]/features → features}/Details/Versions/index.tsx

@@ -1,19 +1,19 @@
 import { Block, Icon, Tag } from '@lobehub/ui';
 import { useTheme } from 'antd-style';
 import { CheckIcon, MinusIcon } from 'lucide-react';
-import Link from 'next/link';
-import { usePathname } from 'next/navigation';
 import qs from 'query-string';
 import { memo, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
+import Link from '@/app/[variants]/(main)/components/Link';
+import { usePathname } from '@/app/[variants]/(main)/hooks/usePathname';
+import { useQuery } from '@/app/[variants]/(main)/hooks/useQuery';
 import InlineTable from '@/components/InlineTable';
 import PublishedTime from '@/components/PublishedTime';
-import { useQuery } from '@/hooks/useQuery';
 import { AssistantMarketSource, AssistantNavKey } from '@/types/discover';
 
-import Title from '../../../../../../features/Title';
+import Title from '../../../../../features/Title';
 import { useDetailContext } from '../../DetailProvider';
 
 const Versions = memo(() => {

package/src/app/[variants]/(main)/discover/(detail)/assistant/{[...slugs]/features → features}/Details/index.tsx

@@ -1,10 +1,10 @@
 'use client';
 
 import { useResponsive } from 'antd-style';
-import { useQueryState } from 'nuqs';
 import { memo } from 'react';
 import { Flexbox } from 'react-layout-kit';
 
+import { useQueryState } from '@/hooks/useQueryParam';
 import { AssistantNavKey } from '@/types/discover';
 
 import Sidebar from '../Sidebar';

package/src/app/[variants]/(main)/discover/(detail)/assistant/{[...slugs]/features → features}/Header.tsx

@@ -13,8 +13,8 @@ import urlJoin from 'url-join';
 
 import { formatIntergerNumber } from '@/utils/format';
 
-import { useCategory } from '../../../../(list)/assistant/features/Category/useCategory';
-import PublishedTime from '../../../../../../../../components/PublishedTime';
+import { useCategory } from '../../../(list)/assistant/features/Category/useCategory';
+import PublishedTime from '../../../../../../../components/PublishedTime';
 import { useDetailContext } from './DetailProvider';
 
 const useStyles = createStyles(({ css, token }) => {

package/src/app/[variants]/(main)/discover/(detail)/assistant/{[...slugs]/features → features}/Sidebar/ActionButton/AddAgent.tsx

@@ -4,9 +4,9 @@ import { Icon } from '@lobehub/ui';
 import { App, Dropdown } from 'antd';
 import { createStyles } from 'antd-style';
 import { ChevronDownIcon } from 'lucide-react';
-import { useRouter } from 'nextjs-toploader/app';
 import { memo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
+import { useNavigate } from 'react-router-dom';
 
 import { SESSION_CHAT_URL } from '@/const/url';
 import { useSessionStore } from '@/store/session';
@@ -70,7 +70,7 @@ const AddAgent = memo<{ mobile?: boolean }>(({ mobile }) => {
   const createSession = useSessionStore((s) => s.createSession);
   const sessions = useSessionStore((s) => s.sessions);
   const { message, modal } = App.useApp();
-  const router = useRouter();
+  const navigate = useNavigate();
   const { t } = useTranslation('discover');
 
   const meta = {
@@ -114,7 +114,7 @@ const AddAgent = memo<{ mobile?: boolean }>(({ mobile }) => {
     try {
       const session = await createSessionWithMarketIdentifier(true);
       message.success(t('assistants.addAgentSuccess'));
-      router.push(SESSION_CHAT_URL(session, mobile));
+      navigate(SESSION_CHAT_URL(session, mobile));
     } finally {
       setIsLoading(false);
     }

package/src/app/[variants]/(main)/discover/(detail)/assistant/{[...slugs]/features → features}/Sidebar/ActionButton/index.tsx

@@ -6,7 +6,7 @@ import urlJoin from 'url-join';
 
 import { OFFICIAL_URL } from '@/const/url';
 
-import ShareButton from '../../../../../features/ShareButton';
+import ShareButton from '../../../../features/ShareButton';
 import { useDetailContext } from '../../DetailProvider';
 import AddAgent from './AddAgent';
 

package/src/app/[variants]/(main)/discover/(detail)/assistant/{[...slugs]/features → features}/Sidebar/Related/index.tsx

@@ -5,7 +5,7 @@ import { Flexbox } from 'react-layout-kit';
 import { Link } from 'react-router-dom';
 import urlJoin from 'url-join';
 
-import Title from '../../../../../../features/Title';
+import Title from '../../../../../features/Title';
 import { useQuery } from '@/hooks/useQuery';
 import { AssistantMarketSource } from '@/types/discover';
 import { useDetailContext } from '../../DetailProvider';

package/src/app/[variants]/(main)/discover/(detail)/assistant/{[...slugs]/features → features}/Sidebar/TocList/index.tsx

@@ -9,8 +9,8 @@ import { useToc } from '@/app/[variants]/(main)/discover/(detail)/features/Toc/u
 import { useQuery } from '@/hooks/useQuery';
 import { AssistantNavKey } from '@/types/discover';
 
-import Title from '../../../../../../features/Title';
-import Toc from '../../../../../features/Toc';
+import Title from '../../../../../features/Title';
+import Toc from '../../../../features/Toc';
 
 const TocList = memo(() => {
   const { t } = useTranslation('discover');

package/src/app/[variants]/(main)/discover/(detail)/assistant/{[...slugs]/features → features}/StatusPage/index.tsx

@@ -6,20 +6,20 @@ import {
   FolderOpenOutlined,
 } from '@ant-design/icons';
 import { Button, Result } from 'antd';
-import { useRouter } from 'next/navigation';
 import { memo } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
+import { useNavigate } from 'react-router-dom';
 
 interface StatusPageProps {
   status: 'unpublished' | 'archived' | 'deprecated';
 }
 
 const StatusPage = memo<StatusPageProps>(({ status }) => {
-  const router = useRouter();
+  const navigate = useNavigate();
   const { t } = useTranslation('discover');
 
   const handleBackToMarket = () => {
-    router.push('/discover/assistant');
+    navigate('/discover/assistant');
   };
 
   // 审核中状态