@lobehub/lobehub 2.0.0-next.1 → 2.0.0-next.10

package/src/envs/auth.ts

@@ -20,10 +20,6 @@ declare global {
 
       NEXT_AUTH_SSO_SESSION_STRATEGY?: string;
 
-      AUTH0_CLIENT_ID?: string;
-      AUTH0_CLIENT_SECRET?: string;
-      AUTH0_ISSUER?: string;
-
       // Github
       GITHUB_CLIENT_ID?: string;
       GITHUB_CLIENT_SECRET?: string;
@@ -33,11 +29,6 @@ declare global {
       AZURE_AD_CLIENT_SECRET?: string;
       AZURE_AD_TENANT_ID?: string;
 
-      // AUTHENTIK
-      AUTHENTIK_CLIENT_ID?: string;
-      AUTHENTIK_CLIENT_SECRET?: string;
-      AUTHENTIK_ISSUER?: string;
-
       // ZITADEL
       ZITADEL_CLIENT_ID?: string;
       ZITADEL_CLIENT_SECRET?: string;
@@ -46,102 +37,7 @@ declare global {
   }
 }
 
-// TODO(NextAuth ENVs Migration): Remove once nextauth envs migration time end
-const removeTipsTemplate = (willBeRemoved: string, replaceOne: string) =>
-  `${willBeRemoved} will be removed in the future. Please set ${replaceOne} instead.`;
-// End
-
 export const getAuthConfig = () => {
-  // TODO(NextAuth ENVs Migration): Remove once nextauth envs migration time end
-  if (process.env.AUTH0_CLIENT_ID) {
-    console.warn(removeTipsTemplate('AUTH0_CLIENT_ID', 'AUTH_AUTH0_ID'));
-  }
-  if (process.env.AUTH0_CLIENT_SECRET) {
-    console.warn(removeTipsTemplate('AUTH0_CLIENT_SECRET', 'AUTH_AUTH0_SECRET'));
-  }
-  if (process.env.AUTH0_ISSUER) {
-    console.warn(removeTipsTemplate('AUTH0_ISSUER', 'AUTH_AUTH0_ISSUER'));
-  }
-  if (process.env.AUTHENTIK_CLIENT_ID) {
-    console.warn(removeTipsTemplate('AUTHENTIK_CLIENT_ID', 'AUTH_AUTHENTIK_ID'));
-  }
-  if (process.env.AUTHENTIK_CLIENT_SECRET) {
-    console.warn(removeTipsTemplate('AUTHENTIK_CLIENT_SECRET', 'AUTH_AUTHENTIK_SECRET'));
-  }
-  if (process.env.AUTHENTIK_ISSUER) {
-    console.warn(removeTipsTemplate('AUTHENTIK_ISSUER', 'AUTH_AUTHENTIK_ISSUER'));
-  }
-  if (process.env.AUTHELIA_CLIENT_ID) {
-    console.warn(removeTipsTemplate('AUTHELIA_CLIENT_ID', 'AUTH_AUTHELIA_ID'));
-  }
-  if (process.env.AUTHELIA_CLIENT_SECRET) {
-    console.warn(removeTipsTemplate('AUTHELIA_CLIENT_SECRET', 'AUTH_AUTHELIA_SECRET'));
-  }
-  if (process.env.AUTHELIA_ISSUER) {
-    console.warn(removeTipsTemplate('AUTHELIA_ISSUER', 'AUTH_AUTHELIA_ISSUER'));
-  }
-  if (process.env.AZURE_AD_CLIENT_ID) {
-    console.warn(removeTipsTemplate('AZURE_AD_CLIENT_ID', 'AUTH_AZURE_AD_ID'));
-  }
-  if (process.env.AZURE_AD_CLIENT_SECRET) {
-    console.warn(removeTipsTemplate('AZURE_AD_CLIENT_SECRET', 'AUTH_AZURE_AD_SECRET'));
-  }
-  if (process.env.AZURE_AD_TENANT_ID) {
-    console.warn(removeTipsTemplate('AZURE_AD_TENANT_ID', 'AUTH_AZURE_AD_TENANT_ID'));
-  }
-  if (process.env.CLOUDFLARE_ZERO_TRUST_CLIENT_ID) {
-    console.warn(
-      removeTipsTemplate('CLOUDFLARE_ZERO_TRUST_CLIENT_ID', 'AUTH_CLOUDFLARE_ZERO_TRUST_ID'),
-    );
-  }
-  if (process.env.CLOUDFLARE_ZERO_TRUST_CLIENT_SECRET) {
-    console.warn(
-      removeTipsTemplate(
-        'CLOUDFLARE_ZERO_TRUST_CLIENT_SECRET',
-        'AUTH_CLOUDFLARE_ZERO_TRUST_SECRET',
-      ),
-    );
-  }
-  if (process.env.CLOUDFLARE_ZERO_TRUST_ISSUER) {
-    console.warn(
-      removeTipsTemplate('CLOUDFLARE_ZERO_TRUST_ISSUER', 'AUTH_CLOUDFLARE_ZERO_TRUST_ISSUER'),
-    );
-  }
-  if (process.env.GENERIC_OIDC_CLIENT_ID) {
-    console.warn(removeTipsTemplate('GENERIC_OIDC_CLIENT_ID', 'AUTH_GENERIC_OIDC_ID'));
-  }
-  if (process.env.GENERIC_OIDC_CLIENT_SECRET) {
-    console.warn(removeTipsTemplate('GENERIC_OIDC_CLIENT_SECRET', 'AUTH_GENERIC_OIDC_SECRET'));
-  }
-  if (process.env.GENERIC_OIDC_ISSUER) {
-    console.warn(removeTipsTemplate('GENERIC_OIDC_ISSUER', 'AUTH_GENERIC_OIDC_ISSUER'));
-  }
-  if (process.env.GITHUB_CLIENT_ID) {
-    console.warn(removeTipsTemplate('GITHUB_CLIENT_ID', 'AUTH_GITHUB_ID'));
-  }
-  if (process.env.GITHUB_CLIENT_SECRET) {
-    console.warn(removeTipsTemplate('GITHUB_CLIENT_SECRET', 'AUTH_GITHUB_SECRET'));
-  }
-  if (process.env.LOGTO_CLIENT_ID) {
-    console.warn(removeTipsTemplate('LOGTO_CLIENT_ID', 'AUTH_LOGTO_ID'));
-  }
-  if (process.env.LOGTO_CLIENT_SECRET) {
-    console.warn(removeTipsTemplate('LOGTO_CLIENT_SECRET', 'AUTH_LOGTO_SECRET'));
-  }
-  if (process.env.LOGTO_ISSUER) {
-    console.warn(removeTipsTemplate('LOGTO_ISSUER', 'AUTH_LOGTO_ISSUER'));
-  }
-  if (process.env.ZITADEL_CLIENT_ID) {
-    console.warn(removeTipsTemplate('ZITADEL_CLIENT_ID', 'AUTH_ZITADEL_ID'));
-  }
-  if (process.env.ZITADEL_CLIENT_SECRET) {
-    console.warn(removeTipsTemplate('ZITADEL_CLIENT_SECRET', 'AUTH_ZITADEL_SECRET'));
-  }
-  if (process.env.ZITADEL_ISSUER) {
-    console.warn(removeTipsTemplate('ZITADEL_ISSUER', 'AUTH_ZITADEL_ISSUER'));
-  }
-  // End
-
   return createEnv({
     client: {
       NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY: z.string().optional(),
@@ -163,49 +59,11 @@ export const getAuthConfig = () => {
       NEXT_AUTH_DEBUG: z.boolean().optional().default(false),
       NEXT_AUTH_SSO_SESSION_STRATEGY: z.enum(['jwt', 'database']).optional().default('jwt'),
 
-      // Auth0
-      AUTH0_CLIENT_ID: z.string().optional(),
-      AUTH0_CLIENT_SECRET: z.string().optional(),
-      AUTH0_ISSUER: z.string().optional(),
-
-      // Github
-      GITHUB_CLIENT_ID: z.string().optional(),
-      GITHUB_CLIENT_SECRET: z.string().optional(),
-
       // Azure AD
       AZURE_AD_CLIENT_ID: z.string().optional(),
       AZURE_AD_CLIENT_SECRET: z.string().optional(),
       AZURE_AD_TENANT_ID: z.string().optional(),
 
-      // AUTHENTIK
-      AUTHENTIK_CLIENT_ID: z.string().optional(),
-      AUTHENTIK_CLIENT_SECRET: z.string().optional(),
-      AUTHENTIK_ISSUER: z.string().optional(),
-
-      // AUTHELIA
-      AUTHELIA_CLIENT_ID: z.string().optional(),
-      AUTHELIA_CLIENT_SECRET: z.string().optional(),
-      AUTHELIA_ISSUER: z.string().optional(),
-
-      // Cloudflare Zero Trust
-      CLOUDFLARE_ZERO_TRUST_CLIENT_ID: z.string().optional(),
-      CLOUDFLARE_ZERO_TRUST_CLIENT_SECRET: z.string().optional(),
-      CLOUDFLARE_ZERO_TRUST_ISSUER: z.string().optional(),
-
-      // Generic OIDC
-      GENERIC_OIDC_CLIENT_ID: z.string().optional(),
-      GENERIC_OIDC_CLIENT_SECRET: z.string().optional(),
-      GENERIC_OIDC_ISSUER: z.string().optional(),
-
-      // ZITADEL
-      ZITADEL_CLIENT_ID: z.string().optional(),
-      ZITADEL_CLIENT_SECRET: z.string().optional(),
-      ZITADEL_ISSUER: z.string().optional(),
-
-      // LOGTO
-      LOGTO_CLIENT_ID: z.string().optional(),
-      LOGTO_CLIENT_SECRET: z.string().optional(),
-      LOGTO_ISSUER: z.string().optional(),
       LOGTO_WEBHOOK_SIGNING_KEY: z.string().optional(),
 
       // Casdoor
@@ -226,49 +84,12 @@ export const getAuthConfig = () => {
       NEXT_AUTH_DEBUG: !!process.env.NEXT_AUTH_DEBUG,
       NEXT_AUTH_SSO_SESSION_STRATEGY: process.env.NEXT_AUTH_SSO_SESSION_STRATEGY || 'jwt',
 
-      // Auth0
-      AUTH0_CLIENT_ID: process.env.AUTH0_CLIENT_ID,
-      AUTH0_CLIENT_SECRET: process.env.AUTH0_CLIENT_SECRET,
-      AUTH0_ISSUER: process.env.AUTH0_ISSUER,
-
-      // Github
-      GITHUB_CLIENT_ID: process.env.GITHUB_CLIENT_ID,
-      GITHUB_CLIENT_SECRET: process.env.GITHUB_CLIENT_SECRET,
-
       // Azure AD
       AZURE_AD_CLIENT_ID: process.env.AZURE_AD_CLIENT_ID,
       AZURE_AD_CLIENT_SECRET: process.env.AZURE_AD_CLIENT_SECRET,
       AZURE_AD_TENANT_ID: process.env.AZURE_AD_TENANT_ID,
 
-      // AUTHENTIK
-      AUTHENTIK_CLIENT_ID: process.env.AUTHENTIK_CLIENT_ID,
-      AUTHENTIK_CLIENT_SECRET: process.env.AUTHENTIK_CLIENT_SECRET,
-      AUTHENTIK_ISSUER: process.env.AUTHENTIK_ISSUER,
-
-      // AUTHELIA
-      AUTHELIA_CLIENT_ID: process.env.AUTHELIA_CLIENT_ID,
-      AUTHELIA_CLIENT_SECRET: process.env.AUTHELIA_CLIENT_SECRET,
-      AUTHELIA_ISSUER: process.env.AUTHELIA_ISSUER,
-
-      // Cloudflare Zero Trust
-      CLOUDFLARE_ZERO_TRUST_CLIENT_ID: process.env.CLOUDFLARE_ZERO_TRUST_CLIENT_ID,
-      CLOUDFLARE_ZERO_TRUST_CLIENT_SECRET: process.env.CLOUDFLARE_ZERO_TRUST_CLIENT_SECRET,
-      CLOUDFLARE_ZERO_TRUST_ISSUER: process.env.CLOUDFLARE_ZERO_TRUST_ISSUER,
-
-      // Generic OIDC
-      GENERIC_OIDC_CLIENT_ID: process.env.GENERIC_OIDC_CLIENT_ID,
-      GENERIC_OIDC_CLIENT_SECRET: process.env.GENERIC_OIDC_CLIENT_SECRET,
-      GENERIC_OIDC_ISSUER: process.env.GENERIC_OIDC_ISSUER,
-
-      // ZITADEL
-      ZITADEL_CLIENT_ID: process.env.ZITADEL_CLIENT_ID,
-      ZITADEL_CLIENT_SECRET: process.env.ZITADEL_CLIENT_SECRET,
-      ZITADEL_ISSUER: process.env.ZITADEL_ISSUER,
-
       // LOGTO
-      LOGTO_CLIENT_ID: process.env.LOGTO_CLIENT_ID,
-      LOGTO_CLIENT_SECRET: process.env.LOGTO_CLIENT_SECRET,
-      LOGTO_ISSUER: process.env.LOGTO_ISSUER,
       LOGTO_WEBHOOK_SIGNING_KEY: process.env.LOGTO_WEBHOOK_SIGNING_KEY,
 
       // Casdoor

package/src/features/AgentSetting/AgentPlugin/index.tsx

@@ -34,8 +34,8 @@ const AgentPlugin = memo(() => {
     s.toggleAgentPlugin,
   ]);
 
-  const { showDalle } = useServerConfigStore(featureFlagsSelectors);
-  const installedPlugins = useToolStore(toolSelectors.metaList(showDalle), isEqual);
+  const { showMarket } = useServerConfigStore(featureFlagsSelectors);
+  const installedPlugins = useToolStore(toolSelectors.metaList, isEqual);
 
   const { isLoading } = useFetchInstalledPlugins();
 
@@ -112,16 +112,18 @@ const AgentPlugin = memo(() => {
           />
         </Tooltip>
       ) : null}
-      <Tooltip title={t('plugin.store')}>
-        <Button
-          icon={Store}
-          onClick={(e) => {
-            e.stopPropagation();
-            setShowStore(true);
-          }}
-          size={'small'}
-        />
-      </Tooltip>
+      {showMarket ? (
+        <Tooltip title={t('plugin.store')}>
+          <Button
+            icon={Store}
+            onClick={(e) => {
+              e.stopPropagation();
+              setShowStore(true);
+            }}
+            size={'small'}
+          />
+        </Tooltip>
+      ) : null}
     </Space.Compact>
   );
 
@@ -149,7 +151,13 @@ const AgentPlugin = memo(() => {
   );
 
   const plugin: FormGroupItemType = {
-    children: isLoading ? loadingSkeleton : isEmpty ? empty : [...deprecatedList, ...list],
+    children: isLoading
+      ? loadingSkeleton
+      : isEmpty
+        ? showMarket
+          ? empty
+          : []
+        : [...deprecatedList, ...list],
     extra,
     title: t('settingPlugin.title'),
   };

package/src/features/ChatInput/ActionBar/STT/browser.tsx

@@ -8,7 +8,7 @@ import { SWRConfiguration } from 'swr';
 import { useAgentStore } from '@/store/agent';
 import { agentSelectors } from '@/store/agent/slices/chat';
 import { useChatStore } from '@/store/chat';
-import { chatSelectors } from '@/store/chat/selectors';
+import { messageStateSelectors } from '@/store/chat/selectors';
 import { useGlobalStore } from '@/store/global';
 import { globalGeneralSelectors } from '@/store/global/selectors';
 import { useUserStore } from '@/store/user';
@@ -43,7 +43,7 @@ const BrowserSTT = memo<{ mobile?: boolean }>(({ mobile }) => {
   const { t } = useTranslation('chat');
 
   const [loading, updateInputMessage] = useChatStore((s) => [
-    chatSelectors.isAIGenerating(s),
+    messageStateSelectors.isAIGenerating(s),
     s.updateInputMessage,
   ]);
 

package/src/features/ChatInput/ActionBar/STT/openai.tsx

@@ -11,7 +11,7 @@ import { API_ENDPOINTS } from '@/services/_url';
 import { useAgentStore } from '@/store/agent';
 import { agentSelectors } from '@/store/agent/selectors';
 import { useChatStore } from '@/store/chat';
-import { chatSelectors } from '@/store/chat/slices/message/selectors';
+import { messageStateSelectors } from '@/store/chat/slices/message/selectors';
 import { useGlobalStore } from '@/store/global';
 import { globalGeneralSelectors } from '@/store/global/selectors';
 import { useUserStore } from '@/store/user';
@@ -54,7 +54,7 @@ const OpenaiSTT = memo<{ mobile?: boolean }>(({ mobile }) => {
   const { t } = useTranslation('chat');
 
   const [loading, updateInputMessage] = useChatStore((s) => [
-    chatSelectors.isAIGenerating(s),
+    messageStateSelectors.isAIGenerating(s),
     s.updateInputMessage,
   ]);
 

package/src/features/ChatInput/ActionBar/Tools/useControls.tsx

@@ -9,7 +9,6 @@ import { useCheckPluginsIsInstalled } from '@/hooks/useCheckPluginsIsInstalled';
 import { useFetchInstalledPlugins } from '@/hooks/useFetchInstalledPlugins';
 import { useAgentStore } from '@/store/agent';
 import { agentSelectors } from '@/store/agent/selectors';
-import { featureFlagsSelectors, useServerConfigStore } from '@/store/serverConfig';
 import { useToolStore } from '@/store/tool';
 import { builtinToolSelectors, pluginSelectors } from '@/store/tool/selectors';
 
@@ -24,12 +23,11 @@ export const useControls = ({
 }) => {
   const { t } = useTranslation('setting');
   const list = useToolStore(pluginSelectors.installedPluginMetaList, isEqual);
-  const { showDalle } = useServerConfigStore(featureFlagsSelectors);
   const [checked, togglePlugin] = useAgentStore((s) => [
     agentSelectors.currentAgentPlugins(s),
     s.togglePlugin,
   ]);
-  const builtinList = useToolStore(builtinToolSelectors.metaList(showDalle), isEqual);
+  const builtinList = useToolStore(builtinToolSelectors.metaList, isEqual);
   const enablePluginCount = useAgentStore(
     (s) =>
       agentSelectors

package/src/features/Conversation/Error/ErrorJsonViewer.tsx

@@ -4,18 +4,19 @@ import { memo } from 'react';
 import { Flexbox } from 'react-layout-kit';
 
 interface ErrorJSONViewerProps {
+  block?: boolean;
   error?: ChatMessageError | null;
   id: string;
 }
 
-const ErrorJsonViewer = memo<ErrorJSONViewerProps>(({ error, id }) => {
+const ErrorJsonViewer = memo<ErrorJSONViewerProps>(({ error, id, block }) => {
   const errorBody = error?.body || error;
 
   if (!errorBody) return;
 
   return (
-    <Flexbox id={id} style={{ maxWidth: 600 }}>
-      <Highlighter actionIconSize={'small'} language={'json'}>
+    <Flexbox id={id} style={{ maxWidth: block ? '100%' : 600, width: block ? '100%' : undefined }}>
+      <Highlighter actionIconSize={'small'} language={'json'} wrap>
         {JSON.stringify(errorBody, null, 2)}
       </Highlighter>
     </Flexbox>

package/src/features/Conversation/Error/OllamaBizError/index.tsx

@@ -1,4 +1,4 @@
-import { UIChatMessage } from '@lobechat/types';
+import { ChatMessageError } from '@lobechat/types';
 import { Skeleton } from 'antd';
 import dynamic from 'next/dynamic';
 import { memo } from 'react';
@@ -24,7 +24,12 @@ interface OllamaErrorResponse {
 
 const UNRESOLVED_MODEL_REGEXP = /model "([\w+,-_]+)" not found/;
 
-const OllamaBizError = memo<UIChatMessage>(({ error, id }) => {
+interface OllamaBizErrorProps {
+  error?: ChatMessageError | null;
+  id: string;
+}
+
+const OllamaBizError = memo<OllamaBizErrorProps>(({ error, id }) => {
   const errorBody: OllamaErrorResponse = (error as any)?.body;
 
   const errorMessage = errorBody.error?.message;

package/src/features/Conversation/Error/index.tsx

@@ -1,5 +1,5 @@
 import { AgentRuntimeErrorType, ILobeAgentRuntimeErrorType } from '@lobechat/model-runtime';
-import { ChatErrorType, ChatMessageError, ErrorType, UIChatMessage } from '@lobechat/types';
+import { ChatErrorType, ChatMessageError, ErrorType } from '@lobechat/types';
 import { IPluginErrorType } from '@lobehub/chat-plugin-sdk';
 import type { AlertProps } from '@lobehub/ui';
 import { Skeleton } from 'antd';
@@ -15,6 +15,11 @@ import ErrorJsonViewer from './ErrorJsonViewer';
 import InvalidAccessCode from './InvalidAccessCode';
 import { ErrorActionContainer } from './style';
 
+interface ErrorMessageData {
+  error?: ChatMessageError | null;
+  id: string;
+}
+
 const loading = () => <Skeleton active />;
 
 const OllamaBizError = dynamic(() => import('./OllamaBizError'), { loading, ssr: false });
@@ -87,7 +92,12 @@ export const useErrorContent = (error: any) => {
   }, [error]);
 };
 
-const ErrorMessageExtra = memo<{ data: UIChatMessage }>(({ data }) => {
+interface ErrorExtraProps {
+  block?: boolean;
+  data: ErrorMessageData;
+}
+
+const ErrorMessageExtra = memo<ErrorExtraProps>(({ data, block }) => {
   const error = data.error as ChatMessageError;
   if (!error?.type) return;
 
@@ -123,10 +133,10 @@ const ErrorMessageExtra = memo<{ data: UIChatMessage }>(({ data }) => {
     return <ChatInvalidAPIKey id={data.id} provider={data.error?.body?.provider} />;
   }
 
-  return <ErrorJsonViewer error={data.error} id={data.id} />;
+  return <ErrorJsonViewer block={block} error={data.error} id={data.id} />;
 });
 
-export default memo<{ data: UIChatMessage }>(({ data }) => (
+export default memo<ErrorExtraProps>(({ data, block }) => (
   <Suspense
     fallback={
       <ErrorActionContainer>
@@ -134,6 +144,6 @@ export default memo<{ data: UIChatMessage }>(({ data }) => (
       </ErrorActionContainer>
     }
   >
-    <ErrorMessageExtra data={data} />
+    <ErrorMessageExtra block={block} data={data} />
   </Suspense>
 ));

package/src/features/Conversation/MarkdownElements/LobeArtifact/Render/index.tsx

@@ -7,7 +7,7 @@ import { useTranslation } from 'react-i18next';
 import { Center, Flexbox } from 'react-layout-kit';
 
 import { useChatStore } from '@/store/chat';
-import { chatPortalSelectors, chatSelectors } from '@/store/chat/selectors';
+import { chatPortalSelectors, messageStateSelectors } from '@/store/chat/selectors';
 import { dotLoading } from '@/styles/loading';
 
 import { InPortalThreadContext } from '../../../context/InPortalThreadContext';
@@ -66,7 +66,7 @@ const Render = memo<ArtifactProps>(({ identifier, title, type, language, childre
   const { message } = App.useApp();
   const [isGenerating, isArtifactTagClosed, openArtifact, closeArtifact] = useChatStore((s) => {
     return [
-      chatSelectors.isMessageGenerating(id)(s),
+      messageStateSelectors.isMessageGenerating(id)(s),
       chatPortalSelectors.isArtifactTagClosed(id)(s),
       s.openArtifact,
       s.closeArtifact,

package/src/features/Conversation/Messages/Assistant/Extra/index.tsx

@@ -8,7 +8,7 @@ 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 { chatSelectors } from '@/store/chat/selectors';
+import { messageStateSelectors } from '@/store/chat/selectors';
 
 interface AssistantMessageExtraProps {
   content: string;
@@ -20,7 +20,7 @@ interface AssistantMessageExtraProps {
 
 export const AssistantMessageExtra = memo<AssistantMessageExtraProps>(
   ({ extra, id, content, metadata, tools }) => {
-    const loading = useChatStore(chatSelectors.isMessageGenerating(id));
+    const loading = useChatStore(messageStateSelectors.isMessageGenerating(id));
 
     return (
       <Flexbox gap={8} style={{ marginTop: !!tools?.length ? 8 : 4 }}>

package/src/features/Conversation/Messages/Assistant/MessageContent.tsx

@@ -4,7 +4,7 @@ import { ReactNode, memo } from 'react';
 import { Flexbox } from 'react-layout-kit';
 
 import { useChatStore } from '@/store/chat';
-import { aiChatSelectors, chatSelectors } from '@/store/chat/selectors';
+import { aiChatSelectors, messageStateSelectors } from '@/store/chat/selectors';
 
 import { DefaultMessage } from '../Default';
 import ImageFileListViewer from '../User/ImageFileListViewer';
@@ -19,8 +19,10 @@ export const AssistantMessageContent = memo<
     editableContent: ReactNode;
   }
 >(({ id, tools, content, chunksList, search, imageList, ...props }) => {
-  const editing = useChatStore(chatSelectors.isMessageEditing(id));
-  const generating = useChatStore(chatSelectors.isMessageGenerating(id));
+  const [editing, generating] = useChatStore((s) => [
+    messageStateSelectors.isMessageEditing(id)(s),
+    messageStateSelectors.isMessageGenerating(id)(s),
+  ]);
 
   const isToolCallGenerating = generating && (content === LOADING_FLAT || !content) && !!tools;
 

package/src/features/Conversation/Messages/Assistant/Tool/Inspector/BuiltinPluginTitle.tsx

@@ -5,7 +5,7 @@ import { ReactNode, memo } from 'react';
 import { Flexbox } from 'react-layout-kit';
 
 import { useChatStore } from '@/store/chat';
-import { chatSelectors } from '@/store/chat/selectors';
+import { messageStateSelectors } from '@/store/chat/selectors';
 import { shinyTextStylish } from '@/styles/loading';
 
 export const useStyles = createStyles(({ css, token }) => ({
@@ -38,7 +38,7 @@ const BuiltinPluginTitle = memo<BuiltinPluginTitleProps>(
     const { styles } = useStyles();
 
     const isLoading = useChatStore(
-      chatSelectors.isToolApiNameShining(messageId, index, toolCallId),
+      messageStateSelectors.isToolApiNameShining(messageId, index, toolCallId),
     );
 
     return (

package/src/features/Conversation/Messages/Assistant/Tool/Inspector/ToolTitle.tsx

@@ -7,7 +7,7 @@ import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
 import { useChatStore } from '@/store/chat';
-import { chatSelectors } from '@/store/chat/selectors';
+import { messageStateSelectors } from '@/store/chat/selectors';
 import { pluginHelpers, useToolStore } from '@/store/tool';
 import { toolSelectors } from '@/store/tool/selectors';
 import { shinyTextStylish } from '@/styles/loading';
@@ -43,7 +43,9 @@ const ToolTitle = memo<ToolTitleProps>(({ identifier, messageId, index, apiName,
   const { t } = useTranslation('plugin');
   const { styles } = useStyles();
 
-  const isLoading = useChatStore(chatSelectors.isToolApiNameShining(messageId, index, toolCallId));
+  const isLoading = useChatStore(
+    messageStateSelectors.isToolApiNameShining(messageId, index, toolCallId),
+  );
 
   const pluginMeta = useToolStore(toolSelectors.getMetaById(identifier), isEqual);
 

package/src/features/Conversation/Messages/Assistant/Tool/Render/CustomRender.tsx

@@ -10,7 +10,7 @@ import { Flexbox } from 'react-layout-kit';
 import PluginResult from '@/features/Conversation/Messages/Assistant/Tool/Inspector/PluginResult';
 import PluginRender from '@/features/PluginsUI/Render';
 import { useChatStore } from '@/store/chat';
-import { chatSelectors } from '@/store/chat/selectors';
+import { messageStateSelectors } from '@/store/chat/selectors';
 
 import Arguments from './Arguments';
 import KeyValueEditor from './KeyValueEditor';
@@ -43,7 +43,7 @@ const CustomRender = memo<CustomRenderProps>(
     tool_call_id,
   }) => {
     const { t } = useTranslation(['tool', 'common']);
-    const [loading] = useChatStore((s) => [chatSelectors.isPluginApiInvoking(id)(s)]);
+    const [loading] = useChatStore((s) => [messageStateSelectors.isPluginApiInvoking(id)(s)]);
     const [isEditing, setIsEditing] = useState(false);
     const { message } = App.useApp();
     const [updatePluginArguments, reInvokeToolMessage] = useChatStore((s) => [

package/src/features/Conversation/Messages/Assistant/Tool/Render/index.tsx

@@ -3,7 +3,7 @@ import isEqual from 'fast-deep-equal';
 import { Suspense, memo } from 'react';
 
 import { useChatStore } from '@/store/chat';
-import { chatSelectors } from '@/store/chat/selectors';
+import { chatSelectors, messageStateSelectors } from '@/store/chat/selectors';
 
 import CustomRender from './CustomRender';
 import ErrorResponse from './ErrorResponse';
@@ -31,7 +31,7 @@ const Render = memo<RenderProps>(
     identifier,
     apiName,
   }) => {
-    const loading = useChatStore(chatSelectors.isToolCallStreaming(messageId, toolIndex));
+    const loading = useChatStore(messageStateSelectors.isToolCallStreaming(messageId, toolIndex));
     const toolMessage = useChatStore(chatSelectors.getMessageByToolCallId(toolCallId), isEqual);
 
     if (loading || !toolMessage) return null;

package/src/features/Conversation/Messages/Assistant/Tool/index.tsx

@@ -3,7 +3,7 @@ import { Flexbox } from 'react-layout-kit';
 
 import AnimatedCollapsed from '@/components/AnimatedCollapsed';
 import { useChatStore } from '@/store/chat';
-import { chatSelectors } from '@/store/chat/selectors';
+import { messageStateSelectors } from '@/store/chat/selectors';
 
 import Inspectors from './Inspector';
 import Render from './Render';
@@ -24,7 +24,7 @@ const Tool = memo<InspectorProps>(
   ({ arguments: requestArgs, apiName, messageId, id, index, identifier, style, payload, type }) => {
     const [showDetail, setShowDetail] = useState(type !== 'mcp');
     const [showPluginRender, setShowPluginRender] = useState(false);
-    const isLoading = useChatStore(chatSelectors.isInToolsCalling(messageId, index));
+    const isLoading = useChatStore(messageStateSelectors.isInToolsCalling(messageId, index));
 
     useEffect(() => {
       if (type !== 'mcp') return;

package/src/features/Conversation/Messages/Assistant/index.tsx

@@ -19,7 +19,7 @@ import { useOpenChatSettings } from '@/hooks/useInterceptingRoutes';
 import { useAgentStore } from '@/store/agent';
 import { agentChatConfigSelectors } from '@/store/agent/selectors';
 import { useChatStore } from '@/store/chat';
-import { chatSelectors } from '@/store/chat/selectors';
+import { messageStateSelectors } from '@/store/chat/slices/message/selectors';
 import { chatGroupSelectors, useChatGroupStore } from '@/store/chatGroup';
 import { useGlobalStore } from '@/store/global';
 import { useSessionStore } from '@/store/session';
@@ -81,9 +81,9 @@ const AssistantMessage = memo<AssistantMessageProps>((props) => {
   );
 
   const [generating, isInRAGFlow, editing] = useChatStore((s) => [
-    chatSelectors.isMessageGenerating(id)(s),
-    chatSelectors.isMessageInRAGFlow(id)(s),
-    chatSelectors.isMessageEditing(id)(s),
+    messageStateSelectors.isMessageGenerating(id)(s),
+    messageStateSelectors.isMessageInRAGFlow(id)(s),
+    messageStateSelectors.isMessageEditing(id)(s),
   ]);
 
   const { styles } = useStyles({

package/src/features/Conversation/Messages/Default.tsx

@@ -4,7 +4,7 @@ import { ReactNode, memo } from 'react';
 import BubblesLoading from '@/components/BubblesLoading';
 import { LOADING_FLAT } from '@/const/message';
 import { useChatStore } from '@/store/chat';
-import { chatSelectors } from '@/store/chat/selectors';
+import { messageStateSelectors } from '@/store/chat/selectors';
 
 export const DefaultMessage = memo<
   UIChatMessage & {
@@ -13,7 +13,7 @@ export const DefaultMessage = memo<
     isToolCallGenerating?: boolean;
   }
 >(({ id, editableContent, content, isToolCallGenerating, addIdOnDOM = true }) => {
-  const editing = useChatStore(chatSelectors.isMessageEditing(id));
+  const editing = useChatStore(messageStateSelectors.isMessageEditing(id));
 
   if (isToolCallGenerating) return;
 

package/src/features/Conversation/Messages/User/Extra.tsx

@@ -5,7 +5,7 @@ import ExtraContainer from '@/features/Conversation/components/Extras/ExtraConta
 import TTS from '@/features/Conversation/components/Extras/TTS';
 import Translate from '@/features/Conversation/components/Extras/Translate';
 import { useChatStore } from '@/store/chat';
-import { chatSelectors } from '@/store/chat/selectors';
+import { messageStateSelectors } from '@/store/chat/selectors';
 
 interface UserMessageExtraProps {
   content: string;
@@ -13,7 +13,7 @@ interface UserMessageExtraProps {
   id: string;
 }
 export const UserMessageExtra = memo<UserMessageExtraProps>(({ extra, id, content }) => {
-  const loading = useChatStore(chatSelectors.isMessageGenerating(id));
+  const loading = useChatStore(messageStateSelectors.isMessageGenerating(id));
 
   const showTranslate = !!extra?.translate;
   const showTTS = !!extra?.tts;