@lobehub/lobehub 2.0.0-next.95 → 2.0.0-next.97

package/packages/database/src/repositories/dataImporter/index.ts

@@ -17,39 +17,39 @@ interface ImportResult {
 type ConflictStrategy = 'skip' | 'override' | 'merge';
 
 interface TableImportConfig {
-  // 冲突处理策略
+  // Conflict resolution strategy
   conflictStrategy?: ConflictStrategy;
-  // 字段处理函数
+  // Field processing functions
   fieldProcessors?: {
     [field: string]: (value: any) => any;
   };
-  // 是否使用复合主键（没有单独的id字段）
+  // Whether to use composite key (no separate id field)
   isCompositeKey?: boolean;
-  // 是否保留原始ID
+  // Whether to preserve original ID
   preserveId?: boolean;
-  // 关系字段定义
+  // Relation field definitions
   relations?: {
     field: string;
     sourceField?: string;
     sourceTable: string;
   }[];
-  // 自引用字段
+  // Self-reference fields
   selfReferences?: {
     field: string;
     sourceField?: string;
   }[];
-  // 表名
+  // Table name
   table: string;
-  // 唯一约束字段
+  // Unique constraint fields
   uniqueConstraints?: string[];
 }
 
-// 导入表配置
+// Import table configuration
 const IMPORT_TABLE_CONFIG: TableImportConfig[] = [
   {
     conflictStrategy: 'merge',
     preserveId: true,
-    // 特殊表，ID与用户ID相同
+    // Special table, ID same as user ID
     table: 'userSettings',
     uniqueConstraints: ['id'],
   },

package/packages/database/src/schemas/topic.ts

@@ -77,7 +77,7 @@ export type ThreadItem = typeof threads.$inferSelect;
 export const insertThreadSchema = createInsertSchema(threads);
 
 /**
- * 文档与话题关联表 - 实现文档和话题的多对多关系
+ * Document-Topic association table - Implements many-to-many relationship between documents and topics
  */
 export const topicDocuments = pgTable(
   'topic_documents',

package/packages/database/src/server/models/ragEval/evaluation.ts

@@ -56,7 +56,7 @@ export class EvalEvaluationModel {
         ),
       );
 
-    // 然后查询每个评估的记录统计
+    // Then query record statistics for each evaluation
     const evaluationIds = evaluations.map((evals) => evals.id);
 
     const recordStats = await this.db

package/packages/types/src/hotkey.ts

@@ -60,6 +60,7 @@ export const KeyEnum = {
 export const HotkeyEnum = {
   AddUserMessage: 'addUserMessage',
   ClearCurrentMessages: 'clearCurrentMessages',
+  CommandPalette: 'commandPalette',
   DeleteAndRegenerateMessage: 'deleteAndRegenerateMessage',
   DeleteLastMessage: 'deleteLastMessage',
   EditMessage: 'editMessage',

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

@@ -6,7 +6,7 @@ import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
 import { type ActionKeys, ChatInputProvider, DesktopChatInput } from '@/features/ChatInput';
-import WideScreenContainer from '@/features/Conversation/components/WideScreenContainer';
+import WideScreenContainer from '@/features/ChatList/components/WideScreenContainer';
 import { useChatStore } from '@/store/chat';
 import { aiChatSelectors } from '@/store/chat/selectors';
 

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

@@ -9,7 +9,7 @@ import { Flexbox } from 'react-layout-kit';
 
 import { DEFAULT_AVATAR } from '@/const/meta';
 import { type ActionKeys, ChatInputProvider, DesktopChatInput } from '@/features/ChatInput';
-import WideScreenContainer from '@/features/Conversation/components/WideScreenContainer';
+import WideScreenContainer from '@/features/ChatList/components/WideScreenContainer';
 import { useChatStore } from '@/store/chat';
 import { aiChatSelectors } from '@/store/chat/selectors';
 import { useSessionStore } from '@/store/session';

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

@@ -1,7 +1,7 @@
 import { createStyles } from 'antd-style';
 import React, { memo } from 'react';
 
-import { ChatItem } from '@/features/Conversation';
+import { ChatItem } from '@/features/ChatList';
 import { useAgentStore } from '@/store/agent';
 import { agentChatConfigSelectors } from '@/store/agent/selectors';
 import { useChatStore } from '@/store/chat';

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

@@ -2,8 +2,8 @@
 
 import React, { memo, useCallback } from 'react';
 
-import { SkeletonList, VirtualizedList } from '@/features/Conversation';
-import WideScreenContainer from '@/features/Conversation/components/WideScreenContainer';
+import { SkeletonList, VirtualizedList } from '@/features/ChatList';
+import WideScreenContainer from '@/features/ChatList/components/WideScreenContainer';
 import { useFetchMessages } from '@/hooks/useFetchMessages';
 import { useChatStore } from '@/store/chat';
 import { displayMessageSelectors } from '@/store/chat/selectors';

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

@@ -1,7 +1,7 @@
 import { Suspense, lazy } from 'react';
 import { Flexbox } from 'react-layout-kit';
 
-import { SkeletonList } from '@/features/Conversation';
+import { SkeletonList } from '@/features/ChatList';
 
 const Content = lazy(() => import('./Content'));
 

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

@@ -16,7 +16,7 @@ import {
   getVirtuaGlobalRef,
   subscribeVirtuaActiveIndex,
   subscribeVirtuaGlobalRef,
-} from '@/features/Conversation/components/VirtualizedList/VirtuosoContext';
+} from '@/features/ChatList/components/VirtualizedList/VirtuosoContext';
 import { useChatStore } from '@/store/chat';
 import { displayMessageSelectors } from '@/store/chat/selectors';
 

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

@@ -1,11 +1,11 @@
 'use client';
 
 import { useResponsive, useTheme } from 'antd-style';
-import { memo, useRef } from 'react';
+import { memo, useEffect, useRef } from 'react';
 import { Flexbox } from 'react-layout-kit';
+import { useSearchParams } from 'react-router-dom';
 
 import SettingContainer from '@/features/Setting/SettingContainer';
-import { parseAsStringEnum, useQueryParam } from '@/hooks/useQueryParam';
 import { SettingsTabs } from '@/store/global/initialState';
 
 import CategoryContent from '../CategoryContent';
@@ -13,18 +13,51 @@ import SettingsContent from '../SettingsContent';
 import { LayoutProps } from '../type';
 import Header from './Header';
 import SideBar from './SideBar';
+import useMergedState from 'rc-util/lib/hooks/useMergedState';
 
 const Layout = memo<LayoutProps>(() => {
   const ref = useRef<HTMLDivElement | null>(null);
   const { md = true } = useResponsive();
   const theme = useTheme();
 
-  const [activeTab, setActiveTab] = useQueryParam(
-    'active',
-    parseAsStringEnum(Object.values(SettingsTabs)).withDefault(SettingsTabs.Common),
-  );
+  const [searchParams, setSearchParams] = useSearchParams();
+
+  const [activeTabState, setActiveTabState] = useMergedState({
+    active: searchParams.get('active') as SettingsTabs ? searchParams.get('active') as SettingsTabs : SettingsTabs.Common,
+  }, {
+    onChange: (obj: {
+      active: SettingsTabs;
+      provider?: string;
+    }) => {
+      if (obj.provider) {
+        setSearchParams({ active: obj.active, provider: obj.provider });
+      } else {
+        searchParams.delete('provider');
+        setSearchParams({ active: obj.active });
+      }
+    },
+  });
+
+  const setActiveTab = (tab: SettingsTabs) => {
+    if (tab === SettingsTabs.Provider) {
+      setActiveTabState({ active: tab, provider: 'all' });
+    } else {
+      setActiveTabState({
+        active: tab,
+      });
+    }
+  };
+
+  useEffect(() => {
+    return () => {
+      setSearchParams((prevParams) => {
+        prevParams.delete('active');
+        return prevParams;
+      });
+    };
+  }, []);
 
-  const category = <CategoryContent activeTab={activeTab} onMenuSelect={setActiveTab} />;
+  const category = <CategoryContent activeTab={activeTabState.active} onMenuSelect={setActiveTab} />;
 
   return (
     <Flexbox
@@ -39,7 +72,7 @@ const Layout = memo<LayoutProps>(() => {
         <Header getContainer={() => ref.current!}>{category}</Header>
       )}
       <SettingContainer maxWidth={'none'}>
-        <SettingsContent activeTab={activeTab} mobile={false} />
+        <SettingsContent activeTab={activeTabState.active} mobile={false} />
       </SettingContainer>
     </Flexbox>
   );

package/src/app/[variants]/(main)/settings/provider/(list)/ProviderGrid/Card.tsx

@@ -5,7 +5,6 @@ import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
-import Link from '@/components/Link';
 import { AiProviderListItem } from '@/types/aiProvider';
 
 import EnableSwitch from './EnableSwitch';
@@ -13,9 +12,10 @@ import { useStyles } from './style';
 
 interface ProviderCardProps extends AiProviderListItem {
   loading?: boolean;
+  onProviderSelect: (provider: string) => void;
 }
 const ProviderCard = memo<ProviderCardProps>(
-  ({ id, description, name, enabled, source, logo, loading }) => {
+  ({ id, description, name, enabled, source, logo, loading, onProviderSelect }) => {
     const { t } = useTranslation('providers');
     const { cx, styles, theme } = useStyles();
 
@@ -33,7 +33,9 @@ const ProviderCard = memo<ProviderCardProps>(
     return (
       <Flexbox className={cx(styles.container)} gap={24}>
         <Flexbox gap={12} padding={16} width={'100%'}>
-          <Link href={`/settings?active=provider&provider=${id}`}>
+          <div onClick={() => {
+            onProviderSelect(id);
+          }} style={{ cursor: 'pointer' }}>
             <Flexbox gap={12} width={'100%'}>
               <Flexbox align={'center'} horizontal justify={'space-between'}>
                 {source === 'builtin' ? (
@@ -68,7 +70,7 @@ const ProviderCard = memo<ProviderCardProps>(
                 {source === 'custom' ? description : t(`${id}.description`)}
               </Text>
             </Flexbox>
-          </Link>
+          </div>
           <Divider style={{ margin: '4px 0' }} />
           <Flexbox horizontal justify={'space-between'}>
             <div />

package/src/app/[variants]/(main)/settings/provider/(list)/ProviderGrid/index.tsx

@@ -14,7 +14,12 @@ const loadingArr = Array.from({ length: 12 })
   .fill('-')
   .map((item, index) => `${index}x${item}`);
 
-const List = memo(() => {
+type ListProps = {
+  onProviderSelect: (provider: string) => void;
+};
+
+const List = memo((props: ListProps) => {
+  const { onProviderSelect } = props;
   const { t } = useTranslation('modelProvider');
   const enabledList = useAiInfraStore(aiProviderSelectors.enabledAiProviderList, isEqual);
   const disabledList = useAiInfraStore(aiProviderSelectors.disabledAiProviderList, isEqual);
@@ -30,7 +35,14 @@ const List = memo(() => {
         </Flexbox>
         <Grid gap={16} rows={3}>
           {loadingArr.map((item) => (
-            <Card enabled={false} id={item} key={item} loading source={'builtin'} />
+            <Card
+              enabled={false}
+              id={item}
+              key={item}
+              loading
+              onProviderSelect={onProviderSelect}
+              source={'builtin'}
+            />
           ))}
         </Grid>
       </Flexbox>
@@ -47,7 +59,7 @@ const List = memo(() => {
         </Flexbox>
         <Grid gap={16} rows={3}>
           {enabledList.map((item) => (
-            <Card {...item} key={item.id} />
+            <Card {...item} key={item.id} onProviderSelect={onProviderSelect} />
           ))}
         </Grid>
       </Flexbox>
@@ -60,7 +72,7 @@ const List = memo(() => {
         </Flexbox>
         <Grid gap={16} rows={3}>
           {disabledList.map((item) => (
-            <Card {...item} key={item.id} />
+            <Card {...item} key={item.id} onProviderSelect={onProviderSelect} />
           ))}
         </Grid>
       </Flexbox>

package/src/app/[variants]/(main)/settings/provider/(list)/index.tsx

@@ -1,20 +1,32 @@
 'use client';
 
 import { isCustomBranding } from '@/const/version';
-import { parseAsString, useQueryParam } from '@/hooks/useQueryParam';
 
 import DesktopLayout from '../_layout/Desktop';
 import MobileLayout from '../_layout/Mobile';
 import ProviderDetailPage from '../detail';
 import Footer from './Footer';
+import { useMemo, useState } from 'react';
+import { useSearchParams } from 'react-router-dom';
 
 const Page = (props: { mobile?: boolean }) => {
-  const [Provider, setProvider] = useQueryParam('provider', parseAsString.withDefault('all'));
+  const [SearchParams, setSearchParams] = useSearchParams();
+  const [provider, setProviderState] = useState(SearchParams.get('provider') || 'all');
+  const setProvider = (provider: string) => {
+    setSearchParams({ active: 'provider', provider });
+    setProviderState(provider);
+  };
+
   const { mobile } = props;
   const ProviderLayout = mobile ? MobileLayout : DesktopLayout;
+
+  const ProviderListPage = useMemo(() => {
+    return <ProviderDetailPage id={provider} onProviderSelect={setProvider} />;
+  }, [provider]);
+
   return (
     <ProviderLayout onProviderSelect={setProvider}>
-      <ProviderDetailPage id={Provider} />
+      {ProviderListPage}
       {!isCustomBranding && <Footer />}
     </ProviderLayout>
   );

package/src/app/[variants]/(main)/settings/provider/detail/index.tsx

@@ -1,22 +1,30 @@
-import NewAPI from './newapi';
-import ProviderGrid from '../(list)/ProviderGrid';
-import Azure from './azure';
-import AzureAI from './azureai';
-import Bedrock from './bedrock';
-import Cloudflare from './cloudflare';
-import ComfyUI from './comfyui';
-import DefaultPage from './default/ProviderDetialPage';
-import GitHub from './github';
-import Ollama from './ollama';
-import OpenAI from './openai';
-import VertexAI from './vertexai';
+import dynamic from 'next/dynamic';
+import Loading from '@/components/Loading/BrandTextLoading';
 
-const ProviderDetailPage = (props: { id?: string | null }) => {
-  const { id } = props;
+const NewAPI = dynamic(() => import('./newapi'), { loading: () => <Loading />, ssr: false });
+const OpenAI = dynamic(() => import('./openai'), { loading: () => <Loading />, ssr: false });
+const VertexAI = dynamic(() => import('./vertexai'), { loading: () => <Loading />, ssr: false });
+const GitHub = dynamic(() => import('./github'), { loading: () => <Loading />, ssr: false });
+const Ollama = dynamic(() => import('./ollama'), { loading: () => <Loading />, ssr: false });
+const ComfyUI = dynamic(() => import('./comfyui'), { loading: () => <Loading />, ssr: false });
+const Cloudflare = dynamic(() => import('./cloudflare'), { loading: () => <Loading />, ssr: false });
+const Bedrock = dynamic(() => import('./bedrock'), { loading: () => <Loading />, ssr: false });
+const AzureAI = dynamic(() => import('./azureai'), { loading: () => <Loading />, ssr: false });
+const Azure = dynamic(() => import('./azure'), { loading: () => <Loading />, ssr: false });
+const ProviderGrid = dynamic(() => import('../(list)/ProviderGrid'), { loading: () => <Loading />, ssr: false });
+const DefaultPage = dynamic(() => import('./default/ProviderDetialPage'), { loading: () => <Loading />, ssr: false });
+
+type ProviderDetailPageProps = {
+  id?: string | null;
+  onProviderSelect: (provider: string) => void;
+}
+
+const ProviderDetailPage = (props: ProviderDetailPageProps) => {
+  const { id, onProviderSelect } = props;
 
   switch (id) {
     case 'all': {
-      return <ProviderGrid />;
+      return <ProviderGrid onProviderSelect={onProviderSelect} />;
     }
     case 'azure': {
       return <Azure />;

package/src/components/InvalidAPIKey/APIKeyForm/Bedrock.tsx

@@ -6,7 +6,7 @@ import { ModelProvider } from 'model-bank';
 import { memo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { FormAction } from '@/features/Conversation/Error/style';
+import { FormAction } from '@/features/ChatList/Error/style';
 import { aiProviderSelectors, useAiInfraStore } from '@/store/aiInfra';
 
 const BedrockForm = memo<{ description: string }>(({ description }) => {

package/src/components/InvalidAPIKey/APIKeyForm/ComfyUIForm.tsx

@@ -10,7 +10,7 @@ import { Center, Flexbox } from 'react-layout-kit';
 
 import { FormInput, FormPassword } from '@/components/FormInput';
 import KeyValueEditor from '@/components/KeyValueEditor';
-import { FormAction } from '@/features/Conversation/Error/style';
+import { FormAction } from '@/features/ChatList/Error/style';
 import { useAiInfraStore } from '@/store/aiInfra';
 import { ComfyUIKeyVault } from '@/types/user/settings';
 

package/src/components/InvalidAPIKey/APIKeyForm/ProviderApiKeyForm.tsx

@@ -4,7 +4,7 @@ import { ReactNode, memo, useContext, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { FormInput, FormPassword } from '@/components/FormInput';
-import { FormAction } from '@/features/Conversation/Error/style';
+import { FormAction } from '@/features/ChatList/Error/style';
 import { useProviderName } from '@/hooks/useProviderName';
 import { featureFlagsSelectors, useServerConfigStore } from '@/store/serverConfig';
 import { GlobalLLMProviderKey } from '@/types/user/settings';

package/src/components/InvalidAPIKey/APIKeyForm/__tests__/ComfyUIForm.test.tsx

@@ -97,7 +97,7 @@ vi.mock('react-layout-kit', () => ({
   )),
 }));
 
-vi.mock('@/features/Conversation/Error/style', () => ({
+vi.mock('@/features/ChatList/Error/style', () => ({
   FormAction: vi.fn(({ children, title, description, avatar, ...props }) => (
     <div data-testid="form-action" {...props}>
       <div data-testid="avatar">{avatar}</div>

package/src/components/InvalidAPIKey/index.tsx

@@ -1,6 +1,6 @@
 import { memo } from 'react';
 
-import { ErrorActionContainer } from '@/features/Conversation/Error/style';
+import { ErrorActionContainer } from '@/features/ChatList/Error/style';
 
 import APIKeyForm from './APIKeyForm';
 

package/src/features/{Conversation → ChatList}/MarkdownElements/remarkPlugins/getNodeContent.test.ts

@@ -1,8 +1,7 @@
-import { toMarkdown } from 'mdast-util-to-markdown';
 import { Parent } from 'unist';
 import { expect } from 'vitest';
 
-import { treeNodeToString } from '@/features/Conversation/MarkdownElements/remarkPlugins/getNodeContent';
+import { treeNodeToString } from './getNodeContent';
 
 describe('treeNodeToString', () => {
   it('with latex', () => {

package/src/features/{Conversation → ChatList}/Messages/Assistant/Actions/index.tsx

@@ -5,13 +5,13 @@ import { useSearchParams } from 'next/navigation';
 import { memo, use, useCallback, useContext, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import ShareMessageModal from '@/features/Conversation/components/ShareMessageModal';
-import { VirtuaContext } from '@/features/Conversation/components/VirtualizedList/VirtuosoContext';
 import { useChatStore } from '@/store/chat';
 import { messageStateSelectors, threadSelectors } from '@/store/chat/selectors';
 import { useSessionStore } from '@/store/session';
 import { sessionSelectors } from '@/store/session/selectors';
 
+import ShareMessageModal from '../../../components/ShareMessageModal';
+import { VirtuaContext } from '../../../components/VirtualizedList/VirtuosoContext';
 import { InPortalThreadContext } from '../../../context/InPortalThreadContext';
 import { useChatListActionsBar } from '../../../hooks/useChatListActionsBar';
 import { ErrorActionsBar } from './Error';

package/src/features/{Conversation → ChatList}/Messages/Assistant/Extra/index.test.tsx

@@ -9,13 +9,13 @@ import { AssistantMessageExtra } from './index';
 vi.mock('zustand/traditional');
 
 // Mock TTS and Translate components
-vi.mock('@/features/Conversation/components/Extras/TTS', () => ({
+vi.mock('@/features/ChatList/components/Extras/TTS', () => ({
   default: vi.fn(() => <div>TTS Component</div>),
 }));
-vi.mock('@/features/Conversation/components/Extras/Translate', () => ({
+vi.mock('@/features/ChatList/components/Extras/Translate', () => ({
   default: vi.fn(() => <div>Translate Component</div>),
 }));
-vi.mock('@/features/Conversation/components/Extras/Usage', () => ({
+vi.mock('@/features/ChatList/components/Extras/Usage', () => ({
   default: vi.fn(() => <div>Usage Component</div>),
 }));
 

package/src/features/{Conversation → ChatList}/Messages/Assistant/Extra/index.tsx

@@ -1,15 +1,16 @@
+import { LOADING_FLAT } from '@lobechat/const';
 import { ModelPerformance, ModelUsage } from '@lobechat/types';
 import { memo } from 'react';
 import { Flexbox } from 'react-layout-kit';
 
-import { LOADING_FLAT } from '@/const/message';
-import ExtraContainer from '@/features/Conversation/components/Extras/ExtraContainer';
-import TTS from '@/features/Conversation/components/Extras/TTS';
-import Translate from '@/features/Conversation/components/Extras/Translate';
-import Usage from '@/features/Conversation/components/Extras/Usage';
 import { useChatStore } from '@/store/chat';
 import { messageStateSelectors } from '@/store/chat/selectors';
 
+import ExtraContainer from '../../../components/Extras/ExtraContainer';
+import TTS from '../../../components/Extras/TTS';
+import Translate from '../../../components/Extras/Translate';
+import Usage from '../../../components/Extras/Usage';
+
 interface AssistantMessageExtraProps {
   content: string;
   extra?: any;

package/src/features/{Conversation → ChatList}/Messages/Assistant/MessageContent.tsx

@@ -3,12 +3,12 @@ import { UIChatMessage } from '@lobechat/types';
 import { ReactNode, memo } from 'react';
 import { Flexbox } from 'react-layout-kit';
 
-import { CollapsedMessage } from '@/features/Conversation/Messages/Assistant/CollapsedMessage';
 import { useChatStore } from '@/store/chat';
 import { aiChatSelectors, messageStateSelectors } from '@/store/chat/selectors';
 
 import { DefaultMessage } from '../Default';
 import ImageFileListViewer from '../User/ImageFileListViewer';
+import { CollapsedMessage } from './CollapsedMessage';
 import FileChunks from './FileChunks';
 import IntentUnderstanding from './IntentUnderstanding';
 import Reasoning from './Reasoning';

package/src/features/{Conversation → ChatList}/Messages/Group/Actions/WithContentId.tsx

@@ -5,13 +5,13 @@ import { useSearchParams } from 'next/navigation';
 import { memo, use, useCallback, useContext, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import ShareMessageModal from '@/features/Conversation/components/ShareMessageModal';
-import { VirtuaContext } from '@/features/Conversation/components/VirtualizedList/VirtuosoContext';
 import { useChatStore } from '@/store/chat';
 import { messageStateSelectors, threadSelectors } from '@/store/chat/selectors';
 import { useSessionStore } from '@/store/session';
 import { sessionSelectors } from '@/store/session/selectors';
 
+import ShareMessageModal from '../../../components/ShareMessageModal';
+import { VirtuaContext } from '../../../components/VirtualizedList/VirtuosoContext';
 import { InPortalThreadContext } from '../../../context/InPortalThreadContext';
 import { useChatListActionsBar } from '../../../hooks/useChatListActionsBar';
 

package/src/features/{Conversation → ChatList}/Messages/Group/ContentBlock.tsx

@@ -4,13 +4,13 @@ import { memo, useMemo } from 'react';
 import { Flexbox } from 'react-layout-kit';
 
 import { LOADING_FLAT } from '@/const/message';
-import { markdownElements } from '@/features/Conversation/MarkdownElements';
-import Reasoning from '@/features/Conversation/Messages/Assistant/Reasoning';
 import { useChatStore } from '@/store/chat';
 import { aiChatSelectors, messageStateSelectors } from '@/store/chat/selectors';
 import { useUserStore } from '@/store/user';
 import { userGeneralSettingsSelectors } from '@/store/user/selectors';
 
+import { markdownElements } from '../../MarkdownElements';
+import Reasoning from '../Assistant/Reasoning';
 import ImageFileListViewer from '../User/ImageFileListViewer';
 import ErrorContent from './Error';
 import MessageContent from './MessageContent';

package/src/features/{Conversation → ChatList}/Messages/Group/Error/index.tsx

@@ -5,9 +5,10 @@ import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
-import ErrorMessageExtra, { useErrorContent } from '@/features/Conversation/Error';
 import { useChatStore } from '@/store/chat';
 
+import ErrorMessageExtra, { useErrorContent } from '../../../Error';
+
 export interface ErrorContentProps {
   error?: ChatMessageError;
   id: string;

package/src/features/{Conversation → ChatList}/Messages/Group/Group.tsx

@@ -4,10 +4,10 @@ import isEqual from 'fast-deep-equal';
 import { memo, useMemo } from 'react';
 import { Flexbox } from 'react-layout-kit';
 
-import { CollapsedMessage } from '@/features/Conversation/Messages/Group/CollapsedMessage';
 import { useChatStore } from '@/store/chat';
 import { messageStateSelectors } from '@/store/chat/slices/message/selectors';
 
+import { CollapsedMessage } from './CollapsedMessage';
 import { GroupMessageContext } from './GroupContext';
 import GroupItem from './GroupItem';
 

package/src/features/{Conversation → ChatList}/Messages/Group/GroupItem.tsx

@@ -3,10 +3,11 @@ import isEqual from 'fast-deep-equal';
 import { memo, use } from 'react';
 import { Flexbox } from 'react-layout-kit';
 
-import { ContentBlock } from '@/features/Conversation/Messages/Group/ContentBlock';
-import { VirtuaContext } from '@/features/Conversation/components/VirtualizedList/VirtuosoContext';
 import { useChatStore } from '@/store/chat';
 
+import { VirtuaContext } from '../../components/VirtualizedList/VirtuosoContext';
+import { ContentBlock } from './ContentBlock';
+
 interface GroupItemProps extends AssistantContentBlock {
   contentId?: string;
   disableEditing?: boolean;

package/src/features/{Conversation → ChatList}/Messages/Group/Tool/Render/Intervention/ApprovalActions.tsx

@@ -5,10 +5,10 @@ import { memo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
-import { useGroupMessage } from '@/features/Conversation/Messages/Group/GroupContext';
 import { useChatStore } from '@/store/chat';
 import { useUserStore } from '@/store/user';
 
+import { useGroupMessage } from '../../../GroupContext';
 import { ApprovalMode } from './index';
 
 interface ApprovalActionsProps {

package/src/features/{Conversation → ChatList}/Messages/Group/Tool/Render/index.tsx

@@ -3,8 +3,7 @@ import { ChatToolResult, ToolIntervention } from '@lobechat/types';
 import { Suspense, memo } from 'react';
 import { Flexbox } from 'react-layout-kit';
 
-import AbortResponse from '@/features/Conversation/Messages/Group/Tool/Render/AbortResponse';
-
+import AbortResponse from './AbortResponse';
 import CustomRender from './CustomRender';
 import ErrorResponse from './ErrorResponse';
 import Intervention from './Intervention';