diff --git a/frontend/src/app/settings/llm/ChatChat/index.tsx b/frontend/src/app/settings/llm/ChatChat/index.tsx
new file mode 100644
index 00000000..1849cd65
--- /dev/null
+++ b/frontend/src/app/settings/llm/ChatChat/index.tsx
@@ -0,0 +1,69 @@
+import { Input, Flex } from 'antd';
+import { useTheme } from 'antd-style';
+import { memo } from 'react';
+import { useTranslation } from 'react-i18next';
+import Avatar from 'next/image';
+
+import { imageUrl } from '@/const/url';
+
+import { ModelProvider } from '@/libs/agent-runtime';
+
+import Checker from '../components/Checker';
+import ProviderConfig from '../components/ProviderConfig';
+import { LLMProviderBaseUrlKey, LLMProviderConfigKey } from '../const';
+
+const providerKey = 'chatchat';
+
+const ChatChatProvider = memo(() => {
+  const { t } = useTranslation('setting');
+  const theme = useTheme();
+
+  console.log('----ttt---1-', t('llm.ChatChat.endpoint.title'))
+  console.log('----ttt---2-', t('llm.Ollama.endpoint.title'))
+  console.log('----ttt---3-', t)
+
+  return (
+    <ProviderConfig
+      configItems={[
+        {
+          children: <Input allowClear placeholder={t('llm.ChatChat.endpoint.placeholder')} />,
+          desc: t('llm.ChatChat.endpoint.desc'),
+          label: t('llm.ChatChat.endpoint.title'),
+          name: [LLMProviderConfigKey, providerKey, LLMProviderBaseUrlKey],
+        },
+        {
+          children: (
+            <Input.TextArea
+              allowClear
+              placeholder={t('llm.ChatChat.customModelName.placeholder')}
+              style={{ height: 100 }}
+            />
+          ),
+          desc: t('llm.ChatChat.customModelName.desc'),
+          label: t('llm.ChatChat.customModelName.title'),
+          name: [LLMProviderConfigKey, providerKey, 'customModelName'],
+        },
+        {
+          children: <Checker model={'gml-4'} provider={ModelProvider.ChatChat} />,
+          desc: t('llm.ChatChat.checker.desc'),
+          label: t('llm.checker.title'),
+          minWidth: undefined,
+        },
+      ]}
+      provider={providerKey}
+      title={
+        <Flex>
+          <Avatar
+            alt={'Chatchat'}
+            height={24}
+            src={imageUrl('logo.png')}
+            width={24}
+          />
+          { 'ChatChat' }
+        </Flex>
+      }
+    />
+  );
+});
+
+export default ChatChatProvider;
diff --git a/frontend/src/app/settings/llm/index.tsx b/frontend/src/app/settings/llm/index.tsx
index 72ba4868..c085bc39 100644
--- a/frontend/src/app/settings/llm/index.tsx
+++ b/frontend/src/app/settings/llm/index.tsx
@@ -17,6 +17,7 @@ import Ollama from './Ollama';
 import OpenAI from './OpenAI';
 import Perplexity from './Perplexity';
 import Zhipu from './Zhipu';
+import ChatChat from './ChatChat'
 
 export default memo<{ showOllama: boolean }>(({ showOllama }) => {
   const { t } = useTranslation('setting');
@@ -34,6 +35,7 @@ export default memo<{ showOllama: boolean }>(({ showOllama }) => {
       <Anthropic />
       <Mistral />
       {showOllama && <Ollama />}
+      <ChatChat/>
       <Footer>
         <Trans i18nKey="llm.waitingForMore" ns={'setting'}>
           更多模型正在
diff --git a/frontend/src/const/settings.ts b/frontend/src/const/settings.ts
index 20d0d4f1..d68d80d7 100644
--- a/frontend/src/const/settings.ts
+++ b/frontend/src/const/settings.ts
@@ -91,6 +91,10 @@ export const DEFAULT_LLM_CONFIG: GlobalLLMConfig = {
     apiKey: '',
     enabled: false,
   },
+  chatchat: {
+    enabled: false,
+    endpoint: ''
+  },
 };
 
 export const DEFAULT_AGENT: GlobalDefaultAgent = {
diff --git a/frontend/src/features/ChatInput/ActionBar/Tools/index.tsx b/frontend/src/features/ChatInput/ActionBar/Tools/index.tsx
index 9a4c898f..68939be9 100644
--- a/frontend/src/features/ChatInput/ActionBar/Tools/index.tsx
+++ b/frontend/src/features/ChatInput/ActionBar/Tools/index.tsx
@@ -35,6 +35,9 @@ const Tools = memo(() => {
   const list = useToolStore(pluginSelectors.installedPluginMetaList, isEqual);
   const builtinList = useToolStore(builtinToolSelectors.metaList, isEqual);
 
+  console.log('builtinList--', builtinList)
+  console.log('list--', list)
+
   const enablePluginCount = useSessionStore(
     (s) =>
       agentSelectors
diff --git a/frontend/src/locales/default/setting.ts b/frontend/src/locales/default/setting.ts
index f58779bc..3fd542d4 100644
--- a/frontend/src/locales/default/setting.ts
+++ b/frontend/src/locales/default/setting.ts
@@ -181,6 +181,22 @@ export default {
         title: 'API Key',
       },
     },
+    ChatChat: {
+      title: 'ChatChat',
+      checker: {
+        desc: '测试地址是否正确填写',
+      },
+      customModelName: {
+        desc: '增加自定义模型，多个模型使用逗号（,）隔开',
+        placeholder: 'gml-4',
+        title: '自定义模型名称',
+      },
+      endpoint: {
+        desc: '填入 ChatCaht 接口代理地址，本地未额外指定可留空',
+        placeholder: 'http://127.0.0.1:7861/chat',
+        title: '接口代理地址',
+      },
+    },
 
     checker: {
       button: '检查',
diff --git a/frontend/src/types/settings/modelProvider.ts b/frontend/src/types/settings/modelProvider.ts
index 7d78d2b0..78866506 100644
--- a/frontend/src/types/settings/modelProvider.ts
+++ b/frontend/src/types/settings/modelProvider.ts
@@ -70,6 +70,12 @@ export interface MistralConfig {
   enabled: boolean;
 }
 
+export interface ChatChatConfig {
+  customModelName?: string;
+  enabled?: boolean;
+  endpoint?: string;
+}
+
 export interface GlobalLLMConfig {
   anthropic: AnthropicConfig;
   azure: AzureOpenAIConfig;
@@ -81,6 +87,7 @@ export interface GlobalLLMConfig {
   openAI: OpenAIConfig;
   perplexity: PerplexityConfig;
   zhipu: ZhiPuConfig;
+  chatchat: ChatChatConfig;
 }
 
 export type GlobalLLMProviderKey = keyof GlobalLLMConfig;