diff --git a/frontend/package.json b/frontend/package.json
index e0347210..d6c71bfd 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -22,29 +22,30 @@
         "axios": "^1.6.2",
         "clipboard": "^2.0.11",
         "crypto-js": "^4.2.0",
-        "dayjs": "^1.11.19",
+        "dayjs": "^1.11.20",
         "echarts": "^6.0.0",
-        "element-plus": "^2.13.5",
+        "element-plus": "^2.13.7",
         "js-base64": "^3.7.8",
         "jsencrypt": "^3.5.4",
         "monaco-editor": "^0.55.1",
         "monaco-sql-languages": "^1.0.0",
         "nprogress": "^0.2.0",
         "pinia": "^3.0.4",
-        "qrcode.vue": "^3.8.0",
+        "qrcode.vue": "^3.8.1",
         "screenfull": "^6.0.2",
         "sortablejs": "^1.15.7",
-        "sql-formatter": "^15.7.2",
+        "sql-formatter": "^15.7.3",
         "trzsz": "^1.1.6",
         "uuid": "^13.0.0",
         "vue": "^v3.6.0-beta.8",
-        "vue-i18n": "^11.3.0",
-        "vue-router": "^5.0.3",
+        "vue-element-plus-x": "^1.3.98",
+        "vue-i18n": "^11.3.2",
+        "vue-router": "^5.0.4",
         "vuedraggable": "^4.1.0",
         "xlsx": "^0.18.5"
     },
     "devDependencies": {
-        "@tailwindcss/vite": "^4.2.1",
+        "@tailwindcss/vite": "^4.2.2",
         "@types/crypto-js": "^4.2.2",
         "@types/node": "^22.13.14",
         "@types/nprogress": "^0.2.0",
@@ -52,17 +53,17 @@
         "@typescript-eslint/eslint-plugin": "^8.35.0",
         "@typescript-eslint/parser": "^8.35.0",
         "@vitejs/plugin-vue": "^6.0.5",
-        "@vue/compiler-sfc": "^3.5.29",
+        "@vue/compiler-sfc": "^3.5.32",
         "autoprefixer": "^10.4.21",
         "code-inspector-plugin": "^1.4.2",
-        "eslint": "^10.0.2",
+        "eslint": "^10.2.0",
         "eslint-plugin-vue": "^10.8.0",
         "postcss": "^8.5.8",
         "prettier": "^3.8.1",
-        "sass": "^1.98.0",
-        "tailwindcss": "^4.2.1",
-        "typescript": "^5.9.3",
-        "vite": "^8.0.0",
+        "sass": "^1.99.0",
+        "tailwindcss": "^4.2.2",
+        "typescript": "^6.0.2",
+        "vite": "^8.0.8",
         "vite-plugin-progress": "0.0.7",
         "vue-eslint-parser": "^10.4.0"
     },
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 372d631d..0fdd9dbb 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -1,5 +1,10 @@
 <template>
-    <el-config-provider :size="getGlobalComponentSize" :locale="getGlobalI18n">
+    <el-config-provider
+        :size="getGlobalComponentSize"
+        :locale="getGlobalI18n"
+        :button="{ autoInsertSpace: false, round: true }"
+        :dialog="{ alignCenter: true, transition: 'dialog-bounce' }"
+    >
         <el-watermark
             :zIndex="100000"
             :width="210"
diff --git a/frontend/src/assets/icon/ai/ai.svg b/frontend/src/assets/icon/ai/ai.svg
new file mode 100644
index 00000000..e00e585d
--- /dev/null
+++ b/frontend/src/assets/icon/ai/ai.svg
@@ -0,0 +1 @@
+<svg t="1775984689718" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9497" width="48" height="48"><path d="M710.8 98.1H318.5c-120 0-217.6 97.6-217.6 217.6V708c0 120 97.6 217.6 217.6 217.6h392.3c120 0 217.6-97.6 217.6-217.6V315.7c0.1-120-97.6-217.6-217.6-217.6z m-30 57.4L652.6 214c-8.8 18.3-27.7 30.2-48.1 30.2H424.9c-20.4 0-39.2-11.9-48.1-30.2l-28.2-58.6h332.2zM871.1 708c0 88.4-71.9 160.3-160.3 160.3H318.5c-88.4 0-160.3-71.9-160.3-160.3V315.7c0-77.4 55.2-142.2 128.2-157l38.6 80.2c18.3 38.1 57.5 62.7 99.7 62.7h179.6c42.3 0 81.4-24.6 99.7-62.7l38.6-80.2c73.1 14.9 128.2 79.6 128.2 157V708z" p-id="9498"></path><path d="M486.9 408.2c-4.6-9.9-14.1-15.8-24.3-16.4-0.6 0-1.3-0.1-1.9-0.1-0.7 0-1.4 0.1-2.1 0.1-10.1 0.7-19.6 6.5-24.2 16.4l-142.7 306c-6.7 14.4-0.5 31.4 13.9 38.1 3.9 1.8 8 2.7 12.1 2.7 10.8 0 21.1-6.1 26-16.6l34.4-73.8h165.1l34.4 73.8c4.9 10.4 15.2 16.6 26 16.6 4.1 0 8.2-0.9 12.1-2.7 14.4-6.7 20.6-23.8 13.9-38.1l-142.7-306z m-82 199.1l55.8-119.7 55.8 119.7H404.9zM683.1 391.2c-15.8 0-28.7 12.8-28.7 28.7v306.9c0 15.8 12.8 28.7 28.7 28.7s28.7-12.8 28.7-28.7V419.9c0-15.9-12.8-28.7-28.7-28.7z" p-id="9499"></path></svg>
\ No newline at end of file
diff --git a/frontend/src/assets/icon/ai/assistant.svg b/frontend/src/assets/icon/ai/assistant.svg
new file mode 100644
index 00000000..9c786f18
--- /dev/null
+++ b/frontend/src/assets/icon/ai/assistant.svg
@@ -0,0 +1 @@
+<svg t="1775984826390" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="11872" width="48" height="48"><path d="M762.112 325.632h-225.536v-65.792c49.408-11.264 86.528-55.296 86.528-108.288 0-61.184-49.92-110.848-111.104-110.848s-111.104 49.664-111.104 110.848c0 52.736 37.12 97.024 86.528 108.288v65.792h-225.536c-87.808 0-158.976 71.424-158.976 158.976V706.56c0 87.808 71.424 158.976 158.976 158.976h500.224c87.808 0 158.976-71.424 158.976-158.976v-221.696c0-87.808-71.424-159.232-158.976-159.232z m-312.064-174.08c0-34.048 27.904-61.952 61.952-61.952s61.952 27.904 61.952 61.952-27.904 61.952-61.952 61.952-61.952-27.904-61.952-61.952zM872.192 706.56c0 60.672-49.408 110.08-110.08 110.08H261.888c-60.672 0-110.08-49.408-110.08-110.08v-221.696c0-60.672 49.408-110.08 110.08-110.08h500.224c60.672 0 110.08 49.408 110.08 110.08V706.56zM724.224 934.4H299.776c-13.568 0-24.576 11.008-24.576 24.576s11.008 24.576 24.576 24.576h424.192c13.568 0 24.576-11.008 24.576-24.576s-10.752-24.576-24.32-24.576zM29.696 478.464c-13.568 0-24.576 11.008-24.576 24.576v185.088c0 13.568 11.008 24.576 24.576 24.576s24.576-11.008 24.576-24.576v-185.088c0-13.568-11.008-24.576-24.576-24.576zM994.304 478.464c-13.568 0-24.576 11.008-24.576 24.576v185.088c0 13.568 11.008 24.576 24.576 24.576s24.576-11.008 24.576-24.576v-185.088c0-13.568-11.008-24.576-24.576-24.576z" p-id="11873"></path><path d="M349.184 467.968c-70.4 0-127.488 57.088-127.488 127.488 0 70.4 57.344 127.488 127.488 127.488s127.744-57.088 127.744-127.488c-0.256-70.144-57.344-127.488-127.744-127.488z m0 206.08c-43.264 0-78.592-35.328-78.592-78.592s35.328-78.592 78.592-78.592 78.592 35.328 78.592 78.592-35.328 78.592-78.592 78.592zM674.816 467.968c-70.4 0-127.744 57.088-127.744 127.488 0 70.4 57.344 127.488 127.744 127.488s127.488-57.088 127.488-127.488c0.256-70.144-57.088-127.488-127.488-127.488z m0 206.08c-43.264 0-78.592-35.328-78.592-78.592s35.328-78.592 78.592-78.592 78.592 35.328 78.592 78.592-35.328 78.592-78.592 78.592z" p-id="11874"></path></svg>
\ No newline at end of file
diff --git a/frontend/src/common/Api.ts b/frontend/src/common/Api.ts
index 2085088f..840e1f9d 100644
--- a/frontend/src/common/Api.ts
+++ b/frontend/src/common/Api.ts
@@ -4,7 +4,7 @@ import { RequestOptions, useApiFetch } from '@/hooks/useRequest';
 /**
  * 可用于各模块定义各自api请求
  */
-class Api {
+class Api<T = any> {
     /**
      * 请求url
      */
@@ -57,17 +57,17 @@ class Api {
      * fetch 请求对应的该api
      * @param {Object} param 请求该api的参数
      */
-    async request(param: any = null, options: any = {}): Promise<any> {
+    async request(param: any = null, options: any = {}): Promise<T> {
         const { execute, data } = this.useApi(param, options);
         const res = await execute();
-        return data.value || res;
+        return (data.value as T) || (res as T);
     }
 
     /**
      * xhr 请求对应的该api
      * @param {Object} param 请求该api的参数
      */
-    async xhrReq(param: any = null, options: any = {}): Promise<any> {
+    async xhrReq(param: any = null, options: any = {}): Promise<T> {
         if (this.beforeHandler) {
             await this.beforeHandler(param);
         }
@@ -81,15 +81,15 @@ class Api {
      * @param url url
      * @param method 请求方法(get,post,put,delete...)
      */
-    static create(url: string, method: string): Api {
-        return new Api(url, method);
+    static create<T = any>(url: string, method: string): Api<T> {
+        return new Api<T>(url, method);
     }
 
     /**
      * 创建get api
      * @param url url
      */
-    static newGet(url: string): Api {
+    static newGet<T = any>(url: string): Api<T> {
         return Api.create(url, 'get');
     }
 
@@ -97,7 +97,7 @@ class Api {
      * new post api
      * @param url url
      */
-    static newPost(url: string): Api {
+    static newPost<T = any>(url: string): Api<T> {
         return Api.create(url, 'post');
     }
 
@@ -105,7 +105,7 @@ class Api {
      * new put api
      * @param url url
      */
-    static newPut(url: string): Api {
+    static newPut<T = any>(url: string): Api<T> {
         return Api.create(url, 'put');
     }
 
@@ -113,7 +113,7 @@ class Api {
      * new delete api
      * @param url url
      */
-    static newDelete(url: string): Api {
+    static newDelete<T = any>(url: string): Api<T> {
         return Api.create(url, 'delete');
     }
 }
diff --git a/frontend/src/common/utils/format.ts b/frontend/src/common/utils/format.ts
index 4f921f29..3c0586fc 100644
--- a/frontend/src/common/utils/format.ts
+++ b/frontend/src/common/utils/format.ts
@@ -6,7 +6,7 @@ import dayjs from 'dayjs';
  * @param format 格式化格式  默认 YYYY-MM-DD HH:mm:ss
  * @returns 格式化后内容
  */
-export function formatDate(date: any, format: string = 'YYYY-MM-DD HH:mm:ss') {
+export function formatDate(date?: string | number | Date, format: string = 'YYYY-MM-DD HH:mm:ss') {
     if (!date) {
         return '';
     }
diff --git a/frontend/src/components/terminal/TerminalBody.vue b/frontend/src/components/terminal/TerminalBody.vue
index 5b473564..9f45ee71 100644
--- a/frontend/src/components/terminal/TerminalBody.vue
+++ b/frontend/src/components/terminal/TerminalBody.vue
@@ -18,8 +18,8 @@ import { useThemeConfig } from '@/store/themeConfig';
 import { ref, nextTick, reactive, onMounted, onBeforeUnmount, watch } from 'vue';
 import TerminalSearch from './TerminalSearch.vue';
 import { TerminalStatus } from './common';
-import { useDebounceFn, useEventListener, useIntervalFn } from '@vueuse/core';
-import themes from './themes';
+import { useDebounceFn, useEventListener } from '@vueuse/core';
+import themes from './themes.js';
 import { TrzszFilter } from 'trzsz';
 import { useI18n } from 'vue-i18n';
 import { createWebSocket } from '@/common/request';
@@ -54,6 +54,7 @@ const { themeConfig } = storeToRefs(useThemeConfig());
 // 终端实例
 let term: Terminal;
 let socket: WebSocket;
+let heartbeatTimer: ReturnType<typeof setInterval> | null = null;
 
 const state = reactive({
     // 插件
@@ -154,7 +155,7 @@ const initSocket = async () => {
     }
 
     // 注册心跳
-    useIntervalFn(sendPing, 15000);
+    startHeartbeat();
 
     state.status = TerminalStatus.Connected;
 
@@ -172,6 +173,22 @@ const initSocket = async () => {
     };
 };
 
+const startHeartbeat = () => {
+    stopHeartbeat();
+    console.log('terminal start heartbeat');
+    heartbeatTimer = setInterval(() => {
+        sendPing();
+    }, 10000);
+};
+
+const stopHeartbeat = () => {
+    if (heartbeatTimer) {
+        console.log('terminal stop heartbeat');
+        clearInterval(heartbeatTimer);
+        heartbeatTimer = null;
+    }
+};
+
 const loadAddon = () => {
     // 注册搜索组件
     const searchAddon = new SearchAddon();
@@ -280,6 +297,7 @@ const sendData = (key: any) => {
 };
 
 const closeSocket = () => {
+    stopHeartbeat();
     // 关闭 websocket
     socket && socket.readyState === 1 && socket.close();
 };
diff --git a/frontend/src/i18n/en/ai.ts b/frontend/src/i18n/en/ai.ts
new file mode 100644
index 00000000..ff8b4c56
--- /dev/null
+++ b/frontend/src/i18n/en/ai.ts
@@ -0,0 +1 @@
+export default {};
diff --git a/frontend/src/i18n/en/menu.ts b/frontend/src/i18n/en/menu.ts
index 82dd8d31..c65decc4 100644
--- a/frontend/src/i18n/en/menu.ts
+++ b/frontend/src/i18n/en/menu.ts
@@ -148,5 +148,7 @@ export default {
 
         noPagePermission: 'No Page Permission',
         authcertShowciphertext: 'Show Ciphertext',
+
+        aiAssistant: 'AI Assistant',
     },
 };
diff --git a/frontend/src/i18n/zh-cn/ai.ts b/frontend/src/i18n/zh-cn/ai.ts
new file mode 100644
index 00000000..ff8b4c56
--- /dev/null
+++ b/frontend/src/i18n/zh-cn/ai.ts
@@ -0,0 +1 @@
+export default {};
diff --git a/frontend/src/i18n/zh-cn/menu.ts b/frontend/src/i18n/zh-cn/menu.ts
index ab6b9aa5..f0235a71 100644
--- a/frontend/src/i18n/zh-cn/menu.ts
+++ b/frontend/src/i18n/zh-cn/menu.ts
@@ -148,5 +148,7 @@ export default {
 
         noPagePermission: '无页面权限',
         authcertShowciphertext: '授权凭证密文查看',
+
+        aiAssistant: 'AI助手',
     },
 };
diff --git a/frontend/src/layout/component/main.vue b/frontend/src/layout/component/main.vue
index f166faae..6a3ddc60 100644
--- a/frontend/src/layout/component/main.vue
+++ b/frontend/src/layout/component/main.vue
@@ -46,7 +46,7 @@ watch(
             setTimeout(() => {
                 layoutScrollbarRef.value.update();
             }, 500);
-            layoutScrollbarRef.value.setScrollTop();
+            layoutScrollbarRef.value.setScrollTop(0);
         });
     }
 );
diff --git a/frontend/src/layout/navBars/breadcrumb/user.vue b/frontend/src/layout/navBars/breadcrumb/user.vue
index 1d89e8b8..900b3bdc 100644
--- a/frontend/src/layout/navBars/breadcrumb/user.vue
+++ b/frontend/src/layout/navBars/breadcrumb/user.vue
@@ -1,5 +1,10 @@
 <template>
     <div class="layout-navbars-breadcrumb-user" :style="{ flex: layoutUserFlexNum }">
+        <!-- <div class="layout-navbars-breadcrumb-user-icon" @click="onShowAiChatDialog">
+            <SvgIcon name="icon ai/assistant" :title="$t('layout.user.menuSearch')" />
+            <AiChatDialog v-model:visible="state.aiChatDialogVisible" />
+        </div> -->
+
         <div class="layout-navbars-breadcrumb-user-icon">
             <el-switch
                 @change="switchDark()"
@@ -10,20 +15,6 @@
                 class="dark-icon"
             />
         </div>
-        <!-- <el-dropdown :show-timeout="70" :hide-timeout="50" trigger="click" @command="onComponentSizeChange">
-            <div class="layout-navbars-breadcrumb-user-icon">
-                <el-icon title="组件大小">
-                    <plus />
-                </el-icon>
-            </div>
-            <template #dropdown>
-                <el-dropdown-menu>
-                    <el-dropdown-item command="" :disabled="state.disabledSize === ''">默认</el-dropdown-item>
-                    <el-dropdown-item command="large" :disabled="state.disabledSize === 'large'">大型</el-dropdown-item>
-                    <el-dropdown-item command="small" :disabled="state.disabledSize === 'small'">小型</el-dropdown-item>
-                </el-dropdown-menu>
-            </template>
-</el-dropdown> -->
 
         <el-dropdown :show-timeout="70" :hide-timeout="50" trigger="click" @command="onLanguageChange">
             <div class="layout-navbars-breadcrumb-user-icon">
@@ -81,7 +72,7 @@
 </template>
 
 <script setup lang="ts" name="layoutBreadcrumbUser">
-import { ref, computed, reactive, onMounted, watch, useTemplateRef } from 'vue';
+import { ref, computed, reactive, onMounted, watch, useTemplateRef, defineAsyncComponent } from 'vue';
 import { useRouter } from 'vue-router';
 import { ElMessageBox, ElMessage } from 'element-plus';
 import screenfull from 'screenfull';
@@ -99,6 +90,8 @@ import { useI18n } from 'vue-i18n';
 import { I18nEnum } from '@/common/commonEnum';
 import EnumValue from '@/common/Enum';
 
+// const AiChatDialog = defineAsyncComponent(() => import('@/views/ai/AiChatDialog.vue'));
+
 const router = useRouter();
 const searchRef = ref();
 const userNewsRef = useTemplateRef('userNewsRef');
@@ -107,6 +100,7 @@ const state = reactive({
     isScreenfull: false,
     disabledSize: '',
     unreadMsgCount: 0,
+    aiChatDialogVisible: false,
 });
 const { userInfo } = storeToRefs(useUserInfo());
 const themeConfigStore = useThemeConfig();
@@ -237,6 +231,10 @@ const initComponentSize = () => {
     }
 };
 
+const onShowAiChatDialog = () => {
+    state.aiChatDialogVisible = true;
+};
+
 // 语言切换
 const onLanguageChange = (lang: string) => {
     themeConfig.value.globalI18n = lang;
diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.ts
index 818cba58..f3204ef8 100644
--- a/frontend/src/router/index.ts
+++ b/frontend/src/router/index.ts
@@ -66,7 +66,7 @@ export async function initRouter() {
 }
 
 // 路由加载前
-router.beforeEach(async (to, from, next) => {
+router.beforeEach(async (to, from) => {
     NProgress.configure({ showSpinner: false });
     NProgress.start();
 
@@ -81,22 +81,22 @@ router.beforeEach(async (to, from, next) => {
     // 判断是访问登陆页，有token就在当前页面，没有token重置路由与用户信息到登陆页
     if (toPath === URL_LOGIN) {
         if (token) {
-            return next(from.fullPath);
+            return from.fullPath;
         }
 
         resetRoute();
         syssocket.destory();
-        return next();
+        return true;
     }
 
     // 判断访问页面是否在路由白名单地址(静态路由)中，如果存在直接放行
     if (ROUTER_WHITE_LIST.includes(toPath)) {
-        return next();
+        return true;
     }
 
     // 判断是否有token，没有重定向到 login 页面
     if (!token) {
-        return next(`${URL_LOGIN}?redirect=${toPath}`);
+        return `${URL_LOGIN}?redirect=${toPath}`;
     }
 
     // 终端不需要连接系统websocket消息
@@ -110,12 +110,12 @@ router.beforeEach(async (to, from, next) => {
             // 可能token过期无法获取菜单权限信息等
             await initRouter();
         } catch (e) {
-            return next(`${URL_401}?redirect=${toPath}`);
+            return `${URL_401}?redirect=${toPath}`;
         }
-        return next({ path: toPath, query: to.query });
+        return { path: toPath, query: to.query };
     }
 
-    next();
+    return true;
 });
 
 // 路由加载后
diff --git a/frontend/src/store/userInfo.ts b/frontend/src/store/userInfo.ts
index 957ed7ba..c04cbfac 100644
--- a/frontend/src/store/userInfo.ts
+++ b/frontend/src/store/userInfo.ts
@@ -1,14 +1,24 @@
 import { defineStore } from 'pinia';
 import { getUser } from '@/common/utils/storage';
 
+export interface UserInfo {
+    username: string;
+    name: string;
+    lastLoginIp?: string;
+    lastLoginTime?: string;
+    photo?: string; // 头像
+    permissions?: string[]; // 权限
+}
+
 export const useUserInfo = defineStore('userInfo', {
     state: (): UserInfoState => ({
-        userInfo: {},
+        userInfo: {} as UserInfo,
     }),
     actions: {
         // 设置用户信息
-        async setUserInfo(data: object) {
+        async setUserInfo(data: any) {
             const ui = getUser();
+            console.log(ui);
             if (ui) {
                 this.userInfo = ui;
             } else {
diff --git a/frontend/src/theme/element.scss b/frontend/src/theme/element.scss
index b65a560c..2b43932a 100644
--- a/frontend/src/theme/element.scss
+++ b/frontend/src/theme/element.scss
@@ -276,13 +276,22 @@ html.dark {
     right: 0;
 }
 
+// dialog 动画
+/* Bounce Animation */
+.dialog-bounce-enter-active,
+.dialog-bounce-leave-active,
+.dialog-bounce-enter-active .el-dialog,
+.dialog-bounce-leave-active .el-dialog {
+    transition: all 0.5s cubic-bezier(0.175, 0.885, 0.32, 1.275);
+}
 
-/* Dialog 对话框
-------------------------------- */
-.el-dialog {
-    border-radius: 6px;
-    /* 设置圆角 */
-    box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
-    /* 添加轻微阴影效果 */
-    border: 1px solid var(--el-border-color-lighter);
+.dialog-bounce-enter-from,
+.dialog-bounce-leave-to {
+    opacity: 0;
+}
+
+.dialog-bounce-enter-from .el-dialog,
+.dialog-bounce-leave-to .el-dialog {
+    transform: scale(0.3) translateY(-50px);
+    opacity: 0;
 }
\ No newline at end of file
diff --git a/frontend/src/views/ai/AiAssistant.vue b/frontend/src/views/ai/AiAssistant.vue
new file mode 100644
index 00000000..c1e1b50a
--- /dev/null
+++ b/frontend/src/views/ai/AiAssistant.vue
@@ -0,0 +1,143 @@
+<template>
+    <div class="flex h-full">
+        <!-- 左侧会话列表 -->
+        <aside class="flex flex-col border-r transition-all duration-300 ease-in-out" style="border-color: var(--el-border-color-light, #e4e7ed)">
+            <Conversations
+                v-model:active="currentSessionId"
+                :items="conversations"
+                @change="onChangeSession"
+                :label-max-width="200"
+                :show-tooltip="true"
+                row-key="key"
+                tooltip-placement="right"
+                :tooltip-offset="35"
+                show-to-top-btn
+                :menuTeleported="false"
+                show-built-in-menu
+                @menu-command="onMenuCommand"
+            >
+                <template #header>
+                    <div class="p-2 border-b" style="border-color: var(--el-border-color-lighter, #ebeef5)">
+                        <el-button icon="plus" type="primary" @click="createNewSession" class="w-full shadow-sm hover:shadow-md transition-shadow duration-200">
+                            新建会话
+                        </el-button>
+                    </div>
+                </template>
+
+                <!-- <template #menu="{ item }">
+                    <div class="flex flex-col">
+                        <el-button
+                            v-for="menuItem in conversationMenuItems"
+                            :key="menuItem.key"
+                            link
+                            size="small"
+                            :icon="menuItem.icon"
+                            @click.stop="onMenuCommand(menuItem.key, item)"
+                        >
+                            <span v-if="menuItem.label">{{ menuItem.label }}</span>
+                        </el-button>
+                    </div>
+                </template> -->
+            </Conversations>
+        </aside>
+
+        <!-- 右侧聊天区域 -->
+        <main class="ml-3 flex-1 flex flex-col bg-linear-to-br from-gray-50 to-white dark:from-gray-800 dark:to-gray-900">
+            <AiChat v-if="currentSessionId" :session-id="currentSessionId" :is-new-session="isNewSession" @activate="loadSessions" class="flex-1" />
+            <div v-else class="flex-1 flex flex-col items-center justify-center text-gray-400 dark:text-gray-500 space-y-4">
+                <div class="text-6xl opacity-20">💬</div>
+                <p class="text-lg font-medium">开始新的对话</p>
+                <p class="text-sm">选择一个会话或创建新会话</p>
+            </div>
+        </main>
+    </div>
+</template>
+
+<script setup lang="ts" name="AiAssistant">
+import { ref, onMounted, defineAsyncComponent, nextTick } from 'vue';
+import { formatDate } from '@/common/utils/format';
+import type { ConversationItem, ConversationMenuCommand } from 'vue-element-plus-x/types/Conversations';
+import { Conversations } from 'vue-element-plus-x';
+import { randomUuid } from '@/common/utils/string';
+import { aiApi } from './api';
+import { ElMessageBox } from 'element-plus';
+import { useI18nOperateSuccessMsg } from '@/hooks/useI18n';
+import { notBlankI18n } from '@/common/assert';
+import { useI18n } from 'vue-i18n';
+
+const AiChat = defineAsyncComponent(() => import('./AiChat.vue'));
+
+const { t } = useI18n();
+
+const conversations = ref<ConversationItem[]>([]);
+// 当前会话id
+const currentSessionId = ref<string>('');
+// 是否是新会话
+const isNewSession = ref(false);
+
+/**
+ * 加载会话列表
+ */
+const loadSessions = async () => {
+    const sessions = await aiApi.listSessions.request();
+    conversations.value = sessions.map((session) => {
+        return {
+            key: session.sessionKey,
+            label: session.title,
+            createTime: formatDate(session.createTime),
+            updateTime: formatDate(session.updateTime),
+        };
+    });
+    // 默认选中第一个会话
+    if (!currentSessionId.value && sessions.length > 0) {
+        switchSession(sessions[0].sessionKey);
+    }
+};
+
+const onChangeSession = (item: ConversationItem) => {
+    isNewSession.value = false;
+    switchSession(item.key);
+};
+
+const createNewSession = async () => {
+    currentSessionId.value = randomUuid();
+    isNewSession.value = true;
+};
+
+const switchSession = (sessionId: string) => {
+    currentSessionId.value = sessionId;
+};
+
+const deleteSession = async (sessionKey: string) => {
+    await aiApi.deleteSession.request({ sessionKey });
+    if (currentSessionId.value === sessionKey) {
+        currentSessionId.value = '';
+    }
+    await loadSessions();
+};
+
+// 内置菜单点击方法
+const onMenuCommand = async (command: ConversationMenuCommand, item: ConversationItem) => {
+    if (command === 'delete') {
+        deleteSession(item.key);
+        return;
+    }
+    if (command === 'rename') {
+        ElMessageBox.prompt('', t('common.name'), {
+            confirmButtonText: t('common.confirm'),
+            cancelButtonText: t('common.cancel'),
+        }).then(async ({ value }) => {
+            notBlankI18n(value, 'common.name');
+            await aiApi.renameSession.request({ sessionKey: item.key, title: value });
+            useI18nOperateSuccessMsg();
+            loadSessions();
+        });
+    }
+};
+
+onMounted(() => {
+    loadSessions();
+});
+</script>
+
+<style></style>
diff --git a/frontend/src/views/ai/AiChat.vue b/frontend/src/views/ai/AiChat.vue
new file mode 100644
index 00000000..43d88476
--- /dev/null
+++ b/frontend/src/views/ai/AiChat.vue
@@ -0,0 +1,572 @@
+<template>
+    <div class="h-full flex flex-col justify-center items-center p-5">
+        <div class="w-full p-5" v-if="state.messages.length > 0" style="height: calc(100vh - 260px)">
+            <BubbleList v-loading="msgLoading" ref="bubbleListRef" :list="messages" max-height="100%">
+                <template #avatar="{ item }">
+                    <SvgIcon v-if="item.role == ROLE.AI" :size="24" name="icon ai/assistant" color="var(--el-color-primary)" />
+                    <img v-else class="size-10 max-w-none rounded-full" :src="useUserInfo().userInfo.photo" alt="avatar" />
+                </template>
+
+                <template #header="{ item }">
+                    <ThoughtChain :thinking-items="item.thinks" class="min-w-150" :max-width="BUBBLE_MAX_WIDTH" row-key="codeId" />
+                </template>
+
+                <template #content="{ item }">
+                    <!-- chat 内容走 markdown -->
+                    <XMarkdown
+                        v-if="item.content && item.role === ROLE.AI"
+                        :markdown="item.content"
+                        :themes="{ light: 'github-light', dark: 'github-dark' }"
+                        :default-theme-mode="isDark ? 'dark' : 'light'"
+                    />
+
+                    <!-- user 内容 纯文本 -->
+                    <div v-if="item.content && item.role === ROLE.USER" class="whitespace-pre-wrap">
+                        {{ item.content }}
+                    </div>
+                </template>
+
+                <template #footer="{ item }">
+                    <div class="flex justify-between items-center">
+                        <div>
+                            <el-button @click="copyToClipboard(item.content)" color="#626aef" icon="DocumentCopy" size="small" circle />
+                        </div>
+                        <div class="ml-2 mt-1 text-xs">
+                            {{ item.time }}
+                        </div>
+                    </div>
+                </template>
+            </BubbleList>
+        </div>
+
+        <div class="w-full">
+            <EditorSender
+                ref="senderRef"
+                @click.once="onFoucsSender()"
+                style="border-radius: 24px"
+                :custom-style="{
+                    height: '60px',
+                }"
+                @submit="onSubmit"
+                :loading="senderLoading"
+                submit-type="enter"
+                :auto-focus="true"
+                variant="updown"
+                clearable
+            >
+            </EditorSender>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts" name="AiChat">
+import { createWebSocket } from '@/common/request';
+import { formatDate } from '@/common/utils/format';
+import { copyToClipboard } from '@/common/utils/string';
+import { useThemeConfig } from '@/store/themeConfig';
+import { useUserInfo } from '@/store/userInfo';
+import { computed, onBeforeUnmount, reactive, ref, toRefs, useTemplateRef, watch } from 'vue';
+import { BubbleList, EditorSender, ThoughtChain, XMarkdown } from 'vue-element-plus-x';
+import type { BubbleListInstance } from 'vue-element-plus-x/types/BubbleList';
+import type { SubmitResult } from 'vue-element-plus-x/types/EditorSender';
+import { aiApi, SessionMessage, ToolCall } from './api';
+
+// ==================== 常量定义 ====================
+
+const ROLE = {
+    AI: 'assistant',
+    USER: 'user',
+    TOOL: 'tool',
+} as const;
+
+const MESSAGE_TYPE = {
+    END: 'end',
+    ERROR: 'error',
+} as const;
+
+const THINK_STATUS = {
+    LOADING: 'loading',
+    SUCCESS: 'success',
+    ERROR: 'error',
+} as const;
+
+const THINK_TYPE = {
+    REASONING: 'reasoning',
+    TOOL: 'tool',
+} as const;
+
+const BUBBLE_MAX_WIDTH = '80%';
+const TOOL_ERROR_PREFIX = '[tool error]';
+
+type messageType = SessionMessage & {
+    key?: number;
+    loading?: boolean; // 是否正在加载中
+    thinks?: Array<{
+        type?: string;
+        status: string;
+        codeId: string;
+        title: string;
+        isCanExpand: boolean;
+        isDefaultExpand: boolean;
+        thinkTitle: string;
+        thinkContent: string;
+        extra?: any;
+    }>; // 思考链
+};
+
+const props = defineProps({
+    sessionId: {
+        type: String,
+        default: '',
+    },
+    isNewSession: {
+        type: Boolean,
+        default: false,
+    },
+});
+
+const emit = defineEmits(['activate']);
+
+let socket: WebSocket;
+let reconnectTimer: any = null;
+let reconnectAttempts = 0;
+const MAX_RECONNECT_ATTEMPTS = 5;
+const RECONNECT_DELAY = 3000;
+
+const themeConfig = useThemeConfig();
+const isDark = computed(() => themeConfig.themeConfig.isDark);
+
+const senderRef = useTemplateRef<InstanceType<typeof EditorSender>>('senderRef');
+const bubbleListRef = useTemplateRef<BubbleListInstance>('bubbleListRef');
+
+const state = reactive({
+    msgLoading: false,
+    senderLoading: false,
+    messages: [] as Array<messageType>,
+});
+const { msgLoading, senderLoading } = toRefs(state);
+
+// 标记会话是否已激活（用户是否发送过消息）
+const sessionActivated = ref(false);
+
+const initSocket = async () => {
+    try {
+        console.log('init chat ws...');
+        socket = await createWebSocket(`/ai/chat`);
+        socket.onmessage = (e) => {
+            const data: SessionMessage = JSON.parse(e.data);
+            handleChunk(data);
+        };
+
+        socket.onclose = (event) => {
+            console.log('chat ws 连接关闭:', event.code, event.reason);
+            if (!event.wasClean) {
+                attemptReconnect();
+            }
+        };
+
+        socket.onerror = (error) => {
+            console.error('chat ws  错误:', error);
+        };
+
+        // 连接成功，重置重连计数
+        reconnectAttempts = 0;
+    } catch (e) {
+        state.messages.push({
+            content: '连接失败，请检查网络或联系管理员',
+            role: ROLE.AI,
+        });
+        console.log('连接错误', e);
+        attemptReconnect();
+        return;
+    }
+};
+
+const attemptReconnect = () => {
+    if (reconnectAttempts >= MAX_RECONNECT_ATTEMPTS) {
+        console.warn('达到最大重连次数，停止重连');
+        state.messages.push({
+            content: '连接已断开，请刷新页面重试',
+            role: ROLE.AI,
+        });
+        return;
+    }
+
+    reconnectAttempts++;
+    console.log(`尝试第 ${reconnectAttempts} 次重连...`);
+
+    if (reconnectTimer) {
+        clearTimeout(reconnectTimer);
+    }
+
+    reconnectTimer = setTimeout(() => {
+        initSocket();
+    }, RECONNECT_DELAY);
+};
+
+const cleanupSocket = () => {
+    if (reconnectTimer) {
+        clearTimeout(reconnectTimer);
+        reconnectTimer = null;
+    }
+    if (socket) {
+        socket.onclose = null;
+        socket.onerror = null;
+        socket.onmessage = null;
+        if (socket.readyState === WebSocket.OPEN || socket.readyState === WebSocket.CONNECTING) {
+            socket.close();
+        }
+        socket = null as any;
+    }
+    reconnectAttempts = 0;
+};
+
+const handleChunk = (chunkMsg: SessionMessage) => {
+    const nowMsgIndex = state.messages.length - 1;
+    const message = state.messages[nowMsgIndex];
+
+    if (chunkMsg.content && chunkMsg.role != ROLE.TOOL) {
+        message.content += chunkMsg.content;
+        scrollToBottom();
+
+        if (message.loading) {
+            message.loading = false;
+        }
+    }
+
+    // 结束会话
+    if (chunkMsg.type == MESSAGE_TYPE.END || chunkMsg.type == MESSAGE_TYPE.ERROR) {
+        message.time = chunkMsg.time;
+        state.senderLoading = false;
+
+        // 结束可能存在的思考链
+        if (message.thinks && message.thinks.length > 0) {
+            for (let think of message.thinks) {
+                if (think.status == THINK_STATUS.LOADING) {
+                    think.status = THINK_STATUS.SUCCESS;
+                }
+            }
+        }
+
+        // 如果是新会话，触发会话激活事件
+        if (props.isNewSession && !sessionActivated.value) {
+            sessionActivated.value = true;
+            setTimeout(() => {
+                emit('activate');
+            }, 500);
+        }
+        return;
+    }
+
+    const reasoningChunk = chunkMsg.reasoningContent;
+    if (reasoningChunk) {
+        // 开始思考链状态
+        addReasoningContent(nowMsgIndex, {
+            title: '思考',
+            reasoningContent: reasoningChunk,
+        });
+    }
+
+    // 处理 <think> 标签格式的思考内容
+    handleThinkTagContent(nowMsgIndex, chunkMsg.content);
+
+    // 处理工具调用
+    if (chunkMsg.toolCalls) {
+        for (let toolCall of chunkMsg.toolCalls) {
+            addReasoningContent(nowMsgIndex, {
+                type: THINK_TYPE.TOOL,
+                title: formatToolThinkTitle(toolCall),
+                reasoningContent: JSON.stringify(toolCall),
+                extra: {
+                    toolCallId: toolCall.id,
+                },
+            });
+        }
+    }
+
+    // 处理工具结果
+    if (chunkMsg.role == ROLE.TOOL) {
+        if (!message.thinks) {
+            return;
+        }
+        const { toolCallId, content } = chunkMsg;
+        for (let think of message.thinks) {
+            if (think.type != THINK_TYPE.TOOL || !think.extra) {
+                continue;
+            }
+            if (think.extra?.toolCallId == toolCallId) {
+                think.thinkContent = appendToolCallResult(think.thinkContent, content);
+                if (content.startsWith(TOOL_ERROR_PREFIX)) {
+                    think.status = THINK_STATUS.ERROR;
+                }
+                return;
+            }
+        }
+    }
+};
+
+const addReasoningContent = (
+    msgIndex: number,
+    content: {
+        type?: string;
+        title: string;
+        reasoningContent: string;
+        extra?: any;
+    } = { title: '思考', reasoningContent: '' }
+) => {
+    const thinks = state.messages[msgIndex].thinks;
+    const reasoningContent = content.reasoningContent;
+
+    // 创建think对象的辅助函数
+    const createThink = (status: string, codeId: number | string) => ({
+        type: content.type,
+        status,
+        codeId: String(codeId),
+        title: content.type == THINK_TYPE.TOOL ? '工具调用' : '思考',
+        isCanExpand: true,
+        isDefaultExpand: true,
+        thinkTitle: content.title,
+        thinkContent: reasoningContent,
+        extra: content.extra,
+    });
+
+    // 如果没有thinks数组，初始化
+    if (!thinks || thinks.length == 0) {
+        state.messages[msgIndex].thinks = [createThink(THINK_STATUS.LOADING, 1)];
+        return;
+    }
+
+    const thinkIndex = thinks.length - 1;
+    const think = thinks[thinkIndex];
+
+    // 如果title不同，结束当前think并创建新的
+    if (think.title != content.title) {
+        think.status = THINK_STATUS.SUCCESS;
+        thinks.push(createThink(THINK_STATUS.LOADING, thinkIndex + 2));
+        return;
+    }
+
+    // 如果当前think还在loading状态，追加内容
+    if (think.status == THINK_STATUS.LOADING) {
+        think.thinkContent += reasoningContent;
+        if (!reasoningContent) {
+            think.status = THINK_STATUS.SUCCESS;
+        }
+        return;
+    }
+
+    // 如果内容为空，直接返回
+    if (!reasoningContent) {
+        return;
+    }
+
+    // 否则创建新的think
+    thinks.push(createThink(THINK_STATUS.LOADING, thinkIndex + 2));
+};
+
+const loadMessage = async () => {
+    if (!props.sessionId) {
+        return;
+    }
+    try {
+        state.msgLoading = true;
+        const messages = await aiApi.listMessages.request({ sessionKey: props.sessionId });
+
+        const finalMessages = new Map<string, messageType>(); // messageId -> message
+        const toolCallMessages = new Map<string, messageType[]>(); // messageId -> [message]
+        const toolMessages = new Map<string, messageType>(); // toolCallId -> message
+        // 第一轮遍历：分类消息
+        for (let message of messages) {
+            if (message.toolCalls && message.toolCalls.length > 0) {
+                if (!toolCallMessages.has(message.messageId || message.time + '')) {
+                    toolCallMessages.set(message.messageId || message.time + '', []);
+                }
+                toolCallMessages.get(message.messageId || message.time + '')?.push(message);
+                continue;
+            }
+            if (message.role == ROLE.TOOL) {
+                toolMessages.set(message.toolCallId || '', message);
+                continue;
+            }
+
+            finalMessages.set(message.messageId || message.time + '', message);
+        }
+
+        // 第二轮遍历：处理工具调用和结果
+        for (let [key, value] of toolCallMessages) {
+            const message = finalMessages.get(key);
+            if (!message) {
+                continue;
+            }
+            const thinks = [];
+
+            for (let toolCallMsg of value) {
+                const tollCalls = toolCallMsg.toolCalls;
+                if (!tollCalls) {
+                    continue;
+                }
+                for (let toolCall of tollCalls) {
+                    const toolResult = toolMessages.get(toolCall.id)?.content || '';
+                    const think = {
+                        type: THINK_TYPE.TOOL,
+                        status: toolResult.startsWith(TOOL_ERROR_PREFIX) ? THINK_STATUS.ERROR : THINK_STATUS.SUCCESS,
+                        codeId: String(toolCall.id),
+                        title: '工具调用',
+                        isCanExpand: true,
+                        isDefaultExpand: false,
+                        thinkTitle: formatToolThinkTitle(toolCall),
+                        thinkContent: appendToolCallResult(JSON.stringify(toolCall), toolResult),
+                    };
+                    thinks.push(think);
+                }
+            }
+
+            message.thinks = thinks;
+        }
+
+        state.messages = Array.from(finalMessages.values());
+    } finally {
+        state.msgLoading = false;
+        scrollToBottom();
+    }
+};
+
+const formatToolThinkTitle = (toolCall: ToolCall) => {
+    return '工具调用 - ' + toolCall.function?.name || '';
+};
+
+const appendToolCallResult = (toolDesc: string, toolResult: string) => {
+    return `${toolDesc}  工具调用结果: ${toolResult}`;
+};
+
+const onFoucsSender = () => {
+    senderRef.value?.focusToEnd();
+};
+
+/**
+ * 滚动到底部
+ * @param delay
+ */
+const scrollToBottom = (delay: number = 500) => {
+    setTimeout(() => {
+        bubbleListRef.value?.scrollToBottom();
+    }, delay);
+};
+
+onBeforeUnmount(() => {
+    cleanupSocket();
+});
+
+watch(
+    () => props.sessionId,
+    async (newVal) => {
+        if (!newVal) {
+            return;
+        }
+        if (!socket) {
+            initSocket();
+        }
+        onFoucsSender();
+        loadMessage();
+    },
+    { immediate: true }
+);
+
+/**
+ * 转为组件需要的数据
+ */
+const messages = computed(() => {
+    return state.messages.map((item) => {
+        const role = item.role;
+        return {
+            ...item,
+            time: formatDate(item.time),
+            placement: role === ROLE.AI ? 'start' : 'end',
+            variant: role === ROLE.AI ? 'filled' : 'outlined', // 气泡的样式
+            isFog: role === ROLE.AI, // AI 消息开启雾化效果
+            maxWidth: BUBBLE_MAX_WIDTH,
+        };
+    }) as any[];
+});
+
+const sendUserMsg = (msg: string) => {
+    // 检查 WebSocket 连接状态
+    if (!socket || socket.readyState === WebSocket.CLOSED || socket.readyState === WebSocket.CLOSING) {
+        console.warn('WebSocket 连接已关闭，尝试重连...');
+
+        // 如果正在重连中，等待重连完成
+        if (reconnectAttempts > 0 && reconnectAttempts < MAX_RECONNECT_ATTEMPTS) {
+            state.messages.push({
+                content: '正在重新连接服务器，请稍候...',
+                role: ROLE.AI,
+            });
+            attemptReconnect();
+            return;
+        }
+
+        // 立即尝试重连
+        attemptReconnect();
+        state.messages.push({
+            content: '连接已断开，正在尝试重新连接...',
+            role: ROLE.AI,
+        });
+        return;
+    }
+
+    socket.send(
+        JSON.stringify({
+            sessionId: props.sessionId,
+            content: msg,
+        })
+    );
+};
+
+const onSubmit = (value: SubmitResult) => {
+    try {
+        state.senderLoading = true;
+        sendUserMsg(value.text);
+
+        state.messages.push({
+            content: value.text,
+            role: ROLE.USER,
+            time: new Date(),
+        });
+
+        state.messages.push({
+            content: '',
+            role: ROLE.AI,
+            loading: true,
+        });
+    } finally {
+        clearSenderEditor();
+    }
+};
+
+const clearSenderEditor = () => {
+    senderRef.value?.clear();
+};
+
+// 记录进入思考中
+let isThinking = false;
+
+const handleThinkTagContent = (msgIndex: number, content?: string) => {
+    if (!content) return;
+
+    const hasThinkStart = content.includes('<think>');
+    const hasThinkEnd = content.includes('</think>');
+
+    if (hasThinkStart) isThinking = true;
+    if (hasThinkEnd) isThinking = false;
+
+    if (isThinking) {
+        addReasoningContent(msgIndex, {
+            title: '思考',
+            reasoningContent: content.replace(/<think>|<\/think>/g, ''),
+        });
+    } else if (hasThinkEnd) {
+        addReasoningContent(msgIndex);
+    }
+};
+</script>
+
+<style></style>
diff --git a/frontend/src/views/ai/AiChatDialog.vue b/frontend/src/views/ai/AiChatDialog.vue
new file mode 100644
index 00000000..3fb67c7f
--- /dev/null
+++ b/frontend/src/views/ai/AiChatDialog.vue
@@ -0,0 +1,57 @@
+<template>
+    <el-drawer
+        :title="title"
+        v-model="dialogVisible"
+        z-index="2000"
+        top="32px"
+        size="70%"
+        :close-on-click-modal="false"
+        :show-close="true"
+        @close="closeDialog"
+    >
+        <template #header>
+            <DrawerHeader
+                :header="title"
+                :back="
+                    () => {
+                        dialogVisible = false;
+                    }
+                "
+            />
+        </template>
+
+        <AiAssistant></AiAssistant>
+        <!-- <AiChat ref="aiChatRef" :title="title" :show-close="false" /> -->
+    </el-drawer>
+</template>
+
+<script setup lang="ts" name="AiChatDialog">
+import { ref, onMounted, useTemplateRef, watch, defineAsyncComponent } from 'vue';
+
+const DrawerHeader = defineAsyncComponent(() => import('@/components/drawer-header/DrawerHeader.vue'));
+const AiAssistant = defineAsyncComponent(() => import('./AiAssistant.vue'));
+
+const props = defineProps({
+    title: {
+        type: String,
+        default: '',
+    },
+});
+
+const emit = defineEmits(['close', 'send', 'refresh']);
+
+const dialogVisible = defineModel<Boolean>('visible', { required: true });
+// const aiChatRef = useTemplateRef<InstanceType<typeof AiChat>>('aiChatRef');
+
+const handleSend = (message: string) => {
+    emit('send', message);
+};
+
+const handleRefresh = () => {
+    emit('refresh');
+};
+
+const closeDialog = () => {
+    emit('close');
+};
+</script>
diff --git a/frontend/src/views/ai/api.ts b/frontend/src/views/ai/api.ts
new file mode 100644
index 00000000..1e7a39a8
--- /dev/null
+++ b/frontend/src/views/ai/api.ts
@@ -0,0 +1,45 @@
+import Api from '@/common/Api';
+import { joinClientParams } from '@/common/request';
+
+export interface Session {
+    sessionKey: string;
+    title: string;
+    createTime: string;
+    updateTime: string;
+}
+
+export interface ToolCall {
+    id: string;
+    function: {
+        name: string;
+        arguments: string;
+    };
+}
+
+export interface SessionMessage {
+    messageId?: string;
+    role: string;
+    content: string;
+    type?: string;
+    time?: any;
+    reasoningContent?: string;
+    toolCalls?: ToolCall[];
+    toolCallId?: string;
+    extra?: any;
+}
+
+export const aiApi = {
+    // 获取权限列表
+    listSessions: Api.newGet<Session[]>('/ai/chat/sessions'),
+    deleteSession: Api.newDelete('/ai/chat/sessions/{sessionKey}'),
+    renameSession: Api.newPost('/ai/chat/sessions/rename'),
+    listMessages: Api.newGet<SessionMessage[]>('/ai/chat/messages'),
+};
+
+export function getMachineTerminalSocketUrl(authCertName: any) {
+    return `/machines/terminal/${authCertName}`;
+}
+
+export function getMachineRdpSocketUrl(authCertName: any) {
+    return `/api/machines/rdp/${authCertName}`;
+}
diff --git a/frontend/src/views/ai/route.ts b/frontend/src/views/ai/route.ts
new file mode 100644
index 00000000..dc458660
--- /dev/null
+++ b/frontend/src/views/ai/route.ts
@@ -0,0 +1,3 @@
+export default {
+    AiAssistant: () => import('@/views/ai/AiAssistant.vue'),
+};
diff --git a/frontend/src/views/ops/db/transfer/DbTransferEdit.vue b/frontend/src/views/ops/db/transfer/DbTransferEdit.vue
index 70f2e01e..c57e8e54 100644
--- a/frontend/src/views/ops/db/transfer/DbTransferEdit.vue
+++ b/frontend/src/views/ops/db/transfer/DbTransferEdit.vue
@@ -59,10 +59,10 @@
                 </el-form-item>
 
                 <el-form-item v-if="form.mode === 2">
-                    <el-row :gutter="10">
+                    <el-row :gutter="10" class="w-full">
                         <el-col :span="10">
                             <el-form-item prop="targetFileDbType" :label="$t('db.dbFileType')" :required="form.mode === 2">
-                                <el-select v-model="form.targetFileDbType" clearable filterable style="width: 180px">
+                                <el-select v-model="form.targetFileDbType" clearable filterable>
                                     <el-option
                                         v-for="(dbTypeAndDialect, key) in getDbDialectMap()"
                                         :key="key"
@@ -192,8 +192,8 @@ const rules = {
 };
 
 const fileTypeOptions = [
-    { label: '.sql', value: 'sql' },
     { label: '.zip', value: 'zip' },
+    { label: '.sql', value: 'sql' },
 ];
 
 const dbForm: any = ref(null);
diff --git a/frontend/src/views/ops/docker/container/ContainerList.vue b/frontend/src/views/ops/docker/container/ContainerList.vue
index 41bb57f6..5b36a392 100644
--- a/frontend/src/views/ops/docker/container/ContainerList.vue
+++ b/frontend/src/views/ops/docker/container/ContainerList.vue
@@ -102,7 +102,7 @@
             </template>
         </el-table-column>
 
-        <el-table-column prop="networks" :label="$t('docker.ip')" :min-width="100" >
+        <el-table-column prop="networks" :label="$t('docker.ip')" :min-width="110">
             <template #default="scope">
                 <el-tag v-for="network in scope.row.networks" :key="network" type="primary">{{ network || '-' }}</el-tag>
             </template>
diff --git a/frontend/src/views/ops/machine/MachineRec.vue b/frontend/src/views/ops/machine/MachineRec.vue
index 7d9959bf..4a827ace 100644
--- a/frontend/src/views/ops/machine/MachineRec.vue
+++ b/frontend/src/views/ops/machine/MachineRec.vue
@@ -1,6 +1,9 @@
 <template>
     <div id="terminalRecDialog">
         <el-dialog
+            modal-penetrable
+            :modal="false"
+            draggable
             :title="title"
             v-model="dialogVisible"
             :before-close="handleClose"
@@ -24,6 +27,9 @@
         </el-dialog>
 
         <el-dialog
+            modal-penetrable
+            :modal="false"
+            draggable
             :title="title"
             v-model="playerDialogVisible"
             :before-close="handleClosePlayer"
@@ -31,7 +37,7 @@
             :destroy-on-close="true"
             width="70%"
         >
-            <div ref="playerRef" id="rc-player"></div>
+            <div class="max-h-[60vh]" ref="playerRef" id="rc-player"></div>
         </el-dialog>
 
         <el-dialog :title="$t('machine.execCmdRecord')" v-model="execCmdsDialogVisible" :destroy-on-close="true" width="500">
@@ -116,6 +122,7 @@ const playRec = async (rec: any) => {
         if (player) {
             player.dispose();
         }
+
         rec.playRecLoding = true;
         state.playerDialogVisible = true;
         nextTick(() => {
diff --git a/frontend/src/views/ops/resource/ResourceOp.vue b/frontend/src/views/ops/resource/ResourceOp.vue
index baaea7f2..5b78c075 100644
--- a/frontend/src/views/ops/resource/ResourceOp.vue
+++ b/frontend/src/views/ops/resource/ResourceOp.vue
@@ -379,7 +379,6 @@ const onResizeOpPanel = () => {
 const loadTags = async () => {
     const tags = await tagApi.getTagTrees.request({
         type: getResourceTypes().join(','),
-        flatten: '0',
     });
 
     const result: any[] = [];
diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json
index 3c62b58f..154e0aa0 100644
--- a/frontend/tsconfig.json
+++ b/frontend/tsconfig.json
@@ -14,16 +14,9 @@
         // "allowJs": true,                       /* Allow javascript files to be compiled. */
         // "checkJs": true,                       /* Report errors in .js files. */
         "jsx": "preserve" /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */,
-        // "declaration": true /* Generates corresponding '.d.ts' file. */,
-        // "declarationMap": true,                /* Generates a sourcemap for each corresponding '.d.ts' file. */
-        // "sourceMap": true,                     /* Generates corresponding '.map' file. */
-        // "outFile": "./",                       /* Concatenate and emit output to single file. */
-        // "outDir": "./",                        /* Redirect output structure to the directory. */
+        // "outDir": "./dist" /* Redirect output structure to the directory. */,
         // "rootDir": "./",                       /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
-        // "composite": true,                     /* Enable project compilation */
-        // "tsBuildInfoFile": "./",               /* Specify file to store incremental compilation information */
-        // "removeComments": true,                /* Do not emit comments to output. */
-        // "noEmit": true,                        /* Do not emit outputs. */
+        "noEmit": true,                        /* Do not emit outputs. */
         // "importHelpers": true /* Import emit helpers from 'tslib'. */,
         // "downlevelIteration": true /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */,
         // "isolatedModules": true /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */,
@@ -43,11 +36,9 @@
         // "noFallthroughCasesInSwitch": true,    /* Report errors for fallthrough cases in switch statement. */
         // "noUncheckedIndexedAccess": true,      /* Include 'undefined' in index signature results */
         /* Module Resolution Options */
-        "moduleResolution": "node" /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */,
-        "baseUrl": "." /* Base directory to resolve non-absolute module names. */,
         "paths": {
             "@/*": [
-                "src/*"
+                "./src/*"
             ]
         } /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */,
         // "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
@@ -73,22 +64,16 @@
         "importHelpers": true,
         // 定义一个变量就必须给它一个初始值
         "strictPropertyInitialization": false,
-        // 允许使用obj[key]访问对象属性
-        "suppressImplicitAnyIndexErrors": true,
-        // 允许编译javascript文件
-        "allowJs": true,
-        "sourceMap": true,
     },
     "include": [
         "src/**/*.ts",
         "src/**/*.vue",
         "src/**/*.tsx",
         "src/**/*.d.ts",
-        "*.d.ts",
-        "src/i18n/module/common/zh-cn.js"
-    ], // **Represents any directory, and * represents any file. Indicates that all files in the src directory will be compiled
+        "*.d.ts"
+    ],
     "exclude": [
         "node_modules",
-        "dist"
-    ] // Indicates the file directory that does not need to be compiled
+        "dist",
+    ]
 }
\ No newline at end of file
diff --git a/server/go.mod b/server/go.mod
index e10b3514..e62c614e 100644
--- a/server/go.mod
+++ b/server/go.mod
@@ -7,8 +7,8 @@ require (
 	gitee.com/liuzongyang/libpq v1.10.11
 	github.com/ClickHouse/clickhouse-go/v2 v2.40.1
 	github.com/antlr4-go/antlr/v4 v4.13.1
-	github.com/cloudwego/eino v0.8.4
-	github.com/cloudwego/eino-ext/components/model/openai v0.1.10
+	github.com/cloudwego/eino v0.8.9
+	github.com/cloudwego/eino-ext/components/model/openai v0.1.12
 	github.com/docker/docker v28.5.2+incompatible
 	github.com/docker/go-connections v0.6.0
 	github.com/gin-gonic/gin v1.12.0
@@ -17,17 +17,17 @@ require (
 	github.com/go-ldap/ldap/v3 v3.4.13
 	github.com/go-playground/locales v0.14.1
 	github.com/go-playground/universal-translator v0.18.1
-	github.com/go-playground/validator/v10 v10.30.1
+	github.com/go-playground/validator/v10 v10.30.2
 	github.com/go-sql-driver/mysql v1.9.3
 	github.com/golang-jwt/jwt/v5 v5.3.1
 	github.com/google/uuid v1.6.0
 	github.com/gorilla/websocket v1.5.3
-	github.com/klauspost/compress v1.18.4
-	github.com/lionsoul2014/ip2region/binding/golang v0.0.0-20250930013652-2d71241a3bb9
-	github.com/microsoft/go-mssqldb v1.9.6
+	github.com/klauspost/compress v1.18.5
+	github.com/lionsoul2014/ip2region/binding/golang v0.0.0-20260409130608-36c9de10bb8f
+	github.com/microsoft/go-mssqldb v1.9.8
 	github.com/mojocn/base64Captcha v1.3.8 // 验证码
 	github.com/opencontainers/image-spec v1.1.1
-	github.com/pierrec/lz4/v4 v4.1.25
+	github.com/pierrec/lz4/v4 v4.1.26
 	github.com/pkg/sftp v1.13.10
 	github.com/pquerna/otp v1.5.0
 	github.com/redis/go-redis/v9 v9.18.0
@@ -39,10 +39,10 @@ require (
 	github.com/twmb/franz-go v1.20.7
 	github.com/twmb/franz-go/pkg/kadm v1.17.2
 	go.mongodb.org/mongo-driver/v2 v2.5.0 // mongo
-	golang.org/x/crypto v0.49.0
+	golang.org/x/crypto v0.50.0
 	golang.org/x/oauth2 v0.36.0
 	golang.org/x/sync v0.20.0
-	golang.org/x/text v0.35.0
+	golang.org/x/text v0.36.0
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1
 	gopkg.in/yaml.v3 v3.0.1
 	gorm.io/driver/mysql v1.6.0
@@ -50,7 +50,7 @@ require (
 )
 
 require (
-	filippo.io/edwards25519 v1.1.0 // indirect
+	filippo.io/edwards25519 v1.2.0 // indirect
 	github.com/Azure/go-ntlmssp v0.1.0 // indirect
 	github.com/ClickHouse/ch-go v0.67.0 // indirect
 	github.com/Microsoft/go-winio v0.6.2 // indirect
@@ -58,13 +58,13 @@ require (
 	github.com/bahlo/generic-list-go v0.2.0 // indirect
 	github.com/bmatcuk/doublestar/v4 v4.10.0 // indirect
 	github.com/boombuler/barcode v1.1.0 // indirect
-	github.com/buger/jsonparser v1.1.1 // indirect
-	github.com/bytedance/gopkg v0.1.3 // indirect
+	github.com/buger/jsonparser v1.1.2 // indirect
+	github.com/bytedance/gopkg v0.1.4 // indirect
 	github.com/bytedance/sonic v1.15.0 // indirect
-	github.com/bytedance/sonic/loader v0.5.0 // indirect
+	github.com/bytedance/sonic/loader v0.5.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/cloudwego/base64x v0.1.6 // indirect
-	github.com/cloudwego/eino-ext/libs/acl/openai v0.1.14 // indirect
+	github.com/cloudwego/eino-ext/libs/acl/openai v0.1.16 // indirect
 	github.com/containerd/errdefs v1.0.0 // indirect
 	github.com/containerd/errdefs/pkg v0.3.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
@@ -75,15 +75,15 @@ require (
 	github.com/eino-contrib/jsonschema v1.0.3 // indirect
 	github.com/evanphx/json-patch v0.5.2 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
-	github.com/gabriel-vasile/mimetype v1.4.12 // indirect
-	github.com/gin-contrib/sse v1.1.0 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.13 // indirect
+	github.com/gin-contrib/sse v1.1.1 // indirect
 	github.com/glebarez/go-sqlite v1.22.0 // indirect
 	github.com/go-asn1-ber/asn1-ber v1.5.8-0.20250403174932-29230038a667 // indirect
 	github.com/go-faster/city v1.0.1 // indirect
 	github.com/go-faster/errors v0.7.1 // indirect
 	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/goccy/go-json v0.10.5 // indirect
+	github.com/goccy/go-json v0.10.6 // indirect
 	github.com/goccy/go-yaml v1.19.2 // indirect
 	github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
 	github.com/golang-sql/sqlexp v0.1.0 // indirect
@@ -96,19 +96,20 @@ require (
 	github.com/klauspost/cpuid/v2 v2.3.0 // indirect
 	github.com/kr/fs v0.1.0 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/meguminnnnnnnnn/go-openai v0.1.1 // indirect
+	github.com/mailru/easyjson v0.9.2 // indirect
+	github.com/mattn/go-isatty v0.0.21 // indirect
+	github.com/meguminnnnnnnnn/go-openai v0.1.2 // indirect
 	github.com/moby/docker-image-spec v1.3.1 // indirect
 	github.com/moby/sys/atomicwriter v0.1.0 // indirect
 	github.com/moby/term v0.5.2 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/ncruces/go-strftime v0.1.9 // indirect
+	github.com/morikuni/aec v1.1.0 // indirect
+	github.com/ncruces/go-strftime v1.0.0 // indirect
 	github.com/nikolalohinski/gonja v1.5.3 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/paulmach/orb v0.11.1 // indirect
-	github.com/pelletier/go-toml/v2 v2.2.4 // indirect
+	github.com/pelletier/go-toml/v2 v2.3.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/quic-go/qpack v0.6.0 // indirect
@@ -116,13 +117,13 @@ require (
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
 	github.com/segmentio/asm v1.2.0 // indirect
 	github.com/shopspring/decimal v1.4.0 // indirect
-	github.com/sirupsen/logrus v1.9.3 // indirect
+	github.com/sirupsen/logrus v1.9.4 // indirect
 	github.com/slongfield/pyfmt v0.0.0-20220222012616-ea85ff4c361f // indirect
 	github.com/tidwall/match v1.2.0 // indirect
 	github.com/tidwall/pretty v1.2.1 // indirect
 	github.com/tjfoc/gmsm v1.4.1 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
-	github.com/twmb/franz-go/pkg/kmsg v1.12.0 // indirect
+	github.com/twmb/franz-go/pkg/kmsg v1.13.1 // indirect
 	github.com/ugorji/go/codec v1.3.1 // indirect
 	github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
 	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
@@ -131,22 +132,22 @@ require (
 	github.com/yargevad/filepathx v1.0.0 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
 	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
-	go.opentelemetry.io/otel v1.38.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.37.0 // indirect
-	go.opentelemetry.io/otel/metric v1.38.0 // indirect
-	go.opentelemetry.io/otel/trace v1.38.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.68.0 // indirect
+	go.opentelemetry.io/otel v1.43.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.43.0 // indirect
+	go.opentelemetry.io/otel/metric v1.43.0 // indirect
+	go.opentelemetry.io/otel/trace v1.43.0 // indirect
 	go.uber.org/atomic v1.11.0 // indirect
-	golang.org/x/arch v0.22.0 // indirect
-	golang.org/x/exp v0.0.0-20251002181428-27f1f14c8bb9 // indirect
-	golang.org/x/image v0.31.0 // indirect
-	golang.org/x/net v0.51.0 // indirect
-	golang.org/x/sys v0.42.0 // indirect
-	google.golang.org/protobuf v1.36.10 // indirect
-	modernc.org/libc v1.66.10 // indirect
+	golang.org/x/arch v0.25.0 // indirect
+	golang.org/x/exp v0.0.0-20260312153236-7ab1446f8b90 // indirect
+	golang.org/x/image v0.39.0 // indirect
+	golang.org/x/net v0.53.0 // indirect
+	golang.org/x/sys v0.43.0 // indirect
+	google.golang.org/protobuf v1.36.11 // indirect
+	modernc.org/libc v1.71.0 // indirect
 	modernc.org/mathutil v1.7.1 // indirect
 	modernc.org/memory v1.11.0 // indirect
-	modernc.org/sqlite v1.39.0 // indirect
+	modernc.org/sqlite v1.48.2 // indirect
 )
 
 replace google.golang.org/genproto => google.golang.org/genproto v0.0.0-20250603155806-513f23925822
diff --git a/server/internal/ai/agent/agent.go b/server/internal/ai/agent/agent.go
index 534f8c29..32292984 100644
--- a/server/internal/ai/agent/agent.go
+++ b/server/internal/ai/agent/agent.go
@@ -2,119 +2,251 @@ package agent
 
 import (
 	"context"
+	"errors"
+	"io"
+	"mayfly-go/internal/ai/agent/middleware"
+	"mayfly-go/internal/ai/session"
+	"mayfly-go/internal/ai/tools"
+	"mayfly-go/pkg/contextx"
 	"mayfly-go/pkg/logx"
+	"mayfly-go/pkg/utils/collx"
+	"mayfly-go/pkg/utils/stringx"
+	"slices"
 
 	"github.com/cloudwego/eino/adk"
 	"github.com/cloudwego/eino/adk/prebuilt/deep"
-	"github.com/cloudwego/eino/components/tool"
+	"github.com/cloudwego/eino/components/model"
 	"github.com/cloudwego/eino/compose"
 	"github.com/cloudwego/eino/schema"
 )
 
-// newOpsExpertAgent 创建一个新的运维专家Agent
-func newOpsExpertAgent(ctx context.Context, tools ...tool.BaseTool) (adk.Agent, error) {
-	toolableChatModel, err := GetChatModel(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	return adk.NewChatModelAgent(ctx, &adk.ChatModelAgentConfig{
-		Name:        "OpsExpertAgent",
-		Description: "an agent for ops expert task",
-		Model:       toolableChatModel,
-		ToolsConfig: adk.ToolsConfig{
-			ToolsNodeConfig: compose.ToolsNodeConfig{
-				Tools: tools,
-			},
-		},
-	})
+// GetDefaultAgent 获取默认agent
+func GetDefaultAgent(ctx context.Context, opts ...option) (*Agent, error) {
+	return NewDeepAgent(ctx, opts...)
 }
 
-// GetOpsExpertAgent 获取运维专家agent
-func GetOpsExpertAgent(ctx context.Context, toolTypes ...ToolType) (*AiAgent, error) {
-	tools := make([]tool.BaseTool, 0)
-	for _, toolType := range toolTypes {
-		if t, exists := GetTools(toolType); exists {
-			tools = append(tools, t...)
+const (
+	DefaultAgentId = "main"
+)
+
+func NewAgent(ctx context.Context, opts ...option) (*Agent, error) {
+	return newAgent(ctx, func(ctx context.Context, a *Agent) (adk.Agent, error) {
+		return adk.NewChatModelAgent(ctx, &adk.ChatModelAgentConfig{
+			Name:          a.name,
+			Description:   a.description,
+			Model:         a.chatModel,
+			MaxIterations: a.maxStep,
+			ToolsConfig: adk.ToolsConfig{
+				ToolsNodeConfig: compose.ToolsNodeConfig{
+					Tools: a.tools.GetAll(),
+				},
+			},
+			Handlers: a.middlewares,
+		})
+	}, opts...)
+}
+
+func NewDeepAgent(ctx context.Context, opts ...option) (*Agent, error) {
+	return newAgent(ctx, func(ctx context.Context, cfg *Agent) (adk.Agent, error) {
+		return deep.New(ctx, &deep.Config{
+			Name:        cfg.name,
+			Description: cfg.description,
+			ChatModel:   cfg.chatModel,
+			ToolsConfig: adk.ToolsConfig{
+				ToolsNodeConfig: compose.ToolsNodeConfig{
+					Tools: cfg.tools.GetAll(),
+				},
+			},
+			MaxIteration: cfg.maxStep,
+			Handlers:     cfg.middlewares,
+		})
+	}, opts...)
+}
+
+func newAgent(ctx context.Context, factory agentFactory, opts ...option) (*Agent, error) {
+	agent := &Agent{
+		id:          DefaultAgentId,
+		name:        "OpsExpert",
+		description: "an agent for general task",
+		maxStep:     20,
+		tools:       tools.DefaultRegistry,
+		middlewares: []adk.ChatModelAgentMiddleware{
+			&middleware.ApprovalMiddleware{},
+			&middleware.SafeToolMiddleware{},
+		},
+	}
+
+	for _, opt := range opts {
+		opt(agent)
+	}
+
+	if agent.chatModel == nil {
+		chatModel, err := GetChatModel(ctx)
+		if err != nil {
+			return nil, err
+		}
+		agent.chatModel = chatModel
+	}
+
+	if agent.contextManager == nil {
+		if ctxManager, err := GetDefaultContextManager(); err != nil {
+			return nil, err
+		} else {
+			agent.contextManager = ctxManager
 		}
 	}
 
-	agent, err := newOpsExpertAgent(ctx, tools...)
+	adkAgent, err := factory(ctx, agent)
 	if err != nil {
 		return nil, err
 	}
-	return &AiAgent{
-		Agent: agent,
-	}, nil
+	agent.agent = adkAgent
+	return agent, nil
 }
 
-type AiAgent struct {
-	adk.Agent
+// agentFactory 定义创建 adk.Agent 的回调函数签名
+type agentFactory func(ctx context.Context, cfg *Agent) (adk.Agent, error)
+
+type Agent struct {
+	agent     adk.Agent
+	chatModel model.ToolCallingChatModel // agent使用的chat model
+
+	id          string
+	name        string // agent名称
+	description string // agent描述
+	maxStep     int    // agent最大执行步数，防止死循环
+
+	tools          *tools.Registry                // 可调用的工具注册中心
+	middlewares    []adk.ChatModelAgentMiddleware // 中间件
+	contextManager *ContextManager                // 上下文管理器
 }
 
-// Run 运行，并返回最终结果
-func (aiAgent *AiAgent) Run(ctx context.Context, sysPrompt string, question string) (string, error) {
+// Run 运行agent
+func (a *Agent) Run(ctx context.Context, messages []adk.Message, runOpts ...runOption) (string, error) {
+	ctx = contextx.WithTraceId(ctx)
+
+	runOptions := &runOptions{}
+	for _, opt := range runOpts {
+		opt(runOptions)
+	}
+	if runOptions.sessionKey != "" {
+		ctx = session.WithSessionKey(ctx, runOptions.sessionKey)
+	}
+
 	runner := adk.NewRunner(ctx, adk.RunnerConfig{
 		EnableStreaming: true,
-		Agent:           aiAgent.Agent,
+		Agent:           a.agent,
 		CheckPointStore: NewInMemoryStore(),
 	})
 
-	deep.New(ctx, &deep.Config{})
+	contextMessages, err := a.contextManager.BuildMessages(ctx)
+	if err != nil {
+		logx.InfoContext(ctx, err.Error())
+		contextMessages = []adk.Message{}
+	}
 
-	iter := runner.Run(ctx, []adk.Message{
-		{
-			Role:    schema.System,
-			Content: sysPrompt,
-		},
-		{
-			Role:    schema.User,
-			Content: question,
-		},
-	})
-
-	var lastMessage adk.Message
+	adkRunOptions := runOptions.adkRunOptions
+	adkRunOptions = append(adkRunOptions,
+		adk.WithCallbacks(logCallback),
+		adk.WithCheckPointID(session.GetSessionKey(ctx)))
+	iter := runner.Run(ctx, slices.Concat(contextMessages, messages), adkRunOptions...)
+	var outputMessages []adk.Message
+	messageId := stringx.RandUUID()
 	for {
 		event, ok := iter.Next()
 		if !ok {
 			break
 		}
 
-		err := event.Err
+		err = event.Err
 		if err != nil {
-			logx.Error(err.Error())
-			return "", err
+			break
 		}
 
-		if lastMessage, _, err = adk.GetMessage(event); err != nil {
-			return "", err
+		var msg adk.Message
+		sr := event.Output.MessageOutput.MessageStream
+		if sr != nil {
+			// 使用匿名函数或直接在处理完后关闭
+			func() {
+				defer sr.Close()
+				var chunkMessages []adk.Message
+				for {
+					chunk, err := sr.Recv()
+					if errors.Is(err, io.EOF) {
+						break
+					}
+					if err != nil {
+						logx.Warnf("stream recv error: %v", err)
+						break
+					}
+					chunkMessages = append(chunkMessages, chunk)
+					if err := runOptions.CallOnChunk(ctx, chunk); err != nil {
+						logx.Warnf("onStreaming callback error: %v", err)
+						break
+					}
+				}
+				if len(chunkMessages) > 0 {
+					if message, err := schema.ConcatMessages(chunkMessages); err != nil {
+						logx.Warnf("concat streamed messages error: %v", err)
+					} else {
+						msg = message
+					}
+				}
+			}()
+		} else {
+			msg = event.Output.MessageOutput.Message
+		}
+		if msg == nil {
+			break
 		}
 
-		LogEvent(event)
+		if msg.ToolCallID != "" {
+			if _, ok := adk.GetSessionValue(ctx, msg.ToolCallID); ok {
+				m := collx.M(msg.Extra)
+				msg.Extra = *m.Set("toolStatus", "error")
+			}
+		}
+		SetMessageId(msg, messageId)
+		outputMessages = append(outputMessages, msg)
+		if err := runOptions.CallOnEvent(ctx, event, msg); err != nil {
+			logx.Warnf("onEvent callback error: %v", err)
+			break
+		}
+
+		LogEventAndMsg(ctx, event, msg)
 	}
 
-	if lastMessage != nil {
-		return lastMessage.Content, nil
-	}
-
-	return "finished without output message", nil
-}
-
-func NewDeepAgent(ctx context.Context, tools ...tool.BaseTool) (adk.Agent, error) {
-	toolableChatModel, err := GetChatModel(ctx)
 	if err != nil {
-		return nil, err
+		if toolErr, ok := errors.AsType[*tools.ToolError](err); ok {
+			// 工具调用失败，并且没有重试，则记录对应错误消息
+			toolErrMsg := &schema.Message{
+				Role:       schema.Tool,
+				Content:    tools.GetToolErrorMsg(err),
+				ToolCallID: toolErr.ToolCallId,
+				ToolName:   toolErr.ToolName,
+			}
+			errMsg := &schema.Message{
+				Role:    schema.Assistant,
+				Content: err.Error(),
+			}
+			SetMessageId(toolErrMsg, messageId)
+			SetMessageId(errMsg, messageId)
+			runOptions.CallOnEvent(ctx, nil, toolErrMsg)
+
+			outputMessages = append(outputMessages, toolErrMsg, errMsg)
+		} else {
+			logx.ErrorContext(ctx, err.Error())
+			return "", err
+		}
 	}
-	return deep.New(ctx, &deep.Config{
-		Name:        "OpsExpertAgent",
-		Description: "an agent for ops expert task",
-		ChatModel:   toolableChatModel,
-		// SubAgents:   []adk.Agent{ca, wa},
-		ToolsConfig: adk.ToolsConfig{
-			ToolsNodeConfig: compose.ToolsNodeConfig{
-				Tools: tools,
-			},
-		},
-		MaxIteration: 100,
-	})
+
+	if len(outputMessages) > 0 {
+		// 追加输出消息到上下文中，构造要保存的消息列表：先存用户消息，再存AI回复，保持对话顺序
+		if err := a.contextManager.AppendMsgs(ctx, slices.Concat(messages, outputMessages)...); err != nil {
+			logx.ErrorfContext(ctx, "agent append message error: %v", err)
+		}
+		return outputMessages[len(outputMessages)-1].Content, err
+	}
+
+	return "finished without output message", err
 }
diff --git a/server/internal/ai/agent/callback.go b/server/internal/ai/agent/callback.go
new file mode 100644
index 00000000..5572349a
--- /dev/null
+++ b/server/internal/ai/agent/callback.go
@@ -0,0 +1,16 @@
+package agent
+
+import (
+	"context"
+
+	"github.com/cloudwego/eino/callbacks"
+	"github.com/cloudwego/eino/components/model"
+	template "github.com/cloudwego/eino/utils/callbacks"
+)
+
+var logCallback = template.NewHandlerHelper().ChatModel(&template.ModelCallbackHandler{
+	OnStart: func(ctx context.Context, info *callbacks.RunInfo, input *model.CallbackInput) context.Context {
+		// logx.DebugfContext(ctx, "ChatModel %s started with input: %v\n", info.Name, input)
+		return ctx
+	},
+}).Handler()
diff --git a/server/internal/ai/agent/context.go b/server/internal/ai/agent/context.go
new file mode 100644
index 00000000..be3aa243
--- /dev/null
+++ b/server/internal/ai/agent/context.go
@@ -0,0 +1,66 @@
+package agent
+
+import (
+	"context"
+	"errors"
+	"mayfly-go/internal/ai/memory"
+	"mayfly-go/internal/ai/session"
+
+	"github.com/cloudwego/eino/adk"
+)
+
+var (
+	// DefaultSessionStore 默认会话存储
+	DefaultSessionStore session.Store
+)
+
+// GetDefaultContextManager 获取默认的上下文管理器实例
+func GetDefaultContextManager() (*ContextManager, error) {
+	if DefaultSessionStore != nil {
+		return NewContextManager(session.NewManager(DefaultSessionStore)), nil
+	}
+
+	sessionStore, err := session.NewStoreJSONL("./sessions")
+	if err != nil {
+		return nil, err
+	}
+	DefaultSessionStore = sessionStore
+	return NewContextManager(session.NewManager(sessionStore)), nil
+}
+
+type ContextManager struct {
+	sessionManager *session.Manager // 会话管理器
+	memoryManager  *memory.Manager  // 记忆管理器
+}
+
+// NewContextManager 创建并初始化 ContextManager 实例
+func NewContextManager(sm *session.Manager) *ContextManager {
+	return &ContextManager{
+		sessionManager: sm,
+	}
+}
+
+func (c *ContextManager) GetSessionKey(ctx context.Context) string {
+	return session.GetSessionKey(ctx)
+}
+
+// BuildMessages 从上下文中构建消息列表，供Agent执行使用
+func (c *ContextManager) BuildMessages(ctx context.Context) ([]adk.Message, error) {
+	sessionKey := c.GetSessionKey(ctx)
+	if sessionKey == "" {
+		return nil, errors.New("session key is empty")
+	}
+	history, err := c.sessionManager.GetHistory(ctx, sessionKey)
+	if err != nil {
+		return nil, err
+	}
+	return history, nil
+}
+
+func (c *ContextManager) AppendMsgs(ctx context.Context, msgs ...adk.Message) error {
+	return c.sessionManager.AppendMsgs(ctx, c.GetSessionKey(ctx), msgs...)
+}
+
+func (c *ContextManager) ClearHistory(ctx context.Context) error {
+	return c.sessionManager.ClearHistory(ctx, c.GetSessionKey(ctx))
+}
diff --git a/server/internal/ai/agent/log.go b/server/internal/ai/agent/log.go
new file mode 100644
index 00000000..0739f76a
--- /dev/null
+++ b/server/internal/ai/agent/log.go
@@ -0,0 +1,71 @@
+package agent
+
+import (
+	"context"
+	"fmt"
+	"mayfly-go/pkg/logx"
+	"mayfly-go/pkg/utils/stringx"
+	"strings"
+
+	"github.com/cloudwego/eino/adk"
+	"github.com/cloudwego/eino/schema"
+)
+
+func LogEventAndMsg(ctx context.Context, event *adk.AgentEvent, msg adk.Message) {
+	agentTag := fmt.Sprintf("Agent - [%s|%s]", event.AgentName, event.RunPath)
+
+	// 定义统一的消息内容
+	var eventMsg strings.Builder
+
+	// 思考内容
+	if msg.ReasoningContent != "" {
+		eventMsg.WriteString(fmt.Sprintf("[THINK] %s\n", msg.ReasoningContent))
+	}
+
+	// 消息内容
+	if len(msg.Content) > 0 {
+		if msg.Role == schema.Tool {
+			eventMsg.WriteString(fmt.Sprintf("[TOOL-RESP] %s: %s\n", msg.ToolName, stringx.Truncate(msg.Content, 500, 300, "...")))
+		} else {
+			eventMsg.WriteString(fmt.Sprintf("[ANSWER] %s\n", stringx.Truncate(msg.Content, 500, 300, "...")))
+		}
+	}
+
+	// 工具调用
+	if len(msg.ToolCalls) > 0 {
+		for _, tc := range msg.ToolCalls {
+			eventMsg.WriteString(fmt.Sprintf("[TOOL-CALL] %s(%s)\n", tc.Function.Name, stringx.Truncate(tc.Function.Arguments, 500, 300, "...")))
+		}
+	}
+
+	// 动作信息
+	if event.Action != nil {
+		if event.Action.TransferToAgent != nil {
+			eventMsg.WriteString(fmt.Sprintf("[TRANSFER] %s\n", event.Action.TransferToAgent.DestAgentName))
+		}
+		if event.Action.Interrupted != nil {
+			for _, ic := range event.Action.Interrupted.InterruptContexts {
+				if str, ok := ic.Info.(fmt.Stringer); ok {
+					eventMsg.WriteString(fmt.Sprintf("[INTERRUPT] %s\n", str.String()))
+				} else {
+					eventMsg.WriteString(fmt.Sprintf("[INTERRUPT] %v\n", ic.Info))
+				}
+			}
+		}
+		if event.Action.Exit {
+			eventMsg.WriteString("[DONE]\n")
+		}
+	}
+
+	// 错误信息
+	if event.Err != nil {
+		eventMsg.WriteString(fmt.Sprintf("[ERROR] %v\n", event.Err))
+	}
+
+	// 统一输出日志
+	finalMsg := eventMsg.String()
+	if finalMsg != "" {
+		logx.InfofContext(ctx, "%s\n%s", agentTag, finalMsg)
+	}
+	// return msg, nil
+}
diff --git a/server/internal/ai/agent/middleware/approval.go b/server/internal/ai/agent/middleware/approval.go
new file mode 100644
index 00000000..44e2a0ba
--- /dev/null
+++ b/server/internal/ai/agent/middleware/approval.go
@@ -0,0 +1,95 @@
+package middleware
+
+import (
+	"context"
+	"fmt"
+	"mayfly-go/internal/ai/tools"
+
+	"github.com/cloudwego/eino/adk"
+	"github.com/cloudwego/eino/components/tool"
+	"github.com/cloudwego/eino/schema"
+)
+
+type ApprovalMiddleware struct {
+	*adk.BaseChatModelAgentMiddleware
+}
+
+func (m *ApprovalMiddleware) WrapInvokableToolCall(
+	_ context.Context,
+	endpoint adk.InvokableToolCallEndpoint,
+	tCtx *adk.ToolContext,
+) (adk.InvokableToolCallEndpoint, error) {
+	// 只拦截需要审批的 Tool
+	if tCtx.Name != "execute" {
+		return endpoint, nil
+	}
+
+	return func(ctx context.Context, args string, opts ...tool.Option) (string, error) {
+		wasInterrupted, _, storedArgs := tool.GetInterruptState[string](ctx)
+
+		if !wasInterrupted {
+			return "", tool.StatefulInterrupt(ctx, &tools.ApprovalInfo{
+				ToolName:        tCtx.Name,
+				ArgumentsInJSON: args,
+			}, args)
+		}
+
+		isTarget, hasData, data := tool.GetResumeContext[*tools.ApprovalResult](ctx)
+		if isTarget && hasData {
+			if data.Approved {
+				return endpoint(ctx, storedArgs, opts...)
+			}
+			if data.DisapproveReason != nil {
+				return fmt.Sprintf("tool '%s' disapproved: %s", tCtx.Name, *data.DisapproveReason), nil
+			}
+			return fmt.Sprintf("tool '%s' disapproved", tCtx.Name), nil
+		}
+
+		// 重新中断
+		return "", tool.StatefulInterrupt(ctx, &tools.ApprovalInfo{
+			ToolName:        tCtx.Name,
+			ArgumentsInJSON: storedArgs,
+		}, storedArgs)
+	}, nil
+}
+
+func (m *ApprovalMiddleware) WrapStreamableToolCall(
+	_ context.Context,
+	endpoint adk.StreamableToolCallEndpoint,
+	tCtx *adk.ToolContext,
+) (adk.StreamableToolCallEndpoint, error) {
+	// 如果 agent 配置了 StreamingShell，则 execute 会走流式调用，需要实现该方法才能拦截到
+	if tCtx.Name != "execute" {
+		return endpoint, nil
+	}
+	return func(ctx context.Context, args string, opts ...tool.Option) (*schema.StreamReader[string], error) {
+		wasInterrupted, _, storedArgs := tool.GetInterruptState[string](ctx)
+		if !wasInterrupted {
+			return nil, tool.StatefulInterrupt(ctx, &tools.ApprovalInfo{
+				ToolName:        tCtx.Name,
+				ArgumentsInJSON: args,
+			}, args)
+		}
+
+		isTarget, hasData, data := tool.GetResumeContext[*tools.ApprovalResult](ctx)
+		if isTarget && hasData {
+			if data.Approved {
+				return endpoint(ctx, storedArgs, opts...)
+			}
+			if data.DisapproveReason != nil {
+				return singleChunkReader(fmt.Sprintf("tool '%s' disapproved: %s", tCtx.Name, *data.DisapproveReason)), nil
+			}
+			return singleChunkReader(fmt.Sprintf("tool '%s' disapproved", tCtx.Name)), nil
+		}
+
+		isTarget, _, _ = tool.GetResumeContext[any](ctx)
+		if !isTarget {
+			return nil, tool.StatefulInterrupt(ctx, &tools.ApprovalInfo{
+				ToolName:        tCtx.Name,
+				ArgumentsInJSON: storedArgs,
+			}, storedArgs)
+		}
+
+		return endpoint(ctx, storedArgs, opts...)
+	}, nil
+}
diff --git a/server/internal/ai/agent/middleware/safetool.go b/server/internal/ai/agent/middleware/safetool.go
new file mode 100644
index 00000000..f99be33f
--- /dev/null
+++ b/server/internal/ai/agent/middleware/safetool.go
@@ -0,0 +1,69 @@
+package middleware
+
+import (
+	"context"
+	"errors"
+	"mayfly-go/internal/ai/tools"
+
+	"github.com/cloudwego/eino/adk"
+	"github.com/cloudwego/eino/components/tool"
+	"github.com/cloudwego/eino/compose"
+	"github.com/cloudwego/eino/schema"
+)
+
+type SafeToolMiddleware struct {
+	*adk.BaseChatModelAgentMiddleware
+}
+
+func (m *SafeToolMiddleware) WrapInvokableToolCall(
+	ctx context.Context,
+	endpoint adk.InvokableToolCallEndpoint,
+	tc *adk.ToolContext,
+) (adk.InvokableToolCallEndpoint, error) {
+	return func(ctx context.Context, args string, opts ...tool.Option) (string, error) {
+		result, err := endpoint(ctx, args, opts...)
+		if err == nil {
+			return result, nil
+		}
+
+		// 中断错误不转换，需要继续传播
+		if _, ok := compose.IsInterruptRerunError(err); ok {
+			return "", err
+		}
+
+		if toolErr, ok := errors.AsType[*tools.ToolError](err); ok {
+			// 支持重试策略，将其转换为错误字符串
+			if toolErr.Strategy == tools.RecoverRetry {
+				return tools.GetToolErrorMsg(err), nil
+			}
+		}
+
+		return "", tools.NewToolError(err, tools.RecoverNone).WithToolName(tc.Name).WithToolCallId(tc.CallID)
+	}, nil
+}
+
+func (m *SafeToolMiddleware) WrapStreamableToolCall(
+	_ context.Context,
+	endpoint adk.StreamableToolCallEndpoint,
+	tc *adk.ToolContext,
+) (adk.StreamableToolCallEndpoint, error) {
+	return func(ctx context.Context, args string, opts ...tool.Option) (*schema.StreamReader[string], error) {
+		sr, err := endpoint(ctx, args, opts...)
+		if err == nil {
+			return safeWrapReader(sr), nil
+		}
+
+		if _, ok := compose.IsInterruptRerunError(err); ok {
+			return nil, err
+		}
+
+		if toolErr, ok := errors.AsType[*tools.ToolError](err); ok {
+			// 支持重试策略，将其转换为错误字符串
+			if toolErr.Strategy == tools.RecoverRetry {
+				return singleChunkReader(tools.GetToolErrorMsg(err)), nil
+			}
+		}
+
+		return nil, tools.NewToolError(err, tools.RecoverNone).WithToolName(tc.Name).WithToolCallId(tc.CallID)
+	}, nil
+}
diff --git a/server/internal/ai/agent/middleware/utils.go b/server/internal/ai/agent/middleware/utils.go
new file mode 100644
index 00000000..4ca13988
--- /dev/null
+++ b/server/internal/ai/agent/middleware/utils.go
@@ -0,0 +1,35 @@
+package middleware
+
+import (
+	"errors"
+	"fmt"
+	"io"
+
+	"github.com/cloudwego/eino/schema"
+)
+
+func singleChunkReader(msg string) *schema.StreamReader[string] {
+	r, w := schema.Pipe[string](1)
+	_ = w.Send(msg, nil)
+	w.Close()
+	return r
+}
+
+func safeWrapReader(sr *schema.StreamReader[string]) *schema.StreamReader[string] {
+	r, w := schema.Pipe[string](64)
+	go func() {
+		defer w.Close()
+		for {
+			chunk, err := sr.Recv()
+			if errors.Is(err, io.EOF) {
+				return
+			}
+			if err != nil {
+				_ = w.Send(fmt.Sprintf("\n[tool error] %v", err), nil)
+				return
+			}
+			_ = w.Send(chunk, nil)
+		}
+	}()
+	return r
+}
diff --git a/server/internal/ai/agent/msg_extra.go b/server/internal/ai/agent/msg_extra.go
new file mode 100644
index 00000000..30a0144a
--- /dev/null
+++ b/server/internal/ai/agent/msg_extra.go
@@ -0,0 +1,18 @@
+package agent
+
+import (
+	"mayfly-go/pkg/utils/collx"
+
+	"github.com/cloudwego/eino/adk"
+)
+
+// GetMessageId 获取消息id
+func GetMessageId(msg adk.Message) string {
+	return collx.M(msg.Extra).GetStr("messageId")
+}
+
+// SetMessageId 设置消息id
+func SetMessageId(msg adk.Message, messageId string) {
+	m := collx.M(msg.Extra)
+	msg.Extra = *m.Set("messageId", messageId)
+}
diff --git a/server/internal/ai/agent/option.go b/server/internal/ai/agent/option.go
new file mode 100644
index 00000000..79976ca0
--- /dev/null
+++ b/server/internal/ai/agent/option.go
@@ -0,0 +1,135 @@
+package agent
+
+import (
+	"context"
+	"mayfly-go/internal/ai/tools"
+
+	"github.com/cloudwego/eino/adk"
+)
+
+// option 定义了Agent的配置选项
+type option func(*Agent)
+
+func WithId(id string) option {
+	return func(agent *Agent) {
+		agent.id = id
+	}
+}
+
+func WithName(name string) option {
+	return func(agent *Agent) {
+		agent.name = name
+	}
+}
+
+func WithDescription(description string) option {
+	return func(agent *Agent) {
+		agent.description = description
+	}
+}
+
+func WithTools(tools *tools.Registry) option {
+	return func(agent *Agent) {
+		agent.tools = tools
+	}
+}
+
+func WithMiddlewares(middlewares ...adk.ChatModelAgentMiddleware) option {
+	return func(agent *Agent) {
+		agent.middlewares = middlewares
+	}
+}
+
+func WithContextManager(contextManager *ContextManager) option {
+	return func(agent *Agent) {
+		agent.contextManager = contextManager
+	}
+}
+
+func WithMaxStep(maxStep int) option {
+	return func(agent *Agent) {
+		agent.maxStep = maxStep
+	}
+}
+
+// runOption 定义了Agent执行时的配置选项
+
+type runOption func(*runOptions)
+
+type runOptions struct {
+	adkRunOptions []adk.AgentRunOption
+	sessionKey    string
+	userId        string
+
+	// onChunk 流式内容块回调函数
+	// 当 Agent 产生增量输出（如 LLM 生成的每一个 Token 或片段）时触发。
+	// 适用于实现前端“打字机”效果，实时展示 AI 的思考或回复内容。
+	// 参数 adk.Message 包含当前增量的 Content, ReasoningContent 或 ToolCalls 等信息。
+	onChunk func(context.Context, adk.Message) error // 流式输出回调函数
+
+	// onEvent 完整事件回调函数
+	// 当 Agent 运行过程中产生完整的事件节点（如工具调用开始/结束、LLM 完整响应生成完毕等）时触发。
+	// 参数 *adk.AgentEvent 事件信息；adk.Message 为该事件对应的完整消息对象。
+	onEvent func(context.Context, *adk.AgentEvent, adk.Message) error
+}
+
+// CallOnChunk 增量消息回调
+func (ro *runOptions) CallOnChunk(ctx context.Context, chunk adk.Message) error {
+	if ro.onChunk != nil {
+		return ro.onChunk(ctx, chunk)
+	}
+	return nil
+}
+
+// CallOnEvent 事件回调
+func (ro *runOptions) CallOnEvent(ctx context.Context, event *adk.AgentEvent, msg adk.Message) error {
+	if ro.onEvent != nil {
+		return ro.onEvent(ctx, event, msg)
+	}
+	return nil
+}
+
+func WithRunAdkOptions(options ...adk.AgentRunOption) runOption {
+	return func(opts *runOptions) {
+		opts.adkRunOptions = options
+	}
+}
+
+func WithRunSessionKey(sessionKey string) runOption {
+	return func(opts *runOptions) {
+		opts.sessionKey = sessionKey
+	}
+}
+
+func WithRunUserId(userId string) runOption {
+	return func(opts *runOptions) {
+		opts.userId = userId
+	}
+}
+
+// WithOnChunk 设置流式增量回调
+// 该回调会在 Agent 产生每一个微小的输出片段（如 LLM 生成的单个 Token）时触发。
+// 典型应用场景：
+// 1. 前端实现“打字机”效果，实时逐字显示 AI 回复。
+// 2. 实时展示 AI 的思考过程（ReasoningContent）。
+// 注意：由于触发频率极高，回调函数内部应避免执行耗时操作，以免阻塞 Agent 运行。
+func WithOnChunk(onChunk func(context.Context, adk.Message) error) runOption {
+	return func(opts *runOptions) {
+		opts.onChunk = onChunk
+	}
+}
+
+// WithOnEvent 设置完整事件节点回调
+// 该回调会在 Agent 完成一个完整的逻辑节点（如一次完整的工具调用、一轮完整的 LLM 推理结束）时触发。
+// 典型应用场景：
+// 1. 记录详细的执行日志或审计轨迹。
+// 2. 前端展示复杂的交互状态（如：“正在搜索知识库...”、“已调用天气接口”）。
+// 3. 监控 Agent 的运行步骤和决策路径。
+// 参数说明：
+//   - event: 事件信息
+//   - msg: 该事件产生的完整消息对象（而非增量片段）。
+func WithOnEvent(onEvent func(context.Context, *adk.AgentEvent, adk.Message) error) runOption {
+	return func(opts *runOptions) {
+		opts.onEvent = onEvent
+	}
+}
diff --git a/server/internal/ai/agent/print.go b/server/internal/ai/agent/print.go
deleted file mode 100644
index 81972bc4..00000000
--- a/server/internal/ai/agent/print.go
+++ /dev/null
@@ -1,67 +0,0 @@
-package agent
-
-import (
-	"fmt"
-	"mayfly-go/pkg/logx"
-
-	"github.com/cloudwego/eino/adk"
-	"github.com/cloudwego/eino/schema"
-)
-
-func LogEvent(event *adk.AgentEvent) {
-	agentTag := fmt.Sprintf("Agent - [%s|%s]", event.AgentName, event.RunPath)
-
-	msg, _, err := adk.GetMessage(event)
-	if err != nil {
-		logx.Debugf("%s error: get msg error: %v", agentTag, err)
-		return
-	}
-
-	// 消息内容
-	if len(msg.Content) > 0 {
-		content := msg.Content
-		if len(content) > 500 {
-			content = content[:500] + "..."
-		}
-		if msg.Role == schema.Tool {
-			logx.Infof("%s tool[%s] response: %s", agentTag, msg.ToolName, content)
-		} else {
-			logx.Infof("%s answer: %s", agentTag, content)
-		}
-	}
-
-	// 工具调用
-	if len(msg.ToolCalls) > 0 {
-		for _, tc := range msg.ToolCalls {
-			args := tc.Function.Arguments
-			if len(args) > 300 {
-				args = args[:300] + "..."
-			}
-			logx.Infof("%s call %s(%s)", agentTag, tc.Function.Name, args)
-		}
-	}
-
-	// 动作
-	if event.Action != nil {
-		if event.Action.TransferToAgent != nil {
-			logx.Debugf("%s ->  transfer: %s", agentTag, event.Action.TransferToAgent.DestAgentName)
-		}
-		if event.Action.Interrupted != nil {
-			for _, ic := range event.Action.Interrupted.InterruptContexts {
-				if str, ok := ic.Info.(fmt.Stringer); ok {
-					logx.Infof("%s ⏸  %s", agentTag, str.String())
-				} else {
-					logx.Infof("%s ⏸  %v", agentTag, ic.Info)
-				}
-			}
-		}
-		if event.Action.Exit {
-			logx.Infof("%s done", agentTag)
-		}
-	}
-
-	// 错误
-	if event.Err != nil {
-		logx.Errorf("%s error: %v", agentTag, event.Err)
-	}
-}
diff --git a/server/internal/ai/agent/tools.go b/server/internal/ai/agent/tools.go
deleted file mode 100644
index c510c135..00000000
--- a/server/internal/ai/agent/tools.go
+++ /dev/null
@@ -1,61 +0,0 @@
-package agent
-
-import "github.com/cloudwego/eino/components/tool"
-
-type ToolType string
-
-const (
-	ToolTypeDb   ToolType = "db"
-	ToolTypeFlow ToolType = "flow"
-)
-
-// toolRegistry 工具注册中心，一个ToolType对应多个工具
-var toolRegistry = make(map[ToolType][]tool.BaseTool)
-
-// RegisterTool 注册agent工具
-func RegisterTool(toolType ToolType, tool ...tool.BaseTool) {
-	toolRegistry[toolType] = append(toolRegistry[toolType], tool...)
-}
-
-// GetTools 获取指定类型的所有工具
-func GetTools(toolType ToolType) ([]tool.BaseTool, bool) {
-	tools, exists := toolRegistry[toolType]
-	return tools, exists
-}
-
-// GetAllTools 获取所有已注册的工具
-func GetAllTools() map[ToolType][]tool.BaseTool {
-	return toolRegistry
-}
-
-// RegisterTools 批量注册工具
-func RegisterTools(tools map[ToolType][]tool.BaseTool) {
-	for toolType, toolList := range tools {
-		toolRegistry[toolType] = append(toolRegistry[toolType], toolList...)
-	}
-}
-
-// GetToolsByTypes 获取指定类型的多个工具
-func GetToolsByTypes(types []ToolType) map[ToolType][]tool.BaseTool {
-	result := make(map[ToolType][]tool.BaseTool)
-	for _, t := range types {
-		if tools, exists := toolRegistry[t]; exists {
-			result[t] = tools
-		}
-	}
-	return result
-}
-
-// GetFirstTool 获取指定类型的第一个工具（常用场景）
-func GetFirstTool(toolType ToolType) (tool.BaseTool, bool) {
-	tools, exists := toolRegistry[toolType]
-	if !exists || len(tools) == 0 {
-		return nil, false
-	}
-	return tools[0], true
-}
-
-// ClearTools 清空指定类型的工具
-func ClearTools(toolType ToolType) {
-	delete(toolRegistry, toolType)
-}
diff --git a/server/internal/ai/agent/utils.go b/server/internal/ai/agent/utils.go
index 9dc74934..ef30ba6c 100644
--- a/server/internal/ai/agent/utils.go
+++ b/server/internal/ai/agent/utils.go
@@ -15,7 +15,7 @@ func ParseLLMJSON[T any](raw string) (*T, error) {
 
 	var lastErr error
 	for _, c := range candidates {
-		if v, err := jsonx.To[T](c); err == nil {
+		if v, err := jsonx.ToByStr[T](c); err == nil {
 			return v, nil
 		} else {
 			lastErr = err
diff --git a/server/internal/ai/agent/utils_test.go b/server/internal/ai/agent/utils_test.go
index fe19085a..2ec0c6fe 100644
--- a/server/internal/ai/agent/utils_test.go
+++ b/server/internal/ai/agent/utils_test.go
@@ -14,7 +14,7 @@ func TestParseLLMJSON(t *testing.T) {
 		hasError bool
 	}{
 		{
-			name: "Valid JSON Object",
+			name:  "Valid JSON Object",
 			input: "```json\n{\n  \"name\": \"Alice\",\n  \"age\": \"30\"\n}\n```",
 			expected: map[string]any{
 				"name": "Alice",
@@ -23,7 +23,7 @@ func TestParseLLMJSON(t *testing.T) {
 			hasError: false,
 		},
 		{
-			name: "Valid JSON Object",
+			name:  "Valid JSON Object",
 			input: "```\n{\n  \"name\": \"Alice\",\n  \"age\": \"40\"\n}\n```",
 			expected: map[string]any{
 				"name": "Alice",
@@ -32,7 +32,7 @@ func TestParseLLMJSON(t *testing.T) {
 			hasError: false,
 		},
 		{
-			name: "Valid JSON Object",
+			name:  "Valid JSON Object",
 			input: "aaabbbccc```\n{\n  \"name\": \"Alice\",\n  \"age\": \"50\"\n}\n```dddd",
 			expected: map[string]any{
 				"name": "Alice",
@@ -41,7 +41,7 @@ func TestParseLLMJSON(t *testing.T) {
 			hasError: false,
 		},
 		{
-			name: "Valid JSON Array",
+			name:  "Valid JSON Array",
 			input: "```json\n[\n  {\"id\": \"1\", \"value\": \"foo\"},\n  {\"id\": \"2\", \"value\": \"bar\"}\n]\n```",
 			expected: []map[string]any{
 				{"id": "1", "value": "foo"},
@@ -50,7 +50,7 @@ func TestParseLLMJSON(t *testing.T) {
 			hasError: false,
 		},
 		{
-			name: "Valid JSON Array",
+			name:  "Valid JSON Array",
 			input: "aaaa```json\n[\n  {\"id\": \"11\", \"value\": \"foo\"},\n  {\"id\": \"22\", \"value\": \"bar\"}\n]\n```",
 			expected: []map[string]any{
 				{"id": "11", "value": "foo"},
@@ -105,4 +105,4 @@ func TestParseLLMJSON(t *testing.T) {
 			t.Logf("%v", result)
 		})
 	}
-}
\ No newline at end of file
+}
diff --git a/server/internal/ai/api/ai.go b/server/internal/ai/api/ai.go
new file mode 100644
index 00000000..fb7e53e0
--- /dev/null
+++ b/server/internal/ai/api/ai.go
@@ -0,0 +1,163 @@
+package api
+
+import (
+	"context"
+	"mayfly-go/internal/ai/agent"
+	"mayfly-go/internal/ai/api/form"
+	"mayfly-go/internal/ai/api/vo"
+	"mayfly-go/internal/ai/application"
+	"mayfly-go/internal/ai/application/dto"
+	"mayfly-go/internal/ai/domain/entity"
+	"mayfly-go/pkg/biz"
+	"mayfly-go/pkg/logx"
+	"mayfly-go/pkg/req"
+	"mayfly-go/pkg/utils/anyx"
+	"mayfly-go/pkg/utils/collx"
+	"mayfly-go/pkg/utils/jsonx"
+	"mayfly-go/pkg/ws"
+	"time"
+
+	"github.com/cloudwego/eino/adk"
+	"github.com/cloudwego/eino/schema"
+	"github.com/gorilla/websocket"
+)
+
+// Ai API结构体，用于处理AI相关请求
+type Ai struct {
+	sessionApp application.Session `inject:"T"`
+}
+
+// ReqConfs 获取AI相关的请求配置
+func (a *Ai) ReqConfs() *req.Confs {
+	reqs := [...]*req.Conf{
+		req.NewGet("/chat", a.Chat).NoRes(),
+		req.NewGet("/chat/sessions", a.ChatSessions),
+		req.NewGet("/chat/messages", a.ChatMessages),
+		req.NewDelete("/chat/sessions/:sessionKey", a.DeleteSession),
+		req.NewPost("/chat/sessions/rename", a.RenameSessionTitle),
+	}
+
+	return req.NewConfs("/ai", reqs[:]...)
+}
+
+// ChatSessions 获取会话列表
+func (a *Ai) ChatSessions(rc *req.Ctx) {
+	sessions, err := a.sessionApp.ListSessions(rc.MetaCtx, &dto.SessionQuery{
+		UserId: rc.GetLoginAccount().Id,
+	})
+	biz.ErrIsNil(err)
+	rc.ResData = sessions
+}
+
+func (a *Ai) DeleteSession(rc *req.Ctx) {
+	a.sessionApp.DeleteMeta(rc.MetaCtx, rc.PathParam("sessionKey"))
+}
+
+func (a *Ai) RenameSessionTitle(rc *req.Ctx) {
+	rename := req.BindJson[struct {
+		SessionKey string `json:"sessionKey"  binding:"required"`
+		Title      string `json:"title"  binding:"required"`
+	}](rc)
+	biz.ErrIsNil(a.sessionApp.UpdateByCond(rc.MetaCtx, &entity.Session{Title: rename.Title}, &entity.Session{SessionKey: rename.SessionKey}))
+}
+
+// ChatMessages 获取会话消息
+func (a *Ai) ChatMessages(rc *req.Ctx) {
+	messages, err := a.sessionApp.ListSessionMessages(rc.MetaCtx, &dto.SessionMessageQuery{
+		SessionKey: rc.Query("sessionKey"),
+	})
+	biz.ErrIsNil(err)
+	rc.ResData = collx.ArrayMap(messages, func(msg *entity.SessionMessage) *vo.ChatMsg {
+		cm := &vo.ChatMsg{
+			MessageId:        msg.MessageId,
+			Content:          msg.Content,
+			ReasoningContent: msg.GetExtraString("reasoningContent"),
+			Time:             *msg.CreateTime,
+			Role:             msg.Role,
+			ToolCallId:       msg.ToolCallId,
+		}
+		if msg.ToolCalls != "" {
+			tollcalls, _ := jsonx.ToByStr[[]schema.ToolCall](msg.ToolCalls)
+			cm.ToolCalls = *tollcalls
+		}
+		return cm
+	})
+}
+
+// Chat 聊天
+func (a *Ai) Chat(rc *req.Ctx) {
+	wsConn, err := ws.Upgrader.Upgrade(rc.GetWriter(), rc.GetRequest(), nil)
+	defer func() {
+		if wsConn != nil {
+			if err := recover(); err != nil {
+				wsConn.WriteMessage(websocket.TextMessage, []byte(jsonx.ToStr(&vo.ChatMsg{Content: anyx.ToString(err), Time: time.Now()})))
+			}
+			wsConn.Close()
+		}
+	}()
+	biz.ErrIsNilAppendErr(err, "Upgrade websocket fail: %s")
+	// 权限校验
+	// rc = rc.WithRequiredPermission(req.NewPermission("ai:chat"))
+	err = req.PermissionHandler(rc)
+	biz.ErrIsNil(err)
+
+	ctx := rc.MetaCtx
+	ag, err := agent.GetDefaultAgent(ctx)
+	biz.ErrIsNilAppendErr(err, "get agent error: %s")
+	for {
+		messageType, message, err := wsConn.ReadMessage()
+		if err != nil {
+			if websocket.IsUnexpectedCloseError(err, websocket.CloseGoingAway, websocket.CloseAbnormalClosure) {
+				logx.Debugf("error: %v", err)
+			}
+			break
+		}
+
+		now := time.Now()
+		if messageType == websocket.TextMessage {
+			chatMsg, err := jsonx.To[form.ChatMsg](message)
+			biz.ErrIsNilAppendErr(err, "parse chat message error: %s")
+
+			_, err = ag.Run(ctx, collx.AsArray(schema.UserMessage(chatMsg.Content)),
+				agent.WithRunSessionKey(chatMsg.SessionId),
+				agent.WithOnChunk(func(ctx context.Context, m adk.Message) error {
+					// 工具调用，不推送前端，等完整事件处理结束后推送，不然前端没法获取完整工具调用内容
+					if len(m.ToolCalls) > 0 || m.Role == schema.Tool {
+						return nil
+					}
+					respMsg := vo.ChatMsg{
+						Type:             "chunk",
+						Time:             now,
+						Role:             string(m.Role),
+						Content:          m.Content,
+						ReasoningContent: m.ReasoningContent,
+						ToolCalls:        m.ToolCalls,
+					}
+					wsConn.WriteMessage(websocket.TextMessage, []byte(jsonx.ToStr(respMsg)))
+					return nil
+				}),
+				agent.WithOnEvent(func(ctx context.Context, ae *adk.AgentEvent, m adk.Message) error {
+					if len(m.ToolCalls) > 0 || m.Role == schema.Tool {
+						respMsg := vo.ChatMsg{
+							Type:             "tool",
+							Time:             now,
+							Role:             string(m.Role),
+							Content:          m.Content,
+							ReasoningContent: m.ReasoningContent,
+							ToolCalls:        m.ToolCalls,
+							ToolCallId:       m.ToolCallID,
+						}
+						wsConn.WriteMessage(websocket.TextMessage, []byte(jsonx.ToStr(respMsg)))
+					}
+					return nil
+				}),
+			)
+
+			if err != nil {
+				wsConn.WriteMessage(websocket.TextMessage, []byte(jsonx.ToStr(&vo.ChatMsg{Type: "error", Content: err.Error(), Time: now})))
+			} else {
+				wsConn.WriteMessage(websocket.TextMessage, []byte(jsonx.ToStr(&vo.ChatMsg{Type: "end", Time: now})))
+			}
+		}
+	}
+}
diff --git a/server/internal/ai/api/api.go b/server/internal/ai/api/api.go
index f8f2642f..12c522b1 100644
--- a/server/internal/ai/api/api.go
+++ b/server/internal/ai/api/api.go
@@ -3,6 +3,6 @@ package api
 import "mayfly-go/pkg/ioc"
 
 func InitIoc() {
-	// 注册AI SQL API组件
 	ioc.Register(new(AiDB))
+	ioc.Register(new(Ai))
 }
diff --git a/server/internal/ai/api/form/form.go b/server/internal/ai/api/form/form.go
new file mode 100644
index 00000000..422a6138
--- /dev/null
+++ b/server/internal/ai/api/form/form.go
@@ -0,0 +1,6 @@
+package form
+
+type ChatMsg struct {
+	SessionId string `json:"sessionId"`
+	Content   string `json:"content"`
+}
diff --git a/server/internal/ai/api/vo/vo.go b/server/internal/ai/api/vo/vo.go
new file mode 100644
index 00000000..6965e1ca
--- /dev/null
+++ b/server/internal/ai/api/vo/vo.go
@@ -0,0 +1,18 @@
+package vo
+
+import (
+	"time"
+
+	"github.com/cloudwego/eino/schema"
+)
+
+type ChatMsg struct {
+	Type             string            `json:"type,omitempty"` // "text", "tool", "end"
+	Time             time.Time         `json:"time"`
+	MessageId        string            `json:"messageId"`
+	Role             string            `json:"role"`
+	Content          string            `json:"content"`
+	ReasoningContent string            `json:"reasoningContent,omitempty"`
+	ToolCalls        []schema.ToolCall `json:"toolCalls,omitempty"`
+	ToolCallId       string            `json:"toolCallId,omitempty"`
+}
diff --git a/server/internal/ai/application/application.go b/server/internal/ai/application/application.go
new file mode 100644
index 00000000..764a8e8f
--- /dev/null
+++ b/server/internal/ai/application/application.go
@@ -0,0 +1,13 @@
+package application
+
+import (
+	"mayfly-go/internal/ai/agent"
+	"mayfly-go/pkg/ioc"
+)
+
+func Init() {
+	sessionAppImpl := new(sessionAppImpl)
+	ioc.Register(sessionAppImpl)
+	// 注册session存储
+	agent.DefaultSessionStore = sessionAppImpl
+}
diff --git a/server/internal/ai/application/dto/dto.go b/server/internal/ai/application/dto/dto.go
new file mode 100644
index 00000000..32d21fb5
--- /dev/null
+++ b/server/internal/ai/application/dto/dto.go
@@ -0,0 +1,9 @@
+package dto
+
+type SessionQuery struct {
+	UserId uint64
+}
+
+type SessionMessageQuery struct {
+	SessionKey string
+}
diff --git a/server/internal/ai/application/session.go b/server/internal/ai/application/session.go
new file mode 100644
index 00000000..dc89cad0
--- /dev/null
+++ b/server/internal/ai/application/session.go
@@ -0,0 +1,150 @@
+package application
+
+import (
+	"cmp"
+	"context"
+	"errors"
+	"mayfly-go/internal/ai/agent"
+	"mayfly-go/internal/ai/application/dto"
+	"mayfly-go/internal/ai/domain/entity"
+	"mayfly-go/internal/ai/domain/repository"
+	"mayfly-go/internal/ai/session"
+	"mayfly-go/pkg/base"
+	"mayfly-go/pkg/model"
+	"mayfly-go/pkg/utils/collx"
+	"mayfly-go/pkg/utils/jsonx"
+	"mayfly-go/pkg/utils/stringx"
+
+	"github.com/cloudwego/eino/adk"
+	"github.com/cloudwego/eino/schema"
+)
+
+type Session interface {
+	base.App[*entity.Session]
+	session.Store
+
+	// ListSessions 列出会话
+	ListSessions(ctx context.Context, query *dto.SessionQuery) ([]*entity.Session, error)
+
+	ListSessionMessages(ctx context.Context, query *dto.SessionMessageQuery) ([]*entity.SessionMessage, error)
+}
+
+type sessionAppImpl struct {
+	base.AppImpl[*entity.Session, repository.Session]
+
+	sessionMessageRepo repository.SessionMessage `inject:"T"`
+}
+
+var _ session.Store = (*sessionAppImpl)(nil)
+var _ Session = (*sessionAppImpl)(nil)
+
+func (s *sessionAppImpl) ListSessions(ctx context.Context, query *dto.SessionQuery) ([]*entity.Session, error) {
+	cond := model.NewCond().
+		Eq("creatorId", query.UserId).
+		OrderByDesc("id")
+	return s.ListByCond(cond)
+}
+
+func (s *sessionAppImpl) ListSessionMessages(ctx context.Context, query *dto.SessionMessageQuery) ([]*entity.SessionMessage, error) {
+	cond := model.NewCond().
+		Eq("sessionKey", query.SessionKey).
+		OrderByAsc("id")
+	return s.sessionMessageRepo.SelectByCond(cond)
+}
+
+// AppendMsgs 追加消息到会话历史
+func (s *sessionAppImpl) AppendMsgs(ctx context.Context, sessionKey string, msgs ...adk.Message) error {
+	if len(msgs) == 0 {
+		return nil
+	}
+
+	messages := collx.ArrayMap(msgs, func(msg adk.Message) *entity.SessionMessage {
+		sm := &entity.SessionMessage{
+			SessionKey: sessionKey,
+			MessageId:  cmp.Or(agent.GetMessageId(msg), stringx.RandUUID()),
+			Role:       string(msg.Role),
+			Content:    msg.Content,
+			ToolCalls:  jsonx.ToStr(msg.ToolCalls),
+			ToolCallId: msg.ToolCallID,
+		}
+		if msg.Role == schema.Tool {
+			sm.SetExtraValue("toolName", msg.ToolName).
+				SetExtraValue("toolStatus", msg.Extra["toolStatus"])
+		}
+		return sm
+	})
+
+	return s.sessionMessageRepo.BatchInsert(ctx, messages)
+}
+
+// GetHistory 获取会话历史消息
+func (s *sessionAppImpl) GetHistory(ctx context.Context, sessionKey string, limit int) ([]adk.Message, error) {
+	messages, err := s.sessionMessageRepo.SelectHistory(ctx, sessionKey, limit)
+	if err != nil {
+		return nil, err
+	}
+	return collx.ArrayMap(messages, func(msg *entity.SessionMessage) adk.Message {
+		sm := &schema.Message{
+			Role:       schema.RoleType(msg.Role),
+			Content:    msg.Content,
+			ToolCallID: msg.ToolCallId,
+		}
+		if msg.ToolCalls != "" {
+			tollcalls, _ := jsonx.ToByStr[[]schema.ToolCall](msg.ToolCalls)
+			sm.ToolCalls = *tollcalls
+		}
+		return sm
+	}), nil
+}
+
+// ClearHistory 清空会话历史消息
+func (s *sessionAppImpl) ClearHistory(ctx context.Context, sessionKey string) error {
+	return s.sessionMessageRepo.DeleteByCond(ctx, &entity.SessionMessage{SessionKey: sessionKey})
+}
+
+// ListMetas 列出所有会话元信息
+func (s *sessionAppImpl) ListMetas(ctx context.Context) ([]*session.SessionMeta, error) {
+	return nil, errors.New("not implemented")
+}
+
+// GetMeta 获取会话元信息
+func (s *sessionAppImpl) GetMeta(ctx context.Context, sessionKey string) (*session.SessionMeta, error) {
+	sessionMeta := &entity.Session{SessionKey: sessionKey}
+	err := s.GetByCond(sessionMeta)
+	if err != nil {
+		return nil, nil
+	}
+
+	return &session.SessionMeta{
+		Key:       sessionMeta.SessionKey,
+		Summary:   sessionMeta.Summary,
+		CreatedAt: *sessionMeta.CreateTime,
+		UpdatedAt: *sessionMeta.UpdateTime,
+	}, nil
+}
+
+// SaveMeta 保存会话元信息
+func (s *sessionAppImpl) SaveMeta(ctx context.Context, meta *session.SessionMeta) error {
+	session := &entity.Session{
+		SessionKey:   meta.Key,
+		Summary:      meta.Summary,
+		MessageCount: meta.Count,
+		TokenCount:   meta.TokenCount,
+	}
+
+	// 检查是否存在，存在则更新，不存在则创建
+	existing := &entity.Session{SessionKey: meta.Key}
+	err := s.GetByCond(existing)
+	if err == nil {
+		session.Id = existing.Id
+	} else {
+		session.Title = meta.Extra.GetStr("title")
+	}
+
+	return s.Save(ctx, session)
+}
+
+// DeleteMeta 删除会话元信息
+func (s *sessionAppImpl) DeleteMeta(ctx context.Context, sessionKey string) error {
+	return s.DeleteByCond(ctx, &entity.Session{SessionKey: sessionKey})
+}
diff --git a/server/internal/ai/domain/entity/session.go b/server/internal/ai/domain/entity/session.go
new file mode 100644
index 00000000..21ba114f
--- /dev/null
+++ b/server/internal/ai/domain/entity/session.go
@@ -0,0 +1,22 @@
+package entity
+
+import (
+	"mayfly-go/pkg/model"
+)
+
+// Session AI 会话元数据
+type Session struct {
+	model.Model
+	model.ExtraData
+
+	SessionKey string `gorm:"column:session_key;size:64;not null;comment:会话唯一标识" json:"sessionKey"`
+	Title      string `gorm:"column:title;size:255;;comment:会话标题" json:"title"`
+	Summary    string `gorm:"column:summary;size:3000;;comment:会话摘要" json:"summary"`
+
+	MessageCount int `gorm:"column:message_count;default:0;comment:消息数量" json:"messageCount"`
+	TokenCount   int `gorm:"column:token_count;default:0;comment:消耗Token总数" json:"tokenCount"`
+}
+
+func (s *Session) TableName() string {
+	return "t_ai_session"
+}
diff --git a/server/internal/ai/domain/entity/session_message.go b/server/internal/ai/domain/entity/session_message.go
new file mode 100644
index 00000000..1f66d69a
--- /dev/null
+++ b/server/internal/ai/domain/entity/session_message.go
@@ -0,0 +1,19 @@
+package entity
+
+import "mayfly-go/pkg/model"
+
+type SessionMessage struct {
+	model.CreateModel
+	model.ExtraData
+
+	SessionKey string `gorm:"column:session_key;size:64;not null;comment:会话唯一标识" json:"sessionKey"`
+	MessageId  string `gorm:"column:message_id;size:64;not null;comment:消息唯一标识" json:"messageId"`
+	Role       string `gorm:"column:role;size:10;not null;comment:消息角色" json:"role"`
+	Content    string `gorm:"column:content;type:text;comment:消息内容" json:"content"`
+	ToolCalls  string `gorm:"column:tool_calls;type:text;comment:工具调用" json:"toolCalls"`
+	ToolCallId string `gorm:"column:tool_call_id;size:64;comment:工具调用id" json:"toolCallId"`
+}
+
+func (s *SessionMessage) TableName() string {
+	return "t_ai_session_message"
+}
diff --git a/server/internal/ai/domain/repository/session.go b/server/internal/ai/domain/repository/session.go
new file mode 100644
index 00000000..fee3620a
--- /dev/null
+++ b/server/internal/ai/domain/repository/session.go
@@ -0,0 +1,10 @@
+package repository
+
+import (
+	"mayfly-go/internal/ai/domain/entity"
+	"mayfly-go/pkg/base"
+)
+
+type Session interface {
+	base.Repo[*entity.Session]
+}
diff --git a/server/internal/ai/domain/repository/session_message.go b/server/internal/ai/domain/repository/session_message.go
new file mode 100644
index 00000000..f3de5001
--- /dev/null
+++ b/server/internal/ai/domain/repository/session_message.go
@@ -0,0 +1,13 @@
+package repository
+
+import (
+	"context"
+	"mayfly-go/internal/ai/domain/entity"
+	"mayfly-go/pkg/base"
+)
+
+type SessionMessage interface {
+	base.Repo[*entity.SessionMessage]
+
+	SelectHistory(ctx context.Context, sessionKey string, limit int) ([]*entity.SessionMessage, error)
+}
diff --git a/server/internal/ai/infra/persistence/persistence.go b/server/internal/ai/infra/persistence/persistence.go
new file mode 100644
index 00000000..6867c95c
--- /dev/null
+++ b/server/internal/ai/infra/persistence/persistence.go
@@ -0,0 +1,8 @@
+package persistence
+
+import "mayfly-go/pkg/ioc"
+
+func InitIoc() {
+	ioc.RegisterByType[*sessionRepoImpl]()
+	ioc.RegisterByType[*sessionMessageRepoImpl]()
+}
diff --git a/server/internal/ai/infra/persistence/session.go b/server/internal/ai/infra/persistence/session.go
new file mode 100644
index 00000000..e95168d9
--- /dev/null
+++ b/server/internal/ai/infra/persistence/session.go
@@ -0,0 +1,15 @@
+package persistence
+
+import (
+	"mayfly-go/internal/ai/domain/entity"
+	"mayfly-go/internal/ai/domain/repository"
+	"mayfly-go/pkg/base"
+)
+
+type sessionRepoImpl struct {
+	base.RepoImpl[*entity.Session]
+}
+
+func newSessionRepo() repository.Session {
+	return &sessionRepoImpl{}
+}
diff --git a/server/internal/ai/infra/persistence/session_message.go b/server/internal/ai/infra/persistence/session_message.go
new file mode 100644
index 00000000..3532d71a
--- /dev/null
+++ b/server/internal/ai/infra/persistence/session_message.go
@@ -0,0 +1,24 @@
+package persistence
+
+import (
+	"context"
+	"mayfly-go/internal/ai/domain/entity"
+	"mayfly-go/internal/ai/domain/repository"
+	"mayfly-go/pkg/base"
+)
+
+type sessionMessageRepoImpl struct {
+	base.RepoImpl[*entity.SessionMessage]
+}
+
+func newSessionMessageRepo() repository.SessionMessage {
+	return &sessionMessageRepoImpl{}
+}
+
+func (s *sessionMessageRepoImpl) SelectHistory(ctx context.Context, sessionKey string, limit int) ([]*entity.SessionMessage, error) {
+	var messages []*entity.SessionMessage
+	if err := s.SelectBySql("select * from t_ai_session_message where session_key = ? order by id asc limit ?", &messages, sessionKey, limit); err != nil {
+		return nil, err
+	}
+	return messages, nil
+}
diff --git a/server/internal/ai/init/init.go b/server/internal/ai/init/init.go
index a72eb558..0cf20598 100644
--- a/server/internal/ai/init/init.go
+++ b/server/internal/ai/init/init.go
@@ -2,12 +2,20 @@ package init
 
 import (
 	"mayfly-go/internal/ai/api"
+	"mayfly-go/internal/ai/application"
+	"mayfly-go/internal/ai/infra/persistence"
+	"mayfly-go/internal/ai/tools/dbtool"
 	"mayfly-go/pkg/starter"
 )
 
 func init() {
 	// 注册AI模块的IoC组件
 	starter.AddInitIocFunc(func() {
+		persistence.InitIoc()
+		application.Init()
 		api.InitIoc()
 	})
+
+	// 数据库工具初始化
+	dbtool.Init()
 }
diff --git a/server/internal/ai/memory/manager.go b/server/internal/ai/memory/manager.go
new file mode 100644
index 00000000..35515a6b
--- /dev/null
+++ b/server/internal/ai/memory/manager.go
@@ -0,0 +1,11 @@
+package memory
+
+type Manager struct {
+	store Store
+}
+
+func NewManager(store Store) *Manager {
+	return &Manager{
+		store: store,
+	}
+}
diff --git a/server/internal/ai/memory/store.go b/server/internal/ai/memory/store.go
new file mode 100644
index 00000000..086ec820
--- /dev/null
+++ b/server/internal/ai/memory/store.go
@@ -0,0 +1,33 @@
+package memory
+
+import (
+	"context"
+	"time"
+)
+
+// MemoryItem 用户记忆结构
+// 每个用户一条记录，使用Markdown格式存储所有记忆内容
+type MemoryItem struct {
+	// 用户ID（主键）
+	UserID string `json:"userId"`
+	// 记忆内容（Markdown格式）
+	Memory string `json:"memory"`
+	// 创建时间
+	CreatedAt time.Time `json:"createdAt"`
+	// 最后更新时间
+	UpdatedAt time.Time `json:"updatedAt"`
+}
+
+// Store 记忆存储接口
+type Store interface {
+	// 短期记忆
+	GetShortTerm(ctx context.Context, userId string) ([]*MemoryItem, error)
+	SaveShortTerm(ctx context.Context, userId string, items []*MemoryItem) error
+
+	// 长期记忆
+	GetLongTerm(ctx context.Context, userId string) ([]*MemoryItem, error)
+	SaveLongTerm(ctx context.Context, userId string, items []*MemoryItem) error
+
+	// 向量检索
+	Search(ctx context.Context, query string, limit int) ([]*MemoryItem, error)
+}
diff --git a/server/internal/ai/protocol/registry.go b/server/internal/ai/protocol/registry.go
index 7fdde2d2..1ab8e929 100644
--- a/server/internal/ai/protocol/registry.go
+++ b/server/internal/ai/protocol/registry.go
@@ -2,6 +2,8 @@ package protocol
 
 import (
 	"context"
+	"crypto/md5"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"mayfly-go/internal/ai/config"
@@ -59,12 +61,13 @@ func GetChatModel(ctx context.Context, modelConfig *config.ModelConfig) (model.T
 
 // generateCacheKey 生成基于 modelConfig 关键字段的缓存键
 func generateCacheKey(config *config.ModelConfig) string {
-	return fmt.Sprintf("%s_%s_%s_%d_%f",
-		config.Model,
-
-		config.BaseUrl,
-		config.ApiKey,
-		config.MaxTokens,
-		config.Temperature,
-	)
+	// 序列化为 JSON 确保所有字段都被包含，且顺序一致
+	data, err := json.Marshal(config)
+	if err != nil {
+		// 出错时 fallback 到简单 ID
+		return config.Model
+	}
+	// 使用 MD5 缩短 Key 长度，便于存储和比较
+	hash := md5.Sum(data)
+	return fmt.Sprintf("%x", hash)
 }
diff --git a/server/internal/ai/session/context.go b/server/internal/ai/session/context.go
new file mode 100644
index 00000000..de8115d0
--- /dev/null
+++ b/server/internal/ai/session/context.go
@@ -0,0 +1,22 @@
+package session
+
+import (
+	"context"
+	"mayfly-go/pkg/contextx"
+
+	"github.com/spf13/cast"
+)
+
+const (
+	SessionKey contextx.CtxKey = "sessionKey"
+)
+
+// GetSessionKey 从上下文中获取会话Key
+func GetSessionKey(ctx context.Context) string {
+	return cast.ToString(ctx.Value(SessionKey))
+}
+
+// WithSessionKey 设置会话Key到上下文中
+func WithSessionKey(ctx context.Context, sessionKey string) context.Context {
+	return context.WithValue(ctx, SessionKey, sessionKey)
+}
diff --git a/server/internal/ai/session/manager.go b/server/internal/ai/session/manager.go
new file mode 100644
index 00000000..b5355698
--- /dev/null
+++ b/server/internal/ai/session/manager.go
@@ -0,0 +1,100 @@
+package session
+
+import (
+	"context"
+	"fmt"
+	"mayfly-go/pkg/utils/collx"
+	"mayfly-go/pkg/utils/stringx"
+	"time"
+
+	"github.com/cloudwego/eino/adk"
+)
+
+// Manager 会话管理器
+// 负责会话缓存管理和生命周期管理，底层存储委托给 Store 实现
+type Manager struct {
+	store Store // 底层存储
+}
+
+// NewManager 创建会话管理器
+// store: 底层存储实现 (如 JSONLStore, MemoryStore 等)
+func NewManager(store Store) *Manager {
+	return &Manager{
+		store: store,
+	}
+}
+
+// GetHistory 获取会话历史消息
+func (m *Manager) GetHistory(ctx context.Context, key string, opts ...GetOption) ([]adk.Message, error) {
+	// 应用选项配置
+	options := defaultGetOptions()
+	for _, opt := range opts {
+		opt(options)
+	}
+	return m.store.GetHistory(ctx, key, options.messageLimit)
+}
+
+// AppendMsgs 追加消息到会话
+func (m *Manager) AppendMsgs(ctx context.Context, key string, msgs ...adk.Message) error {
+	if key == "" || len(msgs) == 0 {
+		return nil
+	}
+
+	// 追加消息到底层存储（Store 只负责存储，不更新元数据）
+	if err := m.store.AppendMsgs(ctx, key, msgs...); err != nil {
+		return err
+	}
+
+	meta, err := m.store.GetMeta(ctx, key)
+	if err != nil {
+		return err
+	}
+	// 如果元数据不存在，创建新会话
+	if meta == nil {
+		// 元数据不存在，创建新的
+		meta = &SessionMeta{
+			Key:       key,
+			CreatedAt: time.Now(),
+		}
+		meta.Extra.Set("title", stringx.Truncate(msgs[0].Content, 50, 30, "..."))
+	}
+
+	// 计算新增消息的Token数量
+	totalTokens := collx.ArrayReduce(msgs, 0, func(totalToken int, msg adk.Message) int {
+		responseMeta := msg.ResponseMeta
+		if responseMeta != nil && responseMeta.Usage != nil {
+			return totalToken + responseMeta.Usage.TotalTokens
+		}
+		return totalToken
+	})
+
+	// 保存元数据
+	meta.Count += len(msgs)
+	meta.TokenCount += totalTokens
+	meta.UpdatedAt = time.Now()
+	return m.store.SaveMeta(ctx, meta)
+}
+
+// Delete 删除会话
+// 同时删除历史消息、元数据和缓存
+func (m *Manager) Delete(ctx context.Context, key string) error {
+	// 先清空历史消息（可选，确保数据一致性）
+	if err := m.store.ClearHistory(ctx, key); err != nil {
+		return fmt.Errorf("manager: clear history: %w", err)
+	}
+
+	// 再删除元数据
+	return m.store.DeleteMeta(ctx, key)
+}
+
+// List 列出所有会话
+// 从 Store 加载最新的会话元数据列表
+func (m *Manager) List(ctx context.Context) ([]*SessionMeta, error) {
+	return m.store.ListMetas(ctx)
+}
+
+// ClearHistory 清空会话历史消息（保留元数据）
+func (m *Manager) ClearHistory(ctx context.Context, key string) error {
+	// 调用 Store 清空历史
+	return m.store.ClearHistory(ctx, key)
+}
diff --git a/server/internal/ai/session/options.go b/server/internal/ai/session/options.go
new file mode 100644
index 00000000..5d1c360c
--- /dev/null
+++ b/server/internal/ai/session/options.go
@@ -0,0 +1,24 @@
+package session
+
+// GetOptions 获取或创建会话的配置选项
+type GetOptions struct {
+	messageLimit int // 消息条数限制，0 表示加载全部
+}
+
+// GetOptions 选项函数类型
+type GetOption func(*GetOptions)
+
+// WithGetMessageLimit 设置加载的历史消息条数
+// limit: 消息条数，0 表示加载全部历史消息
+func WithGetMessageLimit(limit int) GetOption {
+	return func(o *GetOptions) {
+		o.messageLimit = limit
+	}
+}
+
+// defaultGetOptions 返回默认配置
+func defaultGetOptions() *GetOptions {
+	return &GetOptions{
+		messageLimit: 100000, // 默认加载全部
+	}
+}
diff --git a/server/internal/ai/session/session.go b/server/internal/ai/session/session.go
new file mode 100644
index 00000000..93bd5a43
--- /dev/null
+++ b/server/internal/ai/session/session.go
@@ -0,0 +1,27 @@
+package session
+
+import (
+	"mayfly-go/pkg/utils/collx"
+	"time"
+
+	"github.com/cloudwego/eino/adk"
+)
+
+// SessionMeta 会话元数据
+type SessionMeta struct {
+	UserId     string    `json:"userId"`
+	Key        string    `json:"key"` // 会话唯一标识
+	Summary    string    `json:"summary"`
+	Count      int       `json:"count"`      // 消息总数
+	TokenCount int       `json:"tokenCount"` // 总 token 数
+	Skip       int       `json:"skip"`
+	Extra      collx.M   `json:"extra,omitempty"` // 扩展字段
+	CreatedAt  time.Time `json:"createdAt"`       // 创建时间戳
+	UpdatedAt  time.Time `json:"updatedAt"`       // 最后更新时间戳
+}
+
+// Session 会话
+type Session struct {
+	Meta     *SessionMeta  `json:"meta"`
+	Messages []adk.Message `json:"messages"`
+}
diff --git a/server/internal/ai/session/store.go b/server/internal/ai/session/store.go
new file mode 100644
index 00000000..5e4f86f2
--- /dev/null
+++ b/server/internal/ai/session/store.go
@@ -0,0 +1,30 @@
+package session
+
+import (
+	"context"
+
+	"github.com/cloudwego/eino/adk"
+)
+
+// Store 会话相关信息存储
+type Store interface {
+	// ============= 消息操作  =============
+
+	// AppendMsgs 追加消息到会话末尾
+	AppendMsgs(ctx context.Context, sessionKey string, msgs ...adk.Message) error
+	// GetHistory 获取会话历史消息（按时间正序排列）
+	GetHistory(ctx context.Context, sessionKey string, limit int) ([]adk.Message, error)
+	// ClearHistory 清空会话历史消息
+	ClearHistory(ctx context.Context, sessionKey string) error
+
+	// ============= 元数据操作  =============
+
+	// ListMetas 列出所有会话元信息
+	ListMetas(ctx context.Context) ([]*SessionMeta, error)
+	// GetMeta 获取会话元信息
+	GetMeta(ctx context.Context, sessionKey string) (*SessionMeta, error)
+	// SaveMeta 保存会话元信息
+	SaveMeta(ctx context.Context, meta *SessionMeta) error
+	// DeleteMeta 删除会话元信息
+	DeleteMeta(ctx context.Context, sessionKey string) error
+}
diff --git a/server/internal/ai/session/store_jsonl.go b/server/internal/ai/session/store_jsonl.go
new file mode 100644
index 00000000..acb2b044
--- /dev/null
+++ b/server/internal/ai/session/store_jsonl.go
@@ -0,0 +1,709 @@
+package session
+
+import (
+	"bufio"
+	"bytes"
+	"context"
+	"encoding/json"
+	"fmt"
+	"hash/fnv"
+	"log"
+	"mayfly-go/pkg/utils/filex"
+	"os"
+	"path/filepath"
+	"strings"
+	"sync"
+	"time"
+
+	"github.com/cloudwego/eino/adk"
+)
+
+const (
+	// numLockShards is the fixed number of mutexes used to serialize
+	// per-session access. Using a sharded array instead of a map keeps
+	// memory bounded regardless of how many sessions are created over
+	// the lifetime of the process — important for a long-running daemon.
+	numLockShards = 64
+
+	// maxLineSize is the maximum size of a single JSON line in a .jsonl
+	// file. Tool results (read_file, web search, etc.) can be large, so
+	// we set a generous limit. The scanner starts at 64 KB and grows
+	// only as needed up to this cap.
+	maxLineSize = 10 * 1024 * 1024 // 10 MB
+)
+
+// JSONLStore implements Store using append-only JSONL files.
+//
+// Each session is stored as two files:
+//
+//	{sanitized_key}.jsonl      — one JSON-encoded message per line, append-only
+//	{sanitized_key}.meta.json  — session metadata (summary, logical truncation offset)
+//
+// Messages are never physically deleted from the JSONL file. Instead,
+// TruncateHistory records a "skip" offset in the metadata file and
+// GetHistory ignores lines before that offset. This keeps all writes
+// append-only, which is both fast and crash-safe.
+type JSONLStore struct {
+	dir   string
+	locks [numLockShards]sync.Mutex
+}
+
+var _ Store = (*JSONLStore)(nil)
+
+// NewJSONLStore creates a new JSONL-backed store rooted at dir.
+func NewStoreJSONL(dir string) (*JSONLStore, error) {
+	err := os.MkdirAll(dir, 0o755)
+	if err != nil {
+		return nil, fmt.Errorf("jsonl: create directory: %w", err)
+	}
+	return &JSONLStore{dir: dir}, nil
+}
+
+// sessionLock returns a mutex for the given session key.
+// Keys are mapped to a fixed pool of shards via FNV hash, so
+// memory usage is O(1) regardless of total session count.
+func (s *JSONLStore) sessionLock(key string) *sync.Mutex {
+	h := fnv.New32a()
+	h.Write([]byte(key))
+	return &s.locks[h.Sum32()%numLockShards]
+}
+
+func (s *JSONLStore) jsonlPath(key string) string {
+	return filepath.Join(s.dir, sanitizeKey(key)+".jsonl")
+}
+
+func (s *JSONLStore) metaPath(key string) string {
+	return filepath.Join(s.dir, sanitizeKey(key)+".meta.json")
+}
+
+// sanitizeKey converts a session key to a safe filename component.
+// Mirrors pkg/session.sanitizeFilename so that migration paths match.
+// Replaces ':' with '_' (session key separator) and '/' and '\' with '_'
+// so composite IDs (e.g. Telegram forum "chatID/threadID", Slack "channel/thread_ts")
+// do not create subdirectories or break on Windows.
+func sanitizeKey(key string) string {
+	s := strings.ReplaceAll(key, ":", "_")
+	s = strings.ReplaceAll(s, "/", "_")
+	s = strings.ReplaceAll(s, "\\", "_")
+	return s
+}
+
+// readMeta loads the metadata file for a session.
+// Returns a zero-value sessionMeta if the file does not exist.
+func (s *JSONLStore) readMeta(key string) (SessionMeta, error) {
+	data, err := os.ReadFile(s.metaPath(key))
+	if os.IsNotExist(err) {
+		return SessionMeta{Key: key}, nil
+	}
+	if err != nil {
+		return SessionMeta{}, fmt.Errorf("jsonl: read meta: %w", err)
+	}
+	var meta SessionMeta
+	err = json.Unmarshal(data, &meta)
+	if err != nil {
+		return SessionMeta{}, fmt.Errorf("jsonl: decode meta: %w", err)
+	}
+	return meta, nil
+}
+
+// writeMeta atomically writes the metadata file using the project's
+// standard WriteFileAtomic (temp + fsync + rename).
+func (s *JSONLStore) writeMeta(key string, meta SessionMeta) error {
+	data, err := json.MarshalIndent(meta, "", "  ")
+	if err != nil {
+		return fmt.Errorf("jsonl: encode meta: %w", err)
+	}
+	return filex.WriteFileAtomic(s.metaPath(key), data, 0o644)
+}
+
+// readMessages reads valid JSON lines from a .jsonl file, skipping
+// the first `skip` lines without unmarshaling them. This avoids the
+// cost of json.Unmarshal on logically truncated messages.
+// Malformed trailing lines (e.g. from a crash) are silently skipped.
+func readMessages(path string, skip int) ([]adk.Message, error) {
+	f, err := os.Open(path)
+	if os.IsNotExist(err) {
+		return []adk.Message{}, nil
+	}
+	if err != nil {
+		return nil, fmt.Errorf("jsonl: open jsonl: %w", err)
+	}
+	defer f.Close()
+
+	var msgs []adk.Message
+	scanner := bufio.NewScanner(f)
+	// Allow large lines for tool results (read_file, web search, etc.).
+	scanner.Buffer(make([]byte, 0, 64*1024), maxLineSize)
+
+	lineNum := 0
+	for scanner.Scan() {
+		line := scanner.Bytes()
+		if len(line) == 0 {
+			continue
+		}
+		lineNum++
+		if lineNum <= skip {
+			continue
+		}
+		var msg adk.Message
+		if err := json.Unmarshal(line, &msg); err != nil {
+			// Corrupt line — likely a partial write from a crash.
+			// Log so operators know data was skipped, but don't
+			// fail the entire read; this is the standard JSONL
+			// recovery pattern.
+			log.Printf("jsonl: skipping corrupt line %d in %s: %v",
+				lineNum, filepath.Base(path), err)
+			continue
+		}
+		msgs = append(msgs, msg)
+	}
+	if scanner.Err() != nil {
+		return nil, fmt.Errorf("jsonl: scan jsonl: %w", scanner.Err())
+	}
+
+	if msgs == nil {
+		msgs = []adk.Message{}
+	}
+	return msgs, nil
+}
+
+// countLines counts the total number of non-empty lines in a .jsonl file.
+// Used by TruncateHistory to reconcile a stale meta.Count without
+// the overhead of unmarshaling every message.
+func countLines(path string) (int, error) {
+	f, err := os.Open(path)
+	if os.IsNotExist(err) {
+		return 0, nil
+	}
+	if err != nil {
+		return 0, fmt.Errorf("jsonl: open jsonl: %w", err)
+	}
+	defer f.Close()
+
+	n := 0
+	scanner := bufio.NewScanner(f)
+	scanner.Buffer(make([]byte, 0, 64*1024), maxLineSize)
+	for scanner.Scan() {
+		if len(scanner.Bytes()) > 0 {
+			n++
+		}
+	}
+	return n, scanner.Err()
+}
+
+func (s *JSONLStore) AppendMsgs(
+	_ context.Context, sessionKey string, msgs ...adk.Message) error {
+	return s.addMsg(sessionKey, msgs...)
+}
+
+// addMsg appends one or more messages to the session's JSONL file in a single write operation.
+// Using batch writes reduces disk I/O overhead compared to writing each message individually.
+// Note: This method only appends messages to storage, it does NOT update metadata.
+// Metadata updates should be handled by the Manager layer.
+func (s *JSONLStore) addMsg(sessionKey string, msgs ...adk.Message) error {
+	l := s.sessionLock(sessionKey)
+	l.Lock()
+	defer l.Unlock()
+
+	if len(msgs) == 0 {
+		return nil
+	}
+
+	// Marshal all messages into JSON lines
+	var buf bytes.Buffer
+	for i, msg := range msgs {
+		line, err := json.Marshal(msg)
+		if err != nil {
+			return fmt.Errorf("jsonl: marshal message %d: %w", i, err)
+		}
+		buf.Write(line)
+		buf.WriteByte('\n')
+	}
+
+	// Open file for appending
+	f, err := os.OpenFile(
+		s.jsonlPath(sessionKey),
+		os.O_CREATE|os.O_WRONLY|os.O_APPEND,
+		0o644,
+	)
+	if err != nil {
+		return fmt.Errorf("jsonl: open jsonl for append: %w", err)
+	}
+
+	// Write all messages in one operation
+	_, writeErr := f.Write(buf.Bytes())
+	if writeErr != nil {
+		f.Close()
+		return fmt.Errorf("jsonl: append messages: %w", writeErr)
+	}
+
+	// Flush to physical storage before closing. This matches the
+	// durability guarantee of writeMeta and rewriteJSONL (which use
+	// WriteFileAtomic with fsync). Without Sync, a power loss could
+	// leave the append in the kernel page cache only — lost on reboot.
+	if syncErr := f.Sync(); syncErr != nil {
+		f.Close()
+		return fmt.Errorf("jsonl: sync jsonl: %w", syncErr)
+	}
+
+	if closeErr := f.Close(); closeErr != nil {
+		return fmt.Errorf("jsonl: close jsonl: %w", closeErr)
+	}
+
+	return nil
+}
+
+func (s *JSONLStore) GetHistory(
+	_ context.Context, sessionKey string, limit int,
+) ([]adk.Message, error) {
+	l := s.sessionLock(sessionKey)
+	l.Lock()
+	defer l.Unlock()
+
+	meta, err := s.readMeta(sessionKey)
+	if err != nil {
+		return nil, err
+	}
+
+	// Pass meta.Skip so readMessages skips those lines without
+	// unmarshaling them — avoids wasted CPU on truncated messages.
+	msgs, err := readMessages(s.jsonlPath(sessionKey), meta.Skip)
+	if err != nil {
+		return nil, err
+	}
+
+	// Apply limit if specified and positive
+	if limit > 0 && len(msgs) > limit {
+		msgs = msgs[len(msgs)-limit:]
+	}
+
+	return msgs, nil
+}
+
+// ClearHistory 清空会话历史消息（保留元数据）
+func (s *JSONLStore) ClearHistory(ctx context.Context, sessionKey string) error {
+	l := s.sessionLock(sessionKey)
+	l.Lock()
+	defer l.Unlock()
+
+	// 清空 JSONL 文件
+	jsonlPath := s.jsonlPath(sessionKey)
+	err := filex.WriteFileAtomic(jsonlPath, []byte{}, 0o644)
+	if err != nil && !os.IsNotExist(err) {
+		return fmt.Errorf("jsonl: clear history: %w", err)
+	}
+
+	// 更新元数据
+	meta, err := s.readMeta(sessionKey)
+	if err != nil {
+		return err
+	}
+
+	meta.Count = 0
+	meta.Skip = 0
+	meta.UpdatedAt = time.Now()
+
+	return s.writeMeta(sessionKey, meta)
+}
+
+func (s *JSONLStore) GetSummary(
+	_ context.Context, sessionKey string,
+) (string, error) {
+	l := s.sessionLock(sessionKey)
+	l.Lock()
+	defer l.Unlock()
+
+	meta, err := s.readMeta(sessionKey)
+	if err != nil {
+		return "", err
+	}
+	return meta.Summary, nil
+}
+
+func (s *JSONLStore) UpdateSummary(
+	_ context.Context, sessionKey, summary string,
+) error {
+	l := s.sessionLock(sessionKey)
+	l.Lock()
+	defer l.Unlock()
+
+	meta, err := s.readMeta(sessionKey)
+	if err != nil {
+		return err
+	}
+	now := time.Now()
+	if meta.CreatedAt.IsZero() {
+		meta.CreatedAt = now
+	}
+	meta.Summary = summary
+	meta.UpdatedAt = now
+
+	return s.writeMeta(sessionKey, meta)
+}
+
+func (s *JSONLStore) TruncateHistory(
+	_ context.Context, sessionKey string, keepLast int,
+) error {
+	l := s.sessionLock(sessionKey)
+	l.Lock()
+	defer l.Unlock()
+
+	meta, err := s.readMeta(sessionKey)
+	if err != nil {
+		return err
+	}
+
+	// Always reconcile meta.Count with the actual line count on disk.
+	// A crash between the JSONL append and the meta update in addMsg
+	// leaves meta.Count stale (e.g. file has 101 lines but meta says
+	// 100). Counting lines is cheap — no unmarshal, just a scan — and
+	// TruncateHistory is not a hot path, so always re-count.
+	n, countErr := countLines(s.jsonlPath(sessionKey))
+	if countErr != nil {
+		return countErr
+	}
+	meta.Count = n
+
+	if keepLast <= 0 {
+		meta.Skip = meta.Count
+	} else {
+		effective := meta.Count - meta.Skip
+		if keepLast < effective {
+			meta.Skip = meta.Count - keepLast
+		}
+	}
+	meta.UpdatedAt = time.Now()
+
+	return s.writeMeta(sessionKey, meta)
+}
+
+func (s *JSONLStore) SetHistory(
+	_ context.Context,
+	sessionKey string,
+	history []adk.Message,
+) error {
+	l := s.sessionLock(sessionKey)
+	l.Lock()
+	defer l.Unlock()
+
+	meta, err := s.readMeta(sessionKey)
+	if err != nil {
+		return err
+	}
+	now := time.Now()
+	if meta.CreatedAt.IsZero() {
+		meta.CreatedAt = now
+	}
+	meta.Skip = 0
+	meta.Count = len(history)
+	meta.UpdatedAt = now
+
+	// Write meta BEFORE rewriting the JSONL file. If we crash between
+	// the two writes, meta has Skip=0 and the old file is still intact,
+	// so GetHistory reads from line 1 — returning "too many" messages
+	// rather than losing data. The next SetHistory call corrects this.
+	err = s.writeMeta(sessionKey, meta)
+	if err != nil {
+		return err
+	}
+
+	return s.rewriteJSONL(sessionKey, history)
+}
+
+// Compact physically rewrites the JSONL file, dropping all logically
+// skipped lines. This reclaims disk space that accumulates after
+// repeated TruncateHistory calls.
+//
+// It is safe to call at any time; if there is nothing to compact
+// (skip == 0) the method returns immediately.
+func (s *JSONLStore) Compact(
+	_ context.Context, sessionKey string,
+) error {
+	l := s.sessionLock(sessionKey)
+	l.Lock()
+	defer l.Unlock()
+
+	meta, err := s.readMeta(sessionKey)
+	if err != nil {
+		return err
+	}
+	if meta.Skip == 0 {
+		return nil
+	}
+
+	// Read only the active messages, skipping truncated lines
+	// without unmarshaling them.
+	active, err := readMessages(s.jsonlPath(sessionKey), meta.Skip)
+	if err != nil {
+		return err
+	}
+
+	// Write meta BEFORE rewriting the JSONL file. If the process
+	// crashes between the two writes, meta has Skip=0 and the old
+	// (uncompacted) file is still intact, so GetHistory reads from
+	// line 1 — returning previously-truncated messages rather than
+	// losing data. The next Compact or TruncateHistory corrects this.
+	meta.Skip = 0
+	meta.Count = len(active)
+	meta.UpdatedAt = time.Now()
+
+	err = s.writeMeta(sessionKey, meta)
+	if err != nil {
+		return err
+	}
+
+	return s.rewriteJSONL(sessionKey, active)
+}
+
+// rewriteJSONL atomically replaces the JSONL file with the given messages
+// using the project's standard WriteFileAtomic (temp + fsync + rename).
+func (s *JSONLStore) rewriteJSONL(
+	sessionKey string, msgs []adk.Message,
+) error {
+	var buf bytes.Buffer
+	for i, msg := range msgs {
+		line, err := json.Marshal(msg)
+		if err != nil {
+			return fmt.Errorf("jsonl: marshal message %d: %w", i, err)
+		}
+		buf.Write(line)
+		buf.WriteByte('\n')
+	}
+	return filex.WriteFileAtomic(s.jsonlPath(sessionKey), buf.Bytes(), 0o644)
+}
+
+func (s *JSONLStore) GetSession(
+	_ context.Context, sessionKey string,
+) (*SessionMeta, error) {
+	l := s.sessionLock(sessionKey)
+	l.Lock()
+	defer l.Unlock()
+
+	meta, err := s.readMeta(sessionKey)
+	if err != nil {
+		return nil, err
+	}
+
+	// If the meta file doesn't exist, check if the JSONL file exists
+	// to provide a minimal response with just the key
+	if meta.Key == "" || meta.CreatedAt.IsZero() {
+		// Check if JSONL file exists
+		jsonlPath := s.jsonlPath(sessionKey)
+		if _, err := os.Stat(jsonlPath); err == nil {
+			// JSONL exists but meta doesn't - reconstruct basic meta
+			count, countErr := countLines(jsonlPath)
+			if countErr != nil {
+				return nil, countErr
+			}
+			meta.Key = sessionKey
+			meta.Count = count
+			meta.CreatedAt = time.Now()
+			meta.UpdatedAt = time.Now()
+		} else {
+			// Neither file exists - return zero value with key set
+			return &SessionMeta{Key: sessionKey}, nil
+		}
+	}
+
+	// Return a copy to prevent race conditions
+	metaCopy := meta
+	return &metaCopy, nil
+}
+
+func (s *JSONLStore) SaveSession(_ context.Context, meta *SessionMeta) error {
+	l := s.sessionLock(meta.Key)
+	l.Lock()
+	defer l.Unlock()
+
+	_, err := s.readMeta(meta.Key)
+	if err != nil {
+		return err
+	}
+
+	return s.writeMeta(meta.Key, *meta)
+}
+
+// DeleteHistory 删除会话历史消息（清空 JSONL 文件）
+func (s *JSONLStore) DeleteHistory(ctx context.Context, sessionKey string) error {
+	l := s.sessionLock(sessionKey)
+	l.Lock()
+	defer l.Unlock()
+
+	// 清空 JSONL 文件
+	jsonlPath := s.jsonlPath(sessionKey)
+	err := filex.WriteFileAtomic(jsonlPath, []byte{}, 0o644)
+	if err != nil && !os.IsNotExist(err) {
+		return fmt.Errorf("jsonl: truncate jsonl file: %w", err)
+	}
+
+	// 更新元数据
+	meta, err := s.readMeta(sessionKey)
+	if err != nil {
+		return err
+	}
+
+	meta.Count = 0
+	meta.Skip = 0
+	meta.UpdatedAt = time.Now()
+
+	return s.writeMeta(sessionKey, meta)
+}
+
+func (s *JSONLStore) ListSessions(
+	_ context.Context,
+) ([]*SessionMeta, error) {
+	// List all .jsonl files in the directory
+	entries, err := os.ReadDir(s.dir)
+	if err != nil {
+		return nil, fmt.Errorf("jsonl: read directory: %w", err)
+	}
+
+	var sessions []*SessionMeta
+	for _, entry := range entries {
+		if entry.IsDir() {
+			continue
+		}
+
+		// Only process .jsonl files (not .meta.json files)
+		name := entry.Name()
+		if !strings.HasSuffix(name, ".jsonl") {
+			continue
+		}
+
+		// Extract the session key from the filename
+		sessionKey := strings.TrimSuffix(name, ".jsonl")
+		sessionKey = strings.ReplaceAll(sessionKey, "_", ":")
+
+		// Load the metadata
+		meta, err := s.readMeta(sessionKey)
+		if err != nil {
+			log.Printf("jsonl: failed to read meta for session %s: %v", sessionKey, err)
+			continue
+		}
+
+		// Ensure the key is set correctly
+		if meta.Key == "" {
+			meta.Key = sessionKey
+		}
+
+		sessions = append(sessions, &meta)
+	}
+
+	return sessions, nil
+}
+
+func (s *JSONLStore) ListMetas(
+	_ context.Context,
+) ([]*SessionMeta, error) {
+	// List all .jsonl files in the directory
+	entries, err := os.ReadDir(s.dir)
+	if err != nil {
+		return nil, fmt.Errorf("jsonl: read directory: %w", err)
+	}
+
+	var sessions []*SessionMeta
+	for _, entry := range entries {
+		if entry.IsDir() {
+			continue
+		}
+
+		// Only process .jsonl files (not .meta.json files)
+		name := entry.Name()
+		if !strings.HasSuffix(name, ".jsonl") {
+			continue
+		}
+
+		// Extract session key from filename (replace ":" with "_")
+		sessionKey := strings.TrimSuffix(name, ".jsonl")
+		sessionKey = strings.ReplaceAll(sessionKey, "_", ":")
+
+		// Load metadata for each session
+		meta, err := s.GetMeta(context.Background(), sessionKey)
+		if err != nil {
+			// Skip failed sessions but log warning
+			continue
+		}
+
+		sessions = append(sessions, meta)
+	}
+
+	return sessions, nil
+}
+
+func (s *JSONLStore) RemoveSession(
+	_ context.Context, sessionKey string,
+) error {
+	l := s.sessionLock(sessionKey)
+	l.Lock()
+	defer l.Unlock()
+
+	// Remove JSONL file
+	jsonlPath := s.jsonlPath(sessionKey)
+	if err := os.Remove(jsonlPath); err != nil && !os.IsNotExist(err) {
+		return fmt.Errorf("jsonl: remove jsonl file: %w", err)
+	}
+
+	// Remove meta file
+	metaPath := s.metaPath(sessionKey)
+	if err := os.Remove(metaPath); err != nil && !os.IsNotExist(err) {
+		return fmt.Errorf("jsonl: remove meta file: %w", err)
+	}
+
+	return nil
+}
+
+func (s *JSONLStore) Close() error {
+	return nil
+}
+
+func (s *JSONLStore) GetMeta(
+	_ context.Context, sessionKey string,
+) (*SessionMeta, error) {
+	l := s.sessionLock(sessionKey)
+	l.Lock()
+	defer l.Unlock()
+
+	meta, err := s.readMeta(sessionKey)
+	if err != nil {
+		return nil, err
+	}
+
+	// If the meta file doesn't exist, check if the JSONL file exists
+	// to provide a minimal response with just the key
+	if meta.Key == "" || meta.CreatedAt.IsZero() {
+		return nil, nil
+	}
+
+	// Return a copy to prevent race conditions
+	metaCopy := meta
+	return &metaCopy, nil
+}
+
+func (s *JSONLStore) SaveMeta(_ context.Context, meta *SessionMeta) error {
+	l := s.sessionLock(meta.Key)
+	l.Lock()
+	defer l.Unlock()
+
+	_, err := s.readMeta(meta.Key)
+	if err != nil {
+		return err
+	}
+
+	return s.writeMeta(meta.Key, *meta)
+}
+
+func (s *JSONLStore) DeleteMeta(
+	_ context.Context, sessionKey string,
+) error {
+	l := s.sessionLock(sessionKey)
+	l.Lock()
+	defer l.Unlock()
+
+	// Remove meta file only
+	metaPath := s.metaPath(sessionKey)
+	if err := os.Remove(metaPath); err != nil && !os.IsNotExist(err) {
+		return fmt.Errorf("jsonl: remove meta file: %w", err)
+	}
+
+	return nil
+}
diff --git a/server/internal/ai/tools/approval_wrapper.go b/server/internal/ai/tools/approval_wrapper.go
new file mode 100644
index 00000000..3a2ef43b
--- /dev/null
+++ b/server/internal/ai/tools/approval_wrapper.go
@@ -0,0 +1,77 @@
+package tools
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/cloudwego/eino/components/tool"
+	"github.com/cloudwego/eino/schema"
+)
+
+type ApprovalInfo struct {
+	ToolName        string
+	ArgumentsInJSON string
+}
+
+type ApprovalResult struct {
+	Approved         bool
+	DisapproveReason *string
+}
+
+func (ai *ApprovalInfo) String() string {
+	return fmt.Sprintf("tool '%s' interrupted with arguments '%s', waiting for your approval, "+
+		"please answer with Y/N",
+		ai.ToolName, ai.ArgumentsInJSON)
+}
+
+func init() {
+	schema.Register[*ApprovalInfo]()
+}
+
+type InvokableApprovableTool struct {
+	tool.InvokableTool
+}
+
+func (i InvokableApprovableTool) Info(ctx context.Context) (*schema.ToolInfo, error) {
+	return i.InvokableTool.Info(ctx)
+}
+
+func (i InvokableApprovableTool) InvokableRun(ctx context.Context, argumentsInJSON string,
+	opts ...tool.Option,
+) (string, error) {
+	toolInfo, err := i.Info(ctx)
+	if err != nil {
+		return "", err
+	}
+
+	wasInterrupted, _, storedArguments := tool.GetInterruptState[string](ctx)
+	if !wasInterrupted {
+		return "", tool.StatefulInterrupt(ctx, &ApprovalInfo{
+			ToolName:        toolInfo.Name,
+			ArgumentsInJSON: argumentsInJSON,
+		}, argumentsInJSON)
+	}
+
+	isResumeTarget, hasData, data := tool.GetResumeContext[*ApprovalResult](ctx)
+	if isResumeTarget && hasData {
+		if data.Approved {
+			return i.InvokableTool.InvokableRun(ctx, storedArguments, opts...)
+		}
+
+		if data.DisapproveReason != nil {
+			return fmt.Sprintf("tool '%s' disapproved, reason: %s", toolInfo.Name, *data.DisapproveReason), nil
+		}
+
+		return fmt.Sprintf("tool '%s' disapproved", toolInfo.Name), nil
+	}
+
+	isResumeTarget, _, _ = tool.GetResumeContext[any](ctx)
+	if !isResumeTarget {
+		return "", tool.StatefulInterrupt(ctx, &ApprovalInfo{
+			ToolName:        toolInfo.Name,
+			ArgumentsInJSON: storedArguments,
+		}, storedArguments)
+	}
+
+	return i.InvokableTool.InvokableRun(ctx, storedArguments, opts...)
+}
diff --git a/server/internal/ai/tools/context.go b/server/internal/ai/tools/context.go
new file mode 100644
index 00000000..13ab905c
--- /dev/null
+++ b/server/internal/ai/tools/context.go
@@ -0,0 +1,22 @@
+package tools
+
+import (
+	"context"
+	"mayfly-go/pkg/contextx"
+
+	"github.com/spf13/cast"
+)
+
+const (
+	SessionKey contextx.CtxKey = "sessionKey"
+)
+
+// GetSessionKey 从上下文中获取会话Key
+func GetSessionKey(ctx context.Context) string {
+	return cast.ToString(ctx.Value(SessionKey))
+}
+
+// WithSessionKey 设置会话Key到上下文中
+func WithSessionKey(ctx context.Context, sessionKey string) context.Context {
+	return context.WithValue(ctx, SessionKey, sessionKey)
+}
diff --git a/server/internal/db/ai/tools/query_data.go b/server/internal/ai/tools/dbtool/query_data.go
similarity index 90%
rename from server/internal/db/ai/tools/query_data.go
rename to server/internal/ai/tools/dbtool/query_data.go
index c9e91afe..b88ff7bc 100644
--- a/server/internal/db/ai/tools/query_data.go
+++ b/server/internal/ai/tools/dbtool/query_data.go
@@ -1,8 +1,9 @@
-package tools
+package dbtool
 
 import (
 	"context"
 
+	"mayfly-go/internal/ai/tools"
 	"mayfly-go/internal/db/application"
 	"mayfly-go/internal/db/dbm/dbi"
 
@@ -27,7 +28,7 @@ func GetQueryData() (tool.InvokableTool, error) {
 		func(ctx context.Context, param *QueryDataParam) (*QueryDataOutput, error) {
 			conn, err := application.GetDbApp().GetDbConn(ctx, param.DbId, param.DbName)
 			if err != nil {
-				return nil, err
+				return nil, tools.NewToolError(err, tools.RecoverRetry)
 			}
 
 			rows := make([]map[string]any, 0)
@@ -39,7 +40,7 @@ func GetQueryData() (tool.InvokableTool, error) {
 				return nil
 			})
 			if err != nil {
-				return nil, err
+				return nil, tools.NewToolError(err, tools.RecoverRetry)
 			}
 
 			output := &QueryDataOutput{Columns: columns, Rows: rows}
diff --git a/server/internal/db/ai/tools/query_table_info.go b/server/internal/ai/tools/dbtool/query_table_info.go
similarity index 87%
rename from server/internal/db/ai/tools/query_table_info.go
rename to server/internal/ai/tools/dbtool/query_table_info.go
index 594882c5..a10eed45 100644
--- a/server/internal/db/ai/tools/query_table_info.go
+++ b/server/internal/ai/tools/dbtool/query_table_info.go
@@ -1,8 +1,9 @@
-package tools
+package dbtool
 
 import (
 	"context"
 
+	"mayfly-go/internal/ai/tools"
 	"mayfly-go/internal/db/application"
 
 	"github.com/cloudwego/eino/components/tool"
@@ -25,12 +26,12 @@ func GetQueryTableInfo() (tool.InvokableTool, error) {
 		func(ctx context.Context, param *QueryTableInfoParam) (*QueryTableInfoOutput, error) {
 			conn, err := application.GetDbApp().GetDbConn(ctx, param.DbId, param.DbName)
 			if err != nil {
-				return nil, err
+				return nil, tools.NewToolError(err, tools.RecoverRetry)
 			}
 
 			ddl, err := conn.GetMetadata().GetTableDDL(param.TableName, false)
 			if err != nil {
-				return nil, err
+				return nil, tools.NewToolError(err, tools.RecoverRetry)
 			}
 			output := &QueryTableInfoOutput{DDL: ddl}
 			return output, nil
diff --git a/server/internal/db/ai/tools/tools.go b/server/internal/ai/tools/dbtool/tools.go
similarity index 68%
rename from server/internal/db/ai/tools/tools.go
rename to server/internal/ai/tools/dbtool/tools.go
index cc8ef46e..33be9391 100644
--- a/server/internal/db/ai/tools/tools.go
+++ b/server/internal/ai/tools/dbtool/tools.go
@@ -1,7 +1,7 @@
-package tools
+package dbtool
 
 import (
-	"mayfly-go/internal/ai/agent"
+	"mayfly-go/internal/ai/tools"
 	"mayfly-go/pkg/logx"
 )
 
@@ -9,12 +9,12 @@ func Init() {
 	if queryTableTool, err := GetQueryTableInfo(); err != nil {
 		logx.Errorf("agent tool - 获取QueryTableInfo工具失败: %v", err)
 	} else {
-		agent.RegisterTool(agent.ToolTypeDb, queryTableTool)
+		tools.DefaultRegistry.Register(queryTableTool)
 	}
 
 	if queryDataTool, err := GetQueryData(); err != nil {
 		logx.Errorf("agent tool - 获取QueryData工具失败: %v", err)
 	} else {
-		agent.RegisterTool(agent.ToolTypeDb, queryDataTool)
+		tools.DefaultRegistry.Register(queryDataTool)
 	}
 }
diff --git a/server/internal/ai/tools/error.go b/server/internal/ai/tools/error.go
new file mode 100644
index 00000000..a9c660fb
--- /dev/null
+++ b/server/internal/ai/tools/error.go
@@ -0,0 +1,62 @@
+package tools
+
+import (
+	"errors"
+	"fmt"
+)
+
+var (
+	ErrToolFailed = errors.New("tool failed")
+)
+
+type RecoverStrategy string
+
+const (
+	RecoverNone  RecoverStrategy = "none"
+	RecoverRetry RecoverStrategy = "retry" // 重试，将错误消息返回给llm
+)
+
+type ToolError struct {
+	Msg      string          // 错误信息
+	Strategy RecoverStrategy // 恢复策略
+
+	ToolName   string // 工具名
+	ToolCallId string // tool call id
+
+	err error // 原始错误
+}
+
+func (e *ToolError) Error() string {
+	return e.Msg
+}
+
+func (e *ToolError) Unwrap() error {
+	return e.err
+}
+
+func (e *ToolError) WithToolName(toolName string) *ToolError {
+	e.ToolName = toolName
+	return e
+}
+
+func (e *ToolError) WithToolCallId(toolCallId string) *ToolError {
+	e.ToolCallId = toolCallId
+	return e
+}
+
+func NewToolError(err error, strategy RecoverStrategy) *ToolError {
+	if err == nil {
+		err = ErrToolFailed
+	}
+
+	return &ToolError{
+		Msg:      err.Error(),
+		Strategy: strategy,
+		err:      errors.Join(err, ErrToolFailed), // 带上ErrToolFailed，方便errors.Is判断
+	}
+}
+
+// GetToolErrorMsg 获取工具错误信息
+func GetToolErrorMsg(err error) string {
+	return fmt.Sprintf("[tool error] %v", err)
+}
diff --git a/server/internal/ai/tools/registry.go b/server/internal/ai/tools/registry.go
new file mode 100644
index 00000000..c2fea21c
--- /dev/null
+++ b/server/internal/ai/tools/registry.go
@@ -0,0 +1,97 @@
+package tools
+
+import (
+	"context"
+	"mayfly-go/pkg/utils/collx"
+
+	"github.com/cloudwego/eino/components/tool"
+)
+
+type ToolType string
+
+const (
+	ToolTypeDb   ToolType = "db"
+	ToolTypeFlow ToolType = "flow"
+)
+
+// Registry 工具注册中心
+type Registry struct {
+	tools collx.SM[string, tool.BaseTool] // 工具注册表
+}
+
+func NewRegistry() *Registry {
+	return &Registry{}
+}
+
+// DefaultRegistry 默认工具注册中心实例
+var DefaultRegistry = NewRegistry()
+
+// Register 注册工具到注册中心
+func (r *Registry) Register(tools ...tool.BaseTool) error {
+	for _, t := range tools {
+		ti, err := t.Info(context.Background())
+		if err != nil {
+			return err
+		}
+		r.tools.Store(ti.Name, t)
+	}
+	return nil
+}
+
+// Get 获取工具
+func (r *Registry) Get(name string) (tool.BaseTool, bool) {
+	return r.tools.Load(name)
+}
+
+// GetAll 获取所有工具
+func (r *Registry) GetAll() []tool.BaseTool {
+	return r.tools.Values()
+}
+
+// Clear 清空工具注册表
+func (r *Registry) Clear() {
+	r.tools.Clear()
+}
+
+// toolRegistry 工具注册中心，一个ToolType对应多个工具
+var toolRegistry collx.SM[ToolType, []tool.BaseTool]
+
+// RegisterTool 注册agent工具
+func RegisterTool(toolType ToolType, tool ...tool.BaseTool) {
+	if tools, exist := toolRegistry.Load(toolType); exist {
+		toolRegistry.Store(toolType, append(tools, tool...))
+	} else {
+		toolRegistry.Store(toolType, tool)
+	}
+}
+
+// GetTools 获取指定类型的所有工具
+func GetTools(toolType ToolType) ([]tool.BaseTool, bool) {
+	return toolRegistry.Load(toolType)
+}
+
+// GetAllTools 获取所有已注册的工具
+func GetAllTools() []tool.BaseTool {
+	var allTools []tool.BaseTool
+	toolRegistry.Range(func(key ToolType, tools []tool.BaseTool) bool {
+		allTools = append(allTools, tools...)
+		return true
+	})
+	return allTools
+}
+
+// GetToolsByTypes 获取指定类型的多个工具
+func GetToolsByTypes(types []ToolType) map[ToolType][]tool.BaseTool {
+	result := make(map[ToolType][]tool.BaseTool)
+	for _, t := range types {
+		if tools, exists := toolRegistry.Load(t); exists {
+			result[t] = tools
+		}
+	}
+	return result
+}
+
+// ClearTools 清空指定类型的工具
+func ClearTools(toolType ToolType) {
+	toolRegistry.Delete(toolType)
+}
diff --git a/server/internal/db/application/db_data_sync.go b/server/internal/db/application/db_data_sync.go
index 0705b341..4eb272bb 100644
--- a/server/internal/db/application/db_data_sync.go
+++ b/server/internal/db/application/db_data_sync.go
@@ -90,7 +90,7 @@ func (app *dataSyncAppImpl) Save(ctx context.Context, taskEntity *entity.DataSyn
 
 func (app *dataSyncAppImpl) Delete(ctx context.Context, id uint64) error {
 	task, err := app.GetById(id)
-	if err == nil {
+	if err != nil {
 		return errorx.NewBiz("sync task not found")
 	}
 	scheduler.RemoveByKey(task.TaskKey)
@@ -133,7 +133,7 @@ func (app *dataSyncAppImpl) Run(ctx context.Context, id uint64) error {
 			CreateTime: &now,
 			Status:     entity.DataSyncTaskStateFail, // 默认失败
 		}
-		
+
 		defer app.endRunning(task, syncLog)
 		defer gox.Recover(func(err error) {
 			syncLog.ErrText = i18n.T(imsg.DataSyncFailMsg, "msg", err.Error())
@@ -383,7 +383,7 @@ func (app *dataSyncAppImpl) saveLog(log *entity.DataSyncLog) {
 }
 
 func (app *dataSyncAppImpl) InitCronJob() {
-	ctx := contextx.NewTraceId()
+	ctx := contextx.WithTraceId(context.Background())
 
 	defer func() {
 		if err := recover(); err != nil {
diff --git a/server/internal/db/application/db_sql_exec.go b/server/internal/db/application/db_sql_exec.go
index 4434d1df..53f457f7 100644
--- a/server/internal/db/application/db_sql_exec.go
+++ b/server/internal/db/application/db_sql_exec.go
@@ -298,7 +298,7 @@ func (d *dbSqlExecAppImpl) FlowBizHandle(ctx context.Context, bizHandleParam *fl
 		return nil, nil
 	}
 
-	execSqlBizForm, err := jsonx.To[FlowDbExecSqlBizForm](procinst.BizForm)
+	execSqlBizForm, err := jsonx.ToByStr[FlowDbExecSqlBizForm](procinst.BizForm)
 	if err != nil {
 		return nil, errorx.NewBizf("failed to parse the business form information: %s", err.Error())
 	}
diff --git a/server/internal/db/application/db_transfer.go b/server/internal/db/application/db_transfer.go
index 948f1138..2896fe4b 100644
--- a/server/internal/db/application/db_transfer.go
+++ b/server/internal/db/application/db_transfer.go
@@ -89,7 +89,7 @@ func (app *dbTransferAppImpl) Save(ctx context.Context, taskEntity *entity.DbTra
 	if err != nil {
 		return err
 	}
-	
+
 	app.addCronJob(ctx, taskEntity)
 	return nil
 }
@@ -123,7 +123,7 @@ func (app *dbTransferAppImpl) InitCronJob() {
 	_ = app.transferFileApp.UpdateByCond(context.TODO(), &entity.DbTransferFile{Status: entity.DbTransferFileStatusFail}, &entity.DbTransferFile{Status: entity.DbTransferFileStatusRunning})
 
 	if err := app.CursorByCond(&entity.DbTransferTaskQuery{Status: entity.DbTransferTaskStatusEnable, CronAble: entity.DbTransferTaskCronAbleEnable}, func(dtt *entity.DbTransferTask) error {
-		app.addCronJob(contextx.NewTraceId(), dtt)
+		app.addCronJob(contextx.WithTraceId(context.Background()), dtt)
 		return nil
 	}); err != nil {
 		logx.ErrorTrace("the db data transfer task failed to initialize", err)
@@ -215,7 +215,7 @@ func (app *dbTransferAppImpl) transfer2Db(ctx context.Context, logId uint64, tas
 	for _, tables := range tableGroups {
 		errGroup.Go(func() error {
 			defer gox.Recover()
-			
+
 			if !app.IsRunning(taskId) {
 				return errorx.NewBiz("transfer stopped")
 			}
@@ -224,7 +224,7 @@ func (app *dbTransferAppImpl) transfer2Db(ctx context.Context, logId uint64, tas
 			pr, pw := io.Pipe()
 			defer pr.Close()
 
-			gox.Go(func ()  {
+			gox.Go(func() {
 				defer pw.Close()
 				err := app.dbApp.DumpDb(ctx, &dto.DumpDb{
 					LogId:        logId,
@@ -319,7 +319,7 @@ func (app *dbTransferAppImpl) transfer2File(ctx context.Context, logId uint64, t
 
 	go func() {
 		var err error
-		
+
 		defer closeFunc(&err)
 		defer app.MarkStop(taskId)
 		defer app.logApp.Flush(logId, true)
diff --git a/server/internal/db/dbm/dbi/db_info.go b/server/internal/db/dbm/dbi/db_info.go
index bb05c614..3377a56c 100644
--- a/server/internal/db/dbm/dbi/db_info.go
+++ b/server/internal/db/dbm/dbi/db_info.go
@@ -50,6 +50,10 @@ type DbInfo struct {
 
 var _ (mcm.SshTunnelAble) = (*DbInfo)(nil)
 
+func (di *DbInfo) String() string {
+	return fmt.Sprintf("DbInfo{Id: %d, Name: %s, Type: %s, Host: %s, Port: %d, Database: %s}", di.Id, di.Name, di.Type, di.Host, di.Port, di.Database)
+}
+
 func (di *DbInfo) GetSshTunnelMachineId() int64 {
 	return int64(di.SshTunnelMachineId)
 }
diff --git a/server/internal/db/dbm/postgres/column.go b/server/internal/db/dbm/postgres/column.go
index 88aecf44..1e40f93e 100644
--- a/server/internal/db/dbm/postgres/column.go
+++ b/server/internal/db/dbm/postgres/column.go
@@ -5,7 +5,7 @@ import (
 )
 
 var (
-	Bool        = dbi.NewDbDataType("bool", dbi.DTBool).WithCT(dbi.CTBool).WithFixColumn(dbi.ClearNumScale)
+	Bool        = dbi.NewDbDataType("bool", dbi.DTString).WithCT(dbi.CTBool).WithFixColumn(dbi.ClearNumScale)
 	Int2        = dbi.NewDbDataType("int2", dbi.DTInt16).WithCT(dbi.CTInt2).WithFixColumn(dbi.ClearNumScale)
 	Int4        = dbi.NewDbDataType("int4", dbi.DTInt32).WithCT(dbi.CTInt4).WithFixColumn(dbi.ClearNumScale)
 	Int8        = dbi.NewDbDataType("int8", dbi.DTInt64).WithCT(dbi.CTInt8).WithFixColumn(dbi.ClearNumScale)
diff --git a/server/internal/db/init/init.go b/server/internal/db/init/init.go
index cea7ba62..6f73c9b3 100644
--- a/server/internal/db/init/init.go
+++ b/server/internal/db/init/init.go
@@ -1,7 +1,6 @@
 package init
 
 import (
-	"mayfly-go/internal/db/ai/tools"
 	"mayfly-go/internal/db/api"
 	"mayfly-go/internal/db/application"
 	"mayfly-go/internal/db/infra/persistence"
@@ -17,6 +16,4 @@ func init() {
 
 	starter.AddInitFunc(application.Init)
 	starter.AddTerminateFunc(Terminate)
-	// 注册AI数据库工具
-	tools.Init()
 }
diff --git a/server/internal/flow/application/node_aitask.go b/server/internal/flow/application/node_aitask.go
index 3c61c036..77d8d9e9 100644
--- a/server/internal/flow/application/node_aitask.go
+++ b/server/internal/flow/application/node_aitask.go
@@ -13,6 +13,8 @@ import (
 	"mayfly-go/pkg/utils/collx"
 	"mayfly-go/pkg/utils/jsonx"
 	"time"
+
+	"github.com/cloudwego/eino/schema"
 )
 
 /******************* AI任务节点 *******************/
@@ -68,7 +70,7 @@ func (u *AiTaskNodeBehavior) Execute(ctx *ExecutionCtx) error {
 	flowNode := ctx.GetFlowNode()
 	aitaskNode := ToAiTaskNode(flowNode)
 
-	aiagent, err := agent.GetOpsExpertAgent(ctx, agent.ToolTypeDb)
+	aiagent, err := agent.GetDefaultAgent(ctx)
 	if err != nil {
 		return err
 	}
@@ -95,7 +97,8 @@ func (u *AiTaskNodeBehavior) Execute(ctx *ExecutionCtx) error {
 
 	cancelCtx, cancelFunc := context.WithTimeout(context.Background(), 1*time.Minute)
 	defer cancelFunc()
-	res, err := aiagent.Run(cancelCtx, sysPrompt, jsonx.ToStr(procinst.BizForm))
+
+	res, err := aiagent.Run(cancelCtx, collx.AsArray(schema.SystemMessage(sysPrompt), schema.UserMessage(jsonx.ToStr(procinst.BizForm))))
 	if err != nil {
 		suggestion = fmt.Sprintf("AI agent response failed: %v", err)
 		logx.Error(suggestion)
diff --git a/server/internal/flow/domain/entity/procdef.go b/server/internal/flow/domain/entity/procdef.go
index 0d48a9a1..d344ea8e 100644
--- a/server/internal/flow/domain/entity/procdef.go
+++ b/server/internal/flow/domain/entity/procdef.go
@@ -61,7 +61,7 @@ func (p *Procdef) GetFlowDef() *FlowDef {
 	if p.FlowDef == "" {
 		return nil
 	}
-	flow, err := jsonx.To[FlowDef](p.FlowDef)
+	flow, err := jsonx.ToByStr[FlowDef](p.FlowDef)
 	if err != nil {
 		logx.ErrorTrace("parse flow def failed", err)
 		return flow
diff --git a/server/internal/flow/domain/entity/procinst.go b/server/internal/flow/domain/entity/procinst.go
index 2e6692df..e92ee0e2 100644
--- a/server/internal/flow/domain/entity/procinst.go
+++ b/server/internal/flow/domain/entity/procinst.go
@@ -43,7 +43,7 @@ func (a *Procinst) SetEnd() {
 
 // GetProcdefFlow 获取流程定义信息
 func (p *Procinst) GetFlowDef() *FlowDef {
-	flow, err := jsonx.To[FlowDef](p.FlowDef)
+	flow, err := jsonx.ToByStr[FlowDef](p.FlowDef)
 	if err != nil {
 		logx.ErrorTrace("parse procdef flow failed", err)
 		return flow
diff --git a/server/internal/machine/api/machine_script.go b/server/internal/machine/api/machine_script.go
index 1c34b113..0f04f996 100644
--- a/server/internal/machine/api/machine_script.go
+++ b/server/internal/machine/api/machine_script.go
@@ -79,7 +79,7 @@ func (m *MachineScript) RunMachineScript(rc *req.Ctx) {
 	script := ms.Script
 	// 如果有脚本参数，则用脚本参数替换脚本中的模板占位符参数
 	if params := rc.Query("params"); params != "" {
-		p, err := jsonx.ToMap(params)
+		p, err := jsonx.ToMapByStr(params)
 		biz.ErrIsNil(err)
 		script, err = stringx.TemplateParse(ms.Script, p)
 		biz.ErrIsNilAppendErr(err, "failed to parse the script template parameter: %s")
diff --git a/server/internal/machine/infra/cache/machine_stats.go b/server/internal/machine/infra/cache/machine_stats.go
index b5195d02..a66ac82e 100644
--- a/server/internal/machine/infra/cache/machine_stats.go
+++ b/server/internal/machine/infra/cache/machine_stats.go
@@ -20,5 +20,5 @@ func GetMachineStats(machineId uint64) (*mcm.Stats, error) {
 	if cacheStr == "" {
 		return nil, errors.New("不存在该值")
 	}
-	return jsonx.To[mcm.Stats](cacheStr)
+	return jsonx.ToByStr[mcm.Stats](cacheStr)
 }
diff --git a/server/internal/machine/mcm/client_cache.go b/server/internal/machine/mcm/client_cache.go
index 0f228987..17fc4db9 100644
--- a/server/internal/machine/mcm/client_cache.go
+++ b/server/internal/machine/mcm/client_cache.go
@@ -11,14 +11,13 @@ var (
 )
 
 // 从缓存中获取客户端信息，不存在则回调获取机器信息函数，并新建。
-//  -  机器的授权凭证名
+//   - 机器的授权凭证名
 func GetMachineCli(ctx context.Context, authCertName string, getMachine func(string) (*MachineInfo, error)) (*Cli, error) {
 	pool, err := poolGroup.GetCachePool(authCertName, func() (*Cli, error) {
 		mi, err := getMachine(authCertName)
 		if err != nil {
 			return nil, err
 		}
-		mi.Key = authCertName
 		return mi.Conn(context.Background())
 	})
 
diff --git a/server/internal/machine/mcm/machine.go b/server/internal/machine/mcm/machine.go
index 11e49015..5c31570c 100644
--- a/server/internal/machine/mcm/machine.go
+++ b/server/internal/machine/mcm/machine.go
@@ -19,7 +19,6 @@ import (
 type MachineInfo struct {
 	model.ExtraData
 
-	Key      string `json:"key"` // 缓存key
 	Id       uint64 `json:"id"`
 	Name     string `json:"name"`
 	Code     string `json:"code"`
@@ -28,15 +27,13 @@ type MachineInfo struct {
 	Ip   string `json:"ip"` // IP地址
 	Port int    `json:"-"`  // 端口号
 
-	AuthCertName string                 `json:"authCertName"`
-	AuthCertType tagentity.AuthCertType `json:"-"`
-	AuthMethod   int8                   `json:"-"` // 授权认证方式
-	Username     string                 `json:"-"` // 用户名
-	Password     string                 `json:"-"`
-	Passphrase   string                 `json:"-"` // 私钥口令
+	AuthCertName string `json:"authCertName"`
+	AuthMethod   int8   `json:"-"` // 授权认证方式
+	Username     string `json:"-"` // 用户名
+	Password     string `json:"-"`
+	Passphrase   string `json:"-"` // 私钥口令
 
 	SshTunnelMachine *MachineInfo `json:"-"` // ssh隧道机器
-	TempSshMachineId uint64       `json:"-"` // ssh隧道机器id，用于记录隧道机器id，连接出错后关闭隧道
 	RemoteAddr       string       `json:"-"` // ssh隧道远程地址，格式 ip:port
 	EnableRecorder   int8         `json:"-"` // 是否启用终端回放记录
 	CodePath         []string     `json:"codePath"`
@@ -45,7 +42,10 @@ type MachineInfo struct {
 var _ (SshTunnelAble) = (*MachineInfo)(nil)
 
 func (mi *MachineInfo) GetSshTunnelMachineId() int64 {
-	return int64(mi.TempSshMachineId)
+	if mi.SshTunnelMachine == nil {
+		return 0
+	}
+	return int64(mi.SshTunnelMachine.Id)
 }
 
 func (mi *MachineInfo) GetRemoteAddr() string {
@@ -59,6 +59,57 @@ func (mi *MachineInfo) UseSshTunnel() bool {
 	return mi.SshTunnelMachine != nil
 }
 
+// GetSshClient 获取ssh客户端连接
+func (mi *MachineInfo) GetSshClient(jumpClient *ssh.Client) (*ssh.Client, error) {
+	config := &ssh.ClientConfig{
+		User: mi.Username,
+		HostKeyCallback: func(hostname string, remote net.Addr, key ssh.PublicKey) error {
+			return nil
+		},
+		Timeout: 10 * time.Second,
+	}
+	if ciphers := mi.GetExtraString("ciphers"); ciphers != "" {
+		config.Ciphers = strings.Split(ciphers, ",")
+	}
+	if keyExchanges := mi.GetExtraString("keyExchanges"); keyExchanges != "" {
+		config.KeyExchanges = strings.Split(keyExchanges, ",")
+	}
+
+	if mi.AuthMethod == int8(tagentity.AuthCertCiphertextTypePassword) {
+		config.Auth = []ssh.AuthMethod{ssh.Password(mi.Password)}
+	} else if mi.AuthMethod == int8(tagentity.AuthCertCiphertextTypePrivateKey) {
+		var key ssh.Signer
+		var err error
+
+		if len(mi.Passphrase) > 0 {
+			key, err = ssh.ParsePrivateKeyWithPassphrase([]byte(mi.Password), []byte(mi.Passphrase))
+		} else {
+			key, err = ssh.ParsePrivateKey([]byte(mi.Password))
+		}
+		if err != nil {
+			return nil, err
+		}
+		config.Auth = []ssh.AuthMethod{ssh.PublicKeys(key)}
+	}
+
+	addr := fmt.Sprintf("%s:%d", mi.Ip, mi.Port)
+	if jumpClient != nil {
+		// 连接目标服务器
+		netConn, err := jumpClient.Dial("tcp", addr)
+		if err != nil {
+			return nil, err
+		}
+		conn, channel, reqs, err := ssh.NewClientConn(netConn, addr, config)
+		if err != nil {
+			return nil, err
+		}
+		// 创建目标服务器的 SSH 客户端
+		return ssh.NewClient(conn, channel, reqs), nil
+	}
+
+	return ssh.Dial("tcp", addr, config)
+}
+
 // 连接
 func (mi *MachineInfo) Conn(ctx context.Context) (*Cli, error) {
 	logx.Infof("the machine[%s] is connecting: %s:%d", mi.Name, mi.Ip, mi.Port)
@@ -70,11 +121,9 @@ func (mi *MachineInfo) Conn(ctx context.Context) (*Cli, error) {
 	}
 
 	cli := &Cli{Info: mi}
-	sshClient, err := GetSshClient(mi, nil)
+	sshClient, err := mi.GetSshClient(nil)
 	if err != nil {
-		if mi.UseSshTunnel() {
-			CloseSshTunnel(mi)
-		}
+		CloseSshTunnel(mi)
 		return nil, err
 	}
 	cli.sshClient = sshClient
@@ -114,80 +163,5 @@ func (mi *MachineInfo) IfUseSshTunnelChangeIpPort(ctx context.Context, out bool)
 	// 修改机器ip地址
 	mi.Ip = exposeIp
 	mi.Port = exposePort
-	// 代理之后置空跳板机信息，防止重复跳
-	mi.TempSshMachineId = stm.Id
-	mi.SshTunnelMachine = nil
 	return nil
 }
-
-func GetSshClient(m *MachineInfo, jumpClient *ssh.Client) (*ssh.Client, error) {
-	// 递归一直取到底层没有跳板机的机器信息
-	if m.SshTunnelMachine != nil {
-		jumpClient, err := GetSshClient(m.SshTunnelMachine, jumpClient)
-		if err != nil {
-			return nil, err
-		}
-		// 新建一个没有跳板机的机器信息
-		m1 := &MachineInfo{
-			Ip:         m.Ip,
-			Port:       m.Port,
-			AuthMethod: m.AuthMethod,
-			Username:   m.Username,
-			Password:   m.Password,
-			Passphrase: m.Passphrase,
-		}
-		// 使用跳板机连接目标机器
-		return GetSshClient(m1, jumpClient)
-	}
-	// 配置 SSH 客户端
-	config := &ssh.ClientConfig{
-		User: m.Username,
-		HostKeyCallback: func(hostname string, remote net.Addr, key ssh.PublicKey) error {
-			return nil
-		},
-		Timeout: 5 * time.Second,
-	}
-	if ciphers := m.GetExtraString("ciphers"); ciphers != "" {
-		config.Ciphers = strings.Split(ciphers, ",")
-	}
-	if keyExchanges := m.GetExtraString("keyExchanges"); keyExchanges != "" {
-		config.KeyExchanges = strings.Split(keyExchanges, ",")
-	}
-
-	if m.AuthMethod == int8(tagentity.AuthCertCiphertextTypePassword) {
-		config.Auth = []ssh.AuthMethod{ssh.Password(m.Password)}
-	} else if m.AuthMethod == int8(tagentity.AuthCertCiphertextTypePrivateKey) {
-		var key ssh.Signer
-		var err error
-
-		if len(m.Passphrase) > 0 {
-			key, err = ssh.ParsePrivateKeyWithPassphrase([]byte(m.Password), []byte(m.Passphrase))
-		} else {
-			key, err = ssh.ParsePrivateKey([]byte(m.Password))
-		}
-		if err != nil {
-			return nil, err
-		}
-		config.Auth = []ssh.AuthMethod{ssh.PublicKeys(key)}
-	}
-
-	addr := fmt.Sprintf("%s:%d", m.Ip, m.Port)
-	if jumpClient != nil {
-		// 连接目标服务器
-		netConn, err := jumpClient.Dial("tcp", addr)
-		if err != nil {
-			return nil, err
-		}
-		conn, channel, reqs, err := ssh.NewClientConn(netConn, addr, config)
-		if err != nil {
-			return nil, err
-		}
-		// 创建目标服务器的 SSH 客户端
-		return ssh.NewClient(conn, channel, reqs), nil
-	}
-	sshClient, err := ssh.Dial("tcp", addr, config)
-	if err != nil {
-		return nil, err
-	}
-	return sshClient, nil
-}
diff --git a/server/internal/machine/mcm/sshtunnel.go b/server/internal/machine/mcm/sshtunnel.go
index d6ff7a0f..32b12f1b 100644
--- a/server/internal/machine/mcm/sshtunnel.go
+++ b/server/internal/machine/mcm/sshtunnel.go
@@ -40,13 +40,25 @@ func GetSshTunnelMachine(ctx context.Context, machineId int, getMachine func(uin
 		if mi == nil {
 			return nil, errors.New("error get machine info")
 		}
-		sshClient, err := GetSshClient(mi, nil)
-		if err != nil {
-			return nil, err
-		}
-		stm := &SshTunnelMachine{SshClient: sshClient, machineId: machineId, tunnels: map[string]*Tunnel{}, mi: mi}
 		logx.Infof("ssh tunnel machine - connect to machine for the first time - [%d][%s:%d]", machineId, mi.Ip, mi.Port)
 
+		clients := []*ssh.Client{}
+		var prev *ssh.Client
+		for {
+			client, err := mi.GetSshClient(prev)
+			if err != nil {
+				return nil, err
+			}
+			clients = append(clients, client)
+			prev = client
+			mi = mi.SshTunnelMachine
+			if mi == nil {
+				break
+			}
+		}
+
+		stm := &SshTunnelMachine{sshClients: clients, machineId: machineId, tunnels: map[string]*Tunnel{}}
+
 		return stm, err
 	}, pool.WithIdleTimeout[*SshTunnelMachine](0), pool.WithHealthCheckInterval[*SshTunnelMachine](1*time.Minute))
 
@@ -90,22 +102,22 @@ func CloseSshTunnel(sshTunnelAble SshTunnelAble) {
 
 // ssh隧道机器
 type SshTunnelMachine struct {
-	mi        *MachineInfo
-	machineId int // 隧道机器id
-	SshClient *ssh.Client
-	mutex     sync.Mutex
-	tunnels   map[string]*Tunnel // 隧道id -> 隧道
+	machineId  int                // 隧道机器id
+	sshClients []*ssh.Client      // ssh客户端，可能跳转多个
+	tunnels    map[string]*Tunnel // 隧道id -> 隧道
+
+	mutex sync.RWMutex
 }
 
 /******************* pool.Conn impl *******************/
 
 func (stm *SshTunnelMachine) Ping() error {
-	_, _, err := stm.SshClient.SendRequest(
-        "keepalive@openssh.com",
-        true,
-        nil,
-    )
-    return err
+	_, _, err := stm.GetClient().SendRequest(
+		"keepalive@openssh.com",
+		true,
+		nil,
+	)
+	return err
 }
 
 // Close 关闭ssh隧道机器及其所有隧道
@@ -120,17 +132,26 @@ func (stm *SshTunnelMachine) Close() error {
 		}
 	}
 
-	if stm.SshClient != nil {
+	if len(stm.sshClients) > 0 {
 		logx.Infof("ssh tunnel machine [%d] is not in use, close tunnel...", stm.machineId)
-		err := stm.SshClient.Close()
-		if err != nil {
-			logx.Errorf("error in closing ssh tunnel machine [%d]: %s", stm.machineId, err.Error())
+		for _, sshClient := range stm.sshClients {
+			if err := sshClient.Close(); err != nil {
+				logx.Errorf("ssh tunnel machine [%d] close failed: %s", stm.machineId, err.Error())
+			}
 		}
 	}
 
 	return nil
 }
 
+// GetClient 获取ssh客户端
+func (stm *SshTunnelMachine) GetClient() *ssh.Client {
+	if len(stm.sshClients) == 0 {
+		return nil
+	}
+	return stm.sshClients[len(stm.sshClients)-1]
+}
+
 // OpenSshTunnel 打开ssh隧道，返回暴露的ip和端口
 func (stm *SshTunnelMachine) OpenSshTunnel(sshTunnelAble SshTunnelAble) (exposedIp string, exposedPort int, err error) {
 	stm.mutex.Lock()
@@ -146,7 +167,7 @@ func (stm *SshTunnelMachine) OpenSshTunnel(sshTunnelAble SshTunnelAble) (exposed
 		return tunnel.LocalHost, tunnel.LocalPort, nil
 	}
 
-	tunnel, err = NewTunnel(tunnelKey, stm.SshClient, remoteAddr)
+	tunnel, err = NewTunnel(tunnelKey, stm.GetClient(), remoteAddr)
 	if err != nil {
 		return "", 0, err
 	}
@@ -156,18 +177,18 @@ func (stm *SshTunnelMachine) OpenSshTunnel(sshTunnelAble SshTunnelAble) (exposed
 
 // GetDialConn 获取通过ssh隧道连接远程地址的连接
 func (stm *SshTunnelMachine) GetDialConn(network string, addr string) (net.Conn, error) {
-	return stm.SshClient.Dial(network, addr)
+	return stm.GetClient().Dial(network, addr)
 }
 
 type Tunnel struct {
-	Id        string // 唯一标识
+	Id string // 唯一标识
 
 	LocalHost  string // 本地监听地址
 	LocalPort  int    // 本地端口
 	RemoteAddr string // 远程连接地址
 
 	refCount atomic.Int64 // 引用计数
-	Closed   atomic.Bool // 是否已关闭
+	Closed   atomic.Bool  // 是否已关闭
 
 	localListener net.Listener
 	localConns    collx.SM[net.Conn, any] // net.Conn -> struct{}
@@ -269,8 +290,8 @@ func (t *Tunnel) Release() {
 // Close 关闭隧道
 func (t *Tunnel) Close() {
 	if t.Closed.Swap(true) {
-        return
-    }
+		return
+	}
 	logx.Infof("ssh tunnel [%s] - closed", t.Id)
 
 	_ = t.localListener.Close()
diff --git a/server/internal/msg/api/msg_tmpl.go b/server/internal/msg/api/msg_tmpl.go
index f186b62e..8aea1a7c 100644
--- a/server/internal/msg/api/msg_tmpl.go
+++ b/server/internal/msg/api/msg_tmpl.go
@@ -78,7 +78,7 @@ func (m *MsgTmpl) SendMsg(rc *req.Ctx) {
 
 	rc.ReqParam = form
 
-	params, err := jsonx.ToMap(form.Parmas)
+	params, err := jsonx.ToMapByStr(form.Parmas)
 	biz.ErrIsNil(err)
 	biz.ErrIsNil(m.msgTmplApp.Send(rc.MetaCtx, code, params, form.ReceiverIds...))
 }
diff --git a/server/internal/pkg/config/app.go b/server/internal/pkg/config/app.go
index 03b35b25..fe85e2e9 100644
--- a/server/internal/pkg/config/app.go
+++ b/server/internal/pkg/config/app.go
@@ -1,5 +1,5 @@
 package config
 
 const (
-	Version = "v1.10.11"
+	Version = "v1.11.0"
 )
diff --git a/server/internal/redis/application/redis.go b/server/internal/redis/application/redis.go
index f2ef256d..6434a3b7 100644
--- a/server/internal/redis/application/redis.go
+++ b/server/internal/redis/application/redis.go
@@ -252,7 +252,7 @@ func (r *redisAppImpl) FlowBizHandle(ctx context.Context, bizHandleParam *flowap
 		return nil, nil
 	}
 
-	runCmdParam, err := jsonx.To[FlowRedisRunCmdBizForm](procinst.BizForm)
+	runCmdParam, err := jsonx.ToByStr[FlowRedisRunCmdBizForm](procinst.BizForm)
 	if err != nil {
 		return nil, errorx.NewBizf("failed to parse the business form information: %s", err.Error())
 	}
diff --git a/server/internal/sys/application/syslog.go b/server/internal/sys/application/syslog.go
index 79e2a25d..a3e1f7f9 100644
--- a/server/internal/sys/application/syslog.go
+++ b/server/internal/sys/application/syslog.go
@@ -151,7 +151,7 @@ func (m *syslogAppImpl) AppendLog(logId uint64, appendLog *AppendLogReq) {
 	syslog.Resp = fmt.Sprintf("%s\n%s", syslog.Resp, appendLogMsg)
 	syslog.Type = appendLog.Type
 	if len(appendLog.Extra) > 0 {
-		existExtra, _ := jsonx.ToMap(syslog.Extra)
+		existExtra, _ := jsonx.ToMapByStr(syslog.Extra)
 		syslog.Extra = jsonx.ToStr(collx.MapMerge(existExtra, appendLog.Extra))
 	}
 
@@ -169,7 +169,7 @@ func (m *syslogAppImpl) SetExtra(logId uint64, key string, val any) {
 		syslog = sl
 	}
 
-	extraMap, _ := jsonx.ToMap(syslog.Extra)
+	extraMap, _ := jsonx.ToMapByStr(syslog.Extra)
 	if extraMap == nil {
 		extraMap = make(map[string]any)
 	}
diff --git a/server/internal/sys/domain/entity/config.go b/server/internal/sys/domain/entity/config.go
index 95b00682..14196886 100644
--- a/server/internal/sys/domain/entity/config.go
+++ b/server/internal/sys/domain/entity/config.go
@@ -41,7 +41,7 @@ func (c *Config) GetJsonM() collx.M {
 	if c.Id == 0 || c.Value == "" {
 		return collx.M{}
 	}
-	res, _ := jsonx.ToMap(c.Value)
+	res, _ := jsonx.ToMapByStr(c.Value)
 	return res
 }
 
diff --git a/server/migration/migration.go b/server/migration/migration.go
index 34c2667a..20944495 100644
--- a/server/migration/migration.go
+++ b/server/migration/migration.go
@@ -26,6 +26,7 @@ func RunMigrations(db *gorm.DB) error {
 		migrations.Init,
 		migrations.V1_9,
 		migrations.V1_10,
+		migrations.V1_11,
 	)
 
 	if err == nil {
diff --git a/server/migration/migrations/v1_11.go b/server/migration/migrations/v1_11.go
new file mode 100644
index 00000000..bd820060
--- /dev/null
+++ b/server/migration/migrations/v1_11.go
@@ -0,0 +1,36 @@
+package migrations
+
+import (
+	aientity "mayfly-go/internal/ai/domain/entity"
+
+	"github.com/go-gormigrate/gormigrate/v2"
+	"gorm.io/gorm"
+)
+
+func V1_11() []*gormigrate.Migration {
+	var migrations []*gormigrate.Migration
+	migrations = append(migrations, V1_11_0()...)
+	return migrations
+}
+
+func V1_11_0() []*gormigrate.Migration {
+	return []*gormigrate.Migration{
+		{
+			ID: "v1.11.0",
+			Migrate: func(tx *gorm.DB) error {
+				err := tx.AutoMigrate(&aientity.Session{},
+					&aientity.SessionMessage{},
+				)
+				if err != nil {
+					return err
+				}
+				tx.Exec(`INSERT INTO t_sys_resource (id, pid, ui_path, type, status, name, code, weight, meta, creator_id, creator, modifier_id, modifier, create_time, update_time, is_deleted, delete_time) VALUES (1775967861, 0, 'lUgXhO96/', 1, 1, 'AI', '/ai', 20000000, '{"icon":"icon ai/ai","isKeepAlive":true,"routeName":"ai"}', 1, 'admin', 1, 'admin', '2026-04-12 12:24:22', '2026-04-12 17:08:47', 0, NULL)`)
+				tx.Exec(`INSERT INTO t_sys_resource (id, pid, ui_path, type, status, name, code, weight, meta, creator_id, creator, modifier_id, modifier, create_time, update_time, is_deleted, delete_time) VALUES (1775967903, 1775967861, 'lUgXhO96/VPfzI5pQ/', 1, 1, 'menu.aiAssistant', 'assistant', 1775967903, '{"icon":"icon ai/assistant","isKeepAlive":true,"routeName":"AiAssistant"}', 1, 'admin', 1, 'admin', '2026-04-12 12:25:03', '2026-04-12 17:05:49', 0, NULL)`)
+				return nil
+			},
+			Rollback: func(tx *gorm.DB) error {
+				return nil
+			},
+		},
+	}
+}
diff --git a/server/pkg/contextx/contextx.go b/server/pkg/contextx/contextx.go
index 418ef380..5837b870 100644
--- a/server/pkg/contextx/contextx.go
+++ b/server/pkg/contextx/contextx.go
@@ -29,12 +29,13 @@ func GetLoginAccount(ctx context.Context) *model.LoginAccount {
 	return nil
 }
 
-func NewTraceId() context.Context {
-	return WithTraceId(context.Background())
-}
+/**   traceId   **/
 
-// WithTraceId 将traceId放置context中
+// WithTraceId 生成traceId并放置于context中, 如果已存在则不覆盖
 func WithTraceId(ctx context.Context) context.Context {
+	if GetTraceId(ctx) != "" {
+		return ctx
+	}
 	return context.WithValue(ctx, TraceIdKey, stringx.RandByChars(16, stringx.Nums+stringx.LowerChars))
 }
 
diff --git a/server/pkg/ioc/default.go b/server/pkg/ioc/default.go
index 87e195c9..fb8bbaff 100644
--- a/server/pkg/ioc/default.go
+++ b/server/pkg/ioc/default.go
@@ -2,6 +2,7 @@ package ioc
 
 import (
 	"mayfly-go/pkg/utils/collx"
+	"mayfly-go/pkg/utils/structx"
 	"reflect"
 )
 
@@ -13,6 +14,11 @@ func Register(component any, opts ...ComponentOption) {
 	DefaultContainer.Register(component, opts...)
 }
 
+// RegisterByType 根据组件实例类型注册至全局默认ioc容器，会自动创建实例
+func RegisterByType[T any](opts ...ComponentOption) {
+	DefaultContainer.Register(structx.NewInstance[T](), opts...)
+}
+
 // Get 根据组件实例类型从全局默认ioc容器获取实例
 func Get[T any]() T {
 	c, _ := DefaultContainer.GetByType(reflect.TypeOf((*T)(nil)).Elem())
@@ -25,7 +31,6 @@ func GetByName[T any](name string) T {
 	return c.(T)
 }
 
-
 // GetBeansByType 根据组件实例类型从全局默认ioc容器获取实例
 func GetBeansByType[T any]() []T {
 	return collx.ArrayMap(DefaultContainer.GetBeansByType(reflect.TypeOf((*T)(nil)).Elem()), func(val any) T {
diff --git a/server/pkg/ioc/ioc.go b/server/pkg/ioc/ioc.go
index 643130de..81bbfeeb 100644
--- a/server/pkg/ioc/ioc.go
+++ b/server/pkg/ioc/ioc.go
@@ -63,7 +63,7 @@ func (c *Container) Inject(obj any) error {
 		return nil
 	}
 
-	ctx := contextx.NewTraceId()
+	ctx := contextx.WithTraceId(context.Background())
 	if err := c.injectWithField(ctx, objValue); err != nil {
 		return err
 	}
diff --git a/server/pkg/model/query_cond.go b/server/pkg/model/query_cond.go
index 41d5a2dc..bdad8f4c 100644
--- a/server/pkg/model/query_cond.go
+++ b/server/pkg/model/query_cond.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"mayfly-go/pkg/consts"
 	"mayfly-go/pkg/utils/anyx"
+	"mayfly-go/pkg/utils/stringx"
 )
 
 type QueryCond struct {
@@ -134,7 +135,7 @@ func (q *QueryCond) Cond(cond, column string, val any, skipBlank bool) *QueryCon
 	if skipBlank && anyx.IsBlank(val) {
 		return q
 	}
-	return q.And(fmt.Sprintf("%s %s ?", column, cond), val)
+	return q.And(fmt.Sprintf("%s %s ?", stringx.Camel2Snake(column), cond), val)
 }
 
 func (q *QueryCond) GetWheres() map[string][]any {
diff --git a/server/pkg/model/type.go b/server/pkg/model/type.go
index e3012f99..0a71319b 100644
--- a/server/pkg/model/type.go
+++ b/server/pkg/model/type.go
@@ -4,6 +4,7 @@ import (
 	"database/sql"
 	"database/sql/driver"
 	"encoding/json"
+	"mayfly-go/pkg/utils/anyx"
 	"mayfly-go/pkg/utils/collx"
 )
 
@@ -56,12 +57,16 @@ type ExtraData struct {
 }
 
 // SetExtraValue 设置额外信息字段值
-func (m *ExtraData) SetExtraValue(key string, val any) {
+func (m *ExtraData) SetExtraValue(key string, val any) *ExtraData {
+	if anyx.IsBlank(val) {
+		return m
+	}
 	if m.Extra != nil {
 		m.Extra[key] = val
 	} else {
 		m.Extra = collx.M{key: val}
 	}
+	return m
 }
 
 // GetExtraVal 获取额外信息字段值
diff --git a/server/pkg/starter/gorm.go b/server/pkg/starter/gorm.go
index c6dec634..927ac721 100644
--- a/server/pkg/starter/gorm.go
+++ b/server/pkg/starter/gorm.go
@@ -22,6 +22,10 @@ func initDB(dbConf DBConf) (*gorm.DB, error) {
 
 func initMysql(dbConf DBConf) (*gorm.DB, error) {
 	logx.Infof("connecting to mysql [%s]", dbConf.Address)
+	if dbConf.Config == "" {
+		dbConf.Config = "charset=utf8&loc=Local&parseTime=true"
+	}
+
 	mysqlConfig := mysql.Config{
 		DSN:                       dbConf.Username + ":" + dbConf.Password + "@tcp(" + dbConf.Address + ")/" + dbConf.Name + "?" + dbConf.Config, // DSN data source name
 		DefaultStringSize:         191,                                                                                                           // string 类型字段的默认长度
diff --git a/server/pkg/utils/collx/map.go b/server/pkg/utils/collx/map.go
index 69ba8397..3ff2139a 100644
--- a/server/pkg/utils/collx/map.go
+++ b/server/pkg/utils/collx/map.go
@@ -13,11 +13,12 @@ import (
 type M map[string]any
 
 // Set 设置key对应的值
-func (m *M) Set(key string, val any) {
+func (m *M) Set(key string, val any) *M {
 	if *m == nil {
 		*m = M{}
 	}
 	(*m)[key] = val
+	return m
 }
 
 // GetStr 获取key对应的string类型值
diff --git a/server/pkg/utils/filex/filex.go b/server/pkg/utils/filex/filex.go
new file mode 100644
index 00000000..7c3ebc59
--- /dev/null
+++ b/server/pkg/utils/filex/filex.go
@@ -0,0 +1,120 @@
+package filex
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+	"time"
+)
+
+// WriteFileAtomic atomically writes data to a file using a temp file + rename pattern.
+//
+// This guarantees that the target file is either:
+// - Completely written with the new data
+// - Unchanged (if any step fails before rename)
+//
+// The function:
+// 1. Creates a temp file in the same directory (original untouched)
+// 2. Writes data to temp file
+// 3. Syncs data to disk (critical for SD cards/flash storage)
+// 4. Sets file permissions
+// 5. Syncs directory metadata (ensures rename is durable)
+// 6. Atomically renames temp file to target path
+//
+// Safety guarantees:
+// - Original file is NEVER modified until successful rename
+// - Temp file is always cleaned up on error
+// - Data is flushed to physical storage before rename
+// - Directory entry is synced to prevent orphaned inodes
+//
+// Parameters:
+//   - path: Target file path
+//   - data: Data to write
+//   - perm: File permission mode (e.g., 0o600 for secure, 0o644 for readable)
+//
+// Returns:
+//   - Error if any step fails, nil on success
+//
+// Example:
+//
+//	// Secure config file (owner read/write only)
+//	err := utils.WriteFileAtomic("config.json", data, 0o600)
+//
+//	// Public readable file
+//	err := utils.WriteFileAtomic("public.txt", data, 0o644)
+func WriteFileAtomic(path string, data []byte, perm os.FileMode) error {
+	dir := filepath.Dir(path)
+	if err := os.MkdirAll(dir, 0o755); err != nil {
+		return fmt.Errorf("failed to create directory: %w", err)
+	}
+
+	// Create temp file in the same directory (ensures atomic rename works)
+	// Using a hidden prefix (.tmp-) to avoid issues with some tools
+	tmpFile, err := os.OpenFile(
+		filepath.Join(dir, fmt.Sprintf(".tmp-%d-%d", os.Getpid(), time.Now().UnixNano())),
+		os.O_WRONLY|os.O_CREATE|os.O_EXCL,
+		perm,
+	)
+	if err != nil {
+		return fmt.Errorf("failed to create temp file: %w", err)
+	}
+
+	tmpPath := tmpFile.Name()
+	cleanup := true
+
+	defer func() {
+		if cleanup {
+			tmpFile.Close()
+			_ = os.Remove(tmpPath)
+		}
+	}()
+
+	// Write data to temp file
+	// Note: Original file is untouched at this point
+	if _, err := tmpFile.Write(data); err != nil {
+		return fmt.Errorf("failed to write temp file: %w", err)
+	}
+
+	// CRITICAL: Force sync to storage medium before any other operations.
+	// This ensures data is physically written to disk, not just cached.
+	// Essential for SD cards, eMMC, and other flash storage on edge devices.
+	if err := tmpFile.Sync(); err != nil {
+		return fmt.Errorf("failed to sync temp file: %w", err)
+	}
+
+	// Set file permissions before closing
+	if err := tmpFile.Chmod(perm); err != nil {
+		return fmt.Errorf("failed to set permissions: %w", err)
+	}
+
+	// Close file before rename (required on Windows)
+	if err := tmpFile.Close(); err != nil {
+		return fmt.Errorf("failed to close temp file: %w", err)
+	}
+
+	// Atomic rename: temp file becomes the target
+	// On POSIX: rename() is atomic
+	// On Windows: Rename() is atomic for files
+	if err := os.Rename(tmpPath, path); err != nil {
+		return fmt.Errorf("failed to rename temp file: %w", err)
+	}
+
+	// Sync directory to ensure rename is durable
+	// This prevents the renamed file from disappearing after a crash
+	if dirFile, err := os.Open(dir); err == nil {
+		_ = dirFile.Sync()
+		dirFile.Close()
+	}
+
+	// Success: skip cleanup (file was renamed, no temp to remove)
+	cleanup = false
+	return nil
+}
+
+func CopyFile(src, dst string, perm os.FileMode) error {
+	data, err := os.ReadFile(src)
+	if err != nil {
+		return err
+	}
+	return WriteFileAtomic(dst, data, perm)
+}
diff --git a/server/pkg/utils/jsonx/jsonx.go b/server/pkg/utils/jsonx/jsonx.go
index fdd55a8e..476fb6de 100644
--- a/server/pkg/utils/jsonx/jsonx.go
+++ b/server/pkg/utils/jsonx/jsonx.go
@@ -3,37 +3,46 @@ package jsonx
 import (
 	"encoding/json"
 	"mayfly-go/pkg/logx"
+	"mayfly-go/pkg/utils/anyx"
 	"mayfly-go/pkg/utils/collx"
 
 	"github.com/tidwall/gjson"
 )
 
-// ToMap json字符串转map
-func ToMap(jsonStr string) (collx.M, error) {
-	if jsonStr == "" {
-		return map[string]any{}, nil
-	}
-	return ToMapByBytes([]byte(jsonStr))
-}
-
-// To json字符串转指定类型
-func To[T any](jsonStr string) (*T, error) {
+// To json字节数组转指定类型
+func To[T any](jsonVal []byte) (*T, error) {
 	var v T
-	if err := json.Unmarshal([]byte(jsonStr), &v); err != nil {
+	if err := json.Unmarshal(jsonVal, &v); err != nil {
 		return nil, err
 	}
 	return &v, nil
 }
 
-// ToMapByBytes json字节数组转map
-func ToMapByBytes(bytes []byte) (collx.M, error) {
+// ToMap json字节数组转map
+func ToMap(jsonVal []byte) (collx.M, error) {
 	var res map[string]any
-	err := json.Unmarshal(bytes, &res)
+	err := json.Unmarshal(jsonVal, &res)
 	return res, err
 }
 
+// ToByStr json字符串转指定类型
+func ToByStr[T any](jsonStr string) (*T, error) {
+	return To[T]([]byte(jsonStr))
+}
+
+// ToMapByStr json字符串转map
+func ToMapByStr(jsonStr string) (collx.M, error) {
+	if jsonStr == "" {
+		return map[string]any{}, nil
+	}
+	return ToMap([]byte(jsonStr))
+}
+
 // 转换为json字符串
 func ToStr(val any) string {
+	if anyx.IsBlank(val) {
+		return ""
+	}
 	if strBytes, err := json.Marshal(val); err != nil {
 		logx.ErrorTrace("toJsonStr error: ", err)
 		return ""
@@ -44,42 +53,42 @@ func ToStr(val any) string {
 
 // 根据json字节数组获取对应字段路径的string类型值
 //
-//  - fieldPath字段路径。如user.username等
+//   - fieldPath字段路径。如user.username等
 func GetStringByBytes(bytes []byte, fieldPath string) (string, error) {
 	return gjson.GetBytes(bytes, fieldPath).String(), nil
 }
 
 // 根据json字符串获取对应字段路径的string类型值
 //
-//  - fieldPath字段路径。如user.username等
+//   - fieldPath字段路径。如user.username等
 func GetString(jsonStr string, fieldPath string) (string, error) {
 	return gjson.Get(jsonStr, fieldPath).String(), nil
 }
 
 // 根据json字节数组获取对应字段路径的int类型值
 //
-//  - fieldPath字段路径。如user.age等
+//   - fieldPath字段路径。如user.age等
 func GetIntByBytes(bytes []byte, fieldPath string) (int64, error) {
 	return gjson.GetBytes(bytes, fieldPath).Int(), nil
 }
 
 // 根据json字符串获取对应字段路径的int类型值
 //
-//  - fieldPath字段路径。如user.age等
+//   - fieldPath字段路径。如user.age等
 func GetInt(jsonStr string, fieldPath string) (int64, error) {
 	return gjson.Get(jsonStr, fieldPath).Int(), nil
 }
 
 // 根据json字节数组获取对应字段路径的bool类型值
 //
-//  - fieldPath字段路径。如user.isDeleted等
+//   - fieldPath字段路径。如user.isDeleted等
 func GetBoolByBytes(bytes []byte, fieldPath string) (bool, error) {
 	return gjson.GetBytes(bytes, fieldPath).Bool(), nil
 }
 
 // 根据json字符串获取对应字段路径的bool类型值
 //
-//  - fieldPath字段路径。如user.isDeleted等
+//   - fieldPath字段路径。如user.isDeleted等
 func GetBool(jsonStr string, fieldPath string) (bool, error) {
 	return GetBoolByBytes([]byte(jsonStr), fieldPath)
 }
diff --git a/server/pkg/utils/netx/netx.go b/server/pkg/utils/netx/netx.go
index 8dd36f31..284f1fce 100644
--- a/server/pkg/utils/netx/netx.go
+++ b/server/pkg/utils/netx/netx.go
@@ -62,7 +62,7 @@ func Ip2Region(ip string) string {
 	defer searcher.Close()
 
 	// do the search
-	region, err := searcher.SearchByStr(ip)
+	region, err := searcher.Search(ip)
 	if err != nil {
 		logx.Warnf("failed to SearchIP(%s): %s\n", ip, err)
 		return ""
diff --git a/server/pkg/utils/stringx/stringx.go b/server/pkg/utils/stringx/stringx.go
index e551daab..387265f4 100644
--- a/server/pkg/utils/stringx/stringx.go
+++ b/server/pkg/utils/stringx/stringx.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"strings"
 	"text/template"
+	"unicode"
 	"unicode/utf8"
 )
 
@@ -45,24 +46,29 @@ func SubString(str string, begin, end int) (substr string) {
 	return string(rs[begin:end])
 }
 
-func Camel2Underline(name string) string {
+// Camel2Snake 将驼峰命名转换为下划线命名
+// 例如: "userName" -> "user_name", "HTTPServer" -> "http_server"
+func Camel2Snake(name string) string {
 	if name == "" {
 		return ""
 	}
 
-	temp := strings.Split(name, "_")
-	var s string
-	for _, v := range temp {
-		vv := []rune(v)
-		if len(vv) > 0 {
-			if bool(vv[0] >= 'a' && vv[0] <= 'z') { //首字母大写
-				vv[0] -= 32
+	var result strings.Builder
+	for i, r := range name {
+		// 如果当前字符是大写字母
+		if unicode.IsUpper(r) {
+			// 如果不是第一个字符，且前一个字符不是下划线，则添加下划线
+			if i > 0 {
+				result.WriteRune('_')
 			}
-			s += string(vv)
+			// 转换为小写
+			result.WriteRune(unicode.ToLower(r))
+		} else {
+			result.WriteRune(r)
 		}
 	}
 
-	return s
+	return result.String()
 }
 
 func UnicodeIndex(str, substr string) int {
@@ -120,7 +126,23 @@ func ReverStrTemplate(temp, str string, res map[string]any) {
 	}
 }
 
-// Truncate 截断字符串并在中间部分显示指定的替换字符串
+// Truncate 截断字符串并在中间部分显示指定的替换字符串。
+// 该函数基于 Unicode 字符（rune）进行计算，支持中文等多字节字符。
+//
+// 参数说明：
+//   - s: 原始字符串
+//   - length: 截断后字符串的总最大长度（包含前缀、替换串和后缀）。
+//     如果原字符串长度小于等于 length，则直接返回原字符串。
+//   - prefixLen: 保留的前缀字符数量。
+//   - replace: 用于替换中间被截断部分的字符串（如 "..."）。
+//
+// 返回：
+//   - 格式化后的字符串。
+//
+// 示例：
+//
+//	Truncate("Hello, World!", 10, 5, "...") -> "Hello...ld!"
+//	Truncate("你好世界", 3, 1, "..") -> "你..界"
 func Truncate(s string, length int, prefixLen int, replace string) string {
 	totalRunes := utf8.RuneCountInString(s)
 
diff --git a/server/pkg/utils/structx/reflect.go b/server/pkg/utils/structx/reflect.go
index acf5ea51..449510c1 100644
--- a/server/pkg/utils/structx/reflect.go
+++ b/server/pkg/utils/structx/reflect.go
@@ -21,3 +21,23 @@ func IsZeroValue(v reflect.Value) bool {
 		return reflect.DeepEqual(v.Interface(), reflect.Zero(v.Type()).Interface())
 	}
 }
+
+// newInstance 创建一个 T 类型的实例
+// 如果 T 是指针类型 (*A)，它返回 new(A) 并转换为 *A
+// 如果 T 是值类型 (A)，它返回 new(A) 的解引用值 A (即零值)，或者根据需求调整
+func NewInstance[T any]() T {
+	var t T
+	typ := reflect.TypeOf(t)
+
+	if typ.Kind() == reflect.Ptr {
+		// T 是 *SomeStruct
+		// 我们需要创建 SomeStruct 的实例，并返回其指针
+		elemType := typ.Elem()
+		v := reflect.New(elemType)
+		return v.Interface().(T)
+	} else {
+		// T 是 SomeStruct
+		// 返回零值结构体，或者返回 &SomeStruct{} (但这会改变类型)
+		return t
+	}
+}
diff --git a/server/readme.txt b/server/readme.txt
index ae319ab3..10018ccd 100644
--- a/server/readme.txt
+++ b/server/readme.txt
@@ -1,6 +1,6 @@
 相关配置文件: 
   后端：
-    config.yml: 服务端口，mysql，aeskey(16 24 32位)，jwtkey等信息在此配置即可。
+    config.yml: 服务端口，db，aeskey(16 24 32位)，jwtkey等信息在此配置即可。
     建议务必将aes.key(资源密码加密如机器、数据库、redis等密码)与jwt.key(jwt秘钥)两信息使用随机字符串替换。
 
 服务启动&重启：./startup.sh
diff --git a/server/readme_en.txt b/server/readme_en.txt
index 4a1bd524..24f8d1d2 100644
--- a/server/readme_en.txt
+++ b/server/readme_en.txt
@@ -1,6 +1,6 @@
 Related configuration files: 
   backend:
-    config.yml: Server port, mysql, aeskey(16, 24, 32 chars), jwt-key and other information can be configured here.
+    config.yml: Server port, db, aeskey(16, 24, 32 chars), jwt-key and other information can be configured here.
     It is recommended to replace aes.key(resource password encryption such as machine, database, redis password) and jwT.key (jwt secret key) with a random string.