@lobehub/lobehub 2.0.0-next.3 → 2.0.0-next.31

package/src/config/modelProviders/zhipu.ts

@@ -1,114 +1,7 @@
 import { ModelProviderCard } from '@/types/llm';
 
 const ZhiPu: ModelProviderCard = {
-  chatModels: [
-    {
-      contextWindowTokens: 128_000,
-      description: 'GLM-4-Flash 是处理简单任务的理想选择，速度最快且免费。',
-      displayName: 'GLM-4-Flash',
-      enabled: true,
-      functionCall: true,
-      id: 'glm-4-flash',
-    },
-    {
-      contextWindowTokens: 128_000,
-      description: 'GLM-4-FlashX 是Flash的增强版本，超快推理速度。',
-      displayName: 'GLM-4-FlashX',
-      enabled: true,
-      functionCall: true,
-      id: 'glm-4-flashx',
-    },
-    {
-      contextWindowTokens: 1_024_000,
-      description: 'GLM-4-Long 支持超长文本输入，适合记忆型任务与大规模文档处理。',
-      displayName: 'GLM-4-Long',
-      functionCall: true,
-      id: 'glm-4-long',
-    },
-    {
-      contextWindowTokens: 128_000,
-      description: 'GLM-4-Air 是性价比高的版本，性能接近GLM-4，提供快速度和实惠的价格。',
-      displayName: 'GLM-4-Air',
-      enabled: true,
-      functionCall: true,
-      id: 'glm-4-air',
-    },
-    {
-      contextWindowTokens: 8192,
-      description: 'GLM-4-AirX 提供 GLM-4-Air 的高效版本，推理速度可达其2.6倍。',
-      displayName: 'GLM-4-AirX',
-      enabled: true,
-      functionCall: true,
-      id: 'glm-4-airx',
-    },
-    {
-      contextWindowTokens: 128_000,
-      description:
-        'GLM-4-Plus 作为高智能旗舰，具备强大的处理长文本和复杂任务的能力，性能全面提升。',
-      displayName: 'GLM-4-Plus',
-      enabled: true,
-      functionCall: true,
-      id: 'glm-4-plus',
-    },
-    {
-      contextWindowTokens: 128_000,
-      description: 'GLM-4-0520 是最新模型版本，专为高度复杂和多样化任务设计，表现卓越。',
-      displayName: 'GLM-4-0520',
-      functionCall: true,
-      id: 'glm-4-0520',
-    },
-    {
-      contextWindowTokens: 128_000,
-      description: 'GLM-4 是发布于2024年1月的旧旗舰版本，目前已被更强的 GLM-4-0520 取代。',
-      displayName: 'GLM-4',
-      functionCall: true,
-      id: 'glm-4',
-    },
-    {
-      contextWindowTokens: 8192,
-      description:
-        'GLM-4V-Flash 专注于高效的单一图像理解，适用于快速图像解析的场景，例如实时图像分析或批量图像处理。',
-      displayName: 'GLM-4V-Flash',
-      enabled: true,
-      id: 'glm-4v-flash',
-      releasedAt: '2024-12-09',
-      vision: true,
-    },
-    {
-      contextWindowTokens: 8192,
-      description: 'GLM-4V-Plus 具备对视频内容及多图片的理解能力，适合多模态任务。',
-      displayName: 'GLM-4V-Plus',
-      enabled: true,
-      id: 'glm-4v-plus',
-      vision: true,
-    },
-    {
-      contextWindowTokens: 2048,
-      description: 'GLM-4V 提供强大的图像理解与推理能力，支持多种视觉任务。',
-      displayName: 'GLM-4V',
-      id: 'glm-4v',
-      vision: true,
-    },
-    {
-      contextWindowTokens: 128_000,
-      description:
-        'CodeGeeX-4 是强大的AI编程助手，支持多种编程语言的智能问答与代码补全，提升开发效率。',
-      displayName: 'CodeGeeX-4',
-      id: 'codegeex-4',
-    },
-    {
-      contextWindowTokens: 4096,
-      description: 'CharGLM-4 专为角色扮演与情感陪伴设计，支持超长多轮记忆与个性化对话，应用广泛。',
-      displayName: 'CharGLM-4',
-      id: 'charglm-4',
-    },
-    {
-      contextWindowTokens: 8192,
-      description: 'Emohaa 是心理模型，具备专业咨询能力，帮助用户理解情感问题。',
-      displayName: 'Emohaa',
-      id: 'emohaa',
-    },
-  ],
+  chatModels: [],
   checkModel: 'glm-4.5-flash',
   description:
     '智谱 AI 提供多模态与语言模型的开放平台，支持广泛的AI应用场景，包括文本处理、图像理解与编程辅助等。',

package/src/envs/app.ts

@@ -2,8 +2,6 @@
 import { createEnv } from '@t3-oss/env-nextjs';
 import { z } from 'zod';
 
-import { isServerMode } from '@/const/version';
-
 declare global {
   // eslint-disable-next-line @typescript-eslint/no-namespace
   namespace NodeJS {
@@ -16,12 +14,11 @@ const isInVercel = process.env.VERCEL === '1';
 
 const vercelUrl = `https://${process.env.VERCEL_URL}`;
 
-const APP_URL = process.env.APP_URL ? process.env.APP_URL : isInVercel ? vercelUrl : undefined;
-
-// only throw error in server mode and server side
-if (typeof window === 'undefined' && isServerMode && !APP_URL) {
-  throw new Error('`APP_URL` is required in server mode');
-}
+const APP_URL = process.env.APP_URL
+  ? process.env.APP_URL
+  : isInVercel
+    ? vercelUrl
+    : 'http://localhost:3010';
 
 const ASSISTANT_INDEX_URL = 'https://registry.npmmirror.com/@lobehub/agents-index/v1/files/public';
 

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, showMarket } = useServerConfigStore(featureFlagsSelectors);
-  const installedPlugins = useToolStore(toolSelectors.metaList(showDalle), isEqual);
+  const { showMarket } = useServerConfigStore(featureFlagsSelectors);
+  const installedPlugins = useToolStore(toolSelectors.metaList, isEqual);
 
   const { isLoading } = useFetchInstalledPlugins();
 

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/ChatInput/ActionBar/index.tsx

@@ -4,7 +4,7 @@ import { memo, useMemo } from 'react';
 import { useGlobalStore } from '@/store/global';
 import { systemStatusSelectors } from '@/store/global/selectors';
 import { useUserStore } from '@/store/user';
-import { preferenceSelectors } from '@/store/user/slices/preference/selectors';
+import { labPreferSelectors } from '@/store/user/slices/preference/selectors';
 
 import { ActionKeys, actionMap } from '../ActionBar/config';
 import { useChatInputStore } from '../store';
@@ -44,7 +44,7 @@ const ActionToolbar = memo(() => {
     systemStatusSelectors.expandInputActionbar(s),
     s.toggleExpandInputActionbar,
   ]);
-  const enableRichRender = useUserStore(preferenceSelectors.inputMarkdownRender);
+  const enableRichRender = useUserStore(labPreferSelectors.enableInputMarkdown);
 
   const leftActions = useChatInputStore((s) =>
     s.leftActions.filter((item) => (enableRichRender ? true : item !== 'typo')),

package/src/features/ChatInput/InputEditor/index.tsx

@@ -21,7 +21,7 @@ import { useHotkeysContext } from 'react-hotkeys-hook';
 import { useTranslation } from 'react-i18next';
 
 import { useUserStore } from '@/store/user';
-import { preferenceSelectors, settingsSelectors } from '@/store/user/selectors';
+import { labPreferSelectors, preferenceSelectors, settingsSelectors } from '@/store/user/selectors';
 
 import { useChatInputStore, useStoreApi } from '../store';
 import Placeholder from './Placeholder';
@@ -69,7 +69,7 @@ const InputEditor = memo<{ defaultRows?: number }>(({ defaultRows = 2 }) => {
     };
   }, [state.isEmpty]);
 
-  const enableRichRender = useUserStore(preferenceSelectors.inputMarkdownRender);
+  const enableRichRender = useUserStore(labPreferSelectors.enableInputMarkdown);
 
   const richRenderProps = useMemo(
     () =>

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 (